diff options
Diffstat (limited to 'pkgs/tools')
37 files changed, 204 insertions, 364 deletions
diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 69900238c5e..7747e46b26a 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.116"; + version = "3.0.117"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-KZZT7XVhJLfrQ7L3FFOTw9bLT5GqewvDTGQQd/ovjbg="; + sha256 = "sha256-iltyw2Qw7WSq96T/upGwSyjqWK8KOo/pK7HR+25n2js="; }; vendorSha256 = "sha256-f3GXkAvTe8rPFWCR5TM4mDK/VOQWt2lrZrfJ/Wvw8Uc="; diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix index 9cc65b4944e..e7ac6d7426d 100644 --- a/pkgs/tools/admin/ejson2env/default.nix +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ejson2env"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Oc0fWihOUafYN5t9SxHxaYJEv5e46CCDNe4xo+Dcjrs="; + sha256 = "sha256-HcUmFajbOUZ0T5Th6OA9WBtfTz646qLbXx8NVeJsVng="; }; - vendorSha256 = "sha256-BY45WirK9AVhvFGB5uqI4dLxzO2WuNNhhJbQ6nsRXao="; + vendorSha256 = "sha256-agWcD8vFNde1SCdkRovMNPf+1KODxV8wW1mXvE0w/CI="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index 4a11d1e5440..4f990c53808 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "6.21.1109"; + version = "6.22.207"; src = { "x86_64-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "12zxp9kvi070nzxbrnrfsyla38ryb69zlidw6cvypmsgqnylfxj7"; + sha256 = "0jybfqj1svkb297ahyp07xf4b8qyb5h1l2kp50a50ivb6flqd3jr"; }; "i686-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; - sha256 = "03vhdmzyd16r0kdxpkq9azyy1h705lk4sbgnbw5fr8gkifwng60f"; + sha256 = "06jmkd474nql6p3hnqwnwj5ac29m2021flnvf44mfhrhaa5wnpz6"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 86a91a09c3e..da60a80f77f 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -113,8 +113,10 @@ stdenv.mkDerivation (rec { # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 + # On aarch64+musl, test-init.sh fails due to a segfault in diff. doCheck = stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl) + && !(stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) && !stdenv.isAarch32; # Prevents attempts of running 'help2man' on cross-built binaries. diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix new file mode 100644 index 00000000000..cd7b8270a1a --- /dev/null +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libxcb +# Darwin dependencies +, AppKit +}: + +rustPlatform.buildRustPackage rec { + pname = "didyoumean"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "hisbaan"; + repo = "didyoumean"; + rev = "v${version}"; + sha256 = "sha256-t2bmvz05vWIxQhC474q/9uky1kAQoFN8Z+qflw5Vj68="; + }; + + cargoSha256 = "sha256-4DbziI9enib4pm9/P4WEu15glIxtejaV2GCqbzuxxyw="; + + buildInputs = lib.optional stdenv.isLinux [ libxcb ] + ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + description = "A CLI spelling corrector for when you're unsure"; + homepage = "https://github.com/hisbaan/didyoumean"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index bb884c5a293..8df3c2183ec 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "dsq"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-BhWcl0yMpTi/6+dFk6wX/rMkH1k9m9eVm40iNwZGrJM="; + hash = "sha256-AT5M3o1cvRIZyyA28uX+AI4p9I3SzX3OCdBcIFGKspw="; }; - vendorSha256 = "sha256-mSF2oNdTKAg3iRejKkn24hSCJDM6iOkRMruic73ceX4="; + vendorSha256 = "sha256-yfhLQBmWkG0ZLjI/ArLZkEGvClmZXkl0o7fEu5JqHM8="; nativeBuildInputs = [ diffutils ]; diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index dfb61ca29ad..1f101735e98 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20220209.0"; + version = "20220309.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FkFu3SvsowcsOFXvqWmpY3KEypXSb6KcpC/nJbQpDBA="; + sha256 = "sha256-J/T3Av0jwT0CJSwc0j+YjaiKFqs9soLf7ctpiz5rmm4="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index de39a6e7f38..3ce65eb2038 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.3.2"; + version = "2022.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-s5NisPUoppROM/p7qm1da4lStpAWZvk18zkUEsOn0Pg="; + sha256 = "sha256-/IMiUMtWFouAjOlyq+BXvqQ1IddBXvua7y0i4J1cktM="; }; postPatch = '' diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/tools/misc/melody/default.nix index 7dfc7eab4fd..a02994f33a0 100644 --- a/pkgs/tools/misc/melody/default.nix +++ b/pkgs/tools/misc/melody/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "melody"; - version = "0.13.9"; + version = "0.13.10"; src = fetchCrate { pname = "melody_cli"; inherit version; - sha256 = "1vqiciridm0pbh5yf42p2jfis908p6r9q3jaqy2hx3f5aggbf09q"; + sha256 = "05slrh5dqbpsvimdr0rlhj04kf1qzwij3zlardvbmvhvfccf4188"; }; - cargoSha256 = "1gf2km06qzvc0xv4vfxm6vdp3c5lgcjwwl92f4frga3cx51vbrzh"; + cargoSha256 = "0qh1byysbc6pl3cvx2vdpl8crx5id59hhrwqzk5g7091spm8wf79"; meta = with lib; { description = "Language that compiles to regular expressions"; diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index 913bfc00a15..0c09368277b 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "pmbootstrap"; - version = "1.41.0"; + version = "1.43.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-go3EXmC9Vp0xXi1mH65p85FKsTe0CbyNXw3VVRrnpeQ="; + sha256 = "sha256-4bPxWmzlyVZrkq9qs/5t+ZOsVDkAAwYc6Mc4een4Qnw="; }; repo = fetchFromGitLab { @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "postmarketOS"; repo = pname; rev = version; - sha256 = "sha256-7Y4rxSdJQaIlq4yiadvrEro0JM5xoHeISDKHz69T4z8="; + sha256 = "sha256-jbTzPGrRVisLG7f4NspkDVB8NYSyyInHkhSUPO3dgU0="; }; pmb_test = "${repo}/test"; diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 3eb29c87441..b28c478de47 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "powerline-go"; - version = "unstable-2021-07-15"; + version = "1.22.1"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; - rev = "f27435b26b5001c52ffb1aee454572c59494c81b"; - sha256 = "sha256-YB/WMprjXA5ZN6baT5nWahNj0xwbP8kzS7X/1tCwWiE="; + rev = "v${version}"; + sha256 = "sha256-7QhW0Vn1u63N0fzSiX/vu0HNhFkoSFHXteJCrcFX+4Q="; }; - vendorSha256 = "sha256-HYF6aKz+P241EKmupEoretadlrh9FBRx6nIER66jofg="; + vendorSha256 = "sha256-+R+UwoYJ+KsV+jQj8+wfEsCAvezolsoPDNzCnGLzOEc="; meta = with lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 36afc1d4cbb..04021e40b74 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -1,34 +1,54 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib +, fetchFromGitHub +, python3 +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "pubs"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "pubs"; repo = "pubs"; rev = "v${version}"; - sha256 = "0npgsyxj7kby5laznk5ilkrychs3i68y57gphwk48w8k9fvnl3zc"; + hash = "sha256-U/9MLqfXrzYVGttFSafw4pYDy26WgdsJMCxciZzO1pw="; }; - propagatedBuildInputs = with python3Packages; [ - argcomplete python-dateutil configobj feedparser bibtexparser pyyaml requests six + propagatedBuildInputs = with python3.pkgs; [ + pyyaml + bibtexparser + python-dateutil + six + requests + configobj beautifulsoup4 + feedparser + argcomplete ]; - checkInputs = with python3Packages; [ pyfakefs mock ddt ]; + checkInputs = with python3.pkgs; [ + pyfakefs + mock + ddt + pytestCheckHook + ]; + + disabledTestPaths = [ + # Disabling git tests because they expect git to be preconfigured + # with the user's details. See + # https://github.com/NixOS/nixpkgs/issues/94663 + "tests/test_git.py" + ]; - # Disabling git tests because they expect git to be preconfigured - # with the user's details. See - # https://github.com/NixOS/nixpkgs/issues/94663 - preCheck = '' - rm tests/test_git.py - ''; + disabledTests = [ + # https://github.com/pubs/pubs/issues/276 + "test_readme" + ]; meta = with lib; { description = "Command-line bibliography manager"; homepage = "https://github.com/pubs/pubs"; - license = licenses.lgpl3; - maintainers = with maintainers; [ gebner ]; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ gebner dotlambda ]; }; } diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/tools/misc/yafetch/default.nix index 5a082184400..f55926d0ae3 100644 --- a/pkgs/tools/misc/yafetch/default.nix +++ b/pkgs/tools/misc/yafetch/default.nix @@ -1,29 +1,29 @@ -{ lib, stdenv, fetchFromGitLab }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "yafetch"; - version = "unstable-2021-07-18"; + version = "unstable-2022-04-20"; - src = fetchFromGitLab { - owner = "cyberkitty"; + src = fetchFromGitHub { + owner = "kira64xyz"; repo = pname; - rev = "f3efbca54df1ffea22cc40034114af141ccff9c1"; - sha256 = "1cxhrjy9vzq87rzql4dcknkwca7nydysp1p1x4fh1qfw79dfdmxw"; + rev = "a118cfc13f0b475db7c266105c10138d838788b8"; + sha256 = "bSJlerfbJG6h5dDwWQKHnVLH6DEuvuUyqaRuJ7jvOsA="; }; # Use the provided NixOS logo automatically prePatch = '' substituteInPlace ./config.h --replace \ - "#include \"ascii/tux.h\"" "#include \"ascii/nixos.h\"" + "#include \"ascii/gnu.h\"" "#include \"ascii/nixos.h\"" ''; # Fixes installation path PREFIX = placeholder "out"; meta = with lib; { - homepage = "https://gitlab.com/cyberkitty/yafetch"; + homepage = "https://github.com/kira64xyz/yafetch"; description = "Yet another fetch clone written in C++"; - license = licenses.gpl2Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ivar ashley ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index 9d9d99b45fa..370a726caa6 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bore-cli"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "ekzhang"; repo = "bore"; rev = "v${version}"; - sha256 = "sha256-k1QpNpN6MVt7+PIDFcJtd7yD1ZpBJ9GFBBagVArRifs="; + sha256 = "sha256-KSJ5KYXOwjtK1oE9IpsVKb7H4uuKJroCpM1Dk+2XJlY="; }; - cargoSha256 = "sha256-fNsMNU4npChqyIeonMSc6AjcBxVYVJhiG++HkQ3FM9M="; + cargoSha256 = "sha256-HPMEbHDRmsmcr7Fuhsyr+NkdI9t1sL7q8uzj8sFks0s="; # tests do not find grcov path correctly meta = with lib; { diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index 7959bdaa83e..1ae0f003602 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.24.5"; + version = "0.35.2"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/sTagdlWU6hU3TTeJcZ8WK4TqmvxgUbC5eLBz2FH6Jo="; + sha256 = "sha256-O6jVedVwzC575s7LS0gx1t6mUizQGv4Gcqra57vXX+w="; }; vendorSha256 = "sha256-NHu1hZFPT2k8izrvvz7w0vlVe/nKH0nS4oXUGS8CWcc="; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 6295c4562b0..a1020a319a7 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "8.0.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-Bk3p8+FkjrF/nLsPRx8daqieV8iewAbcoO2DglFSERg="; + sha256 = "sha256-ngT9ZtPsCzcmZbwpmzbEcSUTHPezzdyAB12qrm5Z6n0="; }; - cargoSha256 = "sha256-chHr/3yN2PLUQLYqkln12q3+n7tX2IclVGpXBCkPxCQ="; + cargoSha256 = "sha256-nHNS1Uskggm5e1paWRSiL4HHcooDbYe0toMwR05OkDQ="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix deleted file mode 100644 index 56fec5333fc..00000000000 --- a/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib -, pkgs -, callPackage -}: - -rec { - libtorrent = callPackage ./libtorrent.nix { }; - rtorrent = callPackage ./rtorrent.nix { }; -} diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix deleted file mode 100644 index d46e4a15939..00000000000 --- a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtest -, openssl -, zlib -}: - -stdenv.mkDerivation rec { - pname = "jesec-libtorrent"; - version = "0.13.8-r3"; - - src = fetchFromGitHub { - owner = "jesec"; - repo = "libtorrent"; - rev = "v${version}"; - hash = "sha256-S3DOKzXkvU+ZJxfrxwLXCVBnepzmiZ+3iiQqz084BEk="; - }; - - nativeBuildInputs = [ - cmake - ]; - buildInputs = [ - openssl - zlib - ]; - - doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - ''; - checkInputs = [ - gtest - ]; - - meta = with lib; { - homepage = "https://github.com/jesec/libtorrent"; - description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ winter AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix deleted file mode 100644 index 7fe444228d3..00000000000 --- a/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, curl -, gtest -, libtorrent -, ncurses -, jsonRpcSupport ? true, nlohmann_json -, xmlRpcSupport ? true, xmlrpc_c -}: - -stdenv.mkDerivation rec { - pname = "jesec-rtorrent"; - version = "0.9.8-r15"; - - src = fetchFromGitHub { - owner = "jesec"; - repo = "rtorrent"; - rev = "v${version}"; - hash = "sha256-yYOw8wsiQd478JijLgPtEWsw2/ewd46re+t9D705rmk="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - curl - libtorrent - ncurses - ] - ++ lib.optional jsonRpcSupport nlohmann_json - ++ lib.optional xmlRpcSupport xmlrpc_c; - - cmakeFlags = [ - "-DUSE_RUNTIME_CA_DETECTION=NO" - ] - ++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO" - ++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"; - - - doCheck = true; - checkInputs = [ - gtest - ]; - - prePatch = '' - substituteInPlace src/main.cc \ - --replace "/etc/rtorrent/rtorrent.rc" "${placeholder "out"}/etc/rtorrent/rtorrent.rc" - ''; - - postFixup = '' - mkdir -p $out/etc/rtorrent - cp $src/doc/rtorrent.rc $out/etc/rtorrent/rtorrent.rc - ''; - - meta = with lib; { - description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)"; - homepage = "https://github.com/jesec/rtorrent"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ winter AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix deleted file mode 100644 index 56fec5333fc..00000000000 --- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib -, pkgs -, callPackage -}: - -rec { - libtorrent = callPackage ./libtorrent.nix { }; - rtorrent = callPackage ./rtorrent.nix { }; -} diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix deleted file mode 100644 index fff4cbb36cf..00000000000 --- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix +++ /dev/null @@ -1,48 +0,0 @@ -# Note: this is rakshasa's version of libtorrent, used mainly by rtorrent. -# *Do not* mistake it by libtorrent-rasterbar, used by Deluge, qbitttorent etc. -{ lib -, stdenv -, fetchFromGitHub -, autoconf-archive -, autoreconfHook -, cppunit -, libsigcxx -, openssl -, pkg-config -, zlib -}: - -stdenv.mkDerivation rec { - pname = "rakshasa-libtorrent"; - version = "0.13.8+date=2021-08-07"; - - src = fetchFromGitHub { - owner = "rakshasa"; - repo = "libtorrent"; - rev = "53596afc5fae275b3fb5753a4bb2a1a7f7cf6a51"; - hash = "sha256-gyl/jfbptHz/gHkkVGWShhv1Z7o9fa9nJIz27U2A6wg="; - }; - - nativeBuildInputs = [ - autoconf-archive - autoreconfHook - pkg-config - ]; - - buildInputs = [ - cppunit - libsigcxx - openssl - zlib - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/rakshasa/libtorrent"; - description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix deleted file mode 100644 index f166f6d0e29..00000000000 --- a/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, autoreconfHook -, autoconf-archive -, cppunit -, curl -, libsigcxx -, libtool -, libtorrent -, ncurses -, openssl -, pkg-config -, xmlrpc_c -, zlib -}: - -stdenv.mkDerivation rec { - pname = "rakshasa-rtorrent"; - version = "0.9.8+date=2021-08-07"; - - src = fetchFromGitHub { - owner = "rakshasa"; - repo = "rtorrent"; - rev = "a6bc99bb821d86b3b0633552db3fbd0a22497657"; - hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; - }; - - nativeBuildInputs = [ - autoconf-archive - autoreconfHook - pkg-config - ]; - - buildInputs = [ - cppunit - curl - libsigcxx - libtool - libtorrent - ncurses - openssl - xmlrpc_c - zlib - ]; - - configureFlags = [ - "--with-xmlrpc-c" - "--with-posix-fallocate" - ]; - - enableParallelBuilding = true; - - postInstall = '' - mkdir -p $out/share/man/man1 $out/share/doc/rtorrent - mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1 - mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc - ''; - - meta = with lib; { - homepage = "https://rakshasa.github.io/rtorrent/"; - description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix new file mode 100644 index 00000000000..529e80ebade --- /dev/null +++ b/pkgs/tools/networking/pathvector/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pathvector"; + version = "5.11.1"; + + src = fetchFromGitHub { + owner = "natesales"; + repo = "pathvector"; + rev = "v${version}"; + sha256 = "sha256-OgIDk+05bG2KrBQOyyMPaH0OJXU3gLM9OBab9lI+yXw="; + }; + + vendorSha256 = "sha256-R3o1L34FXbtRzJ1I2Xj4iWsiFJJWexGWYv2TmvhINe0="; + + CGO_ENABLED = 0; + + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; + + doCheck = false; + + meta = with lib; { + description = "Declarative edge routing platform that automates route optimization and control plane configuration"; + homepage = "https://pathvector.io"; + license = licenses.gpl3; + maintainers = with maintainers; [ matthewpi ]; + }; +} diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index a1f783a7fe4..2013f15d1e1 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.11.0"; + version = "0.11.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-43PqIM61MXY35BSprRNPTMyVUEVD15sq4+6PHS/P2o0="; + sha256 = "sha256-vEgYmtRAashBRsGDExewqaGsVYF7EJ4ky+cE/PMFW38="; }; - cargoSha256 = "sha256-ue93L8pyjKR+bxNdltQcsHSPJ3Iz+4gpeskIhhR2/wI="; + cargoSha256 = "sha256-xstcKIXQDk4ngwWSzMueO47U2oFRHAqvvjRnDXFsPE8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 49a6d645060..469eecde99f 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.20.3"; + version = "0.20.5"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-oYnqrNqbn/OsJd0Lh6rQ2pt7FrLOp5p3MoavC56dWQc="; + sha256 = "sha256-3UuDo6lW+SG4XhqEKvpe/JeJXwEeYTA0i65yJAjDVHk="; }; - cargoSha256 = "sha256-LtDIzqHzzur+GxxvUHciNQCRmxqdmaXSG4ncMV3Rx3c="; + cargoSha256 = "sha256-/3gh3NdIuWl0xtbLahNRGBl/BGpVUmR7sHUIX3bttpQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/tools/package-management/comma/default.nix index 5314285061e..a9885fc1351 100644 --- a/pkgs/tools/package-management/comma/default.nix +++ b/pkgs/tools/package-management/comma/default.nix @@ -1,11 +1,12 @@ -{ lib -, rustPlatform +{ comma , fetchFromGitHub -, nix , fzy +, lib , makeWrapper +, nix +, nix-index +, rustPlatform , testVersion -, comma }: rustPlatform.buildRustPackage rec { @@ -25,7 +26,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/comma \ - --prefix PATH : ${lib.makeBinPath [ nix fzy ]} + --prefix PATH : ${lib.makeBinPath [ nix fzy nix-index ]} ln -s $out/bin/comma $out/bin/, ''; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 027efe46869..8e0860dfe58 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -78,10 +78,14 @@ in lib.makeExtensible (self: { sha256 = "sha256-xz7QnWVCI12lX1+K/Zr9UpB93b10t1HS9y/5n5FYf8Q="; }) ]; + }; + nix_2_8 = common { + version = "2.8.0"; + sha256 = "sha256-gWYNlEyleqkPfxtGXeq6ggjzJwcXJVdieJxA1Obly9s="; }; - stable = self.nix_2_7; + stable = self.nix_2_8; unstable = lib.lowPrio (common rec { version = "2.8"; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index bc78eb7f101..b5ad987b27b 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-04-12"; + version = "2022-04-20"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-Ucbw09oFklulyXr8mGO5RskKNZx0rPTA6hPJgYByPAI="; + sha256 = "sha256-8sDixCXJA1K6hnPtLzNCB9gJh1GShCC89VTCJ63ohKA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index bc1df5eb569..d73ba430633 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.6.4"; + version = "2.7.0"; src = fetchFromGitHub { owner = "epi052"; repo = pname; - rev = "v${version}"; - hash = "sha256-aTyjZc+bsA4rvbcFTLArK+zbfF6thHEYyPbMx9vLcMo="; + rev = version; + hash = "sha256-Ub4HOi38fYNJkpXfms1/aDl97h2UI1Fru8+NAiAztoc="; }; - cargoSha256 = "sha256-PLrIMgn0o+fFB6Zv9sf7X4gZyHwVSd6BOM1/KUo3TAg="; + cargoSha256 = "sha256-ODLL++wn8IQloEFZXF8TasercTKJ0nhPtny4fsi03Ks="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index 8113289a9c4..29a0aadd156 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gau"; - version = "2.0.9"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8op515+0wDxxU1e08gJ6lg/8NhQScFb4b3mCzBV/VNw="; + sha256 = "sha256-jIMBvRnY1Z/cLwBnWGp1fsx6oLri1qiknLj+r9B4GHc="; }; vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ="; diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index a26e0569c5c..4f9d8dd26b0 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.7.2"; + version = "8.8.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V2wBzoU3oL/wT/pIvMxEPTuNaRLTI72OTDRgWXyzZoY="; + sha256 = "sha256-yXyebPZN5WbSP4x2cbdlWqbwhVW24x6VmmodK6GCMH8="; }; vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index d349c205ad4..907f3f4e7c5 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-XgrEtAVfMcXbmAjwgIWME/v85QHJ11fUXapAZtS/lSw="; + sha256 = "sha256-In+rc5H8HNx5hGySYvCqx6hQ7tmTioHiNdJIMyMRNvU="; }; - vendorSha256 = "sha256-Bo0+HSG7NqaweMKPdl+kzB6RdbQsy2FAzmr7ZZVgcsg="; + vendorSha256 = "sha256-z0PsLrT4jtSof4Bd62juGLv58EV22TnPx6fosMvW97c="; subPackages = [ "." ]; diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 85aaee0bb9e..86547d04e46 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.2.5"; - hash = "sha256-W7DTaJVA9xqdgBjrrR+OK1buBMrjpw2T0I//ZZKQFOw="; + version = "1.2.6"; + hash = "sha256-q1Dpdw7bVSG10xtoUpelRgMrWe71vCWajjsAHjAZzQ4="; src = fetchFromGitHub { owner = "aristocratos"; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 5d09020eec3..c265cf028bc 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-9NsudhalFm0km7BmK+2QzK9LxirrVtIFzNrugpw4f8g="; + sha256 = "sha256-HxzniR4z3YzvFww3KqhtelaqMQJBsSw83pfz+jHxvKQ="; }; - vendorSha256 = "sha256-SUbQPzFZUBgFZvaLc8730hZhJvt3/ni306Vt3EZMOmU="; + vendorSha256 = "sha256-wRNfxJVX45dfIBZ0sy48qbPkAsD0CIB1PDTiGs8Fjhs="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 25bf79caddd..76897823029 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -1,40 +1,36 @@ -{ stdenv, lib, fetchurl, fetchpatch -, withGUI ? false, gtk2, pkg-config, sqlite # compile GUI +{ stdenv +, lib +, fetchFromGitHub +, hwdata +, gtk2 +, pkg-config +, sqlite # compile GUI +, withGUI ? false }: stdenv.mkDerivation rec { pname = "lshw"; - version = "B.02.18"; - - src = fetchurl { - url = "https://ezix.org/software/files/lshw-${version}.tar.gz"; - sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf"; + # Fix repology.org by not including the prefixed B, otherwise the `pname` attr + # gets filled as `lshw-B.XX.XX` in `nix-env --query --available --attr nixpkgs.lshw --meta` + # See https://github.com/NixOS/nix/pull/4463 for a definitive fix + version = "02.19"; + + src = fetchFromGitHub { + owner = "lyonel"; + repo = pname; + rev = "B.${version}"; + sha256 = "sha256-PzbNGc1pPiPLWWgTeWoNfAo+SsXgi1HcjnXfYXA9S0I="; }; - patches = [ - (fetchpatch { - # fix crash in scan_dmi_sysfs() when run as non-root - url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch"; - sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3"; - }) - (fetchpatch { - # support cross-compilation - url = "https://github.com/lyonel/lshw/commit/8486d25cea9b68794504fbd9e5c6e294bac6cb07.patch"; - sha256 = "08f0wnxsq0agvsc66bhc7lxvk564ir0pp8pg3cym6a621prb9lm0"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals withGUI [ gtk2 sqlite ]; + buildInputs = [ hwdata ] + ++ lib.optionals withGUI [ gtk2 sqlite ]; - # Fix version info. - preConfigure = '' - sed -e "s/return \"unknown\"/return \"${version}\"/" \ - -i src/core/version.cc - ''; - - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "VERSION=${src.rev}" + ]; buildFlags = [ "all" ] ++ lib.optional withGUI "gui"; @@ -46,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://ezix.org/project/wiki/HardwareLiSter"; description = "Provide detailed information on the hardware configuration of the machine"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ thiagokokada ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 12ad1a764fb..3109687fd18 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.26.3"; + version = "0.27.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "11qvl78dskhawmzjbff2cd4icwvlfhg8hzf1law5w5cr768zv7yn"; + sha256 = "sha256-jdkyDsuOOG1dJmgRmMp2KhY9ermccjrxK2JAIzpO6nw="; }; - cargoSha256 = "1kmwd9m94kl3j6ajfndr7rjx66fsqvnn2jh0m54ac5qd5r9hhdc8"; + cargoSha256 = "sha256-qHG3ve8HoMWBS/x6mRbXMsrpcqNqfVcbAkfYOk7Su/0="; passthru.tests.version = testVersion { package = difftastic; }; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 2511e0c88b2..f3e3d00aeee 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.7.7"; + version = "3.7.9"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FucHivUd9WVQlTsBJbnSd2Q6WQpoFjm6dS0eb6z8SSs="; + sha256 = "sha256-ZY3pihHU5FLu41vKrM/U06iZZ6D/LSuoyy2gHJJqRFY="; }; buildInputs = [ |