diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/archivers/corearchiver/default.nix | 33 | ||||
-rw-r--r-- | pkgs/tools/misc/bdf2psf/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/coreshot/default.nix | 32 | ||||
-rw-r--r-- | pkgs/tools/misc/thefuck/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/networking/minio-client/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/telepresence2/default.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/security/acsccid/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/security/credslayer/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/security/mkpasswd/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/typesetting/lowdown/default.nix | 4 |
10 files changed, 59 insertions, 85 deletions
diff --git a/pkgs/tools/archivers/corearchiver/default.nix b/pkgs/tools/archivers/corearchiver/default.nix deleted file mode 100644 index 217520dde9945..0000000000000 --- a/pkgs/tools/archivers/corearchiver/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja, }: - -mkDerivation rec { - pname = "corearchiver"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-FJGsQp1lbsrvlzKPiTv/FC9RH2+JRwwIvkLDTFW8t5s="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - libcprime - libarchive-qt - libarchive - ]; - - meta = with lib; { - description = "Archiver from the C Suite to create and extract archives"; - homepage = "https://gitlab.com/cubocore/coreapps/corearchiver"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 72f142105b710..06b8aa4d96099 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.205"; + version = "1.207"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-elFmsqtndo4ReR4IoyhC56k0PMqy5QrUxOGUQLGeu0I="; + sha256 = "0k9dv4s44k1khrhr6acsb2sqr5iq3d03ync82nzan5j7mckzs76v"; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/coreshot/default.nix b/pkgs/tools/misc/coreshot/default.nix deleted file mode 100644 index bb2404b1ed522..0000000000000 --- a/pkgs/tools/misc/coreshot/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, libcprime, cmake, ninja }: - -mkDerivation rec { - pname = "coreshot"; - version = "4.2.0"; - - src = fetchFromGitLab { - owner = "cubocore/coreapps"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-HKgGeuM3CKGXwnFwSw6a0AB0klZKY5YS9C4q2UT6TN8="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - qtbase - qtx11extras - libcprime - ]; - - meta = with lib; { - description = "A screen capture utility from the C Suite"; - homepage = "https://gitlab.com/cubocore/coreapps/coreshot"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 13509af98c029..a3aa31d4deddf 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication +{ lib, stdenv, fetchFromGitHub, buildPythonApplication , colorama, decorator, psutil, pyte, six , go, mock, pytestCheckHook, pytest-mock }: @@ -18,6 +18,23 @@ buildPythonApplication rec { checkInputs = [ go mock pytestCheckHook pytest-mock ]; + disabledTests = lib.optional stdenv.isDarwin [ + "test_settings_defaults" + "test_from_file" + "test_from_env" + "test_settings_from_args" + "test_get_all_executables_exclude_paths" + "test_with_blank_cache" + "test_with_filled_cache" + "test_when_etag_changed" + "test_for_generic_shell" + "test_on_first_run" + "test_on_run_after_other_commands" + "test_when_cant_configure_automatically" + "test_when_already_configured" + "test_when_successfully_configured" + ]; + meta = with lib; { homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command"; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index f4907da645ad8..b448c6d359406 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-09-02T09-21-27Z"; + version = "2021-10-07T04-19-58Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-6G0MyeDYc8Y6eib2T+2VB5mDjyO13FdBsufy57osIEk="; + sha256 = "sha256-FF4blsNzr2M/ZZ2epTBhFkoj6s9Iw5GGXY65mKftojk="; }; - vendorSha256 = "sha256-J1khnNTiHkTPRjNlU2yQu8b+bwKP/KBF1KxTIvGLs+U="; + vendorSha256 = "sha256-GFxB5Gxnc6m91EjF2z108J1WmggCQrUhxwEA+Sih+94="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index e7ae903e8682b..9a2e1b4bbc781 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -1,17 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, kubernetes-helm }: buildGoModule rec { pname = "telepresence2"; - version = "2.4.0"; + version = "2.4.6"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "1v2jkhdlyq37akqyhb8mwsh7rjdv2fjw8kyzys3dv04k3dy5sl0f"; + sha256 = "09w7yk7jk5m6clq3drbgdr61w60b21jmfd635brfahms8pykmmzl"; }; - vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; + # The Helm chart is go:embed'ed as a tarball in the binary. + # That tarball is generated by running ./build-aux/package_embedded_chart/main.go, + # which tries to invoke helm from tools/bin/helm. + # Oh well… + preBuild = '' + mkdir -p tools/bin + ln -sfn ${kubernetes-helm}/bin/helm tools/bin/helm + go run ./build-aux/package_embedded_chart/main.go ${src.rev} + ''; + + vendorSha256 = "0przkcqaf56a0sgan2xxqfpbs9nbmq4brwdv1qnag7i9myzvixxb"; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index da461a96957a3..f471393b2cfc2 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoconf , automake @@ -77,7 +78,7 @@ stdenv.mkDerivation rec { ''; homepage = src.meta.homepage; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ roberth ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/security/credslayer/default.nix b/pkgs/tools/security/credslayer/default.nix index 0de8d37c0db4f..223f9dd70eb9a 100644 --- a/pkgs/tools/security/credslayer/default.nix +++ b/pkgs/tools/security/credslayer/default.nix @@ -29,10 +29,20 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Requires a telnet setup "test_telnet" + # stdout has all the correct data, but the underlying test code fails + # functionally everything seems to be intact + "http_get_auth" + "test_http_post_auth" + "test_ntlmssp" ]; pythonImportsCheck = [ "credslayer" ]; + postInstall = '' + wrapProgram $out/bin/credslayer \ + --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}" + ''; + meta = with lib; { description = "Extract credentials and other useful info from network captures"; homepage = "https://github.com/ShellCode33/CredSLayer"; diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index e001239f3136e..6064a80d6cd5d 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, whois, perl }: +{ lib, stdenv, whois, libxcrypt, perl, pkg-config }: stdenv.mkDerivation { - name = "mkpasswd-${whois.version}"; + pname = "mkpasswd"; + inherit (whois) version; + inherit (whois) src; - src = whois.src; + nativeBuildInputs = [ perl pkg-config ]; + buildInputs = [ libxcrypt ]; - nativeBuildInputs = [ perl ]; - - preConfigure = whois.preConfigure; + inherit (whois) preConfigure; buildPhase = "make mkpasswd"; installPhase = "make install-mkpasswd"; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 32907ea3fb757..1cb9c8d40177a 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.9.2"; + version = "0.10.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "2dnjyx3q46n7v1wl46vfgs9rhb3kvhijsd3ydq6amdf6vlf4mf1zsiakd5iycdh0i799zq61yspsibc87mcrs8l289lnwl955avs068"; + sha512 = "3gq6awxvkz2hb8xzcwqhdhdqgspvqjfzm50bq9i29qy2iisq9vzb91bdp3f4q2sqcmk3gms44xyxyn3ih2hwlzsnk0f5prjzyg97fjj"; }; nativeBuildInputs = [ which ] |