From 1c0918d8289ea01bb36b85ec4d2353279e55ca0a Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 29 Jan 2022 18:28:20 +0100 Subject: [PATCH 001/114] lib: add mkPackageOption to default.nix this was forgotten in #155669 --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index 26842253880..318f3e9c2e1 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -126,7 +126,7 @@ let getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' scrubOptionValue literalExpression literalExample literalDocBook - showOption showFiles unknownModule mkOption; + showOption showFiles unknownModule mkOption mkPackageOption; inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; inherit (self.asserts) From a08b85f477ed3351025b1b57213297271b9eda47 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 31 Jan 2022 15:49:20 -0600 Subject: [PATCH 002/114] samurai: apply upstream CVE fixes (security) CVE-2021-30218 CVE-2021-30219 --- .../tools/build-managers/samurai/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index 1fb4206d5ce..cd058bfc263 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "samurai"; @@ -13,6 +13,19 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; + patches = [ + (fetchpatch { + name = "CVE-2021-30218.patch"; + url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch"; + sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw="; + }) + (fetchpatch { + name = "CVE-2021-30219.patch"; + url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch"; + sha256 = "sha256-rcdwKjHeq5Oaga9wezdHSg/7ljkynfbnkBc2ciMW5so="; + }) + ]; + meta = with lib; { description = "ninja-compatible build tool written in C"; homepage = "https://github.com/michaelforney/samurai"; From a36d076f8262cf560eec7b7fc22d37bdeaaff601 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 10 Feb 2022 22:10:32 +0100 Subject: [PATCH 003/114] olm: 3.2.9 -> 3.2.10 --- pkgs/development/libraries/olm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index baae8ae81b7..6392383c983 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.9"; + version = "3.2.10"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08"; + sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km"; }; nativeBuildInputs = [ cmake ]; From 5a85302190a2894e51e7447d9924622b1b00479e Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Tue, 8 Feb 2022 07:05:19 +0000 Subject: [PATCH 004/114] qtspim: 9.1.22 -> 9.1.23 --- pkgs/development/tools/misc/qtspim/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/development/tools/misc/qtspim/default.nix index 842cf0eb5b4..7329ad50967 100644 --- a/pkgs/development/tools/misc/qtspim/default.nix +++ b/pkgs/development/tools/misc/qtspim/default.nix @@ -1,23 +1,17 @@ { lib, stdenv, fetchsvn, wrapQtAppsHook, qtbase, qttools, qmake, bison, flex, ... }: stdenv.mkDerivation rec { pname = "qtspim"; - version = "9.1.22"; + version = "9.1.23"; src = fetchsvn { url = "https://svn.code.sf.net/p/spimsimulator/code/"; - rev = "r739"; - sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s"; + rev = "r749"; + sha256 = "0iazl7mlcilrdbw8gb98v868a8ldw2lmkn1xs8hnfvr93l6aj0rp"; }; postPatch = '' cd QtSpim - # Patches from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=qtspim - sed -i 's/zero_imm/is_zero_imm/g' parser_yacc.cpp - sed -i 's/^int data_dir/bool data_dir/g' parser_yacc.cpp - sed -i 's/^int text_dir/bool text_dir/g' parser_yacc.cpp - sed -i 's/^int parse_error_occurred/bool parse_error_occurred/g' parser_yacc.cpp - substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib substituteInPlace menu.cpp \ --replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \ From 97e4ab5ee8575d8bb2f3d3ec6e1daf1473b61a4b Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Fri, 11 Feb 2022 18:26:55 +0100 Subject: [PATCH 005/114] nerd-font-patcher: use upstream repo with sparseCheckout --- .../misc/nerd-font-patcher/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix index 6807cd9024f..ac3fa9200a7 100644 --- a/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -4,15 +4,16 @@ python3Packages.buildPythonApplication rec { pname = "nerd-font-patcher"; version = "2.1.0"; - # The size of the nerd fonts repository is bigger than 2GB, because it - # contains a lot of fonts and the patcher. - # until https://github.com/ryanoasis/nerd-fonts/issues/484 is not fixed, - # we download the patcher from an alternative repository + # This uses a sparse checkout because the repo is >2GB without it src = fetchFromGitHub { - owner = "betaboon"; - repo = "nerd-fonts-patcher"; - rev = "180684d7a190f75fd2fea7ca1b26c6540db8d3c0"; - sha256 = "sha256-FAbdLf0XiUXGltAgmq33Wqv6PFo/5qCv62UxXnj3SgI="; + owner = "ryanoasis"; + repo = "nerd-fonts"; + rev = "v${version}"; + sparseCheckout = '' + font-patcher + /src/glyphs + ''; + sha256 = "sha256-ePBlEVjzAJ7g6iAGIqPfgZ8bwtNILmyEVm0zD+xNN6k="; }; propagatedBuildInputs = with python3Packages; [ fontforge ]; From 762faa21a2f98ecfaa4bce76a0e167311ccd4ce8 Mon Sep 17 00:00:00 2001 From: Florent C Date: Wed, 16 Feb 2022 15:05:51 +0100 Subject: [PATCH 006/114] tlaps: 1.4.3 -> 1.4.5 This updates tlaps to the most recent stable version and fixes the template for the url from which the sources are fetched. Previously, the tarball was fetched from the "current" remote directory from which old versions are eventually removed. The package was therefore broken. It also adds myself (florentc) as a maintainer. --- pkgs/applications/science/logic/tlaplus/tlaps.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 90a4aeb4f8a..14b3055ab36 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { pname = "tlaps"; - version = "1.4.3"; + version = "1.4.5"; src = fetchurl { - url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz"; - sha256 = "1w5z3ns5xxmhmp8r4x2kjmy3clqam935gmvx82imyxrr1bamx6gf"; + url = "https://tla.msr-inria.inria.fr/tlaps/dist/${version}/tlaps-${version}.tar.gz"; + sha256 = "c296998acd14d5b93a8d5be7ee178007ef179957465966576bda26944b1b7fca"; }; buildInputs = [ ocaml isabelle cvc3 perl wget which ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; license = lib.licenses.bsd2; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ florentc ]; }; } From b549e7bbb5fa55cacf97b9aa405f73c030cf712b Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 23 Feb 2022 12:48:51 +0100 Subject: [PATCH 007/114] genJqSecretsReplacementSnippet: Fix error handling With the previous change that enabled error propagation through `inherit_errexit`, the script would fail if `errexit` was set, but `inherit_errexit` was not. This is due to `shopt -p` exiting with an error if the option is disabled. To work around this, use the exit code instead of the text value returned by `shopt -p`. Fixes #160869. --- nixos/lib/utils.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 190c4db4d49..733f9ca522b 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -150,7 +150,8 @@ rec { rm '${output}' fi - inherit_errexit_restore=$(shopt -p inherit_errexit) + inherit_errexit_enabled=0 + shopt -pq inherit_errexit && inherit_errexit_enabled=1 shopt -s inherit_errexit '' + concatStringsSep @@ -170,7 +171,7 @@ rec { ' <<'EOF' ${builtins.toJSON set} EOF - $inherit_errexit_restore + (( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit ''; systemdUtils = { From 8142ba3e889e063726a0bd897cdecd40cb4a8b1e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 23 Feb 2022 16:48:16 +0100 Subject: [PATCH 008/114] mercurial.withExtensions: deprecate phases --- pkgs/applications/version-management/mercurial/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 80c2679d05c..1d8998ab063 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -180,7 +180,7 @@ in buildInputs = self.buildInputs ++ self.propagatedBuildInputs; nativeBuildInputs = self.nativeBuildInputs; - phases = [ "installPhase" "installCheckPhase" ]; + dontUnpack = true; installPhase = '' runHook preInstall From 00725d5dd622da37a39e6d4890e8302c45f478f9 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 22 Feb 2022 09:59:47 +0100 Subject: [PATCH 009/114] irods: 4.2.7 -> 4.2.11 --- pkgs/tools/filesystems/irods/common.nix | 24 ++++--- pkgs/tools/filesystems/irods/default.nix | 69 ++++++++++--------- .../filesystems/irods/irods_root_path.patch | 22 ------ pkgs/top-level/all-packages.nix | 16 +++-- 4 files changed, 62 insertions(+), 69 deletions(-) diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index fa80e024e3d..a7fdf9e2fb2 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: +{ lib, stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq, libarchive +, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2, nanodbc, fmt +, nlohmann_json, spdlog }: # Common attributes of irods packages { nativeBuildInputs = [ autoconf automake cmake gnumake help2man texinfo which gcc ]; - buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost libcxx catch2 ]; + buildInputs = [ bzip2 zlib libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc libkrb5 boost + libcxx catch2 nanodbc fmt nlohmann_json spdlog ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" @@ -16,18 +19,23 @@ "-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}" "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" "-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}" + "-DIRODS_EXTERNALS_FULLPATH_NANODBC=${nanodbc}" + "-DIRODS_EXTERNALS_FULLPATH_FMT=${fmt}" + "-DIRODS_EXTERNALS_FULLPATH_JSON=${nlohmann_json}" + "-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog}" "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0" "-DCPACK_GENERATOR=TGZ" "-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1" ]; - preConfigure = '' - patchShebangs ./packaging - patchShebangs ./scripts - substituteInPlace CMakeLists.txt --replace "DESTINATION usr/bin" "DESTINATION bin" - substituteInPlace CMakeLists.txt --replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/" - substituteInPlace CMakeLists.txt --replace "DESTINATION usr/lib/" "DESTINATION lib/" + postPatch = '' + patchShebangs ./packaging ./scripts + substituteInPlace CMakeLists.txt \ + --replace "DESTINATION usr/bin" "DESTINATION bin" \ + --replace "INCLUDE_DIRS usr/include/" "INCLUDE_DIRS include/" \ + --replace "DESTINATION usr/lib/" "DESTINATION lib/" \ + --replace "{IRODS_EXTERNALS_FULLPATH_JSON}/include" "{IRODS_EXTERNALS_FULLPATH_JSON}/include/nlohmann" export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out " diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index cbc9f19c664..7931911b65f 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,27 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 }: +{ lib, stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man, texinfo, libtool, cppzmq +, libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl, pam, libiodbc, libkrb5, gcc, libcxx, which, catch2 +, nanodbc_llvm, fmt, nlohmann_json, spdlog }: let - avro-cpp=avro-cpp_llvm; + avro-cpp = avro-cpp_llvm; + nanodbc = nanodbc_llvm; in let common = import ./common.nix { inherit lib stdenv bzip2 zlib autoconf automake cmake gnumake - help2man texinfo libtool cppzmq libarchive jansson - zeromq openssl pam libiodbc libkrb5 gcc libcxx - boost avro-cpp which catch2; + help2man texinfo libtool cppzmq libarchive jansson + zeromq openssl pam libiodbc libkrb5 gcc libcxx + boost avro-cpp which catch2 nanodbc fmt nlohmann_json + spdlog; }; -in rec { +in +rec { # irods: libs and server package irods = stdenv.mkDerivation (common // rec { - version = "4.2.7"; + version = "4.2.11"; pname = "irods"; src = fetchFromGitHub { owner = "irods"; repo = "irods"; rev = version; - sha256 = "1pd4l42z4igzf0l8xbp7yz0nhzsv47ziv5qj8q1hh6pfhmwlzp9s"; + sha256 = "0prcsiddk8n3h515jjapgfz1d6hjqywhrkcf6giqd7xc7b0slz44"; fetchSubmodules = true; }; @@ -33,7 +38,7 @@ in rec { # fix build with recent llvm versions NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; - preConfigure = common.preConfigure + '' + postPatch = common.postPatch + '' patchShebangs ./test substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" substituteInPlace cmake/server.cmake --replace "DESTINATION usr/sbin" "DESTINATION sbin" @@ -62,36 +67,36 @@ in rec { # icommands (CLI) package, depends on the irods package irods-icommands = stdenv.mkDerivation (common // rec { - version = "4.2.7"; - pname = "irods-icommands"; + version = "4.2.11"; + pname = "irods-icommands"; - src = fetchFromGitHub { - owner = "irods"; - repo = "irods_client_icommands"; - rev = version; - sha256 = "08hqrc9iaw0y9rrrcknnl5mzbcrsvqc39pwvm62fipl3vnfqryli"; - }; + src = fetchFromGitHub { + owner = "irods"; + repo = "irods_client_icommands"; + rev = version; + sha256 = "0wgs585j2lp820py2pbizsk54xgz5id96fhxwwk9lqhbzxhfjhcg"; + }; - patches = [ ./zmqcpp-deprecated-send_recv.patch ]; + patches = [ ./zmqcpp-deprecated-send_recv.patch ]; - buildInputs = common.buildInputs ++ [ irods ]; + buildInputs = common.buildInputs ++ [ irods ]; - preConfigure = common.preConfigure + '' - patchShebangs ./bin - ''; + postPatch = common.postPatch + '' + patchShebangs ./bin + ''; - cmakeFlags = common.cmakeFlags ++ [ - "-DCMAKE_INSTALL_PREFIX=${stdenv.out}" - "-DIRODS_DIR=${irods}/lib/irods/cmake" - "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" - "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" - "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + cmakeFlags = common.cmakeFlags ++ [ + "-DCMAKE_INSTALL_PREFIX=${stdenv.out}" + "-DIRODS_DIR=${irods}/lib/irods/cmake" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${irods}/lib" ]; - meta = common.meta // { - description = common.meta.description + " CLI clients"; - longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'."; - }; + meta = common.meta // { + description = common.meta.description + " CLI clients"; + longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'."; + }; }); } diff --git a/pkgs/tools/filesystems/irods/irods_root_path.patch b/pkgs/tools/filesystems/irods/irods_root_path.patch index 16b6ba08cbb..58e618c663c 100644 --- a/pkgs/tools/filesystems/irods/irods_root_path.patch +++ b/pkgs/tools/filesystems/irods/irods_root_path.patch @@ -1,25 +1,3 @@ -diff -r -u irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp irods-4.2.0/lib/core/src/irods_default_paths.cpp ---- irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp 2016-11-15 06:23:55.000000000 +0000 -+++ irods-4.2.0/lib/core/src/irods_default_paths.cpp 2016-12-20 18:03:17.156883399 +0000 -@@ -18,7 +18,7 @@ - try { - boost::filesystem::path path{dl_info.dli_fname}; - path = boost::filesystem::canonical(path); -- path.remove_filename().remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install -+ path.remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install - return path; - } catch(const boost::filesystem::filesystem_error& e) { - THROW(-1, e.what()); -@@ -27,8 +27,7 @@ - - boost::filesystem::path - get_irods_config_directory() { -- boost::filesystem::path path{get_irods_root_directory()}; -- path.append("etc").append("irods"); -+ boost::filesystem::path path("/etc/irods"); - return path; - } - diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py --- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000 +++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a92b35031f..2b749d79ee2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6609,13 +6609,15 @@ with pkgs; }; inherit (callPackages ../tools/filesystems/irods rec { - stdenv = llvmPackages.libcxxStdenv; - libcxx = llvmPackages.libcxx; - boost = boost160.override { inherit stdenv; }; - avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; - }) - irods - irods-icommands; + stdenv = llvmPackages.libcxxStdenv; + libcxx = llvmPackages.libcxx; + boost = boost17x.override { inherit stdenv; }; + fmt = fmt_8.override { inherit stdenv; }; + nanodbc_llvm = nanodbc.override { inherit stdenv; }; + avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; + }) + irods + irods-icommands; ignite = callPackage ../applications/virtualization/ignite { }; From cdfd5b47fc8cf838dd0941f05b549b4992ede451 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 24 Feb 2022 21:08:05 +0100 Subject: [PATCH 010/114] php.packages.phing: init at 2.17.1 --- .../php-packages/phing/default.nix | 31 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/php-packages/phing/default.nix diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix new file mode 100644 index 00000000000..0b2e5ff8c58 --- /dev/null +++ b/pkgs/development/php-packages/phing/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: +let + pname = "phing"; + version = "2.17.1"; +in +mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://www.phing.info/get/phing-${version}.phar"; + sha256 = "sha256-Sf2fdy9b1wmXEDA3S4CRksH/DhAIirIy6oekWE1TNjE="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phing/phing.phar + makeWrapper ${php}/bin/php $out/bin/phing \ + --add-flags "$out/libexec/phing/phing.phar" + ''; + + meta = with lib; { + description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; + license = licenses.lgpl3; + homepage = "https://github.com/phingofficial/phing"; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3a9bd1f1fed..69781ced23b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -140,6 +140,8 @@ lib.makeScope pkgs.newScope (self: with self; { deployer = callPackage ../development/php-packages/deployer { }; + phing = callPackage ../development/php-packages/phing { }; + php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { }; From 00e569b437ddb0538cd445ca481ef6e48b170937 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 08:15:51 +0000 Subject: [PATCH 011/114] python310Packages.pyface: 7.4.0 -> 7.4.1 --- pkgs/development/python-modules/pyface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index aafd60c0dba..4c15dd6d4af 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.4.0"; + version = "7.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r8Awj9dOYPWxh1Ar2JK/nhuY8hAGFO4+6yr9yq7Pb6s="; + sha256 = "sha256-UtzzZ5yj5hCjynxLmQSpbGkWiASNtdflKvjlAZ5HrbY="; }; propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ]; From 8af33fe44764dec1bd4d6787c8563d1e2d0c0f5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Feb 2022 13:53:47 +0000 Subject: [PATCH 012/114] python310Packages.zfec: 1.5.5 -> 1.5.7.2 --- pkgs/development/python-modules/zfec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 1cb2780cc94..f91706b97d1 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zfec"; - version = "1.5.5"; + version = "1.5.7.2"; src = fetchPypi { inherit pname version; - sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca"; + sha256 = "sha256-TuUZvg3MfaLohIK8/Av5d6Ql4dfoJ4z1u7uNAPiir7Y="; }; propagatedBuildInputs = [ pyutil ]; From c3010a9971571a3cf53994e62443df3b1c69d1b3 Mon Sep 17 00:00:00 2001 From: Yevhen Shymotiuk Date: Sat, 5 Feb 2022 04:03:06 +0200 Subject: [PATCH 013/114] tdesktop: 3.4.8 -> 3.5.2 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- .../instant-messengers/telegram/tdesktop/tg_owt.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 9a34513acab..265e72c3867 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -70,7 +70,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "3.4.8"; + version = "3.5.2"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -79,7 +79,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "11h2w82i10zn55iz9xda8ihsnv6s8rxm3wkmmmkpa4zfzinryqb4"; + sha256 = "05324xvb00yz2jfigyy7izk8wnq8phm3sidw62kf7xqyh63qnrzh"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 25dc1ff3d03..a3c61a6f337 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -4,17 +4,18 @@ , openh264, usrsctp, libevent, libvpx , libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire +, mesa, valgrind, libepoxy, libglvnd }: stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2021-12-22"; + version = "unstable-2022-02-09"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "6708e0d31a73e64fe12f54829bf4060c41b2658e"; - sha256 = "081ylw8vp8c84x3f1xx1kia6k1sds2iza9fm5dvn3ccgjwxdm5ny"; + rev = "4cba1acdd718b700bb33945c0258283689d4eac7"; + sha256 = "0j201x9k38mvcyhf1wlyghyvdpv1l75xwgj9rl2l7r55afrpw4ca"; fetchSubmodules = true; }; @@ -27,6 +28,7 @@ stdenv.mkDerivation { openh264 usrsctp libevent libvpx libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire + mesa libepoxy libglvnd ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1648d87b0a..388134ac668 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29034,7 +29034,7 @@ with pkgs; taskopen = callPackage ../applications/misc/taskopen { }; tdesktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { - inherit (xorg) libpthreadstubs libXdmcp; + abseil-cpp = abseil-cpp_202111; }; tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { }; From 97e38be9f68ee4fc04413bc71ed9dfbefda98aa6 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 25 Feb 2022 13:34:32 -0600 Subject: [PATCH 014/114] gometer: init at 5.2.0 --- pkgs/applications/misc/gometer/default.nix | 47 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/misc/gometer/default.nix diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix new file mode 100644 index 00000000000..9b335b1aeda --- /dev/null +++ b/pkgs/applications/misc/gometer/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }: + +stdenv.mkDerivation rec { + pname = "gometer"; + version = "5.2.0"; + + src = fetchurl { + url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm"; + sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28="; + }; + + nativeBuildInputs = [ + rpmextract + wrapGAppsHook + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + rpmextract ${src} + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + mkdir $out/share/applications + mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop + substituteInPlace $out/share/applications/gometer.desktop \ + --replace '/opt/goMeter/' "" + + makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \ + --add-flags $out/opt/goMeter/package.nw + + runHook postInstall + ''; + + meta = with lib; { + description = "Analytic-Tracking tool for GoLance"; + homepage = "https://golance.com/download-gometer"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c8d9ec44fc..d69795d0be0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22391,6 +22391,8 @@ with pkgs; gmailctl = callPackage ../applications/networking/gmailctl { }; + gometer = callPackage ../applications/misc/gometer { }; + gomp = callPackage ../applications/version-management/gomp { }; gomplate = callPackage ../development/tools/gomplate {}; From eeb0db101d26a7d50c7d743b36698a5ee519d942 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 25 Feb 2022 15:35:53 -0800 Subject: [PATCH 015/114] roon-server: 1.8-898 -> 1.8-903 --- pkgs/servers/roon-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 4a619539776..b92d871852d 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-898"; + version = "1.8-903"; src = let @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-khp2E5BYb7bGEW6xfCKEqYDqAdElOFLbAkaHjILfyqo="; + sha256 = "sha256-FkB3sh1uwOctBOAW7eO8HFNr9a9RG3Yq4hKKscYYER4="; }; dontConfigure = true; From a657e1dae607573ee859678455c7ae34ecc6b15a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Feb 2022 08:15:33 +0000 Subject: [PATCH 016/114] corectrl: 1.2.2 -> 1.2.3 --- pkgs/applications/misc/corectrl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 8ec80e99522..b976ea89074 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "1zp523cgvmfjc42wx1f1jh5q3jnsnm833m2xnbbwmfrmhrzh5269"; + sha256 = "sha256-vMSIo4tfvEO6SVxB5aNBnHEn+PXN6wUfRAgUCwZEHKQ="; }; nativeBuildInputs = [ From 4d12b79cd7edfbe01216171dd6ef0e4c64851b0a Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 26 Feb 2022 16:04:44 +0900 Subject: [PATCH 017/114] logrotate: do not enable logrotate.service itself logrotate.timer is enough for rotating logs. Enabling logrotate.service would make the service start on every configuration switch, leading to tests failure when logrotate is enabled. Also update test to make sure the timer is active and runs the service on date change. --- nixos/modules/services/logging/logrotate.nix | 1 - nixos/tests/logrotate.nix | 17 +++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 77e4fc39598..082cf92ff4e 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -167,7 +167,6 @@ in systemd.services.logrotate = { description = "Logrotate Service"; - wantedBy = [ "multi-user.target" ]; startAt = "hourly"; serviceConfig = { diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix index 0f6b59f071d..0dee5d4502d 100644 --- a/nixos/tests/logrotate.nix +++ b/nixos/tests/logrotate.nix @@ -15,19 +15,20 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { with subtest("whether logrotate works"): machine.succeed( # we must rotate once first to create logrotate stamp - "systemctl start --wait logrotate.service", + "systemctl start logrotate.service") + # we need to wait for console text once here to + # clear console buffer up to this point for next wait + machine.wait_for_console_text('logrotate.service: Deactivated successfully') + machine.succeed( # wtmp is present in default config. "rm -f /var/log/wtmp*", "echo test > /var/log/wtmp", - # move into the future and rotate - "date -s 'now + 1 month + 1 day'", - # systemd will run logrotate from logrotate.timer automatically - # on date change, but if we want to wait for it to terminate - # it's easier to run again... - "systemctl start --wait logrotate.service", - + # move into the future and check rotation. + "date -s 'now + 1 month + 1 day'") + machine.wait_for_console_text('logrotate.service: Deactivated successfully') + machine.succeed( # check rotate worked "[ -e /var/log/wtmp.1 ]", ) From 8022c82a39c19bd1fe000884703601532204b82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 25 Feb 2022 18:03:55 +0100 Subject: [PATCH 018/114] nixosTests.switchTest: fix race condition on /testpath Currently the test-watch.service gets started in a loop as long as /testpath exists, so `rm /testpath /testpath-modified` runs into a race condition where if the service was just getting activated, it will create /testpath-modified and make the test fail. This is fixed by making the service RemainAfterExit so that it only starts once, and stopping it manually after we remove /testpath. --- nixos/tests/switch-test.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 4f297b6521d..b429babce83 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -283,6 +283,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.test-watch = { serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; ExecStart = "${pkgs.coreutils}/bin/touch /testpath-modified"; }; }; @@ -723,6 +724,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine.succeed("touch /testpath") machine.wait_until_succeeds("test -f /testpath-modified") machine.succeed("rm /testpath /testpath-modified") + machine.systemctl("stop test-watch.service") switch_to_specialisation("${machine}", "pathModified") machine.succeed("touch /testpath") machine.fail("test -f /testpath-modified") From 941c9de4f80b15de3516b00792d54ebbb8039d6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Feb 2022 11:34:25 +0000 Subject: [PATCH 019/114] ffmpeg-normalize: 1.22.6 -> 1.22.7 --- pkgs/applications/video/ffmpeg-normalize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 28a974a7cc6..add2e525dc9 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.6"; + version = "1.22.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aPPRzNotm3ATL0lEq+49lrlrHoNp+Dm1Im5jYF4E1vY="; + sha256 = "sha256-yWn9SoVKnj9KtvBdI3k1a7fuKJmYeu9KrNyvPqw9SHU="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; From 8a6b41d271d0266e50084bb8422d8f2207868045 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 26 Feb 2022 12:49:48 +0100 Subject: [PATCH 020/114] signald: 0.15.0 -> 0.17.0 ChangeLogs: * https://gitlab.com/signald/signald/-/tags/0.16.0 * https://gitlab.com/signald/signald/-/tags/0.16.1 * https://gitlab.com/signald/signald/-/tags/0.17.0 --- ...g-during-gradle-build-inside-Nix-FOD.patch | 35 +++++++++++ .../0002-buildconfig-local-deps-fixes.patch | 60 +++++++++++++++++++ .../instant-messengers/signald/default.nix | 39 ++++-------- .../signald/gradle-plugin.patch | 19 ------ 4 files changed, 107 insertions(+), 46 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch create mode 100644 pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch delete mode 100644 pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch new file mode 100644 index 00000000000..e23aded6d0e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch @@ -0,0 +1,35 @@ +From 232c692240b9c52b95bd38ba7aecb11e7077cf31 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 26 Feb 2022 12:33:13 +0100 +Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD + +--- + build.gradle | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/build.gradle b/build.gradle +index cbb587f..3b06e80 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -82,6 +82,9 @@ static String getVersion() { + + repositories { + maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages ++ maven { ++ url "https://plugins.gradle.org/m2/" ++ } + mavenCentral() + } + +@@ -102,6 +105,8 @@ dependencies { + implementation 'io.prometheus:simpleclient_httpserver:0.14.1' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' + implementation 'io.sentry:sentry:5.6.1' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' ++ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + } + +-- +2.33.1 + diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch new file mode 100644 index 00000000000..c5931238fe5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch @@ -0,0 +1,60 @@ +From 80277ce9e24d9efa8dfd6eb775187c823e0e528e Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 26 Feb 2022 12:36:15 +0100 +Subject: [PATCH 2/2] buildconfig/local deps fixes + +--- + build.gradle | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/build.gradle b/build.gradle +index cbb587f..ad836cf 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -9,10 +9,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal + import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal + import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform + ++buildscript { ++ repositories { ++ maven { ++ url(uri("@deps@")) ++ } ++ } ++ dependencies { ++ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3" ++ } ++} ++ + plugins { +- id 'com.github.gmazzo.buildconfig' version '3.0.3' + id 'application' + } ++apply plugin: "com.github.gmazzo.buildconfig" + + compileJava.options.encoding = 'UTF-8' + +@@ -82,7 +93,10 @@ static String getVersion() { + + repositories { + maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages +- mavenCentral() ++ mavenLocal() ++ maven { ++ url uri("@deps@") ++ } + } + + dependencies { +@@ -102,6 +116,8 @@ dependencies { + implementation 'io.prometheus:simpleclient_httpserver:0.14.1' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' + implementation 'io.sentry:sentry:5.6.1' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' ++ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + } + +-- +2.33.1 + diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index e75c2357b28..3f84c156f82 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,34 +1,24 @@ { lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl -, makeWrapper, fetchpatch +, makeWrapper, fetchpatch, substituteAll }: let pname = "signald"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg="; - }; - - log4j-update-cve-2021-44228 = fetchpatch { - url = "https://gitlab.com/signald/signald/-/commit/7f668062ab9ffa09a49d171e995f57cf0a0803a7.patch"; - sha256 = "sha256-504je6hKciUGelVCGZjxGjHi1qZQaovagXD5PBQP+mM="; - }; - - buildConfigJar = fetchurl { - url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar"; - sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f"; + sha256 = "sha256-eN6lEs6PuRczbzQZmGlNf6Ahp4FbWpA3EArlATEiZHU="; }; # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - patches = [ log4j-update-cve-2021-44228 ]; nativeBuildInputs = [ gradle_6 perl ]; + patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build @@ -36,7 +26,7 @@ let # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) installPhase = '' find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ | sh ''; # Don't move info to share/ @@ -45,8 +35,8 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "sha256-e2Tehtznc+VsvQzD3lQ50Lg7ipQc7P3ekOnb8XLORO8="; - aarch64-linux = "sha256-P48s3vG5vUNxCCga5FhzpODhlvvc+F2ZZGX/G0FVGWc="; + x86_64-linux = "sha256-kZ25p+lIkOqNoFFBgJRYFcvKJenKICVa1PasaaEHmRA="; + aarch64-linux = "sha256-CbFNigp3R7ETX0uXv6PNuhDpmPc4sowbWmwZ+5txXQs="; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -54,22 +44,17 @@ in stdenv.mkDerivation rec { inherit pname src version; patches = [ - ./gradle-plugin.patch - log4j-update-cve-2021-44228 + (substituteAll { + src = ./0002-buildconfig-local-deps-fixes.patch; + inherit deps; + }) ]; - postPatch = '' - sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle - ''; - buildPhase = '' runHook preBuild export GRADLE_USER_HOME=$(mktemp -d) - # Use the local packages from -deps - sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle - gradle --offline --no-daemon distTar runHook postBuild @@ -100,7 +85,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://signald.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = with maintainers; [ expipiplus1 ma27 ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch b/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch deleted file mode 100644 index fec988a94e7..00000000000 --- a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 11d7a99..66805bb 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal - import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform - import org.xml.sax.SAXParseException - --plugins { -- id 'de.fuerstenau.buildconfig' version '1.1.8' -+buildscript { -+ dependencies { -+ classpath files ("BuildConfig.jar") -+ } - } -+apply plugin: 'de.fuerstenau.buildconfig' - - apply plugin: 'java' - apply plugin: 'application' From f85f8cc3049a912ce40a7a7eca6dc7e1d09a8b22 Mon Sep 17 00:00:00 2001 From: schnusch Date: Sat, 26 Feb 2022 14:57:44 +0100 Subject: [PATCH 021/114] remote-touchpad: 1.1.0 -> 1.2.0 --- pkgs/tools/inputmethods/remote-touchpad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/tools/inputmethods/remote-touchpad/default.nix index 0028fa6b7b2..4df476eb5cd 100644 --- a/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XyE8N+YVwfgxToKkhpe8zJ0e3HFDpKt7cfERxWCfbfU="; + sha256 = "sha256-GjXcQyv55yJSAFeNNB+YeCVWav7vMGo/d1FCPoujYjA="; }; buildInputs = [ libX11 libXi libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "sha256-zTx38kW/ylXXML73C2sFQciV2y3+qbO0S/ZdkiEh5Qs="; + vendorSha256 = "sha256-WG8OjtfVemtmHkrMg4O0oofsjtFKmIvcmCn9AYAGIrc="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; From 4ec18cd57e29e4e426875cb7e86591a0083faad7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 27 Feb 2022 10:55:42 +0800 Subject: [PATCH 022/114] bamf: 0.5.5 -> 0.5.6 --- pkgs/development/libraries/bamf/default.nix | 32 ++++++++++----------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 406ff81fe8e..96b677b27b5 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv -, pantheon -, autoconf -, automake -, libtool +{ stdenv +, lib +, autoreconfHook +, gitUpdater , gnome , which , fetchgit @@ -23,26 +22,24 @@ stdenv.mkDerivation rec { pname = "bamf"; - version = "0.5.5"; + version = "0.5.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; - rev = "${version}+21.10.20210710-0ubuntu1"; - sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0"; + rev = version; + sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ="; }; nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ lxml ])) # Tests - autoconf - automake + autoreconfHook dbus docbook_xsl gnome.gnome-common gobject-introspection gtk-doc - libtool pkg-config vala which @@ -69,22 +66,23 @@ stdenv.mkDerivation rec { "--enable-headless-tests" ]; - # fix paths + # Fix paths makeFlags = [ "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/" "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - preConfigure = '' - ./autogen.sh - ''; - # TODO: Requires /etc/machine-id doCheck = false; - # glib-2.62 deprecations + # Ignore deprecation errors NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + passthru.updateScript = gitUpdater { + inherit pname version; + ignoredVersions = ".ubuntu.*"; + }; + meta = with lib; { description = "Application matching framework"; longDescription = '' From c25c096d614f011fdd6abade39ef2d7ba1764054 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 27 Feb 2022 14:51:45 +0800 Subject: [PATCH 023/114] bird: add patch for babel iface reconfiguration --- pkgs/servers/bird/default.nix | 6 +++++- pkgs/servers/bird/dont-create-sysconfdir-1.patch | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 pkgs/servers/bird/dont-create-sysconfdir-1.patch diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 34d1aab3286..5c5fec3d892 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ readline libssh ]; patches = [ - (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch") + ./dont-create-sysconfdir-2.patch + (fetchurl { + url = "https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c831339c4374ace17d8f2ae6ebfeed279.patch"; + sha256 = "sha256-PEgpRnOGLa1orHJDEHlblnVhBVv7XOKPR70M1wUMxMQ="; + }) ]; CPP="${stdenv.cc.targetPrefix}cpp -E"; diff --git a/pkgs/servers/bird/dont-create-sysconfdir-1.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch deleted file mode 100644 index 8f62670aee9..00000000000 --- a/pkgs/servers/bird/dont-create-sysconfdir-1.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -68,2 +68,2 @@ - install: all -- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir) -+ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) From 069b7425200b747ec6516a0663d646b9fb3927eb Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 27 Feb 2022 08:06:53 +0000 Subject: [PATCH 024/114] python3Packages.jax: fix MKL-enabled build on Intel CPUs Intel doesn't know how to build a CPU it turns out. Don't use them for floating point arithmetic, even with their own MKL! --- pkgs/development/python-modules/jax/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index a616a83255b..d5e53654019 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -64,8 +64,15 @@ buildPythonPackage rec { "tests/" ]; - # See https://github.com/google/jax/issues/9705. - disabledTests = lib.optionals usingMKL [ "test_custom_root_with_aux" ]; + # See + # * https://github.com/google/jax/issues/9705 + # * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921 + # * https://github.com/NixOS/nixpkgs/issues/161960 + disabledTests = lib.optionals usingMKL [ + "test_custom_linear_solve_cholesky" + "test_custom_root_with_aux" + "testEigvalsGrad_shape" + ]; pythonImportsCheck = [ "jax" From fbb2eb81f87e113a10c11050b90f25c875f665ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Feb 2022 19:18:20 +0000 Subject: [PATCH 025/114] texlab: 3.3.1 -> 3.3.2 --- pkgs/development/tools/misc/texlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 5f969721aaf..8cf86d9d782 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HX1Mnzq+GsRnUsJERK5gPI5x4op885t+9Vn6vogSK1o="; + sha256 = "sha256-SpfX/3uM1y8skN5BqudUtswkCpinrmHWT7ixbgg8QNI="; }; - cargoSha256 = "sha256-AdzaLqwONI7WEcL8U0OGuyX/pg+BpZbJz9aaSClo47Q="; + cargoSha256 = "sha256-0YipSDKss8qaINkUw9dW8n0fVKp4FmagI9+9jFyXaLA="; outputs = [ "out" "man" ]; From abb2cd336d25bc769dcd55e4fda5a816fbd62e0f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 27 Feb 2022 18:41:57 -0300 Subject: [PATCH 026/114] elpa-generated: updated at 2022-02-27 --- .../emacs/elisp-packages/elpa-generated.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 2cc03add30b..54bcc3a7c06 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -951,10 +951,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.3.tar"; - sha256 = "03asw26nsnnx7hmyqhksq165vpii0h8y6qjjn0x4sdkyyns16yp7"; + url = "https://elpa.gnu.org/packages/devdocs-0.4.tar"; + sha256 = "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm"; }; packageRequires = [ emacs ]; meta = { @@ -1176,10 +1176,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.10"; + version = "0.8.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.10.tar"; - sha256 = "1763zk75a85803wbn68sz4n3yvkhzh3a8571syd1r2npb59b40ad"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.12.tar"; + sha256 = "1k53crdmaw6lzvprsmpdfvg96ck54bzs4z1d4q9x890anglxq5m6"; }; packageRequires = [ emacs seq ]; meta = { @@ -3220,10 +3220,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.16"; + version = "0.4.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.16.tar"; - sha256 = "0k8n2pa20nkqd8w4c86p1f5cgn93favxxhws62i4w16934x6w07j"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.17.tar"; + sha256 = "1j3whjxhjawl1i5449yf56ljbazx90272gr8zfr36s8h8rijfjn9"; }; packageRequires = [ emacs ]; meta = { @@ -4309,10 +4309,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.2.1"; + version = "2.5.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.2.1.tar"; - sha256 = "1101nb0raiivrv1z4w442688cxj5mpf4h4zxzy6mhirgsbayk91p"; + url = "https://elpa.gnu.org/packages/tramp-2.5.2.2.tar"; + sha256 = "104nn6xdmcviqqv4cx5llhwj1sh4q04w3h9s8gimmi2kg0z8s36r"; }; packageRequires = [ emacs ]; meta = { From 679c50b9f042bff5c9131b369692f3a95ceb9278 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 27 Feb 2022 18:42:13 -0300 Subject: [PATCH 027/114] nongnu-generated: updated at 2022-02-27 --- .../emacs/elisp-packages/nongnu-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index f418fa061be..60028dc9950 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.0"; + version = "1.5.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.5.0.tar"; - sha256 = "0ba91yy2id5jsl9bg8cfjm2sqbqp9jwwdikwkdj5v6xz6ggh134b"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.5.1.tar"; + sha256 = "13xf8izl99y1aqwk9k9hgiwggibjycjh2lhwg0wk5hm7zp6gm8mx"; }; packageRequires = []; meta = { @@ -2210,10 +2210,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.0.4"; + version = "17.1.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.0.4.tar"; - sha256 = "0ji40fcw3y2n4dw0cklbvsybv04wmfqfnqnykgp05aai388rp3j1"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.1.4.tar"; + sha256 = "0863p8ikc8yqw0dahswi5s9q7v7rg1hasdxz5jwkd796fh1ih78n"; }; packageRequires = [ emacs ]; meta = { From 6bd9448062fcb75c55c0fa7adf93d3562aa01734 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Feb 2022 21:59:20 +0000 Subject: [PATCH 028/114] python39Packages.oslo-db: 11.1.0 -> 11.2.0 --- pkgs/development/python-modules/oslo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 5070b43515e..3fd7c4e28c5 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "11.1.0"; + version = "11.2.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "8469c54544f1c0d7ac0a998477033eab13733b186d159554311c6132b43862e9"; + sha256 = "sha256-ezppPrC1BEkUmiJWGMdQtvDhZWyEJoGEe0e4UK1FYL4="; }; nativeBuildInputs = [ pbr ]; From f0f954ab65a76c76668dfd1fa754edd2b2591b92 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 27 Feb 2022 20:43:28 -0300 Subject: [PATCH 029/114] melpa-generated: updated at 2022-02-27 --- .../elisp-packages/recipes-archive-melpa.json | 595 +++++++++++------- 1 file changed, 354 insertions(+), 241 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 0d5f267f5a1..0afde2c5c33 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1893,8 +1893,8 @@ "deps": [ "consult" ], - "commit": "425e46cbc44d532b5bcacd90ad55b784834e536b", - "sha256": "0r51mf9s2cbh3qq4y04rc4b5x6b4qfqd5n5ix8xsq5x154ivmfcj" + "commit": "4d65f37a22425cf41c02862522a76e5688998591", + "sha256": "051k54mrq03574lni5nqabmhpbcgpjlm0vjn0yi7h4g0wl299ab6" }, "stable": { "version": [ @@ -3189,11 +3189,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20220128, - 1118 + 20220225, + 1955 ], - "commit": "0cfad246ee4c1297efa399e3d2c6ebb8bb46288b", - "sha256": "1g4gyf087h98njzzjj23n114zhrlg2z1ab7d3v4438wph6c7my14" + "commit": "5bf59f80389d03f11bc0daa7b9cb24a0bc29f6c5", + "sha256": "0xkv0b8d8zywv86160bxhb5z7v401lzgqssagk08rzvb3vrrjf31" }, "stable": { "version": [ @@ -3231,8 +3231,8 @@ 20200914, 644 ], - "commit": "90c30a8e8d37b606decfabf7b52d37022ea5b3a6", - "sha256": "1vxx4h33dx14hrpgch7xk7y83cdxj6vamma2hanzjgwjq7wvdck3" + "commit": "6b13364d36eeb60d8ec15eaf8effe23c73401900", + "sha256": "1mjsxi18rv83wggp53iyh0dzp8y6jy3azqklkr9rmh6xjqb68a30" }, "stable": { "version": [ @@ -5655,8 +5655,8 @@ "avy", "embark" ], - "commit": "f741dab05b09beb18e0a7e87f5b80ea462ca44a2", - "sha256": "1mw3qf1bn0033yajll05f8k3wvvqld1j6qzhbzppnk95kp9vgknm" + "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", + "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" }, "stable": { "version": [ @@ -7577,26 +7577,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20220224, - 1940 + 20220227, + 1237 ], "deps": [ "a" ], - "commit": "45d04ac3935ade2b1e856115c69a32f11e3e7585", - "sha256": "0f2b3i22xl0j8j6b3i5vbfqfn1irylslwk4xvm3w0sk2pghi93y2" + "commit": "44cca9a637c967b8b0b6385f29572bd3b2999a53", + "sha256": "12ccpncf3l5pl5hmn9vaixwm34jy8rpf8iyyn3srj3v8mak3xsa0" }, "stable": { "version": [ 0, 4, - 2 + 3 ], "deps": [ "a" ], - "commit": "45d04ac3935ade2b1e856115c69a32f11e3e7585", - "sha256": "0f2b3i22xl0j8j6b3i5vbfqfn1irylslwk4xvm3w0sk2pghi93y2" + "commit": "44cca9a637c967b8b0b6385f29572bd3b2999a53", + "sha256": "12ccpncf3l5pl5hmn9vaixwm34jy8rpf8iyyn3srj3v8mak3xsa0" } }, { @@ -9875,11 +9875,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220225, - 1627 + 20220227, + 316 ], - "commit": "2ad8edf9d992034b6e1e46315d72801b9e3aa1e5", - "sha256": "01kshih48hvwdn5gyif5z2vqyhx8h12zs6ygkmqyif5lzm4sqmdc" + "commit": "fc7a20be524d0faa848ba2a16a80767a445a1391", + "sha256": "1dwbvixk2zr2k061zrljr933l2gpkx672d1d67gbz5znz4sbjsgh" }, "stable": { "version": [ @@ -10271,8 +10271,8 @@ 20210501, 820 ], - "commit": "eede626d70953715d2405b325dcb151b7cb597e7", - "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" + "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", + "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" } }, { @@ -10320,8 +10320,8 @@ 20200904, 1431 ], - "commit": "eede626d70953715d2405b325dcb151b7cb597e7", - "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" + "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", + "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" } }, { @@ -12798,8 +12798,8 @@ 20210104, 1831 ], - "commit": "0883ab385a8d15075cab99a265a20131a37b506d", - "sha256": "08rhvnhs8ijcsnlvbh40s64zxksjmwjlskv0rxpv1n70jky46fxi" + "commit": "a2513bb55e05bb503f6c0a0122eed17a33aa1354", + "sha256": "0jgjn78y3kmfmzyhvp3j0lclaxfpa8im7d8gvvzr5qv1j83dprdr" }, "stable": { "version": [ @@ -16004,11 +16004,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220224, - 1532 + 20220227, + 1400 ], - "commit": "95d1851567637325425c0956adbf711c801dd45c", - "sha256": "13mf0qrpyq8p1py4csqp49za18r6v61ibpcgiyprr6wiv3vmkg7p" + "commit": "782a90da29568a79259464c1c11854a3e16ea36e", + "sha256": "01f16chhk4s53xmrl6c3a4nac8qmx6cdwlmxkhnc7a032njgd9bi" }, "stable": { "version": [ @@ -16228,6 +16228,25 @@ "sha256": "07qbm5p4cfrrwyp8a5sw0wkdhnqbappz4xjlnjil2krhj9g39q78" } }, + { + "ename": "consult-project-extra", + "commit": "c7df62c7b77134617aa018025736a37760fad471", + "sha256": "0s77hk2iq0q77cdw1j805a5w74hrcj6fvpwk1y9yy0bp0w4gcr4m", + "fetcher": "github", + "repo": "Qkessler/consult-project-extra", + "unstable": { + "version": [ + 20220222, + 1825 + ], + "deps": [ + "consult", + "project" + ], + "commit": "b2a7062251b101aa9d1ba6c1f3f65c69ebdfd784", + "sha256": "14ji1vjj265j0chn3fk9ncm4l66j6jq0g2nq5qz94qnpk1fadf8s" + } + }, { "ename": "consult-projectile", "commit": "ba7bac7fc95ba11094d3ad64d658be0ec7a16817", @@ -16255,14 +16274,14 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20211113, - 1958 + 20220227, + 2050 ], "deps": [ "consult" ], - "commit": "42dea1d40fedf7894e2515b4566a783b7b85486a", - "sha256": "0nzch4x58vgvmcjr6p622lkzms2gvjfdgpvi6bbj5qdzkln5q23a" + "commit": "228306eeda8c57db45609ca068f60ee433367c17", + "sha256": "0rxfxws0d65sdjph91g77a2sy1k90y9hgyps4da0a6kvbm3zprgg" }, "stable": { "version": [ @@ -18584,8 +18603,8 @@ 20211111, 1407 ], - "commit": "b7ff8224f56af256245d691af589ab10126126d3", - "sha256": "1irhh1320zr19z8i6vphhmga3zymqi6xmnzl4a8ciqwyw2p3hc57" + "commit": "11a9e73a4e67b162b10d3db70b513b4d14bb7a43", + "sha256": "0dh67z7aq7jq8bjdi1k7j1c3sb2b9xm8p147qv4rlllfgfqxnmig" }, "stable": { "version": [ @@ -18792,8 +18811,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20220219, - 1917 + 20220226, + 1848 ], "deps": [ "bui", @@ -18805,8 +18824,8 @@ "posframe", "s" ], - "commit": "1880ac680cd7389d2169886dff09f79017e1d28e", - "sha256": "069l0dkngj1sbcx3g31r8kgm7i75xbbbd8d5m4qf3mqqx4fx5sdj" + "commit": "6933fca0b53ea5d2d65a0545e5a4ae6424d32e9b", + "sha256": "1m99z72qmq4ghaiv5s9bqzx4aj1wj4r1d233h6a92hw7kdd9hj0l" }, "stable": { "version": [ @@ -19489,15 +19508,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20220210, - 2155 + 20220227, + 1955 ], "deps": [ "ccc", "cdb" ], - "commit": "eede626d70953715d2405b325dcb151b7cb597e7", - "sha256": "16hqnq6nssf7igv7v0izlcx5hyax5gkjscsxnc6ninp78qardfh3" + "commit": "ac0777ace98b6e8a8a10aa2302d51efeaa6f7893", + "sha256": "0r4ichirlmw6hsgq74kwnw235a85lkn528322rvd1zl1iir0ffsc" } }, { @@ -20181,11 +20200,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220224, - 1712 + 20220226, + 925 ], - "commit": "4f64975c609e5b052a7dee8f96bc3a025a4a581b", - "sha256": "0zd2nxg3rhgni4drb3sd3llnm4wzd0ijxagvpp4irph30qvhm78d" + "commit": "cdc1a7cc3f05235883ffb098fe1c5a8963ed06e2", + "sha256": "1r84yimb8dc1i6ybc2vngvv38ypfnjwrbp93n13h9ij2p9dmxl8p" } }, { @@ -22737,11 +22756,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220220, - 456 + 20220227, + 205 ], - "commit": "1e3c1962558d6545e453583793e1d48417d4ef14", - "sha256": "0zkixr30wxgym9440hkr8996b0d1i8jj04alwd7cmnh8vkwijxfx" + "commit": "4033a8fd8681d3989550f7a2532d6b4e3c45bfe8", + "sha256": "1vfwxjn86rprfz3cfc6w6hw5lqnbh093kydv0lapgz508f5yjazg" } }, { @@ -23479,19 +23498,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20220111, - 1234 + 20220226, + 1354 ], - "commit": "926fc4260c3f71f5aac2e0becb9ee435a4124d5d", - "sha256": "1jq59zac8jwdkp5lc01ygi7f5wlx4bnzkmrsa4j57w0xn70lbkjv" + "commit": "66fc30af02901db023e464a24d2b5fb3ff472794", + "sha256": "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh" }, "stable": { "version": [ 1, - 6 + 7 ], - "commit": "226581d667f11d69474aa4df3ce90f7ec69fe439", - "sha256": "1kad2inc9k2z65if26vfiw098yklzxdx9fw8a6yicb87jgc1cz36" + "commit": "66fc30af02901db023e464a24d2b5fb3ff472794", + "sha256": "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh" } }, { @@ -24430,6 +24449,21 @@ "sha256": "0nx1blkvnzrxd2l7ckdihm9fvq5vkcghf6qccagkjzk4zbdalz30" } }, + { + "ename": "echo-bar", + "commit": "86a702ef21febcfc227c1f2b64a7e795403a81c6", + "sha256": "1zi6qnqmbscl36iafblhshz5hrm5z1phzzb6swz1ryw23808skyr", + "fetcher": "github", + "repo": "qaiviq/echo-bar.el", + "unstable": { + "version": [ + 20220222, + 214 + ], + "commit": "06cc8ef88f3b054f676b76815879bd6c71107591", + "sha256": "00cipip1zlfag1mrqi887qq2a3zf4n39a0z5h3vsv38zslq1rz7x" + } + }, { "ename": "eclim", "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", @@ -25033,11 +25067,11 @@ "repo": "sinic/ednc", "unstable": { "version": [ - 20201122, - 25 + 20220226, + 1619 ], - "commit": "537e2e165984b53b45cf760ea9e4b86794b8a09d", - "sha256": "07cnp40rbl2p4mn40cib6mvby1svxqd8kb3dxb3a8idb736nzqrp" + "commit": "bf588399e241742962613ce2a96f0cffc86417f6", + "sha256": "0y0rxiqa1vxz4ylhagr9mnh1x4lghg1md3k1pqzciq9gnqgl3fpn" } }, { @@ -26923,8 +26957,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20220220, - 1657 + 20220227, + 931 ], "deps": [ "f", @@ -26932,8 +26966,8 @@ "s", "seq" ], - "commit": "70734a1eed6f008135c197e115ca5f197e47ee0b", - "sha256": "1dgk8r1mbc6lmji4by0111sx61zmwlnbi1jd2k1bydhdmbpdi04w" + "commit": "d4e434fa1857ba2f58d27c7520ebeac0515cd140", + "sha256": "0vqqi7g2xwsldmgffi1ygfv87qar6xyqk9r2j23hpyqjh9pzcvx5" }, "stable": { "version": [ @@ -27945,11 +27979,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220223, - 2258 + 20220225, + 2232 ], - "commit": "f741dab05b09beb18e0a7e87f5b80ea462ca44a2", - "sha256": "1mw3qf1bn0033yajll05f8k3wvvqld1j6qzhbzppnk95kp9vgknm" + "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", + "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" }, "stable": { "version": [ @@ -27975,8 +28009,8 @@ "consult", "embark" ], - "commit": "f741dab05b09beb18e0a7e87f5b80ea462ca44a2", - "sha256": "1mw3qf1bn0033yajll05f8k3wvvqld1j6qzhbzppnk95kp9vgknm" + "commit": "8cb3f7655a7868cebe756c1f6c9f2d07ca4da5d4", + "sha256": "1w1swb8qqqzp0b665bd8pbjykgy0523n1wjxwwd0jbma58c4j5xs" }, "stable": { "version": [ @@ -29541,8 +29575,8 @@ 20200914, 644 ], - "commit": "90c30a8e8d37b606decfabf7b52d37022ea5b3a6", - "sha256": "1vxx4h33dx14hrpgch7xk7y83cdxj6vamma2hanzjgwjq7wvdck3" + "commit": "6b13364d36eeb60d8ec15eaf8effe23c73401900", + "sha256": "1mjsxi18rv83wggp53iyh0dzp8y6jy3azqklkr9rmh6xjqb68a30" }, "stable": { "version": [ @@ -29566,8 +29600,8 @@ 20220215, 1844 ], - "commit": "b5f0062fc16549b5836f58105e88c7a458e78470", - "sha256": "1r7sb4m2whfs7fnfihf7i10484vzd26ljvfx2j6wll0zmd842avs" + "commit": "d469db4ddf72479a42b60f5337504fb53b65079e", + "sha256": "1mp8c7hfrdbxp6h51fkqi3ri3fqxwapgp9qbggw1jfpqlsjga8lm" }, "stable": { "version": [ @@ -32072,14 +32106,14 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20211117, - 2046 + 20220227, + 1024 ], "deps": [ "evil" ], - "commit": "26ad08b5f629370f57690315102140878891ef61", - "sha256": "0i36pc7kb5ysk8hm1ll6dq5y6xpl19nm3ap64gzi3b3p94wn6jl0" + "commit": "0d10ff7bb9a3a93d25cd91018b17f0a052b335f3", + "sha256": "15g47xgpswzc8lz7qdbbzfcq1n9m4474qa2jkg43l8d5ali8qa7z" }, "stable": { "version": [ @@ -42862,8 +42896,8 @@ "transient", "with-editor" ], - "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9", - "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm" + "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", + "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" }, "stable": { "version": [ @@ -47793,15 +47827,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220225, - 727 + 20220226, + 2016 ], "deps": [ "helm-core", "popup" ], - "commit": "fbe5eb03255c18466162253c60db7b6ca50f32b4", - "sha256": "11n5rwcw4ky96na3gbfxcdwcp0x4dnrqadpgzkcz2pv8s5ih8g1y" + "commit": "f030e584b7f2c8679297ce960cedbdf0f7e7e86e", + "sha256": "0y1d8kh0swpgplqji5cmpd2xpaywd3zr3qc4msdw9lvylnrkrdgn" }, "stable": { "version": [ @@ -48706,8 +48740,8 @@ "deps": [ "async" ], - "commit": "fbe5eb03255c18466162253c60db7b6ca50f32b4", - "sha256": "11n5rwcw4ky96na3gbfxcdwcp0x4dnrqadpgzkcz2pv8s5ih8g1y" + "commit": "f030e584b7f2c8679297ce960cedbdf0f7e7e86e", + "sha256": "0y1d8kh0swpgplqji5cmpd2xpaywd3zr3qc4msdw9lvylnrkrdgn" }, "stable": { "version": [ @@ -54590,14 +54624,14 @@ "repo": "maxking/hyperkitty.el", "unstable": { "version": [ - 20200927, - 106 + 20220226, + 1951 ], "deps": [ "request" ], - "commit": "ad65766fee2675bf123491544707b056b89b52ce", - "sha256": "1h819sxbzpcnr6mkl6aw9qxhyhkydppwwwqsgyw9qfil9sk8hyff" + "commit": "2c1d22ff017d096c359aa151e6a29f7214a58118", + "sha256": "1ymrzy0l6r6kvrf6p6xwb8dlg4gj8h14xam56d94fbh6mhr53z50" }, "stable": { "version": [ @@ -56183,11 +56217,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20210508, - 309 + 20220227, + 653 ], - "commit": "2bc911df2055ec42a0cda12a0a14bfffaf997f86", - "sha256": "0vbr0s6bsba7f5pbrdaz693pmyzd89vsky5bsblq0qbd4na6wy8m" + "commit": "73682aac9aff60937a5f0187b1896c8f78f1b9cc", + "sha256": "195mpasf89jwr35q3gbcq286hx2siv9asyki4bz5wx175yp3yjjk" }, "stable": { "version": [ @@ -60579,8 +60613,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20220220, - 1315 + 20220226, + 1619 ], "deps": [ "f", @@ -60588,13 +60622,13 @@ "transient", "xterm-color" ], - "commit": "df699c9f110e17a104b20391963e84f261283c9a", - "sha256": "13c2wa7izvksj9m2c2ar4x8bamayrrc7kvxyqj5i50ddf66z79yy" + "commit": "73cb3a8f519dd555f73b981ac9c803b7489ce25b", + "sha256": "0d68zhzclvnhyxvb0l6a841mvbfawvzryrpck36x06wy3899jn5l" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "f", @@ -60602,8 +60636,8 @@ "transient", "xterm-color" ], - "commit": "b0c1fa0ea5317220e573ed29a2607e5f583111ee", - "sha256": "1ki0vbyylgg041vc70l3j7w28sri612mrgn425d5jyz1gdrg4d3s" + "commit": "73cb3a8f519dd555f73b981ac9c803b7489ce25b", + "sha256": "0d68zhzclvnhyxvb0l6a841mvbfawvzryrpck36x06wy3899jn5l" } }, { @@ -61765,8 +61799,8 @@ 20210318, 2106 ], - "commit": "2effe2ed03cebfd11746b1131eef3dd59205cfaf", - "sha256": "1m2bmblvwmlsprhwi92r9ihaddrbwas7fkhxi1cy87w9x4dvwjmq" + "commit": "71aca81024898c9c6ef88962bddc5462a93ffa0c", + "sha256": "05w51blhz9527idrky4c9j24vqlk7dnygws4ynsp78icn3lmixx6" }, "stable": { "version": [ @@ -63846,17 +63880,17 @@ 20220209, 755 ], - "commit": "bc2ec448077a1aadf11ad5ca3b29aa86e1b29527", - "sha256": "0si95v1rswilp0myarvkfd8d47864jplqfrzmy64zbicichkl81j" + "commit": "35d666b3e14c69eeb968f16ca8635a57b908d8ff", + "sha256": "0bywj3y3cz2wd0xzdl3plghpzh2an8wkl07brrkkhpfy9mcrfv0p" }, "stable": { "version": [ + 1, 0, - 36, - 0 + 2 ], - "commit": "a66064050e228d7d3e322817f841187a8f38b089", - "sha256": "1lgzps5qjgb99hybc2mmkjn5axnpz6p58f87dvasj99i008izcl9" + "commit": "7032d39df69b5d727215c1f31e5bbc29970a30a1", + "sha256": "0bywj3y3cz2wd0xzdl3plghpzh2an8wkl07brrkkhpfy9mcrfv0p" } }, { @@ -64626,26 +64660,26 @@ "repo": "Atreyagaurav/litex-mode", "unstable": { "version": [ - 20220221, - 2240 + 20220225, + 2010 + ], + "deps": [ + "cl-lib" + ], + "commit": "533a0c0777e25134d2782917648b6e8d8274a3ac", + "sha256": "0pspw0w0w8jzi97hhsrgniwjymf7ri59kqkjv9lrxycxddaccc5q" + }, + "stable": { + "version": [ + 0, + 3, + 0 ], "deps": [ "cl-lib" ], "commit": "bad847232a9453db76a9a1de024bdcf4ed1e97e2", "sha256": "07sic5ihf4680kcyw34gm1hyli7p63778awn697555bnmbd7y5as" - }, - "stable": { - "version": [ - 0, - 2, - 1 - ], - "deps": [ - "cl-lib" - ], - "commit": "68ef7fc42aec9122fb6723f5592200dc2136efb2", - "sha256": "0bsr9i6rrcr4y549b9vmd4zz38amxn2f5fxvwhijw2mnnl34w65i" } }, { @@ -64715,8 +64749,8 @@ 20220208, 308 ], - "commit": "df88bbde1d63abd59275301fc072d2bc9a360ad8", - "sha256": "177cmqn5xhzm1w6bahy9kqzaiasbzbr53fjr12zh3aby19892fr0" + "commit": "0070f01c244bd103b935052356f16b9c5d1d7387", + "sha256": "0l0w9p6vk6cjm07cmblrsk7f6vnz9b3i39yg6bzklzzqiwaskj7g" }, "stable": { "version": [ @@ -65322,11 +65356,11 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20220219, - 1614 + 20220227, + 1436 ], - "commit": "6971dd1d2e88aa8ecd61cc79a639a28b93ff8895", - "sha256": "1qyzgmn9jn2wmgl0byz15vk81w8pf861rr7kzxl8i9i4s3l7094p" + "commit": "ac0e295080f08797b6a161ff1df550ff78e9c759", + "sha256": "11ngiihl3daynk03z9ndl3ivkgxbx0k4pg4qynw1n1j6pxasb0b1" }, "stable": { "version": [ @@ -65598,15 +65632,14 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20211214, - 1110 + 20220226, + 1437 ], "deps": [ - "haskell-mode", "lsp-mode" ], - "commit": "001032265f8770fc6a88c1dcd8838cd2707f0b30", - "sha256": "1axjafwfacsy5rcxavd6jf28gxrks94mnf4jcdvy5b78nz9imkpq" + "commit": "69ddd5d32d6d7d658ec3f89c8ec6280e912e6be8", + "sha256": "080k3ghhrnlnlq8dzqki6jwnxg3dvg2kzcsx8214k7sfp47qfkwn" } }, { @@ -65899,8 +65932,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220223, - 639 + 20220227, + 2032 ], "deps": [ "dash", @@ -65910,8 +65943,8 @@ "markdown-mode", "spinner" ], - "commit": "cf87368054f32f9ecd3960f79f0815fbf97d798b", - "sha256": "06cw9syavm0hm68w7l41zy9hvy5x6rbc1wla2siy54qwwhsk4jfa" + "commit": "2d640a146ad164f87c7796826791d7bcb85a8e7a", + "sha256": "0j7c5m7n7g7d16ldcqicw1f12dwcbak9gx5606qm8q8nlhk76mnm" }, "stable": { "version": [ @@ -66765,8 +66798,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220225, - 943 + 20220227, + 1341 ], "deps": [ "dash", @@ -66775,8 +66808,8 @@ "transient", "with-editor" ], - "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9", - "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm" + "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", + "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" }, "stable": { "version": [ @@ -67141,8 +67174,8 @@ "libgit", "magit" ], - "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9", - "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm" + "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", + "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" }, "stable": { "version": [ @@ -67296,8 +67329,8 @@ "deps": [ "dash" ], - "commit": "44c58868c997f0b86d66faeed2f0b29064f8d0b9", - "sha256": "0yd5h61ykl1kmcla1z71kwi0yikax817da77fxz29l6mv85dlsfm" + "commit": "0f96d398346293b4d1f60dd878a490c25917cd8a", + "sha256": "1q948ihwfr55spa81vpg3lih6bc0vappl0xlgdagh7m55mg561bm" }, "stable": { "version": [ @@ -68075,11 +68108,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220217, - 21 + 20220226, + 1237 ], - "commit": "097bd81743026c9b4889b860efd0283b26e64ccf", - "sha256": "1zkm3axkg676jcr0rv3na4v212cq4m2lpk0zac5a2s1y0fgvvx2q" + "commit": "5767b6ff49e26ecd6aa26f552397d5d2b8213d25", + "sha256": "143d57fy5i5ziwfxxix595k0f98ay5l57x5z69g8lkp6nb7b1rq7" }, "stable": { "version": [ @@ -70678,11 +70711,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220225, - 1429 + 20220227, + 1815 ], - "commit": "b8b26b1e3c63e9cccd3b5fa68e5895ed2662f042", - "sha256": "0dppwx7rn4c7b30j34763qsx8wwgfcig6j1l6vq5m3ms239qlv9q" + "commit": "425d428a014125022315c2de69c17700a884d3ea", + "sha256": "0map0cy1p887bgjwswnzjq9qmvgw7r8g82515gvqb8x6xw2pfyj3" }, "stable": { "version": [ @@ -71123,6 +71156,21 @@ "sha256": "04xv4v2n03axjlpm9pg3j4zjapqjb7is3anx6laa90zbw3z2iv9z" } }, + { + "ename": "morgentau-theme", + "commit": "4eaf2cdd0089bb115e68d82c1c91284d9a7c1c48", + "sha256": "1fa7rak2yyz1aqhgxli3idq99vp6rqds7va5n92lzg447jxp84mi", + "fetcher": "github", + "repo": "Melchizedek6809/morgentau-theme", + "unstable": { + "version": [ + 20220223, + 1047 + ], + "commit": "63792c50a1fdfdf85c6ba6d7a8eb9fc3ec0a434a", + "sha256": "0p448x7kl4y9zapkf808x4yxg86ifih95af2rhgzaxxm6ndvkyjl" + } + }, { "ename": "morlock", "commit": "b6ef53bbc80edda12a90a8a9705fe14415972833", @@ -71313,8 +71361,8 @@ 20210306, 1053 ], - "commit": "063c41f1d7c1a877f44c1f8caad6be1897350336", - "sha256": "0wqkprcg7p5c92lm614sb4l3viy9m526fxr28mshvws2wyn6072l" + "commit": "f4ed28f37281ae0f2318e5f52f46ba49d58c8ebc", + "sha256": "1k1aclfizzypa007x4zrpabjc8s8gpid7phwi1bycd418nhbx5z8" }, "stable": { "version": [ @@ -72912,6 +72960,21 @@ "sha256": "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax" } }, + { + "ename": "narumi", + "commit": "961a81f77cebaf9361699dec65b733bf33bc92b4", + "sha256": "1d81z6zxxlv2sih28ar6s93ic49z9qy4q03r115k0559bqy47gjh", + "fetcher": "github", + "repo": "nryotaro/narumi", + "unstable": { + "version": [ + 20220221, + 313 + ], + "commit": "7a3b3c3a314612d16f89120b13ebeb8a4149d829", + "sha256": "0j47yah1prq9kvgx4nvbyvmvgivzalg6m1zjldsa63w76d8sfpqk" + } + }, { "ename": "nash-mode", "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", @@ -74102,14 +74165,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220210, - 1734 + 20220227, + 1208 ], "deps": [ "cl-lib" ], - "commit": "f01872a2972450f8d12d84f58f3c5b812c716299", - "sha256": "0rf05lfmr77yq7xqz1nd4bji6d2cipb3hd5ap9lrk6jiv7f72dr2" + "commit": "e0f8daa7c374cd91d9c4e89cbdda6e0e7fe24317", + "sha256": "1098wm46gi15pzh065fpxfjf8lr7jf2sg48yy9yzdi0dwdyz6l4c" }, "stable": { "version": [ @@ -74422,11 +74485,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220225, - 1239 + 20220226, + 1200 ], - "commit": "d298af9e9d75f076d767044738b4811a82f9b2ca", - "sha256": "1yximnzcv4j4fxjiw4mk7qpqmn8ix49kfyh2jfx858c1nbvbhkrl" + "commit": "7167b7556cccbb16ec83144a2f2a095b91a6ba02", + "sha256": "1i6cmaa530s45sawmfsabr8vvqlnk64bifill070jfzpgilxj7bp" }, "stable": { "version": [ @@ -76394,17 +76457,17 @@ 20210923, 1348 ], - "commit": "1ce35b98ff6d76947c648b96ff41ff3b8a9f1234", - "sha256": "19xjj762l6yirqxvjn4gcvxrarbrjrdp88r6x576qzsqppsm5dsk" + "commit": "63e478f1186a03c7e4dfeeb39b3d8fe2ef1cb429", + "sha256": "10vy102a0isd8cg94y61pm4qfgy74d6003dw0qn0bdmbd19r5071" }, "stable": { "version": [ 0, - 20, - 1 + 21, + 0 ], - "commit": "74668925ca977e252acb084bd139b3077cf95b58", - "sha256": "1q78gxsz763d6vbi1lyfmn7733l10qhq80bchdli9zw7sggs7nq1" + "commit": "63e478f1186a03c7e4dfeeb39b3d8fe2ef1cb429", + "sha256": "10vy102a0isd8cg94y61pm4qfgy74d6003dw0qn0bdmbd19r5071" } }, { @@ -79273,6 +79336,21 @@ "sha256": "0qdgs965ppihsz2ihyykdinr4n7nbb89d384z7kn985b17263lvn" } }, + { + "ename": "org-modern", + "commit": "2e87a00dc3f61007db361015f4d3131cb265530c", + "sha256": "0ppc6ww3alzsc13jbqzjyrcci36f4r1kby0y4s8k1d3d1brqq0py", + "fetcher": "github", + "repo": "minad/org-modern", + "unstable": { + "version": [ + 20220226, + 26 + ], + "commit": "fdb7b59682b656a998bf8821d112283e1a3edbd8", + "sha256": "1ihzv6n4zwxq51gba6w3bgzb4ws18h79z8k1iw24gpbz6pw0pwww" + } + }, { "ename": "org-movies", "commit": "ea06dc48003ba3c4f8e70fef4738cdb306362198", @@ -80346,8 +80424,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220224, - 1711 + 20220227, + 2050 ], "deps": [ "dash", @@ -80356,8 +80434,8 @@ "magit-section", "org" ], - "commit": "c8a360afdd96a99c14de1bd22f5f9cd16f2580a6", - "sha256": "1cj3xwny146f3likhcpxwkvyxflyq6z750m6ig5jjrgyq89gqrfy" + "commit": "65ea325071777030978a85cac73ba6741a3c00a8", + "sha256": "0knk77scs08w2gwkxw8an0d743mz1mip6v8dcg44wh8xwwf2hvg1" }, "stable": { "version": [ @@ -80435,16 +80513,16 @@ "repo": "org-roam/org-roam-ui", "unstable": { "version": [ - 20220131, - 1539 + 20220225, + 2151 ], "deps": [ "org-roam", "simple-httpd", "websocket" ], - "commit": "309fe3c58c7081de4e2c9c64f7b40ea291926048", - "sha256": "14qgr3jwn42a8wy07g03j55j5shnvv52ma2wq1zf34dag7d4fghw" + "commit": "df1f9522c5a9cdb248208427fa9df4f2a7666e2a", + "sha256": "03kyg95f012ql0gpzy58kzxgdfksig5zlbr1p9m9ycgqmmxyq4jp" } }, { @@ -81412,20 +81490,20 @@ "repo": "nullman/emacs-org-visibility", "unstable": { "version": [ - 20220109, - 2003 + 20220227, + 1536 ], - "commit": "1c6f4b0e1b83affd95130f2598f16ebc529aa250", - "sha256": "18ys6blh7zc8l015zcv9sl58pb85yf1k3dmsvvm0hcpf4p3frp95" + "commit": "604cee9fa5c16ddb2bf3ce163077e718465bbc1b", + "sha256": "035hx2kkwdar9cw12dj32lq8scvkwafswjhq3aiiw3q7v4icicbf" }, "stable": { "version": [ 1, 1, - 2 + 3 ], - "commit": "1c6f4b0e1b83affd95130f2598f16ebc529aa250", - "sha256": "18ys6blh7zc8l015zcv9sl58pb85yf1k3dmsvvm0hcpf4p3frp95" + "commit": "604cee9fa5c16ddb2bf3ce163077e718465bbc1b", + "sha256": "035hx2kkwdar9cw12dj32lq8scvkwafswjhq3aiiw3q7v4icicbf" } }, { @@ -85826,14 +85904,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20211213, - 435 + 20220225, + 2254 ], "deps": [ "cl-lib" ], - "commit": "d8211a80fbc2cc0d9e163ef6a3e1d0a693b4e00e", - "sha256": "1p7il5s5r582w7if3v3cwkvdb6myszkf2fr2f3sw0x70x644bq2z" + "commit": "7297dabf6de83642e8242052fe95c79d4233eac7", + "sha256": "0rf28lq8nz3mx7hkcny10wwiaj27ph8hwpvqjji86x89w9w67pqr" }, "stable": { "version": [ @@ -88910,6 +88988,25 @@ "sha256": "1agghimrmh4kh71y51l6lzampjl15ac6jxrrhdviw95c3rxfll4x" } }, + { + "ename": "prefab", + "commit": "15837c8aca3dcdf55cebdbf1bc1d69d840056742", + "sha256": "198scgrwhiwyi6cbr3agh8q23m92aybvmvrf3fah4dqz35iay6yg", + "fetcher": "github", + "repo": "LaurenceWarne/prefab.el", + "unstable": { + "version": [ + 20220210, + 1658 + ], + "deps": [ + "f", + "transient" + ], + "commit": "70c20db8423e39e9889222531ba52715c6d5ce87", + "sha256": "1f4qikrs9zdnnr6f1a5vwb0f9kqn1b7fb5n5n9r14h1wc6pn6y48" + } + }, { "ename": "preproc-font-lock", "commit": "582692267795c91bb7f2ec3bffc2b9c2be9f2a32", @@ -89626,11 +89723,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220211, - 932 + 20220227, + 551 ], - "commit": "0243ad7dc96072126fc6c23e48184a0419bab028", - "sha256": "0ryvhffvf8dv0x6g1ianisw7ff8zxvcdz5x043fld33mykfp716h" + "commit": "2c948f3a8ed378ae5fd800d2c66aece06ba058b8", + "sha256": "1nmdyd8bldgs0zcsdqdjj4c5kq3742019qlxprx2cqs640fi5y2s" }, "stable": { "version": [ @@ -90131,8 +90228,8 @@ 20211013, 1726 ], - "commit": "6a77c9bab4bd3c8e10096694469b203bc211246f", - "sha256": "1zi75h0a22yzjb8d408lgika9s9h10z899nxc45dr77xqpfcfww1" + "commit": "cbc9826db7a7927956e4c5094427580291f55f47", + "sha256": "0zvlq5lqy5c6bc02v6442ljw8gp377pqnkfv3h4x60xqv0lqpfjm" }, "stable": { "version": [ @@ -91222,8 +91319,8 @@ 20210411, 1931 ], - "commit": "b4264112ec10186d5465f7d6af9b2ab91a236216", - "sha256": "0pgzcx8bp6yilsh16zzz51fdykxh1197vcjb9d0sz2bd6267r7qy" + "commit": "90dafaef06809eab8fb1dda8bc0955b959fe1e23", + "sha256": "19rxhzbgj5fp0awgij7i7p26ippd5qf4a2c4yzm8vjyjvvmmd5vs" }, "stable": { "version": [ @@ -95958,8 +96055,8 @@ 20220217, 2009 ], - "commit": "4902f06b1bb2ab5076b4ceaba085c702b9f8c138", - "sha256": "1ps4h8zvbaxmm3ifjizxbvd3y84925l5c7mrcmcfaf98l9v03hca" + "commit": "c8ae5dedb3deddaf35f6345da894ae26d156bf27", + "sha256": "01r727n9gp5c7pmgnka53igcaaphfjy7lqb9w8bjjp7db9ccnacd" }, "stable": { "version": [ @@ -96002,8 +96099,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220220, - 1431 + 20220227, + 1323 ], "deps": [ "dash", @@ -96017,8 +96114,8 @@ "spinner", "xterm-color" ], - "commit": "eb5ca14809f28a8774c7212081984c8fbb41a95d", - "sha256": "0mrw7myijfvx3b8yjvq0p5a1nxxm8yqz614449ycwv9h7mh0ysxj" + "commit": "4140ce28ed7beda6b7a1cc6e6cbf242856f1dbb7", + "sha256": "0sd1n4wxw68hj2x87r5vhii3c36p64i36d4mx6ml8f91gxh4nrc6" }, "stable": { "version": [ @@ -96527,8 +96624,8 @@ 20200830, 301 ], - "commit": "fb10c5dbf43e51e03c7dfb582522640e0e3bff5a", - "sha256": "1absjrxh6zlsr9dzf6k18byal9vlf088df6kl1h5839p6w8640by" + "commit": "fef5275f9df821b169bcf5973646c10c9179e876", + "sha256": "1xrwbf4hvm3l33j35q0xii6yrzpqx9v0rvma8p7j41afhhv9fcp0" } }, { @@ -97532,15 +97629,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20220202, - 1359 + 20220226, + 1344 ], "deps": [ "dash", "edit-indirect" ], - "commit": "a2cea75f7b66a02e28334291fc6fb371cd5741b1", - "sha256": "133r9s2zbc1k2jd9ajxbxss0iy9xsjphxzwfhfvvay8jqy0r71gi" + "commit": "a33a04479fc1d4fa0ee618833965ce9914b9c1f4", + "sha256": "1llvhm9kwv67rng7zd91j5cfx34aklx64drs3hrm5nlxpjass7sm" }, "stable": { "version": [ @@ -99564,15 +99661,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220224, - 2352 + 20220227, + 1043 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "180dea856b1026fff1546eedf992a0ec0f103613", - "sha256": "1ngmnx2hms9d5mjcv9rha9y48h0dayj7j9x38wqv4njcj4vmc7b4" + "commit": "8bdcc23f9b9738dd400b98b4503bb359b7bb43e4", + "sha256": "191rqs073cis7cswjmgxmjp9fw30d8n3kqbw9x8kzqqypw0s577l" }, "stable": { "version": [ @@ -106406,8 +106503,8 @@ 20200212, 1903 ], - "commit": "d0234924365d8edafc7a4f4d3c1ef2c88e1da375", - "sha256": "01xbpxlqws56mhcd1gaxq5w36kavjpwxradjd6vj4ay1cfi6c500" + "commit": "6781ecec4ba66950d04180cc0c2adac4f9a1e39f", + "sha256": "0c6ag1yv08xfwh8cmv3jp9i7kr9ppha9sp518vy9pq8cz151xcyw" }, "stable": { "version": [ @@ -107189,11 +107286,11 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220223, - 557 + 20220225, + 1808 ], - "commit": "effbc9191a4cf562dbc71fe4460d093753be5c5d", - "sha256": "0idjhsagvsx5v590m78929jbi3bn9z2qiwcj0gjz3sg2rsxypwk7" + "commit": "42ee2417302b57ea9e81c1c455841b1578934cbc", + "sha256": "167bs3c2vbvjiafgnkyic8pb538cmv9k2df3phh5ly8bk0jzx17x" }, "stable": { "version": [ @@ -107569,11 +107666,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220216, - 2303 + 20220227, + 1751 ], - "commit": "72b8c013936b8e8d891105144107781a43516735", - "sha256": "098j2yflc84xy0bfbxzdf5f413j6gy77ncvpn3j8xy9qi5frnn0i" + "commit": "7c771c94c8fc31d859c1e083bf32fbce403f4766", + "sha256": "1x4bk5m9s5zag8din004n3paiy8l560p2cwcyfc9y2zjn7h5p42v" }, "stable": { "version": [ @@ -108242,6 +108339,14 @@ "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, + { + "ename": "treemacs-tab-bar", + "commit": "fd08b4b2dc7476e39c210207313431e554de9bb9", + "sha256": "1j5ch9jki388dhjnc7lsi6drvrsajjrdhxhqr55hq8ns1dhm8gl9", + "error": "Not in archive", + "fetcher": "github", + "repo": "Alexander-Miller/treemacs" + }, { "ename": "treepy", "commit": "63c94a703841f8c11948200d86d98145bc62162c", @@ -112505,11 +112610,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20220119, - 1026 + 20220227, + 1557 ], - "commit": "d95e0db1bd042d1a8c9bb6bf744eb07ecbf62d73", - "sha256": "0mw2ws23fvxc5lnpic8kbqii0rvjamdvff5xa7rywd9yiwv3yfm8" + "commit": "f70277774a725e177774cc81ecbd228792cd6656", + "sha256": "1kqjq0b0yfhnqxhmzsz7cw01da95nmakc1qjr8jk1m7hwljl3p4b" }, "stable": { "version": [ @@ -113245,6 +113350,14 @@ "sha256": "09jy46qxq5whk8l6znkvghjyc55cmi6z734aagmhiw33wmiyadm4" } }, + { + "ename": "why-this", + "commit": "f45e4eabb023673be2dd3c6c46e752085587c0e2", + "sha256": "1pb73qc67w73p664kfd0na1qmzbz00dmjz468smrpjjscqmazmp3", + "error": "Not in archive", + "fetcher": "git", + "url": "https://codeberg.org/akib/emacs-why-this.git" + }, { "ename": "wide-column", "commit": "8d29def44ae42dc4b60c1d254a57572bd09faf51", @@ -114025,11 +114138,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20220213, - 243 + 20220225, + 1907 ], - "commit": "cb0321c79abbcf31a61d9be02690b434ece55d4d", - "sha256": "09wamwxplj02xi603jkp246n0qynjaj83gvg7d3jn5z0fhgr6blp" + "commit": "19be797818be2d9ac5a0a8acf30b43ad38e2f4ed", + "sha256": "13yj1pl9v0345dnxwdpy50b74syrbqhlrf8ldfnxpiww090n7zmq" } }, { @@ -116418,11 +116531,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220222, - 2250 + 20220227, + 1351 ], - "commit": "08f996693213ec1ff960aab0895151683e846ef1", - "sha256": "0p8l39rawlpd27j6mza4ag5gkmj73xvnwqv8zhxvhhvipb82w43j" + "commit": "a8785b1e012fa178674d5c9fab014b60ca1ba269", + "sha256": "1fy6mz0f1pgx5m9q76a7803rl9pzg1v5pvxslpsw93qi6xw1wjqv" } }, { @@ -116439,8 +116552,8 @@ "deps": [ "zk" ], - "commit": "08f996693213ec1ff960aab0895151683e846ef1", - "sha256": "0p8l39rawlpd27j6mza4ag5gkmj73xvnwqv8zhxvhhvipb82w43j" + "commit": "a8785b1e012fa178674d5c9fab014b60ca1ba269", + "sha256": "1fy6mz0f1pgx5m9q76a7803rl9pzg1v5pvxslpsw93qi6xw1wjqv" } }, { From f73cd879137938f275513b194d8fdfe14afff499 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Mon, 28 Feb 2022 08:44:13 +0800 Subject: [PATCH 030/114] maintainers: remove meutraa --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/editors/android-studio/common.nix | 6 +++--- .../networking/instant-messengers/mm/default.nix | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a55256a7ea4..435e272765e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7904,12 +7904,6 @@ github = "kira-bruneau"; githubId = 382041; }; - meutraa = { - email = "paul+nixpkgs@lost.host"; - name = "Paul Meredith"; - github = "meutraa"; - githubId = 68550871; - }; mephistophiles = { email = "mussitantesmortem@gmail.com"; name = "Maxim Zhukov"; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 9e0907147b8..12324088b04 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -216,9 +216,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ meutraa fabianhjr ]; - beta = [ meutraa fabianhjr ]; - canary = [ meutraa fabianhjr ]; + stable = [ fabianhjr ]; + beta = [ fabianhjr ]; + canary = [ fabianhjr ]; dev = canary; }."${channel}"; }; diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index c8f24e72a9a..ce4963df01e 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -16,6 +16,6 @@ buildGoModule { description = "A file system based matrix client"; homepage = "https://git.lost.host/meutraa/mm"; license = licenses.isc; - maintainers = with maintainers; [ meutraa ]; + maintainers = with maintainers; [ ]; }; } From 11870cb2b0880659dfb9faaad6a13503447302c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 02:33:26 +0000 Subject: [PATCH 031/114] ccache: 4.5.1 -> 4.6 --- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 10e11391cd3..aa38966b198 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -15,13 +15,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.5.1"; + version = "4.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AmzfBuase3RDoRVswyIgBnyL5TK0LXEGmYIpDzsCwgs="; + sha256 = "sha256-h1lhR8P4aNM6tQCodhpEIXwA0bUQ26B3aoiQeX2siCU="; }; outputs = [ "out" "man" ]; From 9363ec256daa0e2b1e51ff124c27e96156d9837c Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Mon, 27 Sep 2021 18:12:20 -0500 Subject: [PATCH 032/114] pdf2odt: use resholvePackage --- pkgs/tools/typesetting/pdf2odt/default.nix | 52 +++++++++++++--------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 6b64ee46609..f1568de60eb 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, makeWrapper, fetchFromGitHub -, bc, coreutils, file, gawk, ghostscript, gnused, imagemagick, zip }: +{ lib +, resholvePackage +, fetchFromGitHub +, bc +, coreutils +, file +, gawk +, ghostscript +, gnused +, imagemagick +, zip +, bash +, findutils +}: -let - path = lib.makeBinPath [ - bc - coreutils - file - gawk - ghostscript - gnused - imagemagick - zip - ]; - -in stdenv.mkDerivation rec { +resholvePackage rec { pname = "pdf2odt"; version = "20170207"; @@ -24,8 +24,6 @@ in stdenv.mkDerivation rec { sha256 = "14f9r5f0g6jzanl54jv86ls0frvspka1p9c8dy3fnriqpm584j0r"; }; - nativeBuildInputs = [ makeWrapper ]; - patches = [ ./use_mktemp.patch ]; installPhase = '' @@ -33,10 +31,24 @@ in stdenv.mkDerivation rec { install -Dm0644 README.md LICENSE -t $out/share/doc/pdf2odt ln -rs $out/bin/pdf2odt $out/bin/pdf2ods - - wrapProgram $out/bin/pdf2odt \ - --prefix PATH : ${path} ''; + solutions = { + default = { + scripts = [ "bin/pdf2odt" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + bc + file + imagemagick + gawk + gnused + ghostscript + zip + findutils + ]; + }; + }; meta = with lib; { description = "PDF to ODT format converter"; From 1639ba3e819abcae801647e89f72c37949261822 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 02:42:42 +0000 Subject: [PATCH 033/114] certipy: 2.0.7 -> 2.0.9 --- pkgs/tools/security/certipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/certipy/default.nix b/pkgs/tools/security/certipy/default.nix index c6b0efe28a2..8bf3e6983b6 100644 --- a/pkgs/tools/security/certipy/default.nix +++ b/pkgs/tools/security/certipy/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "certipy"; - version = "2.0.7"; + version = "2.0.9"; src = fetchFromGitHub { owner = "ly4k"; repo = "Certipy"; rev = version; - hash = "sha256-/89TO/Dzj53bxndLgMIPCaL3axXJUEpX07+25xtnmws="; + hash = "sha256-84nGRKZ0UlMDAZ1Wo5Hgy9XSAyEh0Tio9+3OZVFZG5k="; }; propagatedBuildInputs = with python3.pkgs; [ From 158bf609c53ba114d8828dd402813699bc53188f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 02:51:34 +0000 Subject: [PATCH 034/114] checkip: 0.18.0 -> 0.18.1 --- pkgs/tools/networking/checkip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 46bd55c61e3..2f885d7a859 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wbgFJ46zUPmHS2lDJpCaCFqfASbFW5JLAC0XOB8QJhY="; + sha256 = "sha256-cQY77csZ7UPi09vUOdn3AKrLzGMI2BE16gfL1wDXxZA="; }; vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc="; From 66691701dff52dd85048910e552ae43b8dad7048 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Mon, 28 Feb 2022 11:34:26 +0800 Subject: [PATCH 035/114] jetbrains: update (#161186) - jetbrains.clion: 2021.3.2 -> 2021.3.3 - jetbrains.mps: 2021.2.3 -> 2021.3 - jetbrains.phpstorm: 2021.3.1 -> 2021.3.2 - jetbrains.webstorm: 2021.3.1 -> 2021.3.2 --- .../applications/editors/jetbrains/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3f07b10a329..5f4700c1662 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -251,12 +251,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2021.3.2"; /* updated by script */ + version = "2021.3.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "029xim3a6ijqdbzwxan189ydcy5b0ry2qqc70fipp8ic5z5iai3b"; /* updated by script */ + sha256 = "03gil00srq3jljc13iyb7v1yc6l6yhdhqm9d1ld2j2pympl6p61m"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -316,13 +316,13 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2021.2.3"; /* updated by script */ - versionMajorMinor = "2021.2"; /* updated by script */ + version = "2021.3"; /* updated by script */ + versionMajorMinor = "2021.3"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "1j33b48ki1xw7xb1hr8k2jz7d78h0qcr1b5gql7i40d7szq0iy10"; /* updated by script */ + sha256 = "0zw5xqdlhjfg0smfjl8xy7drf9spiwqbmqq8z22x4zb61lpvdbp9"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -330,12 +330,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "011i3jgfnb2h64ikbm3wi1vfhzm50mwwy9nksl71nzllj3kz111x"; /* updated by script */ + sha256 = "1qi0zq3gzcfnikky37g2dqgmzm7r1883k6asris8nph389qk86vn"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -395,12 +395,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.3.1"; /* updated by script */ + version = "2021.3.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1f918cj76b79x0d2hhv78mvmki5d1dps8nsx7i50wn2qzdml4kc6"; /* updated by script */ + sha256 = "0q2hn48499hv7licpl84ly0bhiizya8a69dl2vjvgscj3cdkr98q"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From f8c560e285a175a7a1c571968974d314397bc2bd Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Mon, 28 Feb 2022 04:59:55 +0100 Subject: [PATCH 036/114] netdata: fix protobuf support --- pkgs/tools/system/netdata/default.nix | 2 ++ pkgs/tools/system/netdata/fix-protobuf.patch | 23 ++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/system/netdata/fix-protobuf.patch diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 0ae4e77910e..d1e3065efd2 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -47,6 +47,8 @@ in stdenv.mkDerivation rec { # Therefore we put it into `/run/netdata`, which is owned # by netdata only. ./ipc-socket-in-run.patch + # This is only needed for 1.33.1, remove on the next release + ./fix-protobuf.patch ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/pkgs/tools/system/netdata/fix-protobuf.patch b/pkgs/tools/system/netdata/fix-protobuf.patch new file mode 100644 index 00000000000..963e307ec77 --- /dev/null +++ b/pkgs/tools/system/netdata/fix-protobuf.patch @@ -0,0 +1,23 @@ +diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c +index b64a78f29..ccd1c884d 100644 +--- a/daemon/buildinfo.c ++++ b/daemon/buildinfo.c +@@ -60,7 +60,6 @@ + // Optional libraries + + #ifdef HAVE_PROTOBUF +-#if defined(ACLK_NG) || defined(ENABLE_PROMETHEUS_REMOTE_WRITE) + #define FEAT_PROTOBUF 1 + #ifdef BUNDLED_PROTOBUF + #define FEAT_PROTOBUF_BUNDLED " (bundled)" +@@ -71,10 +70,6 @@ + #define FEAT_PROTOBUF 0 + #define FEAT_PROTOBUF_BUNDLED "" + #endif +-#else +-#define FEAT_PROTOBUF 0 +-#define FEAT_PROTOBUF_BUNDLED "" +-#endif + + #ifdef ENABLE_JSONC + #define FEAT_JSONC 1 From bbba21baaa6f42fe1bd0284cc418cbddadcf379d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 03:35:57 +0000 Subject: [PATCH 037/114] python310Packages.willow: 1.4 -> 1.4.1 --- pkgs/development/python-modules/willow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 3dafd4df44b..4f6955c2dbd 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "willow"; - version = "1.4"; + version = "1.4.1"; disabled = pythonOlder "2.7"; src = fetchPypi { pname = "Willow"; inherit version; - sha256 = "0b3lh7z98nlh4yn0cmvk7bimhfk5w4qvbmjr6jn880ji9h2ixq6d"; + sha256 = "sha256-Dfj/UoUx4AtI1Av3Ltgb6sHcgvLULlu+1K/wIYvvjA0="; }; propagatedBuildInputs = [ six pillow ]; From cc87193562dcb336c986a83f9ba89fca87e76186 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 03:38:00 +0000 Subject: [PATCH 038/114] python310Packages.python-hosts: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/python-hosts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index 934f15a7a46..4eca7cca13f 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-hosts"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "8f827da4a1bf69d4f4f881f7d7ebc8b378967b60924aa4baea2c9d1debedf5fc"; + sha256 = "sha256-4SAXjx5pRDhv4YVUgrUttyUa5izpYqpDKiiGJc2y8V0="; }; # win_inet_pton is required for windows support From c3dbdb1d1076830c2244d65180e2d33f841d7ebe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 03:22:24 +0000 Subject: [PATCH 039/114] python310Packages.pyoverkiz: 1.3.8 -> 1.3.9 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index c4e80575801..b602b6db0d0 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.3.8"; + version = "1.3.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "v${version}"; - hash = "sha256-U/Yf+PZdggqfd9b/fuPoLKOACooobjSaqhsXcIcOKSU="; + hash = "sha256-3jL9qu4kKpjLoNboMRSp8w/8K2jf+7z8BZsvzYVUjPc="; }; nativeBuildInputs = [ From ee62ae9a6993113581443d0a2eba0ec63f014fa8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 03:47:07 +0000 Subject: [PATCH 040/114] python310Packages.plexapi: 4.9.2 -> 4.10.0 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index ef702b93adb..02831000e88 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.9.2"; + version = "4.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-93qMSOnCl18dRZQB8v2Cxv21vsdFzHefQ7zttQAuPKk="; + sha256 = "sha256-paj1QFSHQw7MfOor1yYwb2vkF9b5RPj6R6dRstK24gA="; }; propagatedBuildInputs = [ From 142326c28aa4839dcf029d8bc38befb6e182efbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 04:00:36 +0000 Subject: [PATCH 041/114] python310Packages.py3status: 3.40 -> 3.41 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 160c5763995..a5de75f70f8 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.40"; + version = "3.41"; src = fetchPypi { inherit pname version; - sha256 = "9eb6f721f94f28a17a8599ca2743a2bedd58c16cfe74e9817ffa948c13dbb79c"; + sha256 = "sha256-2G+5lKkLtgZ/2ghU0xVTDqIXbTNykYIKRiwZiagusoc="; }; doCheck = false; From 50e0e1248290466943b040ea300178ac02497313 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 04:05:12 +0000 Subject: [PATCH 042/114] python310Packages.trimesh: 3.10.1 -> 3.10.2 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index c479f1e2c1c..de28f70bca0 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.10.1"; + version = "3.10.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4i1pSpCydU/SzoMSkW5NN5rOVd9J09/cBOLE6WQCUE0="; + sha256 = "sha256-PcR84la6ZJjtpjg4WGVUkyZJqVT8Ge7vjk90X6gStAo="; }; propagatedBuildInputs = [ numpy ]; From efa6365cf6254db27d88eeb2140365c19430cb32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 02:54:11 +0000 Subject: [PATCH 043/114] python310Packages.spacy-legacy: 3.0.8 -> 3.0.9 --- pkgs/development/python-modules/spacy/legacy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix index b09983aeae3..3ee2feeaa96 100644 --- a/pkgs/development/python-modules/spacy/legacy.nix +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "spacy-legacy"; - version = "3.0.8"; + version = "3.0.9"; src = fetchPypi { inherit pname version; - sha256 = "b4725c5c161f0685ab4fce3fc912bc68aefdb7e102ba9848e852bb5842256c2f"; + sha256 = "sha256-T33LxObI6MtOrbsAn5wKGipnRC4AMsjWd2yUcMN1mQM="; }; # checkInputs = [ pytestCheckHook spacy ]; From 102c02f432c5ec2529da3a3c4a65b5074daafc02 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 03:29:08 +0000 Subject: [PATCH 044/114] terraform-providers: update 2022-02-28 --- .../terraform-providers/providers.json | 132 +++++++++--------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d74ddedb31f..5a81fd1b6b0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -40,10 +40,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.157.0", - "sha256": "02zsp7kxvg6i7wzrx6qigjsvxmmz4rhpjb36qz1jwn3dzpx6dyv1", - "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", - "version": "1.157.0" + "rev": "v1.158.0", + "sha256": "0q5c9sdpjycrh61khc840l14h5r16kj9vf0nlsqffi9wi8k1i2zr", + "vendorSha256": "05vkn52s0x6kcyxxs0p7w6z1nclmvvla7rjv1ippzw7fgn2s19m0", + "version": "1.158.0" }, "ansible": { "owner": "nbering", @@ -112,10 +112,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.97.0", - "sha256": "0a95xq2bk6a1yas2kxfq30s41s2jgv2rjvz4y7m34wlldd9qxfhg", + "rev": "v2.98.0", + "sha256": "0cfdw70q1kh6f50gsc94mh1xi7s4z47wfsmskp1ahx7av7wpz1p6", "vendorSha256": null, - "version": "2.97.0" + "version": "2.98.0" }, "azurestack": { "owner": "hashicorp", @@ -157,10 +157,10 @@ "owner": "brightbox", "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", - "rev": "v2.1.1", - "sha256": "0gscxy921h8wkr40pi86dfx62z2jl0kkvnkfw7ab7xswz63h1ilm", - "vendorSha256": "1ij21y7lx6599b87vlz31mwykj0qam62w7776d6ar99pc0zl8r8k", - "version": "2.1.1" + "rev": "v2.2.0", + "sha256": "1n0gdfsj8ylmm5pqsjs3dvjvj8larc30x5p9jq546xvi2idvl39n", + "vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71", + "version": "2.2.0" }, "checkly": { "owner": "checkly", @@ -176,10 +176,10 @@ "owner": "CheckPointSW", "provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint", "repo": "terraform-provider-checkpoint", - "rev": "v1.6.0", - "sha256": "1sfvglyd5giwlfyix4klicli96yz7cp7ry6lbvjziw5xaxs5ramf", - "vendorSha256": "1jsy9ls04rkyl6kl98lp6av8y3clpyskqqhlm9vl5qsv6saqcry7", - "version": "1.6.0" + "rev": "v1.7.0", + "sha256": "1msd3qjrrhl0v3m7n9ybkwxki5wpchzjswd2dcifbif4k8pcs470", + "vendorSha256": "0yaxgyzwja5dl4p7w8q77ash75xwsf05kq88nvmdf94lvspfnwlq", + "version": "1.7.0" }, "ciscoasa": { "owner": "CiscoDevNet", @@ -230,10 +230,10 @@ "owner": "Constellix", "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", - "rev": "v0.3.11", - "sha256": "00amvk2d4nb029kjlbljjidmgs7irf7v0ss192csgiyxqi378k2c", + "rev": "v0.4.0", + "sha256": "1z23nri0xk6y1xvrz89hda4ssnbgx6dfzq0fc4nywl6naf2nybyw", "vendorSha256": null, - "version": "0.3.11" + "version": "0.4.0" }, "consul": { "owner": "hashicorp", @@ -248,10 +248,10 @@ "owner": "poseidon", "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", - "rev": "v0.9.2", - "sha256": "104j34b1m110fdya21k4rz03j1yba4a9cpm7hq13i8hc2diqjqnc", + "rev": "v0.10.0", + "sha256": "1wh5qd4m0wxbgd84mnnv5ghi57721wz1bdw0k7ff7l7d4whb0q1z", "vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk", - "version": "0.9.2" + "version": "0.10.0" }, "datadog": { "owner": "DataDog", @@ -356,10 +356,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v1.0.0", - "sha256": "0rpggjsnxwz3rd93nxqr0w2addscxw498mf1mjp3mvkj1f3r9afi", + "rev": "v1.1.0", + "sha256": "02ymg29fmx23hgsifb8dr28yxl3h2d93cn4k6x8cx763nyfd5aqf", "vendorSha256": null, - "version": "1.0.0" + "version": "1.1.0" }, "flexibleengine": { "owner": "FlexibleEngineCloud", @@ -401,10 +401,10 @@ "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.9.1", - "sha256": "1pqwgshjrzdw8prgadwq0hf0q72jjjfaas6kgh2as3yn8q24ynca", - "vendorSha256": "04v5hgq23rpz6h242v0m2zhpsfmx4h97pf396w4v6j0kj1wabf87", - "version": "3.9.1" + "rev": "v3.10.0", + "sha256": "1grmsjnr3af95qiwygmxnyij90bn89kd781s556yiq40qa776nql", + "vendorSha256": "04dqjcxx2z43p8c0z8hwr3xw7g4sggxgclqpk83rapprvbmh33dj", + "version": "3.10.0" }, "google": { "owner": "hashicorp", @@ -430,10 +430,10 @@ "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.19.0", - "sha256": "1ch4nxva1ixmgm6kjyvbd4ydrl8w39ll0ljpk1m2lrg5pn349mjn", - "vendorSha256": "0z8sd1hq0hhm51fi91ri6dmsq6brba9vd22gxkgzxfdsncq24h2a", - "version": "1.19.0" + "rev": "v1.20.1", + "sha256": "1hl1dplb59hssdlq0j83mix9abfgzkbpqpsfirwd8pv4z47s055j", + "vendorSha256": "157y4fwfd2l822ass7v2sa3vn3kxrfhiapg5rwsm8q3lg1g42f2m", + "version": "1.20.1" }, "gridscale": { "owner": "gridscale", @@ -448,10 +448,10 @@ "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.32.2", - "sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f", + "rev": "v1.33.1", + "sha256": "1mskbr0adhnri72fa3afghxpcfbzq0qnpslhh9gdnymvs3afjbdg", "vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv", - "version": "1.32.2" + "version": "1.33.1" }, "helm": { "owner": "hashicorp", @@ -466,10 +466,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.0.0", - "sha256": "1dskbwa10dmj5fdw0wplby6hhcvxri68jlg34966mqx8pas3zsxy", + "rev": "v5.0.1", + "sha256": "13nsqvcbb9ydzsgri090ddw2y5gcxa2a07i1hfzm78mf5hflp4rb", "vendorSha256": "13f7841i14b5n5iabqky7694mbqg95f0cvaygapczki5lf2j7fqy", - "version": "5.0.0" + "version": "5.0.1" }, "http": { "owner": "hashicorp", @@ -674,28 +674,28 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.2.2", - "sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi", - "vendorSha256": null, - "version": "3.2.2" + "rev": "v3.3.0-alpha.1", + "sha256": "0lihzid312q8qh1bl9x1wqslshq7pb0q4m8dgbww1cszzg6xb5aq", + "vendorSha256": "0aniiiysh6iq20fcqvdgs6a4l3prbxzpqpp2ixpfaxhg4z5l8zrf", + "version": "3.3.0-alpha.1" }, "minio": { "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.3.0", - "sha256": "0cgjcq5fk4cyxrpvqkg7nk9hjzr28nmhmlnhclx9bw2rm3g7i000", - "vendorSha256": "0p3mg2j89jjkhgv57l5pkpyjdhbh41ilb5az5y2m5zz3kbl4y13b", - "version": "1.3.0" + "rev": "v1.4.0", + "sha256": "0da7dhgs1c4r65fwwbkbz67lphrsl6ia5v8yx5viwfrsgdh0319z", + "vendorSha256": "1yshi8sz99ii9v77hlgkrcxrazjc8f6s79dszxdrnjwhahnz0hac", + "version": "1.4.0" }, "mongodbatlas": { "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.2.0", - "sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi", - "vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks", - "version": "1.2.0" + "rev": "v1.3.0", + "sha256": "0lrzbljd8iklyrmplc64lq4v8y7z5fw7l41y27nsfjl4rm0xz5bn", + "vendorSha256": "0kkkrdbapyvfzmnbh5kmhlcz5l8g8gf0mfwbya66iy1bb6f6w4mz", + "version": "1.3.0" }, "ncloud": { "owner": "NaverCloudPlatform", @@ -774,10 +774,10 @@ "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.64.0", - "sha256": "1x8lhyr356j2gihgfy8563n75aqb2prwvdlnkxmvlbqcp10rnggd", + "rev": "v4.65.0", + "sha256": "19np5x4swc5k8zjg4rjhx85x7xr4jzyvbcpsgfqaqgdg99hjcmjq", "vendorSha256": null, - "version": "4.64.0" + "version": "4.65.0" }, "okta": { "owner": "okta", @@ -829,10 +829,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.27.5", - "sha256": "04kr3319xpzabajzav3hl2ibws2lj7x2naqfc9gpdy7j06rhhkaa", - "vendorSha256": "1lyz6lb4ciddr3d2zh5hfdfvhdacs13xynkpsjcjyqqfhayxqavg", - "version": "1.27.5" + "rev": "v1.27.6", + "sha256": "1vq2h4ldvskw874fdnjqh1np5z09dh3q3lrqjmfand8ksrzacjjm", + "vendorSha256": "0bkya9ckh82bacaksqbb6010fwclz9wh1b5k1s9z9d0d6bgvf60m", + "version": "1.27.6" }, "opsgenie": { "owner": "opsgenie", @@ -1045,10 +1045,10 @@ "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.12.0", - "sha256": "04rrs6x9grkqqqrz3l3nqzp3vy03jw24l1grx2nbw8srpgw1pcwl", + "rev": "v2.13.0", + "sha256": "1jg6jdmxi60v8gsqycnq7jy89l2zls37zvl317vhp8f93si2hr2d", "vendorSha256": "19zhpa47wxkxk2nixd960xz9xh38nq5ml7dwnimr4v1mpvw9hcgc", - "version": "2.12.0" + "version": "2.13.0" }, "template": { "owner": "hashicorp", @@ -1063,10 +1063,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.61.8", - "sha256": "1a8p141m3kcr1irl9z3vpjs6zkgqp003z7m52yskapv4df8d6skz", + "rev": "v1.61.13", + "sha256": "1g1y9x9xfhyjksn7wb60vddli9fwga5r7snvrsa7sh8fkwvpfs0s", "vendorSha256": null, - "version": "1.61.8" + "version": "1.61.13" }, "tfe": { "owner": "hashicorp", @@ -1136,10 +1136,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.3.0", - "sha256": "1b36c2f06fglf6bs6s4ly73vk1cm7zd1ci13df5wp0f2xxib3szk", + "rev": "v3.3.1", + "sha256": "1mxy44dl1wr99v6b0gvzcf9d5nfky0avmx4fq83h9vfnvq7rmrhn", "vendorSha256": "0x9cyxnaqkfpzx9ml7qqhl98jslpy1v965kd11kgcvqpr9lmc77x", - "version": "3.3.0" + "version": "3.3.1" }, "vcd": { "owner": "vmware", From 51bbbb19ed244d766c0079cfd11b7435f750ad9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 05:21:01 +0000 Subject: [PATCH 045/114] python310Packages.slixmpp: 1.7.1 -> 1.8.0.1 --- pkgs/development/python-modules/slixmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index f28708bdf03..4a4386ff5bc 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.7.1"; + version = "1.8.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-mvg23FdHJZeIZRcm8GLWmm9DDTBt29jmsUHB/smVSec="; + sha256 = "sha256-J3znZl77jST94KhUBQcCxSK0qnsVWIYTG6u3po5FHh8="; }; patches = [ From 4cf4214c7a170d68816e7cf59b3d1f54fb273dc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 05:37:11 +0000 Subject: [PATCH 046/114] flyctl: 0.0.300 -> 0.0.301 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 2ab433d79b6..7de71132d6a 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.300"; + version = "0.0.301"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-hwFnS8GLqGS28AdBgpIn2gRCKgJQSALDVLh5QdObV6g="; + sha256 = "sha256-UwouKnUfEcYpwtLXxwe93mHzVvj/+72FSQ0OW55oztE="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-o5c3wbETEwnQ7IH8YM0xHSCXTnWTvZ5kvqRqoA3QkGc="; + vendorSha256 = "sha256-VKX/Wt7CQy3w4Zv51M/IF1RIPpn7nTCL1T6jJ+oxti4="; doCheck = false; From d4de0d56282716fcd54a077e80aaa41c567f83b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 04:27:59 +0000 Subject: [PATCH 047/114] python310Packages.pyisy: 3.0.2 -> 3.0.3 --- pkgs/development/python-modules/pyisy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index b671dbde59e..67a3892cdc0 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; rev = "v${version}"; - hash = "sha256-ad3hVs0B3uBHj/LVWwAXAkUMbjHPtyaeKueRPcmIMFg="; + hash = "sha256-zQ0IBfbWEGv5t+b3EKF+6tEpmwfAWFMndPqSNSQZ5b4="; }; postPatch = '' From e769e73003858b1974aeb79a0317171d4ad100df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 05:51:52 +0000 Subject: [PATCH 048/114] python310Packages.fastapi: 0.74.0 -> 0.74.1 --- pkgs/development/python-modules/fastapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index b8cce5808cc..7f4a0adc495 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.74.0"; + version = "0.74.1"; format = "flit"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = version; - sha256 = "sha256-pA+oaZpyRDeQ+b9jrzpYdm3LZQ5QWNjvfFRtUe8eDSo="; + sha256 = "sha256-aYSJ30nAS3cG1fVSXuX2m3bxUSnpbWWUxFQy7dzuiTA="; }; propagatedBuildInputs = [ From 4884066cf4e32e893414bfbf7173b4e3bbca1e52 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Mon, 28 Feb 2022 13:55:34 +0800 Subject: [PATCH 049/114] godns: 2.6 -> 2.7 --- pkgs/tools/networking/godns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index a20d63af233..b2744b8ed97 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "godns"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-U8fmjcPeTcKlf721UIbA4/JYeM4l+OIyAPGNp8IPvSk="; + sha256 = "sha256-PD/3WIxNPtC7s4+2ogWG5DEm717rYQLMx9XA06Q6ebo="; }; - vendorSha256 = "sha256-OyqkjA90zcfqRL6pfISR/6WXbv5LwVhKDECBtlqords="; + vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850="; # Some tests require internet access, broken in sandbox doCheck = false; From 6db4dc07c61bfa8670583d586a6477ef070ea717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 06:18:54 +0000 Subject: [PATCH 050/114] remind: 03.04.00 -> 03.04.01 --- pkgs/tools/misc/remind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 22b669e4fdc..91251abde13 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "03.04.00"; + version = "03.04.01"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-uIpIygxV5l122FN8sz+OMeQh8iL4Vy87EM1/CjFvLVI="; + sha256 = "sha256-8INtFmftMb1JSotUdDtMXdSm+UE/8zQW/wIOExr8nkI="; }; propagatedBuildInputs = tclLibraries; From 8a9421f0285d99b1f3cf19eb449a262c8cadf017 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 18 Jan 2022 11:32:17 +0800 Subject: [PATCH 051/114] crystal: add support for passing custom build options when using the shard builder --- pkgs/development/compilers/crystal/build-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 2328e76ad77..a44eaeb369b 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (mkDerivationArgs // { '') crystalBinaries) ++ lib.optional (format == "shards") - "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" + "shards build --local --production ${lib.concatStringsSep " " (args.options or defaultOptions)}" ++ [ "runHook postBuild" ])); installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ From 60840fc63f3bafa5605c9e5138c2997dfb32d937 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 07:10:23 +0000 Subject: [PATCH 052/114] grype: 0.33.0 -> 0.33.1 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 30206fab0eb..cc35a24151a 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grype"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RXEeJZeC6hA6DetZnUNWFtNZEy4HJpxviL8pySBLfts="; + sha256 = "sha256-5QjyGIpxnrwTnEmi0D16vPKodg3+SKiINFONwU2OzC0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildGoModule rec { ''; }; - vendorSha256 = "sha256-2T2fw1nOycP1LxUuMSmz1ke2bg4yox/tIAveXCNJG9Y="; + vendorSha256 = "sha256-CPMfQv9oiLbIMkZe/t482LzssoNTcNVJdr2o2wJecSA="; nativeBuildInputs = [ installShellFiles From 77aa81cbfda5dda3ba1d2bb49eb38e21a7e1b8df Mon Sep 17 00:00:00 2001 From: Sebastien Iooss Date: Mon, 28 Feb 2022 09:12:45 +0100 Subject: [PATCH 053/114] python3Packages.aioitertools: update and remove python 3.10 patch --- .../python-modules/aioitertools/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index cae0b10ea69..aa2987b1baf 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -17,25 +17,16 @@ buildPythonPackage rec { pname = "aioitertools"; - version = "0.8.0"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46"; + sha256 = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - (fetchpatch { - # Fix TypeError: wait() got an unexpected keyword argument 'loop' - # See https://github.com/omnilib/aioitertools/issues/84 - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-aioitertools/trunk/python310.patch"; - sha256 = "sha256-F10sduGaLBcxEoP83N/lGpZIlzkM2JTnQnhHKFwc7P0="; - }) - ]; - nativeBuildInputs = [ flit-core ]; From 0432d5f1dad88c0510386c60c3b9e3ad43f34081 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 08:37:42 +0000 Subject: [PATCH 054/114] jwm: 2.4.0 -> 2.4.1 --- pkgs/applications/window-managers/jwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 2c9461d6388..8a9b72265b9 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "jwm"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "v${version}"; - sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj"; + sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM="; }; nativeBuildInputs = [ pkg-config gettext which autoreconfHook ]; From c57495ca2723eb7802245a51a408f583405c1060 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Mon, 28 Feb 2022 16:38:32 +0800 Subject: [PATCH 055/114] vscode-extensions.takayama.vscode-qq: update 1.4.0 -> 1.4.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c08f48a405e..fe3515aa37d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1879,8 +1879,8 @@ let mktplcRef = { publisher = "takayama"; name = "vscode-qq"; - version = "1.4.0"; - sha256 = "sha256-DYjNWSKOrDYvdiV7G24uKz6w4ggeYUMkQIiOGZAbMSI="; + version = "1.4.2"; + sha256 = "sha256-koeiFXUFI/i8EGCRDTym62m7JER18J9MKZpbAozr0Ng="; }; meta = { license = lib.licenses.mpl20; From d5888cee2b4f98d9d7889c5d655ad360c0ee2e1a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 28 Jan 2022 13:45:56 +0800 Subject: [PATCH 056/114] wp-cli: 2.5.0 -> 2.6.0 --- pkgs/development/tools/wp-cli/default.nix | 33 +++++++++++++---------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 8d8b1a004d5..9ee452b26f9 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl, writeText, php, makeWrapper }: +{ stdenv +, lib +, fetchurl +, formats +, installShellFiles +, makeWrapper +, php +}: + let - version = "2.5.0"; + version = "2.6.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; - sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; + hash = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; }; - ini = writeText "php.ini" '' - [PHP] - memory_limit = -1 ; no limit as composer uses a lot of memory + ini = (formats.ini { }).generate "php.ini" { + PHP.memory_limit = -1; # no limit as composer uses a lot of memory + Phar."phar.readonly" = "Off"; + }; - [Phar] - phar.readonly = Off - ''; in stdenv.mkDerivation rec { pname = "wp-cli"; @@ -21,19 +27,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k="; + hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildCommand = '' dir=$out/share/wp-cli - mkdir -p $out/bin $dir - install -Dm444 ${src} $dir/wp-cli install -Dm444 ${ini} $dir/php.ini - install -Dm444 ${completion} $out/share/bash-completion/completions/wp + installShellCompletion --bash --name wp ${completion} + mkdir -p $out/bin makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ --add-flags "-c $dir/php.ini" \ --add-flags "-f $dir/wp-cli" From 434bdc8e4a13f500f35241839ae82e0d8acbff3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 25 Feb 2022 14:21:47 +0100 Subject: [PATCH 057/114] skanlite: move to pkgs/application/kde --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/skanlite.nix | 18 +++++++++++ pkgs/applications/office/skanlite/default.nix | 30 ------------------- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 20 insertions(+), 33 deletions(-) create mode 100644 pkgs/applications/kde/skanlite.nix delete mode 100644 pkgs/applications/office/skanlite/default.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 9bfe71e196e..27b702e370e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -216,6 +216,7 @@ let pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; rocs = callPackage ./rocs.nix {}; + skanlite = callPackage ./skanlite.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; }; diff --git a/pkgs/applications/kde/skanlite.nix b/pkgs/applications/kde/skanlite.nix new file mode 100644 index 00000000000..30ceba645b7 --- /dev/null +++ b/pkgs/applications/kde/skanlite.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kio, libksane +}: + +mkDerivation { + pname = "skanlite"; + meta = with lib; { + description = "KDE simple image scanning application"; + homepage = "https://apps.kde.org/skanlite"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ polendri ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kio libksane ]; +} diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix deleted file mode 100644 index 6cdbea75598..00000000000 --- a/pkgs/applications/office/skanlite/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, - kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets, - libksane -}: - -mkDerivation rec { - pname = "skanlite"; - version = "2.2.0"; - - src = fetchurl { - url = "mirror://kde/stable/skanlite/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VP7MOZdUe64XIVr3r0aKIl1IPds3vjBTZzOS3N3VhOQ="; - }; - - nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; - - buildInputs = [ - qtbase - kcoreaddons kdoctools ki18n kio kxmlgui ktextwidgets - libksane - ]; - - meta = with lib; { - description = "KDE simple image scanning application"; - homepage = "https://apps.kde.org/skanlite"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ polendri ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 46371603fda..c4583f83bff 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1432,7 +1432,7 @@ mapAliases ({ plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style - sddm-kcm spectacle systemsettings xdg-desktop-portal-kde yakuake + sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake ; inherit (plasma5Packages.thirdParty) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a29312d19b3..9e5104945cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28904,8 +28904,6 @@ with pkgs; sipp = callPackage ../development/tools/misc/sipp { }; - skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; - soci = callPackage ../development/libraries/soci { }; socialscan = with python3.pkgs; toPythonApplication socialscan; From 6c39270a3ab1fc828585c28e5931fca093669b11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 10:02:52 +0100 Subject: [PATCH 058/114] checkov: 2.0.900 -> 2.0.906 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index d7cc9bd49cf..27ad79977ba 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.900"; + version = "2.0.906"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-uhc09UiEe987pgs+6XPBKcERW5pL2PG3U1LEju4jWaM="; + hash = "sha256-sNwdbKaojDR8q/ugs+ot4ObpIodk2uJVvxcBQEb6d5A="; }; nativeBuildInputs = with py.pkgs; [ From 60779b767755bd28a0839d9742cf770e199c59f7 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 18 Feb 2022 16:48:15 +0100 Subject: [PATCH 059/114] pcstat: 2017-05-28 -> 0.0.1 Also switch to buildGoModule. --- pkgs/tools/system/pcstat/default.nix | 20 +++++++++----------- pkgs/tools/system/pcstat/deps.nix | 11 ----------- 2 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 pkgs/tools/system/pcstat/deps.nix diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index d01b08a1434..02a214259c7 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -1,19 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { - pname = "pcstat-unstable"; - version = "2017-05-28"; - - goPackagePath = "github.com/tobert/pcstat"; +buildGoModule rec { + pname = "pcstat"; + version = "0.0.1"; src = fetchFromGitHub { - rev = "91a7346e5b462a61e876c0574cb1ba331a6a5ac5"; - owner = "tobert"; - repo = "pcstat"; - sha256 = "88853e42d16c05e580af4fb8aa815a84ea0fc43e3a25e19c85e649a5f5a2874c"; + owner = "tobert"; + repo = "pcstat"; + rev = "v${version}"; + sha256 = "sha256-rN6oqhvrzMBhwNLm8+r4rZWZYZUhOq2h764KVhSycNo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-1y6rzarkFNX8G4E9FzCLfWxULbdNYK3DeelNCJ+7Y9Q="; meta = with lib; { description = "Page Cache stat: get page cache stats for files on Linux"; diff --git a/pkgs/tools/system/pcstat/deps.nix b/pkgs/tools/system/pcstat/deps.nix deleted file mode 100644 index 809bde1122f..00000000000 --- a/pkgs/tools/system/pcstat/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d38bf781f16e180a1b2ad82697d2f81d7b7ecfac"; - sha256 = "0eedd518ab68c6dfd431a41709d9888bbc13ed31ff64d69dcbd947442b3aaa04"; - }; - } -] From f49a6fea32978a555ef15734d729b1cbb8c43413 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 10:23:27 +0100 Subject: [PATCH 060/114] metasploit: 6.1.30 -> 6.1.31 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 40 ++++++++--------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 50 ++++++++++----------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index eb6e90ac775..aff1c8c625b 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.30" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.31" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 5711b8756e3..64f7ec00c28 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: aab66244adaadb275bd780c1301fea51f444426a - ref: refs/tags/6.1.30 + revision: 2bed5461f9e43e2608a90c3331045b62e8dba26a + ref: refs/tags/6.1.31 specs: - metasploit-framework (6.1.30) + metasploit-framework (6.1.31) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.74) + metasploit-payloads (= 2.0.75) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -128,23 +128,23 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.555.0) - aws-sdk-core (3.126.2) + aws-partitions (1.559.0) + aws-sdk-core (3.127.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.299.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-ec2 (1.300.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.67.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-iam (1.68.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.54.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.112.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) @@ -251,7 +251,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.74) + metasploit-payloads (2.0.75) metasploit_data_models (5.0.4) activerecord (~> 6.0) activesupport (~> 6.0) @@ -264,7 +264,7 @@ GEM webrick metasploit_payloads-mettle (1.0.18) method_source (1.0.0) - mini_portile2 (2.7.1) + mini_portile2 (2.8.0) minitest (5.15.0) mqtt (0.5.0) msgpack (1.4.5) @@ -278,8 +278,8 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.13.1) - mini_portile2 (~> 2.7.0) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) nori (2.6.0) octokit (4.22.0) @@ -292,13 +292,13 @@ GEM pcaprub patch_finder (1.0.2) pcaprub (0.13.1) - pdf-reader (2.9.1) + pdf-reader (2.9.2) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.3.2) + pg (1.3.3) public_suffix (4.0.6) puma (5.6.2) nio4r (~> 2.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index dcaeafc428a..e7f20acf8a1 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.30"; + version = "6.1.31"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-QSKJIcHaWsxbHe2uTW5MnZFMoK1fOa6TejIT2Mq0z7k="; + sha256 = "sha256-WrrpejXhpGu8/d8TBjXBi9qaYZAFTjZr7S2WYz+RTFw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 531b0b6c24e..ced2ecf9bcd 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,60 +104,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r3ihnddcizpf34mcfggyjii8lmjyy1q89mswpbzqa5mxvws85qg"; + sha256 = "15pi27wp50h829757xhp22fx57nvlfm5cjy2iz11b7zvdx19j7fw"; type = "gem"; }; - version = "1.555.0"; + version = "1.559.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19xi4dr675f7x9dmk1fc10jmjdgv45j3dn9k44m5xavd3qnpzx7v"; + sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq"; type = "gem"; }; - version = "3.126.2"; + version = "3.127.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13kl993psm21mni2g3llyj6b1nzway8kcabnrblnrjkd4d4fg3v7"; + sha256 = "0mi99zacz537wsiks9yb6zy8xkqsbrg9j7c4kzrgd8zk55p247wd"; type = "gem"; }; - version = "1.299.0"; + version = "1.300.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iv8db2wb3lajcnqx6icn7bdvhrfd7di01c329r95kgw6gzsf7sc"; + sha256 = "15rhfl5g49422g8bi90dv0cx3imbza99223pqdi4vsg6gwzhszhy"; type = "gem"; }; - version = "1.67.0"; + version = "1.68.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h2mn5ywrla2wqsvzvp9m8jhzr93ywqmyi2l0b538hrq6pmdhjq2"; + sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi"; type = "gem"; }; - version = "1.54.0"; + version = "1.55.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09fc16hdvripmpn1bj5bayqvmfz0pj2l1h2w954id9c9ar7vv7f5"; + sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; type = "gem"; }; - version = "1.112.0"; + version = "1.113.0"; }; aws-sigv4 = { groups = ["default"]; @@ -684,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "aab66244adaadb275bd780c1301fea51f444426a"; - sha256 = "1ffgnk5dh4rjga9swfazmnh4r4cx9ip4vbpd3mdwqnnsq4hqj8j1"; + rev = "2bed5461f9e43e2608a90c3331045b62e8dba26a"; + sha256 = "0p2cj4zn75idxmmkckh5j1hrmnlbq4shc4yzzny6p9716mxfkfjs"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.30"; + version = "6.1.31"; }; metasploit-model = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03q70mqn38chhm9cmjh6k4ch5jsrgf2id09jv0ylkn3vsrrjfzpg"; + sha256 = "1ghwsciyhldpja50f9wv1nd1xnns6ki9hjfhllh1dyja3l1knd9z"; type = "gem"; }; - version = "2.0.74"; + version = "2.0.75"; }; metasploit_data_models = { groups = ["default"]; @@ -746,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.0"; }; minitest = { groups = ["default"]; @@ -877,10 +877,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11"; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; type = "gem"; }; - version = "1.13.1"; + version = "1.13.3"; }; nori = { groups = ["default"]; @@ -967,20 +967,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pn5l3ayjfn4mv2079q80q0x3q39q25nxcc5l9cjqz4lf5anhlfi"; + sha256 = "1pmb0lhbch06i8br2nkcq3flbfx1s2wqi3vkndqr4vnx3azvyjf6"; type = "gem"; }; - version = "2.9.1"; + version = "2.9.2"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m776cj2hik15wi730vhgczd5v9s0xmi45q2hgcf5m5cnqvfih35"; + sha256 = "0qqky1q9xhji017q1apx9w81qdlwpm6ix3amhikjy416hxxmhcj1"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; public_suffix = { groups = ["default"]; From a7f2e16a4f9e0cf153866f4a431bc04a108c840a Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 28 Feb 2022 11:14:49 +0100 Subject: [PATCH 061/114] gitlab: 14.7.4 -> 14.8.2 (#162088) https://about.gitlab.com/releases/2022/02/22/gitlab-14-8-released/ --- .../version-management/gitlab/data.json | 16 +- .../version-management/gitlab/default.nix | 7 +- .../version-management/gitlab/gitaly/Gemfile | 2 +- .../gitlab/gitaly/Gemfile.lock | 20 +- .../gitlab/gitaly/default.nix | 26 +-- .../gitlab/gitaly/gemset.nix | 24 +-- .../gitlab/gitlab-shell/default.nix | 8 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../gitlab/remove-hardcoded-locations.patch | 10 + .../version-management/gitlab/rubyEnv/Gemfile | 29 ++- .../gitlab/rubyEnv/Gemfile.lock | 172 +++++++++--------- .../gitlab/rubyEnv/gemset.nix | 162 +++++++---------- 12 files changed, 217 insertions(+), 263 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 19761eab61f..462ff47afd7 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.7.4", - "repo_hash": "0z62p2c24h7icdqar2l3nwlq7z4pan6n80ril8j1y6k03z1cs0nq", - "yarn_hash": "12k2r1y7kw95kfsmy0s8rbsf0vldr8c2liah0rkc7pihr19gq3w7", + "version": "14.8.2", + "repo_hash": "1pl528qxsbg75l5nny7cw8hcsd0zs50hhn0ngdrf3gjpd6y7pzcc", + "yarn_hash": "0dlhslkhiha4jyfzm0k8i9cgwdk12r5m67i2rznxbrkl38gk9c1x", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.7.4-ee", + "rev": "v14.8.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.7.4", - "GITLAB_PAGES_VERSION": "1.51.0", - "GITLAB_SHELL_VERSION": "13.22.2", - "GITLAB_WORKHORSE_VERSION": "14.7.4" + "GITALY_SERVER_VERSION": "14.8.2", + "GITLAB_PAGES_VERSION": "1.54.0", + "GITLAB_SHELL_VERSION": "13.23.2", + "GITLAB_WORKHORSE_VERSION": "14.8.2" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index f53c693c90b..362cf4702f4 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn -, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps +, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper }: let @@ -120,7 +120,7 @@ stdenv.mkDerivation { inherit src; buildInputs = [ - rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools makeWrapper ]; patches = [ @@ -174,6 +174,9 @@ stdenv.mkDerivation { # rake tasks to mitigate CVE-2017-0882 # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake + + # manually patch the shebang line in generate-loose-foreign-key + wrapProgram $out/share/gitlab/scripts/decomposition/generate-loose-foreign-key --set ENABLE_SPRING 0 --add-flags 'runner -e test' ''; passthru = { diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 70dd9c594c9..78296dff887 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.4.4' +gem 'activesupport', '~> 6.1.4.6' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index fd0dea027e0..752883d801d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionpack (6.1.4.6) + actionview (= 6.1.4.6) + activesupport (= 6.1.4.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.4) - activesupport (= 6.1.4.4) + actionview (6.1.4.6) + activesupport (= 6.1.4.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.4.4) + activesupport (6.1.4.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -88,7 +88,7 @@ GEM google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) grpc-tools (1.42.0) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) @@ -101,7 +101,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.13.0) + loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -219,13 +219,13 @@ GEM with_env (1.1.0) xml-simple (1.1.9) rexml - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.4.4) + activesupport (~> 6.1.4.6) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index a1d3c7c913e..b5a05dde1b4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,23 +1,9 @@ { lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby , bundlerEnv, pkg-config # libgit2 + dependencies -, libgit2, openssl, zlib, pcre, http-parser }: +, libgit2_1_3_0, openssl, zlib, pcre, http-parser }: let - # git2go 32.0.5 does not support libgit2 1.2.0 or 1.3.0. - # It needs a specific commit in between those two releases. - libgit2_custom = libgit2.overrideAttrs (oldAttrs: rec { - version = "1.2.0"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e"; - sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI="; - }; - - patches = []; - }); - rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; @@ -25,7 +11,7 @@ let gemdir = ./.; }; - version = "14.7.4"; + version = "14.8.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -37,10 +23,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-sNSRYqGIi/PzegHYe04WUaLegPEeX79NjuqSVul21Ak="; + sha256 = "sha256-GgQscKxxYpvzU2M99gmvGj0HM/oD+2Ke24FRzUxv6HM="; }; - vendorSha256 = "sha256-eapqtSstc7d3R7A/5krKV0uVr9GhGkHHMrmsBOpWAbo="; + vendorSha256 = "sha256-Qw9/nlo1eB5dPcldXe9doy4QA4DDVUDad3o4kbdNu34="; passthru = { inherit rubyEnv; @@ -50,7 +36,7 @@ buildGoModule { tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2_custom openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ]; doCheck = false; postInstall = '' @@ -65,7 +51,7 @@ buildGoModule { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = with maintainers; [ roblabla globin fpletz talyz ]; + maintainers = with maintainers; [ roblabla globin fpletz talyz yayayayaka ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9539139fe4a..c55d094db5f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9"; + sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm"; + sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -343,10 +343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; type = "gem"; }; - version = "1.8.11"; + version = "1.9.1"; }; ice_nine = { source = { @@ -394,10 +394,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg"; + sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; type = "gem"; }; - version = "2.13.0"; + version = "2.14.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -994,9 +994,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 9dabd7c949b..99ad72a2664 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.22.2"; + version = "13.23.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-jAH/MKmCIybLXsypHehQJaKf+mK9ko5XqWoDH/XKE5w="; + sha256 = "sha256-aee+Tn81o1iK1Xm5et6lKUN8//lyGh3NGs96Mwg4nFc="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-cE6phpVYcZNCEk6bElEksIf4GOr/5vJPRdlGCubRafE="; + vendorSha256 = "sha256-RLV01CM5O0K4R8XDDcas2LjIig0S7GoyAo/S8+Vx2bY="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin @@ -26,7 +26,7 @@ buildGoModule rec { description = "SSH access and repository management app for GitLab"; homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin talyz ]; + maintainers = with maintainers; [ fpletz globin talyz yayayayaka ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 236da79752c..76273acdff2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.7.4"; + version = "14.8.2"; src = fetchFromGitLab { owner = data.owner; @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin talyz ]; + maintainers = with maintainers; [ fpletz globin talyz yayayayaka ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 2026808875d..2b505307405 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -207,3 +207,13 @@ index 567c7540777..29906b1c132 100644 end end end +diff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-key +index 35f84c64ce1..c2fecf3404c 100755 +--- a/scripts/decomposition/generate-loose-foreign-key ++++ b/scripts/decomposition/generate-loose-foreign-key +@@ -1,4 +1,4 @@ +-#!/usr/bin/env -S ENABLE_SPRING=0 bin/rails runner -e test ++#!/usr/bin/env rails + + # This is helper script to swap foreign key to loose foreign key + # using DB schema diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index aab373095f7..4ae8b33569f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.4.4' +gem 'rails', '~> 6.1.4.6' gem 'bootsnap', '~> 1.9.1', require: false @@ -72,7 +72,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.11' -gem 'rubyzip', '~> 2.0.0', require: 'zip' +gem 'rubyzip', '~> 2.3.2', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0', '>= 2.0.9' @@ -183,7 +183,7 @@ gem 'rack', '~> 2.2.3' gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' group :puma do - gem 'puma', '~> 5.5.2', require: false + gem 'puma', '~> 5.6.2', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false gem 'sd_notify', '~> 0.1.0', require: false end @@ -195,7 +195,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' gem 'acts-as-taggable-on', '~> 9.0' # Background jobs -gem 'sidekiq', '~> 6.3' +gem 'sidekiq', '~> 6.4' gem 'sidekiq-cron', '~> 1.2' gem 'redis-namespace', '~> 1.8.1' gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' @@ -295,7 +295,7 @@ gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' -gem 'gitlab-license', '~> 2.0' +gem 'gitlab-license', '~> 2.1.0' # Protect against bruteforcing gem 'rack-attack', '~> 6.3.0' @@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.21.3' +gem 'gitlab-labkit', '~> 0.22.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -396,7 +396,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.6.1', require: false + gem 'gitlab-dangerfiles', '~> 2.8.0', require: false end group :development, :test, :coverage do @@ -466,21 +466,14 @@ gem 'sys-filesystem', '~> 1.4.3' # NTP client gem 'net-ntp' -# SSH host key support -gem 'net-ssh', '~> 6.0' -gem 'sshkey', '~> 2.0' - -# Required for ED25519 SSH host key support -group :ed25519 do - gem 'ed25519', '~> 1.2' - gem 'bcrypt_pbkdf', '~> 1.1' -end +# SSH keys support +gem 'ssh_data', '~> 1.2' # Spamcheck GRPC protocol definitions gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.6.0.pre.rc1' +gem 'gitaly', '~> 14.8.0.pre.rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -496,7 +489,7 @@ gem 'flipper', '~> 0.21.0' gem 'flipper-active_record', '~> 0.21.0' gem 'flipper-active_support_cache_store', '~> 0.21.0' gem 'unleash', '~> 3.2.2' -gem 'gitlab-experiment', '~> 0.6.5' +gem 'gitlab-experiment', '~> 0.7.0' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index e036b98f330..a7f75fb0e26 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -4,63 +4,63 @@ GEM RedCloth (4.3.2) acme-client (2.0.9) faraday (>= 0.17, < 2.0.0) - actioncable (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + actioncable (6.1.4.6) + actionpack (= 6.1.4.6) + activesupport (= 6.1.4.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailbox (6.1.4.6) + actionpack (= 6.1.4.6) + activejob (= 6.1.4.6) + activerecord (= 6.1.4.6) + activestorage (= 6.1.4.6) + activesupport (= 6.1.4.6) mail (>= 2.7.1) - actionmailer (6.1.4.4) - actionpack (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailer (6.1.4.6) + actionpack (= 6.1.4.6) + actionview (= 6.1.4.6) + activejob (= 6.1.4.6) + activesupport (= 6.1.4.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionpack (6.1.4.6) + actionview (= 6.1.4.6) + activesupport (= 6.1.4.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.4) - actionpack (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actiontext (6.1.4.6) + actionpack (= 6.1.4.6) + activerecord (= 6.1.4.6) + activestorage (= 6.1.4.6) + activesupport (= 6.1.4.6) nokogiri (>= 1.8.5) - actionview (6.1.4.4) - activesupport (= 6.1.4.4) + actionview (6.1.4.6) + activesupport (= 6.1.4.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.4) - activesupport (= 6.1.4.4) + activejob (6.1.4.6) + activesupport (= 6.1.4.6) globalid (>= 0.3.6) - activemodel (6.1.4.4) - activesupport (= 6.1.4.4) - activerecord (6.1.4.4) - activemodel (= 6.1.4.4) - activesupport (= 6.1.4.4) + activemodel (6.1.4.6) + activesupport (= 6.1.4.6) + activerecord (6.1.4.6) + activemodel (= 6.1.4.6) + activesupport (= 6.1.4.6) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activesupport (= 6.1.4.4) + activestorage (6.1.4.6) + actionpack (= 6.1.4.6) + activejob (= 6.1.4.6) + activerecord (= 6.1.4.6) + activesupport (= 6.1.4.6) marcel (~> 1.0.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.4) + activesupport (6.1.4.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -130,7 +130,6 @@ GEM base32 (0.3.2) batch-loader (2.0.1) bcrypt (3.1.16) - bcrypt_pbkdf (1.1.0) benchmark (0.1.1) benchmark-ips (2.3.0) benchmark-memory (0.1.2) @@ -186,7 +185,7 @@ GEM childprocess (3.0.0) chunky_png (1.3.5) citrus (3.0.2) - claide (1.0.3) + claide (1.1.0) claide-plugins (0.9.2) cork nap @@ -195,7 +194,7 @@ GEM colored2 (3.1.2) commonmarker (0.23.2) concurrent-ruby (1.1.9) - connection_pool (2.2.2) + connection_pool (2.2.5) contracts (0.11.0) cork (0.3.0) colored2 (~> 3.1) @@ -301,7 +300,6 @@ GEM e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) - ed25519 (1.2.4) elasticsearch (6.8.2) elasticsearch-api (= 6.8.2) elasticsearch-transport (= 6.8.2) @@ -444,7 +442,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.6.0.pre.rc1) + gitaly (14.8.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -452,13 +450,12 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.6.1) + gitlab-dangerfiles (2.8.0) danger (>= 8.3.1) danger-gitlab (>= 8.0.0) - gitlab-experiment (0.6.5) + gitlab-experiment (0.7.0) activesupport (>= 3.0) request_store (>= 1.0) - scientist (~> 1.6, >= 1.6.0) gitlab-fog-azure-rm (1.2.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) @@ -466,15 +463,15 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.21.3) + gitlab-labkit (0.22.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (>= 1.37) - jaeger-client (~> 1.1) + jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) - gitlab-license (2.0.0) + gitlab-license (2.1.0) gitlab-license_finder (6.14.2.1) bundler rubyzip (>= 1, < 3) @@ -626,7 +623,7 @@ GEM http-form_data (~> 2.2) http-parser (~> 1.2.0) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) http-form_data (2.3.0) http-parser (1.2.3) @@ -635,7 +632,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -937,7 +934,7 @@ GEM tty-markdown tty-prompt public_suffix (4.0.6) - puma (5.5.2) + puma (5.6.2) nio4r (~> 2.0) puma_worker_killer (0.3.1) get_process_mem (~> 0.2) @@ -963,20 +960,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.1.4.4) - actioncable (= 6.1.4.4) - actionmailbox (= 6.1.4.4) - actionmailer (= 6.1.4.4) - actionpack (= 6.1.4.4) - actiontext (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activemodel (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + rails (6.1.4.6) + actioncable (= 6.1.4.6) + actionmailbox (= 6.1.4.6) + actionmailer (= 6.1.4.6) + actionpack (= 6.1.4.6) + actiontext (= 6.1.4.6) + actionview (= 6.1.4.6) + activejob (= 6.1.4.6) + activemodel (= 6.1.4.6) + activerecord (= 6.1.4.6) + activestorage (= 6.1.4.6) + activesupport (= 6.1.4.6) bundler (>= 1.15.0) - railties (= 6.1.4.4) + railties (= 6.1.4.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -990,9 +987,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + railties (6.1.4.6) + actionpack (= 6.1.4.6) + activesupport (= 6.1.4.6) method_source rake (>= 0.13) thor (~> 1.0) @@ -1024,13 +1021,13 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) - regexp_parser (2.1.1) + regexp_parser (2.2.1) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - request_store (1.5.0) + request_store (1.5.1) rack (>= 1.4) responders (3.0.0) actionpack (>= 5.0) @@ -1127,7 +1124,7 @@ GEM sexp_processor (~> 4.9) rubyntlm (0.6.2) rubypants (0.2.0) - rubyzip (2.0.0) + rubyzip (2.3.2) rugged (1.2.0) safe_yaml (1.0.4) safety_net_attestation (0.4.0) @@ -1140,9 +1137,8 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.0.1) + sassc (2.4.0) ffi (~> 1.9) - rake sassc-rails (2.1.0) railties (>= 4.0.0) sassc (>= 2.0) @@ -1152,7 +1148,6 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - scientist (1.6.2) sd_notify (0.1.0) securecompare (1.0.0) seed-fu (2.3.7) @@ -1169,7 +1164,7 @@ GEM shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) - sidekiq (6.3.1) + sidekiq (6.4.0) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) @@ -1225,7 +1220,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (2.0.0) + ssh_data (1.2.0) ssrf_filter (1.0.7) stackprof (0.2.15) state_machines (0.5.0) @@ -1312,7 +1307,7 @@ GEM rugged (>= 0.27, < 1.3) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) + unf_ext (0.0.8) unicode-display_width (1.7.0) unicode_utils (1.4.0) uniform_notifier (1.13.0) @@ -1372,7 +1367,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.1) yard (0.9.26) - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS ruby @@ -1401,7 +1396,6 @@ DEPENDENCIES base32 (~> 0.3.0) batch-loader (~> 2.0.1) bcrypt (~> 3.1, >= 3.1.14) - bcrypt_pbkdf (~> 1.1) benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) @@ -1434,7 +1428,6 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) - ed25519 (~> 1.2) elasticsearch-api (~> 6.8.2) elasticsearch-model (~> 6.1) elasticsearch-rails (~> 6.1) @@ -1463,14 +1456,14 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.6.0.pre.rc1) + gitaly (~> 14.8.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.6.1) - gitlab-experiment (~> 0.6.5) + gitlab-dangerfiles (~> 2.8.0) + gitlab-experiment (~> 0.7.0) gitlab-fog-azure-rm (~> 1.2.0) - gitlab-labkit (~> 0.21.3) - gitlab-license (~> 2.0) + gitlab-labkit (~> 0.22.0) + gitlab-license (~> 2.1.0) gitlab-license_finder (~> 6.0) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) @@ -1534,7 +1527,6 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - net-ssh (~> 6.0) nokogiri (~> 1.12) oauth2 (~> 1.4) octokit (~> 4.15) @@ -1571,7 +1563,7 @@ DEPENDENCIES pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.5.0) - puma (~> 5.5.2) + puma (~> 5.6.2) puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) rack-attack (~> 6.3.0) @@ -1579,7 +1571,7 @@ DEPENDENCIES rack-oauth2 (~> 1.16.0) rack-proxy (~> 0.6.0) rack-timeout (~> 0.5.1) - rails (~> 6.1.4.4) + rails (~> 6.1.4.6) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) @@ -1607,7 +1599,7 @@ DEPENDENCIES ruby-progressbar (~> 1.10) ruby-saml (~> 1.13.0) ruby_parser (~> 3.15) - rubyzip (~> 2.0.0) + rubyzip (~> 2.3.2) rugged (~> 1.2) sanitize (~> 6.0) sassc-rails (~> 2.1.0) @@ -1617,7 +1609,7 @@ DEPENDENCIES sentry-raven (~> 3.1) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) - sidekiq (~> 6.3) + sidekiq (~> 6.4) sidekiq-cron (~> 1.2) simple_po_parser (~> 1.1.2) simplecov (~> 0.18.5) @@ -1631,7 +1623,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) - sshkey (~> 2.0) + ssh_data (~> 1.2) stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 025378dd5db..0a2d8394e00 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z3ab9n901craqd3p1yl87kawci0vfw1xlh4d0zkj7lx8hpk10sn"; + sha256 = "0abclh3rd7s2k88bj40jn9wcmal8dcybvn5xrnl80xknmxh3zigp"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q94js7ifm0a76xcwxin98bhr8nz0zqcsqi4y7j2mfwm3hq3bh0i"; + sha256 = "0qhnkz4fs45zid30lnc77m4rw7an6pp2pdmkwkn6cczikqz5sklw"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gncnc5xl1ff70mfnqcys2qy65201yjrkwxx0hb5hl7jlamgvz9h"; + sha256 = "0mqcmxv28wy2jrpk9vghq7njjr03drw0ab3hw64j2d9kbpnpb8w8"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9"; + sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j9591z8lsp9lx3l75699prw6rgkhhlrfaj4lh5klcdffvxzkvi3"; + sha256 = "1n2n52m5j6h370r5j18w76kgqzzkcv8x72p040l16ax40ysglq7p"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm"; + sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sf0nfjcj1na4v6zaxz6hjglax99yznaymjzpk1fi7mk71qf5hx4"; + sha256 = "02dnr16mgwp98n9q733nprfx7dn09z6pa11cfk0pivj8daad5x1l"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm"; + sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik"; + sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a6mmm1s8abv11ycqs6cq55kr6j89jpclkcnra9w2k47rl047vk4"; + sha256 = "1kngq1555jphy5yhmz4yfigpk3ms4b65ynzy5yssrlhbmdf8r430"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -479,16 +479,6 @@ }; version = "3.1.16"; }; - bcrypt_pbkdf = { - groups = ["ed25519"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; - type = "gem"; - }; - version = "1.1.0"; - }; benchmark = { groups = ["default" "development"]; platforms = []; @@ -745,14 +735,14 @@ version = "3.0.2"; }; claide = { - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; claide-plugins = { dependencies = ["cork" "nap" "open4"]; @@ -814,10 +804,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; + sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.5"; }; contracts = { groups = ["default"]; @@ -1253,16 +1243,6 @@ }; version = "0.3.0"; }; - ed25519 = { - groups = ["ed25519"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; - type = "gem"; - }; - version = "1.2.4"; - }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; groups = ["default"]; @@ -1896,10 +1876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "175whfk08jrmvssh5lgk0zgsaksbnhv6p5fg3picknrw4v05vw85"; + sha256 = "0dl80qvyl1jbcc1iabpja3pnsrfag92h25c2r3vqn3bd0x9q4iwc"; type = "gem"; }; - version = "14.6.0.pre.rc1"; + version = "14.8.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -1939,21 +1919,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgb0v41qn2cnzzn4fizffds07vhz9sf09bpmm0lw86x8lz6vfdq"; + sha256 = "0xd7sgl5iwxq2mvx7ql1wpciqrnj2z1ycjxm5ddrdi4kcl9f94z4"; type = "gem"; }; - version = "2.6.1"; + version = "2.8.0"; }; gitlab-experiment = { - dependencies = ["activesupport" "request_store" "scientist"]; + dependencies = ["activesupport" "request_store"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "064iy0pgjfvfcxynclmk70cdi10hwx7xzq1c14p68cilg569vma2"; + sha256 = "1ph12qxhml2iq02sad7hybi5yrc5zvz2spav2ahfh3ks2fvs7cbx"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -1972,20 +1952,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fs11wpqn801dsscs845629hbgwbgs94qhig45jmalw4h9rira4"; + sha256 = "1vs5q1lfk5i953gv2xvz6h5x6ycllr8hdzg81zsrz7hy3aygxknj"; type = "gem"; }; - version = "0.21.3"; + version = "0.22.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hddqd3167360m1h5lnrgxd0gmwhaisb9qz89rprhi5ckzyx2gz"; + sha256 = "1ys98a5qwih4l9zllsysd48d7jl5qcw2ralav0hab3lxalmy5pwf"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -2487,10 +2467,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; http-form_data = { groups = ["default"]; @@ -2540,10 +2520,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; type = "gem"; }; - version = "1.8.11"; + version = "1.9.1"; }; i18n_data = { groups = ["default"]; @@ -3955,10 +3935,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; + sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; type = "gem"; }; - version = "5.5.2"; + version = "5.6.2"; }; puma_worker_killer = { dependencies = ["get_process_mem" "puma"]; @@ -4093,10 +4073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10vylypjzfp6c34zx175x7ql7h27llmjdhgjxp5bn2zmrx3lac8l"; + sha256 = "01mvxg2rmwiqcw0alfd526axg7y1knj0lhy4i2mmxa3q0v7xb8za"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4148,10 +4128,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmyds2www6dmqbbd5ggq31gxxb9mwxd5llzmb3iyczssk6l7lla"; + sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; rainbow = { groups = ["default" "development" "test"]; @@ -4335,10 +4315,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr"; + sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.1"; }; regexp_property_values = { groups = ["default"]; @@ -4367,10 +4347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; + sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; responders = { dependencies = ["actionpack" "railties"]; @@ -4772,10 +4752,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.0.0"; + version = "2.3.2"; }; rugged = { groups = ["default"]; @@ -4842,15 +4822,15 @@ version = "4.0.0"; }; sassc = { - dependencies = ["ffi" "rake"]; + dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"; + sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; type = "gem"; }; - version = "2.0.1"; + version = "2.4.0"; }; sassc-rails = { dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; @@ -4874,16 +4854,6 @@ }; version = "0.8.2"; }; - scientist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05xiv6kznhawbkjrz97s6lp2ld0w95x1l2s80gm8m49f273399s2"; - type = "gem"; - }; - version = "1.6.2"; - }; sd_notify = { groups = ["puma"]; platforms = []; @@ -4994,10 +4964,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k38cbwhcj9ncfzlgfmvq2zqfdvldln58w8s8v89m0jqlhnhsqhj"; + sha256 = "10pllqwracvy5nmchipg359sq9pnyg08q970xpqmpc3nkmrihxlf"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; sidekiq-cron = { dependencies = ["fugit" "sidekiq"]; @@ -5200,15 +5170,15 @@ }; version = "1.3.13"; }; - sshkey = { + ssh_data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; + sha256 = "0p3vaq2fbmlphphqr0yjc5cyzzxjizq4zbxbbw3j2vpgdcmpi6bs"; type = "gem"; }; - version = "2.0.0"; + version = "1.2.0"; }; ssrf_filter = { groups = ["default"]; @@ -5645,10 +5615,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; type = "gem"; }; - version = "0.0.7.7"; + version = "0.0.8"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -5948,9 +5918,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; } From 2f618b1abdf4693007c5910f3756b8c41c0aa26f Mon Sep 17 00:00:00 2001 From: Sebastien Iooss Date: Mon, 28 Feb 2022 11:04:16 +0100 Subject: [PATCH 062/114] correct typing_extensions error --- pkgs/development/python-modules/aioitertools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index aa2987b1baf..289d1ae1630 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; From 107c75bc486ff527b73f74df072a893be3ff79b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 11:33:36 +0100 Subject: [PATCH 063/114] python3Packages.pyface: disable on older Python releases --- .../python-modules/pyface/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index 4c15dd6d4af..d10e20eb0b2 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -1,21 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage -, importlib-metadata, importlib-resources, six, traits +{ lib +, fetchPypi +, buildPythonPackage +, importlib-metadata +, importlib-resources +, traits +, pythonOlder }: buildPythonPackage rec { pname = "pyface"; version = "7.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "sha256-UtzzZ5yj5hCjynxLmQSpbGkWiASNtdflKvjlAZ5HrbY="; }; - propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ]; + propagatedBuildInputs = [ + importlib-metadata + importlib-resources + traits + ]; doCheck = false; # Needs X server - pythonImportsCheck = [ "pyface" ]; + pythonImportsCheck = [ + "pyface" + ]; meta = with lib; { description = "Traits-capable windowing framework"; From de4352babbbba55e6617a10d9c42a77ec710c31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 25 Feb 2022 20:34:56 +0100 Subject: [PATCH 064/114] {lib,}ktorrent: move to pkgs/application/kde --- pkgs/applications/kde/default.nix | 2 + pkgs/applications/kde/ktorrent.nix | 22 +++++++++++ pkgs/applications/kde/libktorrent.nix | 22 +++++++++++ .../networking/p2p/ktorrent/default.nix | 32 ---------------- .../libraries/libktorrent/default.nix | 38 ------------------- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/qt5-packages.nix | 2 - 8 files changed, 47 insertions(+), 75 deletions(-) create mode 100644 pkgs/applications/kde/ktorrent.nix create mode 100644 pkgs/applications/kde/libktorrent.nix delete mode 100644 pkgs/applications/networking/p2p/ktorrent/default.nix delete mode 100644 pkgs/development/libraries/libktorrent/default.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 27b702e370e..4d39d25222c 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -186,6 +186,7 @@ let kteatime = callPackage ./kteatime.nix {}; ktimer = callPackage ./ktimer.nix {}; ktnef = callPackage ./ktnef.nix {}; + ktorrent = callPackage ./ktorrent.nix {}; ktouch = callPackage ./ktouch.nix {}; kturtle = callPackage ./kturtle.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; @@ -203,6 +204,7 @@ let libkomparediff2 = callPackage ./libkomparediff2.nix {}; libksane = callPackage ./libksane.nix {}; libksieve = callPackage ./libksieve.nix {}; + libktorrent = callPackage ./libktorrent.nix {}; mailcommon = callPackage ./mailcommon.nix {}; mailimporter = callPackage ./mailimporter.nix {}; marble = callPackage ./marble.nix {}; diff --git a/pkgs/applications/kde/ktorrent.nix b/pkgs/applications/kde/ktorrent.nix new file mode 100644 index 00000000000..f63865d3030 --- /dev/null +++ b/pkgs/applications/kde/ktorrent.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + karchive, kcmutils, kcrash, kdnssd, ki18n, knotifications, knotifyconfig, + kplotting, kross, libgcrypt, libktorrent, taglib +}: + +mkDerivation { + pname = "ktorrent"; + meta = with lib; { + description = "KDE integrated BtTorrent client"; + homepage = "https://apps.kde.org/ktorrent/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + karchive kcmutils kcrash kdnssd ki18n knotifications knotifyconfig kplotting + kross libgcrypt libktorrent taglib + ]; +} diff --git a/pkgs/applications/kde/libktorrent.nix b/pkgs/applications/kde/libktorrent.nix new file mode 100644 index 00000000000..3b4ae5f72f7 --- /dev/null +++ b/pkgs/applications/kde/libktorrent.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + karchive, kcrash, ki18n, kio, libgcrypt, qca-qt5, solid, + boost, gmp +}: + +mkDerivation { + pname = "libktorrent"; + meta = with lib; { + description = "A BitTorrent library used by KTorrent"; + homepage = "https://apps.kde.org/ktorrent/"; + maintainers = with maintainers; [ eelco ]; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive kcrash ki18n kio libgcrypt qca-qt5 solid ]; + propagatedBuildInputs = [ boost gmp ]; + outputs = [ "out" "dev" ]; + + dontWrapQtApps = true; +} diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix deleted file mode 100644 index 94a4642b2de..00000000000 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake -, extra-cmake-modules, qtbase, qtscript -, karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig -, kdoctools, kross, kcmutils, kwindowsystem -, libktorrent, taglib, libgcrypt, kplotting -}: - -mkDerivation rec { - pname = "ktorrent"; - version = "${libktorrent.mainVersion}"; - - src = fetchurl { - url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534"; - }; - - nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; - - buildInputs = [ - qtbase qtscript - karchive kcrash kdnssd ki18n kio knotifications knotifyconfig kross kcmutils kwindowsystem - libktorrent taglib libgcrypt kplotting - ]; - - meta = with lib; { - description = "KDE integrated BtTorrent client"; - homepage = "https://www.kde.org/applications/internet/ktorrent/"; - license = licenses.gpl2; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix deleted file mode 100644 index 825fe87fe2f..00000000000 --- a/pkgs/development/libraries/libktorrent/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, extra-cmake-modules -, karchive, kcrash, ki18n, kio, solid -, boost, gmp, qca-qt5, libgcrypt -}: - -let - mainVersion = "5.1.2"; - -in stdenv.mkDerivation rec { - pname = "libktorrent"; - version = "2.1.1"; - - src = fetchurl { - url = "mirror://kde/stable/ktorrent/${mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - - buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ]; - - propagatedBuildInputs = [ gmp boost ]; - - passthru = { - inherit mainVersion; - }; - - dontWrapQtApps = true; - - meta = with lib; { - description = "A BitTorrent library used by KTorrent"; - homepage = "https://www.kde.org/applications/internet/ktorrent/"; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c4583f83bff..38e6d5dcc0d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1426,7 +1426,7 @@ mapAliases ({ kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares - ksshaskpass ksystemlog kteatime ktimer ktouch kturtle kwallet-pam + ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eb67dfffea..5368a4a5678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26870,8 +26870,6 @@ with pkgs; ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; - kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index d9cc05afe71..751236fdcb4 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -116,8 +116,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; - libktorrent = callPackage ../development/libraries/libktorrent { }; - liblastfm = callPackage ../development/libraries/liblastfm { }; libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; From b8b1c733b2397dc3b45333a1c9c2929d69ed6f9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Feb 2022 19:54:24 +0000 Subject: [PATCH 065/114] okteta: 0.26.6 -> 0.26.7 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 96256e7ef34..c775a493f16 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.6"; + version = "0.26.7"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-xWnNW1VQPkbfGltckWKwiIjEJqpSxvPy+SbGWL7gFEw="; + sha256 = "sha256-8SO1VpDWz19UfppdtziiZymoLnvQLMAAIjjOTZ/VMOM="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; From ba549fc0b99546fa7a3f442a333b8a638177e2fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 11:56:20 +0100 Subject: [PATCH 066/114] python3Packages.portpicker: fix build - add pythonImportsCheck --- .../python-modules/portpicker/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index fd7bf7bc09c..faf3b958162 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -1,6 +1,8 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi +, psutil +, pythonOlder }: buildPythonPackage rec { @@ -8,15 +10,25 @@ buildPythonPackage rec { version = "1.5.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "e13b148008adeb2793cf8b55bcd20fdcec4f763f2d3bf3c45f5e5e5d1df7d228"; + hash = "sha256-4TsUgAit6yeTz4tVvNIP3OxPdj8tO/PEX15eXR330ig="; }; - meta = { - description = "A library to choose unique available network ports."; + propagatedBuildInputs = [ + psutil + ]; + + pythonImportsCheck = [ + "portpicker" + ]; + + meta = with lib; { + description = "Library to choose unique available network ports"; homepage = "https://github.com/google/python_portpicker"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ danharaj ]; + license = licenses.asl20; + maintainers = with maintainers; [ danharaj ]; }; } From 807cf78f4bbf2aeb72753be46d40b99f4f69878d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Feb 2022 12:01:19 +0100 Subject: [PATCH 067/114] yq-go: 4.20.2 -> 4.21.1 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 483523e1807..bfe18fc4758 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.20.2"; + version = "4.21.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-vhHT9re35aT+TUYhl4rxv4PE/sd7Vp1PoFbS8s5lWLE="; + sha256 = "sha256-283xe7FVHYSsRl4cZD7WDzIW1gqNAFsNrWYJkthZheU="; }; - vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE="; + vendorSha256 = "sha256-F11FnDYJ59aKrdRXDPpKlhX52yQXdaN1sblSkVI2j9w="; doCheck = false; From 39db09d87bc478ca14cdce86bbfaf6977bb88309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Feb 2022 12:02:07 +0100 Subject: [PATCH 068/114] python39Packages.bandit: 1.7.2 -> 1.7.3 --- pkgs/development/python-modules/bandit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 4a2a2803d3a..0fcf5966d68 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.2"; + version = "1.7.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-bRGt6gIUpDgTiHv+caN3tamVXkyCbI/9NBtJTjqyUmA="; + sha256 = "sha256-WHcsqVG/ESndqKKA01FUfegycgv3tcKfrDEDknmAuKY="; }; propagatedBuildInputs = [ From be97fd0d19d409be99e52fb5e2f5ac38debc45c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 11:12:34 +0000 Subject: [PATCH 069/114] python310Packages.garages-amsterdam: 3.2.1 -> 4.0.0 --- pkgs/development/python-modules/garages-amsterdam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index 01ff36e6379..608f89cc03c 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "garages-amsterdam"; - version = "3.2.1"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "garages_amsterdam"; rev = "v${version}"; - sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; + sha256 = "sha256-3YSCf5sUnq2+Bt7LA30XeIMg4zsaPF3K5SVzGZ68SbY="; }; postPatch = '' From 1e6f7736a2f6f0c30bcc51f4f14bcd4147c26292 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 2 Feb 2022 21:26:58 +0100 Subject: [PATCH 070/114] python3Packages.maestral: 1.5.2 -> 1.5.3 --- pkgs/development/python-modules/maestral/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 90494de8223..ccbd70ff48e 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -10,16 +10,18 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.5.2"; + version = "1.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-nFXgvFLw6ru/Sw3+LoZ7V09dyn0L21We/Dlwib2gZB8="; + sha256 = "sha256-Uo3vcYez2qSq162SSKjoCkwygwR5awzDceIq8/h3dao="; }; + format = "pyproject"; + propagatedBuildInputs = [ click desktop-notifier From 0d39e18c48e9cd709566400774f574dd12d2684c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 2 Feb 2022 21:27:55 +0100 Subject: [PATCH 071/114] maestral-gui: 1.5.2 -> 1.5.3 --- pkgs/applications/networking/maestral-qt/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 78876090e9f..2f0f3bd74ff 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -6,16 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.5.2"; + version = "1.5.3"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-/wleUwTPkm5l8GgtBM2J0jsdc1A54WRYJPmHqSsdz4c="; + sha256 = "sha256-zaG9Zwz9S/SVb7xDa7eXkjLNt1BhA1cQ3I18rVt+8uQ="; }; + format = "pyproject"; + propagatedBuildInputs = with python3.pkgs; [ click markdown2 From c0952b6478194c01081d338b46402803cbfd14a6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 18 Feb 2022 21:28:37 +0100 Subject: [PATCH 072/114] chromium{Beta,Dev}: Switch to LLVM 14 This fixes the following build error: [24751/48400] ACTION //components/url_formatter/spoof_checks/top_domains:generate_top_domain_list_variables_file(//build/toolchain/linux/unbundle:default)d_tmp/browser_command.mojom-webui.js.mojom-webui.jsui.js FAILED: gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc python3 ../../build/gn_run_binary.py make_top_domain_list_variables ../../components/url_formatter/spoof_checks/top_domains/domains.list top500_domains gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc make_top_domain_list_variables failed with exit code -4 The "make_top_domain_list_variables" program fails due to a SIGILL error (illegal instruction). See: - https://bugs.chromium.org/p/chromium/issues/detail?id=1273966 - https://reviews.llvm.org/D115015 - https://bugs.chromium.org/p/chromium/issues/detail?id=1269407 --- pkgs/applications/networking/browsers/chromium/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 53762744504..084db58f38b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -54,6 +54,9 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); + } // lib.optionalAttrs (chromiumVersionAtLeast "99") rec { + llvmPackages = llvmPackages_14; + stdenv = llvmPackages_14.stdenv; }); browser = callPackage ./browser.nix { From 1bdf7862e3f8007cdb21bbbde1d496064f869bb3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Feb 2022 20:30:43 +0100 Subject: [PATCH 073/114] chromiumBeta: Fix the build This "fixes" the following error: gen/shim_headers/opus_shim/third_party/opus/src/include/opus.h:5:10: error: 'opus.h' file not found with include; use "quotes" instead ^~~~~~~~ "opus.h" Our system library isn't discovered anymore so I'm switching to the bundled Opus library for now since I don't have time to look into it. --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c377c0ab207..0eb1893e95c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -96,7 +96,7 @@ let "libpng" "libwebp" "libxslt" - "opus" + # "opus" ]; opusWithCustomModes = libopus.override { From 3bce8227a0019104590dfab07d527f7493a9e1f6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 28 Feb 2022 12:31:39 +0100 Subject: [PATCH 074/114] llvmPackages_14.lld: Update fix-root-src-dir.patch to fix the build --- .../compilers/llvm/14/lld/fix-root-src-dir.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch index 26ecef25649..38fb965b472 100644 --- a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch +++ b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch @@ -1,13 +1,13 @@ -diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt -index e1a29b884d17..9d542f8fbfc1 100644 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bcc135665d0..d38679ed41e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -64,7 +64,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - - set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include") - set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") -- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") +@@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE) + + set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") + set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") - + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) From 19d43bf8f6c83e9c0601b3bbb4a9833fb318f3cf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 21 Feb 2022 22:53:07 +0100 Subject: [PATCH 075/114] davix-copy: remove appendToName to have a consistent package name for repology --- pkgs/tools/networking/davix/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 66c912b47f1..63fc1cffd9a 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation rec { version = "0.8.0"; - pname = "davix"; + pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ openssl @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # "please ignore the GitHub-generated tarballs, as they are incomplete" # https://github.com/cern-fts/davix/releases/tag/R_0_8_0 src = fetchurl { - url = "https://github.com/cern-fts/${pname}/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; + url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz"; sha256 = "LxCNoECKg/tbnwxoFQ02C6cz5LOg/imNRbDTLSircSQ="; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5368a4a5678..c968bad82a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4069,7 +4069,7 @@ with pkgs; davix = callPackage ../tools/networking/davix { }; - davix-copy = appendToName "copy" (davix.override { enableThirdPartyCopy = true; }); + davix-copy = davix.override { enableThirdPartyCopy = true; }; cantata = libsForQt5.callPackage ../applications/audio/cantata { }; From 564b9a825297d85a9c7a2c48d28a457ba1f2aa63 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 21 Feb 2022 22:54:09 +0100 Subject: [PATCH 076/114] gawkInteractive: remove appendToName to have a consistent package name for repology --- pkgs/tools/text/gawk/default.nix | 2 +- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index d66d3763c03..3f91a301fd1 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -16,7 +16,7 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; stdenv.mkDerivation rec { - pname = "gawk"; + pname = "gawk" + lib.optionalString interactive "-interactive"; version = "5.1.1"; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c968bad82a4..af85165e4e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5681,8 +5681,7 @@ with pkgs; }; gawkextlib = callPackage ../tools/text/gawk/gawkextlib.nix {}; - gawkInteractive = appendToName "interactive" - (gawk.override { interactive = true; }); + gawkInteractive = gawk.override { interactive = true; }; gawp = callPackage ../tools/misc/gawp { }; From 404e4e6be23d75a18c5dbb87f5f0beb234191f01 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 12:48:53 +0100 Subject: [PATCH 077/114] netcdf-mpi:remove appendToName to have a consistent package name for repology --- pkgs/development/libraries/netcdf/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 71109775722..27af3be4f2d 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -10,11 +10,11 @@ let inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { - pname = "netcdf"; + pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; version = "4.8.0"; # Remove patch mentioned below on upgrade src = fetchurl { - url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz"; + url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz"; sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af85165e4e2..26f02751fc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8084,9 +8084,9 @@ with pkgs; hdf5 = hdf5.override { usev110Api = true; }; }; - netcdf-mpi = appendToName "mpi" (netcdf.override { + netcdf-mpi = netcdf.override { hdf5 = hdf5-mpi.override { usev110Api = true; }; - }); + }; netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; From a5ee1e55a195010263778dfc846b39eb555541ca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 14:30:51 +0100 Subject: [PATCH 078/114] texinfoInteractive: remove double '-interactive' name --- 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 26f02751fc9..6b2e1689fae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15755,9 +15755,7 @@ with pkgs; texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { }; texinfo = texinfo6; - texinfoInteractive = appendToName "interactive" ( - texinfo.override { interactive = true; } - ); + texinfoInteractive = texinfo.override { interactive = true; }; texi2html = callPackage ../development/tools/misc/texi2html { }; From e8d722ff6401d5746069e519643fc4d3c0a63474 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 15:47:18 +0100 Subject: [PATCH 079/114] highfive-mpi: remove appendToName to have a consistent package name for repology --- pkgs/development/libraries/highfive/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index 1a8ea5c1ae5..5eb6ceb204e 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -11,7 +11,7 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { - pname = "highfive"; + pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; version = "2.3.1"; src = fetchFromGitHub { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b2e1689fae..a0c96a84d74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17273,9 +17273,7 @@ with pkgs; highfive = callPackage ../development/libraries/highfive { }; - highfive-mpi = appendToName "mpi" (highfive.override { - hdf5 = hdf5-mpi; - }); + highfive-mpi = highfive.override { hdf5 = hdf5-mpi; }; hiredis = callPackage ../development/libraries/hiredis { }; From 910a9c77227375ab3186d148c68a1c5327f5fc70 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 16:15:32 +0100 Subject: [PATCH 080/114] sqlite-interactive: remove appendToName to have a consistent package name for repology --- pkgs/development/libraries/sqlite/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 6704d894f5a..5fdf6c11d77 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - pname = "sqlite"; + pname = "sqlite${optionalString interactive "-interactive"}"; version = "3.37.2"; # nixpkgs-update: no auto update diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0c96a84d74..b85db5723c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20155,7 +20155,7 @@ with pkgs; sqlitecpp = callPackage ../development/libraries/sqlitecpp { }; - sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin; + sqlite-interactive = (sqlite.override { interactive = true; }).bin; sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { }; From a50f8ee4331598d431eedcc2fe0b29ae47e45b9e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:38:51 +0100 Subject: [PATCH 081/114] mercurialFull: remove appendToName to have a consistent package name for repology --- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 80c2679d05c..e413ca0efe0 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -20,7 +20,7 @@ let inherit (python3Packages) docutils python fb-re2 pygit2 pygments; self = python3Packages.buildPythonApplication rec { - pname = "mercurial"; + pname = "mercurial${lib.optionalString fullBuild "-full"}"; version = "6.0.3"; src = fetchurl { @@ -34,9 +34,9 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; - name = "${pname}-${version}"; + name = "mercurial-${version}"; sha256 = "sha256-i4WROxezeqLX4hTdcPrqsf6dBqsNZz6fFAPzItYuklE="; - sourceRoot = "${pname}-${version}/rust"; + sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85db5723c0..4d42e17033d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27309,7 +27309,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - mercurialFull = appendToName "full" (mercurial.override { fullBuild = true; }); + mercurialFull = mercurial.override { fullBuild = true; }; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; From f427f5296e9923d8c73541de6ac14b6c6d969ed1 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:41:45 +0100 Subject: [PATCH 082/114] openlpFull: remove appendToName to have a consistent package name for repology --- pkgs/applications/misc/openlp/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/openlp/default.nix b/pkgs/applications/misc/openlp/default.nix index 1ee48256474..a075a9bec6f 100644 --- a/pkgs/applications/misc/openlp/default.nix +++ b/pkgs/applications/misc/openlp/default.nix @@ -37,7 +37,8 @@ let # base pkg/lib baseLib = python3Packages.callPackage ./lib.nix { }; in mkDerivation { - inherit (baseLib) pname version src; + pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full"; + inherit (baseLib) version src; nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; buildInputs = [ qtbase ] ++ optionals gstreamerSupport diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d42e17033d..69c3984bff0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31811,12 +31811,12 @@ with pkgs; octopus = callPackage ../applications/science/chemistry/octopus { }; openlp = libsForQt5.callPackage ../applications/misc/openlp { }; - openlpFull = appendToName "full" (openlp.override { + openlpFull = openlp.override { pdfSupport = true; presentationSupport = true; vlcSupport = true; gstreamerSupport = true; - }); + }; dkh = callPackage ../applications/science/chemistry/dkh { }; From 13dca33cdc43f4557ee2f53615f2dcbc8f01ac9d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:58:07 +0100 Subject: [PATCH 083/114] neuron-mpi: remove appendToName to have a consistent package name for repology --- pkgs/applications/science/biology/neuron/default.nix | 2 +- pkgs/top-level/all-packages.nix | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 804407968e1..4dc850f5062 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - pname = "neuron"; + pname = "neuron${lib.optionalString useMpi "-mpi"}"; version = "7.5"; nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69c3984bff0..d149641a187 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31968,13 +31968,9 @@ with pkgs; n3 = callPackage ../applications/science/biology/N3 { }; - neuron = callPackage ../applications/science/biology/neuron { - python = null; - }; + neuron = callPackage ../applications/science/biology/neuron { python = null; }; - neuron-mpi = appendToName "mpi" (neuron.override { - useMpi = true; - }); + neuron-mpi = neuron.override {useMpi = true; }; neuron-full = neuron-mpi.override { python = python2; }; From ea0de43b7688fe2fb63d46e9446fb9bbf3d2c946 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 17:59:51 +0100 Subject: [PATCH 084/114] dblatexFull: remove appendToName to have a consistent package name for repology --- pkgs/tools/typesetting/tex/dblatex/default.nix | 2 +- pkgs/top-level/all-packages.nix | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 99ef9a8a71a..5ccc9ed1566 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -14,7 +14,7 @@ # enable any extra features. stdenv.mkDerivation rec { - pname = "dblatex"; + pname = "dblatex${lib.optionalString enableAllFeatures "-full"}"; version = "0.3.12"; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d149641a187..788874a7965 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32997,13 +32997,9 @@ with pkgs; dbacl = callPackage ../tools/misc/dbacl { }; - dblatex = callPackage ../tools/typesetting/tex/dblatex { - enableAllFeatures = false; - }; + dblatex = callPackage ../tools/typesetting/tex/dblatex { }; - dblatexFull = appendToName "full" (dblatex.override { - enableAllFeatures = true; - }); + dblatexFull = dblatex.override { enableAllFeatures = true; }; dbus-map = callPackage ../tools/misc/dbus-map { }; From fe7678ca819933bc2ac28dccf0c0e9aef04de21c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 20:18:51 +0100 Subject: [PATCH 085/114] raxml-mpi: remove appendToName to have a consistent package name for repology --- pkgs/applications/science/biology/raxml/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index 6e747e318f5..d02d4726629 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - pname = "RAxML"; + pname = "RAxML${lib.optionalString useMpi "-mpi"}"; version = "8.2.12"; src = fetchFromGitHub { owner = "stamatak"; - repo = "standard-${pname}"; + repo = "standard-RAxML"; rev = "v${version}"; sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788874a7965..86775d35489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32020,9 +32020,7 @@ with pkgs; raxml = callPackage ../applications/science/biology/raxml { }; - raxml-mpi = appendToName "mpi" (raxml.override { - useMpi = true; - }); + raxml-mpi = raxml.override { useMpi = true; }; sambamba = callPackage ../applications/science/biology/sambamba { }; From 844e206407208be46015620f275bc3ef86ce720f Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 28 Feb 2022 11:57:28 +0000 Subject: [PATCH 086/114] =?UTF-8?q?n8n:=200.164.1=20=E2=86=92=200.165.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/n8n/node-packages.nix | 150 ++++++++++-------- 1 file changed, 87 insertions(+), 63 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 29e3fa179df..c15e51921d4 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -265,13 +265,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.6" = { + "@oclif/parser-3.8.7" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz"; - sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz"; + sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; }; }; "@opentelemetry/api-1.1.0" = { @@ -445,13 +445,13 @@ let sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; }; }; - "@types/lodash-4.14.178" = { + "@types/lodash-4.14.179" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.178"; + version = "4.14.179"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz"; - sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz"; + sha512 = "uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w=="; }; }; "@types/lossless-json-1.0.1" = { @@ -481,13 +481,13 @@ let sha512 = "cPjLXj8d6anFPzFvOPxS3fvly3Shm5nTfl6g8X5smexixbuGUf7hfr21J5tX9JW+UPStp/5P5R8qrKL5IyVJ+A=="; }; }; - "@types/node-17.0.18" = { + "@types/node-17.0.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.18"; + version = "17.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz"; - sha512 = "eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; }; }; "@types/node-fetch-2.6.1" = { @@ -976,13 +976,13 @@ let sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; }; }; - "aws-sdk-2.1077.0" = { + "aws-sdk-2.1082.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1077.0"; + version = "2.1082.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1077.0.tgz"; - sha512 = "orJvJROs8hJaQRfHsX7Zl5PxEgrD/uTXyqXz9Yu9Io5VVxzvnOty9oHmvEMSlgTIf1qd01gnev/vpvP1HgzKtw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1082.0.tgz"; + sha512 = "aDrUZ63O/ocuC827ursDqFQAm3jhqsJu1DvMCCFg73y+FK9pXXNHp2mwdi3UeeHvtfxISCLCjuyO3VFd/tpVfA=="; }; }; "aws-sign2-0.7.0" = { @@ -1894,6 +1894,15 @@ let sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; }; }; + "cssfilter-0.0.10" = { + name = "cssfilter"; + packageName = "cssfilter"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"; + sha1 = "c6d2672632a2e5c83e013e6864a42ce8defd20ae"; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -4441,13 +4450,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mssql-6.4.0" = { + "mssql-6.4.1" = { name = "mssql"; packageName = "mssql"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-6.4.0.tgz"; - sha512 = "Mtgu3PXqoaL7aHCMurttvEHibjvz5XKjlR6ZCDyAeKtDBORpxm88JyzEU2EESVf7588GulYKc7Gr+Txf5CICBQ=="; + url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz"; + sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw=="; }; }; "mute-stream-0.0.8" = { @@ -4477,49 +4486,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.105.0" = { + "n8n-core-0.106.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.105.0"; + version = "0.106.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.105.0.tgz"; - sha512 = "rYAtchFf7V94M9UP1ZCu9ie9O6OWncNconuzO9I1D/QLjBNVGzu0+SsG8be5bGTrAWO0WiNYdj84qMqqJS4NWg=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz"; + sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw=="; }; }; - "n8n-design-system-0.11.0" = { + "n8n-design-system-0.12.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.11.0.tgz"; - sha512 = "KL64XTr9sqqiBEEV7on2cdLooleHPyXClFL+THUy2oXDbGqdlyCGykukU7S4aX+nSjrJEQEDMaMcbw3NCHrumg=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz"; + sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw=="; }; }; - "n8n-editor-ui-0.131.0" = { + "n8n-editor-ui-0.132.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.131.0"; + version = "0.132.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.131.0.tgz"; - sha512 = "Sexo31sn8PdiNjDckNfDCXBs9MBR/hF5NzuFtUCUNaXPR6Z5gql6EhPT+fJfG9Wdsj09L3vV+j3gTAbXqRgPIw=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.0.tgz"; + sha512 = "WOH1Lh+2VYTqBL75pe+WB0H2K8O/6BSW/Wsl5zXbrI0YXmaC9YEvSTAcmjxvjW+oYnYLfQR3p3j6g3AtNldiJQ=="; }; }; - "n8n-nodes-base-0.162.0" = { + "n8n-nodes-base-0.163.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.162.0"; + version = "0.163.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.162.0.tgz"; - sha512 = "bi7vs//5OHrW6RowouusBwUzKutFKnysLWdDrlxlCENGtRDtI+7ELrLMWnKs6PYTRWz0OSBHpEMN64MDEIoEZg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz"; + sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw=="; }; }; - "n8n-workflow-0.87.0" = { + "n8n-workflow-0.88.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.87.0"; + version = "0.88.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.87.0.tgz"; - sha512 = "ei5fvQK4jM3NotOA36d267o243m2MdlSPlG6cIutqx4lgUd1oXX7mYyCJzF3/kNcWbiI8QjdhUoURgdCOEzn8g=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz"; + sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ=="; }; }; "named-placeholders-1.1.2" = { @@ -7015,13 +7024,13 @@ let sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; }; }; - "url-parse-1.5.9" = { + "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.9.tgz"; - sha512 = "HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; "utf7-1.0.2" = { @@ -7141,13 +7150,13 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "vm2-3.9.8" = { + "vm2-3.9.9" = { name = "vm2"; packageName = "vm2"; - version = "3.9.8"; + version = "3.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz"; - sha512 = "/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz"; + sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; }; }; "vue-fragment-1.5.2" = { @@ -7366,6 +7375,15 @@ let sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; }; }; + "xss-1.0.10" = { + name = "xss"; + packageName = "xss"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz"; + sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw=="; + }; + }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -7462,10 +7480,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.164.1"; + version = "0.165.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.164.1.tgz"; - sha512 = "8eUhHHikLspebbc1AjatdSQeaQAVgeYMIMFZmiUPMUw8FVtQ67otse6t/RvBE2RXTzxKer54Nr8eA+cF5dHi8g=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.165.0.tgz"; + sha512 = "PYg5cXEeH6YzVZaSDD9yOZbPtTM/yfaohbZjijyyzVmlOBnI6teQsaY+aLqK6ST4LfMfpB0ZkXpaiBj6xE9azA=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7551,7 +7569,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.6" // { + (sources."@oclif/parser-3.8.7" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -7574,10 +7592,10 @@ in sources."@types/ftp-0.3.33" sources."@types/json-diff-0.5.2" sources."@types/jsonwebtoken-8.5.8" - sources."@types/lodash-4.14.178" + sources."@types/lodash-4.14.179" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.18" + sources."@types/node-17.0.21" (sources."@types/node-fetch-2.6.1" // { dependencies = [ sources."form-data-3.0.1" @@ -7646,7 +7664,7 @@ in ]; }) sources."avsc-5.7.3" - (sources."aws-sdk-2.1077.0" // { + (sources."aws-sdk-2.1082.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7839,6 +7857,7 @@ in sources."csrf-3.1.0" sources."css-select-4.2.1" sources."css-what-5.1.0" + sources."cssfilter-0.0.10" sources."dashdash-1.14.1" sources."date-utils-1.2.21" sources."debug-4.3.3" @@ -8196,7 +8215,7 @@ in ]; }) sources."ms-2.1.2" - sources."mssql-6.4.0" + sources."mssql-6.4.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { dependencies = [ @@ -8205,19 +8224,19 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.105.0" // { + (sources."n8n-core-0.106.0" // { dependencies = [ sources."qs-6.10.3" ]; }) - sources."n8n-design-system-0.11.0" - sources."n8n-editor-ui-0.131.0" - (sources."n8n-nodes-base-0.162.0" // { + sources."n8n-design-system-0.12.0" + sources."n8n-editor-ui-0.132.0" + (sources."n8n-nodes-base-0.163.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.87.0" + sources."n8n-workflow-0.88.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8627,7 +8646,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.9" + sources."url-parse-1.5.10" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" @@ -8643,7 +8662,7 @@ in sources."validator-13.7.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vm2-3.9.8" + sources."vm2-3.9.9" sources."vue-fragment-1.5.2" sources."vue-i18n-8.27.0" sources."webidl-conversions-3.0.1" @@ -8676,6 +8695,11 @@ in sources."xmlbuilder-11.0.1" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" + (sources."xss-1.0.10" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" From 1573dbdcd01293fd45fec86ea0f35008b5924d0d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 28 Feb 2022 12:35:10 +0100 Subject: [PATCH 087/114] treewide: fix versions starting with 'v' --- pkgs/applications/audio/plujain-ramp/default.nix | 2 +- pkgs/applications/science/chemistry/d-seams/default.nix | 4 ++-- pkgs/development/libraries/ngt/default.nix | 2 +- pkgs/development/libraries/rang/default.nix | 8 ++++---- pkgs/development/python-modules/rstcheck/default.nix | 4 ++-- pkgs/development/tools/packet/default.nix | 4 ++-- pkgs/misc/screensavers/physlock/default.nix | 4 ++-- pkgs/tools/admin/pebble/default.nix | 9 ++++----- pkgs/tools/graphics/snapdragon-profiler/default.nix | 2 +- pkgs/tools/graphics/structure-synth/default.nix | 7 +++---- pkgs/tools/text/diffr/default.nix | 4 ++-- 11 files changed, 24 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/applications/audio/plujain-ramp/default.nix index 56f4d6da050..d8f5357efdb 100644 --- a/pkgs/applications/audio/plujain-ramp/default.nix +++ b/pkgs/applications/audio/plujain-ramp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - version = "v1.1.3"; + version = "1.1.3"; pname = "plujain-ramp"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index f5e21db4b55..74260bacabc 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -2,13 +2,13 @@ , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: clangStdenv.mkDerivation rec { - version = "v1.0.1"; + version = "1.0.1"; pname = "d-SEAMS"; src = fetchFromGitHub { owner = "d-SEAMS"; repo = "seams-core"; - rev = "v1.0.1"; + rev = "v${version}"; sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i"; }; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index 385f2d84f8a..e42ee750cc0 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "NGT"; - version = "v1.12.3-alpha"; + version = "1.12.3-alpha"; src = fetchFromGitHub { owner = "yahoojapan"; diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix index 79ab52fc835..050beef5ea3 100644 --- a/pkgs/development/libraries/rang/default.nix +++ b/pkgs/development/libraries/rang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rang"; - version = "v3.1.0"; + version = "3.1.0"; src = fetchFromGitHub { - "owner" = "agauniyal"; + owner = "agauniyal"; repo = "rang"; - "rev" = "cabe04d6d6b05356fa8f9741704924788f0dd762"; - "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; + rev = "cabe04d6d6b05356fa8f9741704924788f0dd762"; + sha256 = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; }; nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index d109a6cce74..606b2879908 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "v3.3.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "myint"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "sha256-4AhENuT+LtUMCi+aaI/rKa2gHti8sKGLdVGjdRithXI="; }; diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 723e5d8bb2d..173ff4770da 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -3,12 +3,12 @@ buildGoPackage rec { pname = "packet"; - version = "v2.2.2"; + version = "2.2.2"; goPackagePath = "github.com/ebsarr/packet"; src = fetchgit { - rev = version; + rev = "v${version}"; url = "https://github.com/ebsarr/packet"; sha256 = "18n8f2rlab4icb28k1b9gnh30zy382v792x07fmcdqq4nkw6wvwf"; }; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index d25a777e650..b5e9ba8d2b6 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, pam, systemd }: stdenv.mkDerivation rec { - version = "v13"; + version = "13"; pname = "physlock"; src = fetchFromGitHub { owner = "muennich"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s"; }; diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index 1fb902a8c80..436e77ed5f1 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -4,17 +4,16 @@ , nixosTests }: -let - version = "v2.3.0"; +buildGoPackage rec { pname = "pebble"; -in buildGoPackage { - inherit pname version; + version = "2.3.0"; + goPackagePath = "github.com/letsencrypt/${pname}"; src = fetchFromGitHub { owner = "letsencrypt"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2"; }; diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix index 298975ef18b..b48c0a6d16a 100644 --- a/pkgs/tools/graphics/snapdragon-profiler/default.nix +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "snapdragon-profiler"; - version = "v2021.2"; + version = "2021.2"; src = archive; diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index 5f6e655882a..ab32657236a 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: -stdenv.mkDerivation { - +stdenv.mkDerivation rec { pname = "structure-synth"; - version = "v1.5"; + version = "1.5.0"; src = fetchurl { - url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip"; + url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v${version}.zip"; sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index a77a5dc081e..844a09f0d58 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -2,12 +2,12 @@ rustPlatform.buildRustPackage rec { pname = "diffr"; - version = "v0.1.4"; + version = "0.1.4"; src = fetchFromGitHub { owner = "mookid"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; }; From 6a96ddb67509064c2d445b3fae73d4c4c38c539d Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 10 Apr 2021 16:04:35 +0200 Subject: [PATCH 088/114] pkgs-lib: Implement settings format for Elixir --- .../development/settings-options.section.md | 45 ++++ .../development/settings-options.section.xml | 104 +++++++++ pkgs/pkgs-lib/formats.nix | 207 ++++++++++++++++++ 3 files changed, 356 insertions(+) diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 58a3d8448af..f9bb6ff9cc4 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -66,6 +66,45 @@ have a predefined type and string generator already declared under and returning a set with TOML-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). +`pkgs.formats.elixirConf { elixir ? pkgs.elixir }` + +: A function taking an attribute set with values + + `elixir` + + : The Elixir package which will be used to format the generated output + + It returns a set with Elixir-Config-specific attributes `type`, `lib`, and + `generate` as specified [below](#pkgs-formats-result). + + The `lib` attribute contains functions to be used in settings, for + generating special Elixir values: + + `mkRaw elixirCode` + + : Outputs the given string as raw Elixir code + + `mkGetEnv { envVariable, fallback ? null }` + + : Makes the configuration fetch an environment variable at runtime + + `mkAtom atom` + + : Outputs the given string as an Elixir atom, instead of the default + Elixir binary string. Note: lowercase atoms still needs to be prefixed + with `:` + + `mkTuple array` + + : Outputs the given array as an Elixir tuple, instead of the default + Elixir list + + `mkMap attrset` + + : Outputs the given attribute set as an Elixir map, instead of the + default Elixir keyword list + + ::: {#pkgs-formats-result} These functions all return an attribute set with these values: ::: @@ -74,6 +113,12 @@ These functions all return an attribute set with these values: : A module system type representing a value of the format +`lib` + +: Utility functions for convenience, or special interactions with the format. + This attribute is optional. It may contain inside a `types` attribute + containing types specific to this format. + `generate` *`filename jsonValue`* : A function that can render a value of the format to a file. Returns diff --git a/nixos/doc/manual/from_md/development/settings-options.section.xml b/nixos/doc/manual/from_md/development/settings-options.section.xml index c9430b77579..746011a2d07 100644 --- a/nixos/doc/manual/from_md/development/settings-options.section.xml +++ b/nixos/doc/manual/from_md/development/settings-options.section.xml @@ -137,6 +137,97 @@ + + + pkgs.formats.elixirConf { elixir ? pkgs.elixir } + + + + A function taking an attribute set with values + + + + + elixir + + + + The Elixir package which will be used to format the + generated output + + + + + + It returns a set with Elixir-Config-specific attributes + type, lib, and + generate as specified + below. + + + The lib attribute contains functions to + be used in settings, for generating special Elixir values: + + + + + mkRaw elixirCode + + + + Outputs the given string as raw Elixir code + + + + + + mkGetEnv { envVariable, fallback ? null } + + + + Makes the configuration fetch an environment variable + at runtime + + + + + + mkAtom atom + + + + Outputs the given string as an Elixir atom, instead of + the default Elixir binary string. Note: lowercase + atoms still needs to be prefixed with + : + + + + + + mkTuple array + + + + Outputs the given array as an Elixir tuple, instead of + the default Elixir list + + + + + + mkMap attrset + + + + Outputs the given attribute set as an Elixir map, + instead of the default Elixir keyword list + + + + + + These functions all return an attribute set with these values: @@ -152,6 +243,19 @@ + + + lib + + + + Utility functions for convenience, or special interactions + with the format. This attribute is optional. It may contain + inside a types attribute containing types + specific to this format. + + + generate diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 5e17519d4ce..495a7094f9b 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -14,6 +14,15 @@ rec { # The description needs to be overwritten for recursive types type = ...; + # Utility functions for convenience, or special interactions with the + # format (optional) + lib = { + exampleFunction = ... + # Types specific to the format (optional) + types = { ... }; + ... + }; + # generate :: Name -> Value -> Path # A function for generating a file with a value of such a type generate = ...; @@ -147,4 +156,202 @@ rec { ''; }; + + /* For configurations of Elixir project, like config.exs or runtime.exs + + Most Elixir project are configured using the [Config] Elixir DSL + + Since Elixir has more types than Nix, we need a way to map Nix types to + more than 1 Elixir type. To that end, this format provides its own library, + and its own set of types. + + To be more detailed, a Nix attribute set could correspond in Elixir to a + [Keyword list] (the more common type), or it could correspond to a [Map]. + + A Nix string could correspond in Elixir to a [String] (also called + "binary"), an [Atom], or a list of chars (usually discouraged). + + A Nix array could correspond in Elixir to a [List] or a [Tuple]. + + Some more types exists, like records, regexes, but since they are less used, + we can leave the `mkRaw` function as an escape hatch. + + For more information on how to use this format in modules, please refer to + the Elixir section of the Nixos documentation. + + TODO: special Elixir values doesn't show up nicely in the documentation + + [Config]: + [Keyword list]: + [Map]: + [String]: + [Atom]: + [List]: + [Tuple]: + */ + elixirConf = { elixir ? pkgs.elixir }: + with lib; let + toElixir = value: with builtins; + if value == null then "nil" else + if value == true then "true" else + if value == false then "false" else + if isInt value || isFloat value then toString value else + if isString value then string value else + if isAttrs value then attrs value else + if isList value then list value else + abort "formats.elixirConf: should never happen (value = ${value})"; + + escapeElixir = escape [ "\\" "#" "\"" ]; + string = value: "\"${escapeElixir value}\""; + + attrs = set: + if set ? _elixirType then specialType set + else + let + toKeyword = name: value: "${name}: ${toElixir value}"; + keywordList = concatStringsSep ", " (mapAttrsToList toKeyword set); + in + "[" + keywordList + "]"; + + listContent = values: concatStringsSep ", " (map toElixir values); + + list = values: "[" + (listContent values) + "]"; + + specialType = { value, _elixirType }: + if _elixirType == "raw" then value else + if _elixirType == "atom" then value else + if _elixirType == "map" then elixirMap value else + if _elixirType == "tuple" then tuple value else + abort "formats.elixirConf: should never happen (_elixirType = ${_elixirType})"; + + elixirMap = set: + let + toEntry = name: value: "${toElixir name} => ${toElixir value}"; + entries = concatStringsSep ", " (mapAttrsToList toEntry set); + in + "%{${entries}}"; + + tuple = values: "{${listContent values}}"; + + toConf = values: + let + keyConfig = rootKey: key: value: + "config ${rootKey}, ${key}, ${toElixir value}"; + keyConfigs = rootKey: values: mapAttrsToList (keyConfig rootKey) values; + rootConfigs = flatten (mapAttrsToList keyConfigs values); + in + '' + import Config + + ${concatStringsSep "\n" rootConfigs} + ''; + in + { + type = with lib.types; let + valueType = nullOr + (oneOf [ + bool + int + float + str + (attrsOf valueType) + (listOf valueType) + ]) // { + description = "Elixir value"; + }; + in + attrsOf (attrsOf (valueType)); + + lib = + let + mkRaw = value: { + inherit value; + _elixirType = "raw"; + }; + + in + { + inherit mkRaw; + + /* Fetch an environment variable at runtime, with optional fallback + */ + mkGetEnv = { envVariable, fallback ? null }: + mkRaw "System.get_env(${toElixir envVariable}, ${toElixir fallback})"; + + /* Make an Elixir atom. + + Note: lowercase atoms still need to be prefixed by ':' + */ + mkAtom = value: { + inherit value; + _elixirType = "atom"; + }; + + /* Make an Elixir tuple out of a list. + */ + mkTuple = value: { + inherit value; + _elixirType = "tuple"; + }; + + /* Make an Elixir map out of an attribute set. + */ + mkMap = value: { + inherit value; + _elixirType = "map"; + }; + + /* Contains Elixir types. Every type it exports can also be replaced + by raw Elixir code (i.e. every type is `either type rawElixir`). + + It also reexports standard types, wrapping them so that they can + also be raw Elixir. + */ + types = with lib.types; let + isElixirType = type: x: (x._elixirType or "") == type; + + rawElixir = mkOptionType { + name = "rawElixir"; + description = "raw elixir"; + check = isElixirType "raw"; + }; + + elixirOr = other: either other rawElixir; + in + { + inherit rawElixir elixirOr; + + atom = elixirOr (mkOptionType { + name = "elixirAtom"; + description = "elixir atom"; + check = isElixirType "atom"; + }); + + tuple = elixirOr (mkOptionType { + name = "elixirTuple"; + description = "elixir tuple"; + check = isElixirType "tuple"; + }); + + map = elixirOr (mkOptionType { + name = "elixirMap"; + description = "elixir map"; + check = isElixirType "map"; + }); + # Wrap standard types, since anything in the Elixir configuration + # can be raw Elixir + } // lib.mapAttrs (_name: type: elixirOr type) lib.types; + }; + + generate = name: value: pkgs.runCommandNoCC name + { + value = toConf value; + passAsFile = [ "value" ]; + nativeBuildInputs = [ elixir ]; + } '' + cp "$valuePath" "$out" + mix format "$out" + ''; + }; + } From 53e70ab75490df87a165d704a9e98312b3f5137b Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 10 Apr 2021 17:37:58 +0200 Subject: [PATCH 089/114] maintainers/teams: add minijackson to the beam team --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c586254d709..4e410b5914e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -50,6 +50,7 @@ with lib.maintainers; { DianaOlympos gleber happysalada + minijackson yurrriq ]; scope = "Maintain BEAM-related packages and modules."; From ab34433bc0dcdf9b3cfbc8bb187030920b4c0e7b Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Mon, 28 Feb 2022 13:18:39 +0100 Subject: [PATCH 090/114] emojipick: init at 2021-01-27 (#158187) --- pkgs/applications/misc/emojipick/default.nix | 71 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/applications/misc/emojipick/default.nix diff --git a/pkgs/applications/misc/emojipick/default.nix b/pkgs/applications/misc/emojipick/default.nix new file mode 100644 index 00000000000..9c28c98bf04 --- /dev/null +++ b/pkgs/applications/misc/emojipick/default.nix @@ -0,0 +1,71 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +, python3 +, xclip +, libnotify +, dmenu +, rofi +, emojipick-use-rofi ? false +, emojipick-copy-to-clipboard ? true +, emojipick-show-notifications ? true +, emojipick-print-emoji ? true +, emojipick-font-family ? "Noto Color Emoji" +, emojipick-font-size ? "18" +}: + +let + boolToInt = b: if b then "1" else "0"; # Convert boolean to integer string +in +stdenvNoCC.mkDerivation { + pname = "emojipick"; + version = "2021-01-27"; + + src = fetchFromGitHub { + owner = "thingsiplay"; + repo = "emojipick"; + rev = "20210127"; + sha256 = "1kib3cyx6z9v9qw6yrfx5sklanpk5jbxjc317wi7i7ljrg0vdazp"; + }; + + dontConfigure = true; + dontBuild = true; + + # Patch configuration + # notify-send has to be patched in a bash file + postPatch = '' + substituteInPlace emojipick \ + --replace "use_rofi=0" "use_rofi=${boolToInt emojipick-use-rofi}" \ + --replace "copy_to_clipboard=1" "copy_to_clipboard=${boolToInt emojipick-copy-to-clipboard}" \ + --replace "show_notification=1" "show_notification=${boolToInt emojipick-show-notifications}" \ + --replace "print_emoji=1" "print_emoji=${boolToInt emojipick-print-emoji}" \ + --replace "font_family='\"Noto Color Emoji\"'" "font_family='\"${emojipick-font-family}\"'" \ + --replace 'font_size="18"' 'font_size="${emojipick-font-size}"' \ + ${lib.optionalString emojipick-use-rofi "--replace 'rofi ' '${rofi}/bin/rofi '"} \ + --replace notify-send ${libnotify}/bin/notify-send + ''; + + buildInputs = [ + python3 + xclip + libnotify + ] ++ (if emojipick-use-rofi then [rofi] else [dmenu]); + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp ./emojipick $out/bin + cp ./emojiget.py $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Get a selection of emojis with dmenu or rofi"; + homepage = "https://github.com/thingsiplay/emojipick"; + license = licenses.mit; + maintainers = with maintainers; [ alexnortung ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5368a4a5678..3544f1f0be5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23601,6 +23601,8 @@ with pkgs; inherit (nodePackages) svgo; }; + emojipick = callPackage ../applications/misc/emojipick { }; + encode-sans = callPackage ../data/fonts/encode-sans { }; envypn-font = callPackage ../data/fonts/envypn-font From a0d8e37dfd90158176cb989a62d9da418aae589f Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 28 Feb 2022 12:36:25 +0000 Subject: [PATCH 091/114] trivy: 0.24.0 -> 0.24.1 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index f32a11b73a3..7f7d6ed51d6 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kpM/9bRUpcqF7dXlCS01Fn8TBfeW9Rr92pBd6w6HA30="; + sha256 = "sha256-/XkHvXzF7SG5niIknd+wh1Uc0ZbfrklgTkZigjz3aNY="; }; - vendorSha256 = "sha256-lLIlPzmXdz7kY7EEb+l4hUvM7y+1pDNK06/0lB0g2SM="; + vendorSha256 = "sha256-C3JpjDXQ6sUnz9ixO3w2aP3G122nYHezYrNW/FZqlJQ="; excludedPackages = "misc"; From 6aad44741e2d7ad36945b52d2ae56de8977aa6cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 21 Feb 2022 17:53:28 -0300 Subject: [PATCH 092/114] whitesur-gtk-theme: 2021-12-28 -> 2022-02-21 --- pkgs/data/themes/whitesur/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 6833f473664..afc9f2282d9 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-12-28"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0i81aickccfp8fffilhi335hj5ijz2n38yj3zw2fnbwgm667i0fc"; + sha256 = "1bqgbkx7qhpj9vbqcxb69p67m8ix3avxr81pdpdi56g9gqbnkpfc"; }; nativeBuildInputs = [ From 612d007dc552d098e3c7c9b28b70f20edb30ba88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 21 Feb 2022 17:55:53 -0300 Subject: [PATCH 093/114] whitesur-gtk-theme: add optional arguments --- pkgs/data/themes/whitesur/default.nix | 33 ++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index afc9f2282d9..92bfbd0dd26 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -7,8 +7,28 @@ , libxml2 , sassc , util-linux +, altVariants ? [] # default: normal +, colorVariants ? [] # default: all +, opacityVariants ? [] # default: all +, themeVariants ? [] # default: default (BigSur-like theme) +, nautilusSize ? null # default: 200px +, panelOpacity ? null # default: 15% +, panelSize ? null # default: 32px }: +let + pname = "whitesur-gtk-theme"; + single = x: lib.optional (x != null) x; + +in +lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariants +lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants +lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants +lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize) +lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity) +lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (single panelSize) + stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; version = "2022-02-21"; @@ -48,8 +68,19 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mkdir -p $out/share/themes - ./install.sh --dest $out/share/themes --alt all --theme all + + ./install.sh \ + ${toString (map (x: "--alt " + x) altVariants)} \ + ${toString (map (x: "--color " + x) colorVariants)} \ + ${toString (map (x: "--opacity " + x) opacityVariants)} \ + ${toString (map (x: "--theme " + x) themeVariants)} \ + ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \ + ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \ + ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \ + --dest $out/share/themes + runHook postInstall ''; From c37327d82dbf1e395e7d41922ef33b37bbcedaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 21 Feb 2022 17:56:34 -0300 Subject: [PATCH 094/114] whitesur-gtk-theme: replace duplicate files with links --- pkgs/data/themes/whitesur/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 92bfbd0dd26..825772880d6 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -4,6 +4,7 @@ , glib , gnome-shell , gnome-themes-extra +, jdupes , libxml2 , sassc , util-linux @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib gnome-shell + jdupes libxml2 sassc util-linux @@ -81,6 +83,8 @@ stdenv.mkDerivation rec { ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \ --dest $out/share/themes + jdupes --link-soft --recurse $out/share + runHook postInstall ''; From 9d821edfd11c53fa5970c895eb404ac794c53d52 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 28 Feb 2022 14:27:59 +0100 Subject: [PATCH 095/114] pinegrow: init at 6.3 (#157304) Co-authored-by: Sandro --- .../applications/editors/pinegrow/default.nix | 70 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/applications/editors/pinegrow/default.nix diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix new file mode 100644 index 00000000000..8ddd0d6a283 --- /dev/null +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchurl +, unzip +, udev +, nwjs +, gcc-unwrapped +, autoPatchelfHook +, gsettings-desktop-schemas +, gtk3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pinegrow"; + version = "6.3"; + + src = fetchurl { + url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; + sha256 = "0wldj633p67da077nfc67gr9xhq580rkfd0r3904sjq7x01r0kaz"; + }; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + udev + nwjs + gcc-unwrapped + gsettings-desktop-schemas + gtk3 + ]; + + sourceRoot = "."; + + dontUnpack = true; + + # Extract and copy executable in $out/bin + installPhase = '' + runHook preInstall + + mkdir -p $out/share/applications $out/bin $out/opt/bin + # we can't unzip it in $out/lib, because nw.js will start with + # an empty screen. Therefore it will be unzipped in a non-typical + # folder and symlinked. + unzip $src -d $out/opt/pinegrow + substituteInPlace $out/opt/pinegrow/Pinegrow.desktop \ + --replace 'Exec=sh -c "$(dirname %k)/PinegrowLibrary"' 'Exec=sh -c "$out/bin/Pinegrow"' + mv $out/opt/pinegrow/Pinegrow.desktop $out/share/applications/Pinegrow.desktop + ln -s $out/opt/pinegrow/PinegrowLibrary $out/bin/Pinegrow + + runHook postInstall + ''; + + preFixup = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + wrapGApp "$out/opt/pinegrow/PinegrowLibrary" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} + ''; + + meta = with lib; { + homepage = "https://pinegrow.com"; + description = "UI Web Editor"; + platforms = platforms.linux; + license = with licenses; [ unfreeRedistributable ]; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c49100ae61c..e147dd37161 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27702,6 +27702,8 @@ with pkgs; pijuice = with python3Packages; toPythonApplication pijuice; + pinegrow = callPackage ../applications/editors/pinegrow { }; + ping = callPackage ../applications/networking/ping { }; piper = callPackage ../os-specific/linux/piper { }; From 1507783b7f1e4fba85c7f6707dc40bd8b19c7b7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 13:40:49 +0000 Subject: [PATCH 096/114] nextcloud-client: 3.4.2 -> 3.4.3 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 04e6e3fb438..3a63f98c44c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-cqpdn2STxJtUTBRFrUh1lRIDaFZfrRkJMxcJuTKxgk8="; + sha256 = "sha256-nryoueoqnbBAJaU11OUXKP5PNrYf4515ojBkdMFIEMA="; }; patches = [ From d8d6f9bb070034e9193416fcfb42b99f36413537 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 14:44:17 +0100 Subject: [PATCH 097/114] python3Packages.garages-amsterdam: update supported Python releases --- .../python-modules/garages-amsterdam/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index 608f89cc03c..cc89020e443 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -1,16 +1,17 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, pythonOlder , poetry-core -, aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "garages-amsterdam"; version = "4.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; @@ -35,7 +36,9 @@ buildPythonPackage rec { # The only test requires network access doCheck = false; - pythonImportsCheck = [ "garages_amsterdam" ]; + pythonImportsCheck = [ + "garages_amsterdam" + ]; meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; From 3abcc5b5e0fb96a39908f67e77bd69c901c527b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 28 Feb 2022 14:38:08 +0100 Subject: [PATCH 098/114] radare2: 5.6.2 -> 5.6.4 --- pkgs/development/tools/analysis/radare2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 1bef8cd0758..d5d393ee96e 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.6.2"; + version = "5.6.4"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-R53S2+v0qCY5Q7Uf2gQ4veaOzYN2iE6F00+ERvknD2g="; + sha256 = "sha256-rqGlp9fHTF1z8A+DROYfzHXi5xfLMdUWzssGN5uHQmE="; }; preBuild = '' From f37471be4ce3d61a9dddd254aa2c868d03643956 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 14:47:57 +0100 Subject: [PATCH 099/114] python3Packages.aioitertools: update meta --- pkgs/development/python-modules/aioitertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 289d1ae1630..451fb9e7fa1 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; + hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables."; + description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables"; license = licenses.mit; homepage = "https://pypi.org/project/aioitertools/"; maintainers = with maintainers; [ teh ]; From 5c35d6aa2d58ec8fac5e67b394e745f84c563326 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Feb 2022 15:44:07 +0100 Subject: [PATCH 100/114] python3Packages.xkcdpass: disable failing test on Python 3.10 --- .../python-modules/xkcdpass/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index f74332e5364..5aac18d2107 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -1,24 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , installShellFiles +, pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "xkcdpass"; version = "1.19.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c5a2e948746da6fe504e8404284f457d8e98da6df5047c6bb3f71b18882e9d2a"; + hash = "sha256-xaLpSHRtpv5QToQEKE9FfY6Y2m31BHxrs/cbGIgunSo="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "xkcdpass" ]; + pythonImportsCheck = [ + "xkcdpass" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/redacted/XKCD-password-generator/issues/138 + "test_entropy_printout_valid_input" + ]; postInstall = '' installManPage *.? @@ -27,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; - homepage = "https://pypi.python.org/pypi/xkcdpass/"; + homepage = "https://github.com/redacted/XKCD-password-generator"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; From 44174de622d458623d5042c756c8d7cb351d9a78 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 28 Feb 2022 10:09:21 -0600 Subject: [PATCH 101/114] agave: 35 -> 37 (#157536) bold variant (basics covered) slashed variant available but uses same name --- pkgs/data/fonts/agave/default.nix | 33 ++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index 39ef6e34aaa..d2ecda3a111 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -1,20 +1,31 @@ -{ lib, fetchurl }: +{ lib, fetchurl, stdenv }: let pname = "agave"; - version = "35"; -in fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; + version = "37"; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf + mkAg = name: hash: fetchurl { + url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-${name}.ttf"; + sha256 = hash; + name = "Agave-${name}.ttf"; + }; + # There are slashed variants, but with same name so only bundle the default versions for now: + fonts = [ + (mkAg "Regular" "sha256-vX1VhEgqy9rQ7hPmAgBGxKyIs2QSAYqZC/mL/2BIOrA=") + (mkAg "Bold" "sha256-Ax/l/RKyc03law0ThiLac/7HHV4+YxibKzcZnjZs6VI=") + ]; + +in stdenv.mkDerivation { + inherit pname version; + srcs = fonts; + sourceRoot = "."; + + dontUnpack = true; + + installPhase = '' + install -D $srcs -t $out/share/fonts/truetype/ ''; - sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz"; - meta = with lib; { description = "truetype monospaced typeface designed for X environments"; homepage = "https://b.agaric.net/page/agave"; From 1e2662c5fdceeebb8060214f457791a57da7c19c Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 28 Feb 2022 20:10:56 +0300 Subject: [PATCH 102/114] treewide: fix some desktop file names pkgs.writeTextFile doesn't like spaces in filenames. This is fixed in #162246, but other tools will probably dislike spaces in .desktop file names as well, and that PR will take forever, so let's fix this anyway. --- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 2 +- pkgs/build-support/make-desktopitem/default.nix | 9 +++++++-- pkgs/development/tools/scenebuilder/default.nix | 4 ++-- pkgs/games/domination/default.nix | 4 ++-- pkgs/games/lunar-client/default.nix | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index d72d605f021..6ae7f422f02 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = "PrusaSlicer"; + name = "prusa-slicer"; exec = "prusa-slicer"; icon = "PrusaSlicer"; comment = "G-code generator for 3D printers"; @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { categories = [ "Development" ]; }) (makeDesktopItem { - name = "PrusaSlicer G-code Viewer"; + name = "prusa-gcodeviewer"; exec = "prusa-gcodeviewer"; icon = "PrusaSlicer-gcodeviewer"; comment = "G-code viewer for 3D printers"; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index de00c1174b9..7a4d2ee1d25 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -33,7 +33,7 @@ let desktopItems = [ (makeDesktopItem { - name = appname; + name = "superslicer"; exec = "superslicer"; icon = appname; comment = description; diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 787f0f67847..e0a57f4aa3f 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -34,6 +34,11 @@ , extraConfig ? {} # Additional values to be added literally to the final item, e.g. vendor extensions }: let + # FIXME: workaround until https://github.com/NixOS/nixpkgs/pull/162246 lands + cleanName = if lib.hasInfix " " name + then throw "Name must not contain spaces!" + else name; + # There are multiple places in the FDO spec that make "boolean" values actually tristate, # e.g. StartupNotify, where "unset" is literally defined as "do something reasonable". # So, handle null values separately. @@ -111,8 +116,8 @@ let content = [ mainSectionRendered ] ++ actionsRendered; in writeTextFile { - name = "${name}.desktop"; - destination = "/share/applications/${name}.desktop"; + name = "${cleanName}.desktop"; + destination = "/share/applications/${cleanName}.desktop"; text = builtins.concatStringsSep "\n" content; checkPhase = "${desktop-file-utils}/bin/desktop-file-validate $target"; } diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index 3ae31bbadb9..77928a1f22a 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -64,11 +64,11 @@ let ''; desktopItem = makeDesktopItem { - name = "Scene Builder"; + name = "scenebuilder"; exec = "scenebuilder"; icon = "scenebuilder"; comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = pname; + desktopName = "Scene Builder"; mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; categories = [ "Development" ]; }; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index dd044656534..b7eae5e5acd 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -11,13 +11,13 @@ let desktopItem = makeDesktopItem { - name = "Domination"; + name = "domination"; desktopName = "Domination"; exec = "domination"; icon = "domination"; }; editorDesktopItem = makeDesktopItem { - name = "Domination Map Editor"; + name = "domination-map-editor"; desktopName = "Domination Map Editor"; exec = "domination-map-editor"; icon = "domination"; diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index dceb9755fa2..fbebe85cf00 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -5,7 +5,7 @@ let version = "2.9.3"; desktopItem = makeDesktopItem { - name = "Lunar Client"; + name = "lunar-client"; exec = "lunar-client"; icon = "lunarclient"; comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; From 29e05ebbc8323f25c206f99a154c50c063ca31f3 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 27 Feb 2022 22:24:54 -0500 Subject: [PATCH 103/114] pythonPackages.ipyparallel: fix broken build --- pkgs/development/python-modules/ipyparallel/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 51b76fc532b..6bd707a3f6a 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -9,7 +9,10 @@ , ipython , jupyter-client , ipykernel +, packaging +, psutil , tornado +, tqdm , isPy3k , futures ? null }: @@ -25,7 +28,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel tornado + propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel packaging psutil tornado tqdm ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster From d10da64c9857088fb07991509ed1aae0d2409242 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 13:50:23 +0000 Subject: [PATCH 104/114] python310Packages.glfw: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/glfw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index ab42e8fffbf..e9587d0b765 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "v${version}"; - sha256 = "15kk0zhhja0yqah09wzpg6912zd5bjmk84ab1n5nwryicpg44hqk"; + sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM="; }; # Patch path to GLFW shared object From 644ad81cc54d4741cd0b26336d6ce1418ca7afa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 15:57:04 +0000 Subject: [PATCH 105/114] python310Packages.gspread: 5.1.1 -> 5.2.0 --- pkgs/development/python-modules/gspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 741882bdbd3..466b3ae4770 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "5.1.1"; + version = "5.2.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "d9db8c43d552f541ea072d4727d1e955bc2368b095dd86c5429a845c9d8aed8f"; + sha256 = "sha256-JRc6wIFGnPnWIVFMZXbGz0bznIJfF4uMueeDdKY3sL8="; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; From 36d6f93c6f1b7abe8e77ba1fe83387e40837371c Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 28 Feb 2022 19:05:58 +0000 Subject: [PATCH 106/114] ryujinx: 1.0.7168 -> 1.1.54 - changed the update script to now look at GH Actions - formatted with nixpkgs-fmt - added myself as a maintainer --- .../emulators/ryujinx/default.nix | 60 +++++++++++------ pkgs/applications/emulators/ryujinx/deps.nix | 4 +- .../applications/emulators/ryujinx/updater.sh | 67 ++++++++++++------- 3 files changed, 85 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 6dbd356f24c..1a2d122e637 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -1,18 +1,31 @@ -{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems -, dotnetCorePackages, libX11, libgdiplus, ffmpeg -, SDL2_mixer, openal, libsoundio, sndio, pulseaudio -, gtk3, gdk-pixbuf, wrapGAppsHook +{ lib +, buildDotnetModule +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, dotnetCorePackages +, libX11 +, libgdiplus +, ffmpeg +, SDL2_mixer +, openal +, libsoundio +, sndio +, pulseaudio +, gtk3 +, gdk-pixbuf +, wrapGAppsHook }: buildDotnetModule rec { pname = "ryujinx"; - version = "1.0.7168"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.1.54"; # Versioning is based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "6e0799580f0d1b473a79471c5d365c6524d97a86"; - sha256 = "145sn9xkjxj79292faypcdmpmbxm1w70q0iprg6pfymf9920gvfv"; + rev = "3705c206688c69d3348f5cec84dc480d8d7c578e"; + sha256 = "1lhnr11x46yjpka865m0dzkbkdxmrrhjcpvq4ab4wll6j0ipy908"; }; dotnet-sdk = dotnetCorePackages.sdk_6_0; @@ -67,22 +80,31 @@ buildDotnetModule rec { done ''; - desktopItems = [(makeDesktopItem { - desktopName = "Ryujinx"; - name = "ryujinx"; - exec = "Ryujinx"; - icon = "ryujinx"; - comment = meta.description; - type = "Application"; - categories = [ "Game" ]; - })]; + desktopItems = [ + (makeDesktopItem { + desktopName = "Ryujinx"; + name = "ryujinx"; + exec = "Ryujinx"; + icon = "ryujinx"; + comment = meta.description; + type = "Application"; + categories = [ "Game" ]; + }) + ]; meta = with lib; { - description = "Experimental Nintendo Switch Emulator written in C#"; homepage = "https://ryujinx.org/"; - license = licenses.mit; changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog"; - maintainers = [ maintainers.ivar ]; + description = "Experimental Nintendo Switch Emulator written in C#"; + longDescription = '' + Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan, + written in C#. This emulator aims at providing excellent accuracy and + performance, a user-friendly interface and consistent builds. It was + written from scratch and development on the project began in September + 2017. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ivar jk ]; platforms = [ "x86_64-linux" ]; mainProgram = "Ryujinx"; }; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 991d00a5a4b..804b17d8946 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -10,8 +10,8 @@ (fetchNuGet { pname = "GioSharp"; version = "3.22.25.128"; sha256 = "0syfa1f2hg7wsxln5lh86n8m1lihhprc51b6km91gkl25l5hw5bv"; }) (fetchNuGet { pname = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { pname = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) - (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) - (fetchNuGet { pname = "LibHac"; version = "0.14.3"; sha256 = "13pv5dwffj8c2mfibra3hkd1pgg5cj075sf48kgp82y501l25q5m"; }) + (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) + (fetchNuGet { pname = "LibHac"; version = "0.16.0"; sha256 = "1kivnf4c4km1a8y0sl34z9gfazlivna0x31q0065n0sz13g82spi"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }) diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh index 0861414f0bf..4b5fa4834fa 100755 --- a/pkgs/applications/emulators/ryujinx/updater.sh +++ b/pkgs/applications/emulators/ryujinx/updater.sh @@ -1,40 +1,57 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6 -set -eo pipefail +set -euxo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" +DEPS_FILE="$(realpath "./deps.nix")" -nix-prefetch-git https://github.com/ryujinx/ryujinx --quiet > repo_info -new_hash="$(jq -r ".sha256" < repo_info)" -new_rev="$(jq -r ".rev" < repo_info)" -rm repo_info +RELEASE_JOB_DATA=$( + curl -s -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows | + jq -r '.workflows[] | select(.name == "Release job") | { id, path }' +) +RELEASE_JOB_ID=$(echo "$RELEASE_JOB_DATA" | jq -r '.id') +RELEASE_JOB_FILE=$(echo "$RELEASE_JOB_DATA" | jq -r '.path') -new_version="$( - curl -s https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master \ - | grep -Po '"version":.*?[^\\]",' \ - | sed 's/"version":"\(.*\)",/\1/' - )" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +BASE_VERSION=$( + curl -s "https://raw.githubusercontent.com/Ryujinx/Ryujinx/master/${RELEASE_JOB_FILE}" | + grep -Po 'RYUJINX_BASE_VERSION:.*?".*"' | + sed 's/RYUJINX_BASE_VERSION: "\(.*\)"/\1/' +) -if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date! Doing nothing" - exit 0 +LATEST_RELEASE_JOB_DATA=$( + curl -s -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/Ryujinx/Ryujinx/actions/workflows/${RELEASE_JOB_ID}/runs" | + jq -r '.workflow_runs[0] | { head_sha, run_number }' +) +COMMIT=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.head_sha') +PATCH_VERSION=$(echo "$LATEST_RELEASE_JOB_DATA" | jq -r '.run_number') + +NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}" + +OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +echo "comparing versions $OLD_VERSION => $NEW_VERSION" +if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "Already up to date! Doing nothing" + exit 0 fi -cd ../../../.. -update-source-version ryujinx "$new_version" "$new_hash" --rev="$new_rev" +SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')" -store_src="$(nix-build . -A ryujinx.src --no-out-link)" -src="$(mktemp -d /tmp/ryujinx-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" -pushd "$src" +cd ../../../.. +update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" + +STORE_SRC="$(nix-build . -A ryujinx.src --no-out-link)" +SRC="$(mktemp -d /tmp/ryujinx-src.XXX)" +cp -rT "$STORE_SRC" "$SRC" +chmod -R +w "$SRC" +pushd "$SRC" mkdir nuget_tmp.packages -dotnet restore Ryujinx.sln --packages nuget_tmp.packages +DOTNET_CLI_TELEMETRY_OPTOUT=1 dotnet restore Ryujinx.sln --packages nuget_tmp.packages -nuget-to-nix ./nuget_tmp.packages > "$deps_file" +nuget-to-nix ./nuget_tmp.packages >"$DEPS_FILE" popd -rm -r "$src" +rm -r "$SRC" From f5645dd73bbfa7aba81fbc190fcc78087120a760 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Feb 2022 14:17:48 +0000 Subject: [PATCH 107/114] python310Packages.ytmusicapi: 0.20.0 -> 0.21.0 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 218c2edd0ac..fdee7ace495 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo="; + hash = "sha256-JstIHc61TFQEgRHr54N4Doq6ML0EcIcDGTEJ/tbrC2A="; }; propagatedBuildInputs = [ From d39a026cc2669ab842704c62e586cb8c5195b30a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Feb 2022 12:43:31 -0800 Subject: [PATCH 108/114] txr: 273 -> 274 (#162228) * txr: 273 -> 274 * txr: latest clang stdenv, fixes w/musl I have not identified a cause but since this resolves the issue let's use latest clang for now. * txr: no longer needs bison/flex unless in maintainer mode Co-authored-by: Will Dietz --- pkgs/tools/misc/txr/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index d8ba0861120..4b521ed9dda 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }: +{ lib, stdenv, fetchurl, libffi, coreutils }: stdenv.mkDerivation rec { pname = "txr"; - version = "273"; + version = "274"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg="; + sha256 = "sha256-bWgz0kmPLN0V0rkFRiCqxkBjhN8FV9fL+Vu8GSw9Ja4="; }; - nativeBuildInputs = [ bison flex ]; buildInputs = [ libffi ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8b54c390f8..e49e28257d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10604,7 +10604,7 @@ with pkgs; twurl = callPackage ../tools/misc/twurl { }; - txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; + txr = callPackage ../tools/misc/txr { inherit (llvmPackages_latest) stdenv; }; txt2man = callPackage ../tools/misc/txt2man { }; From 8032f355a0dde1b4940f8686719dc23912a79fa6 Mon Sep 17 00:00:00 2001 From: Riley Inman Date: Wed, 23 Feb 2022 01:14:45 -0500 Subject: [PATCH 109/114] rubyripper: 0.6.2 -> 0.8.0rc3 --- .../applications/audio/rubyripper/default.nix | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index e8a275db98d..0af80c991c2 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -1,26 +1,38 @@ -{ lib, stdenv, fetchurl, ruby, cdparanoia, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper +, cdparanoia, cddiscid, ruby }: + stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.8.0rc3"; pname = "rubyripper"; - src = fetchurl { - url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2"; - sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1"; + + src = fetchFromGitHub { + owner = "bleskodev"; + repo = pname; + rev = "v${version}"; + sha256 = "1qfwv8bgc9pyfh3d40bvyr9n7sjc2na61481693wwww640lm0f9f"; }; preConfigure = "patchShebangs ."; configureFlags = [ "--enable-cli" ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ruby cdparanoia ]; - postInstall = '' - wrapProgram "$out/bin/rrip_cli" \ - --prefix PATH : "${ruby}/bin" \ - --prefix PATH : "${cdparanoia}/bin" + + buildInputs = [ + cddiscid + cdparanoia + ruby + ]; + + postFixup = '' + wrapProgram $out/bin/rrip_cli \ + --prefix PATH : ${lib.makeBinPath [ cddiscid cdparanoia ruby ]} ''; meta = with lib; { description = "High quality CD audio ripper"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; + homepage = "https://github.com/bleskodev/rubyripper"; }; } From 62d63ea56ebcc29913b400da46e8214d500abe16 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 28 Feb 2022 23:10:11 +0100 Subject: [PATCH 110/114] python3Packages.binwalk-full: remove appendToName to have a consistent package name for repology --- pkgs/development/python-modules/binwalk/default.nix | 2 +- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 112f12e5f25..a63df0d7d39 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -21,7 +21,7 @@ , visualizationSupport ? false }: buildPythonPackage rec { - pname = "binwalk"; + pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; version = "2.3.3"; src = fetchFromGitHub { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3711d1c5a8..98f8e708c73 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1210,9 +1210,7 @@ in { binwalk = callPackage ../development/python-modules/binwalk { }; - binwalk-full = appendToName "full" (self.binwalk.override { - visualizationSupport = true; - }); + binwalk-full = self.binwalk.override { visualizationSupport = true; }; biopython = callPackage ../development/python-modules/biopython { }; From dccca00e7aeb74bb904e2f2407032aa5c540c65a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 28 Feb 2022 19:23:16 -0300 Subject: [PATCH 111/114] pythonPackages.pythonefl: 1.25.0 -> 1.26.0 --- .../development/python-modules/python-efl/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 293d9771280..c5557b3fa6d 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -4,6 +4,7 @@ , pkg-config , python , dbus-python +, packaging , enlightenment }: @@ -11,18 +12,18 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; + sha256 = "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ dbus-python ]; + propagatedBuildInputs = [ dbus-python packaging ]; preConfigure = '' NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" @@ -39,8 +40,8 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Python bindings for EFL and Elementary"; - homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"; + description = "Python bindings for Enlightenment Foundation Libraries"; + homepage = "https://github.com/DaveMDS/python-efl"; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; From be39c226d5df176692b340c8123f2c336f85b695 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 12 Dec 2021 21:45:35 -0500 Subject: [PATCH 112/114] vscode-extensions.ms-python.python: 2021.11.1422169775 -> 2022.0.1814523869 --- .../applications/editors/vscode/extensions/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index 09c5c02aee9..8d6834dceeb 100644 --- a/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -59,13 +59,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2021.11.1422169775"; + version = "2022.0.1814523869"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "sha256-Y8Wbpuieca/edIWqgq+lGSUMABOGvO/GuujGlEGmoKs="; + sha256 = "sha256-JDaimcOUDo9GuFA3mhbbGLwqZE9ejk8pWYc+9PrRhVk="; }; buildInputs = [ From 0c62a38ae065ba231f5c745879221c56126511e2 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 23 Jan 2022 20:45:11 -0500 Subject: [PATCH 113/114] vscode-extensions.ms-vscode.cpptools: 1.7.1 -> 1.9.1 --- .../vscode/extensions/cpptools/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix index 077c3807eca..cc935876ded 100644 --- a/pkgs/applications/editors/vscode/extensions/cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix @@ -47,15 +47,27 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "1.7.1"; + version = "1.9.1"; }; vsix = fetchurl { - name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; - url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix"; - sha256 = "sha256-LqndG/vv8LgVPEX6dGkikDB6M6ISneo2UJ78izXVFbk="; + name = "${mktplcRef.publisher}-${mktplcRef.name}.gz"; + url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${mktplcRef.publisher}/vsextensions/${mktplcRef.name}/${mktplcRef.version}/vspackage?targetPlatform=linux-x64"; + sha256 = "sha256-BtTl9DR8hnwNpO5k99M4dtqcTQ2hTzVbjR8VZh+tdDI="; }; + unpackPhase = '' + runHook preUnpack + + gzip -d $src --stdout &> temporary.zip + unzip temporary.zip + rm temporary.zip + + cd extension/ + + runHook postUnpack + ''; + buildInputs = [ jq ]; From 11c3d0bd36bc24b0ddc950636b6fa314f76966bb Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 23 Jan 2022 20:45:29 -0500 Subject: [PATCH 114/114] vscode-extensions.WakaTime.vscode-wakatime: 17.1.0 -> 18.0.5 --- .../editors/vscode/extensions/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/wakatime/default.nix index 9832b16f747..554b2bddb6c 100644 --- a/pkgs/applications/editors/vscode/extensions/wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "17.1.0"; - sha256 = "177q8angrn702pxrrpk1fzggzlnnaymq32v55qpjgjb74rhg4dzw"; + version = "18.0.5"; + sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; }; meta = with lib; {