From 5c2b5c2b019d507776868bed741cd9a16d6ae3d3 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 29 Jan 2022 15:06:07 +0100 Subject: [PATCH 001/150] surge-XT: unstable-2021-12-11 -> 1.0.1 --- pkgs/applications/audio/surge-XT/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index a08c25f016a..7d8cf72eba2 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -37,14 +37,14 @@ let in stdenv.mkDerivation rec { pname = "surge-XT"; - version = "unstable-2021-12-11"; + version = "1.0.1"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; - rev = "320f68543d0279c11cea8dc7f5170399cccc9602"; + rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-Jcs5FpX5AZl72aKYNbRcfYqb2PRt0r1pQXk957xk0aM="; + sha256 = "sha256-u7jXNCDFRzq9oFaxovfTEipQsN+e4+whLexJrSJdXWw="; }; nativeBuildInputs = [ From 31d64f74988c5578c8e5521f2b1c3c9678f27eeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 17:28:03 +0000 Subject: [PATCH 002/150] gurobi: 9.5.0 -> 9.5.1 --- pkgs/applications/science/math/gurobi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index dc947a94001..399fa3a3c54 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gurobi"; - version = "9.5.0"; + version = "9.5.1"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; - sha256 = "sha256-u1QuWl0WhfbjZOrwXqbFVySF/8N6IkUWnPPLQCiLwp4="; + sha256 = "sha256-+oKFnTPwj7iuudpmsPvZFxjtVzxTT1capSNyyd64kdo="; }; sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; From b3cadfd9e6bf298574f8334f335289e4d0693232 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 18:31:38 +0000 Subject: [PATCH 003/150] ott: 0.31 -> 0.32 --- pkgs/applications/science/logic/ott/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 8752c4ef59d..4b7166ad998 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ott"; - version = "0.31"; + version = "0.32"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "0l81126i2qkz11fs5yrjdgymnqgjcs5avb7f951h61yh1s68jpnn"; + sha256 = "sha256-vdDsfsIi1gRW1Sowf29VyQ4C5UKyQZaVgS2uTb8VeW4="; }; nativeBuildInputs = [ pkg-config opaline ]; From dccb6ebc8816bf3c2c32ea9787c8ae8fd1661fe3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Mar 2022 01:31:24 +0000 Subject: [PATCH 004/150] backintime-common: 1.2.1 -> 1.3.2 --- pkgs/applications/networking/sync/backintime/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 335ba4a4de1..0b02b87a1b2 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.2.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "mBjheLY7DHs995heZmxVnDdvABkAROCjRJ4a/uJmJcg="; + sha256 = "sha256-7iTQZ7SiESsKK8F8BpLrRNkj8JhHo64kliaOvMvYGvw="; }; nativeBuildInputs = [ makeWrapper gettext ]; From c4664f6bf18c9c8e1bd47f176f3608b4101f4514 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 20 Apr 2022 12:38:41 +0200 Subject: [PATCH 005/150] microcodeIntel: 20220207 -> 20220419 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20220419 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index f239cb307c7..41091181ee8 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20220207"; + version = "20220419"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "sha256-yNHYAf8AX8C8iSaFWa6u7knUryaUgvI6nIH9jkD4jjw="; + sha256 = "sha256-i3OhOEqyK6gJfRIPewPGb4/6k6lO0atmedEqJ2e+66U="; }; nativeBuildInputs = [ iucode-tool libarchive ]; From 4fefaa54aeef6eec90ec58ebfbde99eb074680cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Fri, 29 Apr 2022 22:02:09 +0200 Subject: [PATCH 006/150] odp-dpdk: 1.30.1.0_DPDK_19.11 -> 1.35.0.0_DPDK_19.11 Fixing failing build --- pkgs/os-specific/linux/odp-dpdk/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 66b39b2c89e..a9dac153b15 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -2,10 +2,10 @@ , dpdk, libbpf, libconfig, libpcap, numactl, openssl, zlib, libbsd, libelf, jansson }: let dpdk_19_11 = dpdk.overrideAttrs (old: rec { - version = "19.11"; + version = "19.11.12"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "sha256-RnEzlohDZ3uxwna7dKNFiqfAAswh4pXFHjvWVJexEqs="; + sha256 = "sha256-F9m2+MZi3n0psPIwjWwhiIbbNkoGlxqtru2OlV7TbzQ="; }; mesonFlags = old.mesonFlags ++ [ "-Denable_docs=false" @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "odp-dpdk"; - version = "1.30.1.0_DPDK_19.11"; + version = "1.35.0.0_DPDK_19.11"; src = fetchurl { url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-R3PsqQiHlHPzIYYWTVEC7Ikg3KR5I0jWGgftDA9Jj1o="; + sha256 = "sha256-R4cRfz0uUDbeQmJfFSIAmq3KfD6CE9hIW2yvFqL+b0M="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { description = "Open Data Plane optimized for DPDK"; homepage = "https://www.opendataplane.org"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.linux; maintainers = [ maintainers.abuibrahim ]; }; } From b562fda57b7b6b97b98d39eaf0c9a776d9fd6a05 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sat, 30 Apr 2022 20:54:23 +0300 Subject: [PATCH 007/150] mpdris2: 0.8 -> 0.9.1 --- pkgs/tools/audio/mpdris2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 4cd3921fb55..a367da9828e 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mpDris2"; - version = "0.8"; + version = "0.9.1"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "eonpatapon"; repo = pname; rev = version; - sha256 = "048b8acsd1b8kcxzd9fsh5p9g2an9c4rznicfcpyrsjz5syv894h"; + sha256 = "sha256-1Y6K3z8afUXeKhZzeiaEF3yqU0Ef7qdAj9vAkRlD2p8="; }; preConfigure = '' @@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec { description = "MPRIS 2 support for mpd"; homepage = "https://github.com/eonpatapon/mpDris2/"; license = licenses.gpl3; - maintainers = with maintainers; []; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } From c34a8024bf5f8cae1becf105ad992482cc336e89 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 6 May 2022 10:45:04 +0100 Subject: [PATCH 008/150] gcc12, gfortran12, gnat12: init at 12.1.0 A copy of gcc11 with minor patch changes: - follow .c/.cc rename upstream - made patches unconditional Changes: https://www.gnu.org/software/gcc/gcc-12/changes.html --- ...thread-model-support-from-mcfgthread.patch | 306 ++++++++++++++++++ pkgs/development/compilers/gcc/12/default.nix | 294 +++++++++++++++++ .../gcc/gcc-12-gfortran-driving.patch | 20 ++ .../compilers/gcc/gcc-12-no-sys-dirs.patch | 26 ++ pkgs/top-level/all-packages.nix | 39 ++- 5 files changed, 684 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/gcc/12/Added-mcf-thread-model-support-from-mcfgthread.patch create mode 100644 pkgs/development/compilers/gcc/12/default.nix create mode 100644 pkgs/development/compilers/gcc/gcc-12-gfortran-driving.patch create mode 100644 pkgs/development/compilers/gcc/gcc-12-no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/12/Added-mcf-thread-model-support-from-mcfgthread.patch b/pkgs/development/compilers/gcc/12/Added-mcf-thread-model-support-from-mcfgthread.patch new file mode 100644 index 00000000000..77202438e47 --- /dev/null +++ b/pkgs/development/compilers/gcc/12/Added-mcf-thread-model-support-from-mcfgthread.patch @@ -0,0 +1,306 @@ +From 86f2f767ddffd9f7c6f1470b987ae7b0d251b988 Mon Sep 17 00:00:00 2001 +From: Liu Hao +Date: Wed, 25 Apr 2018 21:54:19 +0800 +Subject: [PATCH] Added 'mcf' thread model support from mcfgthread. + +Signed-off-by: Liu Hao +--- + config/gthr.m4 | 1 + + gcc/config.gcc | 3 +++ + gcc/config/i386/mingw-mcfgthread.h | 1 + + gcc/config/i386/mingw-w64.h | 2 +- + gcc/config/i386/mingw32.h | 11 ++++++++++- + gcc/configure | 2 +- + gcc/configure.ac | 2 +- + libatomic/configure.tgt | 2 +- + libgcc/config.host | 6 ++++++ + libgcc/config/i386/gthr-mcf.h | 1 + + libgcc/config/i386/t-mingw-mcfgthread | 2 ++ + libgcc/configure | 1 + + libstdc++-v3/configure | 1 + + libstdc++-v3/libsupc++/atexit_thread.cc | 18 ++++++++++++++++++ + libstdc++-v3/libsupc++/guard.cc | 23 +++++++++++++++++++++++ + libstdc++-v3/src/c++11/thread.cc | 9 +++++++++ + 16 files changed, 80 insertions(+), 5 deletions(-) + create mode 100644 gcc/config/i386/mingw-mcfgthread.h + create mode 100644 libgcc/config/i386/gthr-mcf.h + create mode 100644 libgcc/config/i386/t-mingw-mcfgthread + +diff --git a/config/gthr.m4 b/config/gthr.m4 +index 7b29f1f3327..82e21fe1709 100644 +--- a/config/gthr.m4 ++++ b/config/gthr.m4 +@@ -21,6 +21,7 @@ case $1 in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + AC_SUBST(thread_header) + ]) +diff --git a/gcc/config.gcc b/gcc/config.gcc +index 46a9029acec..112c24e95a3 100644 +--- a/gcc/config.gcc ++++ b/gcc/config.gcc +@@ -1758,6 +1758,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) + if test x$enable_threads = xposix ; then + tm_file="${tm_file} i386/mingw-pthread.h" + fi ++ if test x$enable_threads = xmcf ; then ++ tm_file="${tm_file} i386/mingw-mcfgthread.h" ++ fi + tm_file="${tm_file} i386/mingw32.h" + # This makes the logic if mingw's or the w64 feature set has to be used + case ${target} in +diff --git a/gcc/config/i386/mingw-mcfgthread.h b/gcc/config/i386/mingw-mcfgthread.h +new file mode 100644 +index 00000000000..ec381a7798f +--- /dev/null ++++ b/gcc/config/i386/mingw-mcfgthread.h +@@ -0,0 +1 @@ ++#define TARGET_USE_MCFGTHREAD 1 +diff --git a/gcc/config/i386/mingw-w64.h b/gcc/config/i386/mingw-w64.h +index 484dc7a9e9f..a15bbeea500 100644 +--- a/gcc/config/i386/mingw-w64.h ++++ b/gcc/config/i386/mingw-w64.h +@@ -48,7 +48,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + #undef SPEC_32 + #undef SPEC_64 +diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h +index 0612b87199a..76cea94f3b7 100644 +--- a/gcc/config/i386/mingw32.h ++++ b/gcc/config/i386/mingw32.h +@@ -32,6 +32,14 @@ along with GCC; see the file COPYING3. If not see + | MASK_STACK_PROBE | MASK_ALIGN_DOUBLE \ + | MASK_MS_BITFIELD_LAYOUT) + ++#ifndef TARGET_USE_MCFGTHREAD ++#define CPP_MCFGTHREAD() ((void)0) ++#define LIB_MCFGTHREAD "" ++#else ++#define CPP_MCFGTHREAD() (builtin_define("__USING_MCFGTHREAD__")) ++#define LIB_MCFGTHREAD " -lmcfgthread " ++#endif ++ + /* See i386/crtdll.h for an alternative definition. _INTEGRAL_MAX_BITS + is for compatibility with native compiler. */ + #define EXTRA_OS_CPP_BUILTINS() \ +@@ -50,6 +58,7 @@ along with GCC; see the file COPYING3. If not see + builtin_define_std ("WIN64"); \ + builtin_define ("_WIN64"); \ + } \ ++ CPP_MCFGTHREAD(); \ + } \ + while (0) + +@@ -93,7 +102,7 @@ along with GCC; see the file COPYING3. If not see + "%{mwindows:-lgdi32 -lcomdlg32} " \ + "%{fvtable-verify=preinit:-lvtv -lpsapi; \ + fvtable-verify=std:-lvtv -lpsapi} " \ +- "-ladvapi32 -lshell32 -luser32 -lkernel32" ++ LIB_MCFGTHREAD "-ladvapi32 -lshell32 -luser32 -lkernel32" + + /* Weak symbols do not get resolved if using a Windows dll import lib. + Make the unwind registration references strong undefs. */ +diff --git a/gcc/configure b/gcc/configure +index 6121e163259..52f0e00efe6 100755 +--- a/gcc/configure ++++ b/gcc/configure +@@ -11693,7 +11693,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/gcc/configure.ac b/gcc/configure.ac +index b066cc609e1..4ecdba88de7 100644 +--- a/gcc/configure.ac ++++ b/gcc/configure.ac +@@ -1612,7 +1612,7 @@ case ${enable_threads} in + target_thread_file='single' + ;; + aix | dce | lynx | mipssde | posix | rtems | \ +- single | tpf | vxworks | win32) ++ single | tpf | vxworks | win32 | mcf) + target_thread_file=${enable_threads} + ;; + *) +diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt +index ea8c34f8c71..23134ad7363 100644 +--- a/libatomic/configure.tgt ++++ b/libatomic/configure.tgt +@@ -145,7 +145,7 @@ case "${target}" in + *-*-mingw*) + # OS support for atomic primitives. + case ${target_thread_file} in +- win32) ++ win32 | mcf) + config_path="${config_path} mingw" + ;; + posix) +diff --git a/libgcc/config.host b/libgcc/config.host +index 11b4acaff55..9fbd38650bd 100644 +--- a/libgcc/config.host ++++ b/libgcc/config.host +@@ -737,6 +737,9 @@ i[34567]86-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +@@ -761,6 +764,9 @@ x86_64-*-mingw*) + posix) + tmake_file="i386/t-mingw-pthread $tmake_file" + ;; ++ mcf) ++ tmake_file="i386/t-mingw-mcfgthread $tmake_file" ++ ;; + esac + # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h + if test x$ac_cv_sjlj_exceptions = xyes; then +diff --git a/libgcc/config/i386/gthr-mcf.h b/libgcc/config/i386/gthr-mcf.h +new file mode 100644 +index 00000000000..5ea2908361f +--- /dev/null ++++ b/libgcc/config/i386/gthr-mcf.h +@@ -0,0 +1 @@ ++#include +diff --git a/libgcc/config/i386/t-mingw-mcfgthread b/libgcc/config/i386/t-mingw-mcfgthread +new file mode 100644 +index 00000000000..4b9b10e32d6 +--- /dev/null ++++ b/libgcc/config/i386/t-mingw-mcfgthread +@@ -0,0 +1,2 @@ ++SHLIB_PTHREAD_CFLAG = ++SHLIB_PTHREAD_LDFLAG = -lmcfgthread +diff --git a/libgcc/configure b/libgcc/configure +index b2f3f870844..eff889dc3b3 100644 +--- a/libgcc/configure ++++ b/libgcc/configure +@@ -5451,6 +5451,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure +index ba094be6f15..979a5ab9ace 100755 +--- a/libstdc++-v3/configure ++++ b/libstdc++-v3/configure +@@ -15187,6 +15187,7 @@ case $target_thread_file in + tpf) thread_header=config/s390/gthr-tpf.h ;; + vxworks) thread_header=config/gthr-vxworks.h ;; + win32) thread_header=config/i386/gthr-win32.h ;; ++ mcf) thread_header=config/i386/gthr-mcf.h ;; + esac + + +diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc +index de920d714c6..665fb74bd6b 100644 +--- a/libstdc++-v3/libsupc++/atexit_thread.cc ++++ b/libstdc++-v3/libsupc++/atexit_thread.cc +@@ -25,6 +25,22 @@ + #include + #include + #include "bits/gthr.h" ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++namespace __cxxabiv1 { ++extern "C" int ++__cxa_thread_atexit (void (_GLIBCXX_CDTOR_CALLABI *dtor)(void *), ++ void *obj, void *dso_handle) ++ _GLIBCXX_NOTHROW ++{ ++ return ::_MCFCRT_AtThreadExit((void (*)(_MCFCRT_STD intptr_t))dtor, (_MCFCRT_STD intptr_t)obj) ? 0 : -1; ++ (void)dso_handle; ++} ++} ++#else // __USING_MCFGTHREAD__ ++ + #ifdef _GLIBCXX_THREAD_ATEXIT_WIN32 + #define WIN32_LEAN_AND_MEAN + #include +@@ -167,3 +183,5 @@ __cxxabiv1::__cxa_thread_atexit (void (*dtor)(void *), void *obj, void */*dso_ha + } + + #endif /* _GLIBCXX_HAVE___CXA_THREAD_ATEXIT_IMPL */ ++ ++#endif // __USING_MCFGTHREAD__ +diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc +index 3a2ec3ad0d6..8b4cc96199b 100644 +--- a/libstdc++-v3/libsupc++/guard.cc ++++ b/libstdc++-v3/libsupc++/guard.cc +@@ -28,6 +28,27 @@ + #include + #include + #include ++ ++#ifdef __USING_MCFGTHREAD__ ++ ++#include ++ ++namespace __cxxabiv1 { ++ ++extern "C" int __cxa_guard_acquire(__guard *g){ ++ return ::_MCFCRT_WaitForOnceFlagForever((::_MCFCRT_OnceFlag *)g) == ::_MCFCRT_kOnceResultInitial; ++} ++extern "C" void __cxa_guard_abort(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsAborted((::_MCFCRT_OnceFlag *)g); ++} ++extern "C" void __cxa_guard_release(__guard *g) throw() { ++ ::_MCFCRT_SignalOnceFlagAsFinished((::_MCFCRT_OnceFlag *)g); ++} ++ ++} ++ ++#else // __USING_MCFGTHREAD__ ++ + #include + #include + #include +@@ -425,3 +446,5 @@ namespace __cxxabiv1 + #endif + } + } ++ ++#endif +diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc +index 8238817c2e9..0c6a1f85f6f 100644 +--- a/libstdc++-v3/src/c++11/thread.cc ++++ b/libstdc++-v3/src/c++11/thread.cc +@@ -55,6 +55,15 @@ static inline int get_nprocs() + #elif defined(_GLIBCXX_USE_SC_NPROC_ONLN) + # include + # define _GLIBCXX_NPROCS sysconf(_SC_NPROC_ONLN) ++#elif defined(_WIN32) ++# include ++static inline int get_nprocs() ++{ ++ SYSTEM_INFO sysinfo; ++ GetSystemInfo(&sysinfo); ++ return (int)sysinfo.dwNumberOfProcessors; ++} ++# define _GLIBCXX_NPROCS get_nprocs() + #else + # define _GLIBCXX_NPROCS 0 + #endif +-- +2.17.0 + diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix new file mode 100644 index 00000000000..4f2da6903d3 --- /dev/null +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -0,0 +1,294 @@ +{ lib, stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langAda ? false +, langObjC ? stdenv.targetPlatform.isDarwin +, langObjCpp ? stdenv.targetPlatform.isDarwin +, langGo ? false +, reproducibleBuild ? true +, profiledCompiler ? false +, langJit ? false +, staticCompiler ? false +, enableShared ? !stdenv.targetPlatform.isStatic +, enableLTO ? !stdenv.hostPlatform.isStatic +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man) +, gmp, mpfr, libmpc, gettext, which, patchelf +, 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" +, libcCross ? null +, threadsCross ? null # for MinGW +, crossStageStatic ? false +, # Strip kills static libs of other archs (hence no cross) + stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system + && stdenv.targetPlatform.system == stdenv.hostPlatform.system +, gnused ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, buildPackages +}: + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +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; + +# profiledCompiler builds inject non-determinism in one of the compilation stages. +# If turned on, we can't provide reproducible builds anymore +assert reproducibleBuild -> profiledCompiler == false; + +with lib; +with builtins; + +let majorVersion = "12"; + version = "${majorVersion}.1.0"; + + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + patches = + optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../gcc-12-no-sys-dirs.patch + ++ optional noSysDirs ../no-sys-dirs-riscv.patch + ++ [ + ../gnat-cflags-11.patch + ../gcc-12-gfortran-driving.patch + ../ppc-musl.patch + ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch { + url = "https://github.com/fxcoudert/gcc/compare/releases/gcc-11.1.0...gcc-11.1.0-arm-20210504.diff"; + sha256 = "sha256-JqCGJAfbOxSmkNyq49aFHteK/RFsCSLQrL9mzUCnaD0="; + }) + + # Obtain latest patch with ../update-mcfgthread-patches.sh + ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch; + + /* Cross-gcc settings (build == host != target) */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + +in + +stdenv.mkDerivation ({ + pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + inherit version; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "sha256-Yv1jSInzHAK2SvLEaPBktHrRynhBHEWr5qxLX43RnHs="; + }; + + inherit patches; + + outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib"; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" "pie" ]; + + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + + lib.optionalString hostPlatform.isDarwin '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name ''${!outputLib}/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" + '' + + ( + if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q _DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done + '' + + lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) + else "") + + lib.optionalString targetPlatform.isAvr '' + makeFlagsArray+=( + '-s' # workaround for hitting hydra log limit + 'LIMITS_H_TEST=false' + ) + ''; + + inherit noSysDirs staticCompiler crossStageStatic + libcCross crossMingw; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl) + ++ (optional langAda gnatboot) + ; + + # For building runtime libs + depsBuildTarget = + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + # 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) + ; + + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + + NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = import ../common/pre-configure.nix { + inherit lib; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; + }; + + dontDisableStatic = true; + + configurePlatforms = [ "build" "host" "target" ]; + + configureFlags = import ../common/configure-flags.nix { + inherit + lib + stdenv + targetPackages + crossStageStatic libcCross + version + + gmp mpfr libmpc libelf isl + + enableLTO + enableMultilib + enablePlugin + enableShared + + langC + langCC + langFortran + langAda + langGo + langObjC + langObjCpp + langJit + ; + }; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = optional + (targetPlatform == hostPlatform && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; + + installTargets = optional stripped "install-strip"; + + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. + + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + )); + + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); + + inherit + (import ../common/extra-target-flags.nix { + inherit lib stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET + ; + + passthru = { + inherit langC langCC langObjC langObjCpp langAda langFortran langGo version; + isGNU = true; + }; + + enableParallelBuilding = true; + inherit enableShared enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = "https://gcc.gnu.org/"; + license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = lib.teams.gcc.members; + + platforms = lib.platforms.unix; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/development/compilers/gcc/gcc-12-gfortran-driving.patch b/pkgs/development/compilers/gcc/gcc-12-gfortran-driving.patch new file mode 100644 index 00000000000..0ad1f256063 --- /dev/null +++ b/pkgs/development/compilers/gcc/gcc-12-gfortran-driving.patch @@ -0,0 +1,20 @@ +This patch fixes interaction with Libtool. +See , for details. + +--- a/gcc/fortran/gfortranspec.cc ++++ b/gcc/fortran/gfortranspec.cc +@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n")); + { + fprintf (stderr, _("Driving:")); + for (i = 0; i < g77_newargc; i++) ++ { ++ if (g77_new_decoded_options[i].opt_index == OPT_l) ++ /* Make sure no white space is inserted after `-l'. */ ++ fprintf (stderr, " -l%s", ++ g77_new_decoded_options[i].canonical_option[1]); ++ else + fprintf (stderr, " %s", + g77_new_decoded_options[i].orig_option_with_args_text); ++ } + fprintf (stderr, "\n"); + } diff --git a/pkgs/development/compilers/gcc/gcc-12-no-sys-dirs.patch b/pkgs/development/compilers/gcc/gcc-12-no-sys-dirs.patch new file mode 100644 index 00000000000..67a94298440 --- /dev/null +++ b/pkgs/development/compilers/gcc/gcc-12-no-sys-dirs.patch @@ -0,0 +1,26 @@ +--- a/gcc/cppdefault.cc 2013-01-10 21:38:27.000000000 +0100 ++++ b/gcc/cppdefault.cc 2014-08-18 16:20:32.893944536 +0200 +@@ -35,6 +35,8 @@ + # undef CROSS_INCLUDE_DIR + #endif + ++#undef LOCAL_INCLUDE_DIR ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +--- a/gcc/gcc.cc 2014-03-23 12:30:57.000000000 +0100 ++++ b/gcc/gcc.cc 2014-08-18 13:19:32.689201690 +0200 +@@ -1162,10 +1162,10 @@ + /* Default prefixes to attach to command names. */ + + #ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#define STANDARD_STARTFILE_PREFIX_1 "" + #endif + #ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#define STANDARD_STARTFILE_PREFIX_2 "" + #endif + + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c89dea3449c..0cd704959b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12510,6 +12510,7 @@ with pkgs; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10; gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; + gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking @@ -12705,7 +12706,19 @@ with pkgs; isl = if !stdenv.isDarwin then isl_0_20 else null; })); - gcc_latest = gcc11; + gcc12 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/12 { + inherit noSysDirs; + + reproducibleBuild = true; + profiledCompiler = false; + + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + + isl = if !stdenv.isDarwin then isl_0_20 else null; + })); + + gcc_latest = gcc12; # Use the same GCC version as the one from stdenv by default gfortran = wrapCC (gcc.cc.override { @@ -12780,6 +12793,14 @@ with pkgs; profiledCompiler = false; }); + gfortran12 = wrapCC (gcc12.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + libgccjit = gcc.cc.override { name = "libgccjit"; langFortran = false; @@ -12869,6 +12890,22 @@ with pkgs; else buildPackages.gnat11; }); + gnat12 = wrapCC (gcc12.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnatboot = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat6 + else buildPackages.gnat12; + }); + gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; From 0bafb3baa7f82797342b787c84e94d6aae70350f Mon Sep 17 00:00:00 2001 From: "S. Nordin Abouzahra" Date: Sat, 7 May 2022 18:31:10 -0400 Subject: [PATCH 009/150] firefox: support JACK and sndio audio backends You can set `media.cubeb.backend` in `about:config` to force a specific backend. --- pkgs/applications/networking/browsers/firefox/common.nix | 8 ++++++++ pkgs/applications/networking/browsers/firefox/wrapper.nix | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e1506239f45..0872558d0f4 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -80,11 +80,13 @@ , alsaSupport ? stdenv.isLinux, alsa-lib , ffmpegSupport ? true , gssSupport ? true, libkrb5 +, jackSupport ? stdenv.isLinux, libjack2 , jemallocSupport ? true, jemalloc , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , pgoSupport ? (stdenv.isLinux && stdenv.isx86_64 && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run , pipewireSupport ? waylandSupport && webrtcSupport , pulseaudioSupport ? stdenv.isLinux, libpulseaudio +, sndioSupport ? stdenv.isLinux, sndio , waylandSupport ? true, libxkbcommon, libdrm ## privacy-related options @@ -303,7 +305,9 @@ buildStdenv.mkDerivation ({ ++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}" ++ flag alsaSupport "alsa" + ++ flag jackSupport "jack" ++ flag pulseaudioSupport "pulseaudio" + ++ lib.optional (lib.versionAtLeast version "100") (flag sndioSupport "sndio") ++ flag ffmpegSupport "ffmpeg" ++ flag jemallocSupport "jemalloc" ++ flag geolocationSupport "necko-wifi" @@ -363,7 +367,9 @@ buildStdenv.mkDerivation ({ ] ++ [ (if (lib.versionAtLeast version "92") then nss_latest else nss_esr) ] ++ lib.optional alsaSupport alsa-lib + ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed + ++ lib.optional (sndioSupport && lib.versionAtLeast version "100") sndio ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional jemallocSupport jemalloc @@ -464,7 +470,9 @@ buildStdenv.mkDerivation ({ inherit version; inherit alsaSupport; inherit binaryName; + inherit jackSupport; inherit pipewireSupport; + inherit sndioSupport; inherit nspr; inherit ffmpegSupport; inherit gssSupport; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d5055f04ed8..08cd6b4a799 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -13,6 +13,8 @@ , mesa # firefox wants gbm for drm+dmabuf , cups , pciutils +, sndio +, libjack2 }: ## configurability of the wrapper itself @@ -53,6 +55,8 @@ let gssSupport = browser.gssSupport or false; alsaSupport = browser.alsaSupport or false; pipewireSupport = browser.pipewireSupport or false; + sndioSupport = browser.sndioSupport or false; + jackSupport = browser.jackSupport or false; # PCSC-Lite daemon (services.pcscd) also must be enabled for firefox to access smartcards smartcardSupport = cfg.smartcardSupport or false; @@ -76,6 +80,8 @@ let (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ]) ++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional alsaSupport alsa-lib + ++ lib.optional sndioSupport sndio + ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk3 ]; From d753ffac205762e8d6a010ae1c01ef66788a8ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 4 May 2022 20:42:39 +1000 Subject: [PATCH 010/150] exoscale-cli: add man pages and completions --- pkgs/tools/admin/exoscale-cli/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index a745c693305..c8efae5fdb8 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "exoscale-cli"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - excludedPackages = [ "./completion" "./docs" ]; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; @@ -21,6 +21,19 @@ buildGoModule rec { # because these are passed to "go install" which does not recognize -o postBuild = '' mv $GOPATH/bin/cli $GOPATH/bin/exo + + mkdir -p manpage + $GOPATH/bin/docs --man-page + rm $GOPATH/bin/docs + + $GOPATH/bin/completion bash + $GOPATH/bin/completion zsh + rm $GOPATH/bin/completion + ''; + + postInstall = '' + installManPage manpage/* + installShellCompletion --cmd exo --bash bash_completion --zsh zsh_completion ''; meta = { From 940c886a0b4fa368d51b7a66f3f67e3243c54038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 4 May 2022 20:43:10 +1000 Subject: [PATCH 011/150] exoscale-cli: add self as maintainer --- pkgs/tools/admin/exoscale-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index c8efae5fdb8..6a093710151 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { description = "Command-line tool for everything at Exoscale: compute, storage, dns"; homepage = "https://github.com/exoscale/cli"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dramaturg ]; + maintainers = with lib.maintainers; [ dramaturg viraptor ]; mainProgram = "exo"; }; } From 08187ac06087ef15a320662136f43be9c182a9fd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 May 2022 02:10:21 -0300 Subject: [PATCH 012/150] nongnu-packages 2022-05-08 --- .../emacs/elisp-packages/nongnu-generated.nix | 81 +++++++++++++------ 1 file changed, 57 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index e15903ad973..f85120c0c21 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -49,10 +49,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.5.3.tar"; - sha256 = "0d5lqaj1bqckvjpwxqglzrhk8fm03n19lxwm74jxfl1lkxq4dw3x"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.5.4.tar"; + sha256 = "1d11q4ddc2rw7n8jrxdddc5h42hf16sbc1l4v6zmmsriahxhgfdd"; }; packageRequires = []; meta = { @@ -258,10 +258,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.3.0.tar"; - sha256 = "10kg30s0gb09l0z17v2hqxy9v5pscnpqp5dng62cjh0x3hdi4i7x"; + url = "https://elpa.nongnu.org/nongnu/cider-1.4.0.tar"; + sha256 = "11a3ysvrywp79pp1yivpsgi8azgzbg7ayiai94p1dyd3viy29qn0"; }; packageRequires = [ clojure-mode @@ -469,10 +469,10 @@ elpaBuild { pname = "elpher"; ename = "elpher"; - version = "3.3.3"; + version = "3.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elpher-3.3.3.tar"; - sha256 = "0yaf6g424g6dngg0acbhlhd24k77bl5h82wiw98f3731xdad174r"; + url = "https://elpa.nongnu.org/nongnu/elpher-3.4.1.tar"; + sha256 = "1vayhcamdp8nn6hrgffd0yx9k9q3mckbcsfwclhyyfc0x1hcwf92"; }; packageRequires = [ emacs ]; meta = { @@ -484,10 +484,10 @@ elpaBuild { pname = "evil"; ename = "evil"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-1.14.0.tar"; - sha256 = "11hzx3ya1119kr8dwlg264biixiqgvi7zwxxksql0a9hqp57rdpx"; + url = "https://elpa.nongnu.org/nongnu/evil-1.15.0.tar"; + sha256 = "0xp31w5mr6sprimd2rwy7mpa3kca5ivwf57jmaqyzpd96gh66pg1"; }; packageRequires = []; meta = { @@ -602,10 +602,10 @@ elpaBuild { pname = "evil-matchit"; ename = "evil-matchit"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.3.tar"; - sha256 = "079qbx6f4clh5ngnrga016h0q2vf7afx9irsa06pishfs94pl4qn"; + url = "https://elpa.nongnu.org/nongnu/evil-matchit-2.4.4.tar"; + sha256 = "1p8xsi0068wabsfn3jwhyinkk2684xp9hlapcbj6y58wkpzqj0f6"; }; packageRequires = [ emacs evil ]; meta = { @@ -712,10 +712,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.23.2"; + version = "0.24"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.23.2.tar"; - sha256 = "1rdz13rjfp8j2ik3vbw1jvacjri3abghlq6aqfvkd7vwm21h30ih"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.24.tar"; + sha256 = "14qnni8ridrg3afh1wy9nvchbk0drn0h7ww5xgc6s03ivvmy7a71"; }; packageRequires = [ emacs project transient ]; meta = { @@ -909,6 +909,21 @@ license = lib.licenses.free; }; }) {}; + gnu-apl-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "gnu-apl-mode"; + ename = "gnu-apl-mode"; + version = "1.5.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnu-apl-mode-1.5.1.tar"; + sha256 = "0almjbh35d0myyjaavmqi7yzk3jpqdcqrhsb2x6vcp6pb199g7z8"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/gnu-apl-mode.html"; + license = lib.licenses.free; + }; + }) {}; gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gnuplot"; @@ -1903,10 +1918,10 @@ elpaBuild { pname = "shellcop"; ename = "shellcop"; - version = "0.0.8"; + version = "0.0.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.8.tar"; - sha256 = "00kj1zadrqnikvwrxd6ma0c8r1jf70c1zaqr03s0g49h4lz6m2da"; + url = "https://elpa.nongnu.org/nongnu/shellcop-0.0.9.tar"; + sha256 = "0rv98s3w3pd2l477100d8kn2kqx21xn3axzcfbxbkgl8bc78mvci"; }; packageRequires = [ emacs ]; meta = { @@ -2023,10 +2038,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.3.tar"; - sha256 = "0wibakmp1lhfyr6sifb7f3jcqp2s5sy0z37ad9n1n9rhj5q8yhzg"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.5.tar"; + sha256 = "1wpkwab6scmc9d3bzp5161d8agmcjacpijs8xqb1mpbyvl1jvavc"; }; packageRequires = [ emacs ]; meta = { @@ -2315,6 +2330,24 @@ license = lib.licenses.free; }; }) {}; + xah-fly-keys = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "xah-fly-keys"; + ename = "xah-fly-keys"; + version = "17.7.20220429090059"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.7.20220429090059.tar"; + sha256 = "006lqjx88b0g0szxai82qdn3bv8qajp2x281arpmp3rpb7faggvq"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xah-fly-keys.html"; + license = lib.licenses.free; + }; + }) {}; xml-rpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "xml-rpc"; From 14dd58e25add2c1a5d145c2bb809bc5ff397d22d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 May 2022 21:46:32 -0300 Subject: [PATCH 013/150] melpa-packages 2022-05-08 --- .../elisp-packages/recipes-archive-melpa.json | 4807 +++++++++-------- 1 file changed, 2698 insertions(+), 2109 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index f6f82db01a5..800a01667f1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -204,11 +204,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20220301, - 1628 + 20220426, + 2058 ], - "commit": "8ce591165e0bdc1a6ea76e78bc10c6b55bab9634", - "sha256": "0v9hw8rf5ypxn7bbwdvv5wrmvdghp691xkfc7kj2zihc0f7vyxak" + "commit": "566944e3b336c29d3ac11cd739a954c9d112f3fb", + "sha256": "0walpgv18gx11hvij1mf9hgsd1x40rhccbzsnwsh86lka1g3na34" }, "stable": { "version": [ @@ -285,11 +285,11 @@ "repo": "jdtsmith/abridge-diff", "unstable": { "version": [ - 20210519, - 322 + 20220419, + 2358 ], - "commit": "85d0512e239f2ec2217da7f316a5aed350041fd9", - "sha256": "0ca375q90fg29c0y47s7ljb5ymwf8wnq6b8v375r06rkqvi7svdx" + "commit": "996d921da0a0ee651b3486c2afe29447f48be50f", + "sha256": "19k23326dwnnbf8gdm1b8zm1p8qx0515ak939vdp6falhqa9x4rn" }, "stable": { "version": [ @@ -1035,8 +1035,8 @@ "auto-complete", "yasnippet" ], - "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", - "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" + "commit": "f34e09783b77d1158ea139b7b3d8034bc52b0b9f", + "sha256": "1qi529lg3y5l4wrzfyk0w2fz36mpd432bp39s859z4cq06yybxga" }, "stable": { "version": [ @@ -1061,8 +1061,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20220120, - 754 + 20220418, + 419 ], "deps": [ "dash", @@ -1072,8 +1072,8 @@ "s", "xcscope" ], - "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", - "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" + "commit": "f34e09783b77d1158ea139b7b3d8034bc52b0b9f", + "sha256": "1qi529lg3y5l4wrzfyk0w2fz36mpd432bp39s859z4cq06yybxga" }, "stable": { "version": [ @@ -1816,11 +1816,11 @@ "repo": "louabill/ado-mode", "unstable": { "version": [ - 20210510, - 1902 + 20220415, + 1647 ], - "commit": "4832a51c2e94e969a99817ccdd13d656344d0afc", - "sha256": "0iyijlyj1d7k5m9mk3blb4wlam652487jhayrmgfy25snqd8b0sm" + "commit": "695ea71cf4d6ae5f0afbc37b6fd08458e5c584c4", + "sha256": "0qgypd7hpbcb0fmgiq5sjs4nxb46kcda1hjz61cnf1skpzvc7amh" }, "stable": { "version": [ @@ -1899,8 +1899,8 @@ "deps": [ "consult" ], - "commit": "5dd63fd156577aa7e9a3a631e2f48444565f463e", - "sha256": "09glzw3h2miqlnr1g7311nz909wgdphi50c6j1npzm68vi4xpnyp" + "commit": "a61d593d0cbff65a93111be96b9f53d3e640cf8d", + "sha256": "1pkqr7asz6h4gjkrg8mc8qikxy4agiv0x6ragbasy0xm3q4wxm0h" }, "stable": { "version": [ @@ -2489,11 +2489,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220325, - 1238 + 20220427, + 1911 ], - "commit": "65c496d3d1d1298345beb9845840067bffb2ffd8", - "sha256": "05n68r1f9g0xhffv8da5142c1771ma0lbwh44fqiraw80zjp5ybi" + "commit": "68365b48f142d75ef4bdc3a274256d97752e3b65", + "sha256": "1nf6z5i9gpbv1qdrm7r0qb0mbzipdn9mnfwc478rrazmn2l0m5cs" }, "stable": { "version": [ @@ -2579,14 +2579,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20220228, - 1513 + 20220424, + 1027 ], "deps": [ "all-the-icons" ], - "commit": "21d5859f1412413f165e0ca44f6002902409a9f9", - "sha256": "0a5ny68g82rwjd262ni4dflq1mgv6i99fgxbbp5m2w781mvcgl7a" + "commit": "0fcb43eb440e18078c8faf67c27a2189bbb45dfb", + "sha256": "16g81kx77bn3n5ziksmmmsx9c6fvfw21czanq1pivclpw3vdqscb" }, "stable": { "version": [ @@ -2641,15 +2641,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220411, - 222 + 20220505, + 834 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "b2fc7db5432431e56babb3440c7a4aab8ff0744d", - "sha256": "1620wmakvgnar61np80jsr52gixxir70fmbf70kn2kv0ybza1ngw" + "commit": "7c9db258ba7dd0a8c90eb7cebd335961cc45e031", + "sha256": "0jh46x04n13a2bcfz5vkpwknhc6d6ppfpf39w5v980my2jghs5n7" }, "stable": { "version": [ @@ -2673,11 +2673,11 @@ "repo": "cryon/almost-mono-themes", "unstable": { "version": [ - 20210306, - 1040 + 20220422, + 1714 ], - "commit": "6503bf0e5429a51906fb1db94941a4fa678bf9b1", - "sha256": "0dypf86x9i1lcqn1kqg5dk3h5bs1k5psw2w4al6c6iy9765ws3b4" + "commit": "0641bf565c113caef8d5c2a93f38cff32ebb62b7", + "sha256": "17r605k8zb30l1sl8zy5w753mvzdppqr9lbkidancasvp1p47rs7" } }, { @@ -2715,8 +2715,8 @@ 20220212, 1526 ], - "commit": "68d4f3bc6a29b3941f43bbc8067aa8870023cffc", - "sha256": "14asfxn6sa55gcvlp2ixim742w5c2s0nnk42sjzrx75xsl0fasrs" + "commit": "45deed4b9aadcd5e2a5482b0fe5110bb78ba1dd6", + "sha256": "0g77kdr0lhv2w4gdcmc2bf4ix5kpjg9g358v0kjn26gr36m843j6" }, "stable": { "version": [ @@ -2947,7 +2947,7 @@ 20210221, 1727 ], - "commit": "c48518560815c49d8d78fb9069906d17e883385e", + "commit": "16b0ba14d94a5d7e55655efc9e1d6d069a9306f2", "sha256": "1fzsqd150gpmrj8kz3zy9cd78x9vank7ra720mljhyf04z0h1mj6" }, "stable": { @@ -2958,7 +2958,7 @@ "deps": [ "projectile" ], - "commit": "87760e8326a0e303ca66dda298a79742888b7254", + "commit": "b9ea996c651c43722a5e577f61b5f823f222d864", "sha256": "1l58l0gj3my61yi55hak0c8y26dc2sn8kzbs80v3vsfr6pq916vx" } }, @@ -3229,11 +3229,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20220408, - 921 + 20220428, + 1339 ], - "commit": "a3d42262f518a52e221c038cca3c1630ea90db25", - "sha256": "0vxyqkhdsvl2rch0ln3jbrs6wn96lbwn5bhpgrvr93bh6lzq3zl4" + "commit": "e982a7b74a681a8c2c823d8dcaafd185ab5f719e", + "sha256": "13vnc9qkz2n121yf482sj19daxa262pnp49cy8p5cvrr75narh1r" }, "stable": { "version": [ @@ -3271,8 +3271,8 @@ 20200914, 644 ], - "commit": "505464961f07f0991263708fd8cbf5f7ad12f53f", - "sha256": "149g366ijc7aqglf27xsy806az8r2s8s6p8w8rx4wvdrhds2wpl7" + "commit": "7615aa55068754d36711e19bfc926b87d5b8f33c", + "sha256": "1ix15ff08adkvlpvh6v5cpx6an0y965rm9d06zallsg1wrzr2rcl" }, "stable": { "version": [ @@ -3609,11 +3609,11 @@ "repo": "wanderlust/apel", "unstable": { "version": [ - 20201106, - 2221 + 20220427, + 1121 ], - "commit": "4e3269b6e702db2dba48cf560563ac883e81e3bf", - "sha256": "1b4ljzq4qyslwxxl6n2izghbl20wwzxxvcq5wk111blnwap4kddw" + "commit": "6947dc4605ebbb87762edf7051a78a3f7b5f17c5", + "sha256": "0qfmnrr9v7r78amvi6qd3a3qyiy1hk0jqhj4bmsabifxwlsmbzlb" } }, { @@ -3624,11 +3624,11 @@ "repo": "raxod502/apheleia", "unstable": { "version": [ - 20220410, - 2121 + 20220501, + 2151 ], - "commit": "806210414b84549f1c19d2df94a4a0491a581f2f", - "sha256": "0y3iyd5p0sbwijqhpsnlfrvg3ra19cqkmv9q0jshy74k674gwpbs" + "commit": "50da8cd1a94fbcd6456b2528a9db20a5cfc8ff5f", + "sha256": "12z8vsnxq8bsfbds3d1wbnrkv8i4kcm6l75hr0pnh4jr6yrmc419" }, "stable": { "version": [ @@ -3741,8 +3741,8 @@ 20210802, 1715 ], - "commit": "1221be63e78c6cfe1af31e01b0909eeb08d9cc9a", - "sha256": "0dgzk00kq5a6bxzwjzvhdn9h8vsij5n4in7lni9nv0qmqc0p3hm2" + "commit": "ea9a32aa33580b0695e7298d56c3d5f050a02b87", + "sha256": "13wm9g184lxzf55cwx1cc88d5a17yghbfqsqvyihsb7yv2i2xg8i" }, "stable": { "version": [ @@ -3784,11 +3784,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20220411, - 2036 + 20220418, + 1554 ], - "commit": "0f8ff945942ecb036691ce4400c664a16545c491", - "sha256": "104inw43k4rmrjr4fl64phr3phlmnvdrmqrr7zjiqc1h5rj6qn57" + "commit": "52ed4bf4aaa01c527271d71e6ce00f3607839777", + "sha256": "168z5i0y7rldbqpmxyvi5z19i57l14yhqzzyhl0sv7zdcqa66s21" }, "stable": { "version": [ @@ -4336,8 +4336,8 @@ 20201026, 339 ], - "commit": "bc04527ce11d15117130b3f2932b4ad9176c8062", - "sha256": "09kpk1k5sn5jc6xpsp2imljsi0cbcqxhblsff1bzcksxnmnm3jdk" + "commit": "43ca538ecece4e14bb9bcd887854aeb14b3d45f4", + "sha256": "05l6wbhyh2jy5cqmy0b3bg5klafcc1fcfp5944r9wdah0lpg169k" }, "stable": { "version": [ @@ -4360,8 +4360,8 @@ 20210731, 609 ], - "commit": "d9d3f49fc8c5c650527ff5a0c6e2baa3f62a4332", - "sha256": "0lly3djprmxr6chifr3apsjqkvv39yx8g6572c2hf03242s0663z" + "commit": "e0d11744d9b2bca780322b1b282fb5ffb18cfd75", + "sha256": "1va7fhh4ppb9aily009m6nf43z5l8fdwinsqy46qj81w5apmbpg5" }, "stable": { "version": [ @@ -4661,8 +4661,8 @@ "keytar", "s" ], - "commit": "a5240ecbf07a503ce13a648a02bf53da6aeaffd7", - "sha256": "0f3mgvvfainfmg60rp5bg24mgjx8jjwvvn6mdqf9q6ypbc1bcdxk" + "commit": "09dd28d875dfe9d1ca9bb8ab3ee2f6102a00832b", + "sha256": "13pqis46qxk242yim8l08kzkj0v36jam37rvj2v7z1lallvrk664" }, "stable": { "version": [ @@ -4767,14 +4767,15 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20220407, - 1522 + 20220422, + 1600 ], "deps": [ + "compat", "packed" ], - "commit": "597969e4aa0ef18751d6a51cb59dd06d41317445", - "sha256": "109hmij1y4l4l7j3fyysnjwkxwvqwp5g84jq8jdikrdif4kylxwj" + "commit": "f19e9fbb8d72a47f0cef049b784e1a492bef9287", + "sha256": "0bjq0x7hv1fg4db3wria5lnlliln7598qsc0l42pic34w1qq3h6l" }, "stable": { "version": [ @@ -4804,8 +4805,8 @@ "cl-lib", "popup" ], - "commit": "d515059ea5316c81223f6d969e45b16b47365b5c", - "sha256": "07xp981b1j9igcai930pqfiz16idp9898bpdl623d9175i5dnrjl" + "commit": "d546b18c3e83e38686d9b7316c6c705597e1a8b3", + "sha256": "1fwg2zn7digz22vf22h4kim3wkz2i2wvs42ak12lxg8aa3w6wn94" }, "stable": { "version": [ @@ -5141,14 +5142,14 @@ "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20220223, - 1622 + 20220505, + 505 ], "deps": [ "ht" ], - "commit": "cb52226184bbaf37231c1be2d65466d20949b79a", - "sha256": "1yy03dn9bgmq8r01fr0pl35hmfjy1blxfbq92m4ha8xwjc46x00i" + "commit": "3d60d2c64278f9f933ee78299f6decde2254af7e", + "sha256": "1r5a9a1s0gb1f7dr36bjkf8zch0q7krk0mjikhs4kd2rfga3ba4a" }, "stable": { "version": [ @@ -5297,8 +5298,8 @@ 20210805, 1344 ], - "commit": "84812796da212fd31ac534336d6d2a7a99a0ee43", - "sha256": "03kihmfvihirm5rp9zirbxsxj3xw0rsbc37fg4lkbipiklrw5l8n" + "commit": "85b02fa6ce76ab872c025a82c2f14614af3d89e1", + "sha256": "1rnigp11xlxhzrfwqna0dqrd0a655gs0qf5m6bkzq41ssdvvdis8" }, "stable": { "version": [ @@ -5365,14 +5366,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20220209, - 554 + 20220421, + 1147 ], "deps": [ "f" ], - "commit": "df455f9723fbaab8ab550c7e7df79dc6b2d159c6", - "sha256": "14n77h7w69w0i845dbbq39nxnh1xw28kacp0cgf666r62vgdcvvj" + "commit": "39cb574a4b5ec74ad62857320bf5fec58abe876f", + "sha256": "1h9wh1gd7i0j3lg08l25p1n9pr24x9cyc3j1all4j77phl38sxhh" }, "stable": { "version": [ @@ -5505,8 +5506,8 @@ 20220215, 1204 ], - "commit": "00b87a82c4561b017052974eecd93c79b6790841", - "sha256": "1cnnw2cwhsrlp2nanvcgdpd90vpmzwxnr9sprwfgzldgk9651r58" + "commit": "c439cbe029f7ffeca6de0ea72258069c41350509", + "sha256": "1r7qan2v3kaykacnf98s2zcfb5ryk4jqpw7acrfvajgvdn3w03sh" } }, { @@ -5710,8 +5711,8 @@ "avy", "embark" ], - "commit": "ab778510d5db9935a2d436b13d98c47b824172ee", - "sha256": "1w2jiv8wffm4lf22bkc4znbk20jarnpwl5483jd3bfg712ykqcsq" + "commit": "857c8403529f54bfeecf460fe98b1a0b8e206802", + "sha256": "09rpnr8lxk5gpjx4vbsi59027yggwh68909vqyxhbqqs2d7f9n26" }, "stable": { "version": [ @@ -6043,14 +6044,15 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20220331, - 2327 + 20220424, + 2212 ], "deps": [ + "compat", "outline-minor-faces" ], - "commit": "5610466a2d2d526a8338dd3b2ffabb9031485a42", - "sha256": "0ma1dfr6cf108whh6slgmshyk2aag6q8z2xm9psk6xrka7wm8yaj" + "commit": "0d44408262080cdf998de5a52516f220e7e7c99a", + "sha256": "1l818vv2wh07jxc7wxmnidr8rcbj8526245fsflxp051hpilvan8" }, "stable": { "version": [ @@ -6538,21 +6540,21 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20220328, - 1456 + 20220416, + 405 ], - "commit": "a50c89a6f01be757335e64df322837300c4ced04", - "sha256": "1ymcrpf97prhxdbv4x8nzyb6yn9b1k69xq51l35vmjdvhhdcfhz2" + "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47", + "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy" }, "stable": { "version": [ 3, 2, 2, - 1 + 2 ], - "commit": "a50c89a6f01be757335e64df322837300c4ced04", - "sha256": "1ymcrpf97prhxdbv4x8nzyb6yn9b1k69xq51l35vmjdvhhdcfhz2" + "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47", + "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy" } }, { @@ -6811,11 +6813,11 @@ "repo": "dholm/benchmark-init-el", "unstable": { "version": [ - 20150905, - 938 + 20220414, + 1612 ], - "commit": "7a0f263282bbc86b01b662636306f22813082647", - "sha256": "1kyn1izm5sbqbp9whnhk9dn3yc7zy8bz5san5w3ivi3rpx15fh94" + "commit": "02435560415bbadbcf5051fb7042880549170e7e", + "sha256": "19375vamhld4xm2qrdmhlp2nczfvalmz9x6ahl23zwkilr8n1nbw" }, "stable": { "version": [ @@ -6906,8 +6908,8 @@ 20220116, 2220 ], - "commit": "db2d945c44e26f32a658e9e743dd4b7a0d84b2fd", - "sha256": "0mlga8kk09ir66lqs5xx0bkr51vcc89hxq3ax2vaq1zsvlddl5h2" + "commit": "20ac176ccdc18ff8cb4a6b37cf1fe90fa7f88335", + "sha256": "0sagnkpaify1z6gc5xmw557j8s49z4yvkk2kfdw7q10cz7hy09gl" } }, { @@ -6936,8 +6938,8 @@ 20210715, 1004 ], - "commit": "dbfa68942862f12f1034d08adaccd94fdd81921e", - "sha256": "10g24wxghl15z1dwbvfc9nv9w060zgnm66l7xmcif0333ks1q5il" + "commit": "f04dad824b9879f7382f36780a0151e4ef544815", + "sha256": "1a3s6za2dlavknpmcbkbrdf4a75a1a0qgni3igq1657xfxk658gw" }, "stable": { "version": [ @@ -7191,8 +7193,8 @@ "parsebib", "s" ], - "commit": "c089a1cc87d91611366b9430c2890c628b3342c4", - "sha256": "1vlpq96w4bvbjz4pa3f2l8vs0jp7gb7k7jlhqjbdpm5qv09q513k" + "commit": "ce8c17690ddad73d01531084b282f221f8eb6669", + "sha256": "15b37xa3f9npbqmr9ml9km61v2l04csgnf61kfr5849zj423643s" }, "stable": { "version": [ @@ -7234,11 +7236,14 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20220402, - 1036 + 20220422, + 1600 + ], + "deps": [ + "compat" ], - "commit": "624de5d111adb277ff3fb0d044bf685e24642de5", - "sha256": "02m6n4cscxzzdbifgmlyc1xqn2497dr3m6kklck4p31vimy3qyyj" + "commit": "aad77ba6ce64245570b4baa83b62008522c3ce3a", + "sha256": "1n4cshnq9nfqa4yr126g144725ivc492xw1pw37fhvjcjpmg7g2p" }, "stable": { "version": [ @@ -7391,14 +7396,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20211030, - 511 + 20220429, + 2055 ], "deps": [ "seq" ], - "commit": "8cefdf0959f0da33250044cf4890b69cfdcf0c5b", - "sha256": "0q4cz07s8qzkvnym7ab2l111dk88nfigpf0r3x0jcxx2qivs52s4" + "commit": "127463a7cb8cc2fa9904d3feb3fca95d2244ddcc", + "sha256": "00nizafvpbhzkc5vnwdgrg5f208gwap79av2ayj8zp76fi718yfk" }, "stable": { "version": [ @@ -8031,8 +8036,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20210703, - 238 + 20220419, + 2240 ], "deps": [ "cl-lib", @@ -8041,23 +8046,23 @@ "flycheck", "yasnippet" ], - "commit": "1e3b6a8aee9fa7c113468838c5b647080caf3703", - "sha256": "1h3j7a1y5p90dd1vj4kyngj5xvbr2z4dkzkq74s85bqf61j66yw2" + "commit": "d685a52259f50c2db51205ef9cc93f713ae8d8fa", + "sha256": "1879vjan19kdvfkck1xk30jllwbiqpyc4m3v1v6kmac7gxm10min" } }, { "ename": "bookmark-in-project", - "commit": "9d3b0aba3f67d2ecf3904ec1c3263375ba38a665", - "sha256": "131x0wmv4yv0h220zcyszd19r7j8xmih4848x9qsldqwv3g3n82z", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-bookmark-in-project", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0liii3f5276z76hkhd2g2xkkhx8v8dl6sv5f9w9lac66hz5a7qqv", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-bookmark-in-project.git", "unstable": { "version": [ - 20220401, - 348 + 20220507, + 1118 ], - "commit": "e95aa25b933e705e87b7a9328e89c8cf0898c201", - "sha256": "14vradzbh7rd11427q3kzbwsq3kmy6m8by2bd74bwpkyaw5x44ci" + "commit": "0e08e4bd4fedc87b2371313d55691356bee0ad7d", + "sha256": "1a0wx4hrs954ff7chpadn95dajcmpgrk5j7yv6ppfh1ml4kx11mn" } }, { @@ -8115,16 +8120,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20211217, - 737 + 20220502, + 1850 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "654fb8051a5c00dd524710fbf917b00f6afc8844", - "sha256": "0rhrq2nj1cqcqbnsf0npn5372yi85czi7r1h9lqjbyfgb2ifxvdn" + "commit": "db7b6083d390e3febf82f9af5782e1a36d30093c", + "sha256": "1i6wff18rlhdncm8qaz5zmrl4g5bl4h13yw9y635nlzzailmjjvj" }, "stable": { "version": [ @@ -8148,15 +8153,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220406, - 1207 + 20220503, + 1114 ], "deps": [ "epkg", "magit" ], - "commit": "b4c9081c8c697fdc2fa71cb07adc2f77dc3c27dd", - "sha256": "1cigyvyxpg3740dsjsx9xx6lg7rwxg0xp3icr0cvcxk5nnd7lcfm" + "commit": "cd1fbd60a2ff62bbfca124ea1e602b14c4aa58e9", + "sha256": "0gk53s4r97qf1mps561x1pjcfzc2nkvd6m559kaf03xsbb6w8mdf" }, "stable": { "version": [ @@ -8497,11 +8502,11 @@ "url": "https://git.madhouse-project.org/algernon/brutalist-theme.el.git", "unstable": { "version": [ - 20181023, - 1222 + 20220507, + 909 ], - "commit": "72adc339c433a98e944cbe76da4c45b9ba4400f5", - "sha256": "068a0z66bidzllz8jhkcfqjksjyffhzqkvddpazcbcnj9fq6ircy" + "commit": "c58131f3a8cb71cc0f8efa47766f29578c45bc59", + "sha256": "09kak8szdfbscd0byj1mdgb94ajrrr4kcqf5x3c2bwlgdazr15gx" } }, { @@ -8620,8 +8625,8 @@ 20191119, 1950 ], - "commit": "1ef6f210f38c0686bc5b445b9704190f168f30ea", - "sha256": "054gbfdaqfj5psb3f06ba46x38gd9xak28h1la5b1szdzj61f23i" + "commit": "b8c0c2170c7113b515477b1bb39c58d22aad67e1", + "sha256": "1yplxc6zff266lrncvhlm64b420b1g4p4jbni3gh7ngl6443xal6" } }, { @@ -8647,11 +8652,11 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20220325, - 1659 + 20220506, + 1506 ], - "commit": "ba1c9d24d3f1ba58445cbf1f762ba6859b66f6bf", - "sha256": "0davkvlyqj78i6njhkjyrv4l7qnscysimssbwjsnl4lbk7c1z85k" + "commit": "7b7e5c2a79ad3b31b465387df0ccc18a5809f9d1", + "sha256": "1r4lbz5hadsxw9dkhi10xr54zmsgknmklfmb78yxnvqhwl30kk20" } }, { @@ -8849,8 +8854,8 @@ 20200924, 345 ], - "commit": "10cdf0ddee1af7b5f34b625b395523595390c96c", - "sha256": "0qn2hrh39d9jj7wrz1m3n2rgzmn37jv0x7j9q68fly8yjm77fh93" + "commit": "b918ba023212b0e223a7ca7df3a2ec12a7c54206", + "sha256": "0xj9k2i7dmnqg99k1kraq58fc1kzgvriy08g46zhka3dz2l2m5br" }, "stable": { "version": [ @@ -9751,8 +9756,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20220305, - 1621 + 20220504, + 516 ], "deps": [ "dash", @@ -9762,8 +9767,8 @@ "s", "transient" ], - "commit": "20337d39e3abe4baa38cc0ed5a6c65272df9af2d", - "sha256": "08ix2iq17xsl9dcnf0xik12ykpji77kb5xs91y23w1plfl1pl0zj" + "commit": "a59e8ab65601e30073fa55bef76e95c964c678d8", + "sha256": "15dx3ppqrv1chkjpj0dn463bmhncvl5vy0lg74g6bdbw5z0vhbzc" }, "stable": { "version": [ @@ -9788,19 +9793,16 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20220214, - 1251 + 20220506, + 1214 ], "deps": [ - "anaconda-mode", - "beacon", - "cl-lib", "hierarchy", "ivy", "tree-mode" ], - "commit": "aa5ffb15cec39920012aa526e932d48e5c74bbb0", - "sha256": "12rsylxr9ls6br38vwq9h6fzqsqjxgqwyv76wf6qaazd4rp76m0y" + "commit": "42023e5d1781c75f425e8c72b63b28e53dae6e9c", + "sha256": "029ssw7k9prmh7rv4drjmwzcykrihpqkmkylz0fla40l7ycmdr5c" }, "stable": { "version": [ @@ -9872,11 +9874,11 @@ "repo": "ocaml/caml-mode", "unstable": { "version": [ - 20211226, - 27 + 20220503, + 1742 ], - "commit": "204bfde9ad21cb94c273db8b0c12d31a4eb425e5", - "sha256": "1pn6whyp66bf2a4zj7g3g1ljlzfn0ia1xwb8lclvmjv0ind12zsz" + "commit": "f2f170f46b758341d96385986e8a93b9b4d248f1", + "sha256": "0w9ypvvkm8qx88rldkhysp12inc8izn1qj9rpcchk8xzs0s7sqxp" }, "stable": { "version": [ @@ -9929,11 +9931,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220413, - 2256 + 20220506, + 1814 ], - "commit": "aadf69d01512bf980245ffe073df5710ccdb6385", - "sha256": "0hjj5jw7sa8nqpxbkyvn57f6k70v6f8lc7a2algg9qq8swk0ic6r" + "commit": "e72edf2d6357beb64798ef1894cc807190f80901", + "sha256": "0l6slrbh7sr3r3zgxh4r1r0g2131mvpmy2vd1hrkjf9q9c5hpqq0" }, "stable": { "version": [ @@ -9955,8 +9957,8 @@ 20210707, 2310 ], - "commit": "281aacc18003ae103b8a04ea83d7b6f814c97b8b", - "sha256": "0v245k0fv0dsg706v34rg91h36avfvl3yfddll1gp9h87df04hkp" + "commit": "02dc92c900babbd232fbcdd14f7ccf44d234ee77", + "sha256": "0gar2j9vis9b2wj1fhqahcrmaw867z3pmsn5d70bb8mdr3xq3dmm" }, "stable": { "version": [ @@ -10115,8 +10117,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20220316, - 1557 + 20220504, + 1421 ], "deps": [ "ansi", @@ -10127,8 +10129,8 @@ "s", "shut-up" ], - "commit": "50df921ddb48682da4ca5437a8ed20618ae9717e", - "sha256": "081kvqii4siipkvlfiz4adzpwrqsq47lxxp13yp7mrj9g22p0bqp" + "commit": "2eb520e64c2e1047319761df0bcc6fa5149f8cd6", + "sha256": "1fg8c8wksban6kblrdsp008ga8srhyp7dbhzbk46dgmprvwmxbwn" }, "stable": { "version": [ @@ -10340,8 +10342,8 @@ 20210501, 820 ], - "commit": "5c209e0306364118abf9d9440d7b8b9613183072", - "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" + "commit": "c664b26d0861621ac86b5b5f47835dd84f06dc93", + "sha256": "1qis1wmqdllzj46nsnlqskk0lld1bgn858gk8l03gcy92jrlh1bg" } }, { @@ -10389,8 +10391,8 @@ 20200904, 1431 ], - "commit": "5c209e0306364118abf9d9440d7b8b9613183072", - "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" + "commit": "c664b26d0861621ac86b5b5f47835dd84f06dc93", + "sha256": "1qis1wmqdllzj46nsnlqskk0lld1bgn858gk8l03gcy92jrlh1bg" } }, { @@ -10659,8 +10661,8 @@ 20171115, 2108 ], - "commit": "8a11a6ae40396bac028437b5bb472ac722c54dda", - "sha256": "0pjms66ygx7icwxr3iq1s9m06vr4g6xvrd6m90jjxra78ywbc8ys" + "commit": "9b4331ab42d3e84dea9293ef989ff1b29e97b2b1", + "sha256": "0rmla0fdskaw1lqi73fiicyi7py3bn1xhn4jh46w7dnwmhm3x9zz" }, "stable": { "version": [ @@ -10815,8 +10817,8 @@ 20220318, 1007 ], - "commit": "595be50f2ecdf603b87f9aeed7b8089f4317ad29", - "sha256": "0z4qzy63awxa7q7jflgv3asiixnl9fv162999cp5nfmnyx1jkizn" + "commit": "06011b53bf64d671c74a79757332b9ef13f47f2b", + "sha256": "00znwpkdvs7igi8c7gns7viikal4029prpf1q3c805l2m9m0424g" }, "stable": { "version": [ @@ -11330,16 +11332,16 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220401, - 1453 + 20220415, + 1213 ], "deps": [ "dash", "seq", "ts" ], - "commit": "059579e841148362d5081a43dcb27c8a3c7751ea", - "sha256": "1jrq5rjw8q88vcd82f2z5qfgzj2agb4ywsyflaj04k3fwxqgnwnf" + "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4", + "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx" }, "stable": { "version": [ @@ -11383,14 +11385,14 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220401, - 1453 + 20220414, + 726 ], "deps": [ "chronometrist" ], - "commit": "059579e841148362d5081a43dcb27c8a3c7751ea", - "sha256": "1jrq5rjw8q88vcd82f2z5qfgzj2agb4ywsyflaj04k3fwxqgnwnf" + "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4", + "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx" }, "stable": { "version": [ @@ -11420,8 +11422,8 @@ "chronometrist", "spark" ], - "commit": "059579e841148362d5081a43dcb27c8a3c7751ea", - "sha256": "1jrq5rjw8q88vcd82f2z5qfgzj2agb4ywsyflaj04k3fwxqgnwnf" + "commit": "f7b2defceed8bafb87da704ce3e7774f53abf1c4", + "sha256": "176imva32l766llrj4171r7bb3z5isvprrr5cl28cm41vqg4szfx" }, "stable": { "version": [ @@ -11493,8 +11495,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220405, - 1216 + 20220507, + 1357 ], "deps": [ "clojure-mode", @@ -11504,13 +11506,13 @@ "sesman", "spinner" ], - "commit": "db972bbdfbe777272529ec848c9f1991ae94dbda", - "sha256": "0hvgczbyki9yvip00gx75laxshjbx0lixf3ibc4rj1mfplfvlcxk" + "commit": "69d374818bd0af1489ee8828b258c689ccc24a66", + "sha256": "0r585myfkdsqrmd7fydbfdakwsfh4wq4bkjgngyag8mkam88ms16" }, "stable": { "version": [ 1, - 3, + 4, 0 ], "deps": [ @@ -11521,8 +11523,8 @@ "sesman", "spinner" ], - "commit": "02ca53021682f426323dc7bb4e6b28e6c8f5eb30", - "sha256": "0mxlkxpzn7rzbzpzcw2z9x2ab2zvhrwr8h21kmfn3li3dha73gf1" + "commit": "b2cee7fc301735b403920583cc2c23dcf70990a3", + "sha256": "08gj8nm6qjjgn75aijhkbdhpwfd1qx6fy2c77m8ca99pbqvabmcq" } }, { @@ -11725,25 +11727,25 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20220320, - 1811 + 20220421, + 1956 ], "deps": [ "cl-lib" ], - "commit": "e4c5bb69e6f1338239bdbf66baf57bb610828b2e", - "sha256": "05ddgcgqribdwbph7qkz5r24h1xsbrnhlg4yqgnyyw5kfxayapzj" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" }, "stable": { "version": [ 2, - 11 + 12 ], "deps": [ "cl-lib" ], - "commit": "6ccd4b494cbae9d28091217654f052eaea321007", - "sha256": "0cr9flk310yn2jgvj4hbqw9nj5wlfi0fazdkqafzidgz6iq150wd" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" } }, { @@ -11803,17 +11805,16 @@ "repo": "bdarcus/citar", "unstable": { "version": [ - 20220411, - 146 + 20220508, + 1220 ], "deps": [ "citeproc", "org", - "parsebib", - "s" + "parsebib" ], - "commit": "c94799e9f33e0645b5ac8696e19bdc9328d7cb7e", - "sha256": "1p8jdm08r4gyc7p00i1dp2k52ddhqwxyy7f1wzkpx6rxjbqlah95" + "commit": "9c732e91a4d198d0dc79df7f36524324d383c211", + "sha256": "0xhgp70sphzzskhxznzd2lf38wsdayac82wi8cyfhp0159z5zh0n" }, "stable": { "version": [ @@ -11916,11 +11917,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20220406, - 315 + 20220427, + 1203 ], - "commit": "0ae60846b0b58f09ea463f603bcc3f414a8fb35d", - "sha256": "0wqvsdbasbz0hbw90883683mh5h1h8rcy7qw6qbabdiyigsv2867" + "commit": "87e2cbf3b2ae6d59ec919a2dcb38e56ccfa5ec14", + "sha256": "1wycbcwmls7lf1vn83pwfrb1bhxf8d5p7w25b1c9lrzq7l769i2k" }, "stable": { "version": [ @@ -12139,6 +12140,30 @@ "sha256": "0w34ixzk8vs2nv5xr7l1b3k0crl1lqvbq6gs5r4b8rhsx9b6c1mb" } }, + { + "ename": "clingo-mode", + "commit": "bbc61401703e33521a15cc1711d18c969c87afca", + "sha256": "1c347c6wvhdxr1xsc7vrjr8pg711hya9vxkgy1v37ii7asp4p0wb", + "fetcher": "github", + "repo": "llaisdy/clingo-mode", + "unstable": { + "version": [ + 20220502, + 2020 + ], + "commit": "cf56ce6b5c50506f6cea27e1dde0441dd8d15ee9", + "sha256": "1v3q3zhx7vf81dkyr2z8ljw8as4c8zcycinhx915aqjj85d923h7" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "commit": "9773d4e22acd9ddf6f159ee5634212f4ab4575ea", + "sha256": "1pirscsakm6gnrqj1rw21fwkb8ni61h3bjdzpfldlai054g7knyx" + } + }, { "ename": "clipetty", "commit": "3f6895244ad88e79d9e5d98dd0ba28be96c79595", @@ -12549,11 +12574,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220307, - 1903 + 20220418, + 2015 ], - "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", - "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" + "commit": "b6f41d74904daa9312648f3a7bea7a72fd8e140b", + "sha256": "0s9750x739biwbcc8m09spkvkwlf1nlrdz869imjpkagk0pci7xm" }, "stable": { "version": [ @@ -12579,8 +12604,8 @@ "deps": [ "clojure-mode" ], - "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", - "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" + "commit": "b6f41d74904daa9312648f3a7bea7a72fd8e140b", + "sha256": "0s9750x739biwbcc8m09spkvkwlf1nlrdz869imjpkagk0pci7xm" }, "stable": { "version": [ @@ -12665,16 +12690,17 @@ "repo": "clojure-emacs/clomacs", "unstable": { "version": [ - 20201224, - 1358 + 20220415, + 1035 ], "deps": [ "cider", + "dash", "s", "simple-httpd" ], - "commit": "ffcb122194507593815d67b26f5d2d8ffcc52bf8", - "sha256": "1dqcc5szghqxdhy8r0gq6s7bbv4zq0grsjjfh8n6wmsyd1svrd3k" + "commit": "9cd7c9fd86bc7bc627a31275d1ef131378b90a49", + "sha256": "0aj3739xxv4plyjslvvm7kxa520hn1v0p6f6qpihpx4f24dyh6hm" }, "stable": { "version": [ @@ -12699,14 +12725,15 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20220402, - 1037 + 20220422, + 1601 ], "deps": [ + "compat", "emacsql-sqlite" ], - "commit": "522cc52a4df6b55099888e89a18f48f7c9275c3d", - "sha256": "16kk5x8p0jh9lvn043i5b4pnndrjxipnzz1crbr552qkkh7wy0fb" + "commit": "6f4af0fc87fa0a1734480d6a4b72797c0916bc12", + "sha256": "1azp6gpswqzhvqamh4h1wi8xkby98irj6w3f3ky943a1zlkibq4a" }, "stable": { "version": [ @@ -12882,8 +12909,8 @@ 20220322, 1258 ], - "commit": "56dafdf19906bc19c5f90c0ea8ede02c3b44958b", - "sha256": "0x8q7g2snbisf44mryb3a8j9122h3aqqw2rhja41m8h5gbh0adxg" + "commit": "b541073a447a21c9117375e24d2db6af37dd6cfc", + "sha256": "00phxl6z8vpph6ypbmcckb131ls6g91lq9cjxbgc7878sxcilf6f" }, "stable": { "version": [ @@ -13077,8 +13104,8 @@ "repo": "wandersoncferreira/code-review", "unstable": { "version": [ - 20220328, - 108 + 20220503, + 1344 ], "deps": [ "a", @@ -13091,14 +13118,14 @@ "markdown-mode", "uuidgen" ], - "commit": "85ab2080e489b4ca01c787f5a316ade02a4ee877", - "sha256": "0j0ijnzfd7b3a2jqi94zlky8iqv9g7vj9fx5fd4g2k53ilgapmdl" + "commit": "d38fbe59304ed31c759ce733cda16f69a8ef2d8c", + "sha256": "0ph2kp1yy08g0wr3wm55zisz04lwsrmlgxgsfcnznw0qj5c2d5cg" }, "stable": { "version": [ 0, 0, - 6 + 7 ], "deps": [ "a", @@ -13111,8 +13138,8 @@ "markdown-mode", "uuidgen" ], - "commit": "136c0933ba9dc19ce3efedb36a7dbd401e2e98b2", - "sha256": "1jlzh81m8knms0wm91hgxabpxa9v2v29wi6cvjfbk59xi4fmr8xs" + "commit": "9cf84cd867d27433e0c8097f0d33cb3ade64f5ca", + "sha256": "17n066qs73rqjmjaynhcr5q73azz8584a3vsgbc9sr1flp3sypwy" } }, { @@ -13385,11 +13412,11 @@ "repo": "emacs-jp/replace-colorthemes", "unstable": { "version": [ - 20200729, - 921 + 20220506, + 858 ], - "commit": "a996eca37f4df726eec95406deb76b538320771a", - "sha256": "1fgcd6vdqknqb1s1hwqqspk84a8xnxmrcnlic1j0x558i2yj4l2x" + "commit": "74ad69bbca6fcfff3c0960d888c7c9c1f9f3e2e8", + "sha256": "13ff4s372wsl5x13vh4vywhi6qcc54gybhp6rxl0r1l4wxidanwn" }, "stable": { "version": [ @@ -13544,8 +13571,8 @@ "deps": [ "s" ], - "commit": "3e7e10bfa7124a7d29a79ab1385d2f1f413952ed", - "sha256": "1i719q025nb053mn65rj9r2hxln7drk998nq3j2ib1g89vvj12kg" + "commit": "fa85a6b9d852d725730a6ad1cc5afeb4ede93ca7", + "sha256": "1xmr4gxj3k4vy654270jgs3x8nv72q4hyk7q8zixycnymbqvby5f" }, "stable": { "version": [ @@ -13879,11 +13906,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20220406, - 2323 + 20220425, + 1145 ], - "commit": "1005540b1cdf176cbcf893b2fa83d2075cbbe3ca", - "sha256": "0fh1ym2axvhw25i4g56znsclapr9mvidq9n33cz4gxp4g2l82z2v" + "commit": "d5145006b948f93e673f439a766da01f636d39fc", + "sha256": "0ghdk8iif240bg9pv24837y619g1s19dp3akxqjwr89sj2llhyln" }, "stable": { "version": [ @@ -14337,8 +14364,8 @@ "emojify", "ht" ], - "commit": "2ea893fcf436b1795ebacbb01f3a1ae93ed88dfc", - "sha256": "17xwhipidalj3ai5xl7i1y72qzvyv9d5ab0ql452a99ib8dkxy04" + "commit": "6f095b419468b0443e1dcd8537ef4b84092f155c", + "sha256": "1ssjzhbngb5v7wzh40zzh1j0pfzv0paqync8jvd0diwaz983rwzx" }, "stable": { "version": [ @@ -14441,8 +14468,8 @@ "ht", "s" ], - "commit": "a3a5803ddc77e092db01b4e46288e406e6568262", - "sha256": "1nyw0cd8qjxz3q5iahqr1kg749p9i3vcmwhd5gnv6370knxyd35s" + "commit": "e2e8a39976506cbf149f9c62a69c7a438be09579", + "sha256": "1lra119f4bbx6rhpm118yml6qnqy7s1lj2w1dnm8vbl68r255zyp" }, "stable": { "version": [ @@ -14672,8 +14699,8 @@ "lean-mode", "s" ], - "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", - "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" + "commit": "362bc6fa3efb1874c525ed6b4b6f24f76af22596", + "sha256": "1lr4h555fa1kdi3q7hkhsnznv7nh9rgjqjkbj2bqp9zwh06245w3" } }, { @@ -14847,8 +14874,8 @@ "company", "native-complete" ], - "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850", - "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g" + "commit": "01d8a2048e13f29dd3aa06281ac8cb466caddb64", + "sha256": "069ch7h1fkm2zvw6nfndyrpxp9s2p7x3d0acswaa7isynygwkcy8" } }, { @@ -14971,8 +14998,8 @@ "cl-lib", "company" ], - "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", - "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" + "commit": "f34e09783b77d1158ea139b7b3d8034bc52b0b9f", + "sha256": "1qi529lg3y5l4wrzfyk0w2fz36mpd432bp39s859z4cq06yybxga" }, "stable": { "version": [ @@ -15144,8 +15171,8 @@ "company", "prescient" ], - "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", - "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" + "commit": "d9b30d741c729a37eb2c6e51d72281c0844780ca", + "sha256": "1n9sa0wvw8yhq2l82hfpx1pgg7lmphd18xrjx6jfqfdkna9j3a8j" }, "stable": { "version": [ @@ -15226,8 +15253,8 @@ "company-quickhelp", "popup" ], - "commit": "c438a75d229d2803299207e9bf8a38fdea30c0c6", - "sha256": "1wid4sy5qizxng1hfmh821x3dj9fji2i87vzfww491bd99nq2d00" + "commit": "75a2f5c7669833646fc653cabd531737b52fb469", + "sha256": "0zkjicfa5dlzq2834p70ks3mr48086lf0dlr0r5df7jrw8wrw8c9" }, "stable": { "version": [ @@ -16086,19 +16113,52 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220412, - 1243 + 20220508, + 928 + ], + "deps": [ + "compat" ], - "commit": "af452dc5d429e15fb1228dd6967d592f1c483640", - "sha256": "0b87i9v4mdd9ay1kngsylp725vkw9wvi3r1mqd6gb49ygs9bz6f6" + "commit": "1dfdf55f3d941f08089e5d0e611cd9daa8a44b19", + "sha256": "1hsxavf55xmy91xmv8yh6fb4aphv6sv947hs35ghvfm5s74sk47v" }, "stable": { "version": [ 0, - 16 + 17 + ], + "commit": "f517b70dd8a3be0b8c883633f2a7721448b40f0f", + "sha256": "08l3h7b5j1q9nwcq660667b245qspl20ikhfdvd9k3g3n2p6p5kz" + } + }, + { + "ename": "consult-ag", + "commit": "9fa648ca3822e65ee14fd8a8b294a80e5e7c3110", + "sha256": "138n5jlm9pw63s74vvvp7vbkgpgiv07dhlvi3yx26zdlm4xks0vp", + "fetcher": "github", + "repo": "yadex205/consult-ag", + "unstable": { + "version": [ + 20220419, + 1721 + ], + "deps": [ + "consult" + ], + "commit": "2460ae6829e86c9f1186a852304d919526838cb8", + "sha256": "0f5m66xgmm306ifh794q65wm4wwyayfgvm9fn1kip7aj86n0snfh" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "consult" ], - "commit": "800824601b610016066991d6e2dde198d4b0ad8f", - "sha256": "1mravx5aapy8bcgk6nvi1jvb5jgl7jsn7pd7br7v7fqadcp225m6" + "commit": "2460ae6829e86c9f1186a852304d919526838cb8", + "sha256": "0f5m66xgmm306ifh794q65wm4wwyayfgvm9fn1kip7aj86n0snfh" } }, { @@ -16128,15 +16188,15 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20211007, - 2352 + 20220505, + 1037 ], "deps": [ "consult", "project" ], - "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", - "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" + "commit": "d397ca6ea67af4d3c59a330a778affd825f0efd9", + "sha256": "07gq5ja8qzzar0qyl1ii6g3sy78mmzh3wnq868s2dhh18vxl5335" }, "stable": { "version": [ @@ -16173,15 +16233,16 @@ "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "consult", - "eglot" + "eglot", + "project" ], - "commit": "2d0e08e92bccc5ed247d4e9244c5c9ee69207e2c", - "sha256": "01bjgabrw7kq6xy6m3b4assn7g5paq74m253pxrjzqa86rqh44sx" + "commit": "0da8801dd8435160ce1f62ad8066bd52e38f5cbd", + "sha256": "1qxk1npxbf8m3g9spikgdxcf6mzjx6cwy3f5vn6zz5ksh14xw3sd" } }, { @@ -16223,14 +16284,14 @@ "repo": "OlMon/consult-flyspell", "unstable": { "version": [ - 20220227, - 2210 + 20220419, + 2044 ], "deps": [ "consult" ], - "commit": "2e7b99dec6c51259d0bffbae3e863f4054dd2346", - "sha256": "1cj3ahxdihi4v4x5qsn1lgacl7dzswy79qli23zrkxaw78x8is0i" + "commit": "396def174495cc77413e2065ef79658a02490dad", + "sha256": "1yvxzkp81yn5k3z1fdkayhb3cn2x92z7wfxcxrqxlasjz9nax5cm" } }, { @@ -16265,6 +16326,24 @@ "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" } }, + { + "ename": "consult-ls-git", + "commit": "af90413953b4b6a4d6c1b9919835703035b565d7", + "sha256": "0vrvcjyjq3f4zs2jdyfk82xhr4n8yw5mxhrsmmd0ljhcqp6zxbmf", + "fetcher": "github", + "repo": "rcj/consult-ls-git", + "unstable": { + "version": [ + 20220501, + 1823 + ], + "deps": [ + "consult" + ], + "commit": "f2398b354994e583ad22af324a129cf94d06009e", + "sha256": "1brvhnlw72vhxjf6d984pjf5sq6l7d6vpnhzq2swp3zz4a5sfqvx" + } + }, { "ename": "consult-lsp", "commit": "c2d4a871be8f52fcfd24c3823382a983d9dcce46", @@ -16273,16 +16352,16 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20220409, - 1107 + 20220507, + 856 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "a8eb3a062feb2715f174500d0624d3a85e000cf7", - "sha256": "12yq494xd256fsqzlvcpv70i6szyvqchhrw9wnkw320ciim815sw" + "commit": "19606a03cf854e1b0930c4526ed92c4560dccdc2", + "sha256": "1g4wimqghcph6jrk9y7sqk2pqppx63n4z0557fpgwd57x62rl7zv" }, "stable": { "version": [ @@ -16306,15 +16385,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20220408, - 1923 + 20220421, + 717 ], "deps": [ "consult", "notmuch" ], - "commit": "5e952b540552dea5965929711a716775b9a0dc74", - "sha256": "1jg05qng54j8m5rnvp8x5fv9ib4i8ba2g569vjgazjq20g6b3lc8" + "commit": "16eb2c100ca144140f07014c32e99487c6a73e18", + "sha256": "0ynla60n7aksp8fqikpsxv45li68ccgklr3xq601z3zyiyjg54a2" }, "stable": { "version": [ @@ -16337,15 +16416,15 @@ "repo": "jgru/consult-org-roam", "unstable": { "version": [ - 20220410, - 632 + 20220508, + 1232 ], "deps": [ "consult", "org-roam" ], - "commit": "53b50493309a8f5e4dcc3951ec341b3124fddbf6", - "sha256": "00bc1padsnw6dmnfabl90p4qj8709446vvmb8i0gbk5a36m2yjn0" + "commit": "05cec288f931a1f3cd5984b88a79f1339110e4b9", + "sha256": "0ar9qfkigwpifca05020p4144d6qh42milwz8wrn8ylxwsmm7v0m" } }, { @@ -16356,15 +16435,15 @@ "repo": "Qkessler/consult-project-extra", "unstable": { "version": [ - 20220228, - 843 + 20220424, + 1815 ], "deps": [ "consult", "project" ], - "commit": "897f2f71a94ce1b72c3bf823e14791a332befbb7", - "sha256": "1c0nllj6hhgvjf7zzy44iacnl29flg54ahb26r4bi9lip8aw65xs" + "commit": "fa882a0bf9b697ebb59d0dfa2ffd81ea6daabf41", + "sha256": "00gf7fam9gfll9s7bw7bna64y1ynmlhqf4jcbkfhj02laff2virf" }, "stable": { "version": [ @@ -16386,15 +16465,15 @@ "repo": "OlMon/consult-projectile", "unstable": { "version": [ - 20220310, - 1840 + 20220505, + 1139 ], "deps": [ "consult", "projectile" ], - "commit": "df85d0f83c323f4672221c9e78d84027bcb9d96f", - "sha256": "178405z6vasr44p1rg1n1ar4vwbvp04n5fnyma1j327lp8lbppmi" + "commit": "8e618bc62405e345cc59e891f82d8ee45691010a", + "sha256": "1mpj0sxy1x8333h88av4nmawy5amgbszxfzc653w3325s6x39xnc" } }, { @@ -16737,14 +16816,14 @@ "repo": "galeo/corfu-doc", "unstable": { "version": [ - 20220407, - 1556 + 20220429, + 1348 ], "deps": [ "corfu" ], - "commit": "07307b68a3e22537cc16e0b326b0212c6e8bc58e", - "sha256": "08bv49jpnm9yi890ppzsnajy7n21mhjm9bm2z5pp0qyj0zlfq9gf" + "commit": "5a6f4f879de6dc2ca6e22789878d416e88e85905", + "sha256": "1rvymrs2vgcqr05xij719fyv5hd3bi34f8aragcabbiwbmjfhz7z" } }, { @@ -16832,8 +16911,8 @@ "ivy", "swiper" ], - "commit": "7489968257a74f176c0d1de7ec8bd1e2011f0db4", - "sha256": "0gmgfv9d5vicd5lqcbzn0i6qfjw42whhww6hdqch2pgkhl4i1ria" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -16870,20 +16949,20 @@ }, { "ename": "counsel-at-point", - "commit": "76600c160b01ac365ba6fed2304128961a8761cc", - "sha256": "1sq9jfzrbr5jai25irkz2nlpj20vw2la8hfchp3zf94vkcvswv27", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-counsel-at-point", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1bcgsyin3y33r91m89kfx9q7c9d0qx7ga97dcpzdnrvbhav9k2cs", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-counsel-at-point.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], "deps": [ "counsel" ], - "commit": "28b26ecac676d6a3942f1b96d2916f4c23d9b3ab", - "sha256": "0dmr5aa74kziwmf8w1jr38lb23yir0mff2wjiidgpxm452pwwrqy" + "commit": "f618411fc8f607e4c93b5efa98584fd461c53ac6", + "sha256": "0jidrijrb28j81w7jhsl87vjagvq5x4h144cynd2kiyb8y2qpg2s" } }, { @@ -18041,8 +18120,8 @@ 20211124, 1105 ], - "commit": "856ecbc0a78ae3bdc2db2ae4d16be43e2d9d9c5e", - "sha256": "18s3vj4hkxdmzbch4zh943p4fbm721kmh91vdkc2fjgpilr2imk3" + "commit": "fa06dfa206812476217ada6c4178de34ff1efc42", + "sha256": "1d8capbzdr69sr4xhz2l8aczys1ry5ns1k873575wp8xfdp02ppq" }, "stable": { "version": [ @@ -18150,11 +18229,11 @@ "repo": "zenozeng/css-eldoc", "unstable": { "version": [ - 20150125, - 323 + 20220415, + 1629 ], - "commit": "c558ac4c470742c98a37290e6b409db28183df30", - "sha256": "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx" + "commit": "73ebf9757a043b56b7d3b5befec5a38e6754b9e5", + "sha256": "1x2lvq8fqxsybny24d4jnnwn97j652i931qgi5y99zz2f0bvg2gj" } }, { @@ -18287,11 +18366,11 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20220130, - 2307 + 20220501, + 2234 ], - "commit": "56021fd53efd775d91db2730e4ab4d5c157c513f", - "sha256": "093ximdpb9bzrnayc47is6i6jya8s5jkq7f8njnqd07hh5bm3l20" + "commit": "efe9534747e056b210e359c3abc67ef94a8ea5ad", + "sha256": "12i6mis37196c13jw5wnybfhdkhw3cfny3v0l98ksp6ki6sr2h5w" }, "stable": { "version": [ @@ -18469,6 +18548,30 @@ "sha256": "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn" } }, + { + "ename": "cue-mode", + "commit": "5c0c13b152f9099cb92a431e374864eee3ca3808", + "sha256": "1ykhgxk0rcwpdqmjgbf47d9vsmml4wbbyrrkr8lzki4hfllzdcyp", + "fetcher": "github", + "repo": "russell/cue-mode", + "unstable": { + "version": [ + 20220507, + 1728 + ], + "commit": "598c9b33b888e067e7472710a5f159cee98a0307", + "sha256": "08px1mxpsl5n7yd8pgkpj0xkmhfvhgppbwwrjm59wgnaiq0mw8sf" + }, + "stable": { + "version": [ + 1, + 0, + 8 + ], + "commit": "598c9b33b888e067e7472710a5f159cee98a0307", + "sha256": "08px1mxpsl5n7yd8pgkpj0xkmhfvhgppbwwrjm59wgnaiq0mw8sf" + } + }, { "ename": "curl-to-elisp", "commit": "11453864d71c7853bc743341db7ca071126ca160", @@ -18653,20 +18756,20 @@ }, { "ename": "cycle-at-point", - "commit": "033260c71bef524da774f7b51e744b919f1a7145", - "sha256": "1h8ar6dhfk2irbk90hnbxp1l5lmb48rr6r7yj24c9yc8manxyxjn", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-cycle-at-point", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "065jpz2c6mlx133wr41k7gkig4ygxy5i0a1j5rapiyrskg8dcyfj", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-cycle-at-point.git", "unstable": { "version": [ - 20220406, - 1340 + 20220507, + 1118 ], "deps": [ "recomplete" ], - "commit": "4637a9288028f3eaa31cfa9658cfe78f423b16cf", - "sha256": "11s016kcv15p8001xivimjlrc7h9xiisa47s769wq1n93csq9749" + "commit": "85750fa695797b95608b331b64ea49d81f7c8a36", + "sha256": "1cf5mvkwy208dlc4jlax9cb9ffl41aibcpsbfp0sv8ibjrnsaldd" } }, { @@ -18752,8 +18855,8 @@ 20211111, 1407 ], - "commit": "d2d2ea33a21e1915a52790ef64fdd1f28867854c", - "sha256": "13ckyzfw8y2skdx9ynwn4m0cpmcd13qr4fxdymaxfid7x162i62r" + "commit": "d4cbe45b38695cd27c56ea0b786c52caa4e164de", + "sha256": "0z1bdrs5v6rxgbakawzcv57llsccgmc6lch0c31qss6dchih9y98" }, "stable": { "version": [ @@ -18919,8 +19022,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20210301, - 1738 + 20220429, + 1454 ], "deps": [ "company", @@ -18931,8 +19034,8 @@ "lcr", "s" ], - "commit": "8741419333fb85ed2c1d71f5902688f5201b0a40", - "sha256": "1i4rz1lp78wzn8x9xgjar8h66csdkf5836ny8lwd68m7z5gh0w21" + "commit": "b81081c2eb8dcbd7e67e05cf5e1991df6cf3e57c", + "sha256": "0cr9d2kbikal1np7j0zd39ldhpicsn9xb7iqfbl4dgksnf8jc5rd" }, "stable": { "version": [ @@ -18960,8 +19063,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20220325, - 1144 + 20220507, + 1711 ], "deps": [ "bui", @@ -18973,8 +19076,8 @@ "posframe", "s" ], - "commit": "f918c0580bd17105cbe50aa701a2375abca5a6ab", - "sha256": "12wnvj6bnz9xx9skzqjmldn9ak0pxm46b2g7ishj7q810fg5hzws" + "commit": "d534b4a2f9ec3f9e4d804a660830764bed062e15", + "sha256": "1ww9hlwa3912gkny16chvk4s7qzn2sl0hf81dijismxwwlpcmhid" }, "stable": { "version": [ @@ -19221,11 +19324,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20220404, - 2004 + 20220417, + 2250 ], - "commit": "dc61f4641779616122692e34a32ba2a158ee034c", - "sha256": "1lhcqlmysqlv38i3nx09bn4ad8q3ly9r5i0ba0lx3a1al94djmpl" + "commit": "7fd71338dce041b352f84e7939f6966f4d379459", + "sha256": "1q2p51348bpg35h9c9cg21k27c7svh52qvi6zlslvnig7wcx662s" }, "stable": { "version": [ @@ -19300,8 +19403,8 @@ "deps": [ "dash" ], - "commit": "dc61f4641779616122692e34a32ba2a158ee034c", - "sha256": "1lhcqlmysqlv38i3nx09bn4ad8q3ly9r5i0ba0lx3a1al94djmpl" + "commit": "7fd71338dce041b352f84e7939f6966f4d379459", + "sha256": "1q2p51348bpg35h9c9cg21k27c7svh52qvi6zlslvnig7wcx662s" }, "stable": { "version": [ @@ -19327,8 +19430,8 @@ 20220409, 620 ], - "commit": "126743bb77c02d12d4f7e3678cef47d6a836cbc1", - "sha256": "168cxkwray5b30nlc77ypmb1z3f3s258psvkb6lxyyc6xfswcjv9" + "commit": "09290bf700cc269ad3c07d9518cd758b90971fcd", + "sha256": "16in48zcxq2zdlz40zf6nxi87xk6a6p14fms9z931rcilhl5p2d8" }, "stable": { "version": [ @@ -19376,8 +19479,8 @@ "deps": [ "dashboard" ], - "commit": "2b0bf850e893c87380ae0b64d887db0b3a3fcead", - "sha256": "0l9ijqia6z0miwpfxzi3pab90bq9iirc2b8aansly6jg4ybihmxj" + "commit": "d8c435ac251ec6493da10882cb161c0e9df03b91", + "sha256": "1dca3s6lj19x0vrmqgw7d4wlqby528lal2q1nvq2zm159y6r6bv6" }, "stable": { "version": [ @@ -19657,15 +19760,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20220305, - 522 + 20220501, + 2005 ], "deps": [ "ccc", "cdb" ], - "commit": "5c209e0306364118abf9d9440d7b8b9613183072", - "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" + "commit": "c664b26d0861621ac86b5b5f47835dd84f06dc93", + "sha256": "1qis1wmqdllzj46nsnlqskk0lld1bgn858gk8l03gcy92jrlh1bg" } }, { @@ -19707,16 +19810,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20220209, - 719 + 20220507, + 1755 ], "deps": [ "dash", "s", "spinner" ], - "commit": "0a3ba239c458ffc4f63a180b43d0e70b81742a3e", - "sha256": "0xavp98da1hr0jsq5dr2h4rfs5y1qgnv3b3pnpc08rfj1h4x211b" + "commit": "ae333e4069e296e98bf9631088c8198f50891d55", + "sha256": "000s08mwadvdwcsisw741pv3l5znii7qbdc2865i8ywbj5b3dadb" }, "stable": { "version": [ @@ -19907,17 +20010,17 @@ }, { "ename": "default-font-presets", - "commit": "3b8b731674a5c5d4f83d998258a5d4c9aabb2048", - "sha256": "0hracb7krwgpnispnjgi86zaywq08mc3c8cyaxl82lc8jc9b05j2", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-default-font-presets", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0dwdga1qk49l72yhmjxphlqzbxykxm70h64j534ffl2i1gjzkzff", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-default-font-presets.git", "unstable": { "version": [ - 20220214, - 2326 + 20220507, + 1118 ], - "commit": "1727055b59e21e91a5b72356968232e31a92f743", - "sha256": "098s8s9j8gvzkkyx6ivd84bi0dmf2p6a3nlz215ljl43l97134pw" + "commit": "7117ddadafcf0264c19b7a6bb912d52efe5553f9", + "sha256": "1m2l7ngrf8r4z873dir2b6ivbq2hqb8041bmd9xy76rwyy40v7x1" } }, { @@ -19975,19 +20078,20 @@ "repo": "jcs-elpa/define-it", "unstable": { "version": [ - 20211216, - 719 + 20220414, + 932 ], "deps": [ "google-translate", "popup", "pos-tip", + "posframe", "request", "s", "wiki-summary" ], - "commit": "63095df0b1b55207a6b51b745ca00bb152dbedf6", - "sha256": "1nmmwxg2yfliqhdy9c7d8dfcqiwzw84hd4a8a7jy9cq4ribpavgh" + "commit": "51fd884c52faf61339aef3a3429fe91672b3e6a8", + "sha256": "10ch8ds5d27kry1ih2cwyp5pl2dlhwwfdsr0smpd1r23i74qlhmm" }, "stable": { "version": [ @@ -20287,11 +20391,11 @@ "repo": "DamienCassou/desktop-environment", "unstable": { "version": [ - 20210129, - 2018 + 20220425, + 1834 ], - "commit": "2c3e0750c11485931f447ea82f80bc90ae07aeba", - "sha256": "0ciha9q6j0fp0197ga0ifi4j527sp2pk6862mm70skpfv6bm8dx2" + "commit": "2863dc3d66aed9052c8af39cc8c8c264be300560", + "sha256": "1cn17igd9dwbqrds7k3p8lkfg4gq5vh6rqkmmjyagnaklj793van" }, "stable": { "version": [ @@ -20460,11 +20564,11 @@ "repo": "radian-software/diary-manager", "unstable": { "version": [ - 20210404, - 1821 + 20220508, + 128 ], - "commit": "0fa122be62dd296cefe23bcf5074cc6159bd9868", - "sha256": "0zhhfba9ak7j713xp2qhxfdc3h9a9a1grp1nprlz7qnz3pkl2rjj" + "commit": "c538504e606208fa902d040e54188072df6193d0", + "sha256": "1j10wl00mgfpw3554jngkmn44z4s28m5qvw3lg0zgca50xkjnyqa" }, "stable": { "version": [ @@ -20584,32 +20688,32 @@ }, { "ename": "diff-ansi", - "commit": "6bbfb72c3db4f774ffab9cf273b26e23fb027ee8", - "sha256": "0k25pfxm0w7i84z1qfzd87l75hv43m89ajaq7bl2ppq2h1fwf880", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-diff-ansi", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1mgn123nf8rq5ayphgvdgdz64ybrqsn9vcjy3hhw5d3dijy6i992", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-diff-ansi.git", "unstable": { "version": [ - 20220323, - 106 + 20220507, + 1118 ], - "commit": "39b39a7265c59e413ff32f1fccebe4dc1a7a966e", - "sha256": "1kw2fvkfydyc8fbwqf4r88qgzrl85qzypjwzklkpwsawdpp6vzs2" + "commit": "bfcce7f609a95b4b5e11c384c75fef8c7c972b95", + "sha256": "0gddzdx0f6l982ij9q2ljm9dbpjrwi12glxhqr599jnxnlcrxshn" } }, { "ename": "diff-at-point", - "commit": "d342698c94e145ecfebf204c1099dbe765b39c71", - "sha256": "1gjjnxafsxrhpxz3zs5kbdmy5wmhcqqfkgryzzc0mmm9iqbskd3j", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-diff-at-point", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "06j1yhl3b2vnm04p83ha1d2z26rr2wj54qbxhfwp0d1w77zrzjf2", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-diff-at-point.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "819da8d75762e1fb1a975d78c2b4666506048485", - "sha256": "1l3q7ks4ylr85ywyrg49hk0wvzlj97rznwmqsf74awgfcl1cy7nk" + "commit": "aabb96b2b59f0e0d94d7b6889fa30016927ea03d", + "sha256": "1zmk2yycsphhz8mqa3ffa3mk6x0cxvmpld7kpa0bn1sp1w8xvssp" } }, { @@ -20620,14 +20724,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20220405, - 2359 + 20220506, + 2102 ], "deps": [ "cl-lib" ], - "commit": "9d5dc2ffa1e4c7b43734b03dccb5ae6a80800569", - "sha256": "1mk0lqfgln23zqx4fc1z6vv2wprmksjv2cy7yyrj8qvkm29fqm94" + "commit": "14f2db367e8023ab0027713315a38ecd703afdbf", + "sha256": "0ciyg1g9sil1pvmd53r57gyds85f11457anjcfi96p4jjyjg9sxx" }, "stable": { "version": [ @@ -20728,11 +20832,11 @@ "repo": "ber-ro/diffsync", "unstable": { "version": [ - 20220408, - 1341 + 20220502, + 1513 ], - "commit": "32a3e64bec16b34c3df4dc41d3df09a2ca2dc63f", - "sha256": "0znbk21nymmiq5hprvqly0w6dfsbsabaqnqkgnncc35cqm2qx8cl" + "commit": "3f8540ef0a677ea8c2b57aaf4a07937512bb148c", + "sha256": "0hgyi8s7f5r87y48a6x427xm8nkr2rms6fzsdjp840ma39pj7n2f" } }, { @@ -20899,11 +21003,14 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20220101, - 1042 + 20220422, + 1601 ], - "commit": "63471f8798157d15776fc8d9470796e56d1a415b", - "sha256": "0m06fmq7ldxd5gsk25w4wcwin06x13y37gl0lcdapn902rly4l5g" + "deps": [ + "compat" + ], + "commit": "09073e6bfd21f3a7f8fcf1e2e7c49994cdee7d2a", + "sha256": "0g8wdsf8rbyl2z9h4d40hjxqp3krj3vkrwwc3j36pzrc48ms2wl1" }, "stable": { "version": [ @@ -20979,8 +21086,8 @@ 20220218, 1541 ], - "commit": "94749f5095353343ce458f08ba4cfeb880b4bf24", - "sha256": "044zjpp37a3ciq2dhfpzjnvc408ch53fpszl9zsj7c0gv9npd2jg" + "commit": "3b3b24eb231af889b0eea50e6e0a20c2bca9c439", + "sha256": "0x2vx80rx8mcj1jf6p7qbf1sfy4zymnrbpkm1gzrs8k4jibmwyz7" }, "stable": { "version": [ @@ -21064,14 +21171,14 @@ "repo": "tilmanrassy/emacs-dir-treeview", "unstable": { "version": [ - 20210625, - 2358 + 20220505, + 27 ], "deps": [ "treeview" ], - "commit": "c48b0e12eb02ae046cf6dc97fe006db31ded3f2b", - "sha256": "07hhy41h1qx38rrf6f9b2r13chs3v4mzyplhpx1r6wjrj0nmh2pv" + "commit": "fa0b795b36740755ec37f5b41c3a734ad702e5a1", + "sha256": "17r27gvapc68dwyd4diw406k9nx2slicshdl923swqzyxm2c75vb" } }, { @@ -21175,19 +21282,20 @@ "repo": "juan-leon/dired-efap", "unstable": { "version": [ - 20140122, - 1656 + 20220421, + 1535 ], - "commit": "624757b2e54d9a13e2183118d6c113e37684b90c", - "sha256": "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv" + "commit": "360b369cb19998c6730ee1debfbec3edb7f349a9", + "sha256": "07yfks2gj15fw0arrf0nyh5ip8kjc46fyrgpdcviwr6lk739c3jk" }, "stable": { "version": [ 0, - 8 + 8, + 1 ], - "commit": "2b849bc5c09d0b752a177495ea1b851ee821f5bf", - "sha256": "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv" + "commit": "360b369cb19998c6730ee1debfbec3edb7f349a9", + "sha256": "07yfks2gj15fw0arrf0nyh5ip8kjc46fyrgpdcviwr6lk739c3jk" } }, { @@ -21854,11 +21962,11 @@ "repo": "purcell/diredfl", "unstable": { "version": [ - 20220103, - 1744 + 20220508, + 805 ], - "commit": "59f8e5bf5c2991aa54a471f61f14d77976db194a", - "sha256": "1ai5hxy87ljz6ch8blj4khm4v9clqxmrfhh5m5hnz9kd7n3d2wyh" + "commit": "62b559e1d6b69834a56a57eb1832ac6ad4d2e5d0", + "sha256": "18ggh4x7gqdnrdaknd4vkd34jgi8aw5s7r3a2xv54p8z22ipxrhh" }, "stable": { "version": [ @@ -22022,11 +22130,11 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220413, - 1257 + 20220508, + 1705 ], - "commit": "78ba565d1aa476d76e799876716ea2ff79a6aadc", - "sha256": "0p7r3vj8vjhbw3kxw9i1210l3fvhg0hm2pp1a0jamn3a7d31534l" + "commit": "75d5abb62670dac0dce3e43e8dbe2e42b7abe6ab", + "sha256": "0li4sgwv68w70dfig4r1y4ksax88ffwbhlqri8wps2kaa9786gny" }, "stable": { "version": [ @@ -22680,17 +22788,17 @@ }, { "ename": "doc-show-inline", - "commit": "4439485b5c582bc6a72789d07ca3b033c6195f3a", - "sha256": "1j1bwm5hfzcq683rl8k9362vlzxnddcqhmxsinwq2c9c7md8hfrv", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-doc-show-inline", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1d2mkk6a9r395vh4iyjdhzwzhn8wp1f9b3p56gls8sdqjpfwavk1", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-doc-show-inline.git", "unstable": { "version": [ - 20220314, - 57 + 20220507, + 1118 ], - "commit": "42954390621f281930a70104162db1bb70532a1b", - "sha256": "0nvk10nh2mkw430zdr0m2cnqzvi48ah32k8zay4lh0qgz4jl2kdy" + "commit": "0cceb39df31fd578cfc95d756f667874e6321001", + "sha256": "108w5v4mw7wj1ahg0bhh7bdvg31hq5iqgyjiyf9zdm02wnmz8jhh" } }, { @@ -22953,8 +23061,8 @@ "deps": [ "s" ], - "commit": "604999a4a40d0599808fdef99612740c143cc590", - "sha256": "1a9kwy6p5dw1kvdr9d52kgxn6w89xxn3r2p9y6hxl4f9s923j70a" + "commit": "bb7485d24a4fb147fc7fc7fcd1e1c7ddd3ff64b5", + "sha256": "18h39vrr66y0m16nfax6646qlnw1l0qd5c7dqpnr060ma52sbfkv" }, "stable": { "version": [ @@ -23122,8 +23230,8 @@ "dash", "shrink-path" ], - "commit": "7d8eb7c44087a62d8dd6e8ba1afc26facd914fbc", - "sha256": "0y050g6qgzzw7krabgw0gx2dx6mv7kkzy5y501id37cgryhws483" + "commit": "85bdd9ed8674710f6b9815e9a1c41ad4b5a45ace", + "sha256": "1wmy080z709mn29w7h9m17a18jnr6a8dzip92k86kcg5z3mjg5ki" }, "stable": { "version": [ @@ -23167,14 +23275,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220222, - 2326 + 20220504, + 1557 ], "deps": [ "cl-lib" ], - "commit": "83fd9545c2823b4b2610947802fa3a52995517b4", - "sha256": "0jrmmdz7s6jlq7h6dpxfgx1wvvzwam3rq5dgsqqcn383d9i7zbmb" + "commit": "e9bdd137116fa2037ed60037b8421cf68c64888d", + "sha256": "178ri980kwkndb73dawhsfr1dkl6xjdb451z0iar9ghk8z0r0wpg" }, "stable": { "version": [ @@ -23639,25 +23747,25 @@ }, { "ename": "dtache", - "commit": "6e0f64b768c13fb873dc1dcb849770b7b401603d", - "sha256": "1sw5wciadijskzp4cczik36ak08xx7491bqgjhbg2vf2yyg09sbz", - "fetcher": "gitlab", - "repo": "niklaseklund/dtache", + "commit": "0d69cbd12938e72bcaea6b2a79385f48a462713d", + "sha256": "08cmfhjdn30wnyfypx5qjscbi4wbfvypxnwfrcx09nn137qc3h55", + "fetcher": "git", + "url": "https://git.sr.ht/~niklaseklund/dtache", "unstable": { "version": [ - 20220320, - 1338 + 20220501, + 931 ], - "commit": "e7d143df8a8f88cbbe0fa023cd1fc30219598d88", - "sha256": "02bpghhjcgfgcrlkvsrj652ki558pf9q5vj6j056lalfhcrckpvd" + "commit": "9becf3a921a0fde3a6e5d6f30379cf3d9826d565", + "sha256": "0h2kr7clrn0knws52dm5h7pmx2ws5bm1y3z4xmrhsc1vrv4rlk16" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "ecf4c57d96eda400d9b2d5cfeaa9244993ae3603", - "sha256": "1ii8zggw3db5nrkfnfhqsa7w7676bq3vl0z8larwhb34q6shi655" + "commit": "4ecda689e4ccddc23805a22484c95c4f3f65e3bb", + "sha256": "0lrj4dwcrx3s9mxnik9h9cppqjdfnbnlknfa40qwhlzxdvhxmfmq" } }, { @@ -23853,17 +23961,17 @@ 20210909, 1010 ], - "commit": "a27ffbdbd6153db839fdb01495753f2556759640", - "sha256": "0kl1b8g64gv524g8ys5rimy0xm4bvvr7c7s4q4qcyjx5h51fpa45" + "commit": "9ccfc6122533ab8ed80e0c4587b582baa214c6d5", + "sha256": "1bgs80aw6jhrwpx7y56mxpx921hap99nxhiaq5ccjql6wfm47mzi" }, "stable": { "version": [ 3, - 0, - 3 + 1, + 1 ], - "commit": "68c36597dfb99187ccbadf578988deaf690c4e25", - "sha256": "1ndn560fg0fg8n3wplmkg5px69h0g38pyma9wik85cmmqfxry14k" + "commit": "09eac98ced1fff7dea4e5ac45b59e00c1874067e", + "sha256": "0ljv4gnalxq77byic23c8hrjmsqvn87gqj0ijm7rdx4xr1pff1jg" } }, { @@ -24619,25 +24727,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20220407, - 2003 + 20220430, + 2219 ], "deps": [ "parsebib" ], - "commit": "6a044c9cc3429ff6c4072be1c184e0c6ffc49b58", - "sha256": "1isv6gmqcfqxlc8nsflsm4z266x8x56w3msj4skz9nvjljyhgd77" + "commit": "0e243a78f435038dda31953c5b48cbddf2a89e27", + "sha256": "14br20mzxg84l8nbzglkwvam9ac1xlkdm6dpdfxw5ri6lkcd2bpf" }, "stable": { "version": [ 2, - 34 + 35, + 1 ], "deps": [ "parsebib" ], - "commit": "5d4012c1f1d47d2ab03e2280ad2b600ff40ce545", - "sha256": "0al846i1dn5wrx3r0ak63m80g9j9xk2q5cpcpk63lq0l0gfdff2m" + "commit": "a338d8b2007e9353a5ced6c98f12f3332e153f12", + "sha256": "0b8nb0pwpq0j5g7rgmdhjp4g9za4ppzxp7b3swkqr06vvhn7db7v" } }, { @@ -25147,8 +25256,8 @@ "cl-lib", "nadvice" ], - "commit": "1d4acc3ec73609990eabacb59c038708bc401003", - "sha256": "1blx38fyfl1zgfh5k1mgsnxxjlski7f0n890kiyjbaw2ba9zzmgr" + "commit": "1f6f16c24fd0030322d59c2853067a6dccc9e736", + "sha256": "10dm6igma7kqjpr6q1amncdixf58m81khwckjm5c3l8fn7svla55" }, "stable": { "version": [ @@ -25303,8 +25412,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20220312, - 2132 + 20220415, + 1722 ], "deps": [ "auto-complete", @@ -25315,8 +25424,8 @@ "popup", "s" ], - "commit": "d815148f22ed194116dcde63a0150919e380ecd6", - "sha256": "11x1607fcpxzrf8kqi364qiiffbpwpwld0w9x0mjfsphyvdpg62g" + "commit": "5c096ecdf9462b125f2eb4092899ff63636cfc40", + "sha256": "1l97a55kg8dcvbdv9c2bk1acz4y9vl3x68mbybhbm0rs78170hx3" } }, { @@ -25511,8 +25620,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220406, - 1459 + 20220503, + 953 ], "deps": [ "eldoc", @@ -25522,8 +25631,8 @@ "seq", "xref" ], - "commit": "2c34dae387c583aa307615779ff570a84d5e723c", - "sha256": "1wzl0vj5fvxgm3j596vmczjazdn1ix6dgh4fvg3zn25i2rbxa7l0" + "commit": "f8556b7e76ef7086191c469979274e499d992aed", + "sha256": "011i3afyxqfs7nidm7f0p4gb3v62fhxzvq2jhlygla5fz7bf36ww" }, "stable": { "version": [ @@ -25557,8 +25666,8 @@ "fsharp-mode", "jsonrpc" ], - "commit": "454a4ac3efaec2109178c3b0ca7392ce2818ec26", - "sha256": "1zdah0d52806bkbm24lz0hl9z97224w1k6r8c0fbyyi16265ghc3" + "commit": "5208b54098c7534f4768b87c5f4c8a01b638737b", + "sha256": "04s37djxzy8v5xwc5hh8gq37zh7f6ih3y07g07q2fc39rk1xslpd" }, "stable": { "version": [ @@ -25647,10 +25756,10 @@ }, { "ename": "eide", - "commit": "d952fa4c9b2ee754a14cea8aa818142f80f11eea", - "sha256": "0ylnjvyb598h6pq1x14ysbg5x9z773lvx2jlzrq6gwvfpjbzfb3q", + "commit": "932b2461a32c23477bffbc981cb26d9eb437cd76", + "sha256": "13n0mwfjxpjjndlmxlqpzpajjn0jcfgxhln0gz7z4p87myln6wsq", "fetcher": "git", - "url": "https://forge.chapril.org/hjuvi/eide.git", + "url": "https://forge.chalec.org/hjuvi/eide.git", "unstable": { "version": [ 20220316, @@ -25692,8 +25801,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20220324, - 204 + 20220419, + 735 ], "deps": [ "anaphora", @@ -25704,8 +25813,8 @@ "websocket", "with-editor" ], - "commit": "e04e1e19c63667e6847ae6341ab7fc7488f5eb8c", - "sha256": "16f1ka02n06li4griyrviv9bwzvj4s5fk7i2kqa5mkg0gibxmawc" + "commit": "388c8f753cfb99b4f82acbdff26bbe27189d2299", + "sha256": "03idq7z0ry3mjvsw0w3acnsnfjijqkp9lr1v1xn5jn3s58ciyw80" } }, { @@ -25740,8 +25849,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20211119, - 1910 + 20220414, + 1329 ], "deps": [ "clomacs", @@ -25749,8 +25858,8 @@ "direx", "spinner" ], - "commit": "b8d534cec8f75dc95961dca72e39a096c5eea980", - "sha256": "0xl6mb1s70ljb5wkd41qrjvr0gdnds4yli2y3mmrcvry0cp3kp0f" + "commit": "5c6341c751da9c7dbed43eafc8e99f456c1de0d2", + "sha256": "0809fv33w9lnlfj46adm2jvy5fmhvinhkxr0pkmvy3ppnc1ira5k" }, "stable": { "version": [ @@ -25814,20 +25923,20 @@ "repo": "xgqt/emacs-el-fetch", "unstable": { "version": [ - 20220404, - 2144 + 20220426, + 2053 ], - "commit": "2af3483c4ced80c22f0b4ccabdea06d87a23b5f9", - "sha256": "0jqmh7ivn6vaxsni4adxzyd8df4z6j6jf4iqfn88cqci7ddh7zjb" + "commit": "f9d396437ee0cc5362a80b8ce11e15cfe4d2d510", + "sha256": "0gldjrggh829cllad5hzgi5my5c98c1qf6nkbyrc144ds79qnpj5" }, "stable": { "version": [ 1, - 0, - 0 + 1, + 1 ], - "commit": "3ccb2619e75c966b1bf1ad8a68919566be70042f", - "sha256": "0jqmh7ivn6vaxsni4adxzyd8df4z6j6jf4iqfn88cqci7ddh7zjb" + "commit": "2350ae0bf7ed6a98b63c25b73ce8862528ac3a1e", + "sha256": "0gldjrggh829cllad5hzgi5my5c98c1qf6nkbyrc144ds79qnpj5" } }, { @@ -25970,19 +26079,19 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20220115, - 34 + 20220417, + 1946 ], - "commit": "83bd1378ce4a920ce708e15f1d2caafe30d41a79", - "sha256": "1xpk4c3m5d89n2v2xfn55mj2qv60pb0rpx8ghbcsdyd04ir1llp6" + "commit": "d4f4574bcf4005f4fbafde8874cb19b907783956", + "sha256": "0qkx7f19kl85n56bp3q40200a6ynpkhimcnb3k6x4n6idn6ff2pa" }, "stable": { "version": [ - 2, - 4 + 3, + 0 ], - "commit": "7378385a81ad9f033ee5033e0010c96f9b396b55", - "sha256": "0vankik1dh2yd554h59s5vlzanwx8sx9j31kr15830m3hfgikygz" + "commit": "d4f4574bcf4005f4fbafde8874cb19b907783956", + "sha256": "0qkx7f19kl85n56bp3q40200a6ynpkhimcnb3k6x4n6idn6ff2pa" } }, { @@ -25993,15 +26102,15 @@ "url": "https://git.sr.ht/~zetagon/el-secretario", "unstable": { "version": [ - 20211208, - 1038 + 20220422, + 2005 ], "deps": [ "hercules", "org-ql" ], - "commit": "4ac85deae0a2c5f76337cffc0744c8373e5d8f5d", - "sha256": "0rl31hh80xfdgawpfpwfpnbhbphc43h5immk36p6cv357nb2xj4s" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -26019,8 +26128,8 @@ "el-secretario", "elfeed" ], - "commit": "4ac85deae0a2c5f76337cffc0744c8373e5d8f5d", - "sha256": "0rl31hh80xfdgawpfpwfpnbhbphc43h5immk36p6cv357nb2xj4s" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -26031,15 +26140,15 @@ "url": "https://git.sr.ht/~zetagon/el-secretario", "unstable": { "version": [ - 20211214, - 1851 + 20220422, + 2006 ], "deps": [ "el-secretario", "org-ql" ], - "commit": "4ac85deae0a2c5f76337cffc0744c8373e5d8f5d", - "sha256": "0rl31hh80xfdgawpfpwfpnbhbphc43h5immk36p6cv357nb2xj4s" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -26050,15 +26159,15 @@ "url": "https://git.sr.ht/~zetagon/el-secretario", "unstable": { "version": [ - 20211214, - 1851 + 20220426, + 1905 ], "deps": [ "el-secretario", "notmuch" ], - "commit": "4ac85deae0a2c5f76337cffc0744c8373e5d8f5d", - "sha256": "0rl31hh80xfdgawpfpwfpnbhbphc43h5immk36p6cv357nb2xj4s" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -26069,16 +26178,16 @@ "url": "https://git.sr.ht/~zetagon/el-secretario", "unstable": { "version": [ - 20220328, - 1246 + 20220411, + 1419 ], "deps": [ "dash", "el-secretario", "org-ql" ], - "commit": "4ac85deae0a2c5f76337cffc0744c8373e5d8f5d", - "sha256": "0rl31hh80xfdgawpfpwfpnbhbphc43h5immk36p6cv357nb2xj4s" + "commit": "c28a4f42829ed1f96a17abb63a8616216db913a5", + "sha256": "0s4smf6ldwivardvwnilg0p109dh51s04hqn6dna5qr9gal3ff26" } }, { @@ -26301,19 +26410,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20220313, - 1510 + 20220501, + 1128 ], - "commit": "bdc729893ccfc52b2b7369624111cc175e4ce0b9", - "sha256": "1yii555k43v94cqlxv2n9k1d6pz3mjg1sc1zgpbnx5gqhzfk7m5r" + "commit": "7275089749779599d87bee878e5103921ea919f9", + "sha256": "07p8qz4fx2gvgk46sl076w1rgqmdpbxsn54m330627sla5wk5bpf" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "deaf16e832bbb4665fe5ccf825422566ce489ad6", - "sha256": "1y7ngdj2icn8zw5qpjxqj3j9dry4lb7ixgxa148ss5bgsl8pgqnd" + "commit": "e08d0135a7b484686a969f5987f07bc72285ded4", + "sha256": "1ipjrifscjynrbf0nm4siyv57cd7jdi0v16kb2byv9y0yr481ag1" } }, { @@ -26324,11 +26433,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20220228, - 631 + 20220506, + 28 ], - "commit": "c0cbb8d9191a1df8a289aafc8cb94a3ebb515d6b", - "sha256": "102z9wl7d563x7i44zhlc81bi7k030rlzfgs5cm8vbmalgqv1c63" + "commit": "8d523f4fddbd8986340cf76f349ab18c0b3d5581", + "sha256": "0sa97bxkl04s3kg1fd6c6dynp9jklw74jkgny2qhk1d2lzc64bja" }, "stable": { "version": [ @@ -26488,14 +26597,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20220313, - 911 + 20220417, + 809 ], "deps": [ "dash" ], - "commit": "8bcc6b02722adb21d3698df46db2426718aebf70", - "sha256": "0xh658xwx5bbzak4axdrwx90zv9vmba8lwcma4m7scinzwhnjfx5" + "commit": "f567f03da4a55d6eafa0e6e148ca4884d5370498", + "sha256": "1km5ghqldd0avbxr9drps6pik51yfkh2dj2gg4z7jkyvi8i0cxkm" }, "stable": { "version": [ @@ -26723,8 +26832,8 @@ "repo": "remyhonig/elfeed-org", "unstable": { "version": [ - 20210510, - 1219 + 20220420, + 1234 ], "deps": [ "cl-lib", @@ -26733,8 +26842,8 @@ "org", "s" ], - "commit": "268efdd0121fa61f63b722c30e0951c5d31224a4", - "sha256": "0krfklh3hyc72m9llz3j7pmf63n4spwlgi88b237vcml9rhlda5b" + "commit": "e6bf4268485703907a97896fb1080f59977c9e3d", + "sha256": "1md7nxayysd6pkxyp85jmmz3jh6civpd3y0qgn0zq865jcjv86l6" } }, { @@ -26745,15 +26854,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20220126, - 1404 + 20220419, + 1358 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "d2e22f5506bc75dbf4ca42ac87257fd1b259dd66", - "sha256": "0zmalhdd4xbn9wc5dmk4511ha955smrjpmzknwkwhqn8npgbj4m5" + "commit": "eaf1329ff221098eb6d4709245010d070c89b173", + "sha256": "14zn3h7v9vygi6syjnywd5j56xlqv4a1z2grlkgrr0jd0y427jzk" }, "stable": { "version": [ @@ -26777,26 +26886,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20220202, - 201 + 20220428, + 123 ], "deps": [ "elfeed" ], - "commit": "3448413280d5e8fce0d8098476d246c6c584771d", - "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m" + "commit": "419de17d681d75789271b8457509fa3f942eab54", + "sha256": "1mx134xj9n73v55i0yjn86zn19sg93m95gqacs2c6dxzq1v3q14f" }, "stable": { "version": [ 1, 2, - 2 + 3 ], "deps": [ "elfeed" ], - "commit": "3448413280d5e8fce0d8098476d246c6c584771d", - "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m" + "commit": "419de17d681d75789271b8457509fa3f942eab54", + "sha256": "1mx134xj9n73v55i0yjn86zn19sg93m95gqacs2c6dxzq1v3q14f" } }, { @@ -26807,15 +26916,15 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20220331, - 1634 + 20220506, + 720 ], "deps": [ "elfeed", "magit-section" ], - "commit": "517cea6cb6fbf95ef3cb062591364bb7bda8c251", - "sha256": "17ir0kmb6v9fyl6ink2mc25fxf0hs2kbcpfaxwcr8kz087n2bz7n" + "commit": "641a453cfd03e098b5e6376e035eafd080b08781", + "sha256": "00sxk4pf58678lhjmzdi42dkiiszpnnjhv0dwdgi60mc31d7kqdc" } }, { @@ -27038,15 +27147,15 @@ "repo": "gonewest818/elisp-lint", "unstable": { "version": [ - 20211018, - 212 + 20220419, + 252 ], "deps": [ "dash", "package-lint" ], - "commit": "a5ae046c35a898a88eff05137fe9e5159ae610d8", - "sha256": "0vzgqjsx8crikr13r87vczjr47sh2xm3hckqc10s6b26hc2jbxrv" + "commit": "c5765abf75fd1ad22505b349ae1e6be5303426c2", + "sha256": "13g3nknb3rdq941avrjczvaa75jv7mdln4i65rwhz0nyh2sd6jnd" }, "stable": { "version": [ @@ -27538,20 +27647,28 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220411, - 818 + 20220503, + 833 ], - "commit": "ab75cffa4572115c3d6b17348b6bfa2f746f4798", - "sha256": "166fjq9d883hifa35zklyjrm4c575nd6zxdx7akbwibrgwi65bl0" + "commit": "bf0dd36eb2f5b339c6b561dbe3ee9693565b484b", + "error": [ + "exited abnormally with code 1\n", + "", + "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-e2NiTqKt/elpher-bf0dd36/.git/\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nUnable to checkout bf0dd36eb2f5b339c6b561dbe3ee9693565b484b from https://thelambdalab.xyz/git/elpher.git.\n" + ] }, "stable": { "version": [ 3, - 3, - 3 + 4, + 1 ], - "commit": "ab75cffa4572115c3d6b17348b6bfa2f746f4798", - "sha256": "166fjq9d883hifa35zklyjrm4c575nd6zxdx7akbwibrgwi65bl0" + "commit": "bf0dd36eb2f5b339c6b561dbe3ee9693565b484b", + "error": [ + "exited abnormally with code 1\n", + "", + "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-e2NiTqKt/elpher-bf0dd36/.git/\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nfatal: unable to access 'https://thelambdalab.xyz/git/elpher.git/': SSL certificate problem: certificate has expired\nUnable to checkout bf0dd36eb2f5b339c6b561dbe3ee9693565b484b from https://thelambdalab.xyz/git/elpher.git.\n" + ] } }, { @@ -27941,20 +28058,20 @@ "repo": "knu/emacsc", "unstable": { "version": [ - 20210302, - 806 + 20220420, + 1042 ], - "commit": "409fc548bb650c6e832b459c756b13de68147117", - "sha256": "04k3gnfhqy0i4vb03k1jr3r43sfpxs6dyx863gsgz6qnkkbqrydn" + "commit": "199c08147ebe98da1004c478c92ba8866950b637", + "sha256": "0jmbvpqbywp25dgyq0pxxpggvcjkq8lpff37374if1rhiyj0qac2" }, "stable": { "version": [ 1, - 3, - 20210302 + 4, + 20220420 ], - "commit": "409fc548bb650c6e832b459c756b13de68147117", - "sha256": "04k3gnfhqy0i4vb03k1jr3r43sfpxs6dyx863gsgz6qnkkbqrydn" + "commit": "199c08147ebe98da1004c478c92ba8866950b637", + "sha256": "0jmbvpqbywp25dgyq0pxxpggvcjkq8lpff37374if1rhiyj0qac2" } }, { @@ -28094,15 +28211,15 @@ "repo": "emacscollective/emacsql-sqlite-builtin", "unstable": { "version": [ - 20220331, - 1934 + 20220422, + 1605 ], "deps": [ "emacsql", "emacsql-sqlite" ], - "commit": "0f7b7b02fb9a49fbebda2c0f830f2e43dd1e22d0", - "sha256": "063j84zv4zfhbgszkjy4ldqbh9ij11sfpd5l6a1hyr81ywrq45j8" + "commit": "5501f7b7577dc8aa968c0d2183d081f334ad051a", + "sha256": "06wi7z526gxqa763i214z19nx399ijx8arjyg33j1mj6bssjpys3" } }, { @@ -28113,16 +28230,16 @@ "repo": "emacscollective/emacsql-sqlite-builtin", "unstable": { "version": [ - 20220407, - 1931 + 20220422, + 1605 ], "deps": [ "emacsql", "emacsql-sqlite", "sqlite3" ], - "commit": "0f7b7b02fb9a49fbebda2c0f830f2e43dd1e22d0", - "sha256": "063j84zv4zfhbgszkjy4ldqbh9ij11sfpd5l6a1hyr81ywrq45j8" + "commit": "5501f7b7577dc8aa968c0d2183d081f334ad051a", + "sha256": "06wi7z526gxqa763i214z19nx399ijx8arjyg33j1mj6bssjpys3" } }, { @@ -28259,11 +28376,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220413, - 2146 + 20220507, + 1654 ], - "commit": "ab778510d5db9935a2d436b13d98c47b824172ee", - "sha256": "1w2jiv8wffm4lf22bkc4znbk20jarnpwl5483jd3bfg712ykqcsq" + "commit": "857c8403529f54bfeecf460fe98b1a0b8e206802", + "sha256": "09rpnr8lxk5gpjx4vbsi59027yggwh68909vqyxhbqqs2d7f9n26" }, "stable": { "version": [ @@ -28282,15 +28399,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220413, - 1944 + 20220507, + 143 ], "deps": [ "consult", "embark" ], - "commit": "ab778510d5db9935a2d436b13d98c47b824172ee", - "sha256": "1w2jiv8wffm4lf22bkc4znbk20jarnpwl5483jd3bfg712ykqcsq" + "commit": "857c8403529f54bfeecf460fe98b1a0b8e206802", + "sha256": "09rpnr8lxk5gpjx4vbsi59027yggwh68909vqyxhbqqs2d7f9n26" }, "stable": { "version": [ @@ -28438,16 +28555,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20220315, - 1727 + 20220422, + 1318 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "dd1ee74db3325d6a27e14df7ae882b5cbd84989a", - "sha256": "0s50ap75wsjapxdby7x2gk85jnsr6aaf0l1vzpb6ax96ag92d4lm" + "commit": "22f3d9e5359c565b33f55715f90fbde35e4f675e", + "sha256": "17lkc5r0zg7374fv9fqmnpdwvcyjl6q61gnwrvj3wc7ng5njjihh" }, "stable": { "version": [ @@ -28730,8 +28847,8 @@ "emojify", "request" ], - "commit": "97848eefd56b569e6090f9f09d4f1c21c57a4249", - "sha256": "1mvxdlr0a4rwjy0pj4n7rp00q80ah8i6cyz62wlyp942aazmjp7j" + "commit": "434ccc9df8eb884f248d5934e7d465348bb203a4", + "sha256": "07mbh3a34qcb1d37fvy3g5z3mc436lc5vlqqk46x7bjwdbkzlsfs" }, "stable": { "version": [ @@ -28939,11 +29056,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20210120, - 201 + 20220426, + 1750 ], - "commit": "e960bf941d9fa9d92eabf7c03a8bbb51ba1ac453", - "sha256": "0qmklr7d6g98ijd4l4j65x7cx18aafngppvynr4jvlinzsnr263q" + "commit": "f240ac00ccbbd0916b5e3d272c0064a26f527ef8", + "sha256": "0xh0849sr87zbmf7pqgaix6rbwsmkwpw1vqcvl9mxjqlr2ay9y05" }, "stable": { "version": [ @@ -29188,14 +29305,15 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20220402, - 1046 + 20220503, + 1115 ], "deps": [ - "closql" + "closql", + "compat" ], - "commit": "eb16c8ca8cfe989ac085d335c9b17f2c496fd29f", - "sha256": "0wfhjz5dcws4vg8xj58qs60pr27nh1kwskfg29wcfq4gix4v701l" + "commit": "384222d9396f14e6b36a8d67abe6b3ede7418f0b", + "sha256": "0dmpwhk8ym6adsnfdb0qphksqmb20pwssxhzab528wylz5hcny1k" }, "stable": { "version": [ @@ -29218,15 +29336,16 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20220131, - 1328 + 20220424, + 2211 ], "deps": [ + "compat", "epkg", "marginalia" ], - "commit": "6e6bf0c552e27416dccaf90cb2abdd37f244c2ff", - "sha256": "063cjypy35argxr99g23hfhls3bd04k6ywa0r5zb8721vcd6qrkr" + "commit": "73519c62db12c17804bfbcdfb0a6028389374bec", + "sha256": "0r3pxnd0rbfafzfmjln37c0njs1pnn6rzfblvbmplscyzqw7iqgy" }, "stable": { "version": [ @@ -29345,14 +29464,14 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20210913, - 145 + 20220424, + 350 ], "deps": [ "dash" ], - "commit": "4d6ef75a4d91ded22caad220909518ccb67b7b87", - "sha256": "11xfr71y78idcn461p4pz7b0k01nhz15cyl97bjqq6ii5xhbhvdx" + "commit": "ea5c0570f58b8e62249e001ed434a1056a50abe7", + "sha256": "0l85xks1m8yprd5q84gp0ryaagjd74kwb40r0mwdly6y4dzi0kvr" } }, { @@ -29840,8 +29959,8 @@ 20200914, 644 ], - "commit": "505464961f07f0991263708fd8cbf5f7ad12f53f", - "sha256": "149g366ijc7aqglf27xsy806az8r2s8s6p8w8rx4wvdrhds2wpl7" + "commit": "7615aa55068754d36711e19bfc926b87d5b8f33c", + "sha256": "1ix15ff08adkvlpvh6v5cpx6an0y965rm9d06zallsg1wrzr2rcl" }, "stable": { "version": [ @@ -29865,8 +29984,8 @@ 20220215, 1844 ], - "commit": "ca880f9bdde00289e3e8563712a84d164abf7654", - "sha256": "0danaqzagnmgj8i9645pk3963qg7y79kiipmivhjyrksi2llgg9g" + "commit": "76c8ad7cf3c0c2c0d940ec1ad170c156f89213a1", + "sha256": "1w8l0j4mxasrw5y5s65mph48h44mw2ybxb5vjmrzvr7qbwdvrs5a" }, "stable": { "version": [ @@ -30540,14 +30659,14 @@ "repo": "iostapyshyn/eshell-vterm", "unstable": { "version": [ - 20211024, - 1443 + 20220506, + 1212 ], "deps": [ "vterm" ], - "commit": "f2212dbfa51aa4b67efda55304b2b3811e8e0625", - "sha256": "02q1iyh77m7vg9cip7c9wzpiggnsbhhicfs5rqzpc5d7n70gbk2p" + "commit": "4e8589fcaf6243011a76b4816e7689d913927aab", + "sha256": "0hsby6ardi9g37agh181sgvsdvjmvi1n6jsqp34mwslwx7xxjvbv" } }, { @@ -31048,15 +31167,15 @@ "repo": "tali713/esxml", "unstable": { "version": [ - 20211122, - 1657 + 20220506, + 759 ], "deps": [ "cl-lib", "kv" ], - "commit": "23c9684af4c0548dc00e28fd7b504fcfd43abb5f", - "sha256": "0sr31xarr8d9711x3mhy2p2wh6f5mk7j39sr5233b9qkq9a4k947" + "commit": "7ac1fec0e45f12836b301fd9b8e7297434db2f70", + "sha256": "040a9i202pxjxj34c6f49fj6rg70xha2ns6047vj3gcsa72ylm4n" }, "stable": { "version": [ @@ -31416,8 +31535,8 @@ 20220412, 921 ], - "commit": "b3f8339f9564a1926bd8b71c163fa7660cc3b1f4", - "sha256": "17lbrcgddrxw111a8al3i5cgnksmkv1qi0wzqzmvvggq073mvmqr" + "commit": "8706c55f3b7c267c15b8f10170ecec9998b3cc3d", + "sha256": "0rgmfwdjv3i9v67f22k03x2rfgx12yzkjbbk4307s93qdpqqha78" }, "stable": { "version": [ @@ -31436,29 +31555,28 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220413, - 2212 + 20220507, + 902 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "05714e8daacadb7603a05ffe81d1fbda7439a748", - "sha256": "0240j6xqvy6mpsj4id5xs1i5g9scipa40i02m29c0m4nw8alyg11" + "commit": "61a680042f422be715b42ceccb2418847c5f6b65", + "sha256": "0imcxr2lq1bqpcbqv97lly904iq8iz30gry1qgj4phmksji73b42" }, "stable": { "version": [ 1, 14, - 0 + 2 ], "deps": [ "cl-lib", - "goto-chg", - "undo-tree" + "goto-chg" ], - "commit": "4dc63903d9688e2ce838a220b0e24d8f14a64c12", - "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p" + "commit": "162a94cbce4f2c09fa7dd6bd8ca56080cb0ab63b", + "sha256": "1mhm1hd6gzxc2vvihh1w1j8f30xp0ssqcxnp8fx22niz04fk5df8" } }, { @@ -31638,15 +31756,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220414, - 250 + 20220505, + 619 ], "deps": [ "annalist", "evil" ], - "commit": "ceac1a9681cb47de35aa37d63532b1b92cd58b72", - "sha256": "1w77sbfgpyhg0631a3f8lfi4qg5ncqalklkx21fpx2195lsjhd17" + "commit": "9707efcae4fc76fa204b1c29565aae35b99b865a", + "sha256": "0iyhxmaiqk0c72lmggv9jppxmlkb0vd9y0zqxgzjnznz9p08l3vz" }, "stable": { "version": [ @@ -32204,26 +32322,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20220404, - 221 + 20220414, + 1316 ], "deps": [ "evil" ], - "commit": "1884276feca8bd927a371760673b0f99d734e1c5", - "sha256": "12as39q0ya1174h867fkz3g3vph8mdni6k0mbdfb8r3l6x7rw6sl" + "commit": "b314e816bacfc01bb7df9b19a06b18638af5cdbe", + "sha256": "01r85bnmqbmvwlhv5ihglp0dhws1g2wsw2vy0vsw5mi5mmx2xsqr" }, "stable": { "version": [ 2, 4, - 3 + 4 ], "deps": [ "evil" ], - "commit": "1884276feca8bd927a371760673b0f99d734e1c5", - "sha256": "12as39q0ya1174h867fkz3g3vph8mdni6k0mbdfb8r3l6x7rw6sl" + "commit": "b314e816bacfc01bb7df9b19a06b18638af5cdbe", + "sha256": "01r85bnmqbmvwlhv5ihglp0dhws1g2wsw2vy0vsw5mi5mmx2xsqr" } }, { @@ -32339,11 +32457,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20220404, - 301 + 20220414, + 1201 ], - "commit": "29ced6fda6a76771a8a054ef55c13a1330793d4d", - "sha256": "0xnm8i23c2p3mdf4xxjk00766ygvysk7c8iib2jkah5pfg6jc9vb" + "commit": "95ed1ad2448e7f49f1ee417061b61edbb69a0749", + "sha256": "0hypgk03yksvgakx24mrz9nrx2z0d691ls80by2fw96788d68k8x" }, "stable": { "version": [ @@ -32773,15 +32891,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20220403, - 1639 + 20220428, + 1432 ], "deps": [ "cl-lib", "evil" ], - "commit": "1444065e3fb637ec3c976ce68a4679625713b1d5", - "sha256": "1lzjw22fmjhw1ivnn9053n3zicnb8k2jgwyzvyv6x29fvqhw5xgb" + "commit": "c07788c35cf8cd8e652a494322fdc0643e30a89f", + "sha256": "06zhpsmn67f2n0f2yqzcv978l10nkvdr25kkl3cwkhhj9a56x62g" }, "stable": { "version": [ @@ -32867,13 +32985,13 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20220412, - 1724 + 20220504, + 802 ], "deps": [ "evil" ], - "commit": "2bc8aa6425f1311e985cf51ea6b5233c1ee6ce1c", + "commit": "c9e1449bf3f740b5e9b99e7820df4eca7fc7cf02", "sha256": "1ghc10rsrfvmd7m5qf7695gz241v9m5c2fg2mflwy8pw0h2l9nki" }, "stable": { @@ -32940,14 +33058,14 @@ "repo": "7696122/evil-terminal-cursor-changer", "unstable": { "version": [ - 20211225, - 600 + 20220422, + 255 ], "deps": [ "evil" ], - "commit": "3d7db4d6b4a3121ffd7e505b12ea94fcdb8c5df8", - "sha256": "01haj9b1vhgmnc12csdfsw0lwv2kvgka9k0smlcc6rr840aapi72" + "commit": "69d562932f9ab9869ab1ed923e9789cbfa0ff14c", + "sha256": "14d9hyv2hhv0vzvmq5m1d59imzxmlm1qc484kn3sbc99553q0s1x" } }, { @@ -32958,26 +33076,26 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20201008, - 1515 + 20220425, + 2132 ], "deps": [ "evil" ], - "commit": "05714e8daacadb7603a05ffe81d1fbda7439a748", - "sha256": "0240j6xqvy6mpsj4id5xs1i5g9scipa40i02m29c0m4nw8alyg11" + "commit": "61a680042f422be715b42ceccb2418847c5f6b65", + "sha256": "0imcxr2lq1bqpcbqv97lly904iq8iz30gry1qgj4phmksji73b42" }, "stable": { "version": [ 1, 14, - 0 + 2 ], "deps": [ "evil" ], - "commit": "4dc63903d9688e2ce838a220b0e24d8f14a64c12", - "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p" + "commit": "162a94cbce4f2c09fa7dd6bd8ca56080cb0ab63b", + "sha256": "1mhm1hd6gzxc2vvihh1w1j8f30xp0ssqcxnp8fx22niz04fk5df8" } }, { @@ -32988,15 +33106,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20220412, - 639 + 20220415, + 842 ], "deps": [ "auctex", "evil" ], - "commit": "ae397c8bfe8d16e54e96a9955273b767fc2347fd", - "sha256": "1lz787yshg8zadd9bplx0cppn4ch7sfrwppa5spivnysnnxh876k" + "commit": "26035ec9a09f8b38ce0d495ff788e83ec8b195d5", + "sha256": "0agaibr21ncrv7zv1x24za2v4x35ihp0jv33z7zmgixqmlq074i5" }, "stable": { "version": [ @@ -33167,15 +33285,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220404, - 1501 + 20220423, + 947 ], "deps": [ "evil", "tree-sitter" ], - "commit": "e5fda8eca926e65f7aadc9ed27d768eb6d1d415f", - "sha256": "00r744a9yym36by50d94xarnk0pcdvikka65681j1wrwcxv9narm" + "commit": "bfdef5a292f7dde36967bb86eb2f7009b03631b1", + "sha256": "18nxwn051rq2r4jhc21hy2lmla7aghc2l9cvj7ib97q2l4f0jv64" } }, { @@ -33204,8 +33322,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220319, - 1652 + 20220425, + 2355 ], "deps": [ "avy", @@ -33214,8 +33332,8 @@ "tree-edit", "tree-sitter" ], - "commit": "774a1e9598617f334fcd31aa606c5e738012fb60", - "sha256": "1bc51pmrr37yf116vmw436y2gidr5410ya2vlylrh3scssyd6zgw" + "commit": "eafee31ca4f532a9dbee326d3ec3bdd1e997223b", + "sha256": "1p8ghpj83smh1bh38ydhlpyaxfdx0f83wp4sdgzv3zxdfydmb4n9" } }, { @@ -33409,6 +33527,21 @@ "sha256": "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb" } }, + { + "ename": "evm-mode", + "commit": "6318c712774eff8dab62bcf13f9c70290d5d48ec", + "sha256": "0b15hf9k6p2f8k233q04p6vqicdz7q8838pxihsiklzbngr5qkn5", + "fetcher": "github", + "repo": "taquangtrung/emacs-evm-mode", + "unstable": { + "version": [ + 20220503, + 1106 + ], + "commit": "2b326751c9421842521e851d969b9c269c79f8b3", + "sha256": "1igbahaazscn80ny9ix3kvznbz6rl5b59a0jjzz1zcqkwspc5dgc" + } + }, { "ename": "ewal", "commit": "b95fa8694bd49595da9fb56454e6539e76feff97", @@ -34791,11 +34924,11 @@ "repo": "michaelklishin/cucumber.el", "unstable": { "version": [ - 20200815, - 1617 + 20220418, + 848 ], - "commit": "8e1464113b489b54067294cd988ff6a11a423fdb", - "sha256": "1lmfksx49ig4b7nqg0mmaalz08b280iaqgsc0x9i471m9kvbisp7" + "commit": "e204d9e204b767cf95d6a051ff283f05dc51e9d3", + "sha256": "0zg4nkwfwmil2a3n2gnrwsj14dkwb1hm1mbcgcrg2dgvh45idns6" }, "stable": { "version": [ @@ -34859,11 +34992,11 @@ "url": "https://git.sr.ht/~technomancy/fennel-mode", "unstable": { "version": [ - 20220329, - 116 + 20220429, + 1636 ], - "commit": "50ef3c6246f36085cd908cf5432133cadb792304", - "sha256": "0rk5x4ipam32aizdjinhbmb0cjg7wakdh78fnm60jc7a07175ip3" + "commit": "90498bd9c8dac2749baaddb605d35370aa79ba15", + "sha256": "1793gakvc7rdjx2f41f3wlk10l34577dwrrlw82rp6gy668x6zw5" }, "stable": { "version": [ @@ -34905,8 +35038,8 @@ "f", "s" ], - "commit": "f261845c9b051614a8408be4c772912b12e8f2c9", - "sha256": "0kb1yafk1hrc80l7r6q2ffq1pmy93xajahrdrs6w37qyn00pwp32" + "commit": "d81983cf389dd5d2ec6cf9d702ff28ffd1be676b", + "sha256": "109d5sz2prlih28nbzaq3anyr7kyjm9cr7krndgsf7n68w6dz5b4" }, "stable": { "version": [ @@ -35079,8 +35212,8 @@ 20210707, 354 ], - "commit": "68fc17bd7e7cfdcdfc25b8c30fe44a3e8c165dd5", - "sha256": "0h31p0dxs6gyphcmn0s5bay653fmdqmyj4yzb42bhngpdid0ykb6" + "commit": "02ab2b3854df5515245ca2a924f89bf830f9c4de", + "sha256": "1jp3jcr9ni3rslhjv3wg7gqjg2iihdi3six4b65chcxryhkd21jd" }, "stable": { "version": [ @@ -35115,11 +35248,11 @@ "repo": "duckwork/filldent.el", "unstable": { "version": [ - 20220103, - 10 + 20220423, + 2216 ], - "commit": "5969bdf50a1fcf0bd3a1507782152effb5be85e7", - "sha256": "05g8jwd7qq3g6viayhr7szjb5vfj53ynj2krxnhl7cgqbpfbaq4v" + "commit": "2f32e0cf5e27c613f962fa41bf3427bbdc04e6c0", + "sha256": "02hjn163f8pvs3p4ka879fizlivaxhvj1lzkma5fgrrwzhhg5nh8" }, "stable": { "version": [ @@ -35226,20 +35359,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20220125, - 726 + 20220430, + 107 ], - "commit": "204b3d489a606c6e7b83518e46be3bbcef1bcb3d", - "sha256": "0h22rh88i11sz0kh1pq9fc9w58lja00xrany6mcy1hr6l0wy2g5h" + "commit": "116b976b526680c038109882d5cd2d9f218b62a5", + "sha256": "0sq8fyq19jw1hm0m6hiqnvzzvx0c3xigfx7x6i40ib5hnfjlqs0a" }, "stable": { "version": [ 6, - 1, - 2 + 2, + 0 ], - "commit": "52274e6001545bdf45c6477ba21bfaa8eca04755", - "sha256": "0v5c9cnwlbw6jj371swhd5bs8sb2zf6g5yjvhdsfnxly7g3dg636" + "commit": "116b976b526680c038109882d5cd2d9f218b62a5", + "sha256": "0sq8fyq19jw1hm0m6hiqnvzzvx0c3xigfx7x6i40ib5hnfjlqs0a" } }, { @@ -35348,8 +35481,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20220307, - 1527 + 20220427, + 1932 ], "deps": [ "async", @@ -35360,13 +35493,13 @@ "s", "transient" ], - "commit": "6e707da7ffc87d4e90c90694004d91dfa8b1d4ca", - "sha256": "16cxd0hdn7wn3v8bwrr06y1q0grcllqj5qyajhbrlqwws1y86d0h" + "commit": "a0fe025086046aecf5490c993afe9e716324f7e5", + "sha256": "0g5pv08mv4c9jscsp1cyldwi3xdyppys6m1bsq293v5kk38agmdf" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ @@ -35378,8 +35511,8 @@ "s", "transient" ], - "commit": "b7cbb5fa672031cbc9d7de18797ecdd2df8e224f", - "sha256": "00rimqh2hmz9hzqq5piq0bn60rh820ym18r7irh6dv4vdk06zww8" + "commit": "a0fe025086046aecf5490c993afe9e716324f7e5", + "sha256": "0g5pv08mv4c9jscsp1cyldwi3xdyppys6m1bsq293v5kk38agmdf" } }, { @@ -35528,11 +35661,11 @@ "repo": "wwwjfy/emacs-fish", "unstable": { "version": [ - 20210215, - 1114 + 20220505, + 1111 ], - "commit": "a7c953b1491ac3a3e00a7b560f2c9f46b3cb5c04", - "sha256": "1spxxkji9xa930sbwvzyjm8jrqk9ra0xqhivw7zd12a4c56nhna9" + "commit": "d04478c0aba018cb789d77d591bfe315cb25132a", + "sha256": "1dkimwhf7l6bcv6wyh0x4z1zp28kcdakzpz20q279amghif4dymd" }, "stable": { "version": [ @@ -35921,15 +36054,15 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20210529, - 1253 + 20220503, + 1442 ], "deps": [ "apel", "oauth2" ], - "commit": "02735dede6603987e8309a76d0bc7a9ff9a5a227", - "sha256": "1jy2wsm1xc6iaxa449wwz14ky4yiaxd8g05ry59r9pf60cpxxy1h" + "commit": "289e5bbd66f6f14306a6e0b922ee8f26267e2470", + "sha256": "00w0381nngj497jf240zrh26hhanm6fn9xl74k1f94crsfva3ccq" } }, { @@ -36038,32 +36171,32 @@ }, { "ename": "flower", - "commit": "c8a731715d360aea9af2b898242fd4eee5419d14", - "sha256": "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd", + "commit": "4f045c15da285bbc438b581489ca0e2a4dbd5071", + "sha256": "1ah2l1y8j1cvjqvd2mz82y4s43v4j54m24v2g0icnr3cgvj5wphk", "fetcher": "github", - "repo": "PositiveTechnologies/flower", + "repo": "FlowerAutomation/flower", "unstable": { "version": [ - 20201022, - 1904 + 20220416, + 1744 ], "deps": [ "clomacs" ], - "commit": "0d5dd8b9b844adab1a1b7a9641daa9e98918712c", - "sha256": "0d2vl8lclwcn03p4ch0alb5ib0hbjp1ry5g3mkchd0pzwx6wwsrz" + "commit": "047846409867b2dd0ba4e2047a414b498680cd9c", + "sha256": "0bbmyd03rhpkifgjk60pfg0knqh2d7nl3qfi0rzqk44f2f556j89" }, "stable": { "version": [ 0, 4, - 6 + 7 ], "deps": [ "clomacs" ], - "commit": "6ef1affa2d7090714ccc4494823de28cfc11da35", - "sha256": "1dp3g52j1i49bv802g27b7yszpxz0i28i4j74qp39qlld3k0gys0" + "commit": "0d5dd8b9b844adab1a1b7a9641daa9e98918712c", + "sha256": "0d2vl8lclwcn03p4ch0alb5ib0hbjp1ry5g3mkchd0pzwx6wwsrz" } }, { @@ -36089,11 +36222,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20220220, - 1423 + 20220502, + 50 ], - "commit": "08138f8c95488aaf315a1f5d52c33deb8d28672b", - "sha256": "0h4r6m9yi5pvqlc4a3m2kc8jl1ywp4vv8bgmnkzy1aa7i8lb94c3" + "commit": "e49cbcb70235fa39a7d243521e03ad874451a39a", + "sha256": "1hjfkcdi99yfld9jakhhrncpm2yvg03xz35dngc6nn23dkwdpidm" } }, { @@ -36104,15 +36237,15 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20220213, - 1335 + 20220502, + 50 ], "deps": [ "flutter", "flycheck" ], - "commit": "08138f8c95488aaf315a1f5d52c33deb8d28672b", - "sha256": "0h4r6m9yi5pvqlc4a3m2kc8jl1ywp4vv8bgmnkzy1aa7i8lb94c3" + "commit": "e49cbcb70235fa39a7d243521e03ad874451a39a", + "sha256": "1hjfkcdi99yfld9jakhhrncpm2yvg03xz35dngc6nn23dkwdpidm" } }, { @@ -36222,8 +36355,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20220328, - 1518 + 20220504, + 830 ], "deps": [ "dash", @@ -36231,8 +36364,8 @@ "pkg-info", "seq" ], - "commit": "55f25fd98abc145c0c464756504132c271f0f039", - "sha256": "0z1j5w7kifk130ijgkajbxg7n3kj3znn3rd4kwpxb2njwi5ml18x" + "commit": "1d7c1b20782ccbaa6f97e37f5e1d0cee3d5eda8a", + "sha256": "01hr9xpjyws32aap2jlyncbgl1rfig8ylspln01yxf1lljysicc2" }, "stable": { "version": [ @@ -36322,8 +36455,8 @@ "deps": [ "flycheck" ], - "commit": "5ec0f9b28b1d86eec192b23bc24d9a33dfe51882", - "sha256": "02qv8gxlnasak87gggfg1643m5281fzjh4snpq1gjwyv6biqlldz" + "commit": "dcf7e6543e4d94d58375e00e4a10db615ef06941", + "sha256": "05fvfjsqvli3v809m0jdyh7970ldqdjv8x5bk1vr7a2rawk96ns9" } }, { @@ -37148,8 +37281,8 @@ "deps": [ "flycheck" ], - "commit": "69ccdf4b6e9cd87e8cce615884287b65d6ee6bb6", - "sha256": "1xk9ya7267yx8419cb9bm79p0nbxp9974lswypgxv90l4ra5p1jb" + "commit": "327f1c13e4f404b1bdd25b10f7e7ac7d7e3bdac0", + "sha256": "0mxzcms7i2jmagfbgj9sb605c21q6a9v5bs5nsjfqvi5jbj9prfv" }, "stable": { "version": [ @@ -37227,8 +37360,8 @@ "grammarly", "s" ], - "commit": "b3c9c3f0e1f8954dcee9cd6661a8e39c6d7eddb9", - "sha256": "0vdcsy8hgs7pn9pinp1kv3bzxjqcp1ba43licinkxfpf08laiwdc" + "commit": "6cc8a7553ac84a229090ca8ffa6aa7d34de35cde", + "sha256": "1qqw9if8cv0mgk2xgki2yzhjmhj20acj2aqmqvhf8ndi4k0s13f4" }, "stable": { "version": [ @@ -37283,8 +37416,8 @@ "repo": "flycheck/flycheck-haskell", "unstable": { "version": [ - 20211223, - 104 + 20220426, + 2358 ], "deps": [ "dash", @@ -37293,8 +37426,8 @@ "let-alist", "seq" ], - "commit": "8110ef5a1953594d065b67df25d5f0c05c711df4", - "sha256": "1qdgcykn2rdf9jj9pzd0zyk7pdcf9lr942hr6w3kmkc299qiajf8" + "commit": "d92dea78fb8638f7c27a3eb925d84c669fb257dd", + "sha256": "0sv8k40h4qxlfwz2g8qzrri5vwwan5aadk9snaif10ix84zyfzbn" }, "stable": { "version": [ @@ -37653,8 +37786,8 @@ "deps": [ "flycheck" ], - "commit": "60b1098139d5367c2d07b615d80d83f39ee316bc", - "sha256": "13rz1fy7pj16lfwnvhrgr1wzv32kiqvibi2sssb3vwnv6qfg885i" + "commit": "6dc29319973ff86f8f83c988f3e093b28c746aba", + "sha256": "17d392z4m6r06xnk67ipzp5vh585bs21lc7d60v9sihar61awdn4" }, "stable": { "version": [ @@ -38354,14 +38487,14 @@ "repo": "Raku/flycheck-raku", "unstable": { "version": [ - 20210814, - 903 + 20220420, + 732 ], "deps": [ "flycheck" ], - "commit": "50ac228e658a7f86efc298ee3ebd0b9706f083d0", - "sha256": "18wyd7w26wkdpvr76rhblh368dqly7dldkcd71ddjkdi10zas493" + "commit": "4da1970a75396aff1957b07f7579c1de6b817e6b", + "sha256": "1dwi6zz4jk807r4vx26bldzh7zhk5gb2p6045ss5sgjcirsllvn2" } }, { @@ -38865,8 +38998,8 @@ 20220411, 826 ], - "commit": "5ec0f9b28b1d86eec192b23bc24d9a33dfe51882", - "sha256": "02qv8gxlnasak87gggfg1643m5281fzjh4snpq1gjwyv6biqlldz" + "commit": "dcf7e6543e4d94d58375e00e4a10db615ef06941", + "sha256": "05fvfjsqvli3v809m0jdyh7970ldqdjv8x5bk1vr7a2rawk96ns9" } }, { @@ -38898,6 +39031,25 @@ "sha256": "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc" } }, + { + "ename": "flymake-collection", + "commit": "125055719b7be14d8fd808ea48714108bd02d9e5", + "sha256": "1yixy4gx160s006as8bm95gkcw8z171xj65alrv8nymjb5gy8nh7", + "fetcher": "github", + "repo": "mohkale/flymake-collection", + "unstable": { + "version": [ + 20220410, + 1343 + ], + "deps": [ + "flymake", + "let-alist" + ], + "commit": "8f36fed9eef834cf94931fc8b813f9ac8db6d2a4", + "sha256": "0586g7qdcp2bh51ll1sv73ji6vh8l3xxsndpkqxgfkyckmc3iyhh" + } + }, { "ename": "flymake-css", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", @@ -38935,14 +39087,14 @@ "repo": "flymake/emacs-flymake-cursor", "unstable": { "version": [ - 20210126, - 1733 + 20220506, + 1458 ], "deps": [ "flymake" ], - "commit": "3163144d06fe1f9b10bc5a711ac22e5619aabc52", - "sha256": "1qhbijl750gbrwyi0lalrqapvzqrlxk0vf5zsf5iypgkxp02lv61" + "commit": "95806594cacddbbc0c3aa2351a6a7cf28e73a8bf", + "sha256": "19h47khw9p68yk9z4z7jrakniiwc1b3ca1r2017h3ldzmpacwa6y" }, "stable": { "version": [ @@ -39169,8 +39321,8 @@ "grammarly", "s" ], - "commit": "665f1404b4f99e5f067445f368042d3ec9388925", - "sha256": "0mjx0n1zh9chx6ywymrvb29br7zbxx8xxi93fy7kwcv0jk1jzysx" + "commit": "7764178e6b51ccf0ce984b97385c22b2696d54f0", + "sha256": "1q5qn4abjh1l93n56ps856j6aqha2j7yjxbwjwwj0clyfb7bxccf" }, "stable": { "version": [ @@ -39426,13 +39578,13 @@ "unstable": { "version": [ 20220414, - 109 + 429 ], "deps": [ "s" ], - "commit": "47170c0fffc95f965d4e1ef742cf052cfadd3439", - "sha256": "0na86dg6z75rycqpbg0f0mlzxzyjwvr78qjcvj1sh9pq8dwcilbl" + "commit": "db6abad075734dd01dbbd31cfec7ecb65ba16404", + "sha256": "06w5mr32mrmys8gfbpx5srbbap76607by5y3l174y0n5zxgmzz9w" }, "stable": { "version": [ @@ -39548,8 +39700,8 @@ "deps": [ "flymake" ], - "commit": "ca33d4816f30dfc589eaf9b38988607d622b6a3e", - "sha256": "0yfcghkbvi5f5vz1xigl0r0dl3091g5j9zafjy2pk2m8mh2jsnpw" + "commit": "ee515ffdeb2a3b1162c82089e94cc31186eb2001", + "sha256": "1nv82s7m6mpkjlqx5diis9kzmlqkc2q6l3f1mkdf9h7vhkk6had6" }, "stable": { "version": [ @@ -39637,8 +39789,8 @@ "deps": [ "flymake-easy" ], - "commit": "58aa83015faa491e336357a9a8592604fba52701", - "sha256": "1kl6b40a6p8nbhf4i6iv0wgn4dcfwpiw3s2hfyk6vp7lryc9jakn" + "commit": "2d442cff3408ecf3e576f0f3406fd6f567b16fa7", + "sha256": "03fhic235z8vywmnj5yri275pggwc87hlahypdvh5w4i45hxa78r" }, "stable": { "version": [ @@ -39769,34 +39921,35 @@ } }, { - "ename": "flymake-rest", - "commit": "810164452024d14dc4d31c7ed7a0ca4ca3f4eef1", - "sha256": "1bicrsmcdfy6fbpc59fv283n6vki4pcqaklwvalrzj8yylc2aifz", + "ename": "flymake-rakudo", + "commit": "deae8f07ccee183288487c3fd3580705feae0fae", + "sha256": "15gsmwai127i6zrn5iqvd927qlij63gri6rdnws77h5320gg42x1", "fetcher": "github", - "repo": "mohkale/flymake-rest", + "repo": "Raku/flymake-rakudo", "unstable": { "version": [ - 20220409, - 1233 + 20220424, + 637 ], "deps": [ - "flymake", + "flymake-collection", "let-alist" ], - "commit": "4b7051222b64650e2ec8c8340fdbe792138ede83", - "sha256": "1bxyhqz4rgclqp4p29jkr5wvg143cd1f8nlv38zj23x8hfp2n6si" + "commit": "f8e3d03a7207876cd891174702efd572d74f2e49", + "sha256": "1j6v1hdwp1jidx9i28gfkzp9hllzkw3r5qd3ggrb96lbqc5hmyi5" }, "stable": { "version": [ - 1, 0, + 1, 0 ], "deps": [ - "flymake" + "flymake-collection", + "let-alist" ], - "commit": "1fc9cd28e6f8527a7e5ae0333e487bf3354fa36c", - "sha256": "0rcx89v3hffk4rbwqfr2ai3bg61shqcg92qj4idsc45xdj6fk9rw" + "commit": "f8e3d03a7207876cd891174702efd572d74f2e49", + "sha256": "1j6v1hdwp1jidx9i28gfkzp9hllzkw3r5qd3ggrb96lbqc5hmyi5" } }, { @@ -40531,8 +40684,8 @@ 20170305, 1356 ], - "commit": "b64edc9f350beef07168621933d3e287bce28434", - "sha256": "1yss4akandva0rg05g6vfwjk3q9yj6p0pg85nq5glv1qxdx1rvxn" + "commit": "a5fafe89d4032fd1f0c21b7b04708ef2cce2517b", + "sha256": "0m9dwcgja1d33h6d5fbc42lgfxafwvzc3zwnj4ywx6vai9yqljhd" }, "stable": { "version": [ @@ -40694,11 +40847,12 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220407, - 1932 + 20220506, + 420 ], "deps": [ "closql", + "compat", "dash", "emacsql-sqlite", "ghub", @@ -40708,8 +40862,8 @@ "transient", "yaml" ], - "commit": "22c43d3471760dfe00cff0f27e8349ce0e3cb247", - "sha256": "1d0npv5vwp5nb0cl6dp917qg8c5w305w7k18hqm9kwz6wxn7v2cv" + "commit": "29fc1302382700dc7ecb5e0fe20e47b8a9d0a1a4", + "sha256": "1v5nq39fqzzc83syap8icclic7hjaq91y45rx5y9a6rs5dv53akc" }, "stable": { "version": [ @@ -40915,8 +41069,8 @@ "deps": [ "seq" ], - "commit": "0aab300c0a6225d93087ae112f123eb89048ce1d", - "sha256": "102g7n43ji47ssj7rdyx34frbgl84lgmppww4f3x6wbkvfwa2p6f" + "commit": "fba17c2b316122e26292ba995f1c62191b7b3eb0", + "sha256": "1ryj8qm8zgbms98vbzj728f57mq92vf8rp04aql4zq2ryzxv2rnd" }, "stable": { "version": [ @@ -41069,11 +41223,14 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20220407, - 1933 + 20220422, + 1610 + ], + "deps": [ + "compat" ], - "commit": "e33a2cfd591f59fe75723c556285669858d714bf", - "sha256": "0n94pn68bchm3s12mj0s46m3kvsrp4ijh0rry29azbkb4k0p791k" + "commit": "fa5e2363efabc2e61e79bd66c96e7d1a5c827a0d", + "sha256": "1ywl7dc6ksynvcx3v3y8j96lpydwx5jkb2b90dd3skqrxpfqr9vm" }, "stable": { "version": [ @@ -41391,16 +41548,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20220129, - 539 + 20220414, + 1935 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "d82cc1a449d368f5a3dac61695400926da222a84", - "sha256": "0c8x5a0rlyys8dqxsliy4m35c338srffl5387bmyzj68dj43vbfh" + "commit": "ff0cfe9cb4a60d855f0754b741a9417ee413dee0", + "sha256": "0pp0z6zk6lni6pgkrh8is4c99v6npddaarsykwdxai0qxim9q4f3" } }, { @@ -41460,11 +41617,11 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20220408, - 1321 + 20220429, + 1847 ], - "commit": "454a4ac3efaec2109178c3b0ca7392ce2818ec26", - "sha256": "1zdah0d52806bkbm24lz0hl9z97224w1k6r8c0fbyyi16265ghc3" + "commit": "5208b54098c7534f4768b87c5f4c8a01b638737b", + "sha256": "04s37djxzy8v5xwc5hh8gq37zh7f6ih3y07g07q2fc39rk1xslpd" }, "stable": { "version": [ @@ -41530,8 +41687,8 @@ "deps": [ "cl-lib" ], - "commit": "60005b6cfda0ae7d5c21e5a59f6edc90bd9707cc", - "sha256": "1h3sn8g5vb2gr4czrfdsm30c2cv7jm0455zj8ca9z9kapa43fmdi" + "commit": "b90d529eacb643421991f94288151e72ed573b55", + "sha256": "0qfkryfmmhv5h5i0xx50ggs0d4kagy3zpifinr831fswkgc1garv" }, "stable": { "version": [ @@ -41684,14 +41841,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20220331, - 1711 + 20220425, + 1144 ], "deps": [ "cl-lib" ], - "commit": "f5daf5c340ed1242756e0d72f70ff6f9af6358e3", - "sha256": "1fyqrzrwpgv4cizqznaad98xpdk8mxd635kqxsl54n9f96ra2hd2" + "commit": "7fd0a3c6c96ed8afd0249ab0734d9b63d4fd1cb1", + "sha256": "06y66lzhw2vl5y3lpcmgn71rpshq07ljah2p2ksgml87qml29r3s" } }, { @@ -41729,8 +41886,8 @@ 20211231, 1837 ], - "commit": "63993780a628dc2cf357ce44789017b44d7f7b06", - "sha256": "1zbijvavwa2niqwqajs1b7fgrmkq1lvz3j6kbaqmv2649krpnshq" + "commit": "ea361ce0f702c5f92ad4a89017def9c1619a3191", + "sha256": "11kni370swrlvhj38piw55kwa1wfn6g20fjqrlaq9hg93xrah9xp" }, "stable": { "version": [ @@ -41797,11 +41954,14 @@ "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20220402, - 1732 + 20220422, + 1610 ], - "commit": "254dfda0a9f0e03b8b865089343845d3da2c8743", - "sha256": "1x50s5mvxlbcaqrx3bf3kjvb5xgc2rsk3i0ify9l8y2rpc8lbh92" + "deps": [ + "compat" + ], + "commit": "4bd3c23c3dc649ab5412e2bad7eebe3069363190", + "sha256": "112a291aznh3jzcbdl4hm8xqk3nbhkab2yx604a89w69hwi960yl" }, "stable": { "version": [ @@ -41922,19 +42082,19 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20210701, - 36 + 20220501, + 1507 ], - "commit": "64e3544726b77f10becb58a51d61993fbba433af", - "sha256": "1sn893lnqfr13p1m2g36i6f0ikpibhp7q7ak5271fhpzjzh0fi1r" + "commit": "1964d9a52693f3aa9279eed8864bc317ee5c6dc4", + "sha256": "070qmshqn6gz4av3rzbjihlw6psx5c61kbcwdymswzfzmhg5dyn6" }, "stable": { "version": [ 6, - 7 + 9 ], - "commit": "52e984d64c48f518222e0f6bd326236f78d7bf7a", - "sha256": "0fjdm2mlwibi6cz0r7cm4ylxzg7i8fljkwfhflb84xqcaknwr2sk" + "commit": "1964d9a52693f3aa9279eed8864bc317ee5c6dc4", + "sha256": "070qmshqn6gz4av3rzbjihlw6psx5c61kbcwdymswzfzmhg5dyn6" } }, { @@ -41960,11 +42120,11 @@ "repo": "gvol/gap-mode", "unstable": { "version": [ - 20191110, - 2237 + 20220503, + 1555 ], - "commit": "62adb8935033eead7fbf2c107c2dfb79afa53c67", - "sha256": "1rhhls2ylc2jg3mman3zq0mknmmwhll09d9dxrqmk5262d2f7vw4" + "commit": "99237f714c28981142674e8cfeb155863c834858", + "sha256": "0bjrrjz6k7a83gxad9grmynr14s6mig4cihd21nk6x499fn3ssia" } }, { @@ -42130,15 +42290,15 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220410, - 306 + 20220507, + 34 ], "deps": [ "project", "transient" ], - "commit": "1300dd1a410a172588c529734a4fb1c8b58eaef1", - "sha256": "0ssw15rmn06nhk9zdpgkqclc603phx5jh3r5zjvf2pm0gdacwy2y" + "commit": "d28d19b582347bffebbf0ca905297e744842a5f2", + "sha256": "0g96982zq5yarv1ky86qvin2an30n4fsxqgrcyg6yhas9vz7gc4b" }, "stable": { "version": [ @@ -42279,14 +42439,14 @@ "repo": "emacs-geiser/gauche", "unstable": { "version": [ - 20210911, - 1041 + 20220503, + 1700 ], "deps": [ "geiser" ], - "commit": "fd52cbaed9b0a0d0f10e87674b5747e5ee44ebc9", - "sha256": "1sv1a6lhxn8xhbgajz2knrblnaaryp3fz4yw19ggzdx4r30k278y" + "commit": "8ff743f6416f00751e24aef8b9791501a40f5421", + "sha256": "1ppracwfl1snq0ifdlyxpdlv7fbn3pbxm1hd1ihgqivii5nbya9r" }, "stable": { "version": [ @@ -42625,16 +42785,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220413, - 1219 + 20220508, + 704 ], "deps": [ "dash", "magit", "s" ], - "commit": "1f2be2a157555b9f328cc3f8bc07c5898038b331", - "sha256": "1qjnwz8f678nf0zd2qy7jazqw9r9ccxpmsb84mlc7l6xg64kdgzw" + "commit": "2ca9cf999534a94c9aa93b393f30ed373eb2ed86", + "sha256": "1pmjyd9b4b97fvm644gvhlg7jzxsys4kqswrp9rxdlp8w64zxn31" } }, { @@ -42717,11 +42877,11 @@ "repo": "leoliu/ggtags", "unstable": { "version": [ - 20211020, - 354 + 20220420, + 1610 ], - "commit": "8e16861392d7499bf3a212db1f5e9e0ef2e4fba9", - "sha256": "01fhc6cc13i9nvyl3d692s0fsyymr6vjxqpj7ydxsh489nw7hj4a" + "commit": "22d3a3a951cb605d29138f1acee191ef674a4518", + "sha256": "05jl5b2s3chqz67fapxrr3189scrsb2mvjn255hficrghzw0dh1s" }, "stable": { "version": [ @@ -42925,15 +43085,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220403, - 1248 + 20220429, + 1708 ], "deps": [ + "compat", "let-alist", "treepy" ], - "commit": "8c4d0baa37230ef47f4950e7b101304851dd5c95", - "sha256": "13rkw6ydpfp7v92py4yxfyd0ifm4pxnr6069vpvblmg4y8z4zh30" + "commit": "f3a26544575303e86b423a3406656f0e5a576d67", + "sha256": "1ha1mcrgnckz04hq2vslcdd60m0dqqrcbqj2h601wmv8qrf6m5hz" }, "stable": { "version": [ @@ -43291,15 +43452,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220331, - 2308 + 20220506, + 1936 ], "deps": [ + "compat", "transient", "with-editor" ], - "commit": "3cfc8458e14c705afdfbeb7dcd3d3f43d7479344", - "sha256": "1v21p89srk09ahszwm257j950f8j939y3yx8qzmrvmwya4isi9n7" + "commit": "f331092df4d4dfc0a2a7424d929a9c845088d57f", + "sha256": "0vp5zqi980lb220i0gayiksy1hmkqsfjqbvhnhy7iwxqd3w7nxb3" }, "stable": { "version": [ @@ -43393,19 +43555,19 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20211222, - 913 + 20220423, + 1704 ], - "commit": "46a20d2db8a0b330f5ac838bad67c9795d95e7fe", - "sha256": "1qlpdpdxc6xhaiv5s6f8k2y35dn1wvbn17vxzy0d31nqhbqgbwhx" + "commit": "a50672b62a678922b8c0cab95225d520f493439b", + "sha256": "0xywglck2z06vgwf7m7a87plcrxca06pgd4y0iq8asbl046akj0g" }, "stable": { "version": [ 0, - 91 + 92 ], - "commit": "570067d4f4e54ef6003fe442de5536806ff19e98", - "sha256": "0zc9f73app1d7j4yb10sy4xidh5252ncyxlvr5kh0kiqk88ck6j9" + "commit": "a33a50c47bebd5d3f9f0ec7e71acf198e5fd4331", + "sha256": "1fkp6iyisb3g5afyjkxz4yj4ws5f8n7whklck4jdf3014vs01b3c" } }, { @@ -43636,11 +43798,11 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20211020, - 2306 + 20220422, + 1611 ], - "commit": "bb71cb2226a1cf105c329f3186bfcb5bb37e2f2d", - "sha256": "1k3wncwsywdxyfimaz2lg14528zcs3kr8dd4x4yv1v04b5r6myz5" + "commit": "96abfb732d695cbd2075ba701254651a7b28d693", + "sha256": "0d3d1nwjbx6843344kvf80gmcnad0jdxml6abw27b5pi31dx2wp4" }, "stable": { "version": [ @@ -43981,16 +44143,16 @@ "repo": "akirak/github-linguist.el", "unstable": { "version": [ - 20220324, - 548 + 20220418, + 22 ], "deps": [ "async", "map", "project" ], - "commit": "6e3fc58a465e6726dcba6da038f959028c62223b", - "sha256": "1zli3xzp44c61jrg0fn7h39ianxjp2r24sswm3i99hnx052pp8fp" + "commit": "e1055cba19d82620a735e8e40d094b538e1f4d94", + "sha256": "00abshhhm6pvzgwaqhw8g0gwfs915hpdnfh5bqxr9434a56hgkd2" }, "stable": { "version": [ @@ -45003,11 +45165,11 @@ "repo": "eschulte/el-go", "unstable": { "version": [ - 20161111, - 249 + 20220414, + 1956 ], - "commit": "ff45fb44d9cb6579d8511d8b6156ed0b34d5ac97", - "sha256": "14av8zcxp9r4ka0h9x73i6gzwbf231wqkin65va3agrzwaf8swz1" + "commit": "79690579496b0df85a1c94199aca968371b58b3c", + "sha256": "1jygy0d3w86b963zv888b7kfg8bzs3hnhmi6r2lkjp6j25hd584i" } }, { @@ -45616,8 +45778,8 @@ 20220404, 1240 ], - "commit": "b3b3e0acfe5ebeba556f3b98bcff089b889c82c4", - "sha256": "00d1z91zq2sixl80g4ax7n7hc1wh4dmzg5c1p66i9lsmybg2aaxh" + "commit": "b0898e6cd647e38e6f70e6cd121b789610573237", + "sha256": "19nffy0zqcjgqigbq0p03ldf31xki1cci48yfj620nh0cxvyd0vp" }, "stable": { "version": [ @@ -45886,8 +46048,8 @@ 20220210, 1659 ], - "commit": "629edc1ca95113f882e0c136d155a0f2e2e952bb", - "sha256": "15yiv4lx77aan23mjzrzd5da6lcr0brs7agimxm05ya2lhs4n0jq" + "commit": "1faa779a126c3564e74d6254d596da8dd2b4bf56", + "sha256": "0lhlpl3ilkrpfk3r638avp85wvbyk3arlssa94xw99a4nz7ix4a2" } }, { @@ -46111,8 +46273,8 @@ 20210323, 332 ], - "commit": "75597233576dd60e43f535f20d11650404f9207d", - "sha256": "06nv842ycvksvbqacsydbq4pwj8hr304llifrpyalk9wdv15jldi" + "commit": "ea845966423ce90526d717bb27d0022101c75796", + "sha256": "0cwp00677vw20xzrrf7sjjivdz5ny9imqdhj8719ibgqa0cq52zc" }, "stable": { "version": [ @@ -46198,8 +46360,8 @@ 20210323, 422 ], - "commit": "6355c1bab7a1c543b517c9cb1236071576a82c59", - "sha256": "01650x7vnjrcf5v8d2a2zx1xscbw6hrcxyfjj4d43l9hzsp4kx9m" + "commit": "d4db955860de830ebc067b065cba16a776717e76", + "sha256": "0d9429y6nwmjywj7rbyjdxs9h98177s16szj6mr54clixvws57rg" }, "stable": { "version": [ @@ -46228,14 +46390,14 @@ "magit-popup", "s" ], - "commit": "b76ddb07718332bbd6cb59bda77c62dad7dcfcb9", - "sha256": "1zhskkvdczk8f0bz7zxp4f0b7maz4zmzy6agh2a4jxsvnig6sj4q" + "commit": "be5528b51ec58f28601350e466e662727cf6c7c4", + "sha256": "0w9hv2h74cdk84fj6vdsnw4pbqfcf9n0ibj2qp3xn8aw8spkg70f" }, "stable": { "version": [ 0, - 27, - 4 + 28, + 0 ], "deps": [ "dash", @@ -46243,8 +46405,8 @@ "magit-popup", "s" ], - "commit": "285e80cd79d6daee7d5f0ac9555d885f368346f0", - "sha256": "004r3n3y019zvds45h6gk49gailvdy77ql49cmryajd2cifmw2sz" + "commit": "ac1eba30136e553e799a7e59846ca5750b64c054", + "sha256": "0y3wl27zrb7qlc1zn451cmklm2d2ihkrzh4n20fyzx222aq4kbdq" } }, { @@ -46463,8 +46625,8 @@ "s", "websocket" ], - "commit": "9cde43ad6c5dc1a120e731c36bc8e708a4c9a5b5", - "sha256": "060kfibdn0vz2wqi5036ghm4fhrngqm943d7hvpw056hz2iywkqc" + "commit": "1d616a446c64dfe7d85f80cd38ce2a1e2a3b0f34", + "sha256": "0rrq46pg4h8ymyq3s9iqkkcjxd0rd2a018zksxg2xsj6hdq6rrh3" }, "stable": { "version": [ @@ -46873,11 +47035,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20220323, - 1519 + 20220430, + 1545 ], - "commit": "6b427143a8f61bb0b5dd070d554e5058130d15ff", - "sha256": "07nxnyqli58kydpx7b8y4qv134d8n4pb0458max74w7ivgz3jrh2" + "commit": "7fa9e9e6b650f7a6c026b7e24c2af171e8818667", + "sha256": "0jhdj6hvfv5psq5xixjjr13i92q5a2fkibzw25dz5c1f4ky0crcl" }, "stable": { "version": [ @@ -48152,8 +48314,8 @@ 20210108, 1835 ], - "commit": "2390e7899eec7497202c3b58de435060ca2ceaa0", - "sha256": "0sxq05cbz1h2f1h860dzx0k7lxbxpli0smdh3pq03fa926jp8iry" + "commit": "6641a0d7c00ce633887baf3f8c594d9a8a504e9b", + "sha256": "0395f1pwrga0vfd153s7xlgiw5m2d89s5lx6xn9dm8x31q78ghq6" }, "stable": { "version": [ @@ -48292,15 +48454,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220413, - 708 + 20220508, + 1455 ], "deps": [ "helm-core", "popup" ], - "commit": "5546efa7d177068c4f28fe41a02927cf19a7b018", - "sha256": "1p0blx8k6vvmi8y5v0wkz9n1bvljin4gn5apk0k26cv6npllrycz" + "commit": "4402bd042f9af15cc671175061795b36d0cbe434", + "sha256": "1zlnfbddi67h6ks6z0q24jpqzkgqj3y7w0i537zsi3f8rdpv1m8a" }, "stable": { "version": [ @@ -48399,8 +48561,8 @@ "deps": [ "helm" ], - "commit": "1b464c0d2b9e50a0cef2310dbf8babb1a9933834", - "sha256": "1v7v96h1kls7znxf9ph34j8h1y7jnfad91dbiq6j0pff885s9190" + "commit": "9820ba1893c8a7e31e756c891f9b4cf0eff1e50b", + "sha256": "173n4s1i9zi4yizvlzfr2qsj6rb2qizkmhwm21ijd701ac3v9xcs" }, "stable": { "version": [ @@ -48592,8 +48754,8 @@ "cl-lib", "helm" ], - "commit": "c089a1cc87d91611366b9430c2890c628b3342c4", - "sha256": "1vlpq96w4bvbjz4pa3f2l8vs0jp7gb7k7jlhqjbdpm5qv09q513k" + "commit": "ce8c17690ddad73d01531084b282f221f8eb6669", + "sha256": "15b37xa3f9npbqmr9ml9km61v2l04csgnf61kfr5849zj423643s" }, "stable": { "version": [ @@ -49198,14 +49360,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220409, - 756 + 20220503, + 622 ], "deps": [ "async" ], - "commit": "5546efa7d177068c4f28fe41a02927cf19a7b018", - "sha256": "1p0blx8k6vvmi8y5v0wkz9n1bvljin4gn5apk0k26cv6npllrycz" + "commit": "4402bd042f9af15cc671175061795b36d0cbe434", + "sha256": "1zlnfbddi67h6ks6z0q24jpqzkgqj3y7w0i537zsi3f8rdpv1m8a" }, "stable": { "version": [ @@ -49762,8 +49924,8 @@ "deps": [ "helm" ], - "commit": "0feb38491cd000d7d6fd3595cc3bf572bf3b60f9", - "sha256": "0i2c9ig4z9c0dvs5a5nym6rh6sg4vji3llrjdgn58w3zsx6784nv" + "commit": "f9ffd81c3b7fa3e5f79f511a6c2226b5e99b73e6", + "sha256": "0g4gy812ahch4p4nqw8wz0a7qsn637lm85x3iahphy53qvyzc9rf" }, "stable": { "version": [ @@ -49805,15 +49967,15 @@ "repo": "emacs-helm/helm-firefox", "unstable": { "version": [ - 20210331, - 1900 + 20220420, + 1346 ], "deps": [ "cl-lib", "helm" ], - "commit": "58a7ff023c76857ca9cd82075c8743446a50c055", - "sha256": "06ihkw61ivgghasxignalr0zrfrh5nayky9adrqid9bgmiah3q9y" + "commit": "571cf8dfcbe43d91f9890eebefc88d7572c62e75", + "sha256": "0x93x29d74mqbq78jcxq06w9myfml7yni5p2zfdyqva7q725wsgb" }, "stable": { "version": [ @@ -50027,8 +50189,8 @@ "flx", "helm" ], - "commit": "5ea8a2db5fec36ae3604c94c5f8fff1ed459feff", - "sha256": "19yxfrvybfpannnrracw9dkflafj98f5pmf2vkh7k2sxkswbmll0" + "commit": "dd092e8eea5257d49bbdf694df4fefd86252e54b", + "sha256": "1w6625gd5k149wm54m7ci6l9pzrcma6z8hppj965vqlwqc8fj4xa" }, "stable": { "version": [ @@ -50374,8 +50536,8 @@ "deps": [ "helm" ], - "commit": "85a3af1a45221ec326df2e5638c28996348fe09a", - "sha256": "0k701c3dzdw051bv1s17bc82qd62v2zglrgsrk27d8aa5cix40xq" + "commit": "6285c083d885ea8e110868c6a5b9df69c3f3c4af", + "sha256": "1di39sbwf3yi01jh8nbiayqqnms1dddfqnz5g0gg935f5w3l1phm" }, "stable": { "version": [ @@ -50760,8 +50922,8 @@ "helm", "lean-mode" ], - "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", - "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" + "commit": "362bc6fa3efb1874c525ed6b4b6f24f76af22596", + "sha256": "1lr4h555fa1kdi3q7hkhsnznv7nh9rgjqjkbj2bqp9zwh06245w3" } }, { @@ -50828,14 +50990,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20220113, - 1752 + 20220418, + 657 ], "deps": [ "helm" ], - "commit": "736f642ffa0f92706f71c3b7a995f9b97069b069", - "sha256": "19bvcwfv7nzvm3qx41nh0x66c1jldciq2qcn9gkf4r64xwc32yz1" + "commit": "c6494a462e605d6fd16c9355e32685c3e0085589", + "sha256": "02gx6a8n7csip5wm818bmhrq4r0r394r3vvfsn8fja8fagmg3z1a" }, "stable": { "version": [ @@ -52200,8 +52362,8 @@ "s", "searcher" ], - "commit": "5d43df9ceedaa5a712d2ceef2aa2317ed4b7cc1d", - "sha256": "0s08q1ssgbp69q4vj6ysz424mrn79wk3dqpfbwp0v5kgq0882x9l" + "commit": "fcb4aa5a36ee4555e46756704da50ccf7f13c21d", + "sha256": "1g5vpak8ibsh68a5zh0a4bjdcpiik4q0ljamph98iqq7nwj1a4r2" }, "stable": { "version": [ @@ -52681,8 +52843,8 @@ "deps": [ "helm-core" ], - "commit": "c9f5a998e8b69f0bcf0c0bb25931155a436c36cb", - "sha256": "1ma941sqvnzrb2dr3qvzfsxiy57v6iwji5a0la86s2mgv06zhp3c" + "commit": "b6bd3379b98d306935731e9632907387b078e000", + "sha256": "0ki38i2qiysba6xm6hc4xmy4vkpsvc85lh1vgjy8741wkysija2x" }, "stable": { "version": [ @@ -52753,8 +52915,8 @@ "repo": "BenediktBroich/helm-twitch", "unstable": { "version": [ - 20220207, - 1314 + 20220420, + 1625 ], "deps": [ "dash", @@ -52762,8 +52924,8 @@ "streamlink", "twitch-api" ], - "commit": "533216a1add8acc2d6f2b4039c67528b97d06549", - "sha256": "14686l3idn34scz9a3bai2x42zsrbfazpv1am6j64y7mrp284p8g" + "commit": "27fbec24cc250d508cd2f4286da16262752908eb", + "sha256": "1sair8har6blwn1s12msz780cfsjpn0fzhy6ckhjh4sw9747808b" } }, { @@ -53989,17 +54151,17 @@ }, { "ename": "hl-block-mode", - "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", - "sha256": "17ghc2hbvckp68blk8izwmx6far9ampalik2f9idz27982h49ia8", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-hl-block-mode", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0jav8lk7vyfmvb10l4zy12zq9cbiw2f8biw5cp2hg95829hwlin9", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-hl-block-mode.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "3dd29cfbf24fec16eaf3d47936338adb6b34f5c8", - "sha256": "0c0533id01lx0xf5dkkddd3gwb3k2jh55fa6z0d2xzrmc7p1971x" + "commit": "7e0452c768a4e309d1cdc15025683ebfe71e626f", + "sha256": "0ymkxmpfd19qjdc80a6hrljbwpn78xvj6r769zfskyhqj3a3a2xd" } }, { @@ -54040,17 +54202,17 @@ }, { "ename": "hl-prog-extra", - "commit": "d4ababc787d4dd173c65cc1b4b4a0fc0bb6e6d07", - "sha256": "1dgjskhz1jq01j19dmy8d3fzrg1d8jzrycdsxmkjlc2h05285wkg", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-hl-prog-extra", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0fgs70wfrlk99j439ypnjysa0d3fw6h4rf5w1878p9f69azwpz2f", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-hl-prog-extra.git", "unstable": { "version": [ - 20220324, - 16 + 20220507, + 1118 ], - "commit": "3312497ddfc7b7bc0e773ae98fc02477a4b0c7a0", - "sha256": "1n436z6dg7c1vw6sl5bswny059d2629yx9cvlkf076xg8dmlhwdv" + "commit": "a8e2ee5d43ce70c59e57d2ab90b39a6cf9e7b851", + "sha256": "08vs56lvq9ihhxd7vhcgd9lry2bm8q14mx18ap1izj6r52njdsy5" } }, { @@ -54083,11 +54245,14 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20220402, - 1112 + 20220422, + 1611 ], - "commit": "7772ce536e5146f44efc3cc0ce2d9326f115683d", - "sha256": "03gb1vp44bf6a0h6r298bw1zsfd7rxxpph2ll2prspx7kzi2f5ph" + "deps": [ + "compat" + ], + "commit": "6769accd7003ba5a0376d2c5cef0fcffce8f45be", + "sha256": "16jgnv26jp3zxz2gry6703gi4p9v8ggm4ljhm85bg84ana81rhw0" }, "stable": { "version": [ @@ -54688,8 +54853,8 @@ 20200929, 559 ], - "commit": "88beaf52358a5b59c598e1f6c9fc16dd6bd5a850", - "sha256": "1ldf07gaynb463giwlplb332fc1k2xabrrzpw64f0n2rnmjhafll" + "commit": "049efcadbd9b51a601cca60fc78616bcef0799ae", + "sha256": "09l1n4jmw2cr89jfss3zmlbzpbglir1h548kv3zdl44hbyb4wlk9" }, "stable": { "version": [ @@ -55449,11 +55614,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20210603, - 1343 + 20220418, + 2119 ], - "commit": "3bee30b374226deecde8a5cbbc6ca8471c303348", - "sha256": "1c7riqgm5fi13kb2k7qfykr0zsx3hkwyzgcxh4kqnd1y5w54pgs2" + "commit": "f5775d535630199703c936380d210d38249b342c", + "sha256": "1xc1sy51xf3mcbx6bprb6g4hzgg1rm7as3nx8q54wma7dllmh092" }, "stable": { "version": [ @@ -55575,17 +55740,17 @@ }, { "ename": "idle-highlight-mode", - "commit": "43c7b0d74b482de5134de097e982934cd72c5f04", - "sha256": "1yrvvizw48lky06zjsx2n2w5cb2c5qz2kvcm9bpqyr5gp2w63pls", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-idle-highlight-mode", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "15was00580bx5wqvmyp6fc6l54zx5gcwnqgdzpbmyvnxx4v39znl", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-idle-highlight-mode.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "0a24f8e402383b0da1f956d946781317fba14bbc", - "sha256": "11mbm87rx4i093csdqrgin550wgkps69ysgy2ig56m3l1hs5pp78" + "commit": "5418252a11b00377a59295e50b7436f53afe68bb", + "sha256": "0dmqvpck1hwlw8z2lppyc1cnjw62gm9yykk2j4j3ckdvgcpkj6cj" } }, { @@ -56253,11 +56418,14 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20220401, - 1051 + 20220422, + 1611 + ], + "deps": [ + "compat" ], - "commit": "2541fb021dec9eaa3083aca4c8ce30b67a50d6b9", - "sha256": "0k89lbq9dfi3vx7kmf8z3an0x278806skr5s86y54c2l0190giz3" + "commit": "51aeac9f3a24f23d063f591066675d1d70dcea09", + "sha256": "1zl2lkdflssii5mvxr2hgz6spx4qpbvixrm1jj0nrh128s23jx9m" }, "stable": { "version": [ @@ -56544,8 +56712,8 @@ "deps": [ "impatient-mode" ], - "commit": "e5513ae24dfdb58b7c2c2bba544124af4619b241", - "sha256": "1m841f9d9iqmmlycaa703d43svpizix3vbyhqbzrp9idn2l68xb2" + "commit": "6825147ebacb1d738b1c96baf0534a5ed3e6b289", + "sha256": "10kjxm93cdll6a5l1lzk0ciya5z6d02x5rl7har507ac1laj1v23" }, "stable": { "version": [ @@ -56685,8 +56853,8 @@ 20220227, 653 ], - "commit": "604027eda4ee8a44b085ffebbee944ad0d57fa20", - "sha256": "01s4l66afvzs6fb8mv3r8zs514ak6j13p1jhjrsw16s4dnmgc1nj" + "commit": "6fb6c9326077105febe2cd9c77b683b7c310cf03", + "sha256": "069mcbj3gwpbw1fwrpyfb81s0kyk3vklymfj9z7nr7yl8ra986ym" }, "stable": { "version": [ @@ -56891,14 +57059,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20220315, - 1102 + 20220421, + 559 ], "deps": [ "clojure-mode" ], - "commit": "f511dcad0e0684c9609c7526930e88d11da989ab", - "sha256": "1xxjqf3j2k92sj4zwhkjywc6yr5x183r8n33lba2v3w5hcfgahd0" + "commit": "abeab8d6d4cb3bdded5e9083776aab0c06cbdf57", + "sha256": "0b73dm3kyard035jfijcah8vp96vzgywmkl0ajnhyzzxmbl26hqa" }, "stable": { "version": [ @@ -57336,17 +57504,17 @@ }, { "ename": "inkpot-theme", - "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", - "sha256": "1avgzjwppmmhdmljwpy75acylm3f74d3x0q94ld2n1yhi8xx40i9", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-inkpot-theme", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "07d6344a0x7dhlgw9i8dzw7mcdz71d1mig5y307rdqj27ic3bbqn", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-theme-inkpot.git", "unstable": { "version": [ - 20220412, - 538 + 20220507, + 1118 ], - "commit": "8e5c3ce6269debfe7879dfa33a82a4f63c881720", - "sha256": "1q3j1vfyh0a5fmqayz6q6znwszmkpbyv717lzqpjlll4yj8bzw37" + "commit": "59056ef2e8850d33abc6e787219fcff404217afc", + "sha256": "1fayzcc9ixpnhma7968y70zdfslcvxrx3sgqsln0kp5zdkzm2691" } }, { @@ -57921,8 +58089,8 @@ "deps": [ "f" ], - "commit": "3a56ce86e96bd843123f01785d304e022dd020c4", - "sha256": "02c9yrjpqa30skimvh1bf45p9zr12n8m53r7992hjpnk8xadyvj9" + "commit": "e6c9d5e19533eda6b74505a86198416eeecb915a", + "sha256": "00chrr0i1bw0dzrlznahca8zj4q9yqwl187m9dm9d1kgh0dwhn3s" }, "stable": { "version": [ @@ -58076,19 +58244,19 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20211119, - 1718 + 20220501, + 1542 ], - "commit": "077684feec98ce6d5e283a13f056c083986628a2", - "sha256": "12flc98nv353cqr9qbkasgdmiyf9c3iw4apzh899xw857j1h5qdr" + "commit": "1abca3665ecfa6b016311906560f8be4fbb3e3db", + "sha256": "1jzd9kzxf3ncw40d55r1apw0cpk4i1a3s5p85mg9n20553cb6lhj" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "077684feec98ce6d5e283a13f056c083986628a2", - "sha256": "12flc98nv353cqr9qbkasgdmiyf9c3iw4apzh899xw857j1h5qdr" + "commit": "1abca3665ecfa6b016311906560f8be4fbb3e3db", + "sha256": "1jzd9kzxf3ncw40d55r1apw0cpk4i1a3s5p85mg9n20553cb6lhj" } }, { @@ -58157,8 +58325,8 @@ 20220406, 1052 ], - "commit": "7489968257a74f176c0d1de7ec8bd1e2011f0db4", - "sha256": "0gmgfv9d5vicd5lqcbzn0i6qfjw42whhww6hdqch2pgkhl4i1ria" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -58185,8 +58353,8 @@ "avy", "ivy" ], - "commit": "7489968257a74f176c0d1de7ec8bd1e2011f0db4", - "sha256": "0gmgfv9d5vicd5lqcbzn0i6qfjw42whhww6hdqch2pgkhl4i1ria" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -58218,8 +58386,8 @@ "cl-lib", "ivy" ], - "commit": "c089a1cc87d91611366b9430c2890c628b3342c4", - "sha256": "1vlpq96w4bvbjz4pa3f2l8vs0jp7gb7k7jlhqjbdpm5qv09q513k" + "commit": "ce8c17690ddad73d01531084b282f221f8eb6669", + "sha256": "15b37xa3f9npbqmr9ml9km61v2l04csgnf61kfr5849zj423643s" }, "stable": { "version": [ @@ -58432,8 +58600,8 @@ "ivy", "s" ], - "commit": "eb004b51b6bf7f41cf084aecc6d31e90a174ffd6", - "sha256": "08gbbmv6ksd6lpwc53acjvxb5yni78r4rxfi5bnxvqq2fn1vw1iz" + "commit": "942b2565097c97c1afc4fa395fac5788eabc730b", + "sha256": "03q15h6ckbrxmwskf19dhzcr8whgcipbf4nilpqfnhpsn5f4zl8l" }, "stable": { "version": [ @@ -58553,8 +58721,8 @@ "hydra", "ivy" ], - "commit": "7489968257a74f176c0d1de7ec8bd1e2011f0db4", - "sha256": "0gmgfv9d5vicd5lqcbzn0i6qfjw42whhww6hdqch2pgkhl4i1ria" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -58754,15 +58922,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20211228, - 417 + 20220501, + 2235 ], "deps": [ "ivy", "prescient" ], - "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", - "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" + "commit": "d9b30d741c729a37eb2c6e51d72281c0844780ca", + "sha256": "1n9sa0wvw8yhq2l82hfpx1pgg7lmphd18xrjx6jfqfdkna9j3a8j" }, "stable": { "version": [ @@ -58886,8 +59054,8 @@ "s", "searcher" ], - "commit": "4501687a2cc9d8746a054bbc89691e7e2deff1f3", - "sha256": "08nk430yygbc6hqj7s8nn0w62p36hk92a6cfylbbpqgbc5cyrsjj" + "commit": "17a93eadb8a681d878e1d66b90073ed1be2e1dc2", + "sha256": "0m0lvpqamikmg957jj2nkr8xqzxl0kxyjl68577h4r83b60xrnhh" }, "stable": { "version": [ @@ -59668,14 +59836,14 @@ "repo": "john2x/jenkinsfile-mode", "unstable": { "version": [ - 20200929, - 428 + 20220428, + 1113 ], "deps": [ "groovy-mode" ], - "commit": "65bf3925852c35c6bd499978f08f83c1193f4347", - "sha256": "0w38g88yykslg71xr99ff4vx1ffgy90b7xqvvdflr189gwk3avx1" + "commit": "fa5545be1329df3067dcfd81749bbd99df070d6b", + "sha256": "1cg1k3c4k21im499i09yajqhh20igmd2riyia8y65swvvksnzyrc" } }, { @@ -60756,11 +60924,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20211023, - 1434 + 20220418, + 809 ], - "commit": "b1a7119843cb81677d15cba9df64d02b30ea08a8", - "sha256": "1n1dzwg0sfsdkcm18iqiqwf6jspmp2vwipiasdja54ns1m98w2cv" + "commit": "adf4029be778c5983c436873b8a78bc72a6b09f8", + "sha256": "0z6vx541vskgzb1dmlcijbch4z84lrz5fm2ay0n15sypvxfp2yks" }, "stable": { "version": [ @@ -60779,14 +60947,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20220225, - 810 + 20220428, + 541 ], "deps": [ "s" ], - "commit": "6c1d63511fb2b3b3f2e342eff6a375d78be6c12c", - "sha256": "07fl2bcl1drscp94gpy0v3n31rml8fffc7iv5v80qh8zwvn57d6h" + "commit": "2342003662071cf7b256f0a7cd8f545bcffaf22a", + "sha256": "0i38n3s0fc32a1jzw0nchapjkfqxqfkl7r9zzvckbsxkcn2fldwj" }, "stable": { "version": [ @@ -60827,18 +60995,19 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220325, - 2038 + 20220508, + 456 ], "deps": [ "dash", "julia-mode", + "popup", "s", "spinner", "vterm" ], - "commit": "80a2def11e444d8ba2b640d0ea76720cfefccb65", - "sha256": "1k5wqlxgijz73qscbdnkaia3ffw55x08xyqmfppvqv1w4gdvr0ya" + "commit": "47cfc8cc0c5b383b0647c91e657f1ffeaf73cce8", + "sha256": "1n7igv0lfkx9zh12lhbc77mg3ycl3qmc58982damh7r4cvq1lv4w" }, "stable": { "version": [ @@ -60865,14 +61034,14 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20210410, - 40 + 20220503, + 7 ], "deps": [ "vterm" ], - "commit": "d57448466c11833d4fd67f5dbbea9cb9a07a74e2", - "sha256": "0v7l4jxq71vcw3sjs476smbw9ln6xfrq7n3vzw26apzkrplizqyy" + "commit": "443924f6eb77d64a20b4b34a99d3c7d2d54f73a8", + "sha256": "00piv8ifjhpwsk0rwnz9nph02ws1yiybqn4yxb7wv3ppxy139vzx" }, "stable": { "version": [ @@ -61018,8 +61187,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20220212, - 210 + 20220419, + 1852 ], "deps": [ "cl-lib", @@ -61027,8 +61196,8 @@ "websocket", "zmq" ], - "commit": "0a7055d7b12cf98723110415b08ee91869fa7d94", - "sha256": "183313jlmfnbndczllkqm47y4495prw4ks2jav3pdwn5qqfmpznx" + "commit": "7d20c0aee2f9c896215f35232905b23532ef04c5", + "sha256": "0lrg43xas5dx1qlhzk7irq5hwgpfpxkv27zgcrcy0sbhd9y8dad6" }, "stable": { "version": [ @@ -61434,15 +61603,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20220413, - 1705 + 20220422, + 1305 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "bd37ae6e48d918e9d72513345903093239a8ad8d", - "sha256": "0sv1f7yhh5ap6j1a5j6ysrgbhqmnk4mpgkmzdjlclg8209d8as24" + "commit": "51b1f719bc300a4f684b6dc7511dfb044f75f575", + "sha256": "0nq78kb751lgz398w8xbbl63cznb1g3l6j0j4limylmi8rlzvsnd" }, "stable": { "version": [ @@ -61773,11 +61942,14 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20220407, - 1930 + 20220422, + 1611 + ], + "deps": [ + "compat" ], - "commit": "809ce7625a8c8c7ae1ca4e4a38aa857f83c4e732", - "sha256": "0qv5y3zj3d3pv4mw2s38g1dnq5lf57ja7nka2k50j5sdfyhy15h6" + "commit": "0c37db482ca98e729430121209d70dd093082a5e", + "sha256": "1i4l145k9jrl8dv5wkcg3nbm6s0as1myz8vzh4k9rdi2ra6lkajr" }, "stable": { "version": [ @@ -61870,14 +62042,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20220402, - 1112 + 20220422, + 1612 ], "deps": [ - "cl-lib" + "compat" ], - "commit": "7f51c35abdb7e7c5b6e91f2dc01eb59df70bc3ca", - "sha256": "1xashacybsn90c9a9pvk2bgrja7d8j3ziwdrc4h6i7acxhskvmsq" + "commit": "0fd91fef890fb4c18c552e5ecaddd53c9bdac2bd", + "sha256": "1qhl8zq0b8qzanglw2j1c7ll4ifryvjmf3z4y9c22pfr5xf187c2" }, "stable": { "version": [ @@ -62008,8 +62180,8 @@ 20220222, 639 ], - "commit": "4d99f966deaf5345d68b4c852a196bd2c09396bc", - "sha256": "0ybqjavid761abc0pfiw12mp2iwcvm4xqzmb8k47znvfa0c54wwn" + "commit": "5236c2aa6a4f2deeb0421c7d1c315ed9e6b6222a", + "sha256": "0374kgz3gv9h0gksmn91cbbf5hrwjy981f2prk0wl5djwks8nb3i" }, "stable": { "version": [ @@ -62264,8 +62436,8 @@ 20210318, 2106 ], - "commit": "4fbf9059ce5917ac27685d2b5795e4c447a3f571", - "sha256": "0f2ix6kkixvvqjrr0nz9s6vjckd7s8dn03sf5zmq1xnph6cbrzf4" + "commit": "93ccd2058c1980207848810942dbb1a6d9edebe9", + "sha256": "1ciqb2simq7fdc31pjav30rlskami70dcg4abqairfq3yvx5nb7k" }, "stable": { "version": [ @@ -62579,8 +62751,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20220331, - 1355 + 20220426, + 1722 ], "deps": [ "dash", @@ -62588,8 +62760,8 @@ "transient", "yaml-mode" ], - "commit": "b598b21988b8d5b2f44803a31f891f12ea511982", - "sha256": "1p0y4a4g0y77b4v1x650mz7m504iqjdf2xwnqhjygc9n3a0cqsp5" + "commit": "dea03843dc7b152cdfb84c14e076cf79a721a87f", + "sha256": "1y4qy6v2nj3pimffdsc2bgjlb10hvvbhpnizv3xnhcb3brfz3ddr" }, "stable": { "version": [ @@ -62621,8 +62793,8 @@ "evil", "kubel" ], - "commit": "b598b21988b8d5b2f44803a31f891f12ea511982", - "sha256": "1p0y4a4g0y77b4v1x650mz7m504iqjdf2xwnqhjygc9n3a0cqsp5" + "commit": "dea03843dc7b152cdfb84c14e076cf79a721a87f", + "sha256": "1y4qy6v2nj3pimffdsc2bgjlb10hvvbhpnizv3xnhcb3brfz3ddr" }, "stable": { "version": [ @@ -62753,26 +62925,26 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20200113, - 2027 + 20220508, + 929 ], "deps": [ "s" ], - "commit": "3fc84840cbbd75e646cafa2fd3a00004b55e37ec", - "sha256": "0y8wj8f2wzhg5vl4kjrqny3333616s4lcil085190yyb7mjakvn5" + "commit": "1c80df0f2c542f54920f18aa4eb837f0a51c7676", + "sha256": "0hmsf7kgzmpzri3ggb7l6y3pvfpinfv0d24fnxpbp1zd17lfwks1" }, "stable": { "version": [ 1, 2, - 6 + 7 ], "deps": [ "s" ], - "commit": "a27153f6a01f38226920772dc4917b73166da5e6", - "sha256": "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955" + "commit": "1c80df0f2c542f54920f18aa4eb837f0a51c7676", + "sha256": "0hmsf7kgzmpzri3ggb7l6y3pvfpinfv0d24fnxpbp1zd17lfwks1" } }, { @@ -62837,14 +63009,14 @@ "url": "https://git.sr.ht/~tarsius/l", "unstable": { "version": [ - 20220412, - 1418 + 20220422, + 1612 ], "deps": [ "seq" ], - "commit": "6a3e0b9709b2b386ac83f1dd05e54ad2a1ae11e3", - "sha256": "108kd0ymm4rfqchryjgmyvxsfd11xbp8ddlynprbckp61mjhqsaj" + "commit": "c2466e52702a189fcc1ecad25cc1ad9f203f6627", + "sha256": "1j6m799hxwlj9mlnqv4s9ngjfc1m7ih81sv8nmjb1ci9xilkhgdq" }, "stable": { "version": [ @@ -62962,11 +63134,11 @@ "repo": "HenryNewcomer/laguna-theme", "unstable": { "version": [ - 20220109, - 1015 + 20220419, + 1459 ], - "commit": "579bbd2453bd88673873a012dd70522e7d4265ce", - "sha256": "1lnmsicybg02i7yrl3gfngmwa4yyskkq4qrba7cgsgvhadg9fdmq" + "commit": "48d14ffad6f0ffb4bd60c341e618c47ddbb7a2d8", + "sha256": "0s2pm1ykkg4r39sigbpr5rjqv25dxpiz47jg3j38m2qpihgi03nw" } }, { @@ -63507,6 +63679,24 @@ "sha256": "0mc55icihxqpf8b05990q1lc2nj2792wcgyr73xsiqx0963sjaj8" } }, + { + "ename": "le-thesaurus", + "commit": "4534fab1d43c425745f44465adbd1f8a9168ced8", + "sha256": "14sg1c7wn9f6xk1sychw857f88ddlx9c6b71p8cw08gz5hdm2463", + "fetcher": "github", + "repo": "AnselmC/le-thesaurus.el", + "unstable": { + "version": [ + 20220508, + 1442 + ], + "deps": [ + "request" + ], + "commit": "941390e5ca942c7459faf4e5988898baaa66fa14", + "sha256": "076rjjsl4iq7bxky6ca67q3zfc7xnnrl4isdyd1csh0b1sxhalx9" + } + }, { "ename": "leaf", "commit": "24afe5b39979e2f17e104ae97d840645d2a5c2f1", @@ -63669,8 +63859,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20220124, - 1813 + 20220501, + 1007 ], "deps": [ "dash", @@ -63678,8 +63868,8 @@ "flycheck", "s" ], - "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", - "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" + "commit": "362bc6fa3efb1874c525ed6b4b6f24f76af22596", + "sha256": "1lr4h555fa1kdi3q7hkhsnznv7nh9rgjqjkbj2bqp9zwh06245w3" } }, { @@ -63814,8 +64004,8 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20220206, - 1515 + 20220503, + 534 ], "deps": [ "aio", @@ -63824,14 +64014,14 @@ "log4e", "spinner" ], - "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", - "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" + "commit": "682f7a44d0bea0daf6f9a2888fa7f905d3a0cd70", + "sha256": "1y6b5sh83n5daz6p0n33ynf4j6227dpa54x4hpjwr8n7fkjfjwiq" }, "stable": { "version": [ 0, 1, - 24 + 27 ], "deps": [ "aio", @@ -63840,8 +64030,8 @@ "log4e", "spinner" ], - "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", - "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" + "commit": "b95221179bd51b43bb2c5e810e1a2de88ef54d82", + "sha256": "1gmap7472cakcigibydgg0zjd5yha4dp22w0ffqk6zl4qrh7hcdb" } }, { @@ -64057,11 +64247,11 @@ "repo": "tecosaur/lexic", "unstable": { "version": [ - 20220405, - 1339 + 20220501, + 1432 ], - "commit": "83e78f8b1b42b15a890aa29dbeccb2eb389215fb", - "sha256": "16iancwz1n50g2kqvs8ipyljh7x268ssj6lkzy82mmngskfz7sz8" + "commit": "f9b3de4d9c2dd1ce5022383e1a504b87bf7d1b09", + "sha256": "02iz8dh18gb1q97v8ghcd3lavkf28sqbrk0bx6jzzryp69ickk4h" } }, { @@ -64206,6 +64396,29 @@ "sha256": "19sxrikxl0kbfnbl2rdjvj96l9abmqhi68jj5hglgpa8qp3flc24" } }, + { + "ename": "liblouis", + "commit": "13f11dc010e5ba2bb722b7cbff31207be9074128", + "sha256": "08i3kbq9x3sw3i8fhlam8cwzzncqk5nzb24kd29nv7wa2q5g16kw", + "fetcher": "github", + "repo": "liblouis/liblouis-mode", + "unstable": { + "version": [ + 20220426, + 657 + ], + "commit": "a341a0c434cdbe7f46956c8db13203c3fc941a34", + "sha256": "1pkrwxqf1qyxfyyinsnmvvlydgydxazfi0xsl28f08a5zgknv0ab" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "36ec3f98c0a3a84669444a9b3726824f1aaa9682", + "sha256": "1s910nr7cdwwafbdp4kg2j3xcavhrzjla3klrjyndv7skfh2vaad" + } + }, { "ename": "libmpdee", "commit": "fc91db6f80463a1baea9759f9863b551ae21e180", @@ -64318,8 +64531,8 @@ "deps": [ "request" ], - "commit": "e6959223f8e0760063a1048d433d9a9d76c09dd6", - "sha256": "1jvsqfhm64avzav7n0q6l588vc09w14bbaz6lbgl5pdcc1dgvjcj" + "commit": "e03f4a30c4abf354fb961babe4dce1dfa733aa82", + "sha256": "11mjypjv1h2qsfbqxfwknv6lp2fql4cnfsivcpj68475grn1g3s5" }, "stable": { "version": [ @@ -64360,8 +64573,8 @@ 20220209, 755 ], - "commit": "0f5db066c87fe91c1f269cf6b92653f3230c44a1", - "sha256": "19a822jdfpxw7safhgyfsygav4wmr78i0fvw70jarhm2vj9wknpq" + "commit": "87084396a2927d6921a794e40322e4affcbde2df", + "sha256": "1d6wq2k9js8s4sbwrvlls9w79p4l5d31fkb2hphmaijx07w1a6ks" }, "stable": { "version": [ @@ -64381,8 +64594,8 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220405, - 1658 + 20220502, + 1210 ], "deps": [ "fringe-helper", @@ -64390,8 +64603,8 @@ "indicators", "ov" ], - "commit": "45519a4738a999b06f6d40f7dcf2022904e67aa9", - "sha256": "1d5mvxkjy6fpi2jiinc532pbmwdlcgql80bna7kwkg88cdyws1n4" + "commit": "41bc1b7f0e9dd150b99aeb47c4c9874d7c6c2d9b", + "sha256": "088g5wlgq6xvix2kkwzh4df556p9bn8hjlwks420ym3lp97syx9a" }, "stable": { "version": [ @@ -64636,8 +64849,8 @@ 20211004, 1429 ], - "commit": "ba6b7c16ea633112282c3fbdf41b06c82727a541", - "sha256": "1fw6ld08a2gd8bhyjpgxqbjjmb6kv317bcrc98n3v093cph1b58w" + "commit": "22dd4c3ea4c0d2bd82270e2fb272317d0bc87752", + "sha256": "02aa3ci9cfxswpv5nf0bqpp9lkbqirpmksg5hwxl0xxr672mv7kc" }, "stable": { "version": [ @@ -65141,14 +65354,14 @@ "repo": "Atreyagaurav/litex-mode", "unstable": { "version": [ - 20220308, - 1707 + 20220415, + 1704 ], "deps": [ "cl-lib" ], - "commit": "59ef93dca6618c42db1b61fe0a44bdc8faf04506", - "sha256": "08i5v97azfxkp4aqsg2kijyy2w5swxhkplvp40v1bswyy3kn176v" + "commit": "5d5750af2990c050c8d36baa4b8e7a45850d5a6a", + "sha256": "0kfij90iqslc6lnlpvj0hmfhfrfhp28ljd4zj6gv8wz02aldkjgd" }, "stable": { "version": [ @@ -65230,17 +65443,17 @@ 20220404, 0 ], - "commit": "09ae89505a7b411ab659bba83dd1a2a26a584a2e", - "sha256": "0i65v6p306ch08plcham1n1g9b0ln9s3hmkrdd52mp9bjjhwqcgk" + "commit": "b466460b6783caacf1ea3fcfa28752cb73fd0805", + "sha256": "0r0959gy5jq42656pqimap2l790hyb0l3zxqdi2wb02d21276jwl" }, "stable": { "version": [ 4, 8, - 0 + 1 ], - "commit": "cc2adbd4455dcc70cc1366af5e0754a619e75242", - "sha256": "14n8cf020hpz9hrhf7pxcxszvbkp19s5j5cz3a42n4jh7jpacdzp" + "commit": "b10020b0414f15990f4139c363910b58c7ca0852", + "sha256": "0lch1m9xw5xq71sllkhiaxls8rbq9gdj24pyi66p7g6026n5fc21" } }, { @@ -65341,14 +65554,14 @@ "url": "https://git.sr.ht/~tarsius/llama", "unstable": { "version": [ - 20211118, - 1847 + 20220428, + 1405 ], "deps": [ "seq" ], - "commit": "22278a95474ccd665f84c16aa8760534ced9b150", - "sha256": "1f5hnimnz9vjwnqk0m07g6rrhnxbv84mdybxiblzqgbgrh7x0cx3" + "commit": "adc5d169fad53d6d11000a72dc95f8489a8c7534", + "sha256": "1c1yvndzs7lry8nw1bhks4vjlvbjg1fikcpf3xdlfahahp3w1dh9" }, "stable": { "version": [ @@ -65626,8 +65839,8 @@ "ht", "s" ], - "commit": "87cdae737bc540520aa8c8eb3e90a9a3a2108592", - "sha256": "10956s0ix1m19g8r9b0pm8wicm19nyk87k1bqbpcg9f28c2rml9k" + "commit": "b3366ec866b6e3b5c608fee23e86eb832d132ef8", + "sha256": "106fgd8id9xrrl7qyyzxxmi690m29i7zcfk6anc5h52lm52ydk0j" }, "stable": { "version": [ @@ -65861,15 +66074,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220330, - 127 + 20220508, + 2220 ], "deps": [ "map", "seq" ], - "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", - "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" + "commit": "5608825f3eaa30c23ae495a4ce6f6458672743ba", + "sha256": "1jgh82idfrcpnyik3zd129lg0f0mayjnc7xd1wk2jbh84vv217ds" }, "stable": { "version": [ @@ -65900,8 +66113,8 @@ "dash", "loopy" ], - "commit": "cd49433244ef450a1dd10a65a7839076d61bdcf1", - "sha256": "0mdr09vqy4xrqb2l4g3j8n99zvqajw1jxxvvm9zv03zkwvcink1c" + "commit": "5608825f3eaa30c23ae495a4ce6f6458672743ba", + "sha256": "1jgh82idfrcpnyik3zd129lg0f0mayjnc7xd1wk2jbh84vv217ds" }, "stable": { "version": [ @@ -65981,8 +66194,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220313, - 1835 + 20220430, + 1535 ], "deps": [ "dap-mode", @@ -65992,8 +66205,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "fda433671f38874f0ebe66c43c64fec14af3f492", - "sha256": "1zszzw0a58s1clsvhvqxymivrw2x6p96cxx9pygr8is8f9353hpg" + "commit": "7ca60ce9a703ad7a950dcd5ec36ef4251f57d207", + "sha256": "1snsnd9pgq2lz3avypps73qfdl3ky2i5sx04sybj7gj41yz834bc" }, "stable": { "version": [ @@ -66021,8 +66234,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20211203, - 1659 + 20220501, + 1056 ], "deps": [ "dash", @@ -66031,8 +66244,8 @@ "lsp-mode", "yaml" ], - "commit": "c2da2a65cb11e92d23c480dcc12387aa53997181", - "sha256": "067bc37v14mvrmayah95qkcmi8gh3fdhdh8493wabm47kgszsfh4" + "commit": "c57863609abfb93fccabf81dc3112ac38f93c4a2", + "sha256": "007rf2zbkskidskmcnlsx56dxv0saqm2nl9ih1rk6h9vm27yl24z" } }, { @@ -66085,8 +66298,8 @@ "request", "s" ], - "commit": "bc1c71d797d919869f9a7086f8413d260e9df3ef", - "sha256": "1q8m98a0xz49sd080sxg8dcp8jn50d2lm11nmz4pbcn7cf678hy9" + "commit": "2c01e3d8ec55835cf18945786f4a74ad6b7c4260", + "sha256": "0hwf3i7j2rx2m0p89w14la8kk13k5s3nf19i6bnllymy1aykhwng" }, "stable": { "version": [ @@ -66119,8 +66332,8 @@ "deps": [ "lsp-mode" ], - "commit": "7cf64944ab3a25ea5d6f8d5e0cd33124182df991", - "sha256": "037wcvan0185bhzzhi4phw9z245a28s29zvyfik04c27n0bhm2xf" + "commit": "daa51072e1718ca075987901fccbbc2357bca1fc", + "sha256": "0d2myk2906j0ngivca1yf4vdi8bfk5pz706nx279bf0pil7irdy0" } }, { @@ -66195,8 +66408,8 @@ "request", "treemacs" ], - "commit": "0968038b9aea52ef3bf499e597cf3800d913c059", - "sha256": "1rpssrv1avbfq47h23qiymzhzddcxgs77diwq3mavqkxkqrkj3vz" + "commit": "39ca56e24d6f9db2c9d889f79808713e4afde027", + "sha256": "011c2b25k650fbxvpifmld6v0bga1s5679zfl10f1srhlk56p47v" }, "stable": { "version": [ @@ -66245,26 +66458,26 @@ "repo": "fredcamps/lsp-jedi", "unstable": { "version": [ - 20220407, - 406 + 20220430, + 18 ], "deps": [ "lsp-mode" ], - "commit": "b22927b2b51bde8692e70ea60cbb90ff4bfaffb4", - "sha256": "1aadck54fx2f907wi0bm9bwrhjf9ivzfyrrgp50m8a4yjnh9acfv" + "commit": "5e3eb3e160c2d38b8bd2b5cd3b86fa4f823f9330", + "sha256": "0kax988drrzsx103v71bz4vczh4bg0n80arrzm4r6sgrk01219j0" }, "stable": { "version": [ 1, - 1, - 0 + 2, + 2 ], "deps": [ "lsp-mode" ], - "commit": "b22927b2b51bde8692e70ea60cbb90ff4bfaffb4", - "sha256": "1aadck54fx2f907wi0bm9bwrhjf9ivzfyrrgp50m8a4yjnh9acfv" + "commit": "5e3eb3e160c2d38b8bd2b5cd3b86fa4f823f9330", + "sha256": "0kax988drrzsx103v71bz4vczh4bg0n80arrzm4r6sgrk01219j0" } }, { @@ -66337,14 +66550,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20220222, - 656 + 20220508, + 533 ], "deps": [ "lsp-mode" ], - "commit": "ac7d53f72b50df121ee69d0d8fe684d327adade6", - "sha256": "1093g7lyf7k2zcxgmcy0hkjkz3x302x0l3v7g8madrd7axx23sbb" + "commit": "8eb3a6ad1f20a44eb446834c03bd688558b07236", + "sha256": "1x6lb4ahyyangrkcf5s8ck7f4c8wjirwh0zkrbjbyigzb30mb1kp" }, "stable": { "version": [ @@ -66413,8 +66626,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220412, - 1914 + 20220505, + 630 ], "deps": [ "dash", @@ -66424,8 +66637,8 @@ "markdown-mode", "spinner" ], - "commit": "d1be7c90e0c6bf6c810e19a12b6a6e76568f0456", - "sha256": "1qksj5l8iz9s7yhrkrsvf012w7kbdxjnwqi9bvzy7lk518xqhk97" + "commit": "6327359f3b5e19aeaa1c9ee6bd9b80b51f95f843", + "sha256": "04aw7iq07nv9b1nhf9qq7sdphhq3fa684rkaxvc23r1zraxxqsdf" }, "stable": { "version": [ @@ -66463,8 +66676,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "88319a61a06e27fc1d3ea2e7b853ec1692b4c166", - "sha256": "0007lv95cqh8makipas2m4rkllig5zvi51hv3zadlhw57xnvlhjw" + "commit": "8d5d4d4a7f72b4cae89a48ea8618f3ef28bcb121", + "sha256": "1q7d6cbmdr00a36q5nhs2fpqvgapx7fh1rwzp7ih079w7aszm002" } }, { @@ -66482,8 +66695,8 @@ "lsp-mode", "origami" ], - "commit": "5b88ab77dc2696c93fa5dd9debe183821c533b71", - "sha256": "0chf7b8qdgzm173crpbz3vl3kjhgcdsmkprz8bf6w3qb5lpvaysw" + "commit": "7df9c91a309aa4229bec41f109920b37c4197618", + "sha256": "1kq2r2rjwk0ryc832fqfqb3l1yr2ysrj36dzwnj7h1np06rdzpwv" }, "stable": { "version": [ @@ -66580,8 +66793,8 @@ "ht", "lsp-mode" ], - "commit": "308ba57a272c5b17705e534584bd52933e2ace6b", - "sha256": "020njrx0g4isjshldq4gd3f0jp6h3xgk7xs0n0a7czp5hakx9p3n" + "commit": "ab7369d96f4d7d058d0e06e743f86fda8ecc191c", + "sha256": "0dr47dhp0ymb4gmx4xiayiapbkri1hgr2faivp4fqs6gz3w4z4kn" }, "stable": { "version": [ @@ -66612,8 +66825,8 @@ "deps": [ "lsp-mode" ], - "commit": "a56459216b3fdd99f7e3703ce0d20bb517b0222e", - "sha256": "0m23gbxfs1gyhj4i2iwq7g7818qpr2z6hwp7cllnflxf3j5m95s0" + "commit": "f8e7c4bcaefbc3fd96e1ca53d17589be0403b828", + "sha256": "1z7cs2linikm54a7dqn66p58vnsnhy2rj99l2wixa6cdfxlmacn0" }, "stable": { "version": [ @@ -66713,8 +66926,8 @@ "deps": [ "lsp-mode" ], - "commit": "010318052021ec041727e58e41752af094c8827a", - "sha256": "1rwszx7qza3nshcwvgq0lq3bnrggyq45k4363bhcqf95fbjl5jxl" + "commit": "8c04fc4ac6f5eb8053ecdaaedffa35e0f7a5b865", + "sha256": "01qn3qkr06jz0xsqvz76pc2x8aby0hv1f84mh1v3zsmcjdb64vy8" }, "stable": { "version": [ @@ -66736,8 +66949,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20220328, - 625 + 20220502, + 459 ], "deps": [ "dash", @@ -66746,8 +66959,8 @@ "lsp-mode", "treemacs" ], - "commit": "355e468b7fa9887c616a8bfe873d8e456303b67b", - "sha256": "0a9m0n50j3lkig9zsdach6fwxc0m6z33mb2pwwxyhv1xp3jksv92" + "commit": "9859326df6b8e8c954a3c227e53b6878e54aaae8", + "sha256": "0g1azw6638hig4bwy00wyr8pdj13dwf3v5lsjbgxsgckz831wl79" }, "stable": { "version": [ @@ -66773,16 +66986,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220411, - 1413 + 20220425, + 1046 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "7698f9b683349f13c0ff92c1b0f68c2fb11995b7", - "sha256": "1wgzbnwg04gdm6jn3qgyc3nv0ff5zj2rc905m39gsl6bzaz6vbda" + "commit": "6cd0409de6ca59c02d752b8e543bb5eaa61357e4", + "sha256": "1g82vx17wk8g91bshb7i7j7fbmb63032sz1alqlh8b0qc4fw0r39" }, "stable": { "version": [ @@ -67109,6 +67322,24 @@ "sha256": "1sf1h5660fd3mfcca3h1fqk3xssgigkil26wz1kp1kvxfx9lm31m" } }, + { + "ename": "macports", + "commit": "90d3395497abafe2016555dc000c21fa0c829ec7", + "sha256": "0s2ipwgwnrwp2x8gzlkr2y488ij4pah3mymjy3z2nivqs5lg5chv", + "fetcher": "github", + "repo": "amake/macports.el", + "unstable": { + "version": [ + 20220508, + 656 + ], + "deps": [ + "transient" + ], + "commit": "c2c93f8095ee47cc1da2d4f77487ba586d696305", + "sha256": "0rl7fkrcfd88mx467jlpc7fvqmp4p6f5ccnkm8jvs902dj28bsw2" + } + }, { "ename": "macro-math", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -67269,11 +67500,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20220408, - 1250 + 20220422, + 837 ], - "commit": "9c0faba222afc875cf604dd7fe4265f1ff891535", - "sha256": "17wz1mwfnpjzqzzlhns5jk7zc7ma22kasb0wfpwrnsra8wdx4svj" + "commit": "af1b83786c95d448dcb4df5406eb1cdba975abf5", + "sha256": "0aa1fg658j11990h9dfv9n92qa1f36szamfnq37pw27d08n4vkb8" }, "stable": { "version": [ @@ -67293,18 +67524,19 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220412, - 2029 + 20220508, + 1841 ], "deps": [ + "compat", "dash", "git-commit", "magit-section", "transient", "with-editor" ], - "commit": "3cfc8458e14c705afdfbeb7dcd3d3f43d7479344", - "sha256": "1v21p89srk09ahszwm257j950f8j939y3yx8qzmrvmwya4isi9n7" + "commit": "f331092df4d4dfc0a2a7424d929a9c845088d57f", + "sha256": "0vp5zqi980lb220i0gayiksy1hmkqsfjqbvhnhy7iwxqd3w7nxb3" }, "stable": { "version": [ @@ -67377,20 +67609,20 @@ }, { "ename": "magit-commit-mark", - "commit": "2d6e8cd768a8d119f1ac3407f9d5793b084e8f1d", - "sha256": "0dvw9plzhm3yql719xi2n4j1v9q31g67jnwx5n5pzjk90v2rzqxm", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-magit-commit-mark", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "04j8sr7yzl9ipwsra19vczk025v9kba8w43sy37r335dy6h7vr74", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-magit-commit-mark.git", "unstable": { "version": [ - 20220406, - 2314 + 20220507, + 1118 ], "deps": [ "magit" ], - "commit": "18d03e38f2825dfcf9d121720ee550294e5611a0", - "sha256": "0621rcfbd81p6vlr2i3h9lbbqagp4iyr4z63g38y0bylfj4hlc8j" + "commit": "bea29dc0419122b5dbc68b6b56cb0fbe97729e2d", + "sha256": "1xl5xr4vi0mafs1sv82sk5bm8qfm9kdl2jfxsv8p3y489fj4pn3c" } }, { @@ -67662,15 +67894,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220331, - 2308 + 20220429, + 1720 ], "deps": [ + "compat", "libgit", "magit" ], - "commit": "3cfc8458e14c705afdfbeb7dcd3d3f43d7479344", - "sha256": "1v21p89srk09ahszwm257j950f8j939y3yx8qzmrvmwya4isi9n7" + "commit": "f331092df4d4dfc0a2a7424d929a9c845088d57f", + "sha256": "0vp5zqi980lb220i0gayiksy1hmkqsfjqbvhnhy7iwxqd3w7nxb3" }, "stable": { "version": [ @@ -67818,14 +68051,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220329, - 1154 + 20220506, + 1936 ], "deps": [ + "compat", "dash" ], - "commit": "3cfc8458e14c705afdfbeb7dcd3d3f43d7479344", - "sha256": "1v21p89srk09ahszwm257j950f8j939y3yx8qzmrvmwya4isi9n7" + "commit": "f331092df4d4dfc0a2a7424d929a9c845088d57f", + "sha256": "0vp5zqi980lb220i0gayiksy1hmkqsfjqbvhnhy7iwxqd3w7nxb3" }, "stable": { "version": [ @@ -68400,8 +68634,8 @@ 20210108, 1832 ], - "commit": "4d00496bffe0299ef4ea26c705b895e4b50f4cf2", - "sha256": "14ihhixwj4rsjc6f1d7159zi4hwgfn1z6rrgl3vvqxxsxp7al4jy" + "commit": "e1af20253fbc5a91034ccd01cf00141130c11863", + "sha256": "1pvyv1yhhm5ziqrlvd0hfphp3mcdh8iwwqs5awb54frj9j61fsi8" }, "stable": { "version": [ @@ -68426,8 +68660,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "006eabbde7be9d6bf2038bfd9597323c794a8292", - "sha256": "0k6r9i7c4ji747km760xdxfwsk7nbydwfl7av0bvp0kpdda50n0w" + "commit": "e4c38aeb8ef6a85d8c082ad683720e5a4174aa79", + "sha256": "18w2xazs6hw49z7v2z8dcjwbzn696vny22ncdh0s2szp0acwvlaa" }, "stable": { "version": [ @@ -68450,11 +68684,11 @@ "repo": "choppsv1/emacs-mandm-theme", "unstable": { "version": [ - 20191112, - 1832 + 20220426, + 1131 ], - "commit": "4e6ce4f222c1fa175d56e926628f37caa5f398ce", - "sha256": "05lb7izcwivjlyx6442hkskppr2158wg0b8g9k435xl083vxmpfw" + "commit": "4991bbc4b17308f5dc53742dc528cbfdc467ee01", + "sha256": "1wykcvsw54fla7n01xqclbm4vmfpp4iikw3aqb7m04h0ayx56y02" } }, { @@ -68603,11 +68837,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220413, - 621 + 20220426, + 449 ], - "commit": "20c019e8847128b1303fbbad339a55a7ec2a482d", - "sha256": "06f4y3l767x07rih7jr7zcdb73ilsrmnk5ychkd8ci9ylcimlhni" + "commit": "26f2bd9ee7b63bcad6604108e2f565b34bc6083b", + "sha256": "0bbmhgcx6266rljbw641c7q8q7ygz8i4xvk6zyaqwvmnq09xqfch" }, "stable": { "version": [ @@ -68723,11 +68957,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20220406, - 410 + 20220508, + 1219 ], - "commit": "d2a3d5b8625a7c6be21f19f9146745cd5c791a6a", - "sha256": "00wiyghp38x788hn5rbm26lihx0bjwj4w76ya1bx6vl5g8k1h2yw" + "commit": "5b6e660c13ca3f4d15dbc1aa3d7ab2f228491ef9", + "sha256": "11phyiblvxzx3dqqqrqlfi0q67ih1hy1630rlx6pi7w835npn0wz" }, "stable": { "version": [ @@ -68938,8 +69172,8 @@ 20200720, 1034 ], - "commit": "e624dd8a9075aafade6d53a5e8b4e83db4123110", - "sha256": "1058wnv1vf8k01i0xndazildns8fxwfkg3s7i93hdadga0vh838s" + "commit": "c36dcf8c282f547da5b3666f025a3000b5dbd1d9", + "sha256": "135j7i4y5jhypbknknmpha6mfjfzphb3n7pb303dss0amxfs0430" }, "stable": { "version": [ @@ -69026,8 +69260,8 @@ "request", "seq" ], - "commit": "b3649a12a398537ade7136d704f2f05ccc856e23", - "sha256": "13swcbvwhjl8ksrgzvmfafkgd3iz8znk49bs1n48w3g9qvh097w7" + "commit": "e5ff349d23c71a521db41dcdb1ac9765bac5388f", + "sha256": "1iq7m0acvhb86l5p7ah2pq2fz1716l94dw1m7pbi6asbnypgnavy" }, "stable": { "version": [ @@ -69146,11 +69380,11 @@ "repo": "rudi/maude-mode", "unstable": { "version": [ - 20200725, - 2035 + 20220419, + 1454 ], - "commit": "008f372631a1efe15be033792cfb1686b1736aeb", - "sha256": "07a51iwlzj88b6jaxzz8p8r7l9kcbflw8l11h67sx5y0gv23a6vv" + "commit": "68de3c11ae16c409afa74516aaf465996d1a9e59", + "sha256": "18dwn1wp29yr9k8967qnm9avmdi2wxn82kjsyykj1xy3sh9n28my" } }, { @@ -69249,8 +69483,8 @@ 20211205, 1100 ], - "commit": "ca0a3878763180fe2d775feae88b87d21dd8dcb8", - "sha256": "101fynqcw8hnhrgkxb3wdh9a2iqp35q1rh7hijnzz5xpxds2sj96" + "commit": "09f32af1a58d0b042b699c76d2b30e9226508f5e", + "sha256": "12pjmg7jxr7gjamjdgkgnmf05ivg7sxilfdqmd7mjzlr1n73iby7" }, "stable": { "version": [ @@ -69638,11 +69872,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220409, - 24 + 20220501, + 1918 ], - "commit": "ec03160337ea0c9f073b137791eea908491ff840", - "sha256": "13r5zlkw887dap6v5p24aff738r3gk4v56h8wcnzlfm09x6fwh07" + "commit": "72d6ff36b62a57aa9c9dbfbd44cdb3002a0e940a", + "sha256": "0vaam51wg8a7ilk9kp3lvz3p0vfcc3fl2nkpwswdadgr69f2d4qb" }, "stable": { "version": [ @@ -69662,11 +69896,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20220404, - 2046 + 20220502, + 811 ], - "commit": "4b8acadcfc4d703d3afe7c6d16477567cfa15442", - "sha256": "0qiqyhp2mfj90mbfba268rzipi7f3jyqkzsw7ilq1kwrcvwbblvr" + "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", + "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" }, "stable": { "version": [ @@ -69694,8 +69928,8 @@ "auto-complete", "merlin" ], - "commit": "4b8acadcfc4d703d3afe7c6d16477567cfa15442", - "sha256": "0qiqyhp2mfj90mbfba268rzipi7f3jyqkzsw7ilq1kwrcvwbblvr" + "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", + "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" }, "stable": { "version": [ @@ -69727,8 +69961,8 @@ "company", "merlin" ], - "commit": "4b8acadcfc4d703d3afe7c6d16477567cfa15442", - "sha256": "0qiqyhp2mfj90mbfba268rzipi7f3jyqkzsw7ilq1kwrcvwbblvr" + "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", + "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" }, "stable": { "version": [ @@ -69789,8 +70023,8 @@ "iedit", "merlin" ], - "commit": "4b8acadcfc4d703d3afe7c6d16477567cfa15442", - "sha256": "0qiqyhp2mfj90mbfba268rzipi7f3jyqkzsw7ilq1kwrcvwbblvr" + "commit": "49324b4fdc14987164ed7a3a8c3681df5b4866ee", + "sha256": "1hjgwwwmg20nmgvl96s9jay6mipcn7hil1jjvzmbrbkix6f2ymzm" }, "stable": { "version": [ @@ -69815,14 +70049,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20210505, - 1635 + 20220426, + 1631 ], "deps": [ "f" ], - "commit": "562ffe86cad91627e2b94b8684818562c3ad2b5d", - "sha256": "0g90fy27ivjaad1wp6rg8jx8dm44vb6zmsrlchzpwcyhkxs7zv8l" + "commit": "1a6526bc68561b7da6a612152b842a41ffb0aa09", + "sha256": "1l8vcdsgqgfbd5lp3jjjbcpxcrvgn7bz4q9g6hxqrcvkzj0radv0" } }, { @@ -70152,8 +70386,8 @@ 20210131, 2152 ], - "commit": "0ab2406db9b4d5dac2348dd033d5fd37abd92a94", - "sha256": "0jdv58k2h90jr2a7sxkif4diwj3c0978ajyhaapk58icihfn66sa" + "commit": "b26f842de19a31c36fb5149f292b9117dbf4bed7", + "sha256": "1f3zhvswjnb4dipjbgy9vcddnmzavyygl3xyhcpspxcxqxj1sj4g" }, "stable": { "version": [ @@ -70555,11 +70789,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20220402, - 1113 + 20220422, + 1615 + ], + "deps": [ + "compat" ], - "commit": "edf4173ec7e49ecaa2bff7e49e2194e9d1edb258", - "sha256": "1hwwb64cm5f2fm25pmqlzfvhc0nxq2lmnr021njf5p403wjx43si" + "commit": "b0427eea174adb494efc9fa212c22021861d3f76", + "sha256": "0jzmyf9x9nq4jw8a0b5lisam0wz6vy3f8sxn4dj3anawjivn6ml0" }, "stable": { "version": [ @@ -71072,11 +71309,14 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20220402, - 1122 + 20220422, + 1615 ], - "commit": "eaf123f451113c946977482807e90f3b351a619a", - "sha256": "13rjb2r6ml3mflv13pcrdibn7rm3b9pc7z856da55kxkl4v9n40j" + "deps": [ + "compat" + ], + "commit": "d33e76efac6978c755bb5e0ced061b0063a6dff9", + "sha256": "1vzqwijlqvlzwh74gmb5cmc4k932x023361k4csxmpg5xvsgbg0f" }, "stable": { "version": [ @@ -71090,17 +71330,17 @@ }, { "ename": "mode-line-idle", - "commit": "6c854955505f809f7a70e8918ea3a0187e62257c", - "sha256": "0wvy7p27d4qa5f6cg1zqrm8wzfvd0wfwcc5aimcs1hkxlzl1kr6b", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-mode-line-idle", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0lw9cj9wz992hzz39x91zmf6p4jqydxjv7227gwv7h4mzw0js5i1", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-mode-line-idle.git", "unstable": { "version": [ - 20220406, - 2322 + 20220507, + 1118 ], - "commit": "6ff3eb73586e9f3d6197447290aa92fd49f467e8", - "sha256": "1ygsfzw2s3d8jli2z6qsgmy3yrmigpy364525v7jrn2ns7p9i3kd" + "commit": "28658a54fbf20e8224cbc71b074670309ec2e998", + "sha256": "0l9iks709cl62yyj547fzikpc3xfpf9lg0bb1iya1hscix6njbc3" } }, { @@ -71216,20 +71456,20 @@ "url": "https://git.sr.ht/~protesilaos/modus-themes", "unstable": { "version": [ - 20220413, - 1844 + 20220508, + 909 ], - "commit": "dd2b51a76f7177224202b68efdd1bec6fdc65553", - "sha256": "110qj8ivbr21lgfssbb6hvi0a1798aaapwclasiigj458db5z6iy" + "commit": "4da9042dbcf003986dcabcdbccd5cd8f9b583f76", + "sha256": "0w427z6fl86nbamclvzcyswrfvngzpwkv0k6v2fsn491az207mnk" }, "stable": { "version": [ 2, 3, - 2 + 3 ], - "commit": "6bdc035ea1d5559ec6220521d5926780539f04b9", - "sha256": "00c3sa663rnl2rvnjdqzghcyfbdri09xjfigyrgd5xa3y0mnpqiz" + "commit": "ee0670f85bc55a3178c18774e141b4e58b2f6fe7", + "sha256": "14nfb94y9vcnpmwj9acwl6h5v0h1c6swqf33ch4zimxxqgx9zrm4" } }, { @@ -71563,11 +71803,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20220402, - 1624 + 20220422, + 1616 ], - "commit": "9c81859e522717f9a5c2b3ae88cf673a02bffc23", - "sha256": "0h2v7rsjgms71pljc8lqis3bxkjln3gs8jja8bk5ndy9d4d986jz" + "deps": [ + "compat" + ], + "commit": "ac647781d2d66d57c84a64dfd33b463b4a99b257", + "sha256": "0g9bq9z030kf4l5za54300zq98396a6f50d9rd9vylyjqsfxv7fk" }, "stable": { "version": [ @@ -71684,11 +71927,14 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20220329, - 1833 + 20220422, + 1616 + ], + "deps": [ + "compat" ], - "commit": "1fbeea5d4a5f1f236814fcecaee1d158fb50094c", - "sha256": "1iwm8yb46czvyp6i77w2r5c1bqh1q5i791jjsxgy1hnj03gwm6b3" + "commit": "b699497363c60bddc18393f68e3c9185e5fbb589", + "sha256": "0byaqhb1w0z6i87xj87g6ylx4r5bsjipspla0g0zrk33vk7vcfis" }, "stable": { "version": [ @@ -71866,8 +72112,8 @@ 20210306, 1053 ], - "commit": "f8331d15a81fe39a8532ec537d273221e1f1d0b7", - "sha256": "014bh3nbmpmq1l6fx5h4y513bis91jql7mm22idgx543kmjz9mmq" + "commit": "247db142f7251062978ade3fd27c815259eaa05b", + "sha256": "16bdqpmj4lsc3nx78ikvgqslb6jrzc5qmkhfl8m5gy26gfd37dxn" }, "stable": { "version": [ @@ -72268,16 +72514,16 @@ "repo": "xzz53/mu4e-alert", "unstable": { "version": [ - 20220411, - 2 + 20220416, + 1840 ], "deps": [ "alert", "ht", "s" ], - "commit": "56c58eea4fe5cd015300649d98d0314b454b0fc7", - "sha256": "17k981q708jgc5jbzd8fpagyqbscb395hnpzdlpnj8w0kpf38mjk" + "commit": "b34d0ea7b75709cc25d842a783cebea855dc9f7d", + "sha256": "09qzph8madnhd8kqnj662sgfcyvp1wg35ll6i5xbh98yazc0r64s" }, "stable": { "version": [ @@ -72600,11 +72846,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20220312, - 2321 + 20220415, + 2334 ], - "commit": "c0a37d5ee969ca8a783bf6c4a9084c4efeace86d", - "sha256": "0rn0iixl37px4sbkqxrfnfkq6kmb9dsn4x83rbz335dwniqxx5iw" + "commit": "d51551296425b1febd102a38a46f2d3dc4548559", + "sha256": "1bbykm7aalhpx6ndgsd8riy9xszvbghcpbkgbn64hbymsy57nvs5" } }, { @@ -73530,8 +73776,8 @@ 20220124, 1806 ], - "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850", - "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g" + "commit": "01d8a2048e13f29dd3aa06281ac8cb466caddb64", + "sha256": "069ch7h1fkm2zvw6nfndyrpxp9s2p7x3d0acswaa7isynygwkcy8" } }, { @@ -73748,6 +73994,30 @@ "sha256": "0sx2m2j00xhcb8l7fw595zsn9wjhcj4xb163rjqd3d1wjrk6fpn8" } }, + { + "ename": "neil", + "commit": "ecede2ec0a03469b06df1fd92c5703726e33c81a", + "sha256": "1r65b7pkgsjhqxs895206s6qqmcsh04yq5sfrhci3wglg2pkw0kd", + "fetcher": "github", + "repo": "babashka/neil", + "unstable": { + "version": [ + 20220501, + 2053 + ], + "commit": "239c16655431b27ee558bf250bece4f4b10a0e83", + "sha256": "1d31g7a9js378cq56gqwrd978bzc57848j169lsykz24yqx3sf22" + }, + "stable": { + "version": [ + 0, + 0, + 28 + ], + "commit": "6e8620c1a3001d1541ad934ae2847905451a21cf", + "sha256": "0ipg6d8vm7i4jgdxa56w8a4al2nnj09pivfplfja7791mgl0qk30" + } + }, { "ename": "nemerle", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -74274,8 +74544,8 @@ 20181024, 1439 ], - "commit": "25cdbae0ee1270a5c8dd6ba67696e29ad8076919", - "sha256": "1fwqvjg39l7321ykph3fd8dmkdy4q381jlg1jwr7ynmm285rfs9j" + "commit": "7905dee5ac62f7a1e0dfec4d936b97d96c7566d7", + "sha256": "17q8sqnrrsyxz6zld2zarp44wsjn53nsp8bz8k007wd5lbwylvg2" }, "stable": { "version": [ @@ -74373,15 +74643,15 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20220228, - 1520 + 20220505, + 1706 ], "deps": [ "magit-section", "transient" ], - "commit": "20ee8d88900b169831d6b0783bd82d2625e940c7", - "sha256": "0qv5cin9668pxm5cjhrl5sf170g62qqi954q4y2yj7zh3q0qhwpi" + "commit": "8fe2ccf0b01f694a77d2528e06c10f06057784f6", + "sha256": "08kz9qp4gp55z1i87ig0ysq6pgqgwlgr765g1vp8gsh6lp3myh36" }, "stable": { "version": [ @@ -74612,8 +74882,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20220124, - 351 + 20220423, + 2302 ], "deps": [ "anaphora", @@ -74623,8 +74893,8 @@ "s", "virtualenvwrapper" ], - "commit": "ddb59e309018416d1f867b6dddca44f17a1b6bb9", - "sha256": "1qj1yzpgcdn550lb1c9hqc3wb46pah6h00y3m3q3n2v6cks8lnmc" + "commit": "8f247dce12bd10de37f0903f3027a1ddbc318eff", + "sha256": "0g4l2d7mji7wl2bzwj1h6p5cyw8w6bw63fcy3kqsgdjny2mkijl5" } }, { @@ -74670,14 +74940,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220315, - 2232 + 20220505, + 1324 ], "deps": [ - "cl-lib" + "compat" ], - "commit": "2d7237a49ad6a9b6425e68fa4d3245cbe5a7169d", - "sha256": "0509b6n0sjkfpj5hhxm5cb2zxhjnaxjnjmr9dcfbkfmyx3s8gkc0" + "commit": "76b7335202a5b6ddc6b6798a2e2fd5b09df57dc2", + "sha256": "1g48cmb0d2j5fpr5vm0xjv435b43vlx1h5k2g32qcwhygzvck76v" }, "stable": { "version": [ @@ -74715,15 +74985,15 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20220410, - 1334 + 20220504, + 1857 ], "deps": [ "dash", "request" ], - "commit": "bfa7b2f9abcc7a18472c6998634450c876900170", - "sha256": "1d6c1zad3gava05ncnqxznbcy1y3m4hcs1x9p5dbqcs2vsw5l5ln" + "commit": "c1f24d46e08972b2be3912e41337eb630514ac06", + "sha256": "1q927nn8hss0h93jjawkcrzk9fkhk0qdsmsry851bi397sva6n7b" } }, { @@ -74945,19 +75215,18 @@ "repo": "p3r7/norns.el", "unstable": { "version": [ - 20220315, - 1155 + 20220422, + 2152 ], "deps": [ "dash", "f", - "osc", "request", "s", "websocket" ], - "commit": "b70ab2f9a58859243762c633628ad515f5563da8", - "sha256": "0cw0ry30im3b4b70n7rsp8pyv1567kl7byjck3rdlfrl7ll9bzr6" + "commit": "0eb487e15cf4aaaa30efde9068e205f014fd1dd2", + "sha256": "09z85fzbcibhj5mcp3i003zihqqxx8qpwrq99fjd0szjmk8g8zj7" } }, { @@ -75016,16 +75285,16 @@ 20220226, 1200 ], - "commit": "97f16b26518036b2c493dd6af11d98006ca49f77", - "sha256": "006q9qchgzsj5w1d2k10nwcp1zaa6p8f4kmgjv0ca29avhb2qjwm" + "commit": "37492858b61907e4728b2e68e67238c68e9a0d49", + "sha256": "0kc750z3p23rkn2nr3z7y205xb58qi77f2vr8w33nj4ykgil65ar" }, "stable": { "version": [ 0, - 35 + 36 ], - "commit": "7b5921877e748338359a25dae578771f768183af", - "sha256": "1jkninm2ynavacmz835s0v5iy10fw7b3v6hrnhvk1yr7zyiwhy88" + "commit": "a9b5f8959a20bbce774dec8a65a8b207555e52bd", + "sha256": "0dxvavdn97gicsjdfbrfbx1qz140ri3qdyfyxs5xxmmmc3c6gxjd" } }, { @@ -75036,14 +75305,15 @@ "url": "https://git.sr.ht/~tarsius/notmuch-addr", "unstable": { "version": [ - 20220402, - 1624 + 20220422, + 1618 ], "deps": [ + "compat", "notmuch" ], - "commit": "4fc0621106bf5d3ef66152456a22403bccdf0a4d", - "sha256": "0318zjp7nv02pyycllpf6zbi6ccf7yf6n0466qk3hmsb1jd2vxjl" + "commit": "2e479851b5cb2d25c31f21b400cfd34777348874", + "sha256": "1y9i88hadvdz1cd4792g6rvrj6jshva6p74f83qfhw7rhddzvsqn" }, "stable": { "version": [ @@ -75125,14 +75395,15 @@ "url": "https://git.sr.ht/~tarsius/notmuch-maildir", "unstable": { "version": [ - 20210615, - 1513 + 20220422, + 1621 ], "deps": [ + "compat", "notmuch" ], - "commit": "fd0e2199da746906eca080d4ca5bca17068cdce5", - "sha256": "1fqnx6hhg0cqj82yjpl7llg6vvppc3y8q9k6g67mqr7z3712bw0x" + "commit": "f0dcfd755fe9e58652f0569e3c8641d38cd6dd4c", + "sha256": "1hq91mn8gbyahlx2jjh8jqzsi1pm83ajp744m52hipflbz1w9mw5" }, "stable": { "version": [ @@ -75155,14 +75426,15 @@ "url": "https://git.sr.ht/~tarsius/notmuch-transient", "unstable": { "version": [ - 20220402, - 1625 + 20220503, + 1117 ], "deps": [ + "compat", "notmuch" ], - "commit": "d8994bd33d50cc70e0c0bb04588ab384f5104185", - "sha256": "14z6lmgq3l6q2csswk6x95h8dr2kdvm2ifzfv6n4fqyl39za8hjz" + "commit": "341fe7f05efe68460451bd5cb7151ca6d8b8cfc8", + "sha256": "0pggrrf2xdb6r2h2fm96fhwl1cdawqn4a509wymr33gafnr5f2rf" }, "stable": { "version": [ @@ -75185,14 +75457,14 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20220406, - 1747 + 20220428, + 1417 ], "deps": [ "esxml" ], - "commit": "12faf16fbbaf09aadec26dfbda5809d886248c02", - "sha256": "10507fdfx02wb3j7g34w4ii8rgnjbmriq63ir6x1agf38s3i9p52" + "commit": "8f5b42e9d9f304b422c1a7918b43ee323a7d3532", + "sha256": "0xnzwmv44pfqrh7rhqw8v6rd39kshxfah6d9fxrrbv33vlqy8kpl" }, "stable": { "version": [ @@ -75254,26 +75526,27 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20220222, - 1650 + 20220428, + 839 ], "deps": [ "jest", "transient" ], - "commit": "45d8084aeafae415dc45ddc9c3a18b546315fcc6", - "sha256": "1iai69sdjfl9ynif7cbg654r8wdcjlkk8w8qzd2x4wxg72bfa2d2" + "commit": "6eb0a58274870dd75bf848cf5a916a9f2c6ddae5", + "sha256": "1shl3ixvbfs84cw62dh0xzc0kacpbvrg49qnbkyvk9kn91x6k9c1" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ + "jest", "transient" ], - "commit": "a699cba6a8798af709b2576f2df54abd7eb1701b", - "sha256": "1w9a9pjpp3lchl4k8y1zhdpdnmd090s8vp7vbfb89xawp1gavhxg" + "commit": "6eb0a58274870dd75bf848cf5a916a9f2c6ddae5", + "sha256": "1shl3ixvbfs84cw62dh0xzc0kacpbvrg49qnbkyvk9kn91x6k9c1" } }, { @@ -75404,11 +75677,11 @@ "repo": "joostkremers/nswbuff", "unstable": { "version": [ - 20210721, - 741 + 20220426, + 2050 ], - "commit": "fa9dcf131697ea7af066e11a1edcc881c397e07f", - "sha256": "0bkx7mwy3zbb0ixawvn4cysxk3jjc7ahssvdprvw19ls9xx3wbsp" + "commit": "7633674c89e3dbfc0c07cd7fd8b1d206ed4859d3", + "sha256": "1bxxf20nbk4amvlillyrhjiyv6l4q4ilxkxgfanvmr58nrq3illq" }, "stable": { "version": [ @@ -75527,11 +75800,11 @@ "repo": "enricoflor/numbex", "unstable": { "version": [ - 20220327, - 2049 + 20220504, + 1329 ], - "commit": "78a4f72e666a67486dd616b89f7318a8ae3c125b", - "sha256": "1f5fhwj9bm3i3rnaig3gp88lg5l0b5yq4anqid6479j7ig3g7w0i" + "commit": "55d4977c74ca33d1ad4c10fea7369f4bcdfd3f86", + "sha256": "0d43ad14b2k1w3my2nwrnw58z594hw18k6p37xvvpnx8r4fdxbl2" } }, { @@ -76093,11 +76366,11 @@ "repo": "fritzgrabo/ob-dsq", "unstable": { "version": [ - 20220405, - 2219 + 20220425, + 716 ], - "commit": "37090235c064ba5a5e436b0b77b5442f606cf5b3", - "sha256": "0vpxjbri5vs560rjfgy1fy8zi0jadfa0bxj0hqdc23bjmvdg45wx" + "commit": "b8dbf53e5d9ed359fbf69e9d14adf68a7c08af10", + "sha256": "0v721spl9n4lz70dh9vx0pc3as5crmyrwfn0zg8hsbf0gq0m745v" } }, { @@ -77050,17 +77323,17 @@ }, { "ename": "oblivion-theme", - "commit": "7d4af0029c1d935137aebebcc19eda206bf5f9ac", - "sha256": "0a8q63kxlxd2svz5l8sbh6yiyhd6bl8a3hz335a09w1501f23lki", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-oblivion-theme", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1w814y5q66amiz117maq297k59ng5fx3ab04cddwl8awqws58ssg", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-theme-oblivion.git", "unstable": { "version": [ - 20220411, - 525 + 20220507, + 1118 ], - "commit": "d46983d69d75d8db6284ad297b17eedc495be2eb", - "sha256": "1wgv1hjm7xsy4f0xgh2ndiknxxbr4scrvzvqqz530f3nxx00hwz9" + "commit": "4129672f60d55c820adf260002476d038ac18165", + "sha256": "12dlvkb3vsfgz3k7cchbcn9g5q5w8g3m1xr21d31zq67wnm3h8lg" } }, { @@ -77089,8 +77362,8 @@ 20220307, 1315 ], - "commit": "9324ea439a77b4f3a31e9302b97ce1812cf8f17d", - "sha256": "0rznnw6id09s5gvx40zgsl8dlwiinpya26pdw2w0a0bm0kf5k148" + "commit": "c490e5b7c4b5f5e5848a5cbdb1e669588dfeaae3", + "sha256": "1kq8290g494z48a1g1myzyazzfl33gz1hws984kxv8i29lp7jqr3" }, "stable": { "version": [ @@ -77353,15 +77626,16 @@ "url": "https://git.sr.ht/~tarsius/ol-notmuch", "unstable": { "version": [ - 20220402, - 1627 + 20220428, + 1337 ], "deps": [ + "compat", "notmuch", "org" ], - "commit": "48a7245f560f2da61bfdb374d0059bea81639ddf", - "sha256": "17zb3hn8343mlpszdxf47kskd08lisw4ggw999m62ybji88yfxib" + "commit": "744399e054ef3a19f66418fdb98ef9ad139cc3b5", + "sha256": "0mxhnh64arm8dlna88ml9x9grm0v4fh1zbk1pfav957fxwx9l9dm" }, "stable": { "version": [ @@ -78030,11 +78304,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20220406, - 1434 + 20220418, + 2119 ], - "commit": "8f64537f556f26492fe5ee401d8d578d7d88684b", - "sha256": "068sqaxlig3fj7z3a5hc34mnw6g3lv9kn68ibq6yw1b4q8r82knq" + "commit": "75eeae21971d86b51a712ed8ecd6434463b2d866", + "sha256": "0rl3na97qkl5a5p2ifs1sli80rq38qqmjqkv6khn60f05rj5yvk3" }, "stable": { "version": [ @@ -78613,14 +78887,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20220412, - 1423 + 20220422, + 300 ], "deps": [ "org" ], - "commit": "f244b33a5a42d2879b9a6f4fcfeedcefb3326b94", - "sha256": "19dnp8s3aplcran1byr525fc3pmvyva6lac9ba68685ga0pxc4j9" + "commit": "6a786e77e67a715b3cd4f5128b59d501614928af", + "sha256": "0ik5akhsh9aji6n477i1jnk0wnljj7n1d0ybp8szgj2nr5258mhk" } }, { @@ -78646,15 +78920,14 @@ "repo": "dfeich/org-clock-convenience", "unstable": { "version": [ - 20200705, - 1527 + 20220503, + 530 ], "deps": [ - "cl-lib", "org" ], - "commit": "efc9773a8dedf834cf4a78fb6f5f8fffe55ef8eb", - "sha256": "0xnzw4p0wvahkfnxpj2ysz9nylzndp4pvy90vlf0l0d2ff5dymbh" + "commit": "988d4e3c9f0ae6df098b0ab1985b79eed2c5b808", + "sha256": "0b1i013likxba92z3bwrg9in3g3daaz31fdsn1cfxbn3yha6yzai" } }, { @@ -79516,14 +79789,14 @@ "repo": "shg/org-inline-pdf.el", "unstable": { "version": [ - 20210119, - 529 + 20220429, + 1012 ], "deps": [ "org" ], - "commit": "b2dfbf41efac55edacde8a8a6bd0275418de6454", - "sha256": "1gs62qjllsz23qbs9zq767c8xxvxwknl1x6r4ixx9090j7bsrhpd" + "commit": "b790818ecbb85cd6dee44754935eb12153a79679", + "sha256": "0a5fk5wkzljrjwclq8x1lbg9krzfj336pc5kid5ncq947p0m04bn" }, "stable": { "version": [ @@ -79644,21 +79917,21 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20220411, - 2018 + 20220416, + 1507 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "1e19f7a1a815881e244c6ff42a12c56d3249c6f5", - "sha256": "02maqn8hpl3cmjq1bhd2pfvy8gqw00jjijfmzzdfx7wwfvgz3vb7" + "commit": "ca6327161f4994ea0e98d7c6c3f662222e2650bf", + "sha256": "1pg7wxjlhbh3fls17zgh9wdzk0mjc3sfi873207kc5rcd4araq89" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ @@ -79666,8 +79939,8 @@ "org-journal", "transient" ], - "commit": "66740f8615bd487097e8614ffa8caa9aab81c1eb", - "sha256": "1m1a8kfnz544j7xjjhpii2sj20sqfbpfzg4l4606smb6i7zszvdh" + "commit": "ca6327161f4994ea0e98d7c6c3f662222e2650bf", + "sha256": "1pg7wxjlhbh3fls17zgh9wdzk0mjc3sfi873207kc5rcd4araq89" } }, { @@ -79752,14 +80025,14 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20220321, - 145 + 20220503, + 458 ], "deps": [ "all-the-icons" ], - "commit": "75a0f3bc427b9449f6f7ae3b2ac67e16e24153bd", - "sha256": "0p33n195xl6pgvyf7z47mq48fh8ihkq7wx70z1vn9js3xvig2ahm" + "commit": "b20e296b497360de12d5d973aa273cab70c77126", + "sha256": "17vcrz99759sh75swd94w1pajq5kknj7bgw5n12frwgfjlq6hi3s" } }, { @@ -79884,8 +80157,8 @@ 20220204, 42 ], - "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d", - "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j" + "commit": "98504d043c8421ac390b7358b146733c7c0b4479", + "sha256": "0n0bm9xddlgvlrmc2yjkdyvag7690yphdkcjx4w3cb04xlcac9ns" }, "stable": { "version": [ @@ -79976,11 +80249,11 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20220413, - 2110 + 20220422, + 940 ], - "commit": "8cd0d0653a962e1f9e99e9c8dc126d8615f132f0", - "sha256": "1844f71lzarhxyyjfpdlz3pb31rdwyj8jgjlvd434gbsm8mkchaj" + "commit": "ff1046705b3950b7a49da50bc34c11da86c6226d", + "sha256": "0zg2bi6jprigvqy4zglb8f8357sxikcfx0b8vjbwcjl08iimxp6j" }, "stable": { "version": [ @@ -80902,8 +81175,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220331, - 2336 + 20220505, + 2209 ], "deps": [ "avy", @@ -80917,8 +81190,8 @@ "parsebib", "s" ], - "commit": "10ed481413a8cbc676d26e754a3e7c6ff7d44cf3", - "sha256": "0nwbjh5pn8p16w33jd0d4vi497aaww7368899q1hr12yjl9b6c3q" + "commit": "a5a096b0c621fb42aa80cea14677bfb1d0df1f39", + "sha256": "1xirg1cjzr7dm6ffmhybl3s2vvwy72nz775dqmf3aa4kgvg6n47v" }, "stable": { "version": [ @@ -80951,15 +81224,15 @@ "repo": "alezost/org-ref-prettify.el", "unstable": { "version": [ - 20220112, - 1746 + 20220507, + 649 ], "deps": [ "bibtex-completion", "org-ref" ], - "commit": "cbf9a709a10304981c38eba1149def17151aca3c", - "sha256": "1n1rgm2i3mn8cyyslbkrh6gyln59sn03bld0m5ib0s1a8k9099pp" + "commit": "0ec3b6e398ee117c8b8a787a0422b95d9e95f7bb", + "sha256": "14cs9qg1fszg9gxpkrf74b49avcx4smpr39z7a9k3n2w6v4dn19x" } }, { @@ -81065,8 +81338,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220409, - 2317 + 20220508, + 19 ], "deps": [ "dash", @@ -81075,14 +81348,14 @@ "magit-section", "org" ], - "commit": "3bb45afccb9f17758c5604e4d883c769f4fc3545", - "sha256": "04pdlix7wcgkfml41dy2arr2sv3z9s4g3r4ydrbash4w257q9bqq" + "commit": "c0871c42bec9fa836e1b2a8c7691f06694f99714", + "sha256": "0d7dvmrpmvp0hw9aygflw4jvvjsq89yg227g7bgkcnq8970qbwfz" }, "stable": { "version": [ 2, 2, - 1 + 2 ], "deps": [ "dash", @@ -81091,8 +81364,8 @@ "magit-section", "org" ], - "commit": "3782e88d50f83c5b9fbb4b10df71df3f37e27156", - "sha256": "0c5vxz423lz386dxa9nqyf396jmyb36q79paxf27is1dhq1vwd5w" + "commit": "69116a4da49448e79ac03aedceeecd9f5ae9b2d4", + "sha256": "09wcqdqy2gcsyd1mbcm90b70y3qj921m4ky8l3avhzpdwgyw8wy5" } }, { @@ -81489,20 +81762,20 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20220110, - 739 + 20220508, + 1410 ], - "commit": "a1a1738b14dfb73be759023e2bd3dffb0792ebeb", - "sha256": "18c4kjmab089073npcvh1qi4g6m9yqyb0ifm96nay7rivw4rchj2" + "commit": "a6cd8f651f971eaa68be1cbfd30cc775e3a7ee93", + "sha256": "0i5r35my8sbnbic8jskzpnjlp6fjn7vglxaa9pkknjxs0dvj1x6m" }, "stable": { "version": [ 1, - 5, + 6, 0 ], - "commit": "734dd263cf79e4d5a0077f8b5ce344ea45bf7f3d", - "sha256": "1p9v40mm8p25b9xgfahwqqx4c36aqnl9yyjjdhkp6x5xkhkdf7by" + "commit": "61a3ab0e2e8e1ac0ef8772e89ae320c07142f7f5", + "sha256": "0p3bhnp91x65xr5d40kdmyj7vgyq62bvq3b1gfwv7881sh8p6hr9" } }, { @@ -81729,15 +82002,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220409, - 2310 + 20220427, + 1552 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "72456c2a1caa811a4cda2f7b07ba58645c3efbb8", - "sha256": "04lgrbgk0jsmgkla8jif6kma9328535ajrvqaiyja0r2c5d5x7ng" + "commit": "88fde267441118836a5c4ed28bb5958fca37a800", + "sha256": "1f7acxpc133abqzhc667syd7dkazarazndwl1dg8clcms4v6xaqq" } }, { @@ -82273,22 +82546,22 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20220407, - 1708 + 20220414, + 1402 ], "deps": [ "dash", "org", "s" ], - "commit": "d5375818919f21910a97c4617b2a316c40272fb9", - "sha256": "0kdb3m36msy2hqq1mkzzdvbp5dxazv3rfgr17vhi4nm0na47wk2p" + "commit": "6af54ed3a5d9bf90629223157803c42f5d3b152c", + "sha256": "1jpiyjzvqqzrnp95vysp7b742pxlfqd1g6srxhv3fjlq65px6z5a" }, "stable": { "version": [ 2, 6, - 2 + 4 ], "deps": [ "dash", @@ -82329,14 +82602,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20211002, - 1132 + 20220503, + 1357 ], "deps": [ "org" ], - "commit": "4048bf9e1be7ab759696a9541eec8f435359bcf3", - "sha256": "1rnir9mc9cp12wg5p19f0m6g6mvfyv1ahr7zq7azl8hvwmnb6gx7" + "commit": "603a5b692a08340c1865a6f73cacf57c4fd64cb2", + "sha256": "1hwibhqmm7a4zz0fw6qhbgyyw7rx73zd6gn7mg2g4m0c4kwwfifa" }, "stable": { "version": [ @@ -82549,8 +82822,8 @@ "ht", "s" ], - "commit": "484ec25e863a619e53d1ddd351c70541f19cc45a", - "sha256": "0q9ykb9lxb9lwcgy77db8c994ka1rxpaid0immj3zvpxwi2hkbld" + "commit": "6fe53900ead434f3e18e63e9d22a8fa8380ccb37", + "sha256": "0h33ih533dirghhpjlyzm3k8iss007f9npk2fpbc75z3q4ws67wp" }, "stable": { "version": [ @@ -82608,15 +82881,16 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20220402, - 1629 + 20220425, + 1157 ], "deps": [ + "compat", "magit", "org" ], - "commit": "bc4168ecd241a8e2b4b30af51f671b53fe3187be", - "sha256": "16fyp8vd9d0c97s0vp7n8qg34dh38g5z2h4llvdrs3y51s2v5zyd" + "commit": "6dc4d4bfffd6c11550952203a51346b13e120165", + "sha256": "1xpkwp3qk2jr1rphrcxdmld498prh3cds12y2a9cln27yfg8lkql" }, "stable": { "version": [ @@ -82640,17 +82914,18 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20220402, - 1632 + 20220422, + 1625 ], "deps": [ + "compat", "forge", "magit", "org", "orgit" ], - "commit": "a2e547d152e154eda48675f172b7d78c7307315a", - "sha256": "0a76b4x6wl2dr9cpmv6a25prh6ip5k3h7k1sld501212qyay2khs" + "commit": "72285807707a802ebe7f3c6149de9a78a022b17e", + "sha256": "1n5vhpwy2ay1s106icr542wh7a8zrsr7jbprp76qaqhzfzddkiv7" }, "stable": { "version": [ @@ -82676,15 +82951,16 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20220402, - 1637 + 20220422, + 1626 ], "deps": [ + "compat", "org", "seq" ], - "commit": "bb4b19f48134f43410cd9762a086da59fa338e98", - "sha256": "0r930pzfks9b0whbmawmgx4s6vxk8hfsz9k19lddn6rxb64c9db0" + "commit": "36129691e60e992f31065be4c26d58645b83b033", + "sha256": "0k3x931fv66asdmmgfr44b9wy0z8xv1r324mw91fj8zf4v3ryj05" }, "stable": { "version": [ @@ -82966,19 +83242,22 @@ "repo": "minad/osm", "unstable": { "version": [ - 20220403, - 904 + 20220508, + 853 ], - "commit": "ae8194e3032d8740edd7c08380ff5dbc6767fd9d", - "sha256": "137lc50913c3fjfsw668d2rvg58r122z722wc314f6rvdsxx7h1d" + "deps": [ + "compat" + ], + "commit": "45dfc686e527d69b7965752594020a936ddfa9ef", + "sha256": "1f5f3dgaqhryqachrzwr0wqknp88jmv62dnlgz5nx4k7pkhrmrfm" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "f76decfd0e94d5fc030a1d5c3230c213c87b47ef", - "sha256": "0aiq2z9vv4jsl0s0x9vpjgp0mnn27wanhirzj3h80ivgiphzs7l5" + "commit": "e3ea969ce1bf84343f357efa2de97e1dd857f481", + "sha256": "0d037512llpny669m6mhvwhnm90g6ysgjqdx45gqxfwdc65s4a46" } }, { @@ -83245,11 +83524,14 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20220402, - 1637 + 20220424, + 1803 ], - "commit": "d9b220eaa7e845a02fd17779f3f1820527a6ef50", - "sha256": "071lhipssh79kzy2lm7j2phmmsfp745yl2n95h7w5c7i9kxvc2zh" + "deps": [ + "compat" + ], + "commit": "e92af60c68c4cb05db84c13bb71becaca90763d7", + "sha256": "1h2qvvpqz3yi1chhdl8kxc7s98qgn5hyg9131qa5sdn41qx1gi4d" }, "stable": { "version": [ @@ -83543,14 +83825,14 @@ "repo": "yashi/org-asciidoc", "unstable": { "version": [ - 20211224, - 538 + 20220428, + 740 ], "deps": [ "org" ], - "commit": "27bf9a3e900c782bd57719c81c0aa68d9a1e3b46", - "sha256": "1xz5qr1kfhc9r5krdvg4lqc39gdszip44qqwkrkj9jm8pw713yfq" + "commit": "c8bc184f9088b76fdf1ce20e6e5d0a1588e1b327", + "sha256": "0799wah7ywzpzjjhmqkyj9v8krzh0j6qa5gs4a7iwvp9r66jwcpl" } }, { @@ -83654,11 +83936,11 @@ "url": "https://git.sr.ht/~abrahms/ox-gemini", "unstable": { "version": [ - 20220110, - 2102 + 20220418, + 1433 ], - "commit": "7c3300ace135e94467942f77f0a2c07a93ab00ad", - "sha256": "1kggmlj8qr0657skrixk1532smp5946a3vkg1xnwy5kwh8z0n8sf" + "commit": "168f820ea401fb813435a3a55af295873a4c110b", + "sha256": "0jmiya3f9vv4v64p5kxla6wiiyv4wg4w7f4a6zmdrjcn11hflqmm" } }, { @@ -83758,26 +84040,27 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220411, - 1555 + 20220505, + 2123 ], "deps": [ - "org" + "tomelr" ], - "commit": "d3d4c57444f03898e78d2ae11e97fdb94a4655c5", - "sha256": "0wzn9pm72bm1r9z42d7g38l0s1s5dplgmvnqppl02mx6ls1lx1rz" + "commit": "3c699a1ed3f666735974fb90610d60b41e86a3b2", + "sha256": "07bmjxqc3bwmn0rs6886jrmxvjag6y97a4zvnypf0yglq3g9aidx" }, "stable": { "version": [ 0, - 10, - 0 + 11, + 1 ], "deps": [ - "org" + "org", + "tomelr" ], - "commit": "ad412e0d2c8b36232abe090893cc731ffb1b8e17", - "sha256": "0x9hixb518bblaap0zjbp19dswv1davi4qkqz2a6a2ilvmfi47zz" + "commit": "4fc594eda0d0cb41cc3b634b43fbd055db7ae67e", + "sha256": "1qrxy32g8brmc3psfg458ca6r91wqq55bgmsk76w6zm8cgrvsnyc" } }, { @@ -83855,14 +84138,14 @@ "repo": "stig/ox-jira.el", "unstable": { "version": [ - 20220121, - 1015 + 20220423, + 1403 ], "deps": [ "org" ], - "commit": "a8019237a8f5e016a7c952fc2f673a2498a0e779", - "sha256": "0pa7pwk0yjcgak3f9w9jggj3ghlig1azf15ng954r646810j9i4v" + "commit": "00184f8fdef02a3a359a253712e8769cbfbea3ba", + "sha256": "1zyq4d0fvyawvb3w6072zl4zgbnrpzmxlz2l731wqrgnwm0l80gy" } }, { @@ -84023,16 +84306,16 @@ "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20211224, - 1240 + 20220419, + 750 ], "deps": [ "dash", "ht", "org" ], - "commit": "b2e43b936249de2a100afb4262698105c39ce289", - "sha256": "1fj0d37xdn0xgr5xihc6g24j75snwpq5vijyc2n1w2qrw8sav0ak" + "commit": "0a35d0fbfa56bdd9ec5ba5bac2fe002b61c05c52", + "sha256": "00fx05jkz3mbgqw5y1g7pfrhrpkcqn5zf0s51r25ykzdfiggcn7a" }, "stable": { "version": [ @@ -84095,8 +84378,8 @@ "deps": [ "org-msg" ], - "commit": "37a173e9fa40728f121eb0da2ece0ebab4102d1e", - "sha256": "0xz6n8zabaimdh7dqikh3hm41akfwwm49hyjxbfyshbg8r4kld0s" + "commit": "c6d8c2f4a0d762ea1732ffdb7bec2ba98aeecdd9", + "sha256": "05jky43c6bcvvgfkdds4kb2gplnv1my5wqk8qj16qggmdvwiqfwb" }, "stable": { "version": [ @@ -84128,6 +84411,36 @@ "sha256": "1009w8bp2rkqjvks97xlzbprrb1fxhcdb9fzx08ak229glvwav08" } }, + { + "ename": "ox-review", + "commit": "67bf75e1dee7c7d83e66234afb18104b844b1719", + "sha256": "062ifdcgk4iwhz5k8srdd38z34gib5i36rcfhj90bn07d7jsrh2y", + "fetcher": "github", + "repo": "masfj/ox-review", + "unstable": { + "version": [ + 20220502, + 1146 + ], + "deps": [ + "org" + ], + "commit": "4abb1aa4665d246a38a9a53e5b365b3e57ec6d85", + "sha256": "0gxlps90xnmmd2dv9s82c2p2r8zl8nzdlhadw1zq2rxqqhilxn4w" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "org" + ], + "commit": "8b2e7dcd580ce2c0df9067c699b104b04c330682", + "sha256": "0gxlps90xnmmd2dv9s82c2p2r8zl8nzdlhadw1zq2rxqqhilxn4w" + } + }, { "ename": "ox-rfc", "commit": "d3f49159d6a379bf435e2af8920176fd84693a60", @@ -84743,11 +85056,14 @@ "repo": "emacscollective/packed", "unstable": { "version": [ - 20220402, - 1638 + 20220422, + 1626 + ], + "deps": [ + "compat" ], - "commit": "1e2d1a96a2105fec7c1e95d3484790da45fbdf36", - "sha256": "0ph97hkbvv1hdf6g7mjxgqahj1z8zwhiha1kjw2dj0g0ymwh6iwm" + "commit": "3489c97340434096f24c64a33feea22e19c18a2c", + "sha256": "04nz6gl7r9sv51n3yaids524v8ccq5wbblxci1vckzsipbc8ys2i" }, "stable": { "version": [ @@ -85316,11 +85632,14 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20220402, - 1639 + 20220422, + 1627 ], - "commit": "1e66895083bd9e6d918450b1cd8be61a19bfc67f", - "sha256": "0aqs201b30i6zlk4v90m03g99hzbiyw9b6c4wd31z51x5h9prvxa" + "deps": [ + "compat" + ], + "commit": "5dc2c2e06152dc51f7395073569f448a8f94d296", + "sha256": "0plw57g866z6nafgh8czb2hh87z1l2rihv9cvda3gs4fkh8hvimx" }, "stable": { "version": [ @@ -85432,8 +85751,8 @@ "deps": [ "s" ], - "commit": "dbeb8f474b3cf2dfc13a38a2edef2c2c242621ae", - "sha256": "0y9cl85f55p8y47j9vmgw10vj9vvx8wv7anipr16lvccdjhl77hc" + "commit": "c2bdc5ee1d1f029886245f9a5c409e47c1db2cb8", + "sha256": "050b932qa0ll66pa68i8bbjdmi8bgdvklqm65cvm5ssc5hcwjq3k" }, "stable": { "version": [ @@ -85456,11 +85775,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20220116, - 2336 + 20220426, + 2049 ], - "commit": "63e85c8477fdf98ba920437c9df15f8f06c315e9", - "sha256": "1pk6n1nzvq01miswdddf6ny49zswjlc6cghd5ga0af0nmn61fl6z" + "commit": "dd4c5540fa6c2cd990cba324741d7abbc8ed2f23", + "sha256": "16jx7qay8ipyd202xrslfrcbjrvzzal77iqc69rwci3nlwax8vy5" }, "stable": { "version": [ @@ -85509,11 +85828,11 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20220328, - 558 + 20220422, + 936 ], - "commit": "b04eae67384c1d8181edf318fd62d422a8220724", - "sha256": "10vavzmhwh0bh10sp4zkhjp17cxpy8whnaxmk7icc543r7z1vyzd" + "commit": "4d0e780e00f1828b00c43099e6eebc6582998f72", + "sha256": "11m1kvd85rj53xj3h32wwvn2s5v7fdw5hhhyjh7drbzlm90s4kcv" }, "stable": { "version": [ @@ -85533,15 +85852,15 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20220207, - 1352 + 20220422, + 936 ], "deps": [ "map", "parseclj" ], - "commit": "ea7b5281ec80aca0bd1cc93a348aebb302497339", - "sha256": "01j8nrkcm2s0ps277b5zb4pys29lk4cq49rlcqpj19gbfpkwcvdv" + "commit": "dce2eed418ad21acf3d2d6d75c37dfa679b22359", + "sha256": "0b3j69lym3mwakl7qbi1nj8v9xljxzvnxn5m16dhg50q20wqd5wp" }, "stable": { "version": [ @@ -86215,16 +86534,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220214, - 344 + 20220426, + 2203 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "326552eef71ae6d53e215c46be5bf532575b7abb", - "sha256": "1gvaw0684svv9v294f8zgmqa2ym2wa3gymn9y9v2slhamf51r4vk" + "commit": "3ae9ba9ab9aaa03d1193667cb025a786bef9fe9a", + "sha256": "1rkhssb90id5vljk9lrlr8m2z7sxw9x2cb9cgiy06bzpfv4pggar" }, "stable": { "version": [ @@ -86395,14 +86714,14 @@ "repo": "mpwang/perfect-margin", "unstable": { "version": [ - 20190722, - 126 + 20220426, + 1701 ], "deps": [ "cl-lib" ], - "commit": "94b055c743b1859098870c8aca3e915bd6e67d9d", - "sha256": "02k379nig43j85wfm327pw6sh61kxrs1gwz0vgcbx9san4dp83bk" + "commit": "d5cb5f075264ff2e625099aebca3151f4f35019a", + "sha256": "05nh0fi7k9amz6wnkbsznhyr9j8jzmr55d4qg2c60pp3ygfrbzn1" } }, { @@ -86627,14 +86946,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20220412, - 547 + 20220420, + 1550 ], "deps": [ "cl-lib" ], - "commit": "9f898cadc43c2c2e947d72636af30f028e2b925f", - "sha256": "0ay7h3gr1qf01im17jn1jpj82lyd5mw0ynryq4l21mjxbsb9vvmf" + "commit": "4e38680793585a907ae46b148697030c2b552a00", + "sha256": "0jgd2vzfza3pnnksh1kss5mqhbirqn93lvzanhgjr4vb4fv8x13f" }, "stable": { "version": [ @@ -86740,20 +87059,20 @@ "repo": "Alexander-Miller/pfuture", "unstable": { "version": [ - 20211229, - 1513 + 20220425, + 1242 ], - "commit": "bde5b06795e3e35bfb2bba4c34b538d506a0856e", - "sha256": "0cks18fwir8h9b35ryz2yr5rligv1da2iqkqz0fcb5dx2a4fxwjj" + "commit": "f9e67bd7edbd5b4e033efd82c0acc4a85ff860a8", + "sha256": "0ifasmkfj06fb9whk7gg47fiim0bbwyh3279sd72psqbbxfixddf" }, "stable": { "version": [ 1, 10, - 2 + 3 ], - "commit": "bde5b06795e3e35bfb2bba4c34b538d506a0856e", - "sha256": "0cks18fwir8h9b35ryz2yr5rligv1da2iqkqz0fcb5dx2a4fxwjj" + "commit": "f9e67bd7edbd5b4e033efd82c0acc4a85ff860a8", + "sha256": "0ifasmkfj06fb9whk7gg47fiim0bbwyh3279sd72psqbbxfixddf" } }, { @@ -87125,8 +87444,8 @@ 20220120, 1959 ], - "commit": "f8cbf368c803cbcc8ca2468f98a37cf915673c1c", - "sha256": "0avlzya8b2lg190y6kkinh7s6rizhr5m6c150zfq7dp9djc4p62r" + "commit": "4503672471b8fdaaea6c454344817a119c87fcc6", + "sha256": "0fxmqhpw0i54davcg9h8gxf8zxix02g2wnxxly6m0p5g785yng2h" }, "stable": { "version": [ @@ -87738,15 +88057,15 @@ "repo": "arifer612/pippel", "unstable": { "version": [ - 20220225, - 1128 + 20220416, + 1743 ], "deps": [ "dash", "s" ], - "commit": "682a40af266f395cf39862ad0bfb30152ddee204", - "sha256": "1gb7nf047gm57jdggj49ri46hgz8gphqy58abniqlqxjcx9zp4z7" + "commit": "cb194952ee150e77601d3233dabdb521b976ee79", + "sha256": "17606l24yyrjxa4rc0p2zj50lfbayqldw4phhi59yqf61289d520" } }, { @@ -87844,11 +88163,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20220312, - 1316 + 20220428, + 556 ], - "commit": "3cbf38c22d783ac77d5dbc69a38afa04e0aa4803", - "sha256": "14ll9z57jlnbvsnzarqi0k0a0bxnkc9y4r52xah1h09v5fmcyi8a" + "commit": "8faee70e4640bd6ec1857651ec64e139e4dc2833", + "sha256": "1a18kc2rjkgdm8s816pf3nrdjxkwi9yrvkvwwqbxg915rzyv9858" }, "stable": { "version": [ @@ -89200,8 +89519,8 @@ 20211231, 1823 ], - "commit": "0a4a906ef747948eb6ee5521b47607970a7f3044", - "sha256": "1r9gvgdgp8bl4i56jway2rw9r2sv4dz48mxsl1xli49xrp41k1lg" + "commit": "3bf430270c74dad830ab9d776aab23cbf3ea3953", + "sha256": "1ldxv93gjcfr19smdajs081sli81fw6wr83w78i8mlqhw41ilslw" }, "stable": { "version": [ @@ -89344,8 +89663,8 @@ 20210215, 1849 ], - "commit": "76b8b427cc1bbb5aeaa2dc20cfa0443b89efab43", - "sha256": "0p00q4ffdxzb9i0dcnafaby6wzh3q1vdbxq8ysprb62mdz8lmpi6" + "commit": "f90f3a09622993bf34704bb11c24984f6b1f10e2", + "sha256": "05gmc5wrj4pn1s1k4p6vvnl1z75bj4w163mpy8rybxdhsqhhf9a4" }, "stable": { "version": [ @@ -89450,12 +89769,12 @@ }, "stable": { "version": [ - 0, - 8, - 5 + 1, + 1, + 7 ], - "commit": "3454a4cb9d218c38f9c5b88798dfb2f7f85ad936", - "sha256": "039a84gwb0phjm7jcklmji1pcpbxmp4s40djhac8sbzmwdv39zi4" + "commit": "c91d4d53fa479ceb604071008ce0a901770eff57", + "sha256": "15h809mf8d8w8axbfzjs40j8yrh5ms88x4pmlx1qlcac8j6qrilf" } }, { @@ -89600,15 +89919,15 @@ "repo": "SavchenkoValeriy/emacs-powerthesaurus", "unstable": { "version": [ - 20220221, - 1004 + 20220414, + 1453 ], "deps": [ "request", "s" ], - "commit": "810a25056c623f304de6a72123652d9c35936718", - "sha256": "13pzfqjh734lma8yfmp6a7r0j4a8jk3r0dc38hlx1vxwp0pw5ags" + "commit": "88bc5229cba1604c8f74db0a1456d99259d538cc", + "sha256": "19fvibfv3skvs77k3bsd0q5cg3shn9wrdjfyrcybgc9sjfcngv7n" } }, { @@ -89769,8 +90088,8 @@ 20211228, 417 ], - "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", - "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" + "commit": "d9b30d741c729a37eb2c6e51d72281c0844780ca", + "sha256": "1n9sa0wvw8yhq2l82hfpx1pgg7lmphd18xrjx6jfqfdkna9j3a8j" }, "stable": { "version": [ @@ -90244,21 +90563,21 @@ "repo": "rejeep/prodigy.el", "unstable": { "version": [ - 20210116, - 816 + 20220507, + 1753 ], "deps": [ "dash", "f", "s" ], - "commit": "168f5ace1671876d8c3bd350c0853bd0196bddda", - "sha256": "15rshpq0h5i252xamxh70acdz9jddn5xwgswzk5h2b24kxsbfnli" + "commit": "535789e32028133fa9dfb4c9135b6a65c199472f", + "sha256": "0x68c7c40cafg4lbi1lwlli3bghnhcb21wm4idg6qr07y351fjqd" }, "stable": { "version": [ + 1, 0, - 7, 0 ], "deps": [ @@ -90266,8 +90585,8 @@ "f", "s" ], - "commit": "3bacca898db9b3493883c95f923a87eb1ce807eb", - "sha256": "1whnk1902f8q03clm9xlfl47gkpsywf3mx0ykp70c1q496ab39qj" + "commit": "b67e4112eaca7ef7c8596c4728e9bc53418982d7", + "sha256": "04xspdj67nas1ivv0ldlmmkr6v7zd7y3k346pnfgvq8wzqi6x4vz" } }, { @@ -90356,8 +90675,8 @@ 20210715, 1213 ], - "commit": "7ec546f2fb96b8220a7967f248d0d6df7c55b9c8", - "sha256": "1wvavcdlikw33r7vs2fr7f6a5i96fmcf3y546f39dh1xbw1qyz7i" + "commit": "d47f08f64cce595cbd4e9fbe3544986b3c4cee83", + "sha256": "0pp9f8kcgnsgz0mykss4jppnwvlfx7ny58y4pb1rm4l2xvs8y6yj" }, "stable": { "version": [ @@ -90472,6 +90791,21 @@ "sha256": "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8" } }, + { + "ename": "project-rootfile", + "commit": "0fdd6cb9b09cfa3941c0d4dc8271d4c86863bd31", + "sha256": "0yz3dg7r8pr9i79svd67vh2axskraxq2cjkavzjl9i8nidkyfjxn", + "fetcher": "github", + "repo": "buzztaiki/project-rootfile.el", + "unstable": { + "version": [ + 20220505, + 1256 + ], + "commit": "a4c4f004fbf8ca44e74be845a1c3696d6db5b0d6", + "sha256": "00hg3hj2syz8n514h8fcwsyxxf28lbrg8cvhvnk0a2g74s8wk3d1" + } + }, { "ename": "project-shells", "commit": "becf54de5ae9582d7c76382dff16d40b04b1a464", @@ -90513,11 +90847,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220402, - 624 + 20220430, + 800 ], - "commit": "defce6e6bb504bdfab1e091550e2f709310327b9", - "sha256": "1qxns4s8wf02aiwp8hwcbqqydyldvj0ssh6rdbyi3fkq87fajcp6" + "commit": "a4f86f981c84a546530d5904253fa266431ef806", + "sha256": "02303v7y79vdl4n2qga42892cqd5hdajwzp4vk3a4fxcyl8yhv8k" }, "stable": { "version": [ @@ -91018,19 +91352,17 @@ 20220303, 1716 ], - "commit": "eb27c201f121b02c990c3665edce5171a8c70192", - "sha256": "1ccp9gj2h8snm9y8hkmii8yy4xr4as2ymjzxnnk9mpw84jqbf0r8" + "commit": "637a699969baf5930c77b87fbd89bd3286c09c98", + "sha256": "0av1bkv6h4q7p294v62w517d0wmr609k4cb488sr839h1y2kb8c5" }, "stable": { "version": [ 3, 20, - 1, - -1, 1 ], - "commit": "7db4eca77f2b03f93632edca5825f33ab65590e7", - "sha256": "00nykcx2xkvsvlj92vr6gnh04mpifh5cwynnqihgnh7lrgxlm2b7" + "commit": "21027a27c4c2ec1000859ccbcfff46d83b16e1ed", + "sha256": "14042h3p5xav3kkd04li92kyllxjp4xv6iy6r9mfnh8l7mq1l0x4" } }, { @@ -91363,11 +91695,11 @@ "repo": "flexibeast/pulseaudio-control", "unstable": { "version": [ - 20200406, - 752 + 20220418, + 742 ], - "commit": "a931533140547510decdc368f39b2d2b97ca725f", - "sha256": "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76" + "commit": "22f54ae7282b37eaec0231a21e60213a5dbc7172", + "sha256": "0y87i8qpf1fvz37zly9srss1y9hpn4jjj8gsikc72c4qs9n0ljv0" } }, { @@ -91610,17 +91942,17 @@ }, { "ename": "py-autopep8", - "commit": "c400e0f3cfe70821e621fe85d239b4f6596d5171", - "sha256": "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp", - "fetcher": "github", - "repo": "paetzke/py-autopep8.el", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "06blvhb65lp3jvwiznagqskf4gb7w8ly9vvghwrlvwg960m72h61", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-py-autopep8.git", "unstable": { "version": [ - 20160925, - 1052 + 20220502, + 310 ], - "commit": "68e12d8788c91c7ec53a68acf1d23adb2ffa4788", - "sha256": "16fmym6hvi2lx0mmbrrhld1vzki5iqfqx2m0xa9021gjjzb33lw6" + "commit": "89c9ed8de2deab6bb891ae25c85cc6498e60b90a", + "sha256": "0ygvl8zq8d6lbv8x6j6vklxhc6xrmii4fd9c74py1bjqvx4d1fjh" }, "stable": { "version": [ @@ -91926,27 +92258,28 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20220411, - 238 + 20220508, + 655 ], "deps": [ "async", "xr" ], - "commit": "01d6c038b87ddf61cb60e77e7b43e398b9f780b5", - "sha256": "126hdpng1zi0x63l4mlc468hpfqcwpk6l4yz7x6gsdy2v6ib4zrg" + "commit": "069ff6b6b039b16ccc135a4288eebfcd76a0fbd2", + "sha256": "1wz2c24i530xz62hbx0ahbm3sn2y6iwdpq3wk9npqyvhrk11g6ih" }, "stable": { "version": [ - 3, - 2 + 4, + 2, + 0 ], "deps": [ "async", "xr" ], - "commit": "0c8cd00d2da981e3833bface7d0c476cbb3e93d2", - "sha256": "102ns8vjmpb56afc3vyd62zfvvrnjdclm1fsn4jzj45b2in5wmxx" + "commit": "cd1bfd2bbc10fe0ac47d0ec383cde453f6019e6c", + "sha256": "0lvf50p97fns4pc6ilm4pqzp7s4srhcx2gyg6x5ywd5wv32nd04d" } }, { @@ -92111,17 +92444,17 @@ 20210411, 1931 ], - "commit": "01676aea6042da07bf52a35b5bf82cc55865d13a", - "sha256": "183ijnn4502m4aa86d72dy5rnxj6qngszqnp5v7y70nds8f2pcid" + "commit": "40ddfabcb0afe5dadab3c4dcd890b8302db9edd0", + "sha256": "14zh9mlm5fbsg0myyrw7pc253vw0in1jjx4302x3qsb2r1v20xyd" }, "stable": { "version": [ 2, 13, - 5 + 8 ], - "commit": "95cbd2bd14576cb5d9eade4798e73e8601c884de", - "sha256": "0kwkv2qbdr4k9ah2h09g3nrdwi7ky4k53hrqf4s3g89dcnz7s7ql" + "commit": "45cbae2bab9001bb2f159103490a02d63e75ee5b", + "sha256": "1wc3h25p7pid3pzh6vaiaynzs1bqrl62dpb2g486hp3kbqdzlwp3" } }, { @@ -92435,11 +92768,11 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20220128, - 1953 + 20220505, + 1523 ], - "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1", - "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n" + "commit": "6016c780865b3b9dcf90d9452367e0d39bbc1d1f", + "sha256": "00n2vrc7yq2cfsiwpwdga0yjl483rd59zvbdf41nxa92sircvjp2" }, "stable": { "version": [ @@ -92459,11 +92792,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220408, - 1906 + 20220508, + 1854 ], - "commit": "ee956c6a6c5aacf3cc32479eed9f84ccc5aec7dd", - "sha256": "1gdff63rn5aiwxkaxr5bqgs4zda3qd84bc1bqd40wjdfmhzr41if" + "commit": "013f79b0f402ebda79c5c0c087a6a33797ef08ba", + "sha256": "0jmgm2gspyfq0spvyry50bsl3gv2lp295fqgr1y9zk2lbd53b3mz" }, "stable": { "version": [ @@ -92483,8 +92816,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20220404, - 1635 + 20220502, + 1237 ], "deps": [ "dash", @@ -92492,8 +92825,8 @@ "s", "transient" ], - "commit": "08df2134393d47887a6e411d45b86e137cfcd28a", - "sha256": "1vw8yd0vpm53avdr9mjcs5ck4axhmkqypy32xmn4h3qzyc121cha" + "commit": "5e72c343cb81866358e4437390c5eb84c3203440", + "sha256": "16inr0vqfas907bifbd9jh8m7p41hpk6n6ca7x42qkz80ay3i9px" }, "stable": { "version": [ @@ -92843,8 +93176,8 @@ "leaf", "quelpa" ], - "commit": "82f6fa34f0b4747fe535bed56e67a66812195e97", - "sha256": "0xg3s0l8a1gysbmvbazwa54pp1d4wdfm66bnxkswrsfdr2zwfrwf" + "commit": "e220893d29a095234076be1b255fade11f6410b8", + "sha256": "0sfz9yp0h45smqcs40an1a2hvmcgqd6fxi0brsx5hsvs4rxhpry2" }, "stable": { "version": [ @@ -92982,8 +93315,8 @@ 20210904, 1553 ], - "commit": "66f44ba79ed098ae07dc7a9ef445cc8c3687a119", - "sha256": "06sd5hx86higqhk3jvmbpw1j3n7jmd9550h81hhkpxhk629w1nkr" + "commit": "30e9a1333fe4a83424385df53ddaf7016df3679d", + "sha256": "1k6iyzajrw7kvz027l7yddvxq4a0jsahrdhsv8is4bnz8ws36s15" }, "stable": { "version": [ @@ -93141,11 +93474,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220406, - 1330 + 20220505, + 1350 ], - "commit": "e7efbb52fdf2219532230a199153d8a33889c26f", - "sha256": "10d089fvbdxlkqy8hhl42ljsj89j5vzrzckw0vs0im55a8vrih9r" + "commit": "fbb4a4664e2cc2b5d21eee62735f73b7f0272e60", + "sha256": "0120v4z3qk59bkfcn1gazjp0xyn2vbmb4cpflpir4b0xndpgp92g" } }, { @@ -93295,14 +93628,14 @@ "url": "https://repo.or.cz/emacs-rainbow-fart.git", "unstable": { "version": [ - 20220210, - 1359 + 20220427, + 2227 ], "deps": [ "flycheck" ], - "commit": "4e5d3cca6cdc667e5da3300c04e1b3d1b00664a8", - "sha256": "06874ymiqpmx2isys0bf1fxw83xfzx64sxjq01xjzb3zv5ydy13w" + "commit": "6504424707b6e9101dfbd9fdd4b7b963b9a4f323", + "sha256": "1rp8z10rggd1yzx979kwkldcqhqy19i03r9lw93d7137jassb9qp" } }, { @@ -93966,15 +94299,15 @@ "repo": "realgud/realgud-lldb", "unstable": { "version": [ - 20210417, - 1434 + 20220419, + 2006 ], "deps": [ "load-relative", "realgud" ], - "commit": "abffd0d2d23f6c87be5dc5d36e948af92de5df86", - "sha256": "1zjrjgs9vjaqsf5h9sxw1pf2f9sfngx1gxp37lb8myan52qmhlz1" + "commit": "19a2c0a8b228af543338f3a8e51141a9e23484a5", + "sha256": "1yyh945w13qh8isj5p0v8sjwzmvzh330szd2hdy3fgc3d58r7sym" }, "stable": { "version": [ @@ -94145,11 +94478,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20220413, - 2343 + 20220426, + 2048 ], - "commit": "b5c03fc4c2104b1ae661327a0e72d5ce02ee5584", - "sha256": "17gn1nlzmflhc6hnpckdkxlm9l2m9mbfadcgm9n0i20i8gp88f76" + "commit": "2cfe54e9f5470415ab5f59d3c0829bfce41525ad", + "sha256": "1050bv05ljgr61jpvcahfd0cjc00n5kvdvdsawnq4fgpfj2j3vih" }, "stable": { "version": [ @@ -94329,17 +94662,17 @@ }, { "ename": "recomplete", - "commit": "4a3938f413ff1ceeb7ed6aedf0e3067073208068", - "sha256": "0ym5l5cpx464hxzww4m35rrlr4c5h8kl6090w2a7hck47kwyv8ni", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-recomplete", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1y3m8vi3xkdlb7zf3b7hjdpw8isx6ncs2mw86ijf1brapmwpa99f", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-recomplete.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "d0d380929460ff35534900e34ababad43d23c966", - "sha256": "178415wsvjvji4caz72mksrv4krr7aykh02cggnp41w66chm503y" + "commit": "021ca9b047caadd4903aa6f417890d6497ae437a", + "sha256": "1a78hmq8p5a8w0pciansci69vm3m65kcxsfp184bajq1nx8ydn6d" } }, { @@ -94524,14 +94857,14 @@ "repo": "emacs-pe/redis.el", "unstable": { "version": [ - 20150531, - 1948 + 20220429, + 1758 ], "deps": [ "cl-lib" ], - "commit": "2c33f3397bc14e7a8192867b55920492d4eead8c", - "sha256": "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57" + "commit": "a6ad30d6a43b7be083c13f8725b45571d623001a", + "sha256": "048jvvxb6cskhs95n2ngl4cfgf8hbqidvbi1xsyb0gyzvvqbrhj1" } }, { @@ -95345,8 +95678,8 @@ 20220101, 1239 ], - "commit": "9e2cfa86529133eba6c9ef53794be182f15e4c21", - "sha256": "0cq7vqfj8g2wd4ip2ia60rs2bpwkxd2rlz4wpp6as6ncidnzwzzc" + "commit": "ae79e7dd283890072da69b8f48aeec1afd0d9442", + "sha256": "0hbxrwp8nqd12x9z9krddlcm9b9adjzp1az90ywyr1a30bdmv5sk" } }, { @@ -95364,8 +95697,27 @@ "helm", "restclient" ], - "commit": "9e2cfa86529133eba6c9ef53794be182f15e4c21", - "sha256": "0cq7vqfj8g2wd4ip2ia60rs2bpwkxd2rlz4wpp6as6ncidnzwzzc" + "commit": "ae79e7dd283890072da69b8f48aeec1afd0d9442", + "sha256": "0hbxrwp8nqd12x9z9krddlcm9b9adjzp1az90ywyr1a30bdmv5sk" + } + }, + { + "ename": "restclient-jq", + "commit": "34f6696a0015aafd44f48de4cd220f62130c4ccd", + "sha256": "0hkrwnq15kf2qnpkzpji47bhja9h0h54gxc6497ww5vkbmmrnidr", + "fetcher": "github", + "repo": "pashky/restclient.el", + "unstable": { + "version": [ + 20220426, + 1734 + ], + "deps": [ + "jq-mode", + "restclient" + ], + "commit": "ae79e7dd283890072da69b8f48aeec1afd0d9442", + "sha256": "0hbxrwp8nqd12x9z9krddlcm9b9adjzp1az90ywyr1a30bdmv5sk" } }, { @@ -95450,8 +95802,8 @@ "f", "s" ], - "commit": "e01c36223728bb5d0293a7312f047d83e4ba64ae", - "sha256": "1iy13vkn0lhj4hxi925vhbqh1cvcdwfc9yic5khb52qwqsb0ycyw" + "commit": "dd72004f6f7b0d554dbd979f22a31c350e211089", + "sha256": "126dn4d0f301pybvrkjw3h5c729kbnaglzbgpsv5v7r35wrmxfgs" }, "stable": { "version": [ @@ -95543,17 +95895,17 @@ }, { "ename": "revert-buffer-all", - "commit": "02ff00238a8af45d9e26e0b7b6b19a507ea06f86", - "sha256": "1lyxwh3kjlhyi5ln2lmbhyn28fxdd3l58djc9mqbzwdfm81qprsv", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-revert-buffer-all", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1mlx015qspp7lrfpq5942azk9qlggai4157i8bl9c3hkh4q1sgfj", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-revert-buffer-all.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "0343c04a4408ff6cb3c8a9dff7d1ffee8256aa70", - "sha256": "16ws4j2fpnv96338z7vcibhscjrjmym910hsxc137lqrkavqhm19" + "commit": "0296a7101f65d486e13c2674bd4b51631504523d", + "sha256": "0avizhbx0a7fnlbjbm4ivg5abbwymmvrzlshazxf5ngn261fgm2w" } }, { @@ -95621,28 +95973,28 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20220319, - 1216 + 20220427, + 1613 ], "deps": [ "transient", "wgrep" ], - "commit": "5673681708685cce34521a1af48609b00a642b15", - "sha256": "0b1lq45vsn6fylwn1wmmfwc8mzwg4mgmj0kfqic039yagf9rvnpv" + "commit": "a6411f98a695d8b3ef0db156d41b2a62ca36ee7a", + "sha256": "046jws1qhi6spy616m7nzclp4jpx1945b6whayb0mr63as2yr886" }, "stable": { "version": [ 2, 2, - 0 + 1 ], "deps": [ "transient", "wgrep" ], - "commit": "77a709626609e7069f457e1b1885b76ebb98a354", - "sha256": "0a16g9phyy6c6vn5zfkpcpi90ixbx1ivp4wapwg189v77k2810by" + "commit": "444a8ccfea0b38452a0bc4c390a8ee01cfe30017", + "sha256": "1nxzplpk5cf6hhr2v85bmg68i6am96shi2zq7m83fs96bilhwsp5" } }, { @@ -95778,11 +96130,11 @@ "repo": "wavexx/rigid-tabs.el", "unstable": { "version": [ - 20170903, - 1559 + 20220416, + 2123 ], - "commit": "eba84ceaba2e57e76ad2dfbb7a7154238a25d956", - "sha256": "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98" + "commit": "872a10c8751574c9610cba1800f541a6eda24997", + "sha256": "170j67x499a76nfa8s5nzh5d7b602a4j31y61jaxa82877gi2j25" }, "stable": { "version": [ @@ -95825,8 +96177,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20220222, - 228 + 20220421, + 1811 ], "deps": [ "cl-lib", @@ -95834,8 +96186,8 @@ "popup", "posframe" ], - "commit": "e5727c5218a4345adb9b960cf6f4202246aea70c", - "sha256": "14vifq3ksmr0dg4lp293pgr70j76ajasvrm9j9hf3jspq7hbxb0x" + "commit": "e6a89e9fa9eabc32063bffb2eacfcece46f7a049", + "sha256": "0rzynl2n6bk5lwff2rvpj0p3djnr421i1a9vm53554hk0vljzksr" }, "stable": { "version": [ @@ -96025,11 +96377,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20220325, - 1526 + 20220503, + 1708 ], - "commit": "2e1ff0653e5355a2214e735f0ada287071457c6a", - "sha256": "1ra2q2wnman6zdfmky296r8h73zhjwkika8r3czjx5nsg24464vi" + "commit": "de28f7903a3b895c3bf9628ac6d4db4378748fa8", + "sha256": "1j5s30rv6qxjiv73zzdl0mnm9qgndyiiqdc29j8iw5m2gv5p5ncl" } }, { @@ -96097,8 +96449,8 @@ 20190812, 1858 ], - "commit": "8bf67285a25a6756607354d184e36583f2847e7d", - "sha256": "07255pn80w4742sz2h9vbmfxxd8ps2kcn73p7m2bgy02kgbzw42b" + "commit": "0d79161dfece3920600ad155ab1cc1a59da06964", + "sha256": "12yziw3mqhm4xzmkvzfm3w3agwjm4f7650gi99szpankdncma9xy" }, "stable": { "version": [ @@ -96786,17 +97138,17 @@ }, { "ename": "run-stuff", - "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", - "sha256": "038brammgivaq2423sx0iy6n7d7lyx3r939a0b85ix8zvkcbinia", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-run-stuff", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "07h849w8s72vf1drvs0dvf2jmf47f3hxn30by630fp76bfif8i7g", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-run-stuff.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "3723346dc6d867bdc3fd86ca11c32efc43704d7c", - "sha256": "0082mv45a8ybfrrvw8jnc52rk2zw80i52gid1387q2hxsdil0csm" + "commit": "0aeabc7ef3f2a209c0c69300f6d61921ec448ffc", + "sha256": "0ylsj92fq98i7vbibav7807070adaz24jn497qcd15n8ndfrvri5" } }, { @@ -96886,8 +97238,8 @@ 20220217, 2009 ], - "commit": "26ecc903c50b2ffd289bbe981f9ad03626fc0057", - "sha256": "0jr7i85zacpwx3kqg7yb7mbz0ap8w3ydzb8rlf0syccqjiqwslnl" + "commit": "d17be3051b22a06d7742178cd1367aed61807a66", + "sha256": "0yslscybdvnmak1h99qgjrwqim9aiwxhnp5kw4wb4nfqr1nwm3yd" }, "stable": { "version": [ @@ -96930,8 +97282,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220323, - 1159 + 20220427, + 1413 ], "deps": [ "dash", @@ -96945,8 +97297,8 @@ "spinner", "xterm-color" ], - "commit": "6eec9713876d698510ee3715698fd42c1571e307", - "sha256": "17lcys2sm56c8bnj9vjs9mz6liir8cnybax0fxgcrjgfp38wxc48" + "commit": "8c214efb72be9731cd7d613c07672515a0f70664", + "sha256": "11kj8rndj907akzr07mqb78n6rc61kcywwmz8hlp1vl83h82885v" }, "stable": { "version": [ @@ -97249,8 +97601,8 @@ 20181130, 101 ], - "commit": "46352169bd6d2a86ca9c2052cd05ecd16fc7657b", - "sha256": "1k0b1w9a3b89ricji92nq4cqbh1l2fm7ly1bdl8pvf59drp7cpd4" + "commit": "369178c2dd0348250c2ec0019567688376c637f7", + "sha256": "1klwn7crvn7769b5kan91fj5lpz5sanghi4way8h77b2iciya7bf" } }, { @@ -97455,8 +97807,8 @@ 20200830, 301 ], - "commit": "e62afcf5d524638aaf5014fbd32ff8ddeac9e29d", - "sha256": "1m2mraic2xkrmgs3swyjlgnwb3jxryzw1kvl317nrdd13vlnndk9" + "commit": "841808390d8d063c62c60cb70fa02064be2255d6", + "sha256": "1smmachhaazvbj9iparakza057bb4ql84dxkq76svizak0krf156" } }, { @@ -97531,6 +97883,26 @@ "sha256": "1smxr5bkzbfrjx21vhrj1wagmqx5yd92i997dbgs16iaqbzzr7cz" } }, + { + "ename": "scholar-import", + "commit": "ee2e936ba4ce724e304446fd03c8ad13fccd2807", + "sha256": "0c50p19wxs1g6qn4vxazgv83x9r0b9h2wk0wh6mhpgn4irp2sx3g", + "fetcher": "github", + "repo": "teeann/scholar-import", + "unstable": { + "version": [ + 20220504, + 1101 + ], + "deps": [ + "org", + "request", + "s" + ], + "commit": "b61fd8324b457cd75494d706a92af89bbf9a4e71", + "sha256": "1wqdr3n03a34xdnz0dnf07fgp12vamxf2dbfjl1k0yrbxyy449jc" + } + }, { "ename": "schrute", "commit": "505fc4d26049d4e2973a54b24117ccaf4f2fb7e7", @@ -97563,11 +97935,11 @@ "repo": "emacs-pe/scihub.el", "unstable": { "version": [ - 20211020, - 420 + 20220423, + 421 ], - "commit": "aac29628d4eea2d6ec0bfda39503c1f71a379bc9", - "sha256": "0pa054hanclapkj73wwwwwjmk2b3p36w2p44d1fz3w3lfjkf852v" + "commit": "57333c849bcd4953663cbf7c271e9f3a62179765", + "sha256": "0pla2qzpnilx73z3mjflc2a1pp5fnh7ynm749w2fxlrnhz7cmwx8" } }, { @@ -97802,32 +98174,32 @@ }, { "ename": "scroll-on-drag", - "commit": "0cc172bb1b4194b66827bf5be0b6658fb330a11a", - "sha256": "1i4i19qkin19h2xc1r6a66rsll1rfbbvf2nsm75f9vvvrdi4sjyf", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-scroll-on-drag", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0f5d4m1rf2ggac7yy6wdxx61sw10v48wxfsdj70b2wm6fqcz6fqi", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-scroll-on-drag.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "d93b69eed6947cabdfde53dfbcf4bd919cb1f154", - "sha256": "0r1c3b7w1mh7hpi7pi1szdac297w1ig0i1a9c1r7qs41id2bvw51" + "commit": "fb9af984610f7ef83b031ff04efa32dbdf2eb741", + "sha256": "0lyaw728nnxwfaw2rsd4y16gfa66sdsw8b0s5ccfzrwd64vxbxc0" } }, { "ename": "scroll-on-jump", - "commit": "824ab5881f045a43056d9b143cc59267c43aec81", - "sha256": "03ra46xclmxrygpbbf05j9rx2q8qx70cxsqmhygqad5ij75h253k", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-scroll-on-jump", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0vp7pj8ib4h0a7x74pdrknxiqpbkxyhblw5jkbsxzmjbbjwaclk8", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-scroll-on-jump.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "99386fc01b3c7bc2e75458efca408a23220a5f87", - "sha256": "0b3d5bw635jjirkmym4w0y5x450zd88ic3k74jmmgf4fw0fl1q0z" + "commit": "1cfa3e8a91427ef4066e5e62b035dda09cd6a7ae", + "sha256": "0ns3zfa421f7hg1kkgczkmj6v2pr0pj424bfak3y294fh6b15pc2" } }, { @@ -98014,8 +98386,8 @@ "dash", "f" ], - "commit": "a144b16ba107f26f497b65da70b306a802b1d6d4", - "sha256": "0542l0pbmiap01an8nhnzvpdbscn244l66bblkfikc5f6rh6s7fy" + "commit": "26ecae6a6d028fcbffc576a69ef8f787646bc12a", + "sha256": "1v9clc25pwbdq50xqabk36iypg2n68ip7znnhy6qwk9b3ir00zm5" }, "stable": { "version": [ @@ -98282,8 +98654,8 @@ "prescient", "selectrum" ], - "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", - "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" + "commit": "d9b30d741c729a37eb2c6e51d72281c0844780ca", + "sha256": "1n9sa0wvw8yhq2l82hfpx1pgg7lmphd18xrjx6jfqfdkna9j3a8j" }, "stable": { "version": [ @@ -98340,15 +98712,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20210613, - 948 + 20220503, + 1449 ], "deps": [ "apel", "flim" ], - "commit": "509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f", - "sha256": "0lnr5kyc59rs2p3lnhyr6cc126rh17szp68xpsx4brym3blb37yc" + "commit": "b1c245b81715b0430f7593cee2339e6264104f3d", + "sha256": "1s1qvhxklzhmq9h62cn95iaxacvmp7c2hn6jh9bhymx4x9afqagh" } }, { @@ -98400,6 +98772,38 @@ "sha256": "13qqprxz87cv3sjlq5hj0jp0qcfm3djfgasga8cc84ykrcc47p9f" } }, + { + "ename": "sensei", + "commit": "a214e3fc18d245f446bc3cad976d9ece66c232b0", + "sha256": "1i47yayyma42afg61fii05wzkqw15mdm0rnpj34rhzy9ckmzl2yz", + "fetcher": "github", + "repo": "abailly/sensei", + "unstable": { + "version": [ + 20220502, + 2012 + ], + "deps": [ + "projectile", + "request" + ], + "commit": "1294a96f544fd1be9ddaea3a85369fcf437403e9", + "sha256": "0cg7rwvfc0yf9pld50f6hnpcyq3g7r7rh62sb9wzdnwiv9n249lk" + }, + "stable": { + "version": [ + 0, + 41, + 1 + ], + "deps": [ + "projectile", + "request" + ], + "commit": "1294a96f544fd1be9ddaea3a85369fcf437403e9", + "sha256": "0cg7rwvfc0yf9pld50f6hnpcyq3g7r7rh62sb9wzdnwiv9n249lk" + } + }, { "ename": "sensitive", "commit": "5e5468ce136fabe59e1434f8a7f265f41c5e64c1", @@ -98460,15 +98864,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20220315, - 1610 + 20220501, + 1539 ], "deps": [ "dash", "edit-indirect" ], - "commit": "c3c493a700a9bf8078d65b23b9ae1aad3774b8d9", - "sha256": "0dri9i2x62xy2zbgws719ivx9l39pjq01bxpnjzs9n69zx9il9ff" + "commit": "454c9a3561acca3d57cce6ddb356f686b3d8cbee", + "sha256": "0i7d4cig64lz27vq8rf6kqnpm5k7shzj34d6pg56pphf0xs26zyk" }, "stable": { "version": [ @@ -99154,20 +99558,20 @@ "repo": "redguardtoo/shellcop", "unstable": { "version": [ - 20220409, - 620 + 20220414, + 530 ], - "commit": "f6060cc292d0143c925252b27d5db21de03ce7f0", - "sha256": "0gqrmfxg1wd42pp071ax66kv9vfy88wgfp7hpvsq6ba3mrvqah4w" + "commit": "327f5ac43e5d543149a772aef06cdb616477eb43", + "sha256": "1rmv2swyir91c6x94bggkrwankfkipfzhxzmg2c1455ybm48n3lx" }, "stable": { "version": [ 0, 0, - 8 + 9 ], - "commit": "f6060cc292d0143c925252b27d5db21de03ce7f0", - "sha256": "0gqrmfxg1wd42pp071ax66kv9vfy88wgfp7hpvsq6ba3mrvqah4w" + "commit": "327f5ac43e5d543149a772aef06cdb616477eb43", + "sha256": "1rmv2swyir91c6x94bggkrwankfkipfzhxzmg2c1455ybm48n3lx" } }, { @@ -99366,11 +99770,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220405, - 124 + 20220426, + 715 ], - "commit": "c3a3a947fb267df1f03287be2eab4f7119707e90", - "sha256": "1f065v3i7n60lgdz9nzvla3n1xzcvznrg8f3kbf2ccvp5viwzi10" + "commit": "2420e7fb0d11372f1fa898a3b996bf2ce00fe66a", + "sha256": "05m1nqcvwc7vlki3n8v3d4idpvvbb2lkwwj9z30033g0q4j125m8" } }, { @@ -99445,8 +99849,8 @@ 20210715, 1227 ], - "commit": "2a83fd87252a71391d9c17d03ff0e5b1f94ae05d", - "sha256": "155wfql6j6a4rsw8zr1iy13a672yi4dlg60yayk4rmlxh91dj4nw" + "commit": "09aaba23300b9fa3cfd15ceb0e62da4a3d53e7e5", + "sha256": "160ck71cwlzsi59wazxf3nl5sim6rflbs2dxhiavmv9rz2xjgk46" }, "stable": { "version": [ @@ -99813,17 +100217,17 @@ }, { "ename": "sidecar-locals", - "commit": "223bf20a37b48516b6ec9886c67660151ab37da6", - "sha256": "1lw4s749ril3mfbjdvns2myd5d8jf5dhzyywmk18bp7wb5cnmjbg", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-sidecar-locals", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "1vw7xrd0kv50q2sqydw0wwrw5z30lwkfvk70n4v78r9r3y1pfx4m", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-sidecar-locals.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "b69943575bfa7f13ee99c8b8871d3216ad24c85f", - "sha256": "0bfl4py2s3mxpzc60l9qmmdy079li0llzd6gsczwbmvfnrs1189q" + "commit": "3831db67c692f269d1ac8bfdc38c56ee2d110250", + "sha256": "1ypjk466z8cm5plm44l182zq5fwiyv6my2a9rbgfw9rb3ci6s2rg" } }, { @@ -100232,14 +100636,33 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20211016, - 1144 + 20220506, + 1606 ], "deps": [ "terminal-focus-reporting" ], - "commit": "237fb7029fde7c16a24d2231754d95190c1f03cd", - "sha256": "18fnvr7a6zai2nxnv8sq42lgwgfig6ygfkyvcnzn04x7yw7wigxg" + "commit": "f26d25194c65e19b5473fa1a3cdf96be2b209e19", + "sha256": "1427qzmr1cmhld24iza0hrkfcs03h4flf3lcyhxfrykikqs486is" + } + }, + { + "ename": "sisyphus", + "commit": "cbaf88bb3789691a2f733369c271d33b8e959f6b", + "sha256": "03y1xrw1x7prygz46wq8c999l8ra7vcjzqqrpk8qkmmqcg072ag6", + "fetcher": "github", + "repo": "magit/sisyphus", + "unstable": { + "version": [ + 20220506, + 1140 + ], + "deps": [ + "compat", + "magit" + ], + "commit": "2af8cec83790980a9a96c15ee3655a179aa3ddb1", + "sha256": "0g2rvh7vs3d4mmkflvr2jxl8q3hgwcw0wfq788mxhiwkknyrkfmj" } }, { @@ -102304,8 +102727,8 @@ "cl-lib", "deferred" ], - "commit": "d9f499f960eab07fbb56f3513a2992f69df7ab44", - "sha256": "1cj0vclk82j2llg9zrlj4p735k5cna9fcvin2hlak1raqjdx5riw" + "commit": "112450888f3f90f0f2a0e43e49eb5a7e49b1b6db", + "sha256": "1dmchr5mg84xsyny0xnwwvvqcn09kca4r85amy1h7b0qv7p60vv4" }, "stable": { "version": [ @@ -102563,11 +102986,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20220128, - 1519 + 20220430, + 2248 ], - "commit": "a09347a354a14f5407e99fa730e01345d03e03fd", - "sha256": "0nnc6pk5jjx4yhadcph9q9aqb0ks8gs9ybhd32wm32653518hmv4" + "commit": "bd376f705d6eb7afd9a1dfa0c1bd407e869d1e9f", + "sha256": "1kxnnmnj7pbli7lybxvhhd63q376i65il8zxnjig0p13pyh5j1mv" }, "stable": { "version": [ @@ -102670,17 +103093,17 @@ }, { "ename": "spatial-navigate", - "commit": "143e50e99f84cc7f0c9d0597b30c40609ac86dbb", - "sha256": "01w8sjygng0bkkwnfqbyhpd1aa6yls95293mnpdfipwa0zy3rivl", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-spatial-navigate", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "0xv9jdnszx900wm15ifimv0dsyzvcj9sq289qy5hz6778k52ya9z", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-spatial-navigate.git", "unstable": { "version": [ - 20220211, - 548 + 20220507, + 1118 ], - "commit": "0365544483f957db79b8e617fb0bd8160134a655", - "sha256": "0c52dfy1jqmbkl8ml06xif166kxbyy9q8z33cpvkljh36ia23y1z" + "commit": "09ebd2ba7779998c31296bf8b6ffebf854f3eb73", + "sha256": "1zwynrnsbkvac8xi4y81s6z4h9p8vknxd7ii0lqw5cmphx0fdbqb" } }, { @@ -102691,11 +103114,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220327, - 113 + 20220429, + 126 ], - "commit": "279caa7aa99e7b5d6f2f9307b20e9fcb730ffb29", - "sha256": "1ilkyi7j1nj9g6xdvq8y85wk34qhb7zan5a1ds1q3nbmdzgxgmwj" + "commit": "1405b4f050f8181b8bcbe2951760e6c5b68b08c7", + "sha256": "0l0kpmf3acsxr1xbq8kzfs72232vm2szjx9q8w2s982jfwqsfrxr" } }, { @@ -102816,17 +103239,17 @@ }, { "ename": "spell-fu", - "commit": "abaa6522f18ca1f47788ebb3281fbfcdade2b7c7", - "sha256": "0c2yi5lz2ww7mm9ih3m374w65n73z4knhnbrvdyzd7ja3xb3l17n", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-spell-fu", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "04qb0yldnqh4bl2jq1qfr529bnx9hfz74pdlsiv30avm8ly01d8s", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-spell-fu.git", "unstable": { "version": [ - 20220213, - 1215 + 20220507, + 1118 ], - "commit": "8185467b24f05bceb428a0e9909651ec083cc54e", - "sha256": "0ka7i2jl9vbr5071pbb3n8ckc9nqgpxrbfgij7wn33g01dpn2zjn" + "commit": "2f2fd6de0003edb1038b7c639cf23264d1406993", + "sha256": "1p23c2y124xmd3zwfns4zmk460vxd459dds0w0k9mnjnm9p8dkq2" } }, { @@ -102885,15 +103308,15 @@ "repo": "Fuco1/sphinx-mode", "unstable": { "version": [ - 20211021, - 1444 + 20220417, + 1552 ], "deps": [ "dash", "f" ], - "commit": "9d4075c106fc837006394c4c803281383f2ec6f3", - "sha256": "0ngc0b4z0s25l85wk3b4f3ipxnzxl4caiava9kb6jsci0ylap98a" + "commit": "77ca51adf9ee877f3a8f43e744f59e650772f121", + "sha256": "0imv3baiy0cq4aj220l8rx4d1drsmiak7vrhbshsg9987026b8ig" }, "stable": { "version": [ @@ -103305,19 +103728,19 @@ "repo": "pekingduck/emacs-sqlite3-api", "unstable": { "version": [ - 20220327, - 521 + 20220501, + 1217 ], - "commit": "7cb4b660fe30deb8a4229f3abb18bd99ca9c971c", - "sha256": "1b7if1dp6i5kqwhq25gna89xbca66i4mmgx1a5yn12kncfdgs6d7" + "commit": "68eda59d5f3d29d0a64d6256d58b8c1f93ba3583", + "sha256": "0yrfwb3yvhp1ib4izxh1ds68b3zw8gjkjhlk1kivarxnfjnjnly2" }, "stable": { "version": [ 0, - 15 + 16 ], - "commit": "7cb4b660fe30deb8a4229f3abb18bd99ca9c971c", - "sha256": "1b7if1dp6i5kqwhq25gna89xbca66i4mmgx1a5yn12kncfdgs6d7" + "commit": "68eda59d5f3d29d0a64d6256d58b8c1f93ba3583", + "sha256": "0yrfwb3yvhp1ib4izxh1ds68b3zw8gjkjhlk1kivarxnfjnjnly2" } }, { @@ -103709,11 +104132,11 @@ "repo": "SFTtech/starlit-emacs", "unstable": { "version": [ - 20220412, - 1312 + 20220507, + 1833 ], - "commit": "ba7f57db3988075394d6ccec97f0dcb35ebb089d", - "sha256": "19vlv75ycsr89wi4fhh5fsw0q37dw32hyhbznbbc83dpahmxda8n" + "commit": "f788903244778508891eba0da70ea9f287efc9ae", + "sha256": "12dn7sz4xkici1k3jizijh0lzwf8fd0k62dy6v8kcvmwpnqxmrkb" } }, { @@ -103845,6 +104268,21 @@ "sha256": "1bkmgjfp7xir6d0yf782xkjvf595blrqhr3hack26jg5zl8qsrya" } }, + { + "ename": "stem-reading-mode", + "commit": "2c33a541dbe07e85be3b2d8f693485a0674898c1", + "sha256": "1mp1msz3b9w0bszkg0z6jh355vxd7pgjrn3bk6xqg6ancqya8hkv", + "fetcher": "gitlab", + "repo": "wavexx/stem-reading-mode.el", + "unstable": { + "version": [ + 20220418, + 1136 + ], + "commit": "a8bacd80fab6013c09e4e8d337fd88267cbe2ff8", + "sha256": "0ib2rqybwjxclgqy6bp0gmgr6mvyp434mf9ix6m8by3jrkpppvgq" + } + }, { "ename": "stgit", "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", @@ -103906,11 +104344,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220412, - 1434 + 20220508, + 1737 ], - "commit": "77146bd3ad4f275847c965148572bb0ff0b54c1e", - "sha256": "1xmak2mcqvjvckip2hp6gx63nn6k59la4sk8a8rprissd7mj0mkg" + "commit": "d03558c2aeac781c65c4137839362790f8b36b3d", + "sha256": "1gqsbqlc1aygls34mk9l5qywkx71pps4qsh9sinvgyrdwlllyk56" } }, { @@ -103940,28 +104378,28 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20220414, - 131 + 20220430, + 1144 ], "deps": [ "async", "dash" ], - "commit": "6ad9c9d39569d89753b2a54ccb5e8636e04c016e", - "sha256": "1lsmgrlx5izw565af06ixnrr6j2gpyw09flp26qhvgb1xfgrkmhk" + "commit": "58018a1747273df23dec08ec5d318da1960428c1", + "sha256": "0jbj24pbc07gjb6zk29yzjrd80c4aaqfp2mffc4qqisws0f8gfvb" }, "stable": { "version": [ 0, 1, - 2 + 4 ], "deps": [ "async", "dash" ], - "commit": "971382eff7c291e4c247aa9b8b846281be324d7a", - "sha256": "0bpjc7dgylv0fra5dskjq0kx4naz62aafsyd9wcvs01sfkafymva" + "commit": "34632dd99903d4ffbb78a2deb5b658291a6cf040", + "sha256": "0rq8qimc3xfh1x9g691x2bmmy9a1bglv6180hdc5z6irv5gfszvn" } }, { @@ -104620,11 +105058,11 @@ "repo": "bbatsov/super-save", "unstable": { "version": [ - 20200930, - 1634 + 20220426, + 1056 ], - "commit": "886b5518c8a8b4e1f5e59c332d5d80d95b61201d", - "sha256": "1w62sd1vcn164y70rgwgys6a8q8mwzplkiwqiib8vjzqn87w0lqv" + "commit": "71c26cbd47d993fff37e572523ea79c9c49f5caf", + "sha256": "1r56g3h7cn2p64lk5d9zw2hmr7f5xzim1ccydzi8i1g7m7rzlgjp" }, "stable": { "version": [ @@ -105028,14 +105466,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210919, - 1221 + 20220430, + 2247 ], "deps": [ "ivy" ], - "commit": "7489968257a74f176c0d1de7ec8bd1e2011f0db4", - "sha256": "0gmgfv9d5vicd5lqcbzn0i6qfjw42whhww6hdqch2pgkhl4i1ria" + "commit": "8bf8027e4bd8c093bddb76a813952d2a0dcbf21d", + "sha256": "1rdv8r6zw0lziycwv5kd2yyflfwby4gnqgfvv67b1y2l3psjwp94" }, "stable": { "version": [ @@ -105935,14 +106373,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20220403, - 2030 + 20220507, + 607 ], "deps": [ "project" ], - "commit": "04af3a2e31d300d58eeb2b13458edd9b283241db", - "sha256": "13whrvgxrkmllsn6kc608i33q8gj40k00isypnc24pvwc084izn5" + "commit": "24266c6c9a766261a8c8620692dfa4000f3e1d5d", + "sha256": "1fyfpi31qy03qpxw8hpjgykn67pvflgah3agwf053iqpj1krh1gz" } }, { @@ -106010,6 +106448,30 @@ "sha256": "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf" } }, + { + "ename": "talonscript-mode", + "commit": "067b0778eb46049949be0c64595cf48f088560be", + "sha256": "0zlbh8az2rxbbqhrfhiaqhnb4dx3bxin0papj1plzj57j37pmis2", + "fetcher": "github", + "repo": "jcaw/talonscript-mode", + "unstable": { + "version": [ + 20220204, + 1441 + ], + "commit": "b6eb61f56349e0d47276270163ec611c2d5b188e", + "sha256": "1a2x0972psaaz4d89adcr37440a71jm0vbdwca3ixj7rs7l4myp9" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "b6eb61f56349e0d47276270163ec611c2d5b188e", + "sha256": "1a2x0972psaaz4d89adcr37440a71jm0vbdwca3ixj7rs7l4myp9" + } + }, { "ename": "tango-2-theme", "commit": "ab432b0eac0bcf0d40c5b3c8a78475bc0fea47d2", @@ -106090,8 +106552,8 @@ 20220410, 1953 ], - "commit": "15c81940078207e43cb6930abeea1e9c47fefc52", - "sha256": "1ikkz6shhhbvfww75sx8vlmrcaz8fyc3kxck5gl46696wg9arhrh" + "commit": "12c2f7e01a0e5cc9a57c9d8a8f3fecc8f8ddecb2", + "sha256": "1amkmlndha14pyf780mlsipnsh7i66jk7snvylbjs6nx8znhwlrw" }, "stable": { "version": [ @@ -106278,15 +106740,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220319, - 955 + 20220503, + 349 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "500b7b42d81b77920f40a2f461dff7b6367e8326", - "sha256": "1j7gdc5ib1f63lw1cmbv937yx46mzmvh8r8h47z3m2pdx3drfsc0" + "commit": "29010616931f52e3a5aa9d155c14873c09c7306b", + "sha256": "17cshy0ba7jiq36rj66k6m8swijzvpnwpfrgy0xvhgxsz115bhp6" }, "stable": { "version": [ @@ -106333,16 +106795,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20220313, - 2218 + 20220424, + 400 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "7a0ba06db860dfe9a9ca012c2750b13deec385c6", - "sha256": "1w7b5qhg4nd92hl9whvbzz6nx2cb09m84ixkqqzygmjnrxknqsdl" + "commit": "6f3455a365912e8f0c45a2240ea79507dee45ade", + "sha256": "1hnd6wnc52sc0ckriqnhaz64pyjk027y0dpcmh2zhpd27i8d4hmq" }, "stable": { "version": [ @@ -106399,11 +106861,11 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220413, - 2112 + 20220430, + 1020 ], - "commit": "d915e56b3c5cee3388a9e60334447a1b2ab3e2d4", - "sha256": "14w59kyx5z2wi42qfx59zy6zl3glqvc9y9wxj80dvvcg5dnfmgn0" + "commit": "1ce581e30455b113d9c8358e79952134ca2e0356", + "sha256": "1i5vaxfinmj5zrrh80yjjd61sncxvjkb90g2wwa65h3icpa9vvyr" }, "stable": { "version": [ @@ -107063,14 +107525,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20200716, - 1331 + 20220508, + 642 ], "deps": [ "auctex" ], - "commit": "a5f59e0c5f43578f139a2943bd08e5b3140f4c2b", - "sha256": "11xissn0xpfx2xxcm5qj2smkxa5frcswvhpfv6m34j12z0nww7pw" + "commit": "bcceb82971c10b8c0b058b77b3764669900392aa", + "sha256": "1awlh7z18wzp2mppn21chbylqf3fmjlq8v4105kwg9mmw57xjyb7" }, "stable": { "version": [ @@ -107168,19 +107630,19 @@ "repo": "WJCFerguson/textsize", "unstable": { "version": [ - 20220323, - 1330 + 20220427, + 1445 ], - "commit": "6d20632d2b3467144babe01e55275b699219f171", - "sha256": "11rg08waziii410g9d1lkyhmpnp0dw5r2bsw5l3x80f4n5c1k0a0" + "commit": "df91392c3c928d7841631f5809716b9cf0f7309e", + "sha256": "0pmd5hb6ysfp8yyghghxvqdj1lvrqwqdlk5jfwsviiqwdqi23q5r" }, "stable": { "version": [ - 2, + 3, 0 ], - "commit": "c4ce18bc57f3d3171920bd79e0221509e15894ca", - "sha256": "0s00kbgkyw422jil5avzlrpjj77m3l50qr9gba4li375szxp301c" + "commit": "df91392c3c928d7841631f5809716b9cf0f7309e", + "sha256": "0pmd5hb6ysfp8yyghghxvqdj1lvrqwqdlk5jfwsviiqwdqi23q5r" } }, { @@ -107248,11 +107710,11 @@ "repo": "monkeyjunglejuice/matrix-emacs-theme", "unstable": { "version": [ - 20220331, - 632 + 20220503, + 1325 ], - "commit": "00f3e6ffda899ddd0ac2366753d6e810dbdf7bbb", - "sha256": "06r8nxsx4k6pa46dv7w9chwh1f8s545rpl4m2ipbyfmppyvarf4x" + "commit": "f2f69c3aa9c76dc3c27e9bf3c965e66f8b7f61cc", + "sha256": "00jylvw3h1r8lvpw50ca9gwiq4g8frxh7rhibdm9zisvjzw27p5w" } }, { @@ -107445,18 +107907,18 @@ 20200212, 1903 ], - "commit": "324f6a7e36232aedd8151ed9014ce5c3c45264c5", - "sha256": "0mv8sqwslmpsvc5y72dykv7xyqhc7wlmv2d2wi85nfnnvcnadlbd" + "commit": "321b08352d043708869d5c15f961610392afca16", + "sha256": "0pynyavfwwylqibj4az58a3q45di540d0j6dwdwywihn470cinvz" }, "stable": { "version": [ 2022, - 4, - 11, + 5, + 2, 0 ], - "commit": "a16ba4dfe78d98335c6d1990c13ee8c89cf970f1", - "sha256": "0nrgk6xa3r2gvak0zqlmhzqjz1b03kkrxc24qk9xqbg1c4sqnaiv" + "commit": "f7a27a8f7fba7b08cc8ff2452afe8e5ecd99acca", + "sha256": "0zczzrpc2nwzp48wyqssrv3iykrlmyjdmipwq2fqzdi10wb5paq3" } }, { @@ -107512,20 +107974,20 @@ "deps": [ "haskell-mode" ], - "commit": "9dbd4c9b4dd4adb550323376a25a50917c971b00", - "sha256": "1pb93a7c29xz9ni4q71hclhpsh36bap3rb502lw4a8acsfim7jxq" + "commit": "39389e4080144c6734dbe3020cc35185f025ebf0", + "sha256": "14gb1az5gmlq6j7lx4d2cdkb9kr0jad6whd4b0l9h608s86057v7" }, "stable": { "version": [ 1, - 7, - 10 + 8, + 0 ], "deps": [ "haskell-mode" ], - "commit": "3882d1b5f7e395300200a2ce647858fa762e4805", - "sha256": "0qpv6pb71qxx7djhlxah9v8nn5whvhw468b5dl91zmhv55m3y5mr" + "commit": "39389e4080144c6734dbe3020cc35185f025ebf0", + "sha256": "14gb1az5gmlq6j7lx4d2cdkb9kr0jad6whd4b0l9h608s86057v7" } }, { @@ -107536,8 +107998,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20220314, - 930 + 20220429, + 1501 ], "deps": [ "cl-lib", @@ -107546,8 +108008,8 @@ "s", "typescript-mode" ], - "commit": "b93e555858edc331ba33d1d8bd4582d578c7ca31", - "sha256": "0il0rdg6qk4bdpq86hxzwbv1rgwn028v72i3xh2kg6xsmpil4f0z" + "commit": "83c34c636f47cb0c10c7d1a728fa308bfec40890", + "sha256": "19yg6zij9jx39d8b6c41ipa0z99q0af4l59pmnpxv8pfadxvi9qg" }, "stable": { "version": [ @@ -107753,6 +108215,29 @@ "sha256": "1jbmc356cqmjann2wdjnikyb0l136lpjka6bjim0rjhipdnw2acn" } }, + { + "ename": "timu-rouge-theme", + "commit": "5062b3e2d0d1b3bdbde2d0f58ca42952e90a9acf", + "sha256": "148k7anayfvvff5nw5jyjnwcwjag5q57kp4knfxfpb2v1nszpp1n", + "fetcher": "gitlab", + "repo": "aimebertrand/timu-rouge-theme", + "unstable": { + "version": [ + 20220501, + 1753 + ], + "commit": "935e4907f01fba2c7c2ecaab88eb7c4163955c3b", + "sha256": "0651q30pvxqdfv31mn87jxxkhds3f7bqh8bl1dsn7k9l1j6l3xfz" + }, + "stable": { + "version": [ + 1, + 2 + ], + "commit": "fe86f7d9864d986c7c8c430b6100070ab86dbbf1", + "sha256": "0651q30pvxqdfv31mn87jxxkhds3f7bqh8bl1dsn7k9l1j6l3xfz" + } + }, { "ename": "timu-spacegrey-theme", "commit": "1bebe80350df731711bc526ca9fe942410211220", @@ -107761,19 +108246,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20220316, - 2014 + 20220501, + 1509 ], - "commit": "3be10cb5c3e17d9babb67190f63500ee68df267c", - "sha256": "04n31pgzn53cnlcs6qagdbspjy85w4dxm3iz6gynwnp50g4y16cv" + "commit": "1318c58a118c6c5a95a82e71da5eda6bfcf8f143", + "sha256": "1vav4f6g86fh71ddprql0m8b05f4h8l04n7jfskfmvpfwgw2w87r" }, "stable": { "version": [ - 1, - 9 + 2, + 0 ], - "commit": "d623d3fba1a3a50bd677b4b4a22b1e13bdf86e68", - "sha256": "1rhr7j0gfcxvcgl5dfr4fidyx9m9lxwqyi8vcnvwcz0vnfxbr8x1" + "commit": "9e1a12a494537472fb1f9f9f23dc38b8bca1f9af", + "sha256": "1vav4f6g86fh71ddprql0m8b05f4h8l04n7jfskfmvpfwgw2w87r" } }, { @@ -107865,20 +108350,20 @@ "repo": "duckwork/titlecase.el", "unstable": { "version": [ - 20220227, - 1900 + 20220503, + 1344 ], - "commit": "157b2943f4aa5745d64c77c1ac4b76ce6e60c47b", - "sha256": "1bcj3k5gb28dkk8mcyqvm7scdszzf7ydp23piwsmavw0rdfqfhsd" + "commit": "dafaa6ca09fdf1ae8413159cae2b5d74e9713440", + "sha256": "0kpg1l0rbbwqcmlj9i8xs2dv9h6yik9wgngik5z6wdgxbkaxjln7" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "cc3b6b2d7d83b06fe88c0bc0af20cc9e4fe2b8e9", - "sha256": "0k4fw14pjg3hn0m8vqazrnq4bfgdkn59rd3pkcaf10nk0s6z2wjw" + "commit": "dafaa6ca09fdf1ae8413159cae2b5d74e9713440", + "sha256": "0kpg1l0rbbwqcmlj9i8xs2dv9h6yik9wgngik5z6wdgxbkaxjln7" } }, { @@ -108123,11 +108608,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20220411, - 655 + 20220505, + 1155 ], - "commit": "f8ec6b3e301d511649ce84b36067c8eab7038c72", - "sha256": "08lssap3c9dsy1w66mhbyam9f2rhdmb2dw25fzzgy1ziqg1mn0rv" + "commit": "118565dab2d3cf1b083d666bc19ed1b063035732", + "sha256": "1l2s99n7gcm810di9z7v79znlg3yy3aj6pdgwgd7mnyjhlxm3m4a" } }, { @@ -108138,25 +108623,25 @@ "repo": "nagy/tokei.el", "unstable": { "version": [ - 20220413, - 1836 + 20220422, + 2234 ], "deps": [ "magit-section" ], - "commit": "c6e1f333283c6c3f366141ba32dcd57252f6947e", - "sha256": "0jzfhxpkv4syl1wxfyxzkjhkr5h9j8562xwafr2vai2vc6y9p94y" + "commit": "181021cd881eecd604a546d4a717866a81c7a511", + "sha256": "0gcjlcfxd4bg123gjf7d0vfvfd6zpd0da8svynglca1qhp77jkx1" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "magit-section" ], - "commit": "3308412efdf72bc9d5a64250678e0c0c0e0f8511", - "sha256": "02w0v1lpj02xv9c3yhqlnd3fbadnqfz72gy2sck784pkv09zkfg1" + "commit": "181021cd881eecd604a546d4a717866a81c7a511", + "sha256": "0gcjlcfxd4bg123gjf7d0vfvfd6zpd0da8svynglca1qhp77jkx1" } }, { @@ -108257,20 +108742,20 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220413, - 630 + 20220504, + 2220 ], - "commit": "cb9dbf5c0f7a7d7c60daeed8f00c20e750f5ffec", - "sha256": "1zbsj1vakh0k646hbmlg10gmh7yg6jddagpg55j9w3pzzwm31psi" + "commit": "cbd1f7e8dad4284455488f759946d2f38deff2c6", + "sha256": "0lbcabpp5a9zz36j710b1dw1zzjhhm1434nv3icq8q2z6k8n06xb" }, "stable": { "version": [ 0, 2, - 0 + 1 ], - "commit": "edb0d582ae70549ad37b80c7ef22ae434feed3f2", - "sha256": "1mhp5wqwwhcn2crq277nj4bxl3nfn1l2gfbf6sirjksgs1zmrmkm" + "commit": "9760a3ab5ebcde43ab93246fd9cb93732c5d8647", + "sha256": "1xk4nyivzhlxigsxbxfhvf7zp8bwbmp5hkzcqnz8xg9b6zdn7lz8" } }, { @@ -108533,16 +109018,16 @@ 20210713, 1609 ], - "commit": "e4c5bb69e6f1338239bdbf66baf57bb610828b2e", - "sha256": "05ddgcgqribdwbph7qkz5r24h1xsbrnhlg4yqgnyyw5kfxayapzj" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" }, "stable": { "version": [ 2, - 11 + 12 ], - "commit": "6ccd4b494cbae9d28091217654f052eaea321007", - "sha256": "0cr9flk310yn2jgvj4hbqw9nj5wlfi0fazdkqafzidgz6iq150wd" + "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", + "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" } }, { @@ -108637,11 +109122,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220413, - 2332 + 20220508, + 1914 + ], + "deps": [ + "compat" ], - "commit": "19cf9bef5d5c70fdd636ea021a0d26f0104a473d", - "sha256": "044x5h4hzwk6d3npcqi3v0w58glgb9bx153pwvpy1i4aml7vg26x" + "commit": "d9b3a54128065222d35ce4ba49cdb39e23a06d2f", + "sha256": "0p9qkgfsqjp5qra10yalm53b74bvm32rfxrvlpl4pqcs3mqlxw3g" }, "stable": { "version": [ @@ -108661,14 +109149,14 @@ "repo": "conao3/transient-dwim.el", "unstable": { "version": [ - 20200812, - 1033 + 20220425, + 1331 ], "deps": [ "transient" ], - "commit": "de03d875dd89b1d838be67b0c44d9786adf96717", - "sha256": "0gb4k3758bv25vdw30rq0vbs94vdyss0xsiyaxnmvpfnj0v9k2cq" + "commit": "7b6e70fb49b9d18106748202011863ebc39b864a", + "sha256": "1qph3ffpvrx02a423hpmdfp15g9yqdd38bnmsa735cnnhqm3yshd" } }, { @@ -108794,8 +109282,8 @@ 20200910, 1636 ], - "commit": "e3721ed8bd1ac985c497eb718112906a2534bdbc", - "sha256": "10nklm1r8sqxwbdbs6qv2fqg5ga4n7wqcf2mrs8rps6gm2pa8vsq" + "commit": "1e151e5fc841688f1c4d68e9acc0f7b410cd754c", + "sha256": "1x3xdv789b3j8zm1zpd8v1m0712p1z9xi553yspp714w30dzxrs5" }, "stable": { "version": [ @@ -108875,14 +109363,15 @@ "url": "https://git.sr.ht/~tarsius/tray", "unstable": { "version": [ - 20220402, - 1640 + 20220422, + 1628 ], "deps": [ + "compat", "transient" ], - "commit": "5bd96ecb464844749712e5fa786e2e5258b1885d", - "sha256": "1g8nh86afj75na9bzlam28ng0nafvwc2alxpwx6snc9xm8px0cl4" + "commit": "7c70d499d08321337f860a3cd59cba7296cfcace", + "sha256": "0yl0ddn1iz7iph0vxh0fzavgsgrk8ks5axggzbgs8ywl6ya8r7g2" }, "stable": { "version": [ @@ -108916,8 +109405,8 @@ "tree-sitter-langs", "tsc" ], - "commit": "774a1e9598617f334fcd31aa606c5e738012fb60", - "sha256": "1bc51pmrr37yf116vmw436y2gidr5410ya2vlylrh3scssyd6zgw" + "commit": "eafee31ca4f532a9dbee326d3ec3bdd1e997223b", + "sha256": "1p8ghpj83smh1bh38ydhlpyaxfdx0f83wp4sdgzv3zxdfydmb4n9" } }, { @@ -108949,8 +109438,8 @@ "deps": [ "tsc" ], - "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", - "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" + "commit": "3cfab8a0e945db9b3df84437f27945746a43cc71", + "sha256": "0flqsf3nly7s261vss56havss13psgbw98612yj2xkfk9sydia28" }, "stable": { "version": [ @@ -109004,26 +109493,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20220328, - 1344 + 20220508, + 636 ], "deps": [ "tree-sitter" ], - "commit": "0dd5e56e2f5646aa51ed0fc9eb869a8f7090228a", - "sha256": "0jyzpiyl3b88vwfzkda7ak77kl0b2nybvsz0j9cndl3pf95d62g0" + "commit": "deb2d8674be8f777ace50e15c7c041aeddb1d0b2", + "sha256": "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp" }, "stable": { "version": [ 0, - 11, - 6 + 12, + 0 ], "deps": [ "tree-sitter" ], - "commit": "0dd5e56e2f5646aa51ed0fc9eb869a8f7090228a", - "sha256": "0jyzpiyl3b88vwfzkda7ak77kl0b2nybvsz0j9cndl3pf95d62g0" + "commit": "deb2d8674be8f777ace50e15c7c041aeddb1d0b2", + "sha256": "1p2zbb6ac7wi6x6zpbczcmpkb2p45md2csd2bj43d8s56ckzw5mp" } }, { @@ -109070,8 +109559,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220411, - 1944 + 20220506, + 1056 ], "deps": [ "ace-window", @@ -109083,14 +109572,13 @@ "pfuture", "s" ], - "commit": "6e206216cec383d47acec872a0c8ef6e70b7746b", - "sha256": "1ahk3ijhs6qgxqwz0v0zx1x8pz1x7l2902m8n2548npqa868gxrh" + "commit": "07706547a2a927e6787645538d8bdb6e9418fb62", + "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "ace-window", @@ -109102,8 +109590,8 @@ "pfuture", "s" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109114,28 +109602,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220124, - 1914 + 20220425, + 1124 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "6e206216cec383d47acec872a0c8ef6e70b7746b", - "sha256": "1ahk3ijhs6qgxqwz0v0zx1x8pz1x7l2902m8n2548npqa868gxrh" + "commit": "07706547a2a927e6787645538d8bdb6e9418fb62", + "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109146,28 +109633,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211019, - 1654 + 20220427, + 1331 ], "deps": [ "evil", "treemacs" ], - "commit": "6e206216cec383d47acec872a0c8ef6e70b7746b", - "sha256": "1ahk3ijhs6qgxqwz0v0zx1x8pz1x7l2902m8n2548npqa868gxrh" + "commit": "07706547a2a927e6787645538d8bdb6e9418fb62", + "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "evil", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109184,20 +109670,19 @@ "deps": [ "treemacs" ], - "commit": "6e206216cec383d47acec872a0c8ef6e70b7746b", - "sha256": "1ahk3ijhs6qgxqwz0v0zx1x8pz1x7l2902m8n2548npqa868gxrh" + "commit": "07706547a2a927e6787645538d8bdb6e9418fb62", + "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109208,30 +109693,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211010, - 1005 + 20220502, + 1310 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "6e206216cec383d47acec872a0c8ef6e70b7746b", - "sha256": "1ahk3ijhs6qgxqwz0v0zx1x8pz1x7l2902m8n2548npqa868gxrh" + "commit": "07706547a2a927e6787645538d8bdb6e9418fb62", + "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109250,22 +109734,21 @@ "persp-mode", "treemacs" ], - "commit": "6e206216cec383d47acec872a0c8ef6e70b7746b", - "sha256": "1ahk3ijhs6qgxqwz0v0zx1x8pz1x7l2902m8n2548npqa868gxrh" + "commit": "07706547a2a927e6787645538d8bdb6e9418fb62", + "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109284,22 +109767,21 @@ "perspective", "treemacs" ], - "commit": "6e206216cec383d47acec872a0c8ef6e70b7746b", - "sha256": "1ahk3ijhs6qgxqwz0v0zx1x8pz1x7l2902m8n2548npqa868gxrh" + "commit": "07706547a2a927e6787645538d8bdb6e9418fb62", + "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109317,21 +109799,20 @@ "projectile", "treemacs" ], - "commit": "6e206216cec383d47acec872a0c8ef6e70b7746b", - "sha256": "1ahk3ijhs6qgxqwz0v0zx1x8pz1x7l2902m8n2548npqa868gxrh" + "commit": "07706547a2a927e6787645538d8bdb6e9418fb62", + "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x" }, "stable": { "version": [ 2, - 9, - 5 + 10 ], "deps": [ "projectile", "treemacs" ], - "commit": "b5609d3eacab752e7f06fc66fd8c37189152c1cf", - "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109349,8 +109830,20 @@ "dash", "treemacs" ], - "commit": "6e206216cec383d47acec872a0c8ef6e70b7746b", - "sha256": "1ahk3ijhs6qgxqwz0v0zx1x8pz1x7l2902m8n2548npqa868gxrh" + "commit": "07706547a2a927e6787645538d8bdb6e9418fb62", + "sha256": "14i6j0n3wqvjyz7k5gi6i7iwr30rjiqb14ini2ilvh5xmfhixf3x" + }, + "stable": { + "version": [ + 2, + 10 + ], + "deps": [ + "dash", + "treemacs" + ], + "commit": "700bf4fb00c2f05f809d65ed320d47a3dd436d59", + "sha256": "0wf26wkba89rr7j9vsvkp0jfr49560nbvykaxm9hk7zvhkwlm1np" } }, { @@ -109596,8 +110089,8 @@ 20220212, 1632 ], - "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", - "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" + "commit": "3cfab8a0e945db9b3df84437f27945746a43cc71", + "sha256": "0flqsf3nly7s261vss56havss13psgbw98612yj2xkfk9sydia28" }, "stable": { "version": [ @@ -109898,14 +110391,14 @@ "repo": "BenediktBroich/twitch-api", "unstable": { "version": [ - 20220207, - 813 + 20220420, + 1547 ], "deps": [ "dash" ], - "commit": "e48b0b350516e20eaf85514e8855c2fbfbf09c11", - "sha256": "1pfrqa7lc85b9ww54w15liwi0swj3h9vx41fcmv7w0b31fijmzjd" + "commit": "181681097d1fc8d7b78928f8a5b38c61d0e20ef5", + "sha256": "14b8a22jbrnj42iva3mjb66j5w6zj0kd6dyk8pjkk22915w0jwcj" } }, { @@ -109940,11 +110433,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20220223, - 1506 + 20220506, + 827 ], - "commit": "88f317f0b6aef8f8d232e912fdbc679799580c56", - "sha256": "0qkqxvam3r21philap71dy4980sbadx32176rz20wwrs10szqnck" + "commit": "4f056f6db77839dc8653afff68dfecf62d83ec70", + "sha256": "0viyrfxnpmj164kiaai8j0wlrylss8mvpp3q57ldk2r6ijm85klb" }, "stable": { "version": [ @@ -110362,8 +110855,8 @@ 20200719, 618 ], - "commit": "e0edb861ea256e28faaa7d447ca8f16b144d410d", - "sha256": "0b0swqhd5k7i4fk02gxyr1knxjnc8iq1rx9i87iwbha95r0zpm1d" + "commit": "b7b5bffe242fd15b9eb8fe5cb7c9b45e474babbc", + "sha256": "0rbm3gq1b1w1f3gg7h9sncjp088dg7rd5vn3vakh140p289rwirx" }, "stable": { "version": [ @@ -110400,32 +110893,32 @@ }, { "ename": "undo-fu", - "commit": "0ca16994315f7d5dee9fff76db036e084162dc52", - "sha256": "1b0616zlblsd5405sfh02lxjyq6gl3s9m8vsxbqi6fryr4y750s9", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-undo-fu", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "00zbjr5dwpaqjky6sr4affj1nhv8q97psrfs55x6xd5smdkbxx60", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-undo-fu.git", "unstable": { "version": [ - 20220412, - 2337 + 20220507, + 1118 ], - "commit": "f9c39c248cb965cd3c7cb3c8e15a4eee71921f8c", - "sha256": "071k1fnhk102psqg7myj25aqdd61wpvd4zhv4k4p2hlx4d6a2wi6" + "commit": "08a9f1494957ca6513bdf8be5de6801b33e3ee59", + "sha256": "1yfkaqs7jkn6cfd2gixxscx303d97hngvni48a9hqa3n4hkg878p" } }, { "ename": "undo-fu-session", - "commit": "f39d9dc5e57554b42eca54ad5399a53947c2c25f", - "sha256": "0k9qxs3igzf7zcg1vd4v9npfiah512w9j2scnm333brmx4jfgvb7", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-undo-fu-session", + "commit": "ea2ae0d7f188967cf3b0cb71c4bbba364e59bd61", + "sha256": "16p51y2b0c2mbba7r1wrwbb15nv9wlgdd51yyr1gmbp90m81x9ky", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-undo-fu-session.git", "unstable": { "version": [ - 20220412, - 1212 + 20220507, + 1118 ], - "commit": "d2a5ca1299d35f88419e94bf941d6347ce140f2e", - "sha256": "0qwvql0vdir0yv78gk3yzpqasm53bylpdjm5cm6i5sxh41865d12" + "commit": "bc48bb6611d516891b61b2c4b5bc8d7fe8a520f6", + "sha256": "1r53bdip485wmyqq0qim7kwspgqgfa377nfb356ff1j0vmkjkwws" } }, { @@ -110457,8 +110950,8 @@ "deps": [ "cl-lib" ], - "commit": "efb8ac3935635ad0fd731de0ef64b14a23f50b42", - "sha256": "0mvj2jhj2dl4pr4gh7rh3042lawxik9myvvnvqc25zjqa5n4jp8c" + "commit": "ec95d5038425bca375865803701c971a9c748114", + "sha256": "0k6mrsbfhacz4ipcggb4x3gln8bqz2nxk8zapidz6vb11fgay8my" }, "stable": { "version": [ @@ -111306,8 +111799,8 @@ 20220220, 150 ], - "commit": "005706b5c2ae70c2c442030dcccfa7c7e3c23ddb", - "sha256": "0kk2r8lfc6q7rb1yykkf1z156mryb3zs0xbpw3czr7m576zwwrzi" + "commit": "0cb20745e3889f4eb8ea49c4a748f34f9ddf1fa6", + "sha256": "1840m49s0wnk376va05n2vq9877x3siri15da8z6mqrh02sj1fa9" }, "stable": { "version": [ @@ -111321,17 +111814,17 @@ }, { "ename": "utimeclock", - "commit": "f712b882b6961f3a83a9807e973fa6edc592c223", - "sha256": "1818i1b04mzx5015d5h5r1j9hbpg2x8xgszdq831c1sjhvnajh7z", - "fetcher": "gitlab", - "repo": "ideasman42/emacs-utimeclock", + "commit": "1a9ce8cad627f30ce907650593ada1cc0e4653b8", + "sha256": "0k3awhp9ab3h6hqmkrr0rs67rp7yr0zg0kzy6qa84gixc8s3naby", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-utimeclock.git", "unstable": { "version": [ - 20220211, - 548 + 20220425, + 939 ], - "commit": "0e36664ffe9f278bb008107d1b743edfcfba60f1", - "sha256": "1ninhp8z9lr705k8a5pd8cvm3nwrml9wp2hvrv3lilmdr9879h0y" + "commit": "cfd5109e004d3e2522f5e758b3ff7238fcf385d6", + "sha256": "0ii3rvxq0408snj8rmclrk1b1kkx46lkak16q8xlxz1gx01kn64d" } }, { @@ -111348,8 +111841,8 @@ "deps": [ "tuareg" ], - "commit": "5d72a0ab34bf621b2150e9e267ec108fb1c5899a", - "sha256": "0f3lyiqxkl9gqhfa8d7nmk8kq8r8m8b0c6iprqr6l715cwk8qzfz" + "commit": "42614160c20764b443d082083740e8dcc6cf2f78", + "sha256": "0ahxx8l0n7ki256rm2ka62rvil9292ijzm7w5i466gbvp6pa4mdf" }, "stable": { "version": [ @@ -111417,6 +111910,29 @@ "sha256": "0b16d5fkrqbj5v83cbkzchzgp4fhj7qqj67lsd5ix8pgqfgbhi4y" } }, + { + "ename": "uxntal-mode", + "commit": "ea376b1b019ebd4b38773547adcd25132f9e3018", + "sha256": "1kj59xybn5zbj1ggsnf3qwpl365ili96xck6q48y2g597k2ryh04", + "fetcher": "github", + "repo": "non/uxntal-mode", + "unstable": { + "version": [ + 20220502, + 154 + ], + "commit": "39cde87b15a98e0612e30b80e0676211236ac3e7", + "sha256": "1i5rkxnb4bib30qx602b426m0ydcmwlwgs9hl92540kx7d9j8416" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "a6e15c3ff1cfb05598db20ab494f783ba96f52ab", + "sha256": "0jxsn07w5iplc4xcdlljq8cpr0vf68p7wdqi9msv5hbcjrwk6as3" + } + }, { "ename": "v-mode", "commit": "247cab604cf0ef6078f5b0f5887526bcbbcefb70", @@ -111501,14 +112017,14 @@ "repo": "dougm/vagrant-tramp", "unstable": { "version": [ - 20210217, - 704 + 20220508, + 52 ], "deps": [ "dash" ], - "commit": "5f00b42a0c023c461cef7af4de7652d90c788b4d", - "sha256": "1mshxcbwdjs2fs7lzqhs3pqbmdmy2fyzkf9b6r8rsxqlisa4x6sn" + "commit": "2b7a4fabd328961384da06e0e302250cd97edc47", + "sha256": "03jbjsyf3lrqxk6455892hkz9iwfxahghjbp0kj34h46fprms78s" } }, { @@ -112558,11 +113074,11 @@ "url": "https://codeberg.org/joostkremers/visual-fill-column.git", "unstable": { "version": [ - 20211118, - 33 + 20220426, + 2045 ], - "commit": "cf3e2bc632b68d54145c79beede85d3458a337de", - "sha256": "0wj6c6q1sn7q1ywkm3fyl7z967jsl5g2xp3niwqv4kz9bs60aw6v" + "commit": "cdfe574a51c4fc3519536fa3b169b01d5482d5df", + "sha256": "1gimqhpnagv675wsb1yr50wxf8fwxlviks515yhyxn65hgl2x4wn" }, "stable": { "version": [ @@ -112786,11 +113302,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220319, - 1730 + 20220414, + 930 ], - "commit": "7389cb19e2d32435c6d19a67a851335a51490920", - "sha256": "0pf39fanzp45l92mw3cpl8ymvzhhrrpl98dj378wipgr7qnk89ch" + "commit": "f5eb6387506b22ba7e21b4e335e689cf6768f18b", + "sha256": "10zpxnp5iv409jfcggvfwva35kr6vzybra4d4mirdkw898rsmsla" }, "stable": { "version": [ @@ -112809,11 +113325,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220319, - 1729 + 20220414, + 931 ], - "commit": "05e80702e57a192be0bdc9f6271f0c4abbd17c29", - "sha256": "03ncnrqi22fpjw0a1wpbr03jg833s2bw6j76k501n51dz2dqfyyk" + "commit": "d585d0a3b87461b01dfad4ceaa7831668c6021d8", + "sha256": "0hl1zcf5w5m1lrz7jjk8ac7k6g8rhr9klzdh0nd9f6ksydvs9lfv" }, "stable": { "version": [ @@ -112886,11 +113402,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20220412, - 1140 + 20220429, + 21 ], - "commit": "a2f2286c40725244257f46d3a27a730e73f9f596", - "sha256": "08z9r3wz5rnx5pbv82pi5123hynbnwyhzgpkldxfcj4w3cd4qwhs" + "commit": "b44723552f86407d528c4a6c8057382c061b008e", + "sha256": "0rq2skwylvc7s4vfpbbsdykws4akyp9sc6xgrh2ql5yydhhnv2h3" } }, { @@ -112901,14 +113417,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20220202, - 1722 + 20220416, + 1034 ], "deps": [ "vterm" ], - "commit": "2a6861ef6af91dad4be082139214a30116b50acf", - "sha256": "19rr03fqicykw73wbpw2nzz0b0dc62qpqh7gddmgz8lv39d6xmfb" + "commit": "644e9df9f741c3338c248291799375a1778eb98b", + "sha256": "19c8z0nfhavimxr8nc5m67k8yxfzr7vaanjrxs3c6zip35nqrn8w" } }, { @@ -113142,11 +113658,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220405, - 124 + 20220426, + 717 ], - "commit": "c3a3a947fb267df1f03287be2eab4f7119707e90", - "sha256": "1f065v3i7n60lgdz9nzvla3n1xzcvznrg8f3kbf2ccvp5viwzi10" + "commit": "2420e7fb0d11372f1fa898a3b996bf2ce00fe66a", + "sha256": "05m1nqcvwc7vlki3n8v3d4idpvvbb2lkwwj9z30033g0q4j125m8" } }, { @@ -113264,15 +113780,28 @@ "repo": "plexus/walkclj", "unstable": { "version": [ - 20201116, - 735 + 20220422, + 854 + ], + "deps": [ + "parseclj", + "treepy" + ], + "commit": "ce4e7713d801b03f94f5da9898fce09718380ed4", + "sha256": "1r66fxbm39i1p75aizicravy2n8yjnj3m5nckzdqd86nw2v5d5c6" + }, + "stable": { + "version": [ + 0, + 2, + 0 ], "deps": [ "parseclj", "treepy" ], - "commit": "2077475eb3c8d1a170c3a3b0e836420469024f0f", - "sha256": "1ml1jz2dcva98kgzvrbad4myvyx2g1xzl584vj0mj41x0h6m47b3" + "commit": "4b4e9fcef2361bdf88ab3c7f905a76672cfd43e4", + "sha256": "19an6ny0r41wl567z0z8zlyrcq9c4jck1nf5rqnp3z07zswlp5sw" } }, { @@ -113397,16 +113926,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20220103, - 800 + 20220508, + 1540 ], "deps": [ "apel", "flim", "semi" ], - "commit": "638d089bba25ce8184c981d0721eba6417b3d7e2", - "sha256": "1rz9ydhhx38xvyggfdw8aqb2dgvv36g1db13ggkcyxcwp3x22y4s" + "commit": "e3cd5e39454737c0b641e114ddcc550122288a2a", + "sha256": "0qm5gyss1mxwcxgc4s201c0bvh7kfkfg8fii766nfnddfywccj43" } }, { @@ -114180,11 +114709,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20220214, - 1818 + 20220419, + 227 ], - "commit": "1217db8c6356659e67b35dedd9f5f260c06f6e99", - "sha256": "0ph5mrzz3r7x4dmy93v6affl4jznvic97a30mrs3kvhwyr2v4mby" + "commit": "129f4ebfc74f207ac82978f6d90d8b4bb1a55cf9", + "sha256": "065jfwnz9ymv5xiiyhnhsi5sm03ah5985hnm5psay6z9msskcnx8" }, "stable": { "version": [ @@ -114228,6 +114757,30 @@ "sha256": "1ay6qnil7xmml95yiax191fs85mpjkpr0r9314zlf0mf7ip9hvpy" } }, + { + "ename": "whiley-mode", + "commit": "d011f665fc7780714d8180c72b2be1235f1f3435", + "sha256": "16ar0z3iqa7150fbqqzq43mi9f81z181b2fdip6ys4mpwk1iz25a", + "fetcher": "github", + "repo": "Whiley/WhileyEmacsMode", + "unstable": { + "version": [ + 20220501, + 2219 + ], + "commit": "69eb67cf41dad029f1456079aea62a4b61ca9b46", + "sha256": "19j12h9v7agw340zb0cwlga2a0agl8c4bv19hxma5wd6sj0srp3v" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "e7cc4759d46be589d421a2235af6771bcde9ae33", + "sha256": "0g96zxli3jcl8f5fwk4kishgjdlvcaq1rsvj7gyfycnmq08aiszy" + } + }, { "ename": "whitaker", "commit": "4b5d717e2eaf35ce33b26be049a39f2f75a7de72", @@ -114391,11 +114944,11 @@ "url": "https://codeberg.org/akib/emacs-why-this.git", "unstable": { "version": [ - 20220314, - 1329 + 20220429, + 1227 ], - "commit": "ca4cf46d6e7b961a0c0fa39ac084fdca3c8c93b2", - "sha256": "14zb4abakpy2s05lfry097i0gg2d3njj0847a62dnwv8hgypsk6c" + "commit": "b69263c66b63680e1db81f6da98de00c230c7384", + "sha256": "1adsq14s4qkhf3d3n2137zrcz0x0gg31y6pa9viwq6hkhi59rddv" } }, { @@ -114927,11 +115480,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220412, - 1340 + 20220506, + 420 ], - "commit": "3d1af157b466c689ae2c4d1ddc1562d613d84879", - "sha256": "1xd35ma3mm45dzz3gw9cqjdsnl04bpzq7q9qwibc93i2c0l0xf60" + "deps": [ + "compat" + ], + "commit": "7348f6d5ff90318a1c948d0499d8dc6721fe851a", + "sha256": "02m44jrn5yznx4j6dwxsdjxbz8ik0r6mjy6cx9jda2kh7yr9pnc9" }, "stable": { "version": [ @@ -115178,11 +115734,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20220225, - 1907 + 20220508, + 1745 ], - "commit": "5a1f9a45c3d1fa58c3de5183c4456572ae861d49", - "sha256": "0jd7lbb7mbjfk66mkzxnhffh3dlj28xma5a8km5hc4lclqlm74sx" + "commit": "d37187bb5abb2fe4a8ba120fad9e52dd74cc220e", + "sha256": "0527j2ldfiaqlblk00abdl0s0l0wmxac74i4qa899mlqq5sp7kyy" } }, { @@ -115230,6 +115786,24 @@ "sha256": "1jl0b6g64a9w0q7bfvwha67vgws5xd15b7mkfyb5gkz3pymqhfxn" } }, + { + "ename": "wordreference", + "commit": "676db2393007648805f96e65fa65d80800f89d6b", + "sha256": "0ws1hiv2vp6bl86k8ddqry6lilmwqsb0b60lslhld7hiw80r7d37", + "fetcher": "git", + "url": "https://codeberg.org/martianh/wordreference.el", + "unstable": { + "version": [ + 20220504, + 2021 + ], + "deps": [ + "s" + ], + "commit": "785a5d3245efdc3f32ce61fad1c7596230682f3a", + "sha256": "0g23d58lm6fvk2v5z8zvn09c9q3nffdq6w4mdhygj2xc2l3c6rcp" + } + }, { "ename": "wordsmith-mode", "commit": "3b5fda506e5b388cd6824d433b89032ed46858dc", @@ -115312,11 +115886,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20220327, - 1001 + 20220423, + 1150 ], - "commit": "59952e80acecfd6f8b79f075d473501ee468085e", - "sha256": "0jsk210ahf05dm0bmpbl1hj9xld2cvwiyjp09wg084fj5h6fdk6d" + "commit": "ccd6948c92ea21d0dec56dff029b3f46df408de5", + "sha256": "1k4z9yi92mj2c82xww9bzpbgl2fcbi3fv79hlyalv20pqlky0zjy" }, "stable": { "version": [ @@ -115331,6 +115905,21 @@ "sha256": "0f16a4zz5havxbadiv4h6msa30c1yfdkfk56gic5wapz4i26z3x7" } }, + { + "ename": "workroom", + "commit": "f44154886249141ec1cb712f29790a9fa1a0402c", + "sha256": "08jw74rcfajgl1cwiar96fk2hynl1n63a2zd2zs934gbag82b96a", + "fetcher": "git", + "url": "https://codeberg.org/akib/emacs-workroom.git", + "unstable": { + "version": [ + 20220501, + 1500 + ], + "commit": "001fe2777f49ac73b6ab24401094a1c3c5efc887", + "sha256": "0haj4w8xcpm1yb3anla4ql2zi339hs6bcznxzl7qla575ff5sivp" + } + }, { "ename": "world-time-mode", "commit": "f1429650400baf2b1523b5556eaf6a2178d515d4", @@ -115446,14 +116035,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20210927, - 1301 + 20220426, + 2046 ], "deps": [ "visual-fill-column" ], - "commit": "eac1da790f316f357ed76ed67fbb790d6a4d126a", - "sha256": "01yrz25aymzwkcj5yzs8pmswsg0jgzbynbp9hmjnf3sqlgmang62" + "commit": "a736205c194d7525feb1e1f10f4186c7b2b62bef", + "sha256": "1mhakk78gxhv2cahvg3ynzrfwj09l5aknvncmd3r09csrc0cwkfg" }, "stable": { "version": [ @@ -115773,8 +116362,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20211121, - 1953 + 20220421, + 1320 ], "deps": [ "aio", @@ -115784,8 +116373,8 @@ "f", "s" ], - "commit": "c5fafbc41ae5c4d20a1eb2de3b3226f8a55eb65e", - "sha256": "1lzd053b27jikgb10bpbihynx08c9c33fcswrykl0r5548qjwm4j" + "commit": "a2c685b3bb2257da49af771caa02325aa41fa699", + "sha256": "12iy5fk3vz4rfyw848nb9dnnc4l338s9wm981w17k73wf37gnv89" } }, { @@ -115814,14 +116403,14 @@ "repo": "vibhavp/emacs-xkcd", "unstable": { "version": [ - 20220106, - 952 + 20220503, + 1109 ], "deps": [ "json" ], - "commit": "688d0b4ea234adda0c05784e6bb22ab9d71f0884", - "sha256": "15swryph0sks7lrcwnxsf436vq99b7psydnv0b2662nlbb0a4fdb" + "commit": "80011da2e7def8f65233d4e0d790ca60d287081d", + "sha256": "1l7bz979kjk1qngfa1zifyfdzn3vjvmbxy6qa188rxyz1zn6lm12" }, "stable": { "version": [ @@ -116656,8 +117245,8 @@ 20220212, 1742 ], - "commit": "a5ae81e44c8707949fad521ba532bc92568f79c2", - "sha256": "1s4qxxqz81sz1jydgrs9j7qkw3lyzcg76zx32646ibb6i093x8mf" + "commit": "25f6bf7415f6821a4097037a8decd03813d08722", + "sha256": "1dvrm7paaiy3f8mchhk2wxaaba3qzvl0hcld40k3miyjpdn2lfgs" }, "stable": { "version": [ @@ -117424,15 +118013,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20220331, - 1903 + 20220429, + 2057 ], "deps": [ "ace-window", "deft" ], - "commit": "9309bdb1cba8120b43158c09da86727c6bd42373", - "sha256": "1nnq9zsf2whfmd8bm1razsvc00ljgkky840h9ara64wggrh9sli9" + "commit": "86dd346be4bdddd6ac8d47503355fea350098271", + "sha256": "1s9gnsd3gj6wpv1vc3l2hhz4ccmfq6wvxcn3qj011pgz7y557iz9" }, "stable": { "version": [ @@ -117460,8 +118049,8 @@ "deps": [ "s" ], - "commit": "4048bf9e1be7ab759696a9541eec8f435359bcf3", - "sha256": "1rnir9mc9cp12wg5p19f0m6g6mvfyv1ahr7zq7azl8hvwmnb6gx7" + "commit": "603a5b692a08340c1865a6f73cacf57c4fd64cb2", + "sha256": "1hwibhqmm7a4zz0fw6qhbgyyw7rx73zd6gn7mg2g4m0c4kwwfifa" }, "stable": { "version": [ @@ -117571,11 +118160,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220412, - 1937 + 20220423, + 944 ], - "commit": "9f3eac6ad104eeb54e14f9688641b2f49ce15942", - "sha256": "0iwm3swln4mah3xd69b9bbi1fx2zvd0fjsp2sirzqrqxwxqa2s8a" + "commit": "d6d7713cfac073940dcd96b55c18830a64d4ccca", + "sha256": "09vnhnf61l5ap60b2kbc11sxj2zqbf57gmcjv954wsd6zr01rzcg" } }, { @@ -117586,14 +118175,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220312, - 2211 + 20220505, + 1403 ], "deps": [ "zk" ], - "commit": "9f3eac6ad104eeb54e14f9688641b2f49ce15942", - "sha256": "0iwm3swln4mah3xd69b9bbi1fx2zvd0fjsp2sirzqrqxwxqa2s8a" + "commit": "d6d7713cfac073940dcd96b55c18830a64d4ccca", + "sha256": "09vnhnf61l5ap60b2kbc11sxj2zqbf57gmcjv954wsd6zr01rzcg" } }, { @@ -117818,8 +118407,8 @@ 20201205, 1038 ], - "commit": "6d9caa87d1ef3cf3e4ac995c15cd7aa6aecd4ee3", - "sha256": "0p6sxgfjh9ld5d2ylx5w8im0m2skzgdk45bcn0sran4dsvp6jf3d" + "commit": "402f85f5d7d18e26289adcd452d42c73dc1df580", + "sha256": "1x7awisyb1vizpykmflvxw17x58xd2hj6dxq92xkpbswjj6fk238" }, "stable": { "version": [ @@ -117986,8 +118575,8 @@ 20220302, 522 ], - "commit": "ecdcb62847b5e54ccd477d740e4974f28c8f5809", - "sha256": "1f4j53a1bm4kpgmlpfxnqb9zm8q0qxl7frxd8a0nqwfrxrzkqp8p" + "commit": "2133eb000b5239b08a1c2532629a19a19f8e6309", + "sha256": "15r4v3m9plygnkajaaf2y76a09am7r29d8h4yxh5fk7vb7cfyrw3" }, "stable": { "version": [ From e79771850ae731c84433e53f86f9bd9eede838d2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 May 2022 22:57:14 -0300 Subject: [PATCH 014/150] elpa-packages 2022-05-08 --- .../emacs/elisp-packages/elpa-generated.nix | 285 +++++++++++++----- 1 file changed, 210 insertions(+), 75 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 1b39e522a41..4b61ff2a554 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -114,10 +114,10 @@ elpaBuild { pname = "aggressive-completion"; ename = "aggressive-completion"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/aggressive-completion-1.6.tar"; - sha256 = "0i7kcxd7pbdw57gczbxddr2n4j778x2ccfpkgjhdlpdsyidfh2bq"; + url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar"; + sha256 = "1rpy53kh19ljjr2xgna716jynajjpgkkjgcl3gzryxsmky8mwbfl"; }; packageRequires = [ emacs ]; meta = { @@ -234,10 +234,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.1.2"; + version = "13.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.1.2.tar"; - sha256 = "0j79y7iz0g3i36w5l91l2dljs8b4sx42f7q25z2963mvhfvrbp10"; + url = "https://elpa.gnu.org/packages/auctex-13.1.3.tar"; + sha256 = "0v9rxwz6ngnwrgvzgdki861s136gq30lqhy2gcd9q0a36gb6zhwk"; }; packageRequires = [ emacs ]; meta = { @@ -309,10 +309,10 @@ elpaBuild { pname = "bbdb"; ename = "bbdb"; - version = "3.2.2.1"; + version = "3.2.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bbdb-3.2.2.1.tar"; - sha256 = "060nd6vhwwh56jc1mvmyj6mn6kx7zgmbhrkfv9sqdx7h96bcrsbh"; + url = "https://elpa.gnu.org/packages/bbdb-3.2.2.2.tar"; + sha256 = "0bf20r5xhxln6z4qp8zrlln0303dkci2ydsr74pxcj08aqgk5xxf"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -354,10 +354,10 @@ elpaBuild { pname = "bluetooth"; ename = "bluetooth"; - version = "0.3"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bluetooth-0.3.tar"; - sha256 = "1q27hk4j7k0q9vqgn9nq7q0vhn9jdqbygs7d9lv5gwfhdzdnl4az"; + url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar"; + sha256 = "1p10kcim5wqnbj2kiqv6hgjkzznaa48qysnnf8ym90mylsczr70z"; }; packageRequires = [ dash emacs ]; meta = { @@ -756,10 +756,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "28.1.0.3"; + version = "28.1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-28.1.0.3.tar"; - sha256 = "12h06ab57hhjq434cf39g69ain6dpqq8a0h9xc91kvjsiz9chqhd"; + url = "https://elpa.gnu.org/packages/compat-28.1.1.1.tar"; + sha256 = "13ksa6q3m525gd6sdixmak6brfch2rhz8dzzmhvvdh1y04hcnam8"; }; packageRequires = [ emacs nadvice ]; meta = { @@ -771,10 +771,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.16"; + version = "0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.16.tar"; - sha256 = "172w4d9hbzj98j1gyfhzw2zz4fpw90ak8ccg35fngwjlk9mjdrzk"; + url = "https://elpa.gnu.org/packages/consult-0.17.tar"; + sha256 = "16yrp6scxg93anxrp5nww08ixxqk8ra9dn9zm8w5dry997kmkasa"; }; packageRequires = [ emacs ]; meta = { @@ -801,10 +801,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.21"; + version = "0.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.21.tar"; - sha256 = "1jabx61ajiysd3yqkraanlx9gnkz1qs6d94wjc5a2ran58iyknyr"; + url = "https://elpa.gnu.org/packages/corfu-0.23.tar"; + sha256 = "1l988jmvn3x1x77sc89pg5ivwl9i4r2v4k74ymkplgcc9wpffm1v"; }; packageRequires = [ emacs ]; meta = { @@ -857,6 +857,21 @@ license = lib.licenses.free; }; }) {}; + cpupower = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "cpupower"; + ename = "cpupower"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cpupower-1.0.4.tar"; + sha256 = "12910d3qbkapr4bvqv88lr85fz6rkim0zrc24nxnvkhkh3yi8qvd"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/cpupower.html"; + license = lib.licenses.free; + }; + }) {}; crdt = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "crdt"; @@ -917,6 +932,21 @@ license = lib.licenses.free; }; }) {}; + cursory = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "cursory"; + ename = "cursory"; + version = "0.1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cursory-0.1.4.tar"; + sha256 = "0yjwn6kpxl7b3m8si4sqmdkhr8imcgbvwhwki2sxgybs75lxdg97"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cursory.html"; + license = lib.licenses.free; + }; + }) {}; cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "cycle-quotes"; @@ -1146,10 +1176,10 @@ elpaBuild { pname = "djvu"; ename = "djvu"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/djvu-1.1.1.el"; - sha256 = "0z2qk1v4qkvcwl27ycqfb8vyszq5v6b8ci29b4la00yaki16p04i"; + url = "https://elpa.gnu.org/packages/djvu-1.1.2.tar"; + sha256 = "0i7xwgg2fxndy81lnng6fh9iknals8xvx4f1nmxq7c099bzwb57c"; }; packageRequires = []; meta = { @@ -1176,10 +1206,10 @@ elpaBuild { pname = "dtache"; ename = "dtache"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dtache-0.5.tar"; - sha256 = "10gcnkajpw7szd41l6ykkysv00yp93y1z9ajhcmk4wzni93w21z2"; + url = "https://elpa.gnu.org/packages/dtache-0.6.tar"; + sha256 = "1nv5hzn4rnm8pzfr5i209djaafj4ymg5j886yq2j19zkjadc8yx3"; }; packageRequires = [ emacs ]; meta = { @@ -1221,10 +1251,10 @@ elpaBuild { pname = "easy-kill"; ename = "easy-kill"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/easy-kill-0.9.4.tar"; - sha256 = "1pqqv4dhfm00wqch4wy3n2illsvxlz9r6r64925cvq3i7wq4la1x"; + url = "https://elpa.gnu.org/packages/easy-kill-0.9.5.tar"; + sha256 = "0h8rzd23sgkj3vxnyhis9iyq8n3xqp9x1mvxlm61s6wwj9j398j6"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1296,10 +1326,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220324"; + version = "20220416"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220324.tar"; - sha256 = "0x1fhjj7g96xmp8pnj3k23xi61nfzaj04bzx050qjc1dvdg8gpfa"; + url = "https://elpa.gnu.org/packages/eev-20220416.tar"; + sha256 = "174hwb3cyiqimzcsl62yhq51hb4gxmj5wni6w5ng4m24bfkx87nc"; }; packageRequires = [ emacs ]; meta = { @@ -1469,10 +1499,10 @@ elpaBuild { pname = "engrave-faces"; ename = "engrave-faces"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/engrave-faces-0.2.0.tar"; - sha256 = "1d0hsfg3wvwbs82gjyvfjvy1sszcm7qa50bch1b6jy05kbc543ip"; + url = "https://elpa.gnu.org/packages/engrave-faces-0.3.0.tar"; + sha256 = "0l59fci16m6li52bqwbqglsi9gavgsfkxlxm9y1ny3ma0w1rnp9d"; }; packageRequires = [ emacs ]; meta = { @@ -1680,6 +1710,21 @@ license = lib.licenses.free; }; }) {}; + fontaine = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "fontaine"; + ename = "fontaine"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/fontaine-0.1.1.tar"; + sha256 = "1jyb6s2sqr9fmy6f4i9vijaswb8f9vn2br98d4w2afzhmf4d0bdc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/fontaine.html"; + license = lib.licenses.free; + }; + }) {}; frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "frame-tabs"; @@ -1942,6 +1987,21 @@ license = lib.licenses.free; }; }) {}; + gtags-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "gtags-mode"; + ename = "gtags-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gtags-mode-1.0.tar"; + sha256 = "0nyzsr3fnds931ihw2dp5xlgv151kzph7qv1n751r1cajimzlp7n"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gtags-mode.html"; + license = lib.licenses.free; + }; + }) {}; guess-language = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -2058,10 +2118,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "7.1.3"; + version = "8.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-7.1.3.tar"; - sha256 = "0bizibn4qgxqp89fyik6p47s9hss1g932mg8k7pznn3kkhj5c8rh"; + url = "https://elpa.gnu.org/packages/hyperbole-8.0.0.tar"; + sha256 = "171x7jad62xd0n3xgs32dksyhn5abxj1kna0qgm65mm0v73hrv8d"; }; packageRequires = [ emacs ]; meta = { @@ -2408,10 +2468,10 @@ elpaBuild { pname = "lin"; ename = "lin"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/lin-0.3.0.tar"; - sha256 = "08h7rh8gidn9mn031mg8lvhxswv1hxn4i0ffk2vxygfbp9jxfi61"; + url = "https://elpa.gnu.org/packages/lin-0.3.1.tar"; + sha256 = "1blk9vc9fyw6djqh0465bayv2s5s0ap7fps383ihmazmmii6mp2a"; }; packageRequires = [ emacs ]; meta = { @@ -2498,10 +2558,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/logos-0.3.1.tar"; - sha256 = "0wwvp47bmc7w3jvh480vc31agf0s39mvgk0h550z6a1wzlrfzyh9"; + url = "https://elpa.gnu.org/packages/logos-0.3.2.tar"; + sha256 = "1qpbp9f9lz7yrky42cq8b4k295593s7l892zsrdyifnqcgs50bfd"; }; packageRequires = [ emacs ]; meta = { @@ -2886,10 +2946,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.3.0.tar"; - sha256 = "1nq5x46467vnsfg3fzb0qyg97xpnwsvbqg8frdjil5zq5fhsgmrz"; + url = "https://elpa.gnu.org/packages/nano-theme-0.3.1.tar"; + sha256 = "003jhzh52iqrqlxh1gpv3y2wjlxx4ng3al5zcpm5q42kix8cjpd1"; }; packageRequires = [ emacs ]; meta = { @@ -3070,10 +3130,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.5.2"; + version = "9.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.5.2.tar"; - sha256 = "12pvr47b11pq5rncpb3x8y11fhnakk5bi73j9l9w4d4ss3swcrnh"; + url = "https://elpa.gnu.org/packages/org-9.5.3.tar"; + sha256 = "0i8lx7gsdz79qv0h3qdbwqd0m91z6ky33wjmkcbify75giixiv25"; }; packageRequires = [ emacs ]; meta = { @@ -3205,10 +3265,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-0.6.tar"; - sha256 = "0p19qyx4gw1rn2f5hlxa7gx1sph2z5vjw7cnxwpjhbbr0430zzwb"; + url = "https://elpa.gnu.org/packages/osm-0.7.tar"; + sha256 = "0k2phmh2sl50vx88cgndghcjfz0i20mjs2hg4mlh4hb5q9yjpcj4"; }; packageRequires = [ emacs ]; meta = { @@ -3445,10 +3505,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pulsar-0.3.0.tar"; - sha256 = "0dbfj7789qp4l25y8qazmx5kqgjgqjsnk24rwcf6qann4cq6wgnq"; + url = "https://elpa.gnu.org/packages/pulsar-0.3.1.tar"; + sha256 = "0v3bdw0sgic98b7xj19g37hw1vinanagsbhyf5qpajx3gm2im9wx"; }; packageRequires = [ emacs ]; meta = { @@ -3460,10 +3520,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-4.1.0.tar"; - sha256 = "1q4b3y72gbkl5z31brlnjqjl30lgqm2d1zlqrbkqnnfy5hjgazk9"; + url = "https://elpa.gnu.org/packages/pyim-4.2.0.tar"; + sha256 = "1yb6yv92987kq0ls38d0fqwbj5jrf4cg3jvdbwjzr61gg3izf414"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3535,10 +3595,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.5.el"; - sha256 = "159fps843k5pap9k04a7ll1k3gw6d9c6w08lq4bbc3lqg78aa2l9"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar"; + sha256 = "04v73cm1cap19vwc8lqsw0rmfr9v7r3swc4wgxnk9dnzxi9j2527"; }; packageRequires = []; meta = { @@ -3830,10 +3890,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "4"; + version = "5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-4.tar"; - sha256 = "15vs982cxpc3g8cq2gj3a6dfn9i2r9b44x38ydvcmiy2brkd3psj"; + url = "https://elpa.gnu.org/packages/rt-liberation-5.tar"; + sha256 = "1gjj38rag3hh42xkf7qlvwn0qj45i8v30h5wgs3w2a2ccs46bpy4"; }; packageRequires = []; meta = { @@ -3982,6 +4042,21 @@ license = lib.licenses.free; }; }) {}; + shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.3.2.tar"; + sha256 = "03hmk4gr9kjy3238n0ys9na00py035j9s0y8d87c45f5af6c6g2c"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; @@ -4196,6 +4271,21 @@ license = lib.licenses.free; }; }) {}; + sql-cassandra = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "sql-cassandra"; + ename = "sql-cassandra"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.1.tar"; + sha256 = "1w9jhh4gf5nnjq8p2zfdli81yqvnfjri4qlwxiwb913ah48vyi2l"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sql-cassandra.html"; + license = lib.licenses.free; + }; + }) {}; sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "sql-indent"; @@ -4459,14 +4549,44 @@ license = lib.licenses.free; }; }) {}; + tmr = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tmr"; + ename = "tmr"; + version = "0.2.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tmr-0.2.3.tar"; + sha256 = "0lys6g96cvfyhwr7z0yv9cx2ykzyixjppv5fh29qzq3h3dywx5wb"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tmr.html"; + license = lib.licenses.free; + }; + }) {}; + tomelr = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, seq }: + elpaBuild { + pname = "tomelr"; + ename = "tomelr"; + version = "0.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tomelr-0.3.0.tar"; + sha256 = "0jnnyvbmhqn8wkg3y13iy19nck6dphay8jdy2nimp28a1jvs7z6g"; + }; + packageRequires = [ emacs map seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tomelr.html"; + license = lib.licenses.free; + }; + }) {}; tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.2.3"; + version = "2.5.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.2.3.tar"; - sha256 = "1nv603jrvql03z2pfg74yq0hp7963gagg27fksc456mpmz4p7ajq"; + url = "https://elpa.gnu.org/packages/tramp-2.5.2.4.tar"; + sha256 = "0ap1d34p1akrrm8z1r7ln6mj13xg2nrvjln2v3g8plhhp354jldz"; }; packageRequires = [ emacs ]; meta = { @@ -4774,10 +4894,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.22"; + version = "0.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.22.tar"; - sha256 = "1m8r2iqyyvym7a47awh00aq7hld54dklrx4ibwvnmhpxl0fzh7g8"; + url = "https://elpa.gnu.org/packages/vertico-0.23.tar"; + sha256 = "1d2r2y1bhvipn4xqzla5rv09cdpg7f19m9hrnv1pqypjvbgqv1m2"; }; packageRequires = [ emacs ]; meta = { @@ -4794,10 +4914,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.3.tar"; - sha256 = "12jcb4im1ys2s0wbv9nfmgpcrz037zagd677qjm8hz8fn29xdh6n"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.4.tar"; + sha256 = "19lx6p06wkwfivxgswdljdsh9bgcd1b9zkzx426w3pwicdk0cvgg"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -4868,6 +4988,21 @@ license = lib.licenses.free; }; }) {}; + vundo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "vundo"; + ename = "vundo"; + version = "2.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vundo-2.0.0.tar"; + sha256 = "032aqcqq2xhh12qcpp8p3qldv0r9cnqr2y11jk1m5cvgal1cbb68"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vundo.html"; + license = lib.licenses.free; + }; + }) {}; wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "wcheck-mode"; From a7efe866345bbeb7f27ab7495176e1c557f8b32b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 8 May 2022 22:59:04 -0300 Subject: [PATCH 015/150] elpa-generated: manual fixup --- .../emacs/elisp-packages/elpa-generated.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 4b61ff2a554..9103af47119 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -4042,21 +4042,6 @@ license = lib.licenses.free; }; }) {}; - shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.3.2.tar"; - sha256 = "03hmk4gr9kjy3238n0ys9na00py035j9s0y8d87c45f5af6c6g2c"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; From a7be18ee8528414a7af01674401a173453d0f972 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 May 2022 07:51:04 +0000 Subject: [PATCH 016/150] python310Packages.PyChromecast: 12.1.1 -> 12.1.2 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 7d38d99c696..f547b2d160f 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "12.1.1"; + version = "12.1.2"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "sha256-lUWiKs2tyWYD9214eMbqF7rxMoJgz1YMiHyMEqrUyCw="; + sha256 = "sha256-a+Ym5bovb/rvvBPdzthOi2Cp7xsBL3EDn8D3oLy0vaY="; }; propagatedBuildInputs = [ From fa78bd440e338cfc2fd54d2e499760ceadf597f8 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Mon, 9 May 2022 15:43:57 +0800 Subject: [PATCH 017/150] uxplay: 1.50 -> 1.52 --- pkgs/servers/uxplay/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index d013a5a59e4..54adab9b109 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -2,7 +2,6 @@ , stdenv , pkg-config , fetchFromGitHub -, fetchpatch , cmake , wrapGAppsHook , avahi @@ -14,23 +13,15 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.50"; + version = "1.52"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-43BCpYh0XtsnI064/ddcz2/Imj399g+bxLlT0BpqLMI="; + sha256 = "sha256-2wPUG50fbXLg6w2Rni3NyeiCyUNPcOvxvqopD9QZJaQ="; }; - patches = [ - # https://github.com/FDH2/UxPlay/issues/91 - (fetchpatch { - url = "https://github.com/FDH2/UxPlay/commit/f373fb2edcfb1f4c279e5796cf21e4a865800a71.patch"; - sha256 = "sha256-ENT/sMyPjDdZ4gdxiatYJ/UxuCl+ekk0iQOn8ELDAKQ="; - }) - ]; - nativeBuildInputs = [ cmake openssl From 7fe4f29d680475303a41b71f261eef0ec6fff717 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 9 May 2022 12:01:30 +0200 Subject: [PATCH 018/150] swaylock-effects: 1.6-3 -> unstable-2021-10-21 To remain in sync with upstream `swaywm/swaylock`. Fixes a few issues including: * Ability to use `--screenshot`. * No more inverse colors. --- .../window-managers/sway/lock-effects.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index 9e919d3f88e..219e2c2421c 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -16,22 +15,15 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "1.6-3"; + version = "unstable-2021-10-21"; src = fetchFromGitHub { owner = "mortie"; repo = "swaylock-effects"; - rev = "v${version}"; - sha256 = "sha256-71IX0fC4xCPP6pK63KtvDMb3KoP1rw/Iz3S7BgiLSpg="; + rev = "a8fc557b86e70f2f7a30ca9ff9b3124f89e7f204"; + sha256 = "sha256-GN+cxzC11Dk1nN9wVWIyv+rCrg4yaHnCePRYS1c4JTk="; }; - patches = [ - (fetchpatch { - url = "https://github.com/mortie/swaylock-effects/commit/dfff235b09b475e79d75a040a0307a359974d360.patch"; - sha256 = "t8Xz2wRSBlwGtkpWZyIGWX7V/y0P1r/50P8MfauMh4c="; - }) - ]; - postPatch = '' sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build ''; @@ -53,6 +45,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gnxlxnxx ]; + maintainers = with maintainers; [ gnxlxnxx ma27 ]; }; } From 4a3ed385520d47d29b285344a4786711052000a7 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 9 May 2022 12:30:52 +0100 Subject: [PATCH 019/150] driftctl: 0.28.1 -> 0.29.0 --- pkgs/applications/networking/cluster/driftctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 4b5f60b973b..899b7514622 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-v6NtnCwIAqzlbtvwmWr39wauPxT0I/m5HOykQfmAexQ="; + sha256 = "sha256-cn0PhumDaOhTm1vZCj0h9XehnQCDc+mXtne7QQNSbBk="; }; - vendorSha256 = "sha256-2mAPOUAv0ORRCMxesmcwZZh9SCa12k94y/iiN/rzUbs="; + vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA="; nativeBuildInputs = [ installShellFiles ]; From dcb178bff97a36d405662b358424e8e4ea02ed6a Mon Sep 17 00:00:00 2001 From: Lana Black Date: Mon, 9 May 2022 12:05:53 +0000 Subject: [PATCH 020/150] whalebird: 4.5.2 -> 4.5.4 --- pkgs/applications/misc/whalebird/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 3920a3a8655..9b8a7f0a348 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: +, nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }: stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.2"; + version = "4.5.4"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-4ksKXVeUGICHfx014s5g9mapS751dbexBjzyqNvk02M="; + sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr"; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nodePackages.asar ]; - buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; dontConfigure = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ca2700bb3f..d6d64bfd2bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30510,9 +30510,7 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { }; - whalebird = callPackage ../applications/misc/whalebird { - electron = electron_14; - }; + whalebird = callPackage ../applications/misc/whalebird { }; wio = callPackage ../applications/window-managers/wio { wlroots = wlroots_0_14; From 80cc05f26c83ad78945108832f88790e4d23c0ec Mon Sep 17 00:00:00 2001 From: hexchen Date: Mon, 9 May 2022 12:46:25 +0000 Subject: [PATCH 021/150] alfaview: 8.43.0 -> 8.44.0 --- .../networking/instant-messengers/alfaview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 94ad490aead..90a0cd6f53a 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.43.0"; + version = "8.44.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-Rm1U3gxrToNCigL5AomftSUED7X3i7a6enmFnEzWV4c="; + sha256 = "sha256-6BhhUfULtCUO5jZFF+HxGuFCg0XojQ0NJUXHxMtnwN4="; }; nativeBuildInputs = [ From 52310fb50cc308d60fd64762bed78fb987b09b9c Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 9 May 2022 11:03:10 +0200 Subject: [PATCH 022/150] thedesk: update electron Signed-off-by: Florian Brandes --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 329531aa2bc..eeaa4541043 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10827,9 +10827,7 @@ with pkgs; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; - thedesk = callPackage ../applications/misc/thedesk { - electron = electron_14; - }; + thedesk = callPackage ../applications/misc/thedesk { }; theharvester = callPackage ../tools/security/theharvester { }; From 49f66f6da8b6982de61c7c48227092c6b29873f3 Mon Sep 17 00:00:00 2001 From: Riey Date: Mon, 9 May 2022 22:44:56 +0900 Subject: [PATCH 023/150] cargo-feature: 0.6.0 -> 0.7.0 --- pkgs/development/tools/rust/cargo-feature/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/development/tools/rust/cargo-feature/default.nix index 938dfab2982..88c48cd8594 100644 --- a/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/pkgs/development/tools/rust/cargo-feature/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-feature"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9TP67YtvRtgLtsKACL5xjXq5kZtYpTWsTqQsbOKPwtY="; + sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s="; }; - cargoSha256 = "sha256-MkLsQebQdqfUuARIdQZg47kMPudstJUgRQgUuovoLes="; + cargoSha256 = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU="; buildInputs = lib.optional stdenv.isDarwin libiconv; meta = with lib; { - description = "Allows conveniently modify features of crate"; + description = "Cargo plugin to manage dependency features"; homepage = "https://github.com/Riey/cargo-feature"; license = licenses.mit; platforms = platforms.unix; From 3592c25fb2917f1946ead3e0391960eccbc7ffef Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 9 May 2022 14:47:28 +0100 Subject: [PATCH 024/150] terragrunt: 0.36.6 -> 0.36.10 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 48025dfd7f7..748552a4067 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.6"; + version = "0.36.10"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WSvdv4E/m6mJZdo3s9FHMETKaYNB7mltWrQlTHTFJ/E="; + sha256 = "sha256-C7VUDwgxE5VlHamgJk9dDhaBCOLXLDg0TFEhH2jV4oc="; }; - vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; + vendorSha256 = "sha256-ZI2ETgxpRk10WMxb/v1j/LumL2xtE3QBcARs7spYMOk="; doCheck = false; From ac564365d4e0138712c3eed96b4251b4716e73af Mon Sep 17 00:00:00 2001 From: Gaelan Steele Date: Mon, 9 May 2022 14:00:34 +0000 Subject: [PATCH 025/150] emulationstation: pin boost 1.69 Anything later causes build failures. --- pkgs/applications/emulators/emulationstation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/emulationstation/default.nix b/pkgs/applications/emulators/emulationstation/default.nix index 4cb5ca9ec2e..2acb81cf032 100644 --- a/pkgs/applications/emulators/emulationstation/default.nix +++ b/pkgs/applications/emulators/emulationstation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost169, eigen , freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive , fetchpatch }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + buildInputs = [ alsa-lib boost169 curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; installPhase = '' install -D ../emulationstation $out/bin/emulationstation From 04ba6470497fcce936f968b7e77c4387a420fe02 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 13 Jan 2022 18:36:57 +0100 Subject: [PATCH 026/150] communicator: init at 2.1.1 --- pkgs/tools/misc/communicator/default.nix | 67 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/tools/misc/communicator/default.nix diff --git a/pkgs/tools/misc/communicator/default.nix b/pkgs/tools/misc/communicator/default.nix new file mode 100644 index 00000000000..fd48360ba73 --- /dev/null +++ b/pkgs/tools/misc/communicator/default.nix @@ -0,0 +1,67 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-accounts +, mauikit-filebrowsing +, mauikit-texteditor +, qtmultimedia +, qtquickcontrols2 +, kpeople +, kcontacts +}: + +mkDerivation rec { + pname = "communicator"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "communicator"; + rev = "v${version}"; + sha256 = "sha256-tHuFQgssZ6bohELx8tHrd4vvnrWixTyqCqK8WKJEdRE="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/share/maui-accounts/manifests" "$out/usr/share/maui-accounts/manifests" + ''; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-accounts + mauikit-filebrowsing + mauikit-texteditor + qtmultimedia + qtquickcontrols2 + kpeople + kcontacts + ]; + + meta = with lib; { + description = "Contacts and dialer application"; + homepage = "https://invent.kde.org/maui/communicator"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9331260436c..b83607efebe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25573,6 +25573,8 @@ with pkgs; communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; + communicator = libsForQt5.callPackage ../tools/misc/communicator { }; + complete-alias = callPackage ../tools/misc/complete-alias { }; confclerk = callPackage ../applications/misc/confclerk { }; From 2d1af85d4733b886986f8585baa1daf845104a7d Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 13 Jan 2022 18:25:03 +0100 Subject: [PATCH 027/150] mauikit-nota: init at 2.1.1 --- .../editors/maui-nota/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/editors/maui-nota/default.nix diff --git a/pkgs/applications/editors/maui-nota/default.nix b/pkgs/applications/editors/maui-nota/default.nix new file mode 100644 index 00000000000..9664aab2b2c --- /dev/null +++ b/pkgs/applications/editors/maui-nota/default.nix @@ -0,0 +1,56 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-filebrowsing +, mauikit-texteditor +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "nota"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "nota"; + rev = "v${version}"; + sha256 = "sha256-Sgpm5njhQDe9ohAVFcN5iPNC6v9+QZnGRPYxuLvUno8="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-filebrowsing + mauikit-texteditor + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Multi-platform text editor"; + homepage = "https://invent.kde.org/maui/nota"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9331260436c..21293e4c09c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28182,6 +28182,8 @@ with pkgs; ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + maui-nota = libsForQt5.callPackage ../applications/editors/maui-nota { }; + pragha = libsForQt5.callPackage ../applications/audio/pragha { }; rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; From a0e539ac408b9509723f930151fc900e5b0463ce Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 9 Jan 2022 13:21:04 +0100 Subject: [PATCH 028/150] vvave: init at 2.1.1 --- pkgs/applications/video/vvave/default.nix | 59 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/applications/video/vvave/default.nix diff --git a/pkgs/applications/video/vvave/default.nix b/pkgs/applications/video/vvave/default.nix new file mode 100644 index 00000000000..1612ce42001 --- /dev/null +++ b/pkgs/applications/video/vvave/default.nix @@ -0,0 +1,59 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-accounts +, mauikit-filebrowsing +, qtmultimedia +, qtquickcontrols2 +, taglib +}: + +mkDerivation rec { + pname = "vvave"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "vvave"; + rev = "v${version}"; + sha256 = "sha256-ykX1kd3106KTDTJQIGk6miSgbj+oROiXQl/nkCjTphE="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-accounts + mauikit-filebrowsing + qtmultimedia + qtquickcontrols2 + taglib + ]; + + meta = with lib; { + description = "Multi-platform media player"; + homepage = "https://invent.kde.org/maui/vvave"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9331260436c..445d0e0f125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30385,6 +30385,8 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + vvave = libsForQt5.callPackage ../applications/video/vvave { }; + vwm = callPackage ../applications/window-managers/vwm { }; yeahwm = callPackage ../applications/window-managers/yeahwm { }; From 1905c075b014add9485aefb808dcebd362a07d16 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 9 May 2022 08:29:33 -0600 Subject: [PATCH 029/150] raven-reader: init at 1.0.72 --- .../newsreaders/raven-reader/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/networking/newsreaders/raven-reader/default.nix diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix new file mode 100644 index 00000000000..0858b4690bb --- /dev/null +++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "raven-reader"; + version = "1.0.72"; + src = fetchurl { + url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; + sha256 = "sha256-Sx02VMAgmncT9f5Hvs0LugzhD6Z8cWXHx4kn8IG9seU="; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + mkdir -p $out/share/${pname} + cp -a ${appimageContents}/locales $out/share/${pname} + cp -a ${appimageContents}/resources $out/share/${pname} + + install -m 444 -D ${appimageContents}/raven-reader.desktop -t $out/share/applications + + cp -a ${appimageContents}/usr/share/icons $out/share/ + + substituteInPlace $out/share/applications/raven-reader.desktop \ + --replace 'Exec=AppRun' 'Exec=raven-reader' + ''; + + meta = with lib; { + description = "Open source desktop news reader with flexible settings to optimize your experience"; + homepage = "https://ravenreader.app/"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce04e52db14..908a9f2f6b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4250,6 +4250,8 @@ with pkgs; rav1e = callPackage ../tools/video/rav1e { }; + raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { }; + razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; replay-sorcery = callPackage ../tools/video/replay-sorcery { }; From 56481a2ecc842ad2d1915381d9684f33ff74d477 Mon Sep 17 00:00:00 2001 From: rewine <1758075541@qq.com> Date: Mon, 9 May 2022 22:07:02 +0800 Subject: [PATCH 030/150] srain: 1.3.2 -> 1.4.0 --- pkgs/applications/networking/irc/srain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index 2fb6fed15ca..302fe96f1ec 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-JsXReGmdBtzMXhrT1cFlkBbw8j/SxzgXSeHcHlns2po="; + sha256 = "sha256-oeC0zyDyh0lW1IMIJ9bjqryqz3Km4JJzRUxkO6LadoQ="; }; nativeBuildInputs = [ From 11a19355818986004fc0496715cb9600863ee7e7 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Mon, 9 May 2022 11:26:49 -0400 Subject: [PATCH 031/150] supercollider: fix build with libsndfile >=1.1.0 --- pkgs/development/interpreters/supercollider/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 0446e5d540c..ecb3d5787eb 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, cmake +{ lib, stdenv, mkDerivation, fetchurl, fetchpatch, cmake , pkg-config, alsa-lib, libjack2, libsndfile, fftw , curl, gcc, libXt, qtbase, qttools, qtwebengine , readline, qtwebsockets, useSCEL ? false, emacs @@ -18,6 +18,12 @@ mkDerivation rec { patches = [ # add support for SC_DATA_DIR and SC_PLUGIN_DIR env vars to override compile-time values ./supercollider-3.12.0-env-dirs.patch + + # fix issue with libsndfile >=1.1.0 + (fetchpatch { + url = "https://github.com/supercollider/supercollider/commit/b9dd70c4c8d61c93d7a70645e0bd18fa76e6834e.patch"; + hash = "sha256-6FhEHyY0rnE6d7wC+v0U9K+L0aun5LkTqaEFhr3eQNw="; + }) ]; nativeBuildInputs = [ cmake pkg-config qttools ]; From 27424231b35c6b0b040afd6e2caf00d7a8887b36 Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski <3494992+nazarewk@users.noreply.github.com> Date: Mon, 9 May 2022 11:55:04 +0200 Subject: [PATCH 032/150] teamviewer: 15.26.4 -> 15.29.4 --- pkgs/applications/networking/remote/teamviewer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 00289e5c628..7ee1cc9ab4f 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.26.4"; + version = "15.29.4"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-2CprtdKHHTLxS8jA4bRVoHvj/8zyVUV0aGPzU7mNxM8="; + sha256 = "sha256-jkFqOtU+D62S7QmNPvz58Z8wJ79lkN11pWQrtNdD+Uk="; }; unpackPhase = '' @@ -30,7 +30,7 @@ mkDerivation rec { $out/share/teamviewer/config \ $out/share/teamviewer/tv_bin/RTlib \ $out/share/teamviewer/tv_bin/xdg-utils \ - $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} + $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,tv-delayed-start.sh} ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin From 89412f830e0855fa56ae8d409991b79cbd6b5f73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 May 2022 18:32:19 +0200 Subject: [PATCH 033/150] nuclei: 2.6.9 -> 2.7.0 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 2ca79ed25a4..2145c5fc333 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.6.9"; + version = "2.7.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BGWlkNj0LQ02BSUWQYjoT4bR0t/DmNB0jBpvwB/gWwo="; + sha256 = "sha256-+yoxpdEU5TDOJsLRXBwddzAIBAzdSu8hdcvhuCWZxtc="; }; - vendorSha256 = "sha256-ar62CZ/2zXO3lwvWNiIAt9XITj2Y/0iIYGX8tmSCwcU="; + vendorSha256 = "sha256-6BC8jf/XaC7W6vsQEFIyIZ0S8XLJv+dFlaFl9VEO7yc="; modRoot = "./v2"; subPackages = [ From 145de7cdc8d8be8ebf9ee31dc8a25300cc7edc23 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 9 May 2022 14:15:43 -0300 Subject: [PATCH 034/150] shellhub-agent: 0.9.1 -> 0.9.2 Signed-off-by: Otavio Salvador --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 7384f7c350a..f584eea5cca 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "E1TX3GBVKn0tXloNhyiXOtDwSlO7mwXJ6zaOSHKZEFc="; + sha256 = "clLSkby7bmjScUpSZkVvHt5nSIoQOaYrxsoLqiuQZik="; }; modRoot = "./agent"; - vendorSha256 = "sha256-sPb49tRUHhwow7+IKiN33sgWYAa3lTpOD1vh8e5Wy68="; + vendorSha256 = "sha256-XVLsmU4EfOTFVpF5he+FCyDr/NuApUBC9R00nO1HJrg="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From 43cbc7f79f3ab4b76ba615f5fb7dcce00a3d7973 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 9 May 2022 16:17:52 +0200 Subject: [PATCH 035/150] python3Packages.skytemple-files: mark broken on darwin --- pkgs/development/python-modules/skytemple-files/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 42012dbd4cf..2f43d04ba16 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript , ndspy, pillow, setuptools, skytemple-rust, tilequant, armips }: @@ -31,5 +31,6 @@ buildPythonPackage rec { description = "Python library to edit the ROM of Pokémon Mystery Dungeon Explorers of Sky"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xfix marius851000 ]; + broken = stdenv.isDarwin; # pyobjc is missing }; } From 9ca7db22af02d7f80b81318a11a66a881c3d1176 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Mon, 9 May 2022 19:38:09 +0200 Subject: [PATCH 036/150] polkadot: 0.9.18 -> 0.9.21 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 24d1f2cd0f4..f586b6cfd39 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.18"; + version = "0.9.21"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-pjHSiVspBV15jKUFv+Uf2l3tah40l55Pv8vwDuwgwjc="; + sha256 = "HCj5WwfKa4QsfO+1u4ciukDg6Rzv/uvc8h+V/Duhksg="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94="; + cargoSha256 = "tHU8KygIhJDgID/tGGssYTnY8raI5qTdLEDwOKox3No="; buildInputs = lib.optional stdenv.isDarwin [ Security ]; From 52a78362ac76d96644ea0057a8544e14ee6667a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 May 2022 21:36:51 +0200 Subject: [PATCH 037/150] zkar: init at 1.3.0 --- pkgs/tools/security/zkar/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/zkar/default.nix diff --git a/pkgs/tools/security/zkar/default.nix b/pkgs/tools/security/zkar/default.nix new file mode 100644 index 00000000000..315e45cb038 --- /dev/null +++ b/pkgs/tools/security/zkar/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zkar"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "phith0n"; + repo = pname; + rev = "v${version}"; + hash = "sha256-TGqsiYZLbXvCc30OtvNbX4INlzw3ZfjvXal47rP7NDw="; + }; + + vendorSha256 = "sha256-HQ9qclaaDj0H8PL0oQG1WsH19wVQpynijHNcal4gWBE="; + + meta = with lib; { + description = "Java serialization protocol analysis tool"; + homepage = "https://github.com/phith0n/zkar"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c906177bb2..12d3cafd235 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12023,6 +12023,8 @@ with pkgs; zxing = callPackage ../tools/graphics/zxing {}; + zkar = callPackage ../tools/security/zkar { }; + zmap = callPackage ../tools/security/zmap { }; zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { }; From 6f1bb49e5a42ac6154d2a5a0597b8b9a7011a2b6 Mon Sep 17 00:00:00 2001 From: amesgen Date: Mon, 9 May 2022 21:44:38 +0200 Subject: [PATCH 038/150] secp256k1: allow to build on all platforms --- pkgs/tools/security/secp256k1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 890518126d8..bae83462872 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { homepage = "https://github.com/bitcoin-core/secp256k1"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ]; - platforms = with platforms; unix; + platforms = with platforms; all; }; } From 2e882e09033b481a8f4531c30cfab7fc855c3909 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 6 May 2022 08:13:00 +0200 Subject: [PATCH 039/150] hydra-unstable: 2021-08-11 -> 2021-12-17 Adds some new required deps too. Enable doCheck (tests). Apply patch for missing std:: specifier before std::strings. --- pkgs/development/tools/misc/hydra/common.nix | 32 ++++++++-- pkgs/development/tools/misc/hydra/default.nix | 13 ++-- .../tools/misc/hydra/missing-std-string.patch | 61 +++++++++++++++++++ pkgs/top-level/perl-packages.nix | 15 +++++ 4 files changed, 110 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/tools/misc/hydra/missing-std-string.patch diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index f9d7a8156e1..c6bc9c60e3a 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -6,6 +6,9 @@ , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] , tests ? {}, mdbook +, foreman +, python3 +, libressl }: with stdenv; @@ -48,26 +51,32 @@ let DigestSHA1 EmailMIME EmailSender - FileSlurp + FileSlurper IOCompress IPCRun JSON - JSONAny + JSONMaybeXS JSONXS + ListSomeUtils LWP LWPProtocolHttps + ModulePluggable NetAmazonS3 NetPrometheus NetStatsd PadWalker + ParallelForkManager + PerlCriticCommunity PrometheusTinyShared - Readonly + ReadonlyX SQLSplitStatement SetScalar Starman StringCompareConstantTime SysHostnameLong TermSizeAny + Test2Harness + TestPostgreSQL TextDiff TextTable XMLSimple @@ -85,11 +94,12 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper libtool unzip nukeReferences sqlite libpqxx_6 - top-git mercurial /*darcs*/ subversion breezy openssl bzip2 libxslt + top-git mercurial darcs subversion breezy openssl bzip2 libxslt perlDeps perl nix postgresql # for running the tests nlohmann_json boost + pixz ]; hydraPath = lib.makeBinPath ( @@ -99,6 +109,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config mdbook autoconf automake ]; + checkInputs = [ + foreman + python3 + libressl.nc + ]; + configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; NIX_CFLAGS_COMPILE = "-pthread"; @@ -113,6 +129,8 @@ in stdenv.mkDerivation rec { preCheck = '' patchShebangs . export LOGNAME=''${LOGNAME:-foo} + # set $HOME for bzr so it can create its trace file + export HOME=$(mktemp -d) ''; postInstall = '' @@ -127,16 +145,18 @@ in stdenv.mkDerivation rec { --set HYDRA_HOME $out/libexec/hydra \ --set NIX_RELEASE ${nix.name or "unknown"} done - ''; # */ + ''; dontStrip = true; + doCheck = true; + passthru = { inherit perlDeps migration tests; }; meta = with lib; { description = "Nix-based continuous build system"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ lheckemann mindavi das_j ]; }; } diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 27ff31dae96..f0ae50a0dec 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -2,15 +2,18 @@ { hydra-unstable = callPackage ./common.nix { - version = "2021-08-11"; + version = "2021-12-17"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "9bce425c3304173548d8e822029644bb51d35263"; - sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU="; + rev = "e1e5fafdff63c1e1595d2edb8c9854710211a0d7"; + sha256 = "sha256-JPkw3heasqX9iWju7BWjKDsyoS+HmLIKM2ibwHq5+Ko="; }; - patches = [ ./eval.patch ]; - nix = nixVersions.unstable; + patches = [ + ./eval.patch + ./missing-std-string.patch + ]; + nix = nixVersions.nix_2_4; tests = { basic = nixosTests.hydra.hydra-unstable; diff --git a/pkgs/development/tools/misc/hydra/missing-std-string.patch b/pkgs/development/tools/misc/hydra/missing-std-string.patch new file mode 100644 index 00000000000..2010b4cf178 --- /dev/null +++ b/pkgs/development/tools/misc/hydra/missing-std-string.patch @@ -0,0 +1,61 @@ +diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc +index acffe1d..53f2630 100644 +--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc ++++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc +@@ -63,7 +63,7 @@ struct MyArgs : MixEvalArgs, MixCommonArgs + + static MyArgs myArgs; + +-static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const string & name, const string & subAttribute) ++static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const std::string & name, const std::string & subAttribute) + { + Strings res; + std::function rec; +@@ -186,7 +186,7 @@ static void worker( + for (auto & i : context) + if (i.at(0) == '!') { + size_t index = i.find("!", 1); +- job["constituents"].push_back(string(i, index + 1)); ++ job["constituents"].push_back(std::string(i, index + 1)); + } + + state.forceList(*a->value, *a->pos); +diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc +index 62eb572..a957bef 100644 +--- a/src/hydra-queue-runner/hydra-queue-runner.cc ++++ b/src/hydra-queue-runner/hydra-queue-runner.cc +@@ -87,7 +87,7 @@ void State::parseMachines(const std::string & contents) + } + + for (auto line : tokenizeString(contents, "\n")) { +- line = trim(string(line, 0, line.find('#'))); ++ line = trim(std::string(line, 0, line.find('#'))); + auto tokens = tokenizeString>(line); + if (tokens.size() < 3) continue; + tokens.resize(8); +diff --git a/src/libhydra/db.hh b/src/libhydra/db.hh +index 7d5bdc5..00e8f40 100644 +--- a/src/libhydra/db.hh ++++ b/src/libhydra/db.hh +@@ -18,7 +18,7 @@ struct Connection : pqxx::connection + std::string upper_prefix = "DBI:Pg:"; + + if (hasPrefix(s, lower_prefix) || hasPrefix(s, upper_prefix)) { +- return concatStringsSep(" ", tokenizeString(string(s, lower_prefix.size()), ";")); ++ return concatStringsSep(" ", tokenizeString(std::string(s, lower_prefix.size()), ";")); + } + + throw Error("$HYDRA_DBI does not denote a PostgreSQL database"); +diff --git a/src/libhydra/hydra-config.hh b/src/libhydra/hydra-config.hh +index bc989f7..1688c27 100644 +--- a/src/libhydra/hydra-config.hh ++++ b/src/libhydra/hydra-config.hh +@@ -17,7 +17,7 @@ struct HydraConfig + if (hydraConfigFile && pathExists(*hydraConfigFile)) { + + for (auto line : tokenizeString(readFile(*hydraConfigFile), "\n")) { +- line = trim(string(line, 0, line.find('#'))); ++ line = trim(std::string(line, 0, line.find('#'))); + + auto eq = line.find('='); + if (eq == std::string::npos) continue; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72568265a82..b834447e585 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19055,6 +19055,21 @@ let }; }; + ReadonlyX = buildPerlModule { + pname = "ReadonlyX"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SA/SANKO/ReadonlyX-1.04.tar.gz"; + sha256 = "81bb97dba93ac6b5ccbce04a42c3590eb04557d75018773ee18d5a30fcf48188"; + }; + buildInputs = [ ModuleBuildTiny TestFatal ]; + meta = { + homepage = "https://github.com/sanko/readonly"; + description = "Faster facility for creating read-only scalars, arrays, hashes"; + license = lib.licenses.artistic2; + }; + }; + ReadonlyXS = buildPerlPackage { pname = "Readonly-XS"; version = "1.05"; From 3c34e350c930fc1e164627d5ca8daa4dd9f2451a Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 6 May 2022 08:52:03 +0200 Subject: [PATCH 040/150] perlPackages.UUID4Tiny: init at 0.002 Co-authored-by: lheckemann --- 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 b834447e585..56873e39c7f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -24476,6 +24476,19 @@ let }; }; + UUID4Tiny = buildPerlPackage { + pname = "UUID4-Tiny"; + version = "0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.002.tar.gz"; + sha256 = "e7535b31e386d432dec7adde214348389e1d5cf753e7ed07f1ae04c4360840cf"; + }; + meta = { + description = "Cryptographically secure v4 UUIDs for Linux x64"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + UUIDTiny = buildPerlPackage { pname = "UUID-Tiny"; version = "1.04"; From cec7fc48bb7e7a944fc00ba100018cc1237f6f83 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 6 May 2022 08:53:05 +0200 Subject: [PATCH 041/150] hydra-unstable: 2021-12-17 -> 2022-02-07 Co-authored-by: Linus Heckemann --- pkgs/development/tools/misc/hydra/common.nix | 16 ++++++++++++---- pkgs/development/tools/misc/hydra/default.nix | 14 +++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index c6bc9c60e3a..8cde9f460d9 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -9,6 +9,8 @@ , foreman , python3 , libressl +, cacert +, glibcLocales }: with stdenv; @@ -22,19 +24,19 @@ let name = "hydra-perl-deps"; paths = with perlPackages; lib.closePropagation [ ModulePluggable + AuthenSASL CatalystActionREST CatalystAuthenticationStoreDBIxClass + CatalystAuthenticationStoreLDAP CatalystDevel - CatalystDispatchTypeRegex CatalystPluginAccessLog CatalystPluginAuthorizationRoles CatalystPluginCaptcha CatalystPluginPrometheusTiny CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap - CatalystPluginSmartURI CatalystPluginStackTrace - CatalystRuntime + CatalystPluginUnicodeEncoding CatalystTraitForRequestProxyBase CatalystViewDownload CatalystViewJSON @@ -52,8 +54,10 @@ let EmailMIME EmailSender FileSlurper + FileWhich IOCompress IPCRun + IPCRun3 JSON JSONMaybeXS JSONXS @@ -75,16 +79,18 @@ let StringCompareConstantTime SysHostnameLong TermSizeAny + TermReadKey Test2Harness + TestMore TestPostgreSQL TextDiff TextTable + UUID4Tiny XMLSimple YAML nix nix.perl-bindings git - boehmgc ]; }; in stdenv.mkDerivation rec { @@ -110,7 +116,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config mdbook autoconf automake ]; checkInputs = [ + cacert foreman + glibcLocales python3 libressl.nc ]; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index f0ae50a0dec..5289015d43b 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,19 +1,23 @@ -{ fetchFromGitHub, callPackage, nixVersions, nixosTests }: +{ lib, fetchFromGitHub, callPackage, nixVersions, nixosTests, fetchpatch }: { hydra-unstable = callPackage ./common.nix { - version = "2021-12-17"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "e1e5fafdff63c1e1595d2edb8c9854710211a0d7"; - sha256 = "sha256-JPkw3heasqX9iWju7BWjKDsyoS+HmLIKM2ibwHq5+Ko="; + rev = "517dce285a851efd732affc084c7083aed2e98cd"; + sha256 = "sha256-abWhd/VLNse3Gz7gcVbFANJLAhHV4nbOKjhVDmq/Zmg="; }; patches = [ ./eval.patch ./missing-std-string.patch + (fetchpatch { + url = "https://github.com/NixOS/hydra/commit/5ae26aa7604f714dcc73edcb74fe71ddc8957f6c.patch"; + sha256 = "sha256-wkbWo8SFbT3qwVxwkKQWpQT5Jgb1Bb51yiLTlFdDN/I="; + }) ]; - nix = nixVersions.nix_2_4; + nix = nixVersions.nix_2_6; tests = { basic = nixosTests.hydra.hydra-unstable; From a07cc041090da87693501b86cf8e5bf3529e8ed9 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 8 May 2022 19:02:26 +0200 Subject: [PATCH 042/150] hydra: don't force HYDRA_RELEASE --- pkgs/development/tools/misc/hydra/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 8cde9f460d9..affeb75d198 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -149,7 +149,7 @@ in stdenv.mkDerivation rec { wrapProgram $i \ --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ --prefix PATH ':' $out/bin:$hydraPath \ - --set HYDRA_RELEASE ${version} \ + --set-default HYDRA_RELEASE ${version} \ --set HYDRA_HOME $out/libexec/hydra \ --set NIX_RELEASE ${nix.name or "unknown"} done From 3ece875b6007e383428aea745429f3ef8cbe3fff Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 9 May 2022 15:23:26 -0500 Subject: [PATCH 043/150] recutils: disable Clang "format" hardening Remove the -Werror=format-security compiler option when using Clang, because recutils does not build with it enabled. --- pkgs/tools/misc/recutils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 972b60d3649..0299cf38218 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { hash = "sha256-YwFZKwAgwUtFZ1fvXUNNSfYCe45fOkmdEzYvIFxIbg4="; }; + hardeningDisable = lib.optional stdenv.cc.isClang "format"; + buildInputs = [ curl ]; From b86571f4f550418641efb2cf374595cc96e81b3c Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:02:10 +0300 Subject: [PATCH 044/150] freeradius: remove useless null asserts --- pkgs/servers/freeradius/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 3999d422d21..faaa472e964 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -20,16 +20,7 @@ , withYubikey ? false, libyubikey }: -assert withSqlite -> sqlite != null; -assert withLdap -> openldap != null; -assert withPcap -> libpcap != null; -assert withCap -> libcap != null; -assert withMemcached -> libmemcached != null; -assert withRedis -> hiredis != null; -assert withMysql -> libmysqlclient != null; -assert withYubikey -> libyubikey != null; -assert withCollectd -> collectd != null; -assert withRest -> curl != null && withJson; +assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; From 973a0ee2a3cb8c4e0969c98b7cf35d622e7fa729 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:02:53 +0300 Subject: [PATCH 045/150] tachyon: remove nulls --- pkgs/development/libraries/tachyon/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 970b8a84622..ed2819e88c1 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -1,16 +1,12 @@ { lib, stdenv , fetchurl -, Carbon ? null -, libjpeg ? null -, libpng ? null +, Carbon +, libjpeg +, libpng , withJpegSupport ? true # support jpeg output , withPngSupport ? true # support png output }: -assert withJpegSupport -> libjpeg != null; -assert withPngSupport -> libpng != null; -assert stdenv.isDarwin -> Carbon != null; - stdenv.mkDerivation rec { pname = "tachyon"; version = "0.99.4"; From ecc2b14fbc72354b8af3fdfa8359907a2742e49e Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:05:55 +0300 Subject: [PATCH 046/150] libwebp: remove useless nulls --- pkgs/development/libraries/libwebp/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 4333b4fbda4..da75d3a9150 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool , threadingSupport ? true # multi-threading -, openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) -, pngSupport ? true, libpng ? null # PNG image format -, jpegSupport ? true, libjpeg ? null # JPEG image format -, tiffSupport ? true, libtiff ? null # TIFF image format -, gifSupport ? true, giflib ? null # GIF image format +, openglSupport ? false, freeglut, libGL, libGLU # OpenGL (required for vwebp) +, pngSupport ? true, libpng # PNG image format +, jpegSupport ? true, libjpeg # JPEG image format +, tiffSupport ? true, libtiff # TIFF image format +, gifSupport ? true, giflib # GIF image format #, wicSupport ? true # Windows Imaging Component , alignedSupport ? false # Force aligned memory operations , swap16bitcspSupport ? false # Byte swap for 16bit color spaces @@ -14,12 +14,6 @@ , libwebpdecoderSupport ? true # Build libwebpdecoder }: -assert openglSupport -> freeglut != null && libGL != null && libGLU != null; -assert pngSupport -> (libpng != null); -assert jpegSupport -> (libjpeg != null); -assert tiffSupport -> (libtiff != null); -assert gifSupport -> (giflib != null); - let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in From abbb726a8a4745d7965a9c65325a71c53f427009 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:09:05 +0300 Subject: [PATCH 047/150] lame: remove useless nulls --- pkgs/development/libraries/lame/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 8ed0962bece..ec79f8cf600 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -1,21 +1,16 @@ { lib, stdenv, fetchurl -, nasmSupport ? true, nasm ? null # Assembly optimizations +, nasmSupport ? true, nasm # Assembly optimizations , cpmlSupport ? true # Compaq's fast math library -#, efenceSupport ? false, libefence ? null # Use ElectricFence for malloc debugging -, sndfileFileIOSupport ? false, libsndfile ? null # Use libsndfile, instead of lame's internal routines +#, efenceSupport ? false, libefence # Use ElectricFence for malloc debugging +, sndfileFileIOSupport ? false, libsndfile # Use libsndfile, instead of lame's internal routines , analyzerHooksSupport ? true # Use analyzer hooks , decoderSupport ? true # mpg123 decoder , frontendSupport ? true # Build the lame executable -#, mp3xSupport ? false, gtk1 ? null # Build GTK frame analyzer +#, mp3xSupport ? false, gtk1 # Build GTK frame analyzer , mp3rtpSupport ? false # Build mp3rtp , debugSupport ? false # Debugging (disables optimizations) }: -assert nasmSupport -> (nasm != null); -#assert efenceSupport -> (libefence != null); -assert sndfileFileIOSupport -> (libsndfile != null); -#assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null)); - let mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in From 4bc8d425f2c8b1d537293e10e2e8bd9713d9d616 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 3 Apr 2022 19:56:00 +0100 Subject: [PATCH 048/150] imlib2: add some key reverse-dependencies to passthru.tests --- pkgs/development/libraries/imlib2/default.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 26f904b49b0..2790eaf460b 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -9,6 +9,15 @@ # https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613 , svgSupport ? !stdenv.isDarwin , heifSupport ? !stdenv.isDarwin + +# for passthru.tests +, libcaca +, diffoscopeMinimal +, feh +, icewm +, openbox +, fluxbox +, enlightenment }: let @@ -43,6 +52,17 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; + passthru.tests = { + inherit + libcaca + diffoscopeMinimal + feh + icewm + openbox + fluxbox + enlightenment; + }; + meta = with lib; { description = "Image manipulation library"; From 977f14fab1227bea9f7272cbbbba9f563d102f7a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 16 Apr 2022 14:37:42 +0100 Subject: [PATCH 049/150] re2c: add some key reverse dependencies to passthru.tests --- pkgs/development/tools/parsing/re2c/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 41ec653a409..02be14908e4 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -4,6 +4,11 @@ , autoreconfHook , nix-update-script , python3 + +# for passthru.tests +, ninja +, php +, spamassassin }: stdenv.mkDerivation rec { @@ -33,6 +38,9 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { attrPath = pname; }; + tests = { + inherit ninja php spamassassin; + }; }; meta = with lib; { From 33ca5b98b4ab4966b1a2923f0fc0a03e2980d6a8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 9 May 2022 22:37:08 +0100 Subject: [PATCH 050/150] pprof: unstable-2021-09-30 -> unstable-2022-05-09 Fixed build failure against binutils-2.28. --- pkgs/development/tools/profiling/pprof/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index 03460f7f04c..7ff94299afc 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pprof"; - version = "unstable-2021-09-30"; + version = "unstable-2022-05-09"; src = fetchFromGitHub { owner = "google"; repo = "pprof"; - rev = "7fe48b4c820be13151ae35ce5a5e3f54f1b53eef"; - sha256 = "05nr3igdigs1586qplwfm17hfw0v81jy745g6vayq7cbplljfjb1"; + rev = "59ca7ad80af3faf4f87f4d82ff02f5d390c08ed6"; + sha256 = "0jni73ila3glg7rl11v0al947d94dd0syhkjqnliaryh8dkxbx80"; }; - vendorSha256 = "0yl8y3m2ia3cwxhmg1km8358a0225khimv6hcvras8r2glm69h3f"; + vendorSha256 = "0vr8jp3kxgadb73g67plfrl5dkxfwrxaxjs664918jssy25vyk2y"; meta = with lib; { description = "A tool for visualization and analysis of profiling data"; From ed6499826a7f401c536ae6262c52fc636a4f3851 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 9 May 2022 23:42:31 +0200 Subject: [PATCH 051/150] python3Packages.nbclient: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/nbclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 6579185861f..7311384229a 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -15,14 +15,14 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs="; + hash = "sha256-uAcm/B+4mg6Pi+HnfijQAmsejtkLwUPIoMdiLk+M3Z4="; }; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; From 8e3e02b0155ea783ecd2242d3b666e16cb9c1d4e Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:13:12 +0300 Subject: [PATCH 052/150] nghttp2: remove useless nulls and make python3 support build --- .../development/libraries/nghttp2/default.nix | 38 +++++++++---------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 01df15c0a83..ca8cb641819 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -6,15 +6,15 @@ # Optional dependencies , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic -, c-ares ? null, libev ? null, openssl ? null, zlib ? null -, enableAsioLib ? false, boost ? null -, enableGetAssets ? false, libxml2 ? null -, enableHpack ? false, jansson ? null -, enableJemalloc ? false, jemalloc ? null -, enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null +, c-ares, libev, openssl, zlib +, enableAsioLib ? false, boost +, enableGetAssets ? false, libxml2 +, enableHpack ? false, jansson +, enableJemalloc ? false, jemalloc +, enablePython ? false, python3Packages, ncurses # Unit tests ; we have to set TZDIR, which is a GNUism. -, enableTests ? stdenv.hostPlatform.isGnu, cunit ? null, tzdata ? null +, enableTests ? stdenv.hostPlatform.isGnu, cunit, tzdata # downstream dependencies, for testing , curl @@ -25,13 +25,9 @@ # All mutable patches (generated by GitHub or cgit) that are needed here # should be included directly in Nixpkgs as files. -assert enableApp -> c-ares != null && libev != null && openssl != null && zlib != null; -assert enableAsioLib -> boost != null; -assert enableGetAssets -> enableApp == true && libxml2 != null; -assert enableHpack -> enableApp == true && jansson != null; -assert enableJemalloc -> enableApp == true && jemalloc != null; -assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null; -assert enableTests -> cunit != null && tzdata != null; +assert enableGetAssets -> enableApp; +assert enableHpack -> enableApp; +assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; @@ -47,14 +43,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ lib.optionals (enableApp) [ installShellFiles ] - ++ lib.optionals (enablePython) [ cython ]; + ++ lib.optionals (enablePython) [ python3Packages.cython ]; buildInputs = lib.optionals enableApp [ c-ares libev openssl zlib ] ++ lib.optionals (enableAsioLib) [ boost ] ++ lib.optionals (enableGetAssets) [ libxml2 ] ++ lib.optionals (enableHpack) [ jansson ] ++ lib.optionals (enableJemalloc) [ jemalloc ] - ++ lib.optionals (enablePython) [ python ncurses setuptools ]; + ++ lib.optionals (enablePython) [ python3Packages.python ncurses python3Packages.setuptools ]; enableParallelBuilding = true; @@ -62,7 +58,7 @@ stdenv.mkDerivation rec { "--disable-examples" (lib.enableFeature enableApp "app") ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] - ++ lib.optionals (enablePython) [ "--with-cython=${cython}/bin/cython" ]; + ++ lib.optionals (enablePython) [ "--with-cython=${python3Packages.cython}/bin/cython" ]; # Unit tests require CUnit and setting TZDIR environment variable doCheck = enableTests; @@ -72,13 +68,13 @@ stdenv.mkDerivation rec { ''; preInstall = lib.optionalString (enablePython) '' - mkdir -p $out/${python.sitePackages} + mkdir -p $out/${python3Packages.python.sitePackages} # convince installer it's ok to install here - export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}" + export PYTHONPATH="$PYTHONPATH:$out/${python3Packages.python.sitePackages}" ''; postInstall = lib.optionalString (enablePython) '' - mkdir -p $python/${python.sitePackages} - mv $out/${python.sitePackages}/* $python/${python.sitePackages} + mkdir -p $python/${python3Packages.python.sitePackages} + mv $out/${python3Packages.python.sitePackages}/* $python/${python3Packages.python.sitePackages} rm -r $out/lib '' + lib.optionalString (enableApp) '' installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42bf379faca..ae7158be004 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5645,7 +5645,7 @@ in { }); nghttp2 = (toPythonModule (pkgs.nghttp2.override { - inherit (self) python cython setuptools; + python3Packages = self; inherit (pkgs) ncurses; enableApp = false; # build only libnghttp2 ... enablePython = true; # ... and its Python bindings From 3c2f3dff8d1c3c9825223496c119479b04011ce9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:34:16 +0300 Subject: [PATCH 053/150] gloox: remove useless nulls --- pkgs/development/libraries/gloox/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 82429add261..f50704bcb65 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -1,13 +1,9 @@ { lib, stdenv, fetchurl -, zlibSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -, idnSupport ? true, libidn ? null +, zlibSupport ? true, zlib +, sslSupport ? true, openssl +, idnSupport ? true, libidn }: -assert zlibSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert idnSupport -> libidn != null; - with lib; stdenv.mkDerivation rec{ From fe7a2600ac35c463b303e3e8c312d704e5ec0ae0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:35:42 +0300 Subject: [PATCH 054/150] aravis: remove useless nulls --- pkgs/development/libraries/aravis/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index 67e621ad859..6f2d241070f 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool , audit, glib, libusb1, libxml2 , wrapGAppsHook -, gstreamer ? null -, gst-plugins-base ? null -, gst-plugins-good ? null -, gst-plugins-bad ? null -, libnotify ? null -, gnome ? null -, gtk3 ? null +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, libnotify +, gnome +, gtk3 , enableUsb ? true , enablePacketSocket ? true , enableViewer ? true @@ -23,11 +23,7 @@ let (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0") [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; in - assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableViewer -> enableGstPlugin; - assert enableViewer -> libnotify != null; - assert enableViewer -> gnome != null; - assert enableViewer -> gtk3 != null; assert enableViewer -> gstreamerAtLeastVersion1; stdenv.mkDerivation rec { @@ -87,4 +83,3 @@ in platforms = lib.platforms.unix; }; } - From 25cdf9bd9eff816a52f97121ffd954f1699bf5f7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:37:43 +0300 Subject: [PATCH 055/150] libbluray: remove useless nulls --- pkgs/development/libraries/libbluray/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 47015f3b981..8d8e64502d4 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,19 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration -, withJava ? false, jdk ? null, ant ? null -, withAACS ? false, libaacs ? null -, withBDplus ? false, libbdplus ? null -, withMetadata ? true, libxml2 ? null -, withFonts ? true, freetype ? null +, withJava ? false, jdk, ant +, withAACS ? false, libaacs +, withBDplus ? false, libbdplus +, withMetadata ? true, libxml2 +, withFonts ? true, freetype }: with lib; -assert withJava -> jdk != null && ant != null; -assert withAACS -> libaacs != null; -assert withBDplus -> libbdplus != null; -assert withMetadata -> libxml2 != null; -assert withFonts -> freetype != null; - # Info on how to use: # https://wiki.archlinux.org/index.php/BluRay From 14a95907514a0114fe4c102663a62a320c49108c Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:41:36 +0300 Subject: [PATCH 056/150] deadbeef: remove useless nulls --- pkgs/applications/audio/deadbeef/default.nix | 63 +++++++------------- 1 file changed, 21 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index e8b0ded4c00..ac5cb06a219 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -6,56 +6,35 @@ , pkg-config , jansson # deadbeef can use either gtk2 or gtk3 -, gtk2Support ? false, gtk2 ? null -, gtk3Support ? true, gtk3 ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null +, gtk2Support ? false, gtk2 +, gtk3Support ? true, gtk3, gsettings-desktop-schemas, wrapGAppsHook # input plugins -, vorbisSupport ? true, libvorbis ? null -, mp123Support ? true, libmad ? null -, flacSupport ? true, flac ? null -, wavSupport ? true, libsndfile ? null -, cdaSupport ? true, libcdio ? null, libcddb ? null -, aacSupport ? true, faad2 ? null -, opusSupport ? true, opusfile ? null -, wavpackSupport ? false, wavpack ? null -, ffmpegSupport ? false, ffmpeg ? null -, apeSupport ? true, yasm ? null +, vorbisSupport ? true, libvorbis +, mp123Support ? true, libmad +, flacSupport ? true, flac +, wavSupport ? true, libsndfile +, cdaSupport ? true, libcdio, libcddb +, aacSupport ? true, faad2 +, opusSupport ? true, opusfile +, wavpackSupport ? false, wavpack +, ffmpegSupport ? false, ffmpeg +, apeSupport ? true, yasm # misc plugins -, zipSupport ? true, libzip ? null -, artworkSupport ? true, imlib2 ? null -, hotkeysSupport ? true, libX11 ? null -, osdSupport ? true, dbus ? null +, zipSupport ? true, libzip +, artworkSupport ? true, imlib2 +, hotkeysSupport ? true, libX11 +, osdSupport ? true, dbus # output plugins -, alsaSupport ? true, alsa-lib ? null -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null +, alsaSupport ? true, alsa-lib +, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio # effect plugins -, resamplerSupport ? true, libsamplerate ? null -, overloadSupport ? true, zlib ? null +, resamplerSupport ? true, libsamplerate +, overloadSupport ? true, zlib # transports -, remoteSupport ? true, curl ? null +, remoteSupport ? true, curl }: assert gtk2Support || gtk3Support; -assert gtk2Support -> gtk2 != null; -assert gtk3Support -> gtk3 != null && gsettings-desktop-schemas != null && wrapGAppsHook != null; -assert vorbisSupport -> libvorbis != null; -assert mp123Support -> libmad != null; -assert flacSupport -> flac != null; -assert wavSupport -> libsndfile != null; -assert cdaSupport -> (libcdio != null && libcddb != null); -assert aacSupport -> faad2 != null; -assert opusSupport -> opusfile != null; -assert zipSupport -> libzip != null; -assert ffmpegSupport -> ffmpeg != null; -assert apeSupport -> yasm != null; -assert artworkSupport -> imlib2 != null; -assert hotkeysSupport -> libX11 != null; -assert osdSupport -> dbus != null; -assert alsaSupport -> alsa-lib != null; -assert pulseSupport -> libpulseaudio != null; -assert resamplerSupport -> libsamplerate != null; -assert overloadSupport -> zlib != null; -assert wavpackSupport -> wavpack != null; -assert remoteSupport -> curl != null; stdenv.mkDerivation rec { pname = "deadbeef"; From bab661ab2b738f9863794220b1f4c2d0166b4be4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:45:02 +0300 Subject: [PATCH 057/150] profanity: remove useless nulls --- .../instant-messengers/profanity/default.nix | 17 +++++------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 2034f1761f2..0e4487768a8 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -18,21 +18,14 @@ , pkg-config , readline , sqlite -, autoAwaySupport ? true, libXScrnSaver ? null, libX11 +, autoAwaySupport ? true, libXScrnSaver, libX11 , notifySupport ? true, libnotify, gdk-pixbuf , omemoSupport ? true, libsignal-protocol-c, libgcrypt , pgpSupport ? true, gpgme -, pythonPluginSupport ? true, python -, traySupport ? true, gtk +, pythonPluginSupport ? true, python3 +, traySupport ? true, gtk3 }: -assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; -assert notifySupport -> libnotify != null && gdk-pixbuf != null; -assert traySupport -> gtk != null; -assert pgpSupport -> gpgme != null; -assert pythonPluginSupport -> python != null; -assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; - stdenv.mkDerivation rec { pname = "profanity"; version = "0.12.0"; @@ -75,8 +68,8 @@ stdenv.mkDerivation rec { ++ lib.optionals notifySupport [ libnotify gdk-pixbuf ] ++ lib.optionals omemoSupport [ libsignal-protocol-c libgcrypt ] ++ lib.optionals pgpSupport [ gpgme ] - ++ lib.optionals pythonPluginSupport [ python ] - ++ lib.optionals traySupport [ gtk ]; + ++ lib.optionals pythonPluginSupport [ python3 ] + ++ lib.optionals traySupport [ gtk3 ]; # Enable feature flags, so that build fail if libs are missing configureFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9c3f173478..115f9b0458f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29012,8 +29012,6 @@ with pkgs; procmail = callPackage ../applications/misc/procmail { }; profanity = callPackage ../applications/networking/instant-messengers/profanity ({ - gtk = gtk3; - python = python3; } // (config.profanity or {})); properties-cpp = callPackage ../development/libraries/properties-cpp { }; From 5007ea281de467b1bd95ba7d18cc6088fd8d61e7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:56:23 +0300 Subject: [PATCH 058/150] gwyddion: remove useless nulls --- .../science/chemistry/gwyddion/default.nix | 40 ++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 584554232ab..8ab389afaee 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -1,36 +1,22 @@ { lib, stdenv, fetchurl, gtk2, pkg-config, fftw, file, - pythonSupport ? false, pythonPackages ? null, - gnome2 ? null, - openexrSupport ? true, openexr ? null, - libzipSupport ? true, libzip ? null, - libxml2Support ? true, libxml2 ? null, - libwebpSupport ? true, libwebp ? null, + pythonSupport ? false, python2Packages, + gnome2, + openexrSupport ? true, openexr, + libzipSupport ? true, libzip, + libxml2Support ? true, libxml2, + libwebpSupport ? true, libwebp, # libXmu is not used if libunique is. - libXmuSupport ? false, xorg ? null, - libxsltSupport ? true, libxslt ? null, - fitsSupport ? true, cfitsio ? null, - zlibSupport ? true, zlib ? null, - libuniqueSupport ? true, libunique ? null, - libpngSupport ? true, libpng ? null, + libXmuSupport ? false, xorg, + libxsltSupport ? true, libxslt, + fitsSupport ? true, cfitsio, + zlibSupport ? true, zlib, + libuniqueSupport ? true, libunique, + libpngSupport ? true, libpng, openglSupport ? !stdenv.isDarwin }: -assert openexrSupport -> openexr != null; -assert libzipSupport -> libzip != null; -assert libxml2Support -> libxml2 != null; -assert libwebpSupport -> libwebp != null; -assert libXmuSupport -> xorg != null; -assert libxsltSupport -> libxslt != null; -assert fitsSupport -> cfitsio != null; -assert zlibSupport -> zlib != null; -assert libuniqueSupport -> libunique != null; -assert libpngSupport -> libpng != null; -assert openglSupport -> gnome2 != null; -assert pythonSupport -> (pythonPackages != null && gnome2 != null); - let - inherit (pythonPackages) pygtk pygobject2 python; - + inherit (python2Packages) pygtk pygobject2 python; in stdenv.mkDerivation rec { From c07b5cd424651726914877a528f2d8b39dd036fc Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:58:50 +0300 Subject: [PATCH 059/150] mplayer: remove useless nulls --- pkgs/applications/video/mplayer/default.nix | 79 ++++++++------------- 1 file changed, 28 insertions(+), 51 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 0c435bfbe15..6d280e71b86 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,60 +1,37 @@ { config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg -, aalibSupport ? true, aalib ? null -, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null -, fribidiSupport ? true, fribidi ? null -, x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null -, xineramaSupport ? true, libXinerama ? null -, xvSupport ? true, libXv ? null -, alsaSupport ? stdenv.isLinux, alsa-lib ? null -, screenSaverSupport ? true, libXScrnSaver ? null -, vdpauSupport ? false, libvdpau ? null -, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null -, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null -, dvdreadSupport ? true, libdvdread ? null -, bluraySupport ? true, libbluray ? null -, amrSupport ? false, amrnb ? null, amrwb ? null -, cacaSupport ? true, libcaca ? null -, lameSupport ? true, lame ? null -, speexSupport ? true, speex ? null -, theoraSupport ? true, libtheora ? null -, x264Support ? false, x264 ? null -, jackaudioSupport ? false, libjack2 ? null -, pulseSupport ? config.pulseaudio or false, libpulseaudio ? null -, bs2bSupport ? false, libbs2b ? null -, v4lSupport ? false, libv4l ? null +, aalibSupport ? true, aalib +, fontconfigSupport ? true, fontconfig, freefont_ttf +, fribidiSupport ? true, fribidi +, x11Support ? true, libX11, libXext, libGLU, libGL +, xineramaSupport ? true, libXinerama +, xvSupport ? true, libXv +, alsaSupport ? stdenv.isLinux, alsa-lib +, screenSaverSupport ? true, libXScrnSaver +, vdpauSupport ? false, libvdpau +, cddaSupport ? !stdenv.isDarwin, cdparanoia +, dvdnavSupport ? !stdenv.isDarwin, libdvdnav +, dvdreadSupport ? true, libdvdread +, bluraySupport ? true, libbluray +, amrSupport ? false, amrnb, amrwb +, cacaSupport ? true, libcaca +, lameSupport ? true, lame +, speexSupport ? true, speex +, theoraSupport ? true, libtheora +, x264Support ? false, x264 +, jackaudioSupport ? false, libjack2 +, pulseSupport ? config.pulseaudio or false, libpulseaudio +, bs2bSupport ? false, libbs2b +, v4lSupport ? false, libv4l # For screenshots -, libpngSupport ? true, libpng ? null -, libjpegSupport ? true, libjpeg ? null +, libpngSupport ? true, libpng +, libjpegSupport ? true, libjpeg , useUnfreeCodecs ? false -, darwin ? null +, darwin , buildPackages }: -assert fontconfigSupport -> (fontconfig != null); -assert (!fontconfigSupport) -> (freefont_ttf != null); -assert fribidiSupport -> (fribidi != null); -assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null); -assert xineramaSupport -> (libXinerama != null && x11Support); -assert xvSupport -> (libXv != null && x11Support); -assert alsaSupport -> alsa-lib != null; -assert screenSaverSupport -> libXScrnSaver != null; -assert vdpauSupport -> libvdpau != null; -assert cddaSupport -> cdparanoia != null; -assert dvdnavSupport -> libdvdnav != null; -assert dvdreadSupport -> libdvdread != null; -assert bluraySupport -> libbluray != null; -assert amrSupport -> (amrnb != null && amrwb != null); -assert cacaSupport -> libcaca != null; -assert lameSupport -> lame != null; -assert speexSupport -> speex != null; -assert theoraSupport -> libtheora != null; -assert x264Support -> x264 != null; -assert jackaudioSupport -> libjack2 != null; -assert pulseSupport -> libpulseaudio != null; -assert bs2bSupport -> libbs2b != null; -assert libpngSupport -> libpng != null; -assert libjpegSupport -> libjpeg != null; -assert v4lSupport -> libv4l != null; +assert xineramaSupport -> x11Support; +assert xvSupport -> x11Support; let From 8b10b6b0f5f80915bf8a32aea8536aa8cf089b08 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 9 May 2022 21:59:06 +0000 Subject: [PATCH 060/150] itpp: fix build --- pkgs/development/libraries/science/math/itpp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index d7a0dcfe06a..b2acbe761b3 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++11" "-DBLAS_FOUND:BOOL=TRUE" "-DBLAS_LIBRARIES:STRING=${blas}/lib/libblas.so" "-DLAPACK_FOUND:BOOL=TRUE" From 49b62442e9222e71bee268d034fce0d67829330f Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 01:01:00 +0300 Subject: [PATCH 061/150] image_optim: remove useless nulls --- .../graphics/image_optim/default.nix | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index ba437eab412..690b7f4e83e 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -1,29 +1,17 @@ { lib, bundlerApp, bundlerUpdateScript, makeWrapper, - withPngcrush ? true, pngcrush ? null, - withPngout ? true, pngout ? null, - withAdvpng ? true, advancecomp ? null, - withOptipng ? true, optipng ? null, - withPngquant ? true, pngquant ? null, - withJhead ? true, jhead ? null, - withJpegoptim ? true, jpegoptim ? null, - withJpegrecompress ? true, jpeg-archive ? null, - withJpegtran ? true, libjpeg ? null, - withGifsicle ? true, gifsicle ? null, - withSvgo ? true, svgo ? null + withPngcrush ? true, pngcrush, + withPngout ? true, pngout, + withAdvpng ? true, advancecomp, + withOptipng ? true, optipng, + withPngquant ? true, pngquant, + withJhead ? true, jhead, + withJpegoptim ? true, jpegoptim, + withJpegrecompress ? true, jpeg-archive, + withJpegtran ? true, libjpeg, + withGifsicle ? true, gifsicle, + withSvgo ? true, svgo }: -assert withPngcrush -> pngcrush != null; -assert withPngout -> pngout != null; -assert withAdvpng -> advancecomp != null; -assert withOptipng -> optipng != null; -assert withPngquant -> pngquant != null; -assert withJhead -> jhead != null; -assert withJpegoptim -> jpegoptim != null; -assert withJpegrecompress -> jpeg-archive != null; -assert withJpegtran -> libjpeg != null; -assert withGifsicle -> gifsicle != null; -assert withSvgo -> svgo != null; - with lib; let From ae40cc00325b365b8749a06dd3af5f4f95ff9696 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 9 May 2022 18:18:18 -0600 Subject: [PATCH 062/150] python3Packages.slicer: disable failing tests --- pkgs/development/python-modules/slicer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix index 89fb4e5dc72..2033c94fefc 100644 --- a/pkgs/development/python-modules/slicer/default.nix +++ b/pkgs/development/python-modules/slicer/default.nix @@ -20,6 +20,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pandas pytorch scipy ]; + disabledTests = [ + # IndexError: too many indices for array + "test_slicer_sparse" + "test_operations_2d" + ]; + meta = with lib; { description = "Wraps tensor-like objects and provides a uniform slicing interface via __getitem__"; homepage = "https://github.com/interpretml/slicer"; From 7565c2e455709e4c4cf78c2bcc81e6ce012c8cc1 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 9 May 2022 21:39:27 -0300 Subject: [PATCH 063/150] apngasm: 3.1.9 -> 3.1.10 3.1.9 had issues with building and 3.1.10 has been released fixing those; a parallel building error has been found and it is fixed on Gentoo repository, from where we grab the patch from. Log of error: https://hydra.nixos.org/log/6nh56zf7y81p0m6xxynw22wj1kaxrjbd-apngasm-3.1.9.drv Refs: ZHF: #172160 Signed-off-by: Otavio Salvador --- pkgs/applications/graphics/apngasm/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/apngasm/default.nix b/pkgs/applications/graphics/apngasm/default.nix index 1f58ee83e03..085683b5b64 100644 --- a/pkgs/applications/graphics/apngasm/default.nix +++ b/pkgs/applications/graphics/apngasm/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, libpng, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, libpng, zlib }: stdenv.mkDerivation rec { pname = "apngasm"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "d50bfb0cf14c376f4cfb94eb91c61d795a76b715"; # not tagged, but in debian/changelog - sha256 = "0pk0r8x1950pm6j3d5wgryvy3ldm7a9gl59jmnwnjmg1sf9mzf97"; + rev = "f105b2d6024ef3113bb407d68e27e476a17fa998"; + sha256 = "sha256-lTk2sTllKHRUaWPPEkC4qU5K10oRaLrdWBgN4MUGKeo="; }; + patches = [ + # Fix parallel build and avoid static linking of binary. + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/apngasm/files/apngasm-3.1.10-static.patch?id=45fd0cde71ca2ae0e7e38ab67400d84b86b593d7"; + sha256 = "sha256-eKthgInWxXEqN5PupvVf9wVQDElxsPYRFXT7pMc6vIU="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost libpng zlib ]; From a18a0fa29d69ef50f5cfdecda9f7f942aca2ba67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 May 2022 00:44:21 +0000 Subject: [PATCH 064/150] python3Packages.pysabnzbd: init at 1.1.1 --- .../python-modules/pysabnzbd/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pysabnzbd/default.nix diff --git a/pkgs/development/python-modules/pysabnzbd/default.nix b/pkgs/development/python-modules/pysabnzbd/default.nix new file mode 100644 index 00000000000..e77b8cd6818 --- /dev/null +++ b/pkgs/development/python-modules/pysabnzbd/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +}: + +buildPythonPackage rec { + pname = "pysabnzbd"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "jeradM"; + repo = "pysabnzbd"; + rev = "8e6cd1869c8cc99a4560ea1b178f0a1efd89e460"; # tag is missing + hash = "sha256-Ubl+kdcjMm1A7pa3Q5G+fFBwPIxA375Ci04/vVyUl+A="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "pysabnzbd" ]; + + meta = { + description = "Python wrapper for SABnzbd API"; + homepage = "https://github.com/jeradM/pysabnzbd"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dec038f9692..0cdc28e9cf1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6430,6 +6430,8 @@ in { pyrogram = callPackage ../development/python-modules/pyrogram { }; + pysabnzbd = callPackage ../development/python-modules/pysabnzbd { }; + pysbd = callPackage ../development/python-modules/pysbd { }; pyshark = callPackage ../development/python-modules/pyshark { }; From 33892e97554a4af39dde7f7243468f01c3809219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 May 2022 00:46:20 +0000 Subject: [PATCH 065/150] home-assistant: support sabnzbd component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index bfaf4f6f76d..bf1223d752d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2245,7 +2245,8 @@ "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ - ]; # missing inputs: pysabnzbd + pysabnzbd + ]; "safe_mode" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -3594,6 +3595,7 @@ "rss_feed_template" "rtsp_to_webrtc" "ruckus_unleashed" + "sabnzbd" "safe_mode" "samsungtv" "scene" From c9078c523604f97795a95df979be33a17452fe87 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 9 May 2022 21:57:04 -0300 Subject: [PATCH 066/150] asc: force use of C++11 during build Log of error: https://hydra.nixos.org/log/f8yhxkg3zqqsz9ljbi98fsiibihvdbfd-asc-2.6.0.0.drv Refs: ZHF: #172160 Signed-off-by: Otavio Salvador --- pkgs/games/asc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 4dc671f5c3c..a6a1129acad 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-paragui" "--disable-paraguitest" ]; - NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing"; # I'm too lazy to catch all gcc47-related problems + NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing -std=c++11"; # I'm too lazy to catch all gcc47-related problems hardeningDisable = [ "format" ]; buildInputs = [ From 39688e7fec0670d6d4fb266ba8c4aee405b2aea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 May 2022 01:05:42 +0000 Subject: [PATCH 067/150] python3Packages.datapoint: init at 0.9.8 --- .../python-modules/datapoint/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/datapoint/default.nix diff --git a/pkgs/development/python-modules/datapoint/default.nix b/pkgs/development/python-modules/datapoint/default.nix new file mode 100644 index 00000000000..b5d86acf2a0 --- /dev/null +++ b/pkgs/development/python-modules/datapoint/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, appdirs +, pytz +, requests +, pytestCheckHook +, requests-mock +}: + +buildPythonPackage rec { + pname = "datapoint"; + version = "0.9.8"; + + src = fetchFromGitHub { + owner = "ejep"; + repo = "datapoint-python"; + rev = "v${version}"; + hash = "sha256-YC8KFTv6lnCqMfDw1LSova7XBgmKbR3TpPDAAbH9imw="; + }; + + propagatedBuildInputs = [ + appdirs + pytz + requests + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + ]; + + pytestFlagsArray = [ "tests/unit" ]; + + pythonImportsCheck = [ "datapoint" ]; + + meta = { + description = "Python interface to the Met Office's Datapoint API"; + homepage = "https://github.com/ejep/datapoint-python"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dec038f9692..5570a29e784 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2083,6 +2083,8 @@ in { datamodeldict = callPackage ../development/python-modules/datamodeldict { }; + datapoint = callPackage ../development/python-modules/datapoint { }; + dataset = callPackage ../development/python-modules/dataset { }; datasets = callPackage ../development/python-modules/datasets { }; From 705acec552eb83238e381aee71ac7071ba5ab6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 May 2022 01:06:13 +0000 Subject: [PATCH 068/150] home-assistant: support metoffice component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index bfaf4f6f76d..1f83fcd2dce 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1558,7 +1558,8 @@ pymeteoclimatic ]; "metoffice" = ps: with ps; [ - ]; # missing inputs: datapoint + datapoint + ]; "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "microsoft" = ps: with ps; [ @@ -3467,6 +3468,7 @@ "met_eireann" "meteo_france" "meteoclimatic" + "metoffice" "microsoft_face" "microsoft_face_detect" "microsoft_face_identify" From fb7287e6d2d2684520f756639846ee07f6287caa Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Tue, 19 Apr 2022 20:45:37 -0700 Subject: [PATCH 069/150] openmw: enable with glibc fix --- pkgs/games/openmw/default.nix | 13 ++++++++----- pkgs/games/openmw/tes3mp.nix | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 8746d3172ac..389f59f91a6 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wrapQtAppsHook @@ -55,6 +56,13 @@ mkDerivation rec { sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY="; }; + patches = [ + (fetchpatch { + url = "https://gitlab.com/OpenMW/openmw/-/merge_requests/1239.diff"; + sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ @@ -83,10 +91,5 @@ mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar marius851000 ]; platforms = platforms.linux; - - # 2021-10-13, doesn't compile with glibc-2.34, maintainers prefer a fix on glibc's end. - # Can be marked as un-broken as soon as https://gitlab.com/OpenMW/openmw/-/merge_requests/1239 - # is resolved and a patch is appliable here. - broken = true; }; } diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index b92c31663fc..0f91a3c0028 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -87,7 +87,7 @@ let ''; # https://github.com/TES3MP/openmw-tes3mp/issues/552 - patches = [ ./tes3mp.patch ]; + patches = oldAttrs.patches ++ [ ./tes3mp.patch ]; NIX_CFLAGS_COMPILE = "-fpermissive"; @@ -108,6 +108,7 @@ let license = licenses.gpl3Only; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" ]; + broken = true; }; }); From f44cf991c715425e1db6f544a5eec11cc73a1b2a Mon Sep 17 00:00:00 2001 From: 1000101 Date: Fri, 6 May 2022 17:23:20 +0200 Subject: [PATCH 070/150] terraform-providers.cloudamqp: init at 1.15.3 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 26a51711654..cfffdc5b723 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -208,6 +208,15 @@ "vendorSha256": null, "version": "1.3.0" }, + "cloudamqp": { + "owner": "cloudamqp", + "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", + "repo": "terraform-provider-cloudamqp", + "rev": "v1.15.3", + "sha256": "sha256-aQVv/4shdh3AQFTbw1iayNBSGuwDAQ7WUixMeUvAJ0U=", + "vendorSha256": "sha256-Anrcj23MvAk5m3LrGTANBhY6zB46U0st6vMZy2g7Gag=", + "version": "1.15.3" + }, "cloudflare": { "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", From 430f6d45e3487fe745c7774f72f02aa129fcabef Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 10 May 2022 13:01:38 +1000 Subject: [PATCH 071/150] skopeo: 1.7.0 -> 1.8.0 https://github.com/containers/skopeo/releases/tag/v1.8.0 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index c25a27e6d95..4f02b5ca0f4 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-sbe16IcHkhsiBznsMKtG/xYJYJfJS6aZ34++QhkGTTc="; + sha256 = "sha256-LZN8v3pk5OvRdnhAHOa76QASRL8IPbMIFoH6ERu5r6E="; }; outputs = [ "out" "man" ]; From 8f91fe6f8260f3236baf785fd01db0b7afe04efa Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 9 May 2022 22:05:19 -0300 Subject: [PATCH 072/150] aws-sam-cli: fix build error due jmespath version Refs: ZHF: #172160 Signed-off-by: Otavio Salvador --- pkgs/development/tools/aws-sam-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 0bbe2056be5..c4fdb203c34 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec { --replace "dateparser~=1.0" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "Flask~=1.1.2" "Flask~=2.0" \ + --replace "jmespath~=0.10.0" "jmespath" \ --replace "PyYAML~=5.3" "PyYAML #" \ --replace "regex==" "regex #" \ --replace "requests==" "requests #" \ From 0be721b12930887fd883260ddb29c80225eaa9f3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 03:48:28 +0000 Subject: [PATCH 073/150] terraform-providers: update 2022-05-09 --- .../terraform-providers/providers.json | 182 +++++++++--------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cfffdc5b723..8e5db378ffb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -30,10 +30,10 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.7.2", - "sha256": "sha256-1Y3m431KlWU+0cgZsU644WEO1i/9Gp1HomXvuCesVNU=", + "rev": "v2.7.3", + "sha256": "sha256-ZAYnP2XEa2eJ0YZkqXQedRysmQI31RQ1osg/TqCqthE=", "vendorSha256": "sha256-nBVLgOrtINrDziQLdqo5rFWfeY/cOdBW/XVDjtNaNhE=", - "version": "2.7.2" + "version": "2.7.3" }, "akamai": { "owner": "akamai", @@ -49,10 +49,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.165.0", - "sha256": "sha256-Mq0Ob6U2v3onn5wIvAzXhbSBzjUCP4kF6irbwREdGFI=", - "vendorSha256": "sha256-xxq+VOG6FkX1perAcXOiFtL/bjsHl9IWIJb5dfaIkpY=", - "version": "1.165.0" + "rev": "v1.166.0", + "sha256": "sha256-+aRRsN3ALTmQOnDciHjoVFKV/W+/gjtdZeg3eyJ+0fY=", + "vendorSha256": "sha256-2w8o0Fc61ayyUyE4RVcmV4A0heuaIXnOZX040l2ws/Y=", + "version": "1.166.0" }, "ansible": { "owner": "nbering", @@ -103,10 +103,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.12.1", - "sha256": "sha256-z19DTiio6dXIgTmOxehOjIno6XhSUIS/YFtXKocq2Kk=", - "vendorSha256": "sha256-zxOiLStuGuylsKTJteR/9Xs/XcVgDlihCBmnMNLTTd4=", - "version": "4.12.1" + "rev": "v4.13.0", + "sha256": "sha256-KEu+7hKMWsrpS1WYxj3El7M43Chy9HTBjePhWO6bXMo=", + "vendorSha256": "sha256-Ez6uCriNm1OJ2EyMAyjXihzJ/Pzf2p/oAvJ3HN6fDnA=", + "version": "4.13.0" }, "azuread": { "owner": "hashicorp", @@ -121,10 +121,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.4.0", - "sha256": "sha256-hfjwlW7tbs/b7mvtbmFnNXr82b2exCRC4WxfCdZ6bbw=", + "rev": "v3.5.0", + "sha256": "sha256-LF2Mqj/w1AtoYVGkZJsFpz81cfoUR80PURIsYoIYfsI=", "vendorSha256": null, - "version": "3.4.0" + "version": "3.5.0" }, "azurestack": { "owner": "hashicorp", @@ -175,10 +175,10 @@ "owner": "buildkite", "provider-source-address": "registry.terraform.io/buildkite/buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.8.0", - "sha256": "1v4kzsvzkzf0bb6vpyjh0n2kbcfrqa193idvm4jgbcrdb0y3xzn5", - "vendorSha256": "12kqjpyy80pfrasicmdi1f43mr846rad3c6xaa4dvzn7hq640q5j", - "version": "0.8.0" + "rev": "v0.9.0", + "sha256": "sha256-k7caRT/9YA198I6K3Qv3UcyQiULpOvJ3Smc816sKHkQ=", + "vendorSha256": "sha256-smBADIbH/t2IUt2w0VQ2BOU6iAuxVRa1yu4C5P2VeIo=", + "version": "0.9.0" }, "checkly": { "owner": "checkly", @@ -221,10 +221,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.13.0", - "sha256": "sha256-ZG8F6cbJOmQdtudkVUGjKsq2Hs4uYlb/pxrF6Fkk4w0=", - "vendorSha256": "sha256-4usFr3aseHGGUa/bseSRAjE1NTZxh8UXPd66HG3hwOM=", - "version": "3.13.0" + "rev": "v3.14.0", + "sha256": "sha256-WjtAqL4gzr7NdRLf7mr6OULee35kyyZpr5crR514Mak=", + "vendorSha256": "sha256-xqjhSu1bUSpQ1A2Ga2IS2fdyIXcnt/nbQNXhcxVi22Q=", + "version": "3.14.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -348,10 +348,10 @@ "owner": "dome9", "provider-source-address": "registry.terraform.io/dome9/dome9", "repo": "terraform-provider-dome9", - "rev": "v1.25.3", - "sha256": "sha256-0Pde+xVToBP5gavr0ckEIUmgCmRBbqSP5C0YkMthQGQ=", + "rev": "v1.25.4", + "sha256": "sha256-s/wglGsk/Lm45PWmqNHiVjj6sfQzXue+GnjEALp5yDc=", "vendorSha256": null, - "version": "1.25.3" + "version": "1.25.4" }, "elasticsearch": { "owner": "phillbaker", @@ -420,39 +420,39 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.24.1", - "sha256": "sha256-1fwHMN2HIVl+8ZL7OtP1U5ORc41e7Tm3qEpMqIgWL20=", + "rev": "v4.25.0-alpha", + "sha256": "sha256-9BE19VywtNIeDfjBKzle5nGFPmpS8lHV60w0h2xTztU=", "vendorSha256": null, - "version": "4.24.1" + "version": "4.25.0-alpha" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.13.0", - "sha256": "sha256-Rm7j290Pr65F6JqSNpjK8bR1EhXev/74MpUa7SRNf3o=", - "vendorSha256": "sha256-hlcJn54paYJ1nlmqirOvC3Z4y8cMqv6etlDdihV9+R4=", - "version": "3.13.0" + "rev": "v3.14.0", + "sha256": "sha256-KUlFEVeST/ujerpkjHYzdROwkFD4ASx0juHOKWKM14o=", + "vendorSha256": "sha256-M03+MK7YB3IPHA/w+yrO6YohPzknCmhguO5b25qzDzw=", + "version": "3.14.0" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.19.0", - "sha256": "sha256-b6oEKiz8REeJIDFLDI80+kA4f32KRjZy/GhKg0qeN24=", + "rev": "v4.20.0", + "sha256": "sha256-eZNa6V3aVtEgTZgTNgB4EUK3S6iKfk9qI7OnAQ5Mbp4=", "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", - "version": "4.19.0" + "version": "4.20.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.19.0", - "sha256": "sha256-MPB/ca0GIIs7yEfIyqeOkzK2mkEdkE/DkEbaSqpaF0U=", + "rev": "v4.20.0", + "sha256": "sha256-Dr3G7KskfL+4WNOPL3SZCKf+Lo6wP3XS1JrlC6Mv3O8=", "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", - "version": "4.19.0" + "version": "4.20.0" }, "grafana": { "owner": "grafana", @@ -503,10 +503,10 @@ "owner": "loafoe", "provider-source-address": "registry.terraform.io/loafoe/htpasswd", "repo": "terraform-provider-htpasswd", - "rev": "v1.0.1", - "sha256": "sha256-RUkPIsKVMooGy2hYsNFkctMFdJ8MEbtbMB9Qak6HJgQ=", - "vendorSha256": "sha256-4P3IX7KGDqcWVYRiD6tXoEjF/phI89rz5QdR09xtnAo=", - "version": "1.0.1" + "rev": "v1.0.2", + "sha256": "sha256-U8rArNTOmiB06Vrvet6PnkIuylRzswJvVptijvcuVFQ=", + "vendorSha256": "sha256-rotGWkaNbsU+9tGENvkNkR7C3d6334hfPNcvJaZDSKw=", + "version": "1.0.2" }, "http": { "owner": "hashicorp", @@ -548,10 +548,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.41.0-beta0", - "sha256": "sha256-0SANOw6mSXnH/bLRZRjG2R9aPTsp8jZvqYNNtNsiYPw=", + "rev": "v1.41.0", + "sha256": "sha256-5kHoTmQlEzTSjDnAJPdEN2y+DF9gB2BHJFHEYLh6h48=", "vendorSha256": "sha256-8s32A0qgODZZy3rSrHnnBkQyKLBj0fcCBJ9ja9gXc5Q=", - "version": "1.41.0-beta0" + "version": "1.41.0" }, "icinga2": { "owner": "Icinga", @@ -593,10 +593,10 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.7.0", - "sha256": "1qzdm0jgk6f0zyjbv5qaq24h9a37bgb4ghym61vg763lqra69als", - "vendorSha256": "1q5z54rz5lqgdv9gfl20gfnzi4in0d65jkfxnmmsx6fjcb9ih4p6", - "version": "3.7.0" + "rev": "v3.8.0", + "sha256": "sha256-TVSP0oORtiVkPGjgiHHJAsaWDhlN5lnpC3eJ4Ogf2Ss=", + "vendorSha256": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=", + "version": "3.8.0" }, "ksyun": { "owner": "kingsoftcloud", @@ -629,10 +629,10 @@ "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.6.1", - "sha256": "sha256-pdANr7W4d6+8WdAxcqSTpyEIshd6FVYy0+25wfDt4d8=", + "rev": "v2.7.0", + "sha256": "sha256-V7osiBlNDzJbmVUUhpRUi9tnoY1HccdZ5ub83ciSvbY=", "vendorSha256": "sha256-HKea86ck97uc/Gv6geJm9TTRfG6bnpB+q8cuU/jubI8=", - "version": "2.6.1" + "version": "2.7.0" }, "libvirt": { "owner": "dmacvicar", @@ -647,10 +647,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.27.0", - "sha256": "sha256-m2dD/BP5oNRUge3SXhSIptrQhj3Sez4O3hIdrJn45Y4=", + "rev": "v1.27.1", + "sha256": "sha256-rEXGKytKdlHO3RcZT+3e85cGfQ6b7mhdcFK+unw44ug=", "vendorSha256": "sha256-ZJQAZk4TaKT+hLM46gtV1XmBCtwuKwtoom9tPGaOWhc=", - "version": "1.27.0" + "version": "1.27.1" }, "linuxbox": { "owner": "numtide", @@ -683,10 +683,10 @@ "owner": "terraform-lxd", "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", "repo": "terraform-provider-lxd", - "rev": "v1.7.1", - "sha256": "0r1d0d6fp3rihxhfsxlay0dqp5rmnja9s369msra8jylqyharnrh", - "vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs", - "version": "1.7.1" + "rev": "v1.7.2", + "sha256": "sha256-rNqlPyKpBNaIRtiNHB8U8jowWhqdQtDIMxreZ5Dfm3E=", + "vendorSha256": "sha256-ervfG/BAaF4M+BXsp0eCDM6nPWQOS3pthClhArsUoYc=", + "version": "1.7.2" }, "mailgun": { "owner": "wgebis", @@ -746,10 +746,10 @@ "owner": "NaverCloudPlatform", "provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud", "repo": "terraform-provider-ncloud", - "rev": "v2.2.6", - "sha256": "sha256-Sw3Z6hi+nm/e+lMQQkk8KIa2AK2+q+0gBUe091GnQq0=", + "rev": "v2.2.7", + "sha256": "sha256-5WZOZBFZkJtPdWmxznv/ML6d+UTr+qw+SbBuaG+bGS8=", "vendorSha256": "sha256-ovHg4GcbMzjEi+qJBpdqhR0YUakZCdnpc10SCu8FP8I=", - "version": "2.2.6" + "version": "2.2.7" }, "netlify": { "owner": "AegirHealth", @@ -764,10 +764,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.43.4", - "sha256": "sha256-7ckPPU5ieVEZogW7lWd5vMHyXSlTuSqXj1suxKfEyis=", - "vendorSha256": "sha256-HhjTcdw8LbwMJ7P5LcZtgtEojLsqnsiBDrRIp62EZhQ=", - "version": "2.43.4" + "rev": "v2.44.0", + "sha256": "sha256-CR1GPm8K/9ZOFYvgKqMW63sbnRx0HyAYYESC/ZnBNYI=", + "vendorSha256": "sha256-2m5T6+GJTUDS345GDOW7Yf8X+JpxvtdYvInBjNvNXlg=", + "version": "2.44.0" }, "nomad": { "owner": "hashicorp", @@ -810,28 +810,28 @@ "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.5.0-beta.2", - "sha256": "sha256-eC42HXh8Tk3TXWtdeVbv4UGMss3lh4vYyGPypB353X0=", + "rev": "v1.5.0", + "sha256": "sha256-H8wLMLBB4pSbiilmP9C0WPn62fCYHgPhy8OlvtrUYro=", "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.5.0-beta.2" + "version": "1.5.0" }, "oci": { "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.73.0", - "sha256": "sha256-duONflOa+ZmWNAOZTcjLJUaeIUSiDR3VC4+SC4UXBBg=", + "rev": "v4.74.0", + "sha256": "sha256-hZpEhhI2pqOPLQm6XnVGIccyC1kVmLusUzF3KRbAHys=", "vendorSha256": null, - "version": "4.73.0" + "version": "4.74.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.25.1", - "sha256": "sha256-+XCpk/vfAD8TWxMdi/WqXxDEh6cEZ684Zr+vkHnNMsI=", + "rev": "v3.26.0", + "sha256": "sha256-Mnc3JZtKNOB9VpsjXq8WiZz0+zmTmFRfOY23F186tw4=", "vendorSha256": "sha256-LHiOQNFkMajqytrv387yIhAyCQCaG2Kw5OCI8Xe7u2k=", - "version": "3.25.1" + "version": "3.26.0" }, "oktaasa": { "owner": "oktadeveloper", @@ -936,10 +936,10 @@ "owner": "cyrilgdn", "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", - "rev": "v1.15.0", - "sha256": "04gm7y5qyvipg0a0glgyx257vjrkk4k5pjrvzik6adyrjyidixw1", - "vendorSha256": "0pp9c76zdpfyq57jcwv258gipvmy6hjqi933xdi155hkx45cnixr", - "version": "1.15.0" + "rev": "v1.16.0", + "sha256": "sha256-nueqs2SJZxGNzm/gv/mBo8geXI8nZqmDFQ0e539oV2M=", + "vendorSha256": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=", + "version": "1.16.0" }, "powerdns": { "owner": "pan-net", @@ -1008,10 +1008,10 @@ "owner": "selectel", "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", - "rev": "v3.8.1", - "sha256": "sha256-542fWLMJ9nO3Pu/QpUFZtu2eQoQOaAjaaK3aqtyoJPQ=", + "rev": "v3.8.2", + "sha256": "sha256-Lp2ptLuN/+/fcqeSbIMmL4dmOCoplyZeA10wAsCnYlg=", "vendorSha256": "sha256-kmsO9jFoR/93PkOeIo0pkS/OjE+m3QbIspobAv/9+KI=", - "version": "3.8.1" + "version": "3.8.2" }, "sentry": { "owner": "jianyuan", @@ -1035,10 +1035,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.13.0", - "sha256": "sha256-te5+WjbvU7RV22o22iWu8rGEnBfPkZNzkigziOlxMQg=", + "rev": "v6.13.1", + "sha256": "sha256-OtWJgLObTaWCGOjxN8nlkmfW+D6EMS0esht/OkJaioM=", "vendorSha256": "sha256-yWqUsObvABwmA6V9ecz8SFtk1Bhdq2/dUpnNLKQtuNM=", - "version": "6.13.0" + "version": "6.13.1" }, "skytap": { "owner": "skytap", @@ -1053,10 +1053,10 @@ "owner": "chanzuckerberg", "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.32.0", - "sha256": "sha256-Y4apbAQ4Up1VoQxB9w/4EYwhFX9sqYNLLBVxyOqmffE=", + "rev": "v0.33.1", + "sha256": "sha256-xFtk1WbMe2/UFGB/ej6QEL07+dZTsWFmqvyVCa2YBw8=", "vendorSha256": "sha256-l++IzY3/W4qsdFJY7ik0xF6tZWluLb4EcW5KQtBVY5s=", - "version": "0.32.0" + "version": "0.33.1" }, "sops": { "owner": "carlpett", @@ -1116,10 +1116,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.71.0", - "sha256": "sha256-syj6fOBmErKsPQXYQ0U9bFC3butI06FJVLkD6RvWbFE=", + "rev": "v1.72.1", + "sha256": "sha256-vCCIHp8tpAn7PIIBMVXRSI9G420E1ijfYow9bfC3RKs=", "vendorSha256": null, - "version": "1.71.0" + "version": "1.72.1" }, "tfe": { "owner": "hashicorp", From 9a4ea4146e31d172f51591840f7927ccc32dc75f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Tue, 10 May 2022 13:22:18 +0900 Subject: [PATCH 074/150] python3Packages.ipwhl: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/ipwhl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipwhl/default.nix b/pkgs/development/python-modules/ipwhl/default.nix index 1b8b7f002ae..8bbf257ebdc 100644 --- a/pkgs/development/python-modules/ipwhl/default.nix +++ b/pkgs/development/python-modules/ipwhl/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "ipwhl"; - version = "1.0.0"; + version = "1.1.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "~cnx"; repo = "ipwhl-utils"; rev = version; - sha256 = "sha256-KstwdmHpn4ypBNpX56NeStqdzy5RElMTW1oR2hCtJ7c="; + sha256 = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA="; }; buildInputs = [ ipfs ]; From 0684166637e6c9ce87d209d704797f1a9b7e1c3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 04:48:26 +0000 Subject: [PATCH 075/150] haste-server: 72863858338a57d54eb9dee55530e90ebbc22453 -> 68f6fe2b96ad02e21645480448113954bc87e1f5 --- pkgs/servers/haste-server/default.nix | 4 +-- .../servers/haste-server/node-composition.nix | 2 +- pkgs/servers/haste-server/node-deps.nix | 24 +++++++------- pkgs/servers/haste-server/node-env.nix | 32 ++++++++++++------- 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/pkgs/servers/haste-server/default.nix b/pkgs/servers/haste-server/default.nix index 80f06bf4fa4..95e6d5158f6 100644 --- a/pkgs/servers/haste-server/default.nix +++ b/pkgs/servers/haste-server/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "haste-server"; - version = "72863858338a57d54eb9dee55530e90ebbc22453"; + version = "68f6fe2b96ad02e21645480448113954bc87e1f5"; src = fetchFromGitHub { owner = "toptal"; repo = "haste-server"; rev = version; - hash = "sha256-MoEqpfihI3ZqSTHOxFbGziDv8khgq2Nd44YuKYDGflc="; + hash = "sha256-9IPGqIca6GC/dQhGBC4hxWhNRgXR1ik0ONRBU2MGhL0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/haste-server/node-composition.nix b/pkgs/servers/haste-server/node-composition.nix index 7b8937a3647..03dc6f3e5be 100644 --- a/pkgs/servers/haste-server/node-composition.nix +++ b/pkgs/servers/haste-server/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/servers/haste-server/node-deps.nix b/pkgs/servers/haste-server/node-deps.nix index fbb33a90c73..922860100d8 100644 --- a/pkgs/servers/haste-server/node-deps.nix +++ b/pkgs/servers/haste-server/node-deps.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: @@ -67,13 +67,13 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; - "async-1.0.0" = { + "async-3.2.3" = { name = "async"; packageName = "async"; - version = "1.0.0"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz"; - sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; + url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; "async-cache-1.1.0" = { @@ -1237,13 +1237,13 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; - "winston-2.4.5" = { + "winston-2.4.6" = { name = "winston"; packageName = "winston"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz"; - sha512 = "TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A=="; + url = "https://registry.npmjs.org/winston/-/winston-2.4.6.tgz"; + sha512 = "J5Zu4p0tojLde8mIOyDSsmLmcP8I3Z6wtwpTDHx1+hGcdhxcJaAmG4CFtagkb+NiN1M9Ek4b42pzMWqfc9jm8w=="; }; }; "workerpool-6.1.0" = { @@ -1341,7 +1341,7 @@ let name = "haste"; packageName = "haste"; version = "0.1.0"; - src = ../../../../../../../../../nix/store/jmii2np1kr78g0pnyf2y8wvj09nc1pr0-source; + src = ../../../../../../../../../nix/store/6mkl6xr6y74v0ib122gjx8jvd6xig4dc-source; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" sources."ansi-colors-4.1.1" @@ -1349,7 +1349,7 @@ let sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."argparse-2.0.1" - sources."async-1.0.0" + sources."async-3.2.3" sources."async-cache-1.1.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -1495,7 +1495,7 @@ let sources."utils-merge-1.0.1" sources."which-2.0.2" sources."wide-align-1.1.3" - sources."winston-2.4.5" + sources."winston-2.4.6" sources."workerpool-6.1.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ diff --git a/pkgs/servers/haste-server/node-env.nix b/pkgs/servers/haste-server/node-env.nix index 5f055785791..2590dd267a4 100644 --- a/pkgs/servers/haste-server/node-env.nix +++ b/pkgs/servers/haste-server/node-env.nix @@ -98,7 +98,7 @@ let '' + (lib.concatMapStrings (dependency: '' - if [ ! -e "${dependency.name}" ]; then + if [ ! -e "${dependency.packageName}" ]; then ${composePackage dependency} fi '' @@ -257,8 +257,8 @@ let var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); } if(packageLock.dependencies !== undefined) { @@ -390,7 +390,7 @@ let buildNodePackage = { name , packageName - , version + , version ? null , dependencies ? [] , buildInputs ? [] , production ? true @@ -409,7 +409,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "${name}-${version}"; + name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -441,6 +441,14 @@ let if [ -d "$out/lib/node_modules/.bin" ] then ln -s $out/lib/node_modules/.bin $out/bin + + # Patch the shebang lines of all the executables + ls $out/bin/* | while read i + do + file="$(readlink -f "$i")" + chmod u+rwx "$file" + patchShebangs "$file" + done fi # Create symlinks to the deployed manual page folders, if applicable @@ -471,7 +479,7 @@ let buildNodeDependencies = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -489,7 +497,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; in stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; + name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux @@ -519,6 +527,7 @@ let if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . + chmod 644 package-lock.json fi ''} @@ -541,7 +550,7 @@ let buildNodeShell = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -557,9 +566,10 @@ let let nodeDependencies = buildNodeDependencies args; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; + stdenv.mkDerivation ({ + name = "node-shell-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' @@ -578,7 +588,7 @@ let export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; - }; + } // extraArgs); in { buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; From 12e43250db62ccb4fdb8b871b50f61dc7b163f27 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 07:02:11 +0200 Subject: [PATCH 076/150] curlcpp: drop Maintainers in nixpkgs are not active anymore. No active user within nixpkgs. Upstream doesn't see much activity. --- .../development/libraries/curlcpp/default.nix | 24 ------------------- pkgs/tools/networking/curl/default.nix | 3 +-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/curlcpp/default.nix diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix deleted file mode 100644 index 9d4ae41f384..00000000000 --- a/pkgs/development/libraries/curlcpp/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl }: - -stdenv.mkDerivation rec { - pname = "curlcpp"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "JosephP91"; - repo = "curlcpp"; - rev = version; - sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ curl ]; - - meta = with lib; { - homepage = "https://josephp91.github.io/curlcpp/"; - description = "Object oriented C++ wrapper for CURL"; - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ rszibele ]; - }; -} diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index bd37b4954c4..02ae74bd633 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -27,7 +27,6 @@ # for passthru.tests , coeurl -, curlcpp , curlpp , haskellPackages , ocamlPackages @@ -168,7 +167,7 @@ stdenv.mkDerivation rec { passthru = { inherit opensslSupport openssl; tests = { - inherit curlpp curlcpp coeurl; + inherit curlpp coeurl; haskell-curl = haskellPackages.curl; ocaml-curly = ocamlPackages.curly; php-curl = phpExtensions.curl; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ac387f67ef8..f7c89161495 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -271,6 +271,7 @@ mapAliases ({ cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; cupsBjnp = throw "'cupsBjnp' has been renamed to/replaced by 'cups-bjnp'"; # Converted to throw 2022-02-22 cups_filters = throw "'cups_filters' has been renamed to/replaced by 'cups-filters'"; # Converted to throw 2022-02-22 + curlcpp = throw "curlcpp has been removed, no active maintainers and no usage within nixpkgs"; # Added 2022-05-10 curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages"; # Added 2022-01-12 curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23 cv = throw "'cv' has been renamed to/replaced by 'progress'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c906177bb2..8b70ea40d7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16855,8 +16855,6 @@ with pkgs; ctypes_sh = callPackage ../development/libraries/ctypes_sh { }; - curlcpp = callPackage ../development/libraries/curlcpp { }; - curlpp = callPackage ../development/libraries/curlpp { }; cutee = callPackage ../development/libraries/cutee { }; From fc9d5ea630a06349a8b49d9c7e68a9f8abf11aab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 05:08:56 +0000 Subject: [PATCH 077/150] python310Packages.hvplot: 0.7.3 -> 0.8.0 --- pkgs/development/python-modules/hvplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 22be0ff75c9..fba74eac1b9 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "hvplot"; - version = "0.7.3"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "74b269c6e118dd6f7d2a4039e91f16a193638f4119b4358dc6dbd58a2e71e432"; + sha256 = "sha256-hjDbo0lpsQXiZ8vhQjfi1W2ZacgBmArl5RkLwYsnktY="; }; nativeBuildInputs = [ From 9d9b4dc64b366c33ce05b21c4e488e22eca9ece6 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 07:28:43 +0200 Subject: [PATCH 078/150] envoy: fix sha256 for x86_64-linux --- pkgs/servers/http/envoy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 16de2fb399b..49fb6f1861b 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -85,7 +85,7 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { - x86_64-linux = "0k2cna0vjzc8z7jvxdlcw741vacil8daczppv32bslw17af65vq6"; + x86_64-linux = "sha256-23Z6SbKnbah/NCrdMrXhrNFFASd/8xRH3fSyIE++heA="; aarch64-linux = "1ijv4arw67nprykn2wkn4ji8fbr284mc7p74zxfsky772s42yy9j"; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; From ab456c4d4583721157a2e4d48904709e3471ebc7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 9 May 2022 08:26:12 +0100 Subject: [PATCH 079/150] medusa: pull upstream fix for fno-common toolchains Without the chanhe build fails on -fno-common tollchains as: $ nix build -L --impure --expr 'with import ./. {}; medusa.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (["-fno-common"] ++ [oa.NIX_CFLAGS_COMPILE or ""]); })' ... ld: ../medusa-trace.o:/build/source/src/modsrc/../medusa.h:69: multiple definition of `iErrorLevel'; cvs.o:/build/source/src/modsrc/../medusa.h:69: first defined here --- pkgs/tools/security/medusa/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/tools/security/medusa/default.nix index 43a30aad825..7c2174c5233 100644 --- a/pkgs/tools/security/medusa/default.nix +++ b/pkgs/tools/security/medusa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, freerdp, openssl, libssh2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, freerdp, openssl, libssh2 }: stdenv.mkDerivation rec { pname = "medusa-unstable"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0njlz4fqa0165wdmd5y8lfnafayf3c4la0r8pf3hixkdwsss1509"; }; + patches = [ + # Pull upstream fix for -fno-common tollchains like gcc-10: + # https://github.com/jmk-foofus/medusa/pull/36 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/jmk-foofus/medusa/commit/a667656ad085b3eb95309932666c250d97a92767.patch"; + sha256 = "01marqqhjd3qwar3ymp50y1h2im5ilgpaxk7wrc2kcxgmzvbdfxc"; + }) + ]; + outputs = [ "out" "man" ]; configureFlags = [ "--enable-module-ssh=yes" ]; From 7bd29be23bb81d928dc358a6488d96bc2d3e2611 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 06:14:20 +0000 Subject: [PATCH 080/150] python310Packages.dbf: 0.99.1 -> 0.99.2 --- pkgs/development/python-modules/dbf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index b5b6f277fd6..1bf922012d3 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.99.1"; + version = "0.99.2"; src = fetchPypi { inherit pname version; - sha256 = "4ed598a3866dfe7761b8099cf53ab44cb6ed5e4a7dbffb0da8c67a4af8d62fc5"; + sha256 = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0="; }; propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34; From f6004cdb2ecb5128abb35d8fe75249676e0b1b34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 09:15:43 +0200 Subject: [PATCH 081/150] python310Packages.hvplot: disable on older Python releases --- pkgs/development/python-modules/hvplot/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index fba74eac1b9..c39fc338a17 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -5,22 +5,21 @@ , fetchPypi , holoviews , pandas -, pythonImportsCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "hvplot"; version = "0.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "sha256-hjDbo0lpsQXiZ8vhQjfi1W2ZacgBmArl5RkLwYsnktY="; }; - nativeBuildInputs = [ - pythonImportsCheckHook - ]; - propagatedBuildInputs = [ bokeh colorcet From 97ed4e85eab62532cb8fc3bc6e2cdc446b2f8bbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 10:03:26 +0200 Subject: [PATCH 082/150] python310Packages.dbf: disable on older Python releases - add pythonImportsCheck - run tests --- .../python-modules/dbf/default.nix | 51 +++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index 1bf922012d3..6c85d0def6e 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -1,28 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage, aenum, isPy3k, pythonOlder, enum34, python }: +{ lib +, fetchPypi +, buildPythonPackage +, aenum +, pythonOlder +, python +}: buildPythonPackage rec { - pname = "dbf"; - version = "0.99.2"; + pname = "dbf"; + version = "0.99.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0="; - }; + disabled = pythonOlder "3.7"; - propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34; + src = fetchPypi { + inherit pname version; + hash = "sha256-aeutAP2y+bUmUOZ39TpXULP+egeBcjyDmtoCheGzw+0="; + }; - doCheck = !isPy3k; - # tests are not yet ported. - # https://groups.google.com/forum/#!topic/python-dbase/96rx2xmCG4w + propagatedBuildInputs = [ + aenum + ]; - checkPhase = '' - ${python.interpreter} dbf/test.py - ''; + checkPhase = '' + ${python.interpreter} dbf/test.py + ''; - meta = with lib; { - description = "Pure python package for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; - homepage = "https://pypi.python.org/pypi/dbf"; - license = licenses.bsd2; - maintainers = with maintainers; [ vrthra ]; - }; + pythonImportsCheck = [ + "dbf" + ]; + + meta = with lib; { + description = "Module for reading/writing dBase, FoxPro, and Visual FoxPro .dbf files"; + homepage = "https://github.com/ethanfurman/dbf"; + license = licenses.bsd2; + maintainers = with maintainers; [ vrthra ]; + }; } From 7fde85cbe1893c1b0f729063d705786391a1f911 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 10:30:04 +0200 Subject: [PATCH 083/150] python310Packages.oletools: 0.60 -> 0.60.1 --- pkgs/development/python-modules/oletools/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index 76019730eb7..3ba66ac38ed 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oletools"; - version = "0.60"; + version = "0.60.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "decalage2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gatUVkf8iT1OGnahX1BzQLDypCqhS1EvkAgUHJ6myA4="; + hash = "sha256-H3oL8sk2r267wV0hoHOq9r9DY2Atxs+hZUVb6tmHy0w="; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { disabledTests = [ # Test fails with AssertionError: Tuples differ: ('MS Word 2007+... "test_all" + "test_xlm" ]; pythonImportsCheck = [ @@ -54,7 +55,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python tool to analyze MS OLE2 files and MS Office documents"; + description = "Module to analyze MS OLE2 files and MS Office documents"; homepage = "https://github.com/decalage2/oletools"; license = with licenses; [ bsd2 /* and */ mit ]; maintainers = with maintainers; [ fab ]; From 83b7231f6a4c7fa7c3e31f2a71b42f2d70da6285 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 13 Jan 2022 18:52:33 +0100 Subject: [PATCH 084/150] clip: init at 2.1.1 --- pkgs/applications/video/clip/default.nix | 58 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/video/clip/default.nix diff --git a/pkgs/applications/video/clip/default.nix b/pkgs/applications/video/clip/default.nix new file mode 100644 index 00000000000..43f9437c57a --- /dev/null +++ b/pkgs/applications/video/clip/default.nix @@ -0,0 +1,58 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, applet-window-buttons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, mauikit-filebrowsing +, qtmultimedia +, qtquickcontrols2 +, taglib +, ffmpeg +}: + +mkDerivation rec { + pname = "clip"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "clip"; + rev = "v${version}"; + sha256 = "sha256-vW3A0PKJSC2QNs+QVZ9w0g4aVmcndhahrpkd4wWoUko="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + applet-window-buttons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + mauikit-filebrowsing + qtmultimedia + qtquickcontrols2 + taglib + ffmpeg + ]; + + meta = with lib; { + description = "Video player and video collection manager"; + homepage = "https://invent.kde.org/maui/clip"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c82544ce55b..f5b749470f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25533,6 +25533,8 @@ with pkgs; clightd = callPackage ../applications/misc/clight/clightd.nix { }; + clip = libsForQt5.callPackage ../applications/video/clip { }; + clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { }; clipcat = callPackage ../applications/misc/clipcat { }; From b544d177a26985b5fc1149612bac511f35be6a48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 May 2022 11:11:40 +0200 Subject: [PATCH 085/150] lib.licenses: add DRL-1.0 https://spdx.org/licenses/DRL-1.0.html https://github.com/SigmaHQ/sigma/blob/master/LICENSE.Detection.Rules.md --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 2928d11d8b2..4fa6d6abc7a 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -285,6 +285,11 @@ in mkLicense lset) ({ fullName = "DOC License"; }; + drl10 = { + spdxId = "DRL-1.0"; + fullName = "Detection Rule License 1.0"; + }; + eapl = { fullName = "EPSON AVASYS PUBLIC LICENSE"; url = "https://avasys.jp/hp/menu000000700/hpg000000603.htm"; From 4a3bbec489c0e076a807ccf6d877662547ea2ad9 Mon Sep 17 00:00:00 2001 From: "Victor \"multun\" Collod" Date: Tue, 10 May 2022 11:12:52 +0200 Subject: [PATCH 086/150] python3Packages.prox-tv: ignore unstable test --- pkgs/development/python-modules/prox-tv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 0aaf105a52f..1202d45efa4 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { # this test is known to fail on darwin checkPhase = '' - nosetests ${lib.optionalString stdenv.isDarwin " --exclude=test_tv2_1d"} + nosetests --exclude=test_tvp_1d ${lib.optionalString stdenv.isDarwin " --exclude=test_tv2_1d"} ''; propagatedNativeBuildInputs = [ cffi ]; From 4fbc3657db02f9739f2009fbb924aad2ac93ebf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 09:29:48 +0000 Subject: [PATCH 087/150] python310Packages.aws-lambda-builders: 1.15.0 -> 1.16.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index ce5c753a4af..6d4baf0f553 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.15.0"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - sha256 = "sha256-kXglpj82e+LzUI6SW86wyfG2lGVnL/PsrTNsseg4VYk="; + sha256 = "sha256-XJDukyYTtnAHiHACi5gEJ9VPjqv8Y4V7oe4q3l5fpMA="; }; propagatedBuildInputs = [ From c0d01f15f9274c0314a29b5154ab24ab5ca675a5 Mon Sep 17 00:00:00 2001 From: Scriptkiddi Date: Tue, 10 May 2022 11:45:59 +0200 Subject: [PATCH 088/150] pythonPackages.nutils: Mark broken for aarch64 --- pkgs/development/python-modules/nutils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 84003ce30be..3089093d9cd 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , numpy @@ -45,6 +46,7 @@ buildPythonPackage rec { description = "Numerical Utilities for Finite Element Analysis"; homepage = "https://www.nutils.org/"; license = licenses.mit; + broken = stdenv.hostPlatform.isAarch64; maintainers = with maintainers; [ Scriptkiddi ]; }; } From bb55ac971a77b7d23d4963eb6ba33652a568d1ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 09:47:50 +0000 Subject: [PATCH 089/150] python310Packages.extractcode: 30.0.0 -> 31.0.0 --- pkgs/development/python-modules/extractcode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 93374bd004c..8af4cb865fd 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "extractcode"; - version = "30.0.0"; + version = "31.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5a660d1b9e3bae4aa87828e6947dc3b31dc2fa6705acb28a514874602b40bc90"; + sha256 = "sha256-gIGTkum8+BKfdNiQT+ipjA3+0ngjVoQnNygsAoMRPYg="; }; dontConfigure = true; From 14d0c3f3a17fda1e1ad7f8ea3cddb2615d095d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hl=C3=B6=C3=B0ver=20Sigur=C3=B0sson?= Date: Tue, 10 May 2022 12:34:33 +0200 Subject: [PATCH 090/150] csound: darwin support --- pkgs/applications/audio/csound/default.nix | 20 ++++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index ebcdb8f4290..4da3efbffe4 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,4 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext +, Accelerate +, AudioUnit +, CoreAudio +, CoreMIDI , alsa-lib ? null , libpulseaudio ? null , libjack2 ? null @@ -26,21 +30,29 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp + ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] - ++ builtins.filter (optional: optional != null) [ + ++ lib.optionals stdenv.isDarwin [ + Accelerate AudioUnit CoreAudio CoreMIDI + ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen - curl tcltk fltk ]; + curl tcltk fltk + ]); + + postInstall = lib.optional stdenv.isDarwin '' + mkdir -p $out/Library/Frameworks + ln -s $out/lib/CsoundLib64.framework $out/Library/Frameworks + ''; meta = with lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; homepage = "https://csound.com/"; license = licenses.lgpl21Plus; maintainers = [maintainers.marcweber]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f4adeab534..cf59c3dc7c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25602,7 +25602,9 @@ with pkgs; csa = callPackage ../applications/audio/csa { }; - csound = callPackage ../applications/audio/csound { }; + csound = callPackage ../applications/audio/csound { + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AudioUnit CoreAudio CoreMIDI; + }; csound-manual = callPackage ../applications/audio/csound/csound-manual { python = python27; From 0bc70ad43489682489adfcf0678cec700c6d5a20 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 10 May 2022 09:33:38 +0300 Subject: [PATCH 091/150] zeroc-ice: 3.7.6 -> 3.7.7, drop Darwin Fixes build on Linux. Still doesn't build on Darwin, but at least it builds on Linux now. --- .../libraries/zeroc-ice/default.nix | 31 +++---------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 9ee55a47797..b60168a6f5c 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -1,9 +1,7 @@ { stdenv, lib, fetchFromGitHub , bzip2, expat, libedit, lmdb, openssl -, darwin, libiconv, Security , python3 # for tests only , cpp11 ? false -, fetchpatch }: let @@ -24,36 +22,16 @@ let in stdenv.mkDerivation rec { pname = "zeroc-ice"; - version = "3.7.6"; + version = "3.7.7"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4"; + sha256 = "sha256-h455isEmnRyoasXhh1UaA5PICcEEM8/C3IJf5yHRl5g="; }; - patches = [ - # Fixes for openssl 3.0 / glibc-2.34. - (fetchpatch { - url = "https://github.com/zeroc-ice/ice/commit/7204b31a082a10cd481c1f31dbb6184ec699160d.patch"; - sha256 = "sha256-RN8kQrvWRu1oXB7UV7DkYbZ8A0VyJYGArx6ikovwefo="; - }) - (fetchpatch { - url = "https://github.com/zeroc-ice/ice/commit/358e7fea00383d55d1c19d38a3bbb64aca803aeb.patch"; - sha256 = "sha256-ntrTO6qHB7dw398BRdAyJQUfVYW3iEfzUaBYoWWOEDs="; - }) - ]; - - buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; - - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Make.rules.Darwin \ - --replace xcrun "" - ''; + buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ]; preBuild = '' makeFlagsArray+=( @@ -97,7 +75,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; - # no match for 'operator!=' - broken = true; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f9c35a9e11..becfac7963a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30892,9 +30892,7 @@ with pkgs; zerobin = callPackage ../applications/networking/zerobin { }; - zeroc-ice = callPackage ../development/libraries/zeroc-ice { - inherit (darwin.apple_sdk.frameworks) Security; - }; + zeroc-ice = callPackage ../development/libraries/zeroc-ice {}; zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; From b4a61b636a21c7e4608ae9003ccb3865176f395c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 10 May 2022 12:43:06 +0200 Subject: [PATCH 092/150] teams: fix wrapper workaround We can't rely on the wrapper being a shell script, so we make our own wrapper to append the needed args. --- .../networking/instant-messengers/teams/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 684fb8454d6..07462b4cc26 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, runtimeShell , fetchurl , autoPatchelfHook , wrapGAppsHook @@ -57,8 +58,6 @@ let preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin") - gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox) - gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox) ''; @@ -121,9 +120,13 @@ let done; # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 - # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue - # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning - substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox' + wrapped=$out/bin/.teams-old + mv "$out/bin/teams" "$wrapped" + cat > "$out/bin/teams" << EOF + #! ${runtimeShell} + exec $wrapped "\$@" --disable-namespace-sandbox --disable-setuid-sandbox + EOF + chmod +x "$out/bin/teams" ''; }; From 4029d50b1e23718b9c6e1b03ded22b552038ae93 Mon Sep 17 00:00:00 2001 From: Jan Christoph Ebersbach Date: Tue, 10 May 2022 12:49:56 +0200 Subject: [PATCH 093/150] maintainers: expand jceb's name (#172312) --- 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 43794589289..357bcf6720d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5726,7 +5726,7 @@ githubId = 35612334; }; jceb = { - name = "jceb"; + name = "Jan Christoph Ebersbach"; email = "jceb@e-jc.de"; github = "jceb"; githubId = 101593; From 70d7d6eefa40a486de4c41ebd5fa4f859151553e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 12:48:48 +0200 Subject: [PATCH 094/150] signal-desktop: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- .../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 6afccfaaa07..96c6809b045 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, nixosTests +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, makeWrapper, nixosTests , 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, alsa-lib @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) ]; buildInputs = [ From de869f039d591f205e6bf09fd4cc7a55246f1ee2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 10 May 2022 12:53:22 +0200 Subject: [PATCH 095/150] siesta: fix hardcoded path to rm --- pkgs/applications/science/chemistry/siesta/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index 4c3d1d4c1a7..f49b9d1f45f 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "0lz8rfl5xwdj17zn7a30ipi7cgjwqki21a7wg9rdg7iwx27bpnmg"; }; + postPatch = '' + substituteInPlace Src/siesta_init.F --replace '/bin/rm' 'rm' + ''; + passthru = { inherit mpi; }; From 3120f41ddd58d5a0a466634efdf9b99de1262001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rasmus=20Pr=C3=A9centh?= Date: Tue, 10 May 2022 08:49:57 +0200 Subject: [PATCH 096/150] python3Packages.pydyf: fix failing tests --- pkgs/development/python-modules/pydyf/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index 346a6f6e39b..4cf44e3c67e 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , isPy3k , pytestCheckHook @@ -19,6 +20,15 @@ buildPythonPackage rec { sha256 = "sha256-Hi9d5IF09QXeAlp9HnzwG73ZQiyoq5RReCvwDuF4YCw="; }; + patches = [ + # Fix tests for Ghostscript 9.56 + # Remove after v0.1.3 has been released + (fetchpatch { + url = "https://github.com/CourtBouillon/pydyf/commit/d4c34823f1d15368753c9c26f7acc7a24fc2d979.patch"; + sha256 = "sha256-2hHZW/q5CbStbpSJYbm3b23qKXANEb5jbPGQ83uHC+Q="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--isort --flake8 --cov --no-cov-on-fail" "" From 6d06f47584813ec31e5ad167e3f488fbebaac7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 13:05:43 +0200 Subject: [PATCH 097/150] brave: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- pkgs/applications/networking/browsers/brave/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index b216d750d56..79b9b498fbd 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook +{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper , dpkg , alsa-lib , at-spi2-atk @@ -102,7 +102,10 @@ stdenv.mkDerivation rec { dontPatchELF = true; doInstallCheck = true; - nativeBuildInputs = [ dpkg wrapGAppsHook ]; + nativeBuildInputs = [ + dpkg + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH From a6977778089a7f9b31335e5d202cf20798705b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 13:09:04 +0200 Subject: [PATCH 098/150] discord: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- .../networking/instant-messengers/discord/linux.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 05833c1eeaf..f5d984bf3a6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,5 +1,5 @@ { pname, version, src, meta, binaryName, desktopName, autoPatchelfHook -, makeDesktopItem, lib, stdenv, wrapGAppsHook, alsa-lib, at-spi2-atk +, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { libxshmfence mesa nss - wrapGAppsHook + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) ]; dontWrapGApps = true; From a2ee3ed3f284c5b33432fbd55d07a624f01ff8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 13:11:10 +0200 Subject: [PATCH 099/150] vscode: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- pkgs/applications/editors/vscode/generic.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 9a4f1b92d41..e1003180050 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem -, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook +, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap , writeShellScriptBin @@ -68,7 +68,12 @@ let runtimeDependencies = lib.optional stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; - nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook nodePackages.asar wrapGAppsHook ]; + nativeBuildInputs = [ unzip ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + nodePackages.asar + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; dontBuild = true; dontConfigure = true; From 18aee8a1ad6a99dbcd5096711b22e4f48e4d8b83 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 10 May 2022 12:14:42 +0100 Subject: [PATCH 100/150] terragrunt: 0.36.10 -> 0.36.11 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 748552a4067..502b2bf41ef 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.10"; + version = "0.36.11"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C7VUDwgxE5VlHamgJk9dDhaBCOLXLDg0TFEhH2jV4oc="; + sha256 = "sha256-kXa3iG94WTH6KpQksl2r0yXyr4KuLY2AZdZtZ6zWYUA="; }; - vendorSha256 = "sha256-ZI2ETgxpRk10WMxb/v1j/LumL2xtE3QBcARs7spYMOk="; + vendorSha256 = "sha256-7SUf4r+6r6dkBoBZFg2AUK114QEl0+1lwRA4ymYArFs="; doCheck = false; From f3ef66220b4224c130cd0c7b860d105c49ea9da8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 4 May 2022 07:26:03 +0200 Subject: [PATCH 101/150] ocamlPackages.biniou: remove legacy version 1.0.9 for OCaml < 4.02 --- pkgs/development/ocaml-modules/biniou/1.0.nix | 39 ------------------- pkgs/top-level/ocaml-packages.nix | 5 +-- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/biniou/1.0.nix diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix deleted file mode 100644 index ec81e5b8db9..00000000000 --- a/pkgs/development/ocaml-modules/biniou/1.0.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, fetchurl, ocaml, findlib, easy-format}: -let - pname = "biniou"; - version = "1.0.9"; - webpage = "http://mjambon.com/${pname}.html"; -in - -assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; - -stdenv.mkDerivation rec { - - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; - sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; - }; - - nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ easy-format ]; - - strictDeps = true; - - createFindlibDestdir = true; - - makeFlags = [ "PREFIX=$(out)" ]; - - preBuild = '' - mkdir -p $out/bin - ''; - - meta = with lib; { - description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - homepage = webpage; - license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9d7bce728c5..4bb51cf75bd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -139,10 +139,7 @@ let benchmark = callPackage ../development/ocaml-modules/benchmark { }; - biniou = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/biniou { } - else callPackage ../development/ocaml-modules/biniou/1.0.nix { }; + biniou = callPackage ../development/ocaml-modules/biniou { }; bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; From 10bb8b1818d309a144b2a0775ce1d0194a433852 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 4 May 2022 07:13:19 +0200 Subject: [PATCH 102/150] =?UTF-8?q?ocamlPackages.easy-format:=201.2.0=20?= =?UTF-8?q?=E2=86=92=201.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/easy-format/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index a6e78977846..a3fb9722965 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -1,24 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: - -stdenv.mkDerivation rec { +{ lib, fetchurl, buildDunePackage }: +buildDunePackage rec { pname = "easy-format"; - version = "1.2.0"; + version = "1.3.2"; - src = fetchFromGitHub { - owner = "mjambon"; - repo = "easy-format"; - rev = "v${version}"; - sha256 = "sha256-qf73+T9a+eDy78iZgpA08TjIo+lvjftfSkwyT3M96gE="; + src = fetchurl { + url = "https://github.com/ocaml-community/easy-format/releases/download/${version}/easy-format-${version}.tbz"; + sha256 = "sha256:09hrikx310pac2sb6jzaa7k6fmiznnmhdsqij1gawdymhawc4h1l"; }; - nativeBuildInputs = [ ocaml findlib ]; - strictDeps = true; - - createFindlibDestdir = true; - doCheck = true; - checkTarget = "test"; meta = with lib; { description = "A high-level and functional interface to the Format module of the OCaml standard library"; From c07919c76caadd5915cbef41786f595e33cc263b Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 10 May 2022 14:08:18 +0200 Subject: [PATCH 103/150] hydra: fix evaluation with aliases disabled --- pkgs/development/tools/misc/hydra/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index affeb75d198..9edafd493ae 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -36,7 +36,7 @@ let CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace - CatalystPluginUnicodeEncoding + CatalystRuntime CatalystTraitForRequestProxyBase CatalystViewDownload CatalystViewJSON From 86e7fa945e310b1c21ea837109879e7c8b935e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 14:19:53 +0200 Subject: [PATCH 104/150] tlaplusToolbox: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- pkgs/applications/science/logic/tlaplus/toolbox.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index e13fd578927..d84f0b2abf6 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ + makeWrapper + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + ]; dontWrapGApps = true; From 9709c5f4a4ba7b3e2889b4f1fe79c9e42e829909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 14:25:43 +0200 Subject: [PATCH 105/150] cryptomator: use non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation does not work with binary wrappers, which wrapGAppsHook uses since #164163. --- pkgs/tools/security/cryptomator/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index 76b5f521663..5a1886e49e5 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -98,7 +98,13 @@ in stdenv.mkDerivation rec { cp ${src}/dist/linux/common/application-vnd.cryptomator.vault.xml $out/share/mime/packages/application-vnd.cryptomator.vault.xml ''; - nativeBuildInputs = [ autoPatchelfHook maven makeWrapper wrapGAppsHook jdk ]; + nativeBuildInputs = [ + autoPatchelfHook + maven + makeWrapper + (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + jdk + ]; buildInputs = [ fuse jre glib jffi ]; meta = with lib; { From 220428039c8cdb58dcdde4d766ef99fac71c285d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 14:27:58 +0200 Subject: [PATCH 106/150] bluej: fix with non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation assumed quotes to be expanded, which the binary wrapper (which wrapGAppsHook uses since #164163) will not do. --- pkgs/applications/editors/bluej/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index bfc413c24ad..552358319e1 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { preFixup = '' makeWrapper ${jdk}/bin/java $out/bin/bluej \ "''${gappsWrapperArgs[@]}" \ - --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot" + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp $out/share/bluej/bluej.jar bluej.Boot" ''; meta = with lib; { From 757f518f803e684500076f169078ab0de8a9835b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Tue, 10 May 2022 14:28:35 +0200 Subject: [PATCH 107/150] gmtp: fix with non-binary wrapper for wrapGAppsHook The use of --add-flags in this derivation assumed quotes to be expanded, which the binary wrapper (which wrapGAppsHook uses since #164163) will not do. --- pkgs/applications/misc/gmtp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 1479fe7bc7d..5f03b8ea7e7 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; preFixup = '' - gappsWrapperArgs+=(--add-flags "--datapath \"$out/share\""); + gappsWrapperArgs+=(--add-flags "--datapath $out/share"); ''; meta = { From 7d673c71c1a838dc8e2b51e3e48e719f6629fc67 Mon Sep 17 00:00:00 2001 From: Maxim Zhukov Date: Tue, 10 May 2022 14:10:00 +0300 Subject: [PATCH 108/150] luaPackages: add new package - tl (teal language) The compiler for Teal, a typed dialect of Lua Signed-off-by: Maxim Zhukov --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index acd26ee93c0..bf16423a1c7 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -86,4 +86,5 @@ say,https://github.com/Olivine-Labs/say.git,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, stdlib,,,,41.2.2,,vyp +tl,,,,,,mephistophiles vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 5c02026cbe3..745ded10071 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2530,6 +2530,39 @@ buildLuarocksPackage { }; }) {}; +tl = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, compat53, argparse, luafilesystem +}: +buildLuarocksPackage { + pname = "tl"; + version = "0.13.2-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/tl-0.13.2-1.rockspec"; + sha256 = "0a9nr03q6w1689drd0r2y8m7qbyxm8n6bkgjplwkr6c6abvbis3f"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/teal-language/tl", + "rev": "473fef59f21e836e1337a0e3da3c759a1e3556bd", + "date": "2021-07-30T21:02:34-03:00", + "path": "/nix/store/29dm1abr2cc9zqs9n9lymg92gaxqh09g-tl", + "sha256": "1cj7ihw1kz1n1jkha6q0mq0qmlw1vi04i6pcbw3w1cdf2i4fcglh", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + propagatedBuildInputs = [ compat53 argparse luafilesystem ]; + + meta = { + homepage = "https://github.com/teal-language/tl"; + description = "Teal, a typed dialect of Lua"; + maintainers = with lib.maintainers; [ mephistophiles ]; + license.fullName = "MIT"; + }; +}) {}; + vstruct = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, lua }: From 315002db4e19d66b7460f4baa6c0d111682a03fc Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 6 May 2022 18:48:22 -0400 Subject: [PATCH 109/150] arrow-cpp: 7.0.0 -> 8.0.0 --- .../libraries/arrow-cpp/default.nix | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 806df81a708..5fb8746efae 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -19,6 +19,7 @@ , grpc , gtest , jemalloc +, libbacktrace , lz4 , minio , ninja @@ -69,21 +70,20 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "7.0.0"; + version = "8.0.0"; src = fetchurl { - url = - "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-6PSbFJoV7O9OQPz6sbh8ETxrHuGGAFwWnlzfldMamd4="; + url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; + hash = "sha256-rZoFcFEXyYnBFrrprHBJL+AVBQ4bgPsOOP3ktdhjqqM="; }; sourceRoot = "apache-arrow-${version}/cpp"; ${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = jemalloc.src; + # versions are all taken from + # https://github.com/apache/arrow/blob/apache-arrow-8.0.0/cpp/thirdparty/versions.txt + ARROW_MIMALLOC_URL = fetchFromGitHub { - # From - # ./cpp/cmake_modules/ThirdpartyToolchain.cmake - # ./cpp/thirdparty/versions.txt owner = "microsoft"; repo = "mimalloc"; rev = "v1.7.3"; @@ -93,8 +93,15 @@ stdenv.mkDerivation rec { ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = "aeec9c872c8b475dedd7781336710f2dd2666cb2"; - hash = "sha256-vWKdJkieKhaxyAJhijXUmD7NmNvMWd79PskQojulA1w="; + rev = "7d1778c3b38d63db7cec7145d939f40bc5d859d1"; + hash = "sha256-89AysBUVnTdWyMPazeJegnQ6WEH90Ns7qQInZLMSXY4="; + }; + + ARROW_SUBSTRAIT_URL = fetchFromGitHub { + owner = "substrait-io"; + repo = "substrait"; + rev = "e1b4c04a1b518912f4c4065b16a1b2c0ac8e14cf"; + hash = "sha256-56FSjDngsROSHLjMv+OYAIYqphEu3GzgIMHbgh/ZQw0="; }; patches = [ @@ -115,7 +122,10 @@ stdenv.mkDerivation rec { gflags glog gtest + libbacktrace lz4 + nlohmann_json # alternative JSON parser to rapidjson + protobuf # substrait requires protobuf rapidjson re2 snappy @@ -150,6 +160,9 @@ stdenv.mkDerivation rec { "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" "-DARROW_BUILD_TESTS=ON" + "-DARROW_BUILD_INTEGRATION=ON" + "-DARROW_BUILD_UTILITIES=ON" + "-DARROW_EXTRA_ERROR_CONTEXT=ON" "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" "-DThrift_SOURCE=AUTO" # search for Thrift using pkg-config (ThriftConfig.cmake requires OpenSSL and libevent) @@ -168,8 +181,10 @@ stdenv.mkDerivation rec { # Disable Python for static mode because openblas is currently broken there. "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" "-DARROW_USE_GLOG=ON" + "-DARROW_WITH_BACKTRACE=ON" "-DARROW_WITH_BROTLI=ON" "-DARROW_WITH_LZ4=ON" + "-DARROW_WITH_NLOHMANN_JSON=ON" "-DARROW_WITH_SNAPPY=ON" "-DARROW_WITH_UTF8PROC=ON" "-DARROW_WITH_ZLIB=ON" @@ -177,8 +192,10 @@ stdenv.mkDerivation rec { "-DARROW_MIMALLOC=ON" # Parquet options: "-DARROW_PARQUET=ON" + "-DARROW_SUBSTRAIT=ON" "-DPARQUET_BUILD_EXECUTABLES=ON" "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}" + "-DARROW_FLIGHT_TESTING=${if enableFlight then "ON" else "OFF"}" "-DARROW_S3=${if enableS3 then "ON" else "OFF"}" "-DARROW_GCS=${if enableGcs then "ON" else "OFF"}" ] ++ lib.optionals (!enableShared) [ From e0f70681f9ee98371cc74cb28ec906fcf357b96c Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 7 May 2022 08:13:26 -0400 Subject: [PATCH 110/150] python3Packages.pyarrow: enable s3 --- .../development/python-modules/pyarrow/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index cfe63a34d85..141d90a5a97 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -47,8 +47,10 @@ buildPythonPackage rec { PYARROW_WITH_DATASET = zero_or_one true; PYARROW_WITH_FLIGHT = zero_or_one _arrow-cpp.enableFlight; - PYARROW_WITH_PARQUET = zero_or_one true; PYARROW_WITH_HDFS = zero_or_one true; + PYARROW_WITH_PARQUET = zero_or_one true; + PYARROW_WITH_PLASMA = zero_or_one (!stdenv.isDarwin); + PYARROW_WITH_S3 = zero_or_one _arrow-cpp.enableS3; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" @@ -73,6 +75,11 @@ buildPythonPackage rec { # enabled in nixpkgs. # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 "--deselect=pyarrow/tests/test_memory.py::test_env_var" + # these tests require access to s3 via the internet + "--deselect=pyarrow/tests/test_fs.py::test_resolve_s3_region" + "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws" + "--deselect=pyarrow/tests/test_fs.py::test_s3_real_aws_region_selection" + "--deselect=pyarrow/tests/test_fs.py::test_s3_options" ] ++ lib.optionals stdenv.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" @@ -84,16 +91,17 @@ buildPythonPackage rec { rm -r pyarrow/!(tests) ''; - pythonImportsCheck = map (module: "pyarrow.${module}") [ + pythonImportsCheck = [ "pyarrow" ] ++ map (module: "pyarrow.${module}") ([ "compute" "csv" "dataset" + "feather" "flight" "fs" "hdfs" "json" "parquet" - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ "plasma" ]); meta = with lib; { description = "A cross-language development platform for in-memory data"; From 3bf217495b166a0513788c16aa96efba5425d6bc Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 7 May 2022 13:04:51 -0400 Subject: [PATCH 111/150] python3Packages.db-dtypes: patch to support arrow 8 --- .../python-modules/db-dtypes/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/db-dtypes/default.nix b/pkgs/development/python-modules/db-dtypes/default.nix index 883439aba46..636882e4edf 100644 --- a/pkgs/development/python-modules/db-dtypes/default.nix +++ b/pkgs/development/python-modules/db-dtypes/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchpatch +, fetchFromGitHub , numpy , packaging , pandas @@ -12,11 +13,20 @@ buildPythonPackage rec { pname = "db-dtypes"; version = "1.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "3070d1a8d86ff0b5d9b16f15c5fab9c18893c6b3d5723cd95ee397b169049454"; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-db-dtypes-pandas"; + rev = "v${version}"; + hash = "sha256-7u/E0ICiz7LQfuplm/mkGlWrgGEPqeMwM3CUhfH6868="; }; + patches = [ + (fetchpatch { + url = "https://github.com/googleapis/python-db-dtypes-pandas/commit/fb30adfd427d3df9919df00b096210ba1eb1b91d.patch"; + sha256 = "sha256-39kZtYGbn3U1WXiDTczki5EM6SjUlSRXz8UMcdTU20g="; + }) + ]; + propagatedBuildInputs = [ numpy packaging From 15751e9f727b7557ace90a03d52cfb0464dbdc12 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 7 May 2022 13:13:35 -0400 Subject: [PATCH 112/150] python3Packages.google-cloud-bigquery: patch for arrow 8 and parallelize tests --- .../python-modules/google-cloud-bigquery/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 3a5142a9cef..a98bac95963 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -16,6 +16,7 @@ , proto-plus , psutil , pyarrow +, pytest-xdist }: buildPythonPackage rec { @@ -28,6 +29,11 @@ buildPythonPackage rec { sha256 = "sha256-UmW6BEV44Ucdg/hUGSQk/kyDnB+Hsyx4q3AXTQe89hI="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'pyarrow >= 3.0.0, < 8.0dev' 'pyarrow >= 3.0.0, < 9.0dev' + ''; + propagatedBuildInputs = [ google-cloud-core google-cloud-bigquery-storage @@ -47,6 +53,7 @@ buildPythonPackage rec { google-cloud-datacatalog google-cloud-storage pytestCheckHook + pytest-xdist ]; # prevent google directory from shadowing google imports From e4fb3cb6894368f2bd472df7d4f56e957fa4206d Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 8 May 2022 09:23:15 -0400 Subject: [PATCH 113/150] python3Packages.apache-beam: patch in upstream deprecation fix --- .../development/python-modules/apache-beam/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 8d774410ca3..e3545ee0e6d 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -5,6 +5,7 @@ , dill , fastavro , fetchFromGitHub +, fetchpatch , freezegun , grpcio , grpcio-tools @@ -51,6 +52,15 @@ buildPythonPackage rec { sha256 = "sha256-FmfTxRLqXUHhhAZIxCRx2+phX0bmU5rIHaftBU4yBJY="; }; + patches = [ + # patch in the pyarrow.Table.to_batches(max_chunksize=...) argument fix + (fetchpatch { + url = "https://github.com/apache/beam/commit/2418a14ee99ff490d1c82944043f97f37ec97a85.patch"; + sha256 = "sha256-G8ARBBf7nmF46P2ncnlteGFnPWq5iCqZDfuaosre9jY="; + stripLen = 2; + }) + ]; + # See https://github.com/NixOS/nixpkgs/issues/156957. postPatch = '' substituteInPlace setup.py \ From 9254e550a8518d6f78a920c980bfd10ffddb539c Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 10 May 2022 16:57:00 +0300 Subject: [PATCH 114/150] luaPackages: add new packages cldr, fluent, and loadkit These are new dependencies for SILE, currently needed by the flake in the upstream repo and will be needed by the stable package in this repo on the next release --- maintainers/scripts/luarocks-packages.csv | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index bf16423a1c7..e743675be50 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -6,6 +6,7 @@ basexx,https://github.com/teto/basexx.git,,,,, binaryheap,https://github.com/Tieske/binaryheap.lua,,,,,vcunat busted,,,,,, cassowary,,,,,,marsam alerque +cldr,,,,,,alerque compat53,,,,0.7-1,,vcunat cosmo,,,,,,marsam coxpcall,,,,1.17.0-1,, @@ -14,6 +15,7 @@ cyrussasl,https://github.com/JorjBauer/lua-cyrussasl.git,,,,, digestif,https://github.com/astoff/digestif.git,,,0.2-1,lua5_3, dkjson,,,,,, fifo,,,,,, +fluent,,,,,,alerque gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,lua5_1, http,,,,0.3-0,,vcunat inspect,,,,,, @@ -24,6 +26,7 @@ linenoise,https://github.com/hoelzro/lua-linenoise.git,,,,, ljsyscall,,,,,lua5_1,lblasc lmathx,,,,,lua5_3,alexshpilkin lmpfrlib,,,,,lua5_3,alexshpilkin +loadkit,,,,,,alerque lpeg,,,,,,vyp lpeg_patterns,,,,,, lpeglabel,,,,,, From 3b538cd79012f73261743a525e1022a0a1532f36 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 10 May 2022 17:00:10 +0300 Subject: [PATCH 115/150] luaPackages: update (add cldr, fluent, loadkit; bump cassowary) These are extracted from: nix-shell maintainers/scripts/update-luarocks-shell.nix --run maintainers/scripts/update-luarocks-packages ... but reduced to just the LuaRocks that are *only* SILE dependencies so I'm confident of bumping them in this context. --- .../lua-modules/generated-packages.nix | 116 ++++++++++++++++-- 1 file changed, 109 insertions(+), 7 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 745ded10071..c89493d94e1 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -182,17 +182,17 @@ cassowary = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "cassowary"; - version = "2.3.1-2"; + version = "2.3.2-1"; knownRockspec = (fetchurl { - url = "https://luafr.org/luarocks/cassowary-2.3.1-2.rockspec"; - sha256 = "04y882f9ai1jhk0zwla2g0fvl56a75rwnxhsl9r3m0qa5i0ia1i5"; + url = "https://luarocks.org/cassowary-2.3.2-1.rockspec"; + sha256 = "0c6sflm8zpgbcdj47s3rd34h69h3nqcciaaqd1wdx5m0lwc3mii0"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/sile-typesetter/cassowary.lua", - "rev": "c022a120dee86979d18e4c4613e55e721c632d80", - "date": "2021-07-19T14:37:34+03:00", - "path": "/nix/store/rzsbr6gqg8vhchl24ma3p1h4slhk0xp7-cassowary.lua", - "sha256": "1r668qcvd2a1rx17xp7ajp5wjhyvh2fwn0c60xmw0mnarjb5w1pq", + "rev": "e33195f08438c15d725d283979165fda7c6c3321", + "date": "2022-04-22T11:23:46+03:00", + "path": "/nix/store/51mb376xh9pnh2krk08ljmy01zhr9y3z-cassowary.lua", + "sha256": "1lvl40dhzmbqqjrqpjgqlg2kl993fpdy1mpc6d1610zpa9znx1f0", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, @@ -211,6 +211,40 @@ buildLuarocksPackage { }; }) {}; +cldr = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, penlight +}: +buildLuarocksPackage { + pname = "cldr"; + version = "0.2.0-0"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/cldr-0.2.0-0.rockspec"; + sha256 = "1vjwrlrdy10bacn0324fvs4sx85xryyg7npw2mp1k9kmasfr8r1s"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/alerque/cldr-lua.git", + "rev": "51e4760838c0a83ef1a76d0a0fb2e9f964069a50", + "date": "2022-04-16T14:46:14+03:00", + "path": "/nix/store/7jziz15bjm27zw9i3arrxprglakz8n4d-cldr-lua", + "sha256": "1i22mcs50z99850j47gkgwyf0ahl4yh1732b4x3davjwy2fwak1x", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua penlight ]; + + meta = { + homepage = "https://github.com/alerque/cldr-lua"; + description = "Lua interface to Unicode CLDR data"; + maintainers = with lib.maintainers; [ alerque ]; + license.fullName = "MIT/ICU"; + }; +}) {}; + compat53 = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchurl, lua }: @@ -435,6 +469,40 @@ buildLuarocksPackage { }; }) {}; +fluent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua, cldr, luaepnf, penlight +}: +buildLuarocksPackage { + pname = "fluent"; + version = "0.2.0-0"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/fluent-0.2.0-0.rockspec"; + sha256 = "1x3nk8xdf923rvdijr0jx8v6w3wxxfch7ri3kxca0pw80b5bc2fa"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/alerque/fluent-lua.git", + "rev": "e1cd4130e460bcd52f9118b7d9f9a72d2e8b902c", + "date": "2022-04-16T23:08:20+03:00", + "path": "/nix/store/flxlnrzg6rx75qikiggmy494npx59p0b-fluent-lua", + "sha256": "12js8l4hcxhziza0sry0f01kfm8f8m6kx843dmcky36z1y2mccmq", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua cldr luaepnf penlight ]; + + meta = { + homepage = "https://github.com/alerque/fluent-lua"; + description = "Lua implementation of Project Fluent"; + maintainers = with lib.maintainers; [ alerque ]; + license.fullName = "MIT"; + }; +}) {}; + gitsigns-nvim = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, lua, plenary-nvim }: @@ -710,6 +778,40 @@ buildLuarocksPackage { }; }) {}; +loadkit = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "loadkit"; + version = "1.1.0-1"; + knownRockspec = (fetchurl { + url = "https://luarocks.org/loadkit-1.1.0-1.rockspec"; + sha256 = "08fx0xh90r2zvjlfjkyrnw2p95xk1a0qgvlnq4siwdb2mm6fq12l"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/leafo/loadkit.git", + "rev": "c6c712dab45f6c568821f9ed7b49c790a44d12e7", + "date": "2021-01-07T14:41:10-08:00", + "path": "/nix/store/xvwq7b2za8ciww1gjw7vnspg9183xmfa-loadkit", + "sha256": "15znriijs7izf9f6vmhr6dnvw3pzr0yr0mh6ah41fmdwjqi7jzcz", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/leafo/loadkit"; + description = "Loadkit allows you to load arbitrary files within the Lua package path"; + maintainers = with lib.maintainers; [ alerque ]; + license.fullName = "MIT"; + }; +}) {}; + lpeg = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchurl, lua }: From 08a0f925e04bc949c4041c258144b2d45c4946ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 9 May 2022 20:27:40 +0000 Subject: [PATCH 116/150] getmail6: 6.18.7 -> 6.18.8 https://github.com/getmail6/getmail6/releases/tag/v6.18.8 --- pkgs/tools/networking/getmail6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index c31fe48d5b5..e143760c498 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.18.7"; + version = "6.18.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-JghiV0zC9xtOGuGcf0lY5e73/04n6Bat/xOGgXyDWJk="; + hash = "sha256-MIK5++3SaGm1BMpU8G4X7n/SCBw+N39U44cyX65tPcQ="; }; # needs a Docker setup From 29d9779e9b267df3879e7cbc59e8b49fde084523 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 14:38:56 +0000 Subject: [PATCH 117/150] python310Packages.ansible-compat: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/ansible-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 743ebab42f1..88ce74ad4cd 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "2.0.2"; + version = "2.0.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xlGZXcMj7xRbq4V/7mVA/ryIH7cbf+r+gWPUnicxY6U="; + sha256 = "sha256-oRV+QFneQYefP2XV7WK/ND/lvUUoYQHi0pcf/lfjqKU="; }; nativeBuildInputs = [ From 74c9d7985b2a6457aa7e42a1aa71db3ec3e85cb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 14:26:22 +0000 Subject: [PATCH 118/150] python310Packages.zope_lifecycleevent: 4.3 -> 4.4 --- .../python-modules/zope_lifecycleevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 1b3e288ba25..7b3852239e8 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zope.lifecycleevent"; - version = "4.3"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "7ec39087cc1524e55557e7d9dc6295eb1b95b09b125e293c0e2dd068574f0aee"; + sha256 = "sha256-9ahU6J/5fe6ke/vqN4u77yeJ0uDMkKHB2lfZChzmfLU="; }; propagatedBuildInputs = [ zope_event zope_component ]; From d339433f8d018d9e2afa27df5fdf3959f80ee770 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 10 May 2022 14:45:42 +0000 Subject: [PATCH 119/150] =?UTF-8?q?wireplumber:=200.4.9=20=E2=86=92=200.4.?= =?UTF-8?q?10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/pipewire/wireplumber.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 7b9759f553b..f7b26d2809a 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.9"; + version = "0.4.10"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-U92ozuEUFJA416qKnalVowJuBjLRdORHfhmznGf1IFU="; + sha256 = "sha256-Z5Uqjw05SdEU9bGLuhdS+hDv7Fgqx4oW92k4AG1p3Ug="; }; nativeBuildInputs = [ From 96e5ab89864c50037842880890d52a7c4a9b8570 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 30 Apr 2022 11:28:31 -0400 Subject: [PATCH 120/150] python3Packages.ibis-framework: allow setting features for backend deps --- .../python-modules/ibis-framework/default.nix | 52 ++++++++++++------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index dee63fb0856..cf018e8b7cc 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -5,37 +5,45 @@ , pytestCheckHook , atpublic , cached-property -, clickhouse-driver , click +, clickhouse-cityhash +, clickhouse-driver , dask , datafusion , duckdb , duckdb-engine +, geoalchemy2 +, geopandas , graphviz , importlib-metadata +, lz4 , multipledispatch , numpy +, packaging , pandas , parsy , poetry-core , poetry-dynamic-versioning +, psycopg2 , pyarrow , pydantic +, pymysql +, pyspark , pytest-benchmark +, pytest-randomly , pytest-mock , pytest-xdist , python , pytz , regex -, requests +, shapely , sqlalchemy , sqlite , tabulate , toolz }: let - # ignore tests for which dependencies are not available - backends = [ + testBackends = [ "dask" "datafusion" "duckdb" @@ -70,24 +78,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic cached-property - clickhouse-driver - dask - datafusion - duckdb - duckdb-engine - graphviz importlib-metadata multipledispatch numpy + packaging pandas parsy poetry-dynamic-versioning - pyarrow pydantic pytz regex - requests - sqlalchemy tabulate toolz ]; @@ -97,9 +97,9 @@ buildPythonPackage rec { click pytest-benchmark pytest-mock + pytest-randomly pytest-xdist - sqlite - ]; + ] ++ lib.concatMap (name: passthru.extras-require.${name}) testBackends; preBuild = '' # setup.py exists only for developer convenience and is automatically generated @@ -109,7 +109,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--dist=loadgroup" "-m" - "'${lib.concatStringsSep " or " backends} or core'" + "'${lib.concatStringsSep " or " testBackends} or core'" ]; preCheck = '' @@ -125,7 +125,7 @@ buildPythonPackage rec { find "$IBIS_TEST_DATA_DIRECTORY" -type f -exec chmod u+rw {} + # load data - for backend in ${lib.concatStringsSep " " backends}; do + for backend in ${lib.concatStringsSep " " testBackends}; do ${python.interpreter} ci/datamgr.py load "$backend" done ''; @@ -136,7 +136,23 @@ buildPythonPackage rec { pythonImportsCheck = [ "ibis" - ] ++ (map (backend: "ibis.backends.${backend}") backends); + ] ++ map (backend: "ibis.backends.${backend}") testBackends; + + passthru = { + extras-require = { + clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 ]; + dask = [ dask pyarrow ]; + datafusion = [ datafusion ]; + duckdb = [ duckdb duckdb-engine sqlalchemy ]; + geospatial = [ geoalchemy2 geopandas shapely ]; + mysql = [ pymysql sqlalchemy ]; + pandas = [ ]; + postgres = [ psycopg2 sqlalchemy ]; + pyspark = [ pyarrow pyspark ]; + sqlite = [ sqlalchemy sqlite ]; + visualization = [ graphviz-nox ]; + }; + }; meta = with lib; { description = "Productivity-centric Python Big Data Framework"; From 7bfe1e3b52944e520109ca94c1df3d1f2826a128 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Tue, 3 May 2022 05:17:13 -0400 Subject: [PATCH 121/150] python3Packages.ibis-framework: depend on graphviz-nox instead of graphviz --- pkgs/development/python-modules/ibis-framework/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index cf018e8b7cc..c5dfcc13e5c 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -14,7 +14,7 @@ , duckdb-engine , geoalchemy2 , geopandas -, graphviz +, graphviz-nox , importlib-metadata , lz4 , multipledispatch From 37578b911e95aa092c1897d38df3732301063fce Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 10 May 2022 10:49:53 -0400 Subject: [PATCH 122/150] rcshist: use webarchive of source tgz (#172339) Upstream archive has no version and is not reproducible. I doubt version 1.05 would ever appear, but still. Suggested-By: @SuperSandro2000 Co-authored-by: Dmitry Bogatov --- pkgs/applications/version-management/rcshist/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/applications/version-management/rcshist/default.nix index cd176972277..a9c7bbefc13 100644 --- a/pkgs/applications/version-management/rcshist/default.nix +++ b/pkgs/applications/version-management/rcshist/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { version = "1.04"; src = fetchurl { - url = "https://invisible-island.net/datafiles/release/rcshist.tar.gz"; + url = "https://web.archive.org/web/20220508220019/https://invisible-island.net/datafiles/release/rcshist.tar.gz"; sha256 = "01ab3xwgm934lxr8bm758am3vxwx4hxx7cc9prbgqj5nh30vdg1n"; }; From b9a74a1b67200f83f3f5e2b038eb34701c0c9edb Mon Sep 17 00:00:00 2001 From: Lara Date: Wed, 27 Oct 2021 07:46:58 +0000 Subject: [PATCH 123/150] snipe-it: init at 5.4.3 Snipe-IT is a web-based open source asset management system. https://snipeitapp.com/ --- .../web-apps/snipe-it/composer-env.nix | 244 +++ .../servers/web-apps/snipe-it/composition.nix | 15 + pkgs/servers/web-apps/snipe-it/default.nix | 47 + .../web-apps/snipe-it/php-packages.nix | 1348 +++++++++++++++++ pkgs/servers/web-apps/snipe-it/update.sh | 50 + pkgs/top-level/all-packages.nix | 2 + 6 files changed, 1706 insertions(+) create mode 100644 pkgs/servers/web-apps/snipe-it/composer-env.nix create mode 100644 pkgs/servers/web-apps/snipe-it/composition.nix create mode 100644 pkgs/servers/web-apps/snipe-it/default.nix create mode 100644 pkgs/servers/web-apps/snipe-it/php-packages.nix create mode 100755 pkgs/servers/web-apps/snipe-it/update.sh diff --git a/pkgs/servers/web-apps/snipe-it/composer-env.nix b/pkgs/servers/web-apps/snipe-it/composer-env.nix new file mode 100644 index 00000000000..71714b76400 --- /dev/null +++ b/pkgs/servers/web-apps/snipe-it/composer-env.nix @@ -0,0 +1,244 @@ +# This file originates from composer2nix + +{ stdenv, lib, writeTextFile, fetchurl, php, unzip, phpPackages }: + +let + inherit (phpPackages) composer; + + filterSrc = src: + builtins.filterSource (path: type: type != "directory" || (baseNameOf path != ".git" && baseNameOf path != ".git" && baseNameOf path != ".svn")) src; + + buildZipPackage = { name, src }: + stdenv.mkDerivation { + inherit name src; + nativeBuildInputs = [ unzip ]; + buildCommand = '' + shopt -s dotglob + unzip $src + baseDir=$(find . -type d -mindepth 1 -maxdepth 1) + cd $baseDir + mkdir -p $out + mv * $out + ''; + }; + + buildPackage = + { name + , src + , packages ? {} + , devPackages ? {} + , buildInputs ? [] + , symlinkDependencies ? false + , executable ? false + , removeComposerArtifacts ? false + , postInstall ? "" + , noDev ? false + , composerExtraArgs ? "" + , unpackPhase ? "true" + , buildPhase ? "true" + , ...}@args: + + let + reconstructInstalled = writeTextFile { + name = "reconstructinstalled.php"; + executable = true; + text = '' + #! ${php}/bin/php + + ''; + }; + + constructBin = writeTextFile { + name = "constructbin.php"; + executable = true; + text = '' + #! ${php}/bin/php + + ''; + }; + + bundleDependencies = dependencies: + lib.concatMapStrings (dependencyName: + let + dependency = dependencies.${dependencyName}; + in + '' + ${if dependency.targetDir == "" then '' + vendorDir="$(dirname ${dependencyName})" + mkdir -p "$vendorDir" + ${if symlinkDependencies then + ''ln -s "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"'' + else + ''cp -av "${dependency.src}" "$vendorDir/$(basename "${dependencyName}")"'' + } + '' else '' + namespaceDir="${dependencyName}/$(dirname "${dependency.targetDir}")" + mkdir -p "$namespaceDir" + ${if symlinkDependencies then + ''ln -s "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"'' + else + ''cp -av "${dependency.src}" "$namespaceDir/$(basename "${dependency.targetDir}")"'' + } + ''} + '') (builtins.attrNames dependencies); + + extraArgs = removeAttrs args [ "packages" "devPackages" "buildInputs" ]; + in + stdenv.mkDerivation ({ + buildInputs = [ php composer ] ++ buildInputs; + + inherit unpackPhase buildPhase; + + installPhase = '' + ${if executable then '' + mkdir -p $out/share/php + cp -av $src $out/share/php/$name + chmod -R u+w $out/share/php/$name + cd $out/share/php/$name + '' else '' + cp -av $src $out + chmod -R u+w $out + cd $out + ''} + + # Remove unwanted files + rm -f *.nix + + export HOME=$TMPDIR + + # Remove the provided vendor folder if it exists + rm -Rf vendor + + # If there is no composer.lock file, compose a dummy file. + # Otherwise, composer attempts to download the package.json file from + # the registry which we do not want. + if [ ! -f composer.lock ] + then + cat > composer.lock < vendor/composer/installed.json + + # Copy or symlink the provided dependencies + cd vendor + ${bundleDependencies packages} + ${lib.optionalString (!noDev) (bundleDependencies devPackages)} + cd .. + + # Reconstruct autoload scripts + # We use the optimize feature because Nix packages cannot change after they have been built + # Using the dynamic loader for a Nix package is useless since there is nothing to dynamically reload. + composer dump-autoload --optimize ${lib.optionalString noDev "--no-dev"} ${composerExtraArgs} + + # Run the install step as a validation to confirm that everything works out as expected + composer install --optimize-autoloader ${lib.optionalString noDev "--no-dev"} ${composerExtraArgs} + + ${lib.optionalString executable '' + # Reconstruct the bin/ folder if we deploy an executable project + ${php}/bin/php ${constructBin} composer.json + ln -s $(pwd)/vendor/bin $out/bin + ''} + + ${lib.optionalString (!symlinkDependencies) '' + # Patch the shebangs if possible + if [ -d $(pwd)/vendor/bin ] + then + # Look for all executables in bin/ + for i in $(pwd)/vendor/bin/* + do + # Look for their location + realFile=$(readlink -f "$i") + + # Restore write permissions + chmod u+wx "$(dirname "$realFile")" + chmod u+w "$realFile" + + # Patch shebang + sed -e "s|#!/usr/bin/php|#!${php}/bin/php|" \ + -e "s|#!/usr/bin/env php|#!${php}/bin/php|" \ + "$realFile" > tmp + mv tmp "$realFile" + chmod u+x "$realFile" + done + fi + ''} + + if [ "$removeComposerArtifacts" = "1" ] + then + # Remove composer stuff + rm -f composer.json composer.lock + fi + + # Execute post install hook + runHook postInstall + ''; + } // extraArgs); +in +{ + inherit filterSrc; + composer = lib.makeOverridable composer; + buildZipPackage = lib.makeOverridable buildZipPackage; + buildPackage = lib.makeOverridable buildPackage; +} diff --git a/pkgs/servers/web-apps/snipe-it/composition.nix b/pkgs/servers/web-apps/snipe-it/composition.nix new file mode 100644 index 00000000000..d8df4b81fa3 --- /dev/null +++ b/pkgs/servers/web-apps/snipe-it/composition.nix @@ -0,0 +1,15 @@ +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, noDev ? false, php ? pkgs.php, phpPackages ? pkgs.phpPackages}: + +let + composerEnv = import ./composer-env.nix { + inherit (pkgs) stdenv lib writeTextFile fetchurl unzip; + inherit php phpPackages; + }; +in +import ./php-packages.nix { + inherit composerEnv noDev; + inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn; +} + diff --git a/pkgs/servers/web-apps/snipe-it/default.nix b/pkgs/servers/web-apps/snipe-it/default.nix new file mode 100644 index 00000000000..43a1b8bbce6 --- /dev/null +++ b/pkgs/servers/web-apps/snipe-it/default.nix @@ -0,0 +1,47 @@ +{ pkgs, stdenv, lib, fetchFromGitHub, dataDir ? "/var/lib/snipe-it" }: + +let + package = (import ./composition.nix { + inherit pkgs; + inherit (stdenv.hostPlatform) system; + noDev = true; # Disable development dependencies + # Requires PHP >= 7.4 and PHP < 8.0 as of v5.4.3 + # https://snipe-it.readme.io/docs/requirements + php = pkgs.php74; + phpPackages = pkgs.php74Packages; + }).overrideAttrs (attrs : { + installPhase = attrs.installPhase + '' + rm -R $out/storage $out/public/uploads $out/bootstrap/cache + ln -s ${dataDir}/.env $out/.env + ln -s ${dataDir}/storage $out/ + ln -s ${dataDir}/public/uploads $out/public/uploads + ln -s ${dataDir}/bootstrap/cache $out/bootstrap/cache + chmod +x $out/artisan + ''; + }); + +in package.override rec { + pname = "snipe-it"; + version = "5.4.3"; + + src = fetchFromGitHub { + owner = "snipe"; + repo = pname; + rev = "v${version}"; + sha256 = "053cm5vb0806sj61g0zf0xqqzlchgkdj8zwkry07mhjdbp1k8k7n"; + }; + + meta = with lib; { + description = "A free open source IT asset/license management system "; + longDescription = '' + Snipe-IT was made for IT asset management, to enable IT departments to track + who has which laptop, when it was purchased, which software licenses and accessories + are available, and so on. + Details for snipe-it can be found on the official website at https://snipeitapp.com/. + ''; + homepage = "https://snipeitapp.com/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ yayayayaka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/web-apps/snipe-it/php-packages.nix b/pkgs/servers/web-apps/snipe-it/php-packages.nix new file mode 100644 index 00000000000..66a655a0338 --- /dev/null +++ b/pkgs/servers/web-apps/snipe-it/php-packages.nix @@ -0,0 +1,1348 @@ +{composerEnv, fetchurl, fetchgit ? null, fetchhg ? null, fetchsvn ? null, noDev ? false}: + +let + packages = { + "adldap2/adldap2" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "adldap2-adldap2-b2203d800c5932f975abc213c659428697e27cd9"; + src = fetchurl { + url = "https://api.github.com/repos/Adldap2/Adldap2/zipball/b2203d800c5932f975abc213c659428697e27cd9"; + sha256 = "028lkx1hrkp4dqi8f3rcbhyjlk61lajz2fqw8xmlzyhip9l6ivq3"; + }; + }; + }; + "alek13/slack" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "alek13-slack-9db79a622803bf7baf0efafb50e37b900882f7fb"; + src = fetchurl { + url = "https://api.github.com/repos/php-slack/slack/zipball/9db79a622803bf7baf0efafb50e37b900882f7fb"; + sha256 = "0h70p0va4r20lw65asa68zv73w9047hyal0xa082p0wjihim5k1s"; + }; + }; + }; + "asm89/stack-cors" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "asm89-stack-cors-73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"; + src = fetchurl { + url = "https://api.github.com/repos/asm89/stack-cors/zipball/73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"; + sha256 = "1idpisw39ba2dic9jl2s2yrkdgbyny9dfxf0qdr5i0wfvvlmbdih"; + }; + }; + }; + "aws/aws-sdk-php" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "aws-aws-sdk-php-6c919bc226f7ff3fbcbce948f31e618066d02ad0"; + src = fetchurl { + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/6c919bc226f7ff3fbcbce948f31e618066d02ad0"; + sha256 = "1wicn300x19v77dq11pwb6v91h8z11fqjrqrr8b9ncahyf5lg0aq"; + }; + }; + }; + "bacon/bacon-qr-code" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "bacon-bacon-qr-code-5a91b62b9d37cee635bbf8d553f4546057250bee"; + src = fetchurl { + url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/5a91b62b9d37cee635bbf8d553f4546057250bee"; + sha256 = "0rb88fg083790bbciffniff7xqkgzm091szm131afhkl8rr7pnkq"; + }; + }; + }; + "barryvdh/laravel-debugbar" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "barryvdh-laravel-debugbar-70b89754913fd89fef16d0170a91dbc2a5cd633a"; + src = fetchurl { + url = "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/70b89754913fd89fef16d0170a91dbc2a5cd633a"; + sha256 = "1sqm1afhmf0fgyvvwa760f0d5ifnd84fv83v40n28lp534xsibz5"; + }; + }; + }; + "defuse/php-encryption" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "defuse-php-encryption-77880488b9954b7884c25555c2a0ea9e7053f9d2"; + src = fetchurl { + url = "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2"; + sha256 = "1lcvpg56nw72cxyh6sga7fx94qw9l0l1y78z7y7ny3hgdniwhihx"; + }; + }; + }; + "doctrine/annotations" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-annotations-e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f"; + sha256 = "090vizq3xy9p151cjx5fa2izgvypc756wrnclswiiiac4h6mzpyf"; + }; + }; + }; + "doctrine/cache" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-cache-3bb5588cec00a0268829cc4a518490df6741af9d"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d"; + sha256 = "0r9fhv0y79ma7a5llmj1skycflnwbxyyrblkavjj6svld46li94q"; + }; + }; + }; + "doctrine/collections" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-collections-55f8b799269a1a472457bd1a41b4f379d4cfba4a"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/collections/zipball/55f8b799269a1a472457bd1a41b4f379d4cfba4a"; + sha256 = "1kalndrc2g8g82524yg0rcn4xzrl5a9hi0x6g6ixqa6afzgzmvbs"; + }; + }; + }; + "doctrine/common" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-common-f3812c026e557892c34ef37f6ab808a6b567da7f"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/common/zipball/f3812c026e557892c34ef37f6ab808a6b567da7f"; + sha256 = "16jf1wzs6ccpw2ny7rkzpf0asdwr1cfzcyw8g5x88i4j9jazn8xa"; + }; + }; + }; + "doctrine/dbal" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-dbal-8dd39d2ead4409ce652fd4f02621060f009ea5e4"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/dbal/zipball/8dd39d2ead4409ce652fd4f02621060f009ea5e4"; + sha256 = "107k0qr3m34cjxy00yhdjmd8liqa8wg729zj4z2jifz26niiy8qs"; + }; + }; + }; + "doctrine/deprecations" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-deprecations-9504165960a1f83cc1480e2be1dd0a0478561314"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314"; + sha256 = "04kpbzk5iw86imspkg7dgs54xx877k9b5q0dfg2h119mlfkvxil6"; + }; + }; + }; + "doctrine/event-manager" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f"; + sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8"; + }; + }; + }; + "doctrine/inflector" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-inflector-4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9"; + sha256 = "0390gkbk3vdjd98h7wjpdv0579swbavrdb6yrlslfdr068g4bmbf"; + }; + }; + }; + "doctrine/instantiator" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-instantiator-d56bf6102915de5702778fe20f2de3b2fe570b5b"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b"; + sha256 = "04rihgfjv8alvvb92bnb5qpz8fvqvjwfrawcjw34pfnfx4jflcwh"; + }; + }; + }; + "doctrine/lexer" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-lexer-c268e882d4dbdd85e36e4ad69e02dc284f89d229"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229"; + sha256 = "12g069nljl3alyk15884nd1jc4mxk87isqsmfj7x6j2vxvk9qchs"; + }; + }; + }; + "doctrine/persistence" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-persistence-7a6eac9fb6f61bba91328f15aa7547f4806ca288"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/persistence/zipball/7a6eac9fb6f61bba91328f15aa7547f4806ca288"; + sha256 = "0mszkf7lxdhbr5b3ibpn7ipyrf6a6kfj283fvh83akyv1mplsl0h"; + }; + }; + }; + "doctrine/reflection" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "doctrine-reflection-fa587178be682efe90d005e3a322590d6ebb59a5"; + src = fetchurl { + url = "https://api.github.com/repos/doctrine/reflection/zipball/fa587178be682efe90d005e3a322590d6ebb59a5"; + sha256 = "1jn3bbzv0pn16aw0kkg0l765wi49zpf5vpirqwmw3viqj9bgj1b5"; + }; + }; + }; + "dragonmantank/cron-expression" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "dragonmantank-cron-expression-65b2d8ee1f10915efb3b55597da3404f096acba2"; + src = fetchurl { + url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2"; + sha256 = "07yqbhf6n4d818gvla60mgg23gichwiafd5ypd70w4b4dlbcxcpl"; + }; + }; + }; + "eduardokum/laravel-mail-auto-embed" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "eduardokum-laravel-mail-auto-embed-83349a6a35560edb1c95e31205e2a848d73196ef"; + src = fetchurl { + url = "https://api.github.com/repos/eduardokum/laravel-mail-auto-embed/zipball/83349a6a35560edb1c95e31205e2a848d73196ef"; + sha256 = "0v1zbyln5ly1fhyr8m6wdm140zy14l71mqjpkij2pacskbbmvij2"; + }; + }; + }; + "egulias/email-validator" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4"; + src = fetchurl { + url = "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4"; + sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck"; + }; + }; + }; + "enshrined/svg-sanitize" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "enshrined-svg-sanitize-e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"; + src = fetchurl { + url = "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"; + sha256 = "1pv8lkpyl0fp0ychfqlds31lpy73pzz9z2rjngxhpvzfka39gchg"; + }; + }; + }; + "erusev/parsedown" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "erusev-parsedown-cb17b6477dfff935958ba01325f2e8a2bfa6dab3"; + src = fetchurl { + url = "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3"; + sha256 = "1iil9v8g03m5vpxxg3a5qb2sxd1cs5c4p5i0k00cqjnjsxfrazxd"; + }; + }; + }; + "fideloper/proxy" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "fideloper-proxy-c073b2bd04d1c90e04dc1b787662b558dd65ade0"; + src = fetchurl { + url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0"; + sha256 = "05jzgjj4fy5p1smqj41b5qxj42zn0mnczvsaacni4fmq174mz4gy"; + }; + }; + }; + "filp/whoops" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "filp-whoops-2edbc73a4687d9085c8f20f398eebade844e8424"; + src = fetchurl { + url = "https://api.github.com/repos/filp/whoops/zipball/2edbc73a4687d9085c8f20f398eebade844e8424"; + sha256 = "1x79vnjdbjk9z2mix75ri56kyc5iwvjv3dyivncg6n3wd80nyfgg"; + }; + }; + }; + "firebase/php-jwt" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "firebase-php-jwt-83b609028194aa042ea33b5af2d41a7427de80e6"; + src = fetchurl { + url = "https://api.github.com/repos/firebase/php-jwt/zipball/83b609028194aa042ea33b5af2d41a7427de80e6"; + sha256 = "16a0nw983x36al7zdcrf6h2m4jmnnvmr4p9znr5yzpchi5zx42ig"; + }; + }; + }; + "fruitcake/laravel-cors" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "fruitcake-laravel-cors-783a74f5e3431d7b9805be8afb60fd0a8f743534"; + src = fetchurl { + url = "https://api.github.com/repos/fruitcake/laravel-cors/zipball/783a74f5e3431d7b9805be8afb60fd0a8f743534"; + sha256 = "13mqhjks048fb5042l0rfrr52rz7knp9gjn8qviw9cx76kllw2c9"; + }; + }; + }; + "guzzlehttp/guzzle" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "guzzlehttp-guzzle-9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"; + src = fetchurl { + url = "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"; + sha256 = "1dlrdpil0173cmx73ghy8iis2j0lk00dzv3n166d0riky21n8djb"; + }; + }; + }; + "guzzlehttp/promises" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "guzzlehttp-promises-8e7d04f1f6450fef59366c399cfad4b9383aa30d"; + src = fetchurl { + url = "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d"; + sha256 = "158wd8nmvvl386c24lkr4jkwdhqpdj0dxdbjwh8iv6a2rgccjr2q"; + }; + }; + }; + "guzzlehttp/psr7" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "guzzlehttp-psr7-337e3ad8e5716c15f9657bd214d16cc5e69df268"; + src = fetchurl { + url = "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268"; + sha256 = "0qpldw2aw55dm275hgavw9h53l5697ahiz7cn2d0fz97l8j7fg9p"; + }; + }; + }; + "intervention/image" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "intervention-image-abbf18d5ab8367f96b3205ca3c89fb2fa598c69e"; + src = fetchurl { + url = "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e"; + sha256 = "1msfpr9bip69bmhg23ka2f43phgb6dq5z604j5psjh3xd86r6c5d"; + }; + }; + }; + "javiereguiluz/easyslugger" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "javiereguiluz-easyslugger-11524a3fd70e3f0c98043755a0ffa228f2529211"; + src = fetchurl { + url = "https://api.github.com/repos/javiereguiluz/EasySlugger/zipball/11524a3fd70e3f0c98043755a0ffa228f2529211"; + sha256 = "12x5cgp3qmz5d9wvgpd6c0whygm9z3y392fdi4kqjlzi3n5yknnp"; + }; + }; + }; + "laminas/laminas-diactoros" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laminas-laminas-diactoros-36ef09b73e884135d2059cc498c938e90821bb57"; + src = fetchurl { + url = "https://api.github.com/repos/laminas/laminas-diactoros/zipball/36ef09b73e884135d2059cc498c938e90821bb57"; + sha256 = "0qzf3890j1976q6f684fydz49gd48kg3hwipzhsw0dgbcgmr8qs6"; + }; + }; + }; + "laminas/laminas-zendframework-bridge" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laminas-laminas-zendframework-bridge-6ede70583e101030bcace4dcddd648f760ddf642"; + src = fetchurl { + url = "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642"; + sha256 = "10cksxv2fzv3d14n8kmij3wvfibddzp1qz65dqgybs1w2fd1n358"; + }; + }; + }; + "laravel/framework" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laravel-framework-505ebcdeaa9ca56d6d7dbf38ed4f53998c973ed0"; + src = fetchurl { + url = "https://api.github.com/repos/laravel/framework/zipball/505ebcdeaa9ca56d6d7dbf38ed4f53998c973ed0"; + sha256 = "0hwjxlzj3hg8zmwslcjkp9jcrbqpxsvyj9fjhqk3j919dwlwwx0z"; + }; + }; + }; + "laravel/helpers" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laravel-helpers-febb10d8daaf86123825de2cb87f789a3371f0ac"; + src = fetchurl { + url = "https://api.github.com/repos/laravel/helpers/zipball/febb10d8daaf86123825de2cb87f789a3371f0ac"; + sha256 = "1axbawm5hamfqvs5a6n4bbjc2fs5q3zwpsf7xrvqirxc4rgrdbgw"; + }; + }; + }; + "laravel/passport" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laravel-passport-011bd500e8ae3d459b692467880a49ff1ecd60c0"; + src = fetchurl { + url = "https://api.github.com/repos/laravel/passport/zipball/011bd500e8ae3d459b692467880a49ff1ecd60c0"; + sha256 = "0aix2nf06xl32iqyhjjfjp7sq9z57v8w8i9qh408cmr78qg28kwv"; + }; + }; + }; + "laravel/slack-notification-channel" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laravel-slack-notification-channel-f428e76b8d0a0a2ff413ab225eeb829b9a8ffc20"; + src = fetchurl { + url = "https://api.github.com/repos/laravel/slack-notification-channel/zipball/f428e76b8d0a0a2ff413ab225eeb829b9a8ffc20"; + sha256 = "1bmn7018j6pi7jfjbzkwpx3qa1b33d8vvm48xjsyci44vkp7swbk"; + }; + }; + }; + "laravel/tinker" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laravel-tinker-04ad32c1a3328081097a181875733fa51f402083"; + src = fetchurl { + url = "https://api.github.com/repos/laravel/tinker/zipball/04ad32c1a3328081097a181875733fa51f402083"; + sha256 = "1h4847a5rq2qdyszvjx6bqw5c0xi2m3pn9x7cqnq7jz7fkzpi5f9"; + }; + }; + }; + "laravelcollective/html" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "laravelcollective-html-ae15b9c4bf918ec3a78f092b8555551dd693fde3"; + src = fetchurl { + url = "https://api.github.com/repos/LaravelCollective/html/zipball/ae15b9c4bf918ec3a78f092b8555551dd693fde3"; + sha256 = "0prkxn874gp2x1hv4nsv30rfrqn5l7ld8qy3ivd3p7n391k7iak6"; + }; + }; + }; + "lcobucci/jwt" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "lcobucci-jwt-3ef8657a78278dfeae7707d51747251db4176240"; + src = fetchurl { + url = "https://api.github.com/repos/lcobucci/jwt/zipball/3ef8657a78278dfeae7707d51747251db4176240"; + sha256 = "03d8ah4xjhq4pikifgbyxlip8pdqwdiypi2aqbx32i98sj2fa4fr"; + }; + }; + }; + "league/commonmark" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-commonmark-2b8185c13bc9578367a5bf901881d1c1b5bbd09b"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/2b8185c13bc9578367a5bf901881d1c1b5bbd09b"; + sha256 = "14hp7vmqag9jh89rcq1mi3hyw01rkmypdbw2p3zsnjq2p8wwh4r5"; + }; + }; + }; + "league/csv" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-csv-f28da6e483bf979bac10e2add384c90ae9983e4e"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/csv/zipball/f28da6e483bf979bac10e2add384c90ae9983e4e"; + sha256 = "13wpdjf0646z1mawi9bh540gvykwx7ry6kd8cyvpnpi1gjxyqzma"; + }; + }; + }; + "league/event" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-event-d2cc124cf9a3fab2bb4ff963307f60361ce4d119"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/event/zipball/d2cc124cf9a3fab2bb4ff963307f60361ce4d119"; + sha256 = "1fc8aj0mpbrnh3b93gn8pypix28nf2gfvi403kfl7ibh5iz6ds5l"; + }; + }; + }; + "league/flysystem" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-flysystem-f3ad69181b8afed2c9edf7be5a2918144ff4ea32"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/f3ad69181b8afed2c9edf7be5a2918144ff4ea32"; + sha256 = "0s4sx4j7c16qkk7m6k2r4ajfjidlv15z18ybxhfmmz4jb4wsmv94"; + }; + }; + }; + "league/flysystem-aws-s3-v3" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972"; + sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab"; + }; + }; + }; + "league/flysystem-cached-adapter" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-flysystem-cached-adapter-d1925efb2207ac4be3ad0c40b8277175f99ffaff"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/d1925efb2207ac4be3ad0c40b8277175f99ffaff"; + sha256 = "1gvp89cl27ypcy4h0qjm04dc5k77jfm95m4paasglzfsi6g40i71"; + }; + }; + }; + "league/mime-type-detection" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-mime-type-detection-3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3"; + sha256 = "0pmq486v2nf6672y2z53cyb3mfrxcc8n7z2ilpzz9zkkf2yb990j"; + }; + }; + }; + "league/oauth2-server" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-oauth2-server-f5698a3893eda9a17bcd48636990281e7ca77b2a"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/oauth2-server/zipball/f5698a3893eda9a17bcd48636990281e7ca77b2a"; + sha256 = "1fi46pi8aiw8jdhdjwq38kxrva9hbk85h5gr5h1ixlxm699vnrsz"; + }; + }; + }; + "masterminds/html5" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "masterminds-html5-9227822783c75406cfe400984b2f095cdf03d417"; + src = fetchurl { + url = "https://api.github.com/repos/Masterminds/html5-php/zipball/9227822783c75406cfe400984b2f095cdf03d417"; + sha256 = "1szy5njj102vql3i9l9qgnx8z40lhn7lgaqkscma9hn478963rbz"; + }; + }; + }; + "maximebf/debugbar" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "maximebf-debugbar-6d51ee9e94cff14412783785e79a4e7ef97b9d62"; + src = fetchurl { + url = "https://api.github.com/repos/maximebf/php-debugbar/zipball/6d51ee9e94cff14412783785e79a4e7ef97b9d62"; + sha256 = "13lh63wnsp2a6564h3if3925x4maf2plkhzyd1byv995g7bhi68i"; + }; + }; + }; + "monolog/monolog" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "monolog-monolog-d7fd7450628561ba697b7097d86db72662f54aef"; + src = fetchurl { + url = "https://api.github.com/repos/Seldaek/monolog/zipball/d7fd7450628561ba697b7097d86db72662f54aef"; + sha256 = "1zi8pprp0jfjvnw4xh5rcbcr8wmqcgrsccl257p25x2n50sggm8l"; + }; + }; + }; + "mtdowling/jmespath.php" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "mtdowling-jmespath.php-9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; + src = fetchurl { + url = "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; + sha256 = "1ig3gi6f8gisagcn876598ps48s86s6m0c82diyksylarg3yn0yd"; + }; + }; + }; + "neitanod/forceutf8" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "neitanod-forceutf8-c1fbe70bfb5ad41b8ec5785056b0e308b40d4831"; + src = fetchurl { + url = "https://api.github.com/repos/neitanod/forceutf8/zipball/c1fbe70bfb5ad41b8ec5785056b0e308b40d4831"; + sha256 = "1fvh2iapy7q22n65p6xkcbxcmp68x917gkv2cb0gs59671fwxsjf"; + }; + }; + }; + "nesbot/carbon" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "nesbot-carbon-93d9db91c0235c486875d22f1e08b50bdf3e6eee"; + src = fetchurl { + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/93d9db91c0235c486875d22f1e08b50bdf3e6eee"; + sha256 = "1xk4bg9imbsm8481mc49111cimanrxswqqkj3bqs4ja8bam6a51z"; + }; + }; + }; + "nikic/php-parser" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "nikic-php-parser-4432ba399e47c66624bc73c8c0f811e5c109576f"; + src = fetchurl { + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f"; + sha256 = "0372c09xdgdr9dhd9m7sblxyqxk9xdk2r9s0i13ja3ascsz3zvpd"; + }; + }; + }; + "nunomaduro/collision" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "nunomaduro-collision-f7c45764dfe4ba5f2618d265a6f1f9c72732e01d"; + src = fetchurl { + url = "https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d"; + sha256 = "1cazbjxl5rqw4cl783nrymhcvjhvwwwjswr5w0si1wfhmpvr349q"; + }; + }; + }; + "nyholm/psr7" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "nyholm-psr7-1461e07a0f2a975a52082ca3b769ca912b816226"; + src = fetchurl { + url = "https://api.github.com/repos/Nyholm/psr7/zipball/1461e07a0f2a975a52082ca3b769ca912b816226"; + sha256 = "1i6v8r9c2gxsjafyy03g339hkc0wcbsdlg47gy6rswg7qc1r91g1"; + }; + }; + }; + "onelogin/php-saml" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "onelogin-php-saml-a7328b11887660ad248ea10952dd67a5aa73ba3b"; + src = fetchurl { + url = "https://api.github.com/repos/onelogin/php-saml/zipball/a7328b11887660ad248ea10952dd67a5aa73ba3b"; + sha256 = "0ycj3n22k5i3h8p7gn0xff6a7smjypazl2k5qvyzg86fjr7s3vfv"; + }; + }; + }; + "opis/closure" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "opis-closure-3d81e4309d2a927abbe66df935f4bb60082805ad"; + src = fetchurl { + url = "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad"; + sha256 = "0hqs6rdkkcggswrgjlispkby2yg4hwn63bl2ma62lnmpfbpwn0sd"; + }; + }; + }; + "paragonie/constant_time_encoding" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "paragonie-constant_time_encoding-f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"; + src = fetchurl { + url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"; + sha256 = "1r1xj3j7s5mskw5gh3ars4dfhvcn7d252gdqgpif80026kj5fvrp"; + }; + }; + }; + "paragonie/random_compat" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "paragonie-random_compat-996434e5492cb4c3edcb9168db6fbb1359ef965a"; + src = fetchurl { + url = "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a"; + sha256 = "0ky7lal59dihf969r1k3pb96ql8zzdc5062jdbg69j6rj0scgkyx"; + }; + }; + }; + "patchwork/utf8" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "patchwork-utf8-e1fa4d4a57896d074c9a8d01742b688d5db4e9d5"; + src = fetchurl { + url = "https://api.github.com/repos/tchwork/utf8/zipball/e1fa4d4a57896d074c9a8d01742b688d5db4e9d5"; + sha256 = "0rarkg8v23y58bc4n6j39wdi6is0p1rgqxnixqlgavcm35xjgnw0"; + }; + }; + }; + "php-http/message-factory" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "php-http-message-factory-a478cb11f66a6ac48d8954216cfed9aa06a501a1"; + src = fetchurl { + url = "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1"; + sha256 = "13drpc83bq332hz0b97whibkm7jpk56msq4yppw9nmrchzwgy7cs"; + }; + }; + }; + "php-parallel-lint/php-console-color" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "php-parallel-lint-php-console-color-b6af326b2088f1ad3b264696c9fd590ec395b49e"; + src = fetchurl { + url = "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e"; + sha256 = "030449mkpxs35y8dk336ls3bfdq3zjnxswnk5khlg45z5147cr3k"; + }; + }; + }; + "php-parallel-lint/php-console-highlighter" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "php-parallel-lint-php-console-highlighter-21bf002f077b177f056d8cb455c5ed573adfdbb8"; + src = fetchurl { + url = "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8"; + sha256 = "013phmp5n6hp6mvlpbqbrih0zd8h7xc152dpzxxf49b0jczxh8y4"; + }; + }; + }; + "phpdocumentor/reflection-common" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "phpdocumentor-reflection-common-1d01c49d4ed62f25aa84a747ad35d5a16924662b"; + src = fetchurl { + url = "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b"; + sha256 = "1wx720a17i24471jf8z499dnkijzb4b8xra11kvw9g9hhzfadz1r"; + }; + }; + }; + "phpdocumentor/reflection-docblock" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "phpdocumentor-reflection-docblock-069a785b2141f5bcf49f3e353548dc1cce6df556"; + src = fetchurl { + url = "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556"; + sha256 = "0qid63bsfjmc3ka54f1ijl4a5zqwf7jmackjyjmbw3gxdnbi69il"; + }; + }; + }; + "phpdocumentor/type-resolver" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "phpdocumentor-type-resolver-6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"; + src = fetchurl { + url = "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"; + sha256 = "01g6mihq5wd1396njjb7ibcdfgk26ix1kmbjb6dlshzav0k3983h"; + }; + }; + }; + "phpoption/phpoption" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "phpoption-phpoption-eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; + src = fetchurl { + url = "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"; + sha256 = "1lk50y8jj2mzbwc2mxfm2xdasxf4axya72nv8wfc1vyz9y5ys3li"; + }; + }; + }; + "phpseclib/phpseclib" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "phpseclib-phpseclib-c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"; + src = fetchurl { + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"; + sha256 = "0yak18zyyjhqd2l5mlgiinw9rf4rrvbyxp2fnivjvm93jymhhl49"; + }; + }; + }; + "phpspec/prophecy" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "phpspec-prophecy-be1996ed8adc35c3fd795488a653f4b518be70ea"; + src = fetchurl { + url = "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea"; + sha256 = "167snpasy7499pbxpyx2bj607qa1vrg07xfpa30dlpbwi7f34dji"; + }; + }; + }; + "pragmarx/google2fa" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "pragmarx-google2fa-26c4c5cf30a2844ba121760fd7301f8ad240100b"; + src = fetchurl { + url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b"; + sha256 = "1jmc7s3hbczvb0h4kfmya67l969nfww3lmc4slvzsz0zd769434h"; + }; + }; + }; + "pragmarx/google2fa-laravel" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "pragmarx-google2fa-laravel-f9014fd7ea36a1f7fffa233109cf59b209469647"; + src = fetchurl { + url = "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/f9014fd7ea36a1f7fffa233109cf59b209469647"; + sha256 = "1y1b24fyfsf8mrhla3j699x1x6pd23rw5k3pjsag0vqgvd4v3a8n"; + }; + }; + }; + "pragmarx/google2fa-qrcode" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "pragmarx-google2fa-qrcode-fd5ff0531a48b193a659309cc5fb882c14dbd03f"; + src = fetchurl { + url = "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/fd5ff0531a48b193a659309cc5fb882c14dbd03f"; + sha256 = "1csa15v68bznrz3262xjcdgcgw0lg8fwb6fhrbms2mnylhq4s35g"; + }; + }; + }; + "psr/cache" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psr-cache-d11b50ad223250cf17b86e38383413f5a6764bf8"; + src = fetchurl { + url = "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8"; + sha256 = "06i2k3dx3b4lgn9a4v1dlgv8l9wcl4kl7vzhh63lbji0q96hv8qz"; + }; + }; + }; + "psr/container" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psr-container-8622567409010282b7aeebe4bb841fe98b58dcaf"; + src = fetchurl { + url = "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf"; + sha256 = "0qfvyfp3mli776kb9zda5cpc8cazj3prk0bg0gm254kwxyfkfrwn"; + }; + }; + }; + "psr/http-factory" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psr-http-factory-12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; + src = fetchurl { + url = "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; + sha256 = "0inbnqpc5bfhbbda9dwazsrw9xscfnc8rdx82q1qm3r446mc1vds"; + }; + }; + }; + "psr/http-message" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363"; + src = fetchurl { + url = "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363"; + sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45"; + }; + }; + }; + "psr/log" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11"; + src = fetchurl { + url = "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11"; + sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln"; + }; + }; + }; + "psr/simple-cache" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; + src = fetchurl { + url = "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; + sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw"; + }; + }; + }; + "psy/psysh" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "psy-psysh-e4573f47750dd6c92dca5aee543fa77513cbd8d3"; + src = fetchurl { + url = "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3"; + sha256 = "1pzw57gild4h66nfkvlcbz43ralypcjr9dgvwj6rs2gl72rfiwnk"; + }; + }; + }; + "ralouphie/getallheaders" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "ralouphie-getallheaders-120b605dfeb996808c31b6477290a714d356e822"; + src = fetchurl { + url = "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822"; + sha256 = "1bv7ndkkankrqlr2b4kw7qp3fl0dxi6bp26bnim6dnlhavd6a0gg"; + }; + }; + }; + "ramsey/uuid" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "ramsey-uuid-ffa80ab953edd85d5b6c004f96181a538aad35a3"; + src = fetchurl { + url = "https://api.github.com/repos/ramsey/uuid/zipball/ffa80ab953edd85d5b6c004f96181a538aad35a3"; + sha256 = "043g1nwpbvqrvq6ri2517254d72538h5jfzv9miafnws4ajwfpzg"; + }; + }; + }; + "robrichards/xmlseclibs" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "robrichards-xmlseclibs-f8f19e58f26cdb42c54b214ff8a820760292f8df"; + src = fetchurl { + url = "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df"; + sha256 = "01zlpm36rrdj310cfmiz2fnabszxd3fq80fa8x8j3f9ki7dvhh5y"; + }; + }; + }; + "rollbar/rollbar" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "rollbar-rollbar-ff3db5739dd635740caed02ddad43e671b5a37e5"; + src = fetchurl { + url = "https://api.github.com/repos/rollbar/rollbar-php/zipball/ff3db5739dd635740caed02ddad43e671b5a37e5"; + sha256 = "1mkbw0mcaj50ks0x6ql2qq7dr2i5nfr46x6chdf8hvnm1vjnphmd"; + }; + }; + }; + "rollbar/rollbar-laravel" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "rollbar-rollbar-laravel-11df7e19313a4cf60769d26ce35e29b09d5405cd"; + src = fetchurl { + url = "https://api.github.com/repos/rollbar/rollbar-php-laravel/zipball/11df7e19313a4cf60769d26ce35e29b09d5405cd"; + sha256 = "0df52a29c9xs0ifvfkcskix1nx9bz6xykrv2ah9m4pg1ikjkg2cx"; + }; + }; + }; + "sebastian/comparator" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "sebastian-comparator-1071dfcef776a57013124ff35e1fc41ccd294758"; + src = fetchurl { + url = "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758"; + sha256 = "0i2lnvf56n4s88001dzxzy9bjzih1qbf7kzc7457qhlvwdnaydn3"; + }; + }; + }; + "sebastian/diff" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "sebastian-diff-14f72dd46eaf2f2293cbe79c93cc0bc43161a211"; + src = fetchurl { + url = "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211"; + sha256 = "0planffhifwhxgml9r3ma89c83jvbrqilj517a5ps9x8vc6kk312"; + }; + }; + }; + "sebastian/exporter" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "sebastian-exporter-0c32ea2e40dbf59de29f3b49bf375176ce7dd8db"; + src = fetchurl { + url = "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db"; + sha256 = "179m35wkps4vy5yxdpbgim8v2cxf9v2wifswj3ww7qhg7h53b1gk"; + }; + }; + }; + "sebastian/recursion-context" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "sebastian-recursion-context-367dcba38d6e1977be014dc4b22f47a484dac7fb"; + src = fetchurl { + url = "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb"; + sha256 = "1zpq0qk2mgwnbyhjnj05dz2n2v8hvj2g4jy68fd5klxxkdr92ps7"; + }; + }; + }; + "spatie/db-dumper" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "spatie-db-dumper-05e5955fb882008a8947c5a45146d86cfafa10d1"; + src = fetchurl { + url = "https://api.github.com/repos/spatie/db-dumper/zipball/05e5955fb882008a8947c5a45146d86cfafa10d1"; + sha256 = "0g0scxq259qn1maxa61qh3cl5a88778qgx27dgbxr9p8kszivlsg"; + }; + }; + }; + "spatie/laravel-backup" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "spatie-laravel-backup-3ede36961b79b6ea4a6b5f708f2cc60fee74ad6c"; + src = fetchurl { + url = "https://api.github.com/repos/spatie/laravel-backup/zipball/3ede36961b79b6ea4a6b5f708f2cc60fee74ad6c"; + sha256 = "1i6j0qc8g80d9jxb4xhybgym8sykdackfqwqdahhmgs4mc4fg6ps"; + }; + }; + }; + "spatie/temporary-directory" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "spatie-temporary-directory-f517729b3793bca58f847c5fd383ec16f03ffec6"; + src = fetchurl { + url = "https://api.github.com/repos/spatie/temporary-directory/zipball/f517729b3793bca58f847c5fd383ec16f03ffec6"; + sha256 = "1pn6l9c86yigpzn83ajpq2wiy8ds0rlxmiq0iwby14cijc98ma3m"; + }; + }; + }; + "squizlabs/php_codesniffer" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "squizlabs-php_codesniffer-ffced0d2c8fa8e6cdc4d695a743271fab6c38625"; + src = fetchurl { + url = "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625"; + sha256 = "1cndvz85ii2cl47lbfkmxr4xw03n7y70l6jc8sdh6bhz4axvk03z"; + }; + }; + }; + "swiftmailer/swiftmailer" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "swiftmailer-swiftmailer-8a5d5072dca8f48460fce2f4131fcc495eec654c"; + src = fetchurl { + url = "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c"; + sha256 = "1p9m4fw9y9md9a7msbmnc0hpdrky8dwrllnyg1qf1cdyp9d70x1d"; + }; + }; + }; + "symfony/console" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-console-bdcc66f3140421038f495e5b50e3ca6ffa14c773"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/console/zipball/bdcc66f3140421038f495e5b50e3ca6ffa14c773"; + sha256 = "16w04xyq1igg3q4542s3v8vry5k2wsz8ip1vz7j036ghlv154j76"; + }; + }; + }; + "symfony/css-selector" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-css-selector-c1e29de6dc893b130b45d20d8051efbb040560a9"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/css-selector/zipball/c1e29de6dc893b130b45d20d8051efbb040560a9"; + sha256 = "0af571s9i7inwsjbqpf5dkpghs2k5ds8ba8x7wdvad6hpgphify8"; + }; + }; + }; + "symfony/debug" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-debug-5de6c6e7f52b364840e53851c126be4d71e60470"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/debug/zipball/5de6c6e7f52b364840e53851c126be4d71e60470"; + sha256 = "1kmf8kk5ra6nr17z007vacw3dvpcglng584l0y98wrn5kmmfgh4x"; + }; + }; + }; + "symfony/deprecation-contracts" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-deprecation-contracts-6f981ee24cf69ee7ce9736146d1c57c2780598a8"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8"; + sha256 = "05jws1g4kcs297bwf5d72z47m2263i2jqpivi3yv8kf50kdjjzba"; + }; + }; + }; + "symfony/error-handler" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-error-handler-2d0c9c229d995bef5e87fe4e83b717541832b448"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/error-handler/zipball/2d0c9c229d995bef5e87fe4e83b717541832b448"; + sha256 = "1zl6p02pzmzi64fh6c77zgcnwqd41nxvhi4syhdm90l24d0b1di0"; + }; + }; + }; + "symfony/event-dispatcher" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-event-dispatcher-3ccfcfb96ecce1217d7b0875a0736976bc6e63dc"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/3ccfcfb96ecce1217d7b0875a0736976bc6e63dc"; + sha256 = "0rx6h15nzhia0g797xbgd692lraxlbv9fblg9528xr6if94bgcng"; + }; + }; + }; + "symfony/event-dispatcher-contracts" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-event-dispatcher-contracts-01e9a4efac0ee33a05dfdf93b346f62e7d0e998c"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/01e9a4efac0ee33a05dfdf93b346f62e7d0e998c"; + sha256 = "08hi7dgz6bnq8ys1hblgqfqkgix6kzqb1a4751bkxfz2sjh6sza8"; + }; + }; + }; + "symfony/finder" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-finder-b17d76d7ed179f017aad646e858c90a2771af15d"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/finder/zipball/b17d76d7ed179f017aad646e858c90a2771af15d"; + sha256 = "0lmss9kblyj3pvc7wmkj1vlkjx8rr8ad6rrd9c0pf5r9iqbgy1zq"; + }; + }; + }; + "symfony/http-client-contracts" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-http-client-contracts-ec82e57b5b714dbb69300d348bd840b345e24166"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/http-client-contracts/zipball/ec82e57b5b714dbb69300d348bd840b345e24166"; + sha256 = "0q2ad5vjyrh753a71ymlqbb6rnmvq2z65c5mf4iwic2j16cmzr7p"; + }; + }; + }; + "symfony/http-foundation" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-http-foundation-60e8e42a4579551e5ec887d04380e2ab9e4cc314"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/http-foundation/zipball/60e8e42a4579551e5ec887d04380e2ab9e4cc314"; + sha256 = "1vkb67il9cv954lkkzgmsivcx9iypv4hmp1kkkgprmqsrzl5plwl"; + }; + }; + }; + "symfony/http-kernel" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-http-kernel-330a859a7ec9d7e7d82f2569b1c0700a26ffb1e3"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/http-kernel/zipball/330a859a7ec9d7e7d82f2569b1c0700a26ffb1e3"; + sha256 = "0cgngsln3k2mfp8hrmbmc71alpwfhqv7ilq8mgj1h1blh8ms5igg"; + }; + }; + }; + "symfony/mime" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-mime-92d27a34dea2e199fa9b687e3fff3a7d169b7b1c"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/mime/zipball/92d27a34dea2e199fa9b687e3fff3a7d169b7b1c"; + sha256 = "02ibqpbm9az4hwfk6k8ypaqwwbx92kw14lp28wsxywb0lp7hzbcd"; + }; + }; + }; + "symfony/polyfill-ctype" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-ctype-30885182c981ab175d4d034db0f6f469898070ab"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab"; + sha256 = "0dfh24f8g048vbj88vx0lvw48nq5dsamy5kva72ab1h7vw9hvpwb"; + }; + }; + }; + "symfony/polyfill-iconv" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-iconv-f1aed619e28cb077fc83fac8c4c0383578356e40"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40"; + sha256 = "0fjx1a0kvkj0677nc6h49phqlk0hsgkzbs401lmhj6b6cdc7hvzp"; + }; + }; + }; + "symfony/polyfill-intl-idn" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-intl-idn-749045c69efb97c70d25d7463abba812e91f3a44"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44"; + sha256 = "0ni1zlnp5xpxyzbax7v3mn20x35i69nsmch2sx322cs6dwb0ggbn"; + }; + }; + }; + "symfony/polyfill-intl-normalizer" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-intl-normalizer-8590a5f561694770bdcd3f9b5c69dde6945028e8"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8"; + sha256 = "1c60xin00q0d2gbyaiglxppn5hqwki616v5chzwyhlhf6aplwsh3"; + }; + }; + }; + "symfony/polyfill-mbstring" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-mbstring-0abb51d2f102e00a4eefcf46ba7fec406d245825"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825"; + sha256 = "1z17f7465fn778ak68mzz5kg2ql1n6ghgqh3827n9mcipwbp4k58"; + }; + }; + }; + "symfony/polyfill-php72" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-php72-9a142215a36a3888e30d0a9eeea9766764e96976"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976"; + sha256 = "06ipbcvrxjzgvraf2z9fwgy0bzvzjvs5z1j67grg1gb15x3d428b"; + }; + }; + }; + "symfony/polyfill-php73" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-php73-cc5db0e22b3cb4111010e48785a97f670b350ca5"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5"; + sha256 = "04z6fah8rn5b01w78j0vqa0jys4mvji66z4ql6wk1r1bf6j0048y"; + }; + }; + }; + "symfony/polyfill-php80" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-polyfill-php80-4407588e0d3f1f52efb65fbe92babe41f37fe50c"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c"; + sha256 = "187whknxl9rs0ddkjph6zmla5kh3k7w6hnvgfc44zig17jxsjdff"; + }; + }; + }; + "symfony/process" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-process-54e9d763759268e07eb13b921d8631fc2816206f"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/process/zipball/54e9d763759268e07eb13b921d8631fc2816206f"; + sha256 = "01zkgmf4ypscdrpb0wk0fb593sm09xfdk8ah645xx38rsbf3hiy1"; + }; + }; + }; + "symfony/psr-http-message-bridge" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-psr-http-message-bridge-22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34"; + sha256 = "18zvhrcry8173wklv3zpf8k06xx15smrw1dnj0zmq97injnam6fl"; + }; + }; + }; + "symfony/routing" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-routing-324f7f73b89cd30012575119430ccfb1dfbc24be"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/routing/zipball/324f7f73b89cd30012575119430ccfb1dfbc24be"; + sha256 = "0lks9bscddqgwbljgrf4mvd948frvv2ckar4v8m3pdc8s9pajrw2"; + }; + }; + }; + "symfony/service-contracts" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-service-contracts-1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"; + sha256 = "0c1vq6jv2jc37i9m1ndpbv7g75blgvf1s44vk65nb1jdk3hrbrd1"; + }; + }; + }; + "symfony/translation" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-translation-dfe132c5c6d89f90ce7f961742cc532e9ca16dd4"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/translation/zipball/dfe132c5c6d89f90ce7f961742cc532e9ca16dd4"; + sha256 = "1w7m0x6i2r77h8w7sqhnaf4g52x6bb53mm4wbx70aljfahigk0l1"; + }; + }; + }; + "symfony/translation-contracts" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-translation-contracts-d28150f0f44ce854e942b671fc2620a98aae1b1e"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e"; + sha256 = "0gwqxhrzb9dzsqvqr9lc3whzl8wwlfhwskr0wdwqri4pq5mspb2w"; + }; + }; + }; + "symfony/var-dumper" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "symfony-var-dumper-35237c5e5dcb6593a46a860ba5b29c1d4683d80e"; + src = fetchurl { + url = "https://api.github.com/repos/symfony/var-dumper/zipball/35237c5e5dcb6593a46a860ba5b29c1d4683d80e"; + sha256 = "0vqb4m5iqy0g9l4wh53f6w5fsf4lh1i3k7f7lisg5wvxlwfy4yjw"; + }; + }; + }; + "tecnickcom/tc-lib-barcode" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "tecnickcom-tc-lib-barcode-a8a7183e2be6379e522dc825a3b7a3af5394a9e7"; + src = fetchurl { + url = "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/a8a7183e2be6379e522dc825a3b7a3af5394a9e7"; + sha256 = "19b06fj7cin93xis03h62nm64rxmryyzi5rxpc4fi5z5i1q97702"; + }; + }; + }; + "tecnickcom/tc-lib-color" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "tecnickcom-tc-lib-color-83cdb57fd900901c6aa2af8cfd67202518fb69b2"; + src = fetchurl { + url = "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/83cdb57fd900901c6aa2af8cfd67202518fb69b2"; + sha256 = "1qs2j2288awzmrzkpbyswp1v8q83fk3fjmz1kzgdz38xxmff5sfp"; + }; + }; + }; + "tightenco/collect" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "tightenco-collect-3a42ca9b730a88e942fe05180d4f15e045464e40"; + src = fetchurl { + url = "https://api.github.com/repos/tighten/collect/zipball/3a42ca9b730a88e942fe05180d4f15e045464e40"; + sha256 = "0gs28b97v8ll6rr7yc2lwawkjzpigzadivr43idfs3hrc2jw37vv"; + }; + }; + }; + "tightenco/ziggy" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "tightenco-ziggy-82ea6ec6cb6ab3545b0245310b2a424316fe48d8"; + src = fetchurl { + url = "https://api.github.com/repos/tighten/ziggy/zipball/82ea6ec6cb6ab3545b0245310b2a424316fe48d8"; + sha256 = "1mfiwvpd5jhs9lsg0bl3qm1spa25062cfilkn80f9la08gbry5fh"; + }; + }; + }; + "tijsverkoyen/css-to-inline-styles" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "tijsverkoyen-css-to-inline-styles-da444caae6aca7a19c0c140f68c6182e337d5b1c"; + src = fetchurl { + url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c"; + sha256 = "13lzhf1kswg626b8zd23z4pa7sg679si368wcg6pklqvijnn0any"; + }; + }; + }; + "unicodeveloper/laravel-password" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "unicodeveloper-laravel-password-806e345ae992e0adf38c4cfa32063d7d7c9d189a"; + src = fetchurl { + url = "https://api.github.com/repos/unicodeveloper/laravel-password/zipball/806e345ae992e0adf38c4cfa32063d7d7c9d189a"; + sha256 = "1qd63zahc0mw7ypfghm2q1zfq1w3vr58zxh5gdgcx0srlg2v69gc"; + }; + }; + }; + "vlucas/phpdotenv" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "vlucas-phpdotenv-5b547cdb25825f10251370f57ba5d9d924e6f68e"; + src = fetchurl { + url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/5b547cdb25825f10251370f57ba5d9d924e6f68e"; + sha256 = "05a2d5dky62xq42qldhzxak6hf8734kjnpw3y9xhlvrg8ir4d8pv"; + }; + }; + }; + "watson/validating" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "watson-validating-b8731af37eade6b25aac1fcec5e90fdfdb9de5f5"; + src = fetchurl { + url = "https://api.github.com/repos/dwightwatson/validating/zipball/b8731af37eade6b25aac1fcec5e90fdfdb9de5f5"; + sha256 = "1mhialmg9f8q1ka3nawgs6b0pzinb60c6n7vkml3226wpwcj9kq0"; + }; + }; + }; + "webmozart/assert" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "webmozart-assert-6964c76c7804814a842473e0c8fd15bab0f18e25"; + src = fetchurl { + url = "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25"; + sha256 = "17xqhb2wkwr7cgbl4xdjf7g1vkal17y79rpp6xjpf1xgl5vypc64"; + }; + }; + }; + }; + devPackages = {}; +in +composerEnv.buildPackage { + inherit packages devPackages noDev; + name = "snipe-it"; + src = composerEnv.filterSrc ./.; + executable = false; + symlinkDependencies = false; + meta = { + license = "AGPL-3.0-or-later"; + }; +} + diff --git a/pkgs/servers/web-apps/snipe-it/update.sh b/pkgs/servers/web-apps/snipe-it/update.sh new file mode 100755 index 00000000000..cf06f81b078 --- /dev/null +++ b/pkgs/servers/web-apps/snipe-it/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nix curl jq nix-update + +# check if composer2nix is installed +if ! command -v composer2nix &> /dev/null; then + echo "Please install composer2nix (https://github.com/svanderburg/composer2nix) to run this script." + exit 1 +fi + +CURRENT_VERSION=$(nix eval --raw '(with import ../../../.. {}; snipe-it.version)') +TARGET_VERSION_REMOTE=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/snipe/snipe-it/releases/latest | jq -r ".tag_name") +TARGET_VERSION=${TARGET_VERSION_REMOTE:1} +SNIPE_IT=https://github.com/snipe/snipe-it/raw/$TARGET_VERSION_REMOTE +SHA256=$(nix-prefetch-url --unpack "https://github.com/snipe/snipe-it/archive/v$TARGET_VERSION/snipe-it.tar.gz") + +if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then + echo "snipe-it is up-to-date: ${CURRENT_VERSION}" + exit 0 +fi + +curl -LO "$SNIPE_IT/composer.json" +curl -LO "$SNIPE_IT/composer.lock" + +composer2nix --name "snipe-it" \ + --composition=composition.nix \ + --no-dev +rm composer.json composer.lock + +# change version number +sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \ + -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \ + -i ./default.nix + +# fix composer-env.nix +sed -e "s/stdenv\.lib/lib/g" \ + -e '3s/stdenv, writeTextFile/stdenv, lib, writeTextFile/' \ + -i ./composer-env.nix + +# fix composition.nix +sed -e '7s/stdenv writeTextFile/stdenv lib writeTextFile/' \ + -i composition.nix + +# fix missing newline +echo "" >> composition.nix +echo "" >> php-packages.nix + +cd ../../../.. +nix-build -A snipe-it + +exit $? diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f76d7c679e..f2ec4e7668d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22565,6 +22565,8 @@ with pkgs; smcroute = callPackage ../servers/smcroute { }; + snipe-it = callPackage ../servers/web-apps/snipe-it { }; + sogo = callPackage ../servers/web-apps/sogo { }; spacecookie = From 9cb388739f5edba3b6f81a70d337f6ab341a9cc6 Mon Sep 17 00:00:00 2001 From: Lara Date: Tue, 8 Feb 2022 10:44:46 +0000 Subject: [PATCH 124/150] nixos/snipe-it: init Snipe-IT is a free open source IT asset/license management system https://snipeitapp.com/ --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/snipe-it.nix | 493 +++++++++++++++++++ 2 files changed, 494 insertions(+) create mode 100644 nixos/modules/services/web-apps/snipe-it.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b3efa5d5e6f..e0d1c037935 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1079,6 +1079,7 @@ ./services/web-apps/trilium.nix ./services/web-apps/selfoss.nix ./services/web-apps/shiori.nix + ./services/web-apps/snipe-it.nix ./services/web-apps/vikunja.nix ./services/web-apps/virtlyst.nix ./services/web-apps/wiki-js.nix diff --git a/nixos/modules/services/web-apps/snipe-it.nix b/nixos/modules/services/web-apps/snipe-it.nix new file mode 100644 index 00000000000..f14171d02f3 --- /dev/null +++ b/nixos/modules/services/web-apps/snipe-it.nix @@ -0,0 +1,493 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.snipe-it; + snipe-it = pkgs.snipe-it.override { + dataDir = cfg.dataDir; + }; + db = cfg.database; + mail = cfg.mail; + + user = cfg.user; + group = cfg.group; + + tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME; + + # shell script for local administration + artisan = pkgs.writeScriptBin "snipe-it" '' + #! ${pkgs.runtimeShell} + cd ${snipe-it} + sudo=exec + if [[ "$USER" != ${user} ]]; then + sudo='exec /run/wrappers/bin/sudo -u ${user}' + fi + $sudo ${pkgs.php}/bin/php artisan $* + ''; +in { + options.services.snipe-it = { + + enable = mkEnableOption "A free open source IT asset/license management system"; + + user = mkOption { + default = "snipeit"; + description = "User snipe-it runs as."; + type = types.str; + }; + + group = mkOption { + default = "snipeit"; + description = "Group snipe-it runs as."; + type = types.str; + }; + + appKeyFile = mkOption { + description = '' + A file containing the Laravel APP_KEY - a 32 character long, + base64 encoded key used for encryption where needed. Can be + generated with head -c 32 /dev/urandom | base64. + ''; + example = "/run/keys/snipe-it/appkey"; + type = types.path; + }; + + hostName = lib.mkOption { + type = lib.types.str; + default = if config.networking.domain != null then + config.networking.fqdn + else + config.networking.hostName; + defaultText = lib.literalExpression "config.networking.fqdn"; + example = "snipe-it.example.com"; + description = '' + The hostname to serve Snipe-IT on. + ''; + }; + + appURL = mkOption { + description = '' + The root URL that you want to host Snipe-IT on. All URLs in Snipe-IT will be generated using this value. + If you change this in the future you may need to run a command to update stored URLs in the database. + Command example: snipe-it snipe-it:update-url https://old.example.com https://new.example.com + ''; + default = "http${lib.optionalString tlsEnabled "s"}://${cfg.hostName}"; + defaultText = '' + http''${lib.optionalString tlsEnabled "s"}://''${cfg.hostName} + ''; + example = "https://example.com"; + type = types.str; + }; + + dataDir = mkOption { + description = "snipe-it data directory"; + default = "/var/lib/snipe-it"; + type = types.path; + }; + + database = { + host = mkOption { + type = types.str; + default = "localhost"; + description = "Database host address."; + }; + port = mkOption { + type = types.port; + default = 3306; + description = "Database host port."; + }; + name = mkOption { + type = types.str; + default = "snipeit"; + description = "Database name."; + }; + user = mkOption { + type = types.str; + default = user; + defaultText = literalExpression "user"; + description = "Database username."; + }; + passwordFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/run/keys/snipe-it/dbpassword"; + description = '' + A file containing the password corresponding to + . + ''; + }; + createLocally = mkOption { + type = types.bool; + default = false; + description = "Create the database and database user locally."; + }; + }; + + mail = { + driver = mkOption { + type = types.enum [ "smtp" "sendmail" ]; + default = "smtp"; + description = "Mail driver to use."; + }; + host = mkOption { + type = types.str; + default = "localhost"; + description = "Mail host address."; + }; + port = mkOption { + type = types.port; + default = 1025; + description = "Mail host port."; + }; + encryption = mkOption { + type = with types; nullOr (enum [ "tls" "ssl" ]); + default = null; + description = "SMTP encryption mechanism to use."; + }; + user = mkOption { + type = with types; nullOr str; + default = null; + example = "snipeit"; + description = "Mail username."; + }; + passwordFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/run/keys/snipe-it/mailpassword"; + description = '' + A file containing the password corresponding to + . + ''; + }; + backupNotificationAddress = mkOption { + type = types.str; + default = "backup@example.com"; + description = "Email Address to send Backup Notifications to."; + }; + from = { + name = mkOption { + type = types.str; + default = "Snipe-IT Asset Management"; + description = "Mail \"from\" name."; + }; + address = mkOption { + type = types.str; + default = "mail@example.com"; + description = "Mail \"from\" address."; + }; + }; + replyTo = { + name = mkOption { + type = types.str; + default = "Snipe-IT Asset Management"; + description = "Mail \"reply-to\" name."; + }; + address = mkOption { + type = types.str; + default = "mail@example.com"; + description = "Mail \"reply-to\" address."; + }; + }; + }; + + maxUploadSize = mkOption { + type = types.str; + default = "18M"; + example = "1G"; + description = "The maximum size for uploads (e.g. images)."; + }; + + 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 snipe-it 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; }) {} + ); + default = {}; + example = literalExpression '' + { + serverAliases = [ + "snipe-it.''${config.networking.domain}" + ]; + # To enable encryption and let let's encrypt take care of certificate + forceSSL = true; + enableACME = true; + } + ''; + description = '' + With this option, you can customize the nginx virtualHost settings. + ''; + }; + + config = mkOption { + type = with types; + attrsOf + (nullOr + (either + (oneOf [ + bool + int + port + path + str + ]) + (submodule { + options = { + _secret = mkOption { + type = nullOr (oneOf [ str path ]); + description = '' + The path to a file containing the value the + option should be set to in the final + configuration file. + ''; + }; + }; + }))); + default = {}; + example = literalExpression '' + { + ALLOWED_IFRAME_HOSTS = "https://example.com"; + WKHTMLTOPDF = "''${pkgs.wkhtmltopdf}/bin/wkhtmltopdf"; + AUTH_METHOD = "oidc"; + OIDC_NAME = "MyLogin"; + OIDC_DISPLAY_NAME_CLAIMS = "name"; + OIDC_CLIENT_ID = "snipe-it"; + OIDC_CLIENT_SECRET = {_secret = "/run/keys/oidc_secret"}; + OIDC_ISSUER = "https://keycloak.example.com/auth/realms/My%20Realm"; + OIDC_ISSUER_DISCOVER = true; + } + ''; + description = '' + Snipe-IT configuration options to set in the + .env file. + Refer to + for details on supported values. + + Settings containing secret data should be set to an attribute + set containing the attribute _secret - a + string pointing to a file containing the value the option + should be set to. See the example to get a better picture of + this: in the resulting .env file, the + OIDC_CLIENT_SECRET key will be set to the + contents of the /run/keys/oidc_secret + file. + ''; + }; + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = db.createLocally -> db.user == user; + message = "services.snipe-it.database.user must be set to ${user} if services.snipe-it.database.createLocally is set true."; + } + { assertion = db.createLocally -> db.passwordFile == null; + message = "services.snipe-it.database.passwordFile cannot be specified if services.snipe-it.database.createLocally is set to true."; + } + ]; + + environment.systemPackages = [ artisan ]; + + services.snipe-it.config = { + APP_ENV = "production"; + APP_KEY._secret = cfg.appKeyFile; + APP_URL = cfg.appURL; + DB_HOST = db.host; + DB_PORT = db.port; + DB_DATABASE = db.name; + DB_USERNAME = db.user; + DB_PASSWORD._secret = db.passwordFile; + MAIL_DRIVER = mail.driver; + MAIL_FROM_NAME = mail.from.name; + MAIL_FROM_ADDR = mail.from.address; + MAIL_REPLYTO_NAME = mail.from.name; + MAIL_REPLYTO_ADDR = mail.from.address; + MAIL_BACKUP_NOTIFICATION_ADDRESS = mail.backupNotificationAddress; + MAIL_HOST = mail.host; + MAIL_PORT = mail.port; + MAIL_USERNAME = mail.user; + MAIL_ENCRYPTION = mail.encryption; + MAIL_PASSWORD._secret = mail.passwordFile; + APP_SERVICES_CACHE = "/run/snipe-it/cache/services.php"; + APP_PACKAGES_CACHE = "/run/snipe-it/cache/packages.php"; + APP_CONFIG_CACHE = "/run/snipe-it/cache/config.php"; + APP_ROUTES_CACHE = "/run/snipe-it/cache/routes-v7.php"; + APP_EVENTS_CACHE = "/run/snipe-it/cache/events.php"; + SESSION_SECURE_COOKIE = tlsEnabled; + }; + + services.mysql = mkIf db.createLocally { + enable = true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ db.name ]; + ensureUsers = [ + { name = db.user; + ensurePermissions = { "${db.name}.*" = "ALL PRIVILEGES"; }; + } + ]; + }; + + services.phpfpm.pools.snipe-it = { + inherit user group; + phpPackage = pkgs.php74; + phpOptions = '' + post_max_size = ${cfg.maxUploadSize} + upload_max_filesize = ${cfg.maxUploadSize} + ''; + settings = { + "listen.mode" = "0660"; + "listen.owner" = user; + "listen.group" = group; + } // cfg.poolConfig; + }; + + services.nginx = { + enable = mkDefault true; + virtualHosts."${cfg.hostName}" = mkMerge [ cfg.nginx { + root = mkForce "${snipe-it}/public"; + extraConfig = optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"; + locations = { + "/" = { + index = "index.php"; + extraConfig = ''try_files $uri $uri/ /index.php?$query_string;''; + }; + "~ \.php$" = { + extraConfig = '' + try_files $uri $uri/ /index.php?$query_string; + include ${config.services.nginx.package}/conf/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param REDIRECT_STATUS 200; + fastcgi_pass unix:${config.services.phpfpm.pools."snipe-it".socket}; + ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"} + ''; + }; + "~ \.(js|css|gif|png|ico|jpg|jpeg)$" = { + extraConfig = "expires 365d;"; + }; + }; + }]; + }; + + systemd.services.snipe-it-setup = { + description = "Preperation tasks for snipe-it"; + before = [ "phpfpm-snipe-it.service" ]; + after = optional db.createLocally "mysql.service"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = user; + WorkingDirectory = snipe-it; + RuntimeDirectory = "snipe-it/cache"; + RuntimeDirectoryMode = 0700; + }; + path = [ pkgs.replace-secret ]; + script = + let + isSecret = v: isAttrs v && v ? _secret && (isString v._secret || builtins.isPath v._secret); + snipeITEnvVars = lib.generators.toKeyValue { + mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" { + mkValueString = v: with builtins; + if isInt v then toString v + else if isString v then "\"${v}\"" + else if true == v then "true" + else if false == v then "false" + else if isSecret v then + if (isString v._secret) then + hashString "sha256" v._secret + else + hashString "sha256" (builtins.readFile v._secret) + else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}"; + }; + }; + secretPaths = lib.mapAttrsToList (_: v: v._secret) (lib.filterAttrs (_: isSecret) cfg.config); + mkSecretReplacement = file: '' + replace-secret ${escapeShellArgs [ + ( + if (isString file) then + builtins.hashString "sha256" file + else + builtins.hashString "sha256" (builtins.readFile file) + ) + file + "${cfg.dataDir}/.env" + ]} + ''; + secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths; + filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ {} null ])) cfg.config; + snipeITEnv = pkgs.writeText "snipeIT.env" (snipeITEnvVars filteredConfig); + in '' + # error handling + set -euo pipefail + + # set permissions + umask 077 + + # create .env file + install -T -m 0600 -o ${user} ${snipeITEnv} "${cfg.dataDir}/.env" + + # replace secrets + ${secretReplacements} + + # prepend `base64:` if it does not exist in APP_KEY + if ! grep 'APP_KEY=base64:' "${cfg.dataDir}/.env" >/dev/null; then + sed -i 's/APP_KEY=/APP_KEY=base64:/' "${cfg.dataDir}/.env" + fi + + # purge cache + rm "${cfg.dataDir}"/bootstrap/cache/*.php || true + + # migrate db + ${pkgs.php}/bin/php artisan migrate --force + ''; + }; + + systemd.tmpfiles.rules = [ + "d ${cfg.dataDir} 0710 ${user} ${group} - -" + "d ${cfg.dataDir}/bootstrap 0750 ${user} ${group} - -" + "d ${cfg.dataDir}/bootstrap/cache 0750 ${user} ${group} - -" + "d ${cfg.dataDir}/public 0750 ${user} ${group} - -" + "d ${cfg.dataDir}/public/uploads 0750 ${user} ${group} - -" + "d ${cfg.dataDir}/storage 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/app 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/fonts 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/framework 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/framework/cache 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/framework/sessions 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/framework/views 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/logs 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/uploads 0700 ${user} ${group} - -" + ]; + + users = { + users = mkIf (user == "snipeit") { + snipeit = { + inherit group; + isSystemUser = true; + }; + "${config.services.nginx.user}".extraGroups = [ group ]; + }; + groups = mkIf (group == "snipeit") { + snipeit = {}; + }; + }; + + }; + + meta.maintainers = with maintainers; [ yayayayaka ]; +} From 8f54cca448ff7c3f2700d0cd546df5a8d88e3b8c Mon Sep 17 00:00:00 2001 From: Lara Date: Tue, 8 Feb 2022 10:45:36 +0000 Subject: [PATCH 125/150] nixos/doc: Add Snipe-IT to 22.05 release notes --- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index ab0edcebc67..816b3a350fe 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -238,6 +238,14 @@ services.ergochat. + + + Snipe-IT, a + free open source IT asset/license management system. Available + as + services.snipe-it. + + PowerDNS-Admin, diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index af65ae46131..d16e706a336 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -77,6 +77,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [ergochat](https://ergo.chat), a modern IRC with IRCv3 features. Available as [services.ergochat](options.html#opt-services.ergochat.enable). +- [Snipe-IT](https://snipeitapp.com), a free open source IT asset/license management system. Available as [services.snipe-it](options.html#opt-services.snipe-it.enable). + - [PowerDNS-Admin](https://github.com/ngoduykhanh/PowerDNS-Admin), a web interface for the PowerDNS server. Available at [services.powerdns-admin](options.html#opt-services.powerdns-admin.enable). - [pgadmin4](https://github.com/postgres/pgadmin4), an admin interface for the PostgreSQL database. Available at [services.pgadmin](options.html#opt-services.pgadmin.enable). From 5fd7f4ef825f2251aeab5c1f526da955dcb4caef Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 10 May 2022 17:01:35 +0200 Subject: [PATCH 126/150] molden: unbreak build, make compatible with gcc-10 --- pkgs/applications/science/chemistry/molden/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 03f7c6c2b40..fc5c18e4ccd 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -19,7 +19,11 @@ stdenv.mkDerivation rec { --replace '-I/usr/X11R6/include' "" \ --replace '/usr/local/' $out/ \ --replace 'sudo' "" \ - --replace '-C surf depend' '-C surf' + --replace '-C surf depend' '-C surf' \ + --replace 'FFLAGS =' 'FFLAGS = -fallow-argument-mismatch' + + substituteInPlace ambfor/makefile --replace 'FFLAGS =' 'FFLAGS = -fallow-argument-mismatch' + sed -in '/^# DO NOT DELETE THIS LINE/q;' surf/Makefile ''; From cbd4728f8aa0481f252da5a654a224d134d3fa06 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 3 May 2022 19:10:32 +0200 Subject: [PATCH 127/150] opa: drop spurious dependency on cryptokit --- pkgs/development/compilers/opa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 8e70ca8dac2..0959c6da9ac 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ which perl jdk openssl coreutils zlib ncurses makeWrapper gcc binutils gnumake nodejs ] ++ (with ocamlPackages; [ - ocaml findlib ssl cryptokit camlzip ulex ocamlgraph camlp4 + ocaml findlib ssl camlzip ulex ocamlgraph camlp4 ]); NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; From fa04419da05819924ca501f82ab14accff6023ec Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 3 May 2022 19:10:37 +0200 Subject: [PATCH 128/150] =?UTF-8?q?ocamlPackages.cryptokit:=201.16.1=20?= =?UTF-8?q?=E2=86=92=201.17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/cryptokit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 1b5a50b13b9..59ba28be3c3 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,16 +1,16 @@ -{ lib, buildDunePackage, fetchFromGitHub, zlib, dune-configurator, zarith, ncurses }: +{ lib, buildDunePackage, fetchFromGitHub, zlib, dune-configurator, zarith }: buildDunePackage rec { pname = "cryptokit"; - version = "1.16.1"; + version = "1.17"; - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "xavierleroy"; repo = "cryptokit"; rev = "release${lib.replaceStrings ["."] [""] version}"; - sha256 = "sha256-eDIzi16Al/mXCNos/lVqjZWCtdP9SllXnRfm4GBWMfA="; + sha256 = "sha256:1xi7kcigxkfridjas2zwldsfc21wi31cgln071sbmv4agh3dqbyw"; }; # dont do autotools configuration, but do trigger findlib's preConfigure hook @@ -19,7 +19,7 @@ buildDunePackage rec { runHook postConfigure ''; - buildInputs = [ dune-configurator ncurses ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ zarith zlib ]; doCheck = true; From fd8414512baac8b96fbd245b6903afaa956de3d3 Mon Sep 17 00:00:00 2001 From: bb2020 Date: Wed, 24 Nov 2021 20:57:47 +0300 Subject: [PATCH 129/150] gimx: fix build --- pkgs/games/gimx/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 132169b711d..2728afe2c49 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2 -, ncurses5, bluez, libmhash, gimxPDP ? false }: +, ncurses5, bluez, libmhash, gimxPdpGamepad ? false }: let gimx-config = fetchFromGitHub { @@ -11,14 +11,14 @@ let in stdenv.mkDerivation rec { pname = "gimx"; - version = "8.0"; + version = "unstable-2021-08-31"; src = fetchFromGitHub { owner = "matlo"; repo = "GIMX"; - rev = "v${version}"; + rev = "58d2098dce75ed4c90ae649460d3a7a150f4ef0a"; fetchSubmodules = true; - sha256 = "0265gg6q7ymg76fb4pjrfdwjd280b3zzry96qy92w0h411slph85"; + sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz"; }; patches = [ ./conf.patch ]; @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { xorg.libX11 xorg.libXi xorg.libXext ]; - postPatch = lib.optionals gimxPDP '' + postPatch = lib.optionals gimxPdpGamepad '' substituteInPlace ./shared/gimxcontroller/include/x360.h \ --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213" substituteInPlace ./loader/firmware/EMU360.hex \ @@ -60,10 +60,6 @@ in stdenv.mkDerivation rec { cp -r ${./custom} $out/share/custom makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4 \ - --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ - --add-flags "-c $out/share/config/Dualshock4.xml" - - makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4-noff \ --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ --add-flags "-c $out/share/custom/Dualshock4.xml" From 98a2cf221dfe7bbf2e13691f3255481e6a63b20a Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Mon, 25 Apr 2022 10:25:26 -0500 Subject: [PATCH 130/150] lumo: remove --- .../clojurescript/lumo/default.nix | 287 ------------- .../interpreters/clojurescript/lumo/deps.edn | 12 - .../interpreters/clojurescript/lumo/deps.nix | 392 ------------------ .../clojurescript/lumo/mkdir_promise.patch | 20 - .../clojurescript/lumo/no_mangle.patch | 13 - .../clojurescript/lumo/package.json | 51 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 8 files changed, 1 insertion(+), 779 deletions(-) delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/default.nix delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/deps.edn delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/deps.nix delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/package.json diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix deleted file mode 100644 index d8fa630c30d..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ /dev/null @@ -1,287 +0,0 @@ -{ stdenv -, lib -, fetchurl -, clojure -, gnutar -, nodejs -, jre -, unzip -, nodePackages -, xcbuild -, python2 -, openssl -, pkgs -, fetchgit -, darwin -}: -let - version = "1.10.1"; - nodeVersion = "11.13.0"; - nodeSources = fetchurl { - url = "https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz"; - sha256 = "1cjzjbshxnysxkvbf41p3m8298cnhs9kfvdczgvvvlp6w16x4aac"; - }; - lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH"; - - # as found in cljs/snapshot/lumo/repl.cljs - requireDeps = '' \ - cljs.analyzer \ - cljs.compiler \ - cljs.env \ - cljs.js \ - cljs.reader \ - cljs.repl \ - cljs.source-map \ - cljs.source-map.base64 \ - cljs.source-map.base64-vlq \ - cljs.spec.alpha \ - cljs.spec.gen.alpha \ - cljs.tagged-literals \ - cljs.tools.reader \ - cljs.tools.reader.reader-types \ - cljs.tools.reader.impl.commons \ - cljs.tools.reader.impl.utils \ - clojure.core.rrb-vector \ - clojure.core.rrb-vector.interop \ - clojure.core.rrb-vector.nodes \ - clojure.core.rrb-vector.protocols \ - clojure.core.rrb-vector.rrbt \ - clojure.core.rrb-vector.transients \ - clojure.core.rrb-vector.trees \ - clojure.string \ - clojure.set \ - clojure.walk \ - cognitect.transit \ - fipp.visit \ - fipp.engine \ - fipp.deque \ - lazy-map.core \ - lumo.pprint.data \ - lumo.repl \ - lumo.repl-resources \ - lumo.js-deps \ - lumo.common ''; - - compileClojurescript = (simple: '' - (require '[cljs.build.api :as cljs]) - (cljs/build \"src/cljs/snapshot\" - {:optimizations ${if simple then ":simple" else ":none"} - :main 'lumo.core - :cache-analysis true - :source-map false - :dump-core false - :static-fns true - :optimize-constants false - :npm-deps false - :verbose true - :closure-defines {'cljs.core/*target* \"nodejs\" - 'lumo.core/*lumo-version* \"${version}\"} - :compiler-stats true - :process-shim false - :fn-invoke-direct true - :parallel-build false - :browser-repl false - :target :nodejs - :hashbang false - ;; :libs [ \"src/cljs/bundled\" \"src/js\" ] - :output-dir ${if simple - then ''\"cljstmp\"'' - else ''\"target\"''} - :output-to ${if simple - then ''\"cljstmp/main.js\"'' - else ''\"target/deleteme.js\"'' }}) - '' - ); - - - cacheToJsons = '' - (import [java.io ByteArrayOutputStream FileInputStream]) - (require '[cognitect.transit :as transit] - '[clojure.edn :as edn] - '[clojure.string :as str]) - - (defn write-transit-json [cache] - (let [out (ByteArrayOutputStream. 1000000) - writer (transit/writer out :json)] - (transit/write writer cache) - (.toString out))) - - (defn process-caches [] - (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\" - cache-aot-edn (edn/read-string (slurp cache-aot-path)) - cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\" - cache-macros-stream (FileInputStream. cache-macros-path) - cache-macros-edn (transit/read (transit/reader cache-macros-stream :json)) - caches [[cache-aot-path cache-aot-edn] - [cache-macros-path cache-macros-edn]]] - (doseq [[path cache-edn] caches] - (doseq [key (keys cache-edn)] - (let [out-path (str/replace path #\"(\.json|\.edn)\$\" - (str \".\" (munge key) \".json\")) - tr-json (write-transit-json (key cache-edn))] - (spit out-path tr-json)))))) - - (process-caches) - ''; - - trimMainJsEnd = '' - (let [string (slurp \"target/main.js\")] - (spit \"target/main.js\" - (subs string 0 (.indexOf string \"cljs.nodejs={};\")))) - ''; - - - cljdeps = import ./deps.nix { inherit pkgs; }; - classp = cljdeps.makeClasspaths { - extraClasspaths = [ "src/js" "src/cljs/bundled" "src/cljs/snapshot" ]; - }; - - - getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; -in -stdenv.mkDerivation { - inherit version; - pname = "lumo"; - - src = fetchgit { - url = "https://github.com/anmonteiro/lumo.git"; - rev = version; - sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ - nodejs - clojure - jre - python2 - openssl - gnutar - nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" - ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices - xcbuild - ] - ); - - patches = [ ./no_mangle.patch ./mkdir_promise.patch ]; - - postPatch = '' - substituteInPlace $NIX_BUILD_TOP/lumo/vendor/nexe/exe.js \ - --replace 'glob.sync(dir + "/*")' 'glob.sync(dir + "/../*")' - ''; - - buildPhase = '' - # Copy over lumo-build-deps environment - rm yarn.lock - cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./ - - # configure clojure-cli - mkdir ./.cpcache - export CLJ_CONFIG=`pwd` - export CLJ_CACHE=`pwd`/.cpcache - - # require more namespaces for cljs-bundle - sed -i "s!ns lumo.core! \ - ns lumo.core \ - (:require ${requireDeps}) \ - (:require-macros [clojure.template :as temp] \ - [cljs.test :as test])!g" \ - ./src/cljs/snapshot/lumo/core.cljs - - # Step 1: compile clojurescript with :none and :simple - ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}" - ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript false}" - cp -f cljstmp/main.js target/main.js - ${clojure}/bin/clojure -Scp ${classp} -e "${trimMainJsEnd}" - - # Step 2: sift files - unzip -o ${getJarPath "org.clojure/clojurescript"} -d ./target - unzip -j ${getJarPath "org.clojure/clojure"} "clojure/template.clj" -d ./target/clojure - unzip -o ${getJarPath "org.clojure/google-closure-library"} -d ./target - unzip -o ${getJarPath "org.clojure/google-closure-library-third-party"} -d ./target - unzip -o ${getJarPath "org.clojure/tools.reader"} -d ./target - unzip -o ${getJarPath "org.clojure/test.check"} -d ./target - cp -rf ./src/cljs/bundled/lumo/* ./target/lumo/ - cp -rf ./src/cljs/snapshot/lumo/repl.clj ./target/lumo/ - # cleanup - mv ./target/main.js ./target/main - rm ./target/*\.js - mv ./target/main ./target/main.js - rm ./target/AUTHORS - rm ./target/LICENSE - rm ./target/*.edn - rm ./target/*.md - rm -rf ./target/css - rm -rf ./target/META-INF - rm -rf ./target/com - rm -rf ./target/cljs/build - rm -rf ./target/cljs/repl - rm ./target/cljs/core\.cljs\.cache.aot\.json - rm ./target/cljs/source_map\.clj - rm ./target/cljs/repl\.cljc - rm ./target/cljs/externs\.clj - rm ./target/cljs/closure\.clj - rm ./target/cljs/util\.cljc - rm ./target/cljs/js_deps\.cljc - rm ./target/cljs/analyzer/utils\.clj - rm ./target/cljs/core/macros\.clj - rm ./target/cljs/compiler/api.clj - rm ./target/goog/test_module* - rm ./target/goog/transpile\.js - rm ./target/goog/base_* - find ./target -type f -name '*.class' -delete - find ./target -type d -empty -delete - - # Step 3: generate munged cache jsons - ${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}" - rm ./target/cljs/core\$macros\.cljc\.cache\.json - - - # Step 4: Bunde javascript - NODE_ENV=production node scripts/bundle.js - node scripts/bundleForeign.js - - # Step 5: Backup resources - cp -R target resources_bak - - # Step 6: Package executeable 1st time - # fetch node sources and copy to palce that nexe will find - mkdir -p tmp/node/${nodeVersion} - cp ${nodeSources} tmp/node/${nodeVersion}/node-${nodeVersion}.tar.gz - tar -C ./tmp/node/${nodeVersion} -xf ${nodeSources} --warning=no-unknown-keyword - mv ./tmp/node/${nodeVersion}/node-v${nodeVersion}/* ./tmp/node/${nodeVersion}/ - rm -rf ${lumo-internal-classpath} - cp -rf target ${lumo-internal-classpath} - node scripts/package.js ${nodeVersion} - rm -rf target - mv ${lumo-internal-classpath} target - - # Step 7: AOT Macros - sh scripts/aot-bundle-macros.sh - - # Step 8: Package executeable 2nd time - node scripts/package.js ${nodeVersion} - ''; - - dontStrip = true; - - installPhase = '' - mkdir -p $out/bin - cp build/lumo $out/bin - ''; - - meta = { - description = "Fast, cross-platform, standalone ClojureScript environment"; - longDescription = '' - Lumo is a fast, standalone ClojureScript REPL that runs on Node.js and V8. - Thanks to V8's custom startup snapshots, Lumo starts up instantaneously, - making it the fastest Clojure REPL in existence. - ''; - homepage = "https://github.com/anmonteiro/lumo"; - license = lib.licenses.epl10; - maintainers = [ lib.maintainers.hlolli ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/pkgs/development/interpreters/clojurescript/lumo/deps.edn deleted file mode 100644 index 7a2faee1d7a..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/deps.edn +++ /dev/null @@ -1,12 +0,0 @@ -{:deps - {org.clojure/clojure {:mvn/version "1.10.1"} - org.clojure/clojurescript {:mvn/version "1.10.520"} - org.clojure/test.check {:mvn/version "0.10.0-alpha4"} - org.clojure/tools.reader {:mvn/version "1.3.2" - :exclusions [org.clojure/clojure org.clojure/clojurescript]} - com.cognitect/transit-cljs {:mvn/version "0.8.256" - :exclusions [org.clojure/clojure org.clojure/clojurescript]} - malabarba/lazy-map {:mvn/version "1.3" - :exclusions [org.clojure/clojure org.clojure/clojurescript]} - fipp {:mvn/version "0.6.17" - :exclusions [org.clojure/clojure org.clojure/clojurescript]}}} diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix deleted file mode 100644 index 50f1c4af211..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/deps.nix +++ /dev/null @@ -1,392 +0,0 @@ -# generated by clj2nix-1.0.4 -{ pkgs }: - -let repos = [ - "https://repo.clojars.org/" - "https://repo1.maven.org/" - "https://oss.sonatype.org/content/repositories/releases/" - "https://oss.sonatype.org/content/repositories/public/" - "https://repo.typesafe.com/typesafe/releases/" - ]; - -in rec { - makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; - makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); - - packages = [ - { - name = "com.cognitect/transit-java"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-java"; - groupId = "com.cognitect"; - sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708"; - version = "0.8.332"; - }; - } - - { - name = "org.clojure/data.json"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "data.json"; - groupId = "org.clojure"; - sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; - version = "0.2.6"; - }; - } - - { - name = "org.clojure/clojure"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "clojure"; - groupId = "org.clojure"; - sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b"; - version = "1.10.1"; - }; - } - - { - name = "commons-codec/commons-codec"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "commons-codec"; - groupId = "commons-codec"; - sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3"; - version = "1.10"; - }; - } - - { - name = "com.google.errorprone/error_prone_annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "error_prone_annotations"; - groupId = "com.google.errorprone"; - sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b"; - version = "2.1.3"; - }; - } - - { - name = "org.clojure/core.specs.alpha"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "core.specs.alpha"; - groupId = "org.clojure"; - sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; - version = "0.2.44"; - }; - } - - { - name = "org.clojure/spec.alpha"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "spec.alpha"; - groupId = "org.clojure"; - sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; - version = "0.2.176"; - }; - } - - { - name = "org.codehaus.mojo/animal-sniffer-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "animal-sniffer-annotations"; - groupId = "org.codehaus.mojo"; - sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136"; - version = "1.14"; - }; - } - - { - name = "com.googlecode.json-simple/json-simple"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "json-simple"; - groupId = "com.googlecode.json-simple"; - sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742"; - version = "1.1.1"; - }; - } - - { - name = "com.cognitect/transit-cljs"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-cljs"; - groupId = "com.cognitect"; - sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd"; - version = "0.8.256"; - }; - } - - { - name = "org.clojure/google-closure-library"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "google-closure-library"; - groupId = "org.clojure"; - sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a"; - version = "0.0-20170809-b9c14c6b"; - }; - } - - { - name = "fipp"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "fipp"; - groupId = "fipp"; - sha512 = "d844ab63d28cb5e31657cc38e574bbc7072a78419c997f25445ac6ea4a719904a4f4844b37e3f664a8d2e49bd38ff1006a9e8c6e63fb4e2f0a2322d6c2638275"; - version = "0.6.17"; - }; - } - - { - name = "org.clojure/clojurescript"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "clojurescript"; - groupId = "org.clojure"; - sha512 = "b241959d6bd2ab659920965d301508226e26b3edcee469e4cd516cd4ed014b1a6b132c17ee7d96a8e66fe27fd01a74813ac8b85958d260f9fdbbeb4348d57ff1"; - version = "1.10.520"; - }; - } - - { - name = "com.google.jsinterop/jsinterop-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jsinterop-annotations"; - groupId = "com.google.jsinterop"; - sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d"; - version = "1.0.0"; - }; - } - - { - name = "com.fasterxml.jackson.core/jackson-core"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jackson-core"; - groupId = "com.fasterxml.jackson.core"; - sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64"; - version = "2.8.7"; - }; - } - - { - name = "malabarba/lazy-map"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "lazy-map"; - groupId = "malabarba"; - sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f"; - version = "1.3"; - }; - } - - { - name = "com.cognitect/transit-js"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-js"; - groupId = "com.cognitect"; - sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623"; - version = "0.8.846"; - }; - } - - { - name = "org.mozilla/rhino"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "rhino"; - groupId = "org.mozilla"; - sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc"; - version = "1.7R5"; - }; - } - - { - name = "org.clojure/google-closure-library-third-party"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "google-closure-library-third-party"; - groupId = "org.clojure"; - sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35"; - version = "0.0-20170809-b9c14c6b"; - }; - } - - { - name = "com.google.javascript/closure-compiler-externs"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "closure-compiler-externs"; - groupId = "com.google.javascript"; - sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82"; - version = "v20180805"; - }; - } - - { - name = "org.javassist/javassist"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "javassist"; - groupId = "org.javassist"; - sha512 = "ad65ee383ed83bedecc2073118cb3780b68b18d5fb79a1b2b665ff8529df02446ad11e68f9faaf4f2e980065f5946761a59ada379312cbb22d002625abed6a4f"; - version = "3.18.1-GA"; - }; - } - - { - name = "com.google.guava/guava"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "guava"; - groupId = "com.google.guava"; - sha512 = "429ceeec0350ba98e2b089b8b70ded2ec570c3a684894a7545d10592c1c7be42dacd1fad8b2cb9123aa3612575ce1b56e1bb54923443fc293f8e9adeac2762ee"; - version = "25.1-jre"; - }; - } - - { - name = "org.msgpack/msgpack"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "msgpack"; - groupId = "org.msgpack"; - sha512 = "a2741bed01f9c37ba3dbe6a7ab9ce936d36d4da97c35e215250ac89ac0851fc5948d83975ea6257d5dce1d43b6b5147254ecfb4b33f9bbdc489500b3ff060449"; - version = "0.6.12"; - }; - } - - { - name = "com.google.j2objc/j2objc-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "j2objc-annotations"; - groupId = "com.google.j2objc"; - sha512 = "a4a0b58ffc2d9f9b516f571bcd0ac14e4d3eec15aacd6320a4a1a12045acce8c6081e8ce922c4e882221cedb2cc266399ab468487ae9a08124d65edc07ae30f0"; - version = "1.1"; - }; - } - - { - name = "com.cognitect/transit-clj"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-clj"; - groupId = "com.cognitect"; - sha512 = "ad838d9e5688c8cebe54972ad0c9a6db428ec1cece8c8b078e8e8d4b0c7870b328239d2bc9dd8fcbedcba56ca0de9afb5a0a843ff5f630dc039118de7eb45eba"; - version = "0.8.309"; - }; - } - - { - name = "args4j/args4j"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "args4j"; - groupId = "args4j"; - sha512 = "5f0651234c8f8b130fddb39fa832c6da47d3e21bc3434307554314c47e672c28d005c64e9effe85d552190cfc27966b1f005740ffd40b4e1bec2cb257d7feedb"; - version = "2.0.26"; - }; - } - - { - name = "org.clojure/core.rrb-vector"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "core.rrb-vector"; - groupId = "org.clojure"; - sha512 = "4e410c4a90a869e98d5d69a8a6dd6427e9d77b70e1a2b54cf24baf23389f22e7a208375783c2fdc5c1a5acfb8511a5c5ed57ad1a946d5bffd203f453d90a6155"; - version = "0.0.14"; - }; - } - - { - name = "org.checkerframework/checker-qual"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "checker-qual"; - groupId = "org.checkerframework"; - sha512 = "3c38b0b9e0bde464268cff5fdb1894a048240b039093ee3abe5b32976a22737d26b355f8793f630a7f0b319fdb019a6fcd9ee1d5219676f0f10c0b0f496b61b7"; - version = "2.0.0"; - }; - } - - { - name = "org.clojure/tools.reader"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "tools.reader"; - groupId = "org.clojure"; - sha512 = "290a2d98b2eec08a8affc2952006f43c0459c7e5467dc454f5fb5670ea7934fa974e6be19f7e7c91dadcfed62082d0fbcc7788455b7446a2c9c5af02f7fc52b6"; - version = "1.3.2"; - }; - } - - { - name = "com.google.javascript/closure-compiler-unshaded"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "closure-compiler-unshaded"; - groupId = "com.google.javascript"; - sha512 = "4fa7029aabd9ff84255d56004707486726db9c770f43cb10dc44fb53a3254d588a0f47f937f55401d7f319267ec2362c87f5ea709bcfa06f12a66fe22cb8c53d"; - version = "v20180805"; - }; - } - - { - name = "org.clojure/test.check"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "test.check"; - groupId = "org.clojure"; - sha512 = "60fa3bd38c32cf193c573f1bd47c6abd7e7a5bb2fc7f7f9f97aa9dcd54d5e2eab9e351f5f83b01bb96b32811a9f2f5ab384c6b7b7ebbb6c86d1ad4f2789351bf"; - version = "0.10.0-alpha4"; - }; - } - - { - name = "com.google.protobuf/protobuf-java"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "protobuf-java"; - groupId = "com.google.protobuf"; - sha512 = "230fc4360b8b2ee10eb73d756c58478b6c779433aa4ca91938404bbfd0ada516d3215664dbe953c96649e33bbef293958e4ad4616671f0c246883196ece92998"; - version = "3.0.2"; - }; - } - - { - name = "com.google.code.findbugs/jsr305"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jsr305"; - groupId = "com.google.code.findbugs"; - sha512 = "bb09db62919a50fa5b55906013be6ca4fc7acb2e87455fac5eaf9ede2e41ce8bbafc0e5a385a561264ea4cd71bbbd3ef5a45e02d63277a201d06a0ae1636f804"; - version = "3.0.2"; - }; - } - - { - name = "com.google.code.gson/gson"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "gson"; - groupId = "com.google.code.gson"; - sha512 = "c3cdaf66a99e6336abc80ff23374f6b62ac95ab2ae874c9075805e91d849b18e3f620cc202b4978fc92b73d98de96089c8714b1dd096b2ae1958cfa085715f7a"; - version = "2.7"; - }; - } - - ]; - } diff --git a/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch deleted file mode 100644 index e9504bb5c1a..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/vendor/nexe/exe.js b/vendor/nexe/exe.js -index 21e78bb..ecbfca4 100644 ---- a/vendor/nexe/exe.js -+++ b/vendor/nexe/exe.js -@@ -254,9 +254,7 @@ return initModule._compile(${JSON.stringify(source)}, process.execPath); - */ - - function makeOutputDirectory(next) { -- mkdirp(path.dirname(options.output), function() { -- next(); -- }); -+ mkdirp(path.dirname(options.output)).then(() => next()); - }, - - /** -@@ -1107,4 +1105,3 @@ exports.package = function(path, options) { - - return obj; - } -- diff --git a/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch deleted file mode 100644 index 9af22341195..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/bundle.js b/scripts/bundle.js -index 16425a4..0d510fc 100644 ---- a/scripts/bundle.js -+++ b/scripts/bundle.js -@@ -73,6 +73,8 @@ const plugins = [ - if (!isDevBuild) { - plugins.push( - babelMinify({ -+ evaluate: false, -+ mangle: false, - comments: false, - removeConsole: true, - removeDebugger: true, diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json deleted file mode 100644 index acfd5c4ed49..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/package.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "lumo-build-deps", - "version": "1.10.1", - "dependencies": { - "@babel/core": "^7.1.5", - "@babel/plugin-external-helpers": "7.8.3", - "@babel/plugin-proposal-class-properties": "^7.1.0", - "@babel/plugin-proposal-object-rest-spread": "^7.0.0", - "@babel/plugin-transform-runtime": "^7.1.0", - "@babel/preset-env": "^7.1.5", - "@babel/preset-stage-2": "7.8.3", - "@babel/runtime": "^7.1.5", - "async": "^3.1.1", - "async-retry": "^1.2.3", - "babel-core": "^7.0.0-bridge.0", - "babel-eslint": "10.0.3", - "babel-jest": "^25.1.0", - "babel-loader": "^8.0.4", - "babel-plugin-transform-flow-strip-types": "6.22.0", - "browserify": "^16.2.3", - "chalk": "^3.0.0", - "colors": "^1.3.3", - "cross-env": "7.0.0", - "death": "^1.1.0", - "flow-bin": "0.118.0", - "google-closure-compiler-js": "20170910.0.1", - "glob": "^7.1.3", - "gunzip-maybe": "^1.4.1", - "insert-module-globals": "^7.2.0", - "jszip": "2.x", - "mkdirp": "^1.0.3", - "ncp": "^2.0.0", - "node-fetch": "^2.2.1", - "paredit.js": "0.3.6", - "posix-getopt": "github:anmonteiro/node-getopt#master", - "prettier": "1.19.1", - "progress": "^2.0.0", - "read-pkg": "^5.2.0", - "request": "^2.88.0", - "rollup": "^1.9.0", - "rollup-plugin-babel": "^4.3.2", - "rollup-plugin-babel-minify": "^9.1.1", - "rollup-plugin-commonjs": "^10.0.0", - "rollup-plugin-node-resolve": "^5.0.0", - "rollup-plugin-replace": "^2.1.1", - "tar-stream": "^2.0.1", - "webpack": "^4.25.1", - "webpack-cli": "^3.2.3", - "which-promise": "^1.0.0" - } -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7c89161495..4723c9bbce4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -776,6 +776,7 @@ mapAliases ({ lua5_1_sockets = throw "'lua5_1_sockets' has been renamed to/replaced by 'lua51Packages.luasocket'"; # Converted to throw 2022-02-22 lua5_expat = throw "'lua5_expat' has been renamed to/replaced by 'luaPackages.luaexpat'"; # Converted to throw 2022-02-22 lua5_sec = throw "'lua5_sec' has been renamed to/replaced by 'luaPackages.luasec'"; # Converted to throw 2022-02-22 + lumo = throw "lumo has been removed: abandoned by upstream"; # Added 2022-04-25 lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2ec4e7668d..c2a271badb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14252,10 +14252,6 @@ with pkgs; kanif = callPackage ../applications/networking/cluster/kanif { }; - lumo = callPackage ../development/interpreters/clojurescript/lumo { - nodejs = nodejs_latest; - }; - kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; From 69146c5629b61fc9d661d5f1be55c65da2a110b4 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 9 May 2022 15:47:53 +0000 Subject: [PATCH 131/150] =?UTF-8?q?dsf2flac:=20unstable-2018-01-02=20?= =?UTF-8?q?=E2=86=92=20unstable-2021-07-31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set artemist as maintainer as current one isn't active Set platform to only x86-64_linux as others do not work --- pkgs/applications/audio/dsf2flac/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix index db07acf7c36..d47bff7fe88 100644 --- a/pkgs/applications/audio/dsf2flac/default.nix +++ b/pkgs/applications/audio/dsf2flac/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dsf2flac"; - version = "unstable-2018-01-02"; + version = "unstable-2021-07-31"; src = fetchFromGitHub { owner = "hank"; repo = pname; - rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16"; - sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc"; + rev = "6b109cd276ec7c7901f96455c77cf2d2ebfbb181"; + sha256 = "sha256-VlXfywgYhI2QuGQvpD33BspTTgT0jOKUV3gENq4HiBU="; }; buildInputs = [ boost flac id3lib taglib zlib ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A DSD to FLAC transcoding tool"; homepage = "https://github.com/hank/dsf2flac"; license = licenses.gpl2; - maintainers = with maintainers; [ dmrauh ]; - platforms = with platforms; linux; + maintainers = with maintainers; [ artemist ]; + platforms = [ "x86_64-linux" ]; }; } From 2a55c8ee8153ef3a91f36bed003e186f0e846810 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 14:43:58 +0000 Subject: [PATCH 132/150] python310Packages.google-cloud-bigquery: 3.0.1 -> 3.1.0 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index a98bac95963..94cebca1a0a 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.0.1"; + version = "3.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UmW6BEV44Ucdg/hUGSQk/kyDnB+Hsyx4q3AXTQe89hI="; + sha256 = "sha256-0tbK940cEz5//ZsLfi198fmy9wPeN3SXuW2adM/o7AI="; }; postPatch = '' From 6be42c879ddd2584f646a86764f7df3212e6c21c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 May 2022 17:05:05 +0000 Subject: [PATCH 133/150] python310Packages.pydeconz: 91 -> 92 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 8523fd96f64..965b4ecf620 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "91"; + version = "92"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ="; + hash = "sha256-qA7AgiiRBq1ekBcQDC8LlLnZLthA0QFZpxNUZdrMMIA="; }; propagatedBuildInputs = [ From 69c4a08072f4b5446b89e4032489f324c48c2d6e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 10 May 2022 16:49:59 +0000 Subject: [PATCH 134/150] envoy: fix sha256 for aarch64-linux --- pkgs/servers/http/envoy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 49fb6f1861b..f7e9f8dd090 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -86,7 +86,7 @@ buildBazelPackage rec { fetchAttrs = { sha256 = { x86_64-linux = "sha256-23Z6SbKnbah/NCrdMrXhrNFFASd/8xRH3fSyIE++heA="; - aarch64-linux = "1ijv4arw67nprykn2wkn4ji8fbr284mc7p74zxfsky772s42yy9j"; + aarch64-linux = "sha256-dMOu0HYUIUJ+XEtctjaZZ1jGGQq+cHbay8+KwR5XqP0="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; From 20653f46b81bb78bed01ac47edafc7aa895c81ec Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 10 May 2022 10:30:46 -0500 Subject: [PATCH 135/150] ocropus: remove --- pkgs/applications/misc/ocropus/default.nix | 59 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 pkgs/applications/misc/ocropus/default.nix diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix deleted file mode 100644 index 41c6cdee41c..00000000000 --- a/pkgs/applications/misc/ocropus/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, fetchFromGitHub, fetchurl, python2Packages, curl }: - -let - getmodel = name: sha256: { - inherit name; - src = fetchurl { - url = "http://www.tmbdev.net/ocropy/${name}"; - inherit sha256; - }; - }; - - models = [ - (getmodel "en-default.pyrnn.gz" - "1xyi3k3p81mfw0491gb1haisazfyi2i18f1wjs1m34ak39qfqjdp") - (getmodel "fraktur.pyrnn.gz" - "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b") - ]; - -in -python2Packages.buildPythonApplication rec { - pname = "ocropus"; - version = "1.3.3"; - - src = fetchFromGitHub { - sha256 = "02p1334mic5cfhvpfphfrbim4036yfd8s2zzpwm0xmm829z71nr7"; - rev = "v${version}"; - repo = "ocropy"; - owner = "tmbdev"; - }; - - propagatedBuildInputs = with python2Packages; [ curl numpy scipy pillow - matplotlib beautifulsoup4 pygtk lxml ]; - - enableParallelBuilding = true; - - preConfigure = with lib; '' - ${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;") - models)} - - substituteInPlace ocrolib/common.py --replace /usr/local $out - substituteInPlace ocrolib/default.py --replace /usr/local $out - ''; - - doCheck = false; # fails - checkPhase = '' - patchShebangs . - substituteInPlace ./run-test \ - --replace 'ocropus-rpred' 'ocropus-rpred -Q $NIX_BUILD_CORES' - PATH=".:$PATH" ./run-test - ''; - - meta = with lib; { - description = "Open source document analysis and OCR system"; - license = licenses.asl20; - homepage = "https://github.com/tmbdev/ocropy/"; - maintainers = with maintainers; [ domenkozar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7c89161495..3b88ddae2e9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -896,6 +896,7 @@ mapAliases ({ OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16 oauth2_proxy = oauth2-proxy; # Added 2021-04-18 + ocropus = throw "ocropus has been removed: abandoned by upstream"; # Added 2022-04-24 octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set"; # Added 2021-01-24 ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12 odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2ec4e7668d..60d3672c422 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14334,8 +14334,6 @@ with pkgs; octavePackages = recurseIntoAttrs octave.pkgs; - ocropus = callPackage ../applications/misc/ocropus { }; - pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; From 381ef9d262b1cdb5fc4e0636f7f0fdb0214b97e5 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 10 May 2022 11:14:10 -0600 Subject: [PATCH 136/150] python3Packages.shiv: disable failing tests --- pkgs/development/python-modules/shiv/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix index 14cb688be46..ab873da47a7 100644 --- a/pkgs/development/python-modules/shiv/default.nix +++ b/pkgs/development/python-modules/shiv/default.nix @@ -25,6 +25,19 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # AssertionError + "test_hello_world" + "test_extend_pythonpath" + "test_multiple_site_packages" + "test_no_entrypoint" + "test_results_are_binary_identical_with_env_and_build_id" + "test_preamble" + "test_preamble_no_pip" + "test_alternate_root" + "test_alternate_root_environment_variable" + ]; + meta = with lib; { description = "Command line utility for building fully self contained Python zipapps"; homepage = "https://github.com/linkedin/shiv"; From df4afffb3c4aecdd1460e02f3ec788be30593b7b Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Tue, 15 Feb 2022 18:23:14 +0100 Subject: [PATCH 137/150] irrlichtmt: init at 1.9.0mt4 --- .../libraries/irrlichtmt/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/irrlichtmt/default.nix diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix new file mode 100644 index 00000000000..e40f2c84b2a --- /dev/null +++ b/pkgs/development/libraries/irrlichtmt/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, zlib +, libpng +, libjpeg +, libGL +, libX11 +, libXxf86vm +, withTouchSupport ? false +, libXi +, libXext +, Cocoa +, Kernel +}: +stdenv.mkDerivation rec { + pname = "irrlichtmt"; + version = "1.9.0mt4"; + + src = fetchFromGitHub { + owner = "minetest"; + repo = "irrlicht"; + rev = version; + sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw="; + }; + + nativeBuildInputs = [ + cmake + ]; + + # https://github.com/minetest/minetest/pull/10729 + postPatch = lib.optionalString withTouchSupport '' + substituteInPlace include/IrrCompileConfig.h \ + --replace '//#define _IRR_LINUX_X11_XINPUT2_' '#define _IRR_LINUX_X11_XINPUT2_' + ''; + + buildInputs = [ + zlib + libpng + libjpeg + libGL + libX11 + libXxf86vm + ] ++ lib.optionals withTouchSupport [ + libXi + libXext + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + Kernel + ]; + + outputs = [ "out" "dev" ]; + + meta = { + homepage = "https://github.com/minetest/irrlicht"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ DeeUnderscore ]; + description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60d3672c422..8f432f8e438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17971,6 +17971,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit; }; + irrlichtmt = callPackage ../development/libraries/irrlichtmt { + inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; + }; + isocodes = callPackage ../development/libraries/iso-codes { }; iso-flags = callPackage ../data/icons/iso-flags { }; @@ -31893,7 +31897,7 @@ with pkgs; inherit (callPackages ../games/minetest { inherit (darwin) libiconv; - inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel; + inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) minetestclient_5 minetestserver_5; From 273e32f1aa4d021dfe32a97e15a1897a4cba1e65 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Sun, 3 Apr 2022 18:25:33 +0200 Subject: [PATCH 138/150] minetest: use irrlichtmt from Nixpkgs, add optional touch support Touch support requires rebuilding irrlichtmt with touch support, which upstream does not enable by default. Building Minetest with touch support also disables the regular interface, so touch support defaults to off. --- pkgs/games/minetest/default.nix | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index e607fbc7113..2a1039901f3 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,9 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp +{ lib, stdenv, fetchFromGitHub, cmake, irrlichtmt, libpng, bzip2, curl, libogg, jsoncpp , libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit , freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex , leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp -, OpenGL, OpenAL ? openal, Carbon, Cocoa -, Kernel +, OpenGL, OpenAL ? openal, Carbon, Cocoa, withTouchSupport ? false }: with lib; @@ -11,21 +10,7 @@ with lib; let boolToCMake = b: if b then "ON" else "OFF"; - irrlichtMt = stdenv.mkDerivation rec { - pname = "irrlichtMt"; - version = "1.9.0mt4"; - src = fetchFromGitHub { - owner = "minetest"; - repo = "irrlicht"; - rev = version; - sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw="; - }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ] - ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; - outputs = [ "out" "dev" ]; - meta = irrlicht.meta; - }; + irrlichtmtInput = irrlichtmt.override { inherit withTouchSupport; }; generic = { version, rev ? version, sha256, dataRev ? version, dataSha256, buildClient ? true, buildServer ? false }: let sources = { @@ -54,7 +39,7 @@ let "-DENABLE_GETTEXT=1" "-DENABLE_SPATIAL=1" "-DENABLE_SYSTEM_JSONCPP=1" - "-DIRRLICHT_INCLUDE_DIR=${irrlichtMt.dev}/include/irrlicht" + "-DIRRLICHT_INCLUDE_DIR=${irrlichtmtInput.dev}/include/irrlichtmt" # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed "-DCMAKE_INSTALL_BINDIR=bin" @@ -68,6 +53,8 @@ let "-DOpenGL_GL_PREFERENCE=GLVND" ] ++ optionals buildServer [ "-DENABLE_PROMETHEUS=1" + ] ++ optionals withTouchSupport [ + "-DENABLE_TOUCH=TRUE" ]; NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 @@ -75,7 +62,7 @@ let nativeBuildInputs = [ cmake doxygen graphviz ninja ]; buildInputs = [ - irrlichtMt luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses + irrlichtmtInput luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses gmp libspatialindex ] ++ optionals stdenv.isDarwin [ libiconv OpenGL OpenAL Carbon Cocoa From 271905a33f9b755dc63620b7a5040ebde8e3f83c Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Sun, 3 Apr 2022 18:32:14 +0200 Subject: [PATCH 139/150] minetest: add aliases and release notes for v4 deprecation --- .../manual/from_md/release-notes/rl-2205.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ pkgs/top-level/aliases.nix | 2 ++ 3 files changed, 14 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 816b3a350fe..36d3f4976db 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1454,6 +1454,16 @@ has been removed. + + + pkgs.minetestclient_4 and + pkgs.minetestserver_4 have been removed, as + the last 4.x release was in 2018. + pkgs.minetestclient (equivalent to + pkgs.minetest ) and + pkgs.minetestserver can be used instead. + + pkgs.noto-fonts-cjk is now deprecated in diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index d16e706a336..7926f6b9667 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -573,6 +573,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. `pgadmin3` has been removed. +- `pkgs.minetestclient_4` and `pkgs.minetestserver_4` have been removed, as the last 4.x release was in 2018. `pkgs.minetestclient` (equivalent to `pkgs.minetest` ) and `pkgs.minetestserver` can be used instead. + - `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` and `pkgs.noto-fonts-cjk-serif` because they each have different release schedules. To maintain compatibility with prior releases of Nixpkgs, diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3b88ddae2e9..31e4fa42250 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -806,6 +806,8 @@ mapAliases ({ mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2"; # Added 2022-01-01 minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 + minetestclient_4 = throw "minetestclient_4 has been removed from Nixpkgs; current version is available at minetest or minetestclient"; # added 2022-02-01 + minetestserver_4 = throw "minetestserver_4 has been removed from Nixpkgs; current version is available at minetestserver"; # added 2022-02-01 minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 From f24cf4422db3f0d76f91af15d68dcaedaf22eba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 27 Jan 2022 10:48:49 +0300 Subject: [PATCH 140/150] maintainers: change musfay to muscaln --- maintainers/maintainer-list.nix | 8 ++++---- .../applications/science/electronics/fritzing/default.nix | 2 +- pkgs/development/libraries/pico-sdk/default.nix | 2 +- pkgs/development/tools/picotool/default.nix | 2 +- pkgs/tools/cd-dvd/bootiso/default.nix | 2 +- pkgs/tools/graphics/adriconf/default.nix | 2 +- pkgs/tools/misc/qdl/default.nix | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 357bcf6720d..7b01e10bf9a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8799,10 +8799,10 @@ githubId = 5047140; name = "Victor Collod"; }; - musfay = { - email = "musfay@protonmail.com"; - github = "musfay"; - githubId = 33374965; + muscaln = { + email = "muscaln@protonmail.com"; + github = "muscaln"; + githubId = 96225281; name = "Mustafa Çalışkan"; }; mupdt = { diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index c5723dbab98..668a34b511d 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -78,7 +78,7 @@ mkDerivation rec { description = "An open source prototyping tool for Arduino-based projects"; homepage = "https://fritzing.org/"; license = with licenses; [ gpl3 cc-by-sa-30 ]; - maintainers = with maintainers; [ robberer musfay ]; + maintainers = with maintainers; [ robberer muscaln ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index eb98c2f9ef6..1b58253edc0 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/raspberrypi/picotool"; description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices"; license = licenses.bsd3; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix index 507284081f5..f76e0287b56 100644 --- a/pkgs/development/tools/picotool/default.nix +++ b/pkgs/development/tools/picotool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/raspberrypi/picotool"; description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; license = licenses.bsd3; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/tools/cd-dvd/bootiso/default.nix index 5acb901a549..ecd8ecbc9ae 100644 --- a/pkgs/tools/cd-dvd/bootiso/default.nix +++ b/pkgs/tools/cd-dvd/bootiso/default.nix @@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation rec { description = "Script for securely creating a bootable USB device from one image file"; homepage = "https://github.com/jsamr/bootiso"; license = licenses.gpl3; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix index 738c5316882..a76eebf4938 100644 --- a/pkgs/tools/graphics/adriconf/default.nix +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; description = "A GUI tool used to configure open source graphics drivers"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/qdl/default.nix b/pkgs/tools/misc/qdl/default.nix index 79b9cec2ed5..e00b4f352e8 100644 --- a/pkgs/tools/misc/qdl/default.nix +++ b/pkgs/tools/misc/qdl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { homepage = "https://github.com/andersson/qdl"; description = "Tool for flashing images to Qualcomm devices"; license = licenses.bsd3; - maintainers = with maintainers; [ musfay ]; + maintainers = with maintainers; [ muscaln ]; platforms = platforms.linux; }; } From b8f84c3d182854430909419f4ed8ab0d0fa22858 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 9 May 2022 21:07:43 +0200 Subject: [PATCH 141/150] python3Packages.eventlet: disable failing test Only for aarch64. It's failing on aarch64: https://hydra.nixos.org/build/176121677/nixlog/2 Unclear if it's an actual failure or not, but disabling should help downstream packages to build again. --- pkgs/development/python-modules/eventlet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 096279b3453..d24874ac591 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -59,6 +59,8 @@ buildPythonPackage rec { "test_patcher_existing_locks_locked" # broken with pyopenssl 22.0.0 "test_sendall_timeout" + ] ++ lib.optionals stdenv.isAarch64 [ + "test_fork_after_monkey_patch" ]; disabledTestPaths = [ From d652974d1a645c504abb65ee5e85d11e738df936 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 10 May 2022 22:34:02 +0200 Subject: [PATCH 142/150] python3Packages.sanic: fix build on aarch64 (#172155) Co-authored-by: Sandro --- pkgs/development/python-modules/sanic/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 91d8c564315..228bf2a5624 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { format = "setuptools"; disabled = pythonOlder "3.7" || - pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88 + pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88 src = fetchFromGitHub { owner = "sanic-org"; @@ -125,6 +125,13 @@ buildPythonPackage rec { "test_raw_headers" # noisy_exceptions sometimes missing from sanic stdout "test_noisy_exceptions" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # test fail on aarch64 + "test_tls_wrong_options" + "test_cookie_expires" + "test_gunicorn_worker" + "test_gunicorn_worker_no_logs" + "test_gunicorn_worker_with_logs" ]; disabledTestPaths = [ From eee661ba01f05f5b2b9b5527df0643ef8f4b024f Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 10 May 2022 14:38:56 -0600 Subject: [PATCH 143/150] vyper: relax semantic-version dependency --- pkgs/development/compilers/vyper/default.nix | 32 +++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index e4ad7fe5f7f..518b230c838 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,6 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, writeText, asttokens -, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx -, sphinx_rtd_theme, pytest-runner, setuptools-scm }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pythonAtLeast +, pythonRelaxDepsHook +, writeText +, asttokens +, pycryptodome +, recommonmark +, semantic-version +, sphinx +, sphinx_rtd_theme +, pytest-runner +, setuptools-scm +}: let sample-contract = writeText "example.vy" '' @@ -10,18 +23,27 @@ let def __init__(foo: address): self.count = 1 ''; -in +in buildPythonPackage rec { pname = "vyper"; version = "0.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; sha256 = "sha256-fXug5v3zstz19uexMWokHBVsfcl2ZCdIOIXKeLVyh/Q="; }; - nativeBuildInputs = [ pytest-runner setuptools-scm ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + pytest-runner + setuptools-scm + ]; + + pythonRelaxDeps = [ "semantic-version" ]; propagatedBuildInputs = [ asttokens From 6951b5c187bbf43830ef49a6f37db45882edebba Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 10 May 2022 22:47:16 +0200 Subject: [PATCH 144/150] hydra-unstable: drop TestMore, which is an alias for `null` --- pkgs/development/tools/misc/hydra/common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 9edafd493ae..2b0775afc37 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -81,7 +81,6 @@ let TermSizeAny TermReadKey Test2Harness - TestMore TestPostgreSQL TextDiff TextTable From 5c8ab091771fb27e1ee792639c197fe4185ba99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 May 2022 23:03:36 +0200 Subject: [PATCH 145/150] python310Packages.ujson: adopt, update meta data --- pkgs/development/python-modules/ujson/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 0d7faf93f93..987347c8695 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ujson"; version = "5.1.0"; - disabled = isPyPy || pythonOlder "3.5"; + disabled = isPyPy || pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -28,9 +28,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "ujson" ]; meta = with lib; { - description = "Ultra fast JSON encoder and decoder for Python"; - homepage = "https://pypi.python.org/pypi/ujson"; + description = "Ultra fast JSON encoder and decoder"; + homepage = "https://github.com/ultrajson/ultrajson"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From db9c0e88530942ae8f6ae94bae08939fb06b673b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 May 2022 23:25:43 +0200 Subject: [PATCH 146/150] python310Packages.pyopenssl: mark broken on aarch64-darwin --- pkgs/development/python-modules/pyopenssl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index d629d97637f..1b847100a95 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -74,5 +74,7 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/pyopenssl"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; + # https://github.com/pyca/pyopenssl/issues/873 + broken = stdenv.isDarwin && stdenv.isAarch64; }; } From e65476950bcf766354c2f336adbb900786a44679 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Tue, 10 May 2022 12:29:32 +0200 Subject: [PATCH 147/150] terraform-providers.cloudamqp: 1.15.3 -> 1.16.0 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8e5db378ffb..8e8fd811e43 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -212,10 +212,10 @@ "owner": "cloudamqp", "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.15.3", - "sha256": "sha256-aQVv/4shdh3AQFTbw1iayNBSGuwDAQ7WUixMeUvAJ0U=", - "vendorSha256": "sha256-Anrcj23MvAk5m3LrGTANBhY6zB46U0st6vMZy2g7Gag=", - "version": "1.15.3" + "rev": "v1.16.0", + "sha256": "sha256-swE4Nr1cQzNQOq8q6o0nZhhYRtgAwTfx6Epm76Jjjqg=", + "vendorSha256": "sha256-oPeldPn30uS5Yl6IfXVPy2R7/wsAdZsEbbhVnVHQVwk=", + "version": "1.16.0" }, "cloudflare": { "owner": "cloudflare", From f15e339ab0c8dff0d09a0c6a8d8fd273e7fc44af Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 22 Apr 2022 12:55:16 -0700 Subject: [PATCH 148/150] terraform-providers.googleworkspace: init at 0.6.0 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8e8fd811e43..82e0d6ff851 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -454,6 +454,15 @@ "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", "version": "4.20.0" }, + "googleworkspace": { + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/googleworkspace", + "repo": "terraform-provider-googleworkspace", + "rev": "v0.6.0", + "sha256": "06cbwkrqrsshnv8ccsnl424l2sq0shi18kxwvrnwg88xvm8qpcfi", + "vendorSha256": "1zid2f8c9yfl6zwqiacngaf2rvvgs4w9phqjamgzibz41ijk6655", + "version": "0.6.0" + }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", From fe66cf22fdf55eab2b2ed8c0ad86bf4fa61602f8 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Wed, 11 May 2022 00:51:42 +0200 Subject: [PATCH 149/150] gnome.pomodoro: 20.0 -> 21.1 (#172147) --- pkgs/desktops/gnome/misc/pomodoro/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix index 245a5229343..b37e96bb3a2 100644 --- a/pkgs/desktops/gnome/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , substituteAll -, fetchpatch , meson , ninja , pkg-config @@ -17,6 +16,7 @@ , libxml2 , glib , gobject-introspection +, json-glib , libpeas , gsettings-desktop-schemas , gettext @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-pomodoro"; - version = "0.20.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "gnome-pomodoro"; repo = "gnome-pomodoro"; rev = version; - sha256 = "sha256-USzLHoBM0QbBPtbTzJJY02cOSDtmlxPGYhMj7M1FJic="; + sha256 = "sha256-47gZsL1Hg30wtq6NeZdi8gbLHUZJ34KLzxvIg5DqyUk="; }; patches = [ @@ -40,13 +40,6 @@ stdenv.mkDerivation rec { src = ./fix-schema-path.patch; inherit pname version; }) - - # Fix error reporting code. - # https://github.com/gnome-pomodoro/gnome-pomodoro/pull/591 - (fetchpatch { - url = "https://github.com/gnome-pomodoro/gnome-pomodoro/commit/133bd62f15653856d9705b66188b42c20d81719e.patch"; - sha256 = "A20K+57A6/lYH2Buri2+wrCQgz6EGBdYg2xQbHPSkYc="; - }) ]; nativeBuildInputs = [ @@ -69,6 +62,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good gst_all_1.gstreamer gtk3 + json-glib libcanberra libpeas sqlite From 288c3c6fbcc10eb6fde316ae03c56937fb828c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20NICOLE?= Date: Tue, 10 May 2022 15:55:06 -0700 Subject: [PATCH 150/150] waylandpp: 0.2.10 -> 1.0.0 (#172097) --- .../libraries/waylandpp/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 30976e46bf1..c0b48ea17c6 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake +, makeFontsConf , pkg-config , pugixml , wayland @@ -8,22 +9,19 @@ , libffi , buildPackages , docSupport ? true -, doxygen ? null -, graphviz ? null +, doxygen +, graphviz }: -assert docSupport -> doxygen != null; - -with lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.10"; + version = "1.0.0"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "sha256-5/u6tp7/E4tjSfX+QJFmcUYdnyOgl9rB79PDE/SJH1o="; + hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg="; }; cmakeFlags = [ @@ -32,15 +30,23 @@ stdenv.mkDerivation rec { "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; - nativeBuildInputs = [ cmake pkg-config ] ++ optionals docSupport [ doxygen graphviz ]; + # Complains about not being able to find the fontconfig config file otherwise + FONTCONFIG_FILE = lib.optional docSupport (makeFontsConf { fontDirectories = [ ]; }); + + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals docSupport [ doxygen graphviz ]; buildInputs = [ pugixml wayland libGL libffi ]; - outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; + outputs = [ "bin" "dev" "lib" "out" ] ++ lib.optionals docSupport [ "doc" "devman" ]; + + # Resolves the warning "Fontconfig error: No writable cache directories" + preBuild = '' + export XDG_CACHE_HOME="$(mktemp -d)" + ''; meta = with lib; { description = "Wayland C++ binding"; homepage = "https://github.com/NilsBrause/waylandpp/"; - license = with licenses; [ bsd2 hpnd ]; - maintainers = with maintainers; [ minijackson ]; + license = with lib.licenses; [ bsd2 hpnd ]; + maintainers = with lib.maintainers; [ minijackson ]; }; }