diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/backup/borgmatic/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fusuma/Gemfile | 19 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fusuma/Gemfile.lock | 32 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fusuma/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fusuma/gemset.nix | 87 | ||||
-rw-r--r-- | pkgs/tools/misc/tbls/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/wakatime/default.nix | 50 | ||||
-rw-r--r-- | pkgs/tools/networking/bgpq4/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/networkmanager/l2tp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/speedtest-go/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/swagger-codegen3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/cnspec/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/security/rnp/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/security/rnp/sexp_sexpp_rename.patch | 50 | ||||
-rw-r--r-- | pkgs/tools/security/rnp/unbundle-sexpp.patch | 38 | ||||
-rw-r--r-- | pkgs/tools/typesetting/hayagriva/default.nix | 6 |
16 files changed, 30 insertions, 322 deletions
diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 1845ea99def96..dba8cf36b3a02 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -3,6 +3,7 @@ , borgbackup , coreutils , python3Packages +, fetchpatch , fetchPypi , systemd , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd @@ -13,13 +14,21 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.8.10"; + version = "1.8.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hR2q49gCD9BZsk+jQ90EfKkkq7mX9qAO+gRsvdnuDec="; + sha256 = "sha256-Sgj15etVx8nnk0AZv+GzWscSqfqdC7+1wBE6gF/0aL0="; }; + patches = [ + (fetchpatch { + name = "prevent-network-access-in-tests.patch"; + url = "https://projects.torsion.org/borgmatic-collective/borgmatic/pulls/869.patch"; + hash = "sha256-jOo3LjgvJtyTaRKZX1wfnKNdw975hVekBkKfK4mJFAc="; + }) + ]; + nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; # - test_borgmatic_version_matches_news_version diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile b/pkgs/tools/inputmethods/fusuma/Gemfile deleted file mode 100644 index 7cee961df4a06..0000000000000 --- a/pkgs/tools/inputmethods/fusuma/Gemfile +++ /dev/null @@ -1,19 +0,0 @@ -source 'https://rubygems.org' -gem "fusuma", ">=3.0.0" -gem "fusuma-plugin-appmatcher" -gem "fusuma-plugin-keypress" -gem "fusuma-plugin-sendkey" -gem "fusuma-plugin-wmctrl" - -# I've not activated the following plugins for the reasons given below. - -# tap has been archived by upstream -# gem "fusuma-plugin-tap" - -# touchscreen needs specific h/w support I don't have access to, so I can't confirm -# if it's problem free. A quick check didn't reveal any problems. -#gem "fusuma-plugin-touchscreen" - -# thumbsense pulls in remap, and at best remap requires further configuration to allow the use access to event devices. -#gem "fusuma-plugin-thumbsense" -#gem "fusuma-plugin-remap" diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/pkgs/tools/inputmethods/fusuma/Gemfile.lock deleted file mode 100644 index 283d4c3fa5e1b..0000000000000 --- a/pkgs/tools/inputmethods/fusuma/Gemfile.lock +++ /dev/null @@ -1,32 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - fusuma (3.3.1) - fusuma-plugin-appmatcher (0.6.1) - fusuma (>= 3.0) - rexml - ruby-dbus - fusuma-plugin-keypress (0.9.0) - fusuma (>= 3.1) - fusuma-plugin-sendkey (0.10.1) - fusuma (>= 3.1) - revdev - fusuma-plugin-wmctrl (1.3.1) - fusuma (>= 3.1) - revdev (0.2.1) - rexml (3.2.6) - ruby-dbus (0.23.1) - rexml - -PLATFORMS - ruby - -DEPENDENCIES - fusuma (>= 3.0.0) - fusuma-plugin-appmatcher - fusuma-plugin-keypress - fusuma-plugin-sendkey - fusuma-plugin-wmctrl - -BUNDLED WITH - 2.4.22 diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/pkgs/tools/inputmethods/fusuma/default.nix deleted file mode 100644 index 0622ce699f8c2..0000000000000 --- a/pkgs/tools/inputmethods/fusuma/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, bundlerApp, bundlerUpdateScript, makeWrapper, gnugrep, libinput }: - -bundlerApp { - pname = "fusuma"; - gemdir = ./.; - exes = [ "fusuma" ]; - - nativeBuildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram "$out/bin/fusuma" \ - --prefix PATH : ${lib.makeBinPath [ gnugrep libinput ]} - ''; - - passthru.updateScript = bundlerUpdateScript "fusuma"; - - meta = with lib; { - description = "Multitouch gestures with libinput driver on X11, Linux"; - homepage = "https://github.com/iberianpig/fusuma"; - license = licenses.mit; - maintainers = with maintainers; [ nicknovitski Br1ght0ne ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/inputmethods/fusuma/gemset.nix b/pkgs/tools/inputmethods/fusuma/gemset.nix deleted file mode 100644 index 47d5f62159957..0000000000000 --- a/pkgs/tools/inputmethods/fusuma/gemset.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - fusuma = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13pbvmkjriq6myynv4gfismiqa9y7bfbvvrfcv25670l4zyiakhm"; - type = "gem"; - }; - version = "3.3.1"; - }; - fusuma-plugin-appmatcher = { - dependencies = ["fusuma" "rexml" "ruby-dbus"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qkir4a657znq0fnx91lik7bw5kyq54jwhiy2zrlplln78xs5yai"; - type = "gem"; - }; - version = "0.6.1"; - }; - fusuma-plugin-keypress = { - dependencies = ["fusuma"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0as95haqa943i740xs7czcaibb8lvy4gn6kr8nbldq20nly64bih"; - type = "gem"; - }; - version = "0.9.0"; - }; - fusuma-plugin-sendkey = { - dependencies = ["fusuma" "revdev"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rdpxq4nanw85x1djdanwnz46b19fr46kdlkkgbxa4dnjk0zx4pp"; - type = "gem"; - }; - version = "0.10.1"; - }; - fusuma-plugin-wmctrl = { - dependencies = ["fusuma"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rgz1d6ahg5i9sr4z2kab5qk7pm3rm0h7r1vwkygi75rv2r3jy86"; - type = "gem"; - }; - version = "1.3.1"; - }; - revdev = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b6zg6vqlaik13fqxxcxhd4qnkfgdjnl4wy3a1q67281bl0qpsz9"; - type = "gem"; - }; - version = "0.2.1"; - }; - rexml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; - type = "gem"; - }; - version = "3.2.6"; - }; - ruby-dbus = { - dependencies = ["rexml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hf9y5lbi1xcadc2fw87wlif75s1359c2wwlvvd0gag7cq5dm0pm"; - type = "gem"; - }; - version = "0.23.1"; - }; -} diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 0d20bead317e0..0a3b341cc482c 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.74.3"; + version = "1.75.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-tS/sdX74Fr6arZh7/JiNFz1grjPMVZfg8C1VvqxsbYM="; + hash = "sha256-8bfDahJw+ZUSNqMiKDqqyX2jVPd6Wg3JsD/ATAW/oF4="; }; vendorHash = "sha256-NafHcWP9xJX2hy8i1TKtBi54cXDKgoxbgwLQjYRBcjU="; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix deleted file mode 100644 index d27cfa112afcb..0000000000000 --- a/pkgs/tools/misc/wakatime/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, wakatime }: - -buildGoModule rec { - pname = "wakatime"; - version = "1.73.0"; - - src = fetchFromGitHub { - owner = "wakatime"; - repo = "wakatime-cli"; - rev = "v${version}"; - hash = "sha256-EUZgYRsQRqtp0yiqNYex+ILSZwGEdO4BhciEgUVdui4="; - }; - - vendorHash = "sha256-SlYYrlRDBvhNm2BxemK9HzzsqM/RGH/sDQXpoGEY8rw="; - - ldflags = [ - "-s" - "-w" - "-X github.com/wakatime/wakatime-cli/pkg/version.Version=${version}" - ]; - - checkFlags = - let - skippedTests = [ - # Tests requiring network - "TestFileExperts" - "TestSendHeartbeats" - "TestSendHeartbeats_ExtraHeartbeats" - "TestSendHeartbeats_IsUnsavedEntity" - "TestSendHeartbeats_NonExistingExtraHeartbeatsEntity" - - # Flaky tests - "TestLoadParams_ApiKey_FromVault_Err_Darwin" - ]; - in - [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - - passthru.tests.version = testers.testVersion { - package = wakatime; - command = "HOME=$(mktemp -d) wakatime-cli --version"; - }; - - meta = with lib; { - homepage = "https://wakatime.com/"; - description = "WakaTime command line interface"; - license = licenses.bsd3; - maintainers = with maintainers; [ sigmanificient ]; - mainProgram = "wakatime-cli"; - }; -} diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index 006bfbf595dde..ea47cf4b2cae0 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.13"; + version = "1.15"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-Kw1Y9g2ItclDYYoZC2FTdBTec7zoM/N3Vk4zM8EVBR0="; + sha256 = "sha256-3mfFj9KoQbDe0gH7Le03N1Yds/bTEmY+OiXNaOtHkpY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index bcc5e314cfbaa..4389b2b620991 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.20.14"; + version = "1.20.16"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = version; - hash = "sha256-PTDr2M88ZC3Y92zsz/GiSxavd8MdfC9lwxep0+Wjgjk="; + hash = "sha256-78TOx3UnAF02UfZ7cWhPKv9bhJCq5UmAMrwd5xUnVrg="; }; patches = [ diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index 56764fb5f1985..ba393d632c163 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "speedtest-go"; - version = "1.7.5"; + version = "1.7.7"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8YN7k7sP0S3MIArUfwDYMQvcCKNTxauQjevyOoisAuc="; + hash = "sha256-8LMbaa3D1ODjySx69U0CGWphG8CQswWlQsqW6mXPy6o="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index ca30bba0c35e9..04fd6ce62fda1 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper, testers, swagger-codegen3 }: stdenv.mkDerivation rec { - version = "3.0.55"; + version = "3.0.56"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-xiPeWblDr6P405o4ik0gWG2GfBPC/eGtEyF6XCRFHGg="; + sha256 = "sha256-i2XC7fFfsO2OIE4NsO/WiqSHiYCXJZr6naxxAw/jkt0="; }; dontUnpack = true; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index a08dfda01239a..6bcdfd5a17de3 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.4.1"; + version = "11.4.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-amTkhUChhgO4Uhv23TLFiKAkp58NqBmbyVsF/vaq/ZU="; + hash = "sha256-+UKiv+0BRmzu7ER6NE9jkZlov2MC2EEmpH7XWtJkBxA="; }; proxyVendor = true; - vendorHash = "sha256-FNl7Tu2dDWmtCO3pJRWQpSkfR7aa96AdjP6lTcj6WY4="; + vendorHash = "sha256-JxyThRpr1XFYtg3Z5cF/LnGFqG9vzVpGZRNpgHpE458="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/tools/security/rnp/default.nix index 9a3796aeb42e0..2f7a22e59b188 100644 --- a/pkgs/tools/security/rnp/default.nix +++ b/pkgs/tools/security/rnp/default.nix @@ -16,20 +16,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "rnp"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "rnpgp"; repo = "rnp"; rev = "v${finalAttrs.version}"; - hash = "sha256-4fB7Sl9+ATrJTRnhbNG5BoW3XLxR7IP167RK96+gxj0="; + hash = "sha256-jUh7BxRnB6KePCk1jIvKzXgxSmWdKlQYmxshZZY4SBQ"; }; buildInputs = [ zlib bzip2 json_c botan2 sexpp ]; patches = [ - ./unbundle-sexpp.patch - ./sexp_sexpp_rename.patch ]; cmakeFlags = [ @@ -38,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_TESTING=on" "-DDOWNLOAD_GTEST=off" "-DDOWNLOAD_RUBYRNP=off" + "-DSYSTEM_LIBSEXPP=on" ]; nativeBuildInputs = [ asciidoctor cmake gnupg gtest pkg-config python3 ]; diff --git a/pkgs/tools/security/rnp/sexp_sexpp_rename.patch b/pkgs/tools/security/rnp/sexp_sexpp_rename.patch deleted file mode 100644 index a86d205139f70..0000000000000 --- a/pkgs/tools/security/rnp/sexp_sexpp_rename.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git i/src/lib/CMakeLists.txt w/src/lib/CMakeLists.txt -index 086ac57d..2ce59ca1 100755 ---- i/src/lib/CMakeLists.txt -+++ w/src/lib/CMakeLists.txt -@@ -328,7 +328,7 @@ elseif (CRYPTO_BACKEND_OPENSSL) - target_link_libraries(librnp-obj PRIVATE OpenSSL::Crypto) - endif() - --target_link_libraries(librnp-obj PRIVATE sexp) -+target_link_libraries(librnp-obj PRIVATE sexpp) - - set_target_properties(librnp-obj PROPERTIES CXX_VISIBILITY_PRESET hidden) - if (TARGET BZip2::BZip2) -@@ -384,7 +384,7 @@ foreach (prop LINK_LIBRARIES INTERFACE_LINK_LIBRARIES INCLUDE_DIRECTORIES INTERF - get_target_property(val librnp-obj ${prop}) - if (BUILD_SHARED_LIBS) - set_property(TARGET librnp-static PROPERTY ${prop} ${val}) -- list(REMOVE_ITEM val "$<LINK_ONLY:sexp>") -+ list(REMOVE_ITEM val "$<LINK_ONLY:sexpp>") - set_property(TARGET librnp PROPERTY ${prop} ${val}) - else() - set_property(TARGET librnp PROPERTY ${prop} ${val}) -diff --git i/src/librekey/g23_sexp.hpp w/src/librekey/g23_sexp.hpp -index b888680f..b062c52f 100644 ---- i/src/librekey/g23_sexp.hpp -+++ w/src/librekey/g23_sexp.hpp -@@ -27,8 +27,8 @@ - #ifndef RNP_G23_SEXP_HPP - #define RNP_G23_SEXP_HPP - --#include "sexp/sexp.h" --#include "sexp/ext-key-format.h" -+#include "sexpp/sexp.h" -+#include "sexpp/ext-key-format.h" - - #define SXP_MAX_DEPTH 30 - -diff --git i/src/tests/CMakeLists.txt w/src/tests/CMakeLists.txt -index 7d2a6b0c..88aeaf9f 100644 ---- i/src/tests/CMakeLists.txt -+++ w/src/tests/CMakeLists.txt -@@ -176,7 +176,7 @@ target_link_libraries(rnp_tests - PRIVATE - librnp-static - JSON-C::JSON-C -- sexp -+ sexpp - ${GTestMain} - ) - if (CRYPTO_BACKEND_LOWERCASE STREQUAL "openssl") diff --git a/pkgs/tools/security/rnp/unbundle-sexpp.patch b/pkgs/tools/security/rnp/unbundle-sexpp.patch deleted file mode 100644 index dcbf92948a282..0000000000000 --- a/pkgs/tools/security/rnp/unbundle-sexpp.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index bb6d40cb..30171e7c 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -176,11 +176,6 @@ if (ENABLE_FUZZERS) - endif() - add_subdirectory(src/common) - --set(WITH_SEXP_CLI OFF) --set(WITH_SEXP_TESTS OFF) --set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development) --add_subdirectory(src/libsexp EXCLUDE_FROM_ALL) -- - add_subdirectory(src/lib) - add_subdirectory(src/rnp) - add_subdirectory(src/rnpkeys) -diff --git i/src/lib/CMakeLists.txt w/src/lib/CMakeLists.txt -index 086ac57d..b219ef06 100755 ---- i/src/lib/CMakeLists.txt -+++ w/src/lib/CMakeLists.txt -@@ -433,7 +433,7 @@ install(TARGETS librnp - COMPONENT development - ) - -- install(TARGETS librnp-static sexp -+ install(TARGETS librnp-static - EXPORT rnp-targets - ARCHIVE - DESTINATION "${CMAKE_INSTALL_LIBDIR}" -@@ -441,7 +441,7 @@ install(TARGETS librnp - ) - else(BUILD_SHARED_LIBS) - # static libraries only --install(TARGETS librnp sexp -+install(TARGETS librnp - EXPORT rnp-targets - ARCHIVE - DESTINATION "${CMAKE_INSTALL_LIBDIR}" diff --git a/pkgs/tools/typesetting/hayagriva/default.nix b/pkgs/tools/typesetting/hayagriva/default.nix index 6574c0c9c6e94..2bf7a4f401d6c 100644 --- a/pkgs/tools/typesetting/hayagriva/default.nix +++ b/pkgs/tools/typesetting/hayagriva/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "hayagriva"; - version = "0.5.2"; + version = "0.5.3"; src = fetchCrate { inherit pname version; - hash = "sha256-hE0Oi+0vDQGDEOYtHiPit1RrrkrlLZs20nEHOm/bp5M="; + hash = "sha256-6LJRvyCgcj/m25kC26vT3aUREstXmmCIR4+LoHZgIqw="; }; - cargoHash = "sha256-WZbbjLDHYJTiuM0Lh9YfVvLTvK/jfO8fRbLqZ8XOLGg="; + cargoHash = "sha256-asINO3zy4x+n7chriC8ESCe3K027xFUNi+54XtQwS0w="; buildFeatures = [ "cli" ]; |