diff options
Diffstat (limited to 'pkgs/tools')
59 files changed, 861 insertions, 287 deletions
diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 8074e52c7cf1a..5ffef951d51a7 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + makeWrapper pkg-config ]; @@ -22,7 +23,6 @@ stdenv.mkDerivation rec { libSM libstartup_notification libxml2 - makeWrapper openbox ]; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index c3355b8026338..00ebb1ecec23e 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { do sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' done + + # Fix for glibc-2.34. For some reason, `LIBSEMA="CCC"` is added + # if `sem_init` is part of libc which causes errors like + # `gcc: error: CCC: No such file or directory` during the build. + substituteInPlace configure \ + --replace 'LIBSEMA="CCC"' 'LIBSEMA=""' ''; buildInputs = diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 11cf6c53076c4..1e82459f4c6a6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -35,11 +35,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.22.35"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.22.67"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-GsMclLh/VtPaNjD+XDKqTYeSX29R2aRS7If9G918OWY="; + hash = "sha256-ofgxL9V/jTn/itxSOLGYkAmgQXES7aVUM/vM6nWdbBc="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 08fb92e4ea63a..16c547dbeba62 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -33,13 +33,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.4.19"; # N.B: if you change this, change botocore to a matching version too + version = "2.4.23"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-ZOSZBZT4d5jv5lg8KkGoOJqAvStUsGZbiXp3dpsrOpo="; + sha256 = "sha256-zpkphlIfmexqZm0lZgDP3RoQJqTpFdT+5dGtaLiRr/U="; }; propagatedBuildInputs = [ @@ -69,7 +69,6 @@ with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.cfg \ --replace "colorama>=0.2.5,<0.4.4" "colorama" \ - --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ --replace "docutils>=0.10,<0.16" "docutils" \ --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ --replace "wcwidth<0.2.0" "wcwidth" \ diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index efd1ecfee3c16..01cb5081cf4f2 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.32.0"; + version = "2.34.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-PXY32bfuK0bQGI0N+XHs9lakF6K7+WjrHMvuNgDFSJM="; + sha256 = "sha256-BEEwxf3UTShKi3K/uBK1yMxyPCvybL/BbKsu8XAwu0M="; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index d27805bb257e4..5b8732f537514 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -69,7 +69,8 @@ let postPatch = '' substituteInPlace setup.py \ --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ - --replace "cryptography>=3.2,<3.4" "cryptography" + --replace "cryptography>=3.2,<3.4" "cryptography" \ + --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" ''; checkInputs = with self; [ pytest ]; @@ -117,11 +118,11 @@ let ''; }; - azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip" - "sha256-zl/bDsli7d/oXNgiBekXfLC720RSZXRuOLO7vx8W3HM="; + azure-batch = overrideAzureMgmtPackage super.azure-batch "12.0.0" "zip" + "sha256-GpseF4mEp79JWvZ7zOUfDbHkqKlXr7KeM1VKFKlnTes="; - azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" - "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; + azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "3.0.0" "zip" + "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154"; azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "16.0.0" "zip" "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; @@ -156,8 +157,8 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.0.0" "zip" "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "23.1.0" "zip" - "sha256-Sduw9RAG1VfL0LIpmcuezz6rwr5G2W78xtZRxrM3VLM="; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "25.0.0" "zip" + "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -165,8 +166,8 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip" "sha256-N+zUTEnOyn18lDHlkUj+vRXX/sJhZR7XLd1YdV50ULA="; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.1.0" "zip" - "sha256-NlTIrOK4ho0OqcTHjHT1HobiMzDH2KY20TIlN0fm8/Q="; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "17.0.0" "zip" + "sha256-oUbWdZryabCCg/gTujchT7p1nS7IDoU5W9MQ4ekJYH8="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "7.0.0b2" "zip" "sha256-hVvYW9gkfTVMwis3IdD0JXYDxdKcyyzIFx3hNk7VMLI="; @@ -183,11 +184,11 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.0.0" "zip" "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.1.0" "zip" - "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.2.0" "zip" + "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM="; - azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.0.0" "zip" - "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; + azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.1.0" "zip" + "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0" "zip" "64df73df449a6f3717f3d0963e5869224ed3e6216c79de571493bea7c1b52cb6"; @@ -198,14 +199,14 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "5.1.0" "zip" - "sha256-MGCICI7hDobEzyTMgqnKYZ21zfwNo/ogfQDsf3fwbo4="; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "6.0.1" "zip" + "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "12.0.0" "zip" - "da128a7e0291be7fa2063848df92a9180cf5c16d42adc09d2bc2efd711536bfb"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b2" "zip" + "sha256-j8CyWZGF7Z/5szJ+CD96E0EbNsceJ1SScrlPqWVLjnk="; azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.3.0" "zip" "0b6a1ccdffd76e057ab16a6c319740a0ca68d59fedf7e9c02f2437396e72aa11"; @@ -216,8 +217,8 @@ let azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; - azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "0.1.0" "zip" - "sha256-/2LZgu3aY0o2Fgyx0Vo2epVypay0GeXnrTcejIO9R8c="; + azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "1.0.0" "zip" + "bab9bd532a1c34557f5b0ab9950e431e3f00bb96e8a3ce66df0f6ce2ae19cd73"; azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; @@ -231,8 +232,8 @@ let azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "4.0.0" "zip" - "sha256-5XQ3qTPn3qmwYY/nkODa3GP5hXc1NhrItfXoBiucKg0="; + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "6.1.0" "zip" + "c26635089276515b0488fcf014aab50a0446f54800c6e0e5583cc493ac8d738f"; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.0.0" "zip" "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980"; @@ -291,11 +292,11 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "19.0.0" "zip" - "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "19.1.0" "zip" + "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY="; - azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "6.0.0" "zip" - "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; + azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "7.1.0" "zip" + "d8ae7905fb7d3e24822daa20aa7bc5014f41aa18b48ea2d0161e997fc11a3d36"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; @@ -413,12 +414,12 @@ let }); azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec { - version = "4.5.0b4"; + version = "4.5.0b6"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; extension = "zip"; - sha256 = "sha256-f43ZTMFc0IVIaa69gEZFOLALREcx3RRCFoYDY2FYLrY="; + sha256 = "sha256-WFSRJaia0+WnvGxoMYZIvf81ue51VPYXzTp8huUh1fc="; }; }); @@ -481,18 +482,6 @@ let }; }); - PyGithub = super.PyGithub.overridePythonAttrs(oldAttrs: rec { - version = "1.38"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "sha256-HtCPd17FBnvIRStyveLbuVz05S/yvVDMMsackf+tknI="; - }; - - doCheck = false; - }); - knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.9.0"; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 0d88df6185a69..83bdea6d49eeb 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.25.0"; + version = "0.25.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jlLE8io7/Yhu0rF7brV9YhDIsZBANZtatnWbgoHMReg="; + sha256 = "sha256-yDoHDOPtPX5u8K2/fnj6dgqlI+WUCsuxbdKtb/UtIRQ="; }; - vendorSha256 = "sha256-hOurOL7xowgBs9gXa++X7+iOKJJ6WjekGGFiR9Q0OEU="; + vendorSha256 = "sha256-HZpGPCayrnayOg+3mB8Tw+5M2IfIpIvzP7qfY1OL7tk="; excludedPackages = "misc"; diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index c9270ce58357f..e407a5f990705 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "3.9.3"; + version = "3.9.4"; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "v${version}"; - sha256 = "sha256-sx6UtblpsetKPwhlXB3Kj3OMIOyW9QluzB+YbtQGdYQ="; + sha256 = "sha256-PJ9m+697bdrhHZ80wJvL6V366Vn3tmPfioK1sZAyB/Q="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index da37cf9fbd8cf..cd262875a76be 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + ln -s $out/lib/libbz2.so.1.0.* $out/lib/libbz2.so.1.0 + ''; + meta = with lib; { description = "High-quality data compression program"; homepage = "https://www.sourceware.org/bzip2"; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index c51cc12da36bb..fad1944c4a0eb 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-PaTaU2HPhr3dqA7bTE8w6gdstOvsKZBPoIr8kw754ag="; + sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/buttersink/default.nix b/pkgs/tools/filesystems/buttersink/default.nix deleted file mode 100644 index aa0f317787f82..0000000000000 --- a/pkgs/tools/filesystems/buttersink/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, python2 }: - -python2.pkgs.buildPythonApplication rec { - pname = "buttersink"; - version = "0.6.9"; - - src = python2.pkgs.fetchPypi { - inherit pname version; - sha256 = "a797b6e92ad2acdf41e033c1368ab365aa268f4d8458b396a5770fa6c2bc3f54"; - }; - - propagatedBuildInputs = with python2.pkgs; [ boto crcmod psutil ]; - - # No tests implemented - doCheck = false; - - meta = with lib; { - description = "Synchronise btrfs snapshots"; - longDescription = '' - ButterSink is like rsync, but for btrfs subvolumes instead of files, - which makes it much more efficient for things like archiving backup - snapshots. It is built on top of btrfs send and receive capabilities. - Sources and destinations can be local btrfs file systems, remote btrfs - file systems over SSH, or S3 buckets. - ''; - homepage = "https://github.com/AmesCornish/buttersink/wiki"; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index f5b0a0315dfcb..3111be5b4d12e 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; }; + postPatch = '' + # Taken from https://github.com/pupnp/pupnp/pull/334/files + substituteInPlace libupnp/threadutil/inc/ithread.h \ + --replace \ + "#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np" \ + '#define ithread_mutexattr_setkind_np pthread_mutexattr_settype' + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse]; diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 44e547b01c24d..4d56f08b44262 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { ./add-macfuse-support.patch ]; + postPatch = '' + sed -i -e '/TEST_SOURCES/d' CMakeLists.txt + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ fuse ]; diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index ef1b6a5a4ca5b..12cc6572abcb9 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , boost +, catch2 , clasp , cmake , gringo @@ -19,6 +20,10 @@ stdenv.mkDerivation rec { hash = "sha256-d04GPMoz6PMGq6iiul0zT1C9Mljdl9uJJ2C8MIwcmaw="; }; + postPatch = '' + cp ${catch2}/include/catch2/catch.hpp libcudf/tests/catch.hpp + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost clasp gringo re2c ]; @@ -28,6 +33,8 @@ stdenv.mkDerivation rec { "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp" ]; + doCheck = true; + meta = with lib; { description = "Solver for package problems in CUDF format using ASP"; homepage = "https://potassco.org/aspcud/"; diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index a1b2ad662bc6c..9f0cb31c1ff7a 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577"; - doCheck = false; - meta = with lib; { description = "TUI Client for Docker"; homepage = "https://github.com/skanehira/docui"; diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 32c5ec6566dae..72a38cf1eaf3f 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "dsq"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-4g9fu5taFtb7VzVa0X8s6SbEO9qTFD0ff+CVJpr376c="; + hash = "sha256-AxYqSCdCrhHrN21WGJtg0KIde8VAjj6bF7DzELZptj8="; }; - vendorSha256 = "sha256-YPH/uPPNT1byXOtCrNyU68H4mHO8arl6l5hs9WMcxVk="; + vendorSha256 = "sha256-aER7j/DG1WB5DZhvgXYrl19UwQ/lZLPRAptINVJ3rdI="; nativeBuildInputs = [ diffutils ]; diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 65797f65fe6d0..d46815e8bf2a3 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "5.15"; + version = "5.16"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-aG/WEQOJ1JwqEg8Aw81d/kPeutqOAh5CcNdLvkUqEW0="; + sha256 = "sha256-qi/vGTbdShF1XfoL25Pw7FvqRSCNJ8l1S8Or4apCwcs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 3746c4b4657fc..56d710c854549 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var/cache" ]; - CFLAGS = [ + CFLAGS = lib.optionals stdenv.isDarwin [ # TODO: Revisit upstream issue https://savannah.gnu.org/bugs/?59972 # https://github.com/Homebrew/homebrew-core/pull/69761#issuecomment-770268478 "-D__nonnull\\(params\\)=" diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 6bb728af99cac..3de016bf6d688 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchpatch, fetchFromGitHub, lib , cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango -, readline, woff2, zeromq, libuninameslist +, readline, woff2, zeromq , withSpiro ? false, libspiro , withGTK ? false, gtk3 , withGUI ? withGTK @@ -14,13 +14,13 @@ assert withGTK -> withGUI; stdenv.mkDerivation rec { pname = "fontforge"; - version = "20201107"; + version = "20220308"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; + sha256 = "sha256-q+71PDPODl5fEEy3d1icRl+rBGY7AhH+2dMUKeBWGgI="; }; patches = [ @@ -28,13 +28,11 @@ stdenv.mkDerivation rec { # Taken from https://salsa.debian.org/fonts-team/fontforge/-/blob/master/debian/patches/0001-add-extra-cmake-install-rules.patch (fetchpatch { url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; - sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; - }) - # Fix segmentation fault with some fonts. - # This is merged and should be present in the next release. - (fetchpatch { - url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch"; - sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29"; + excludes = [ + # Already handled upstream: https://github.com/fontforge/fontforge/commit/f97a2cd7b344ec8fcb9f8bfb908e1b6f36326d20 + "contrib/cidmap/CMakeLists.txt" + ]; + sha256 = "iQwaGeBHUais979hGVbU2NxKozQSQkpYXjApxPuLI/4="; }) ]; @@ -52,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - readline uthash woff2 zeromq libuninameslist + readline uthash woff2 zeromq python freetype zlib glib giflib libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [ libspiro ] diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index a002d190984f8..8d6de0bbeb81d 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "gparted"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xu4ubXSxXvlrE7OiMQyGjtIpjgM0ECHn0SpamKHR4Qk="; + sha256 = "sha256-5Sk6eS5T/b66KcSoNBE82WA9DWOTMNqTGkaL82h4h74="; }; # Tries to run `pkexec --version` to get version. diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index 31bc0b2b6a12d..f80e15b3b3c22 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -27,8 +27,11 @@ stdenv.mkDerivation rec { stripRoot = false; }; - buildInputs = [ + nativeBuildInputs = [ makeWrapper + ]; + + buildInputs = [ libGLU libGL libX11 ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 0b3e17818dcd7..c1136ed887689 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -26,8 +26,12 @@ let this = stdenv.mkDerivation rec { dontStrip = true; dontPatchShebangs = true; + nativeBuildInputs = [ + makeWrapper + ]; + buildInputs = [ - makeWrapper jre + jre ]; installPhase = '' diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 636c380817ce3..6cf64691efb6d 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -41,8 +41,11 @@ let dontStrip = true; dontPatchShebangs = true; - buildInputs = [ + nativeBuildInputs = [ makeWrapper + ]; + + buildInputs = [ jre ]; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 5528bb2f97c38..4560e14c697f1 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.30.1"; + version = "1.31.0"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-MwkYgkDZmzZsthJxSK6c+0us0D4cPuDfuV1XBbeTNXE="; + sha256 = "sha256-kzGBb8h03jPCqpwKPXeqB3yPTGgvVsl1DjIyCbNgjqM="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 8c4fa097ea41d..3a60c3be36926 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2022.2"; + version = "1.2022.3"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-4LPR8gdpfebq5U/umxcFfqe7i6qJHLqhOAu7DfYzTY8="; + sha256 = "sha256-u40P3YFiWd419Bz1NvhIsPa7nASl/I9z/L2Q5v9eOAo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/plfit/default.nix b/pkgs/tools/misc/plfit/default.nix new file mode 100644 index 0000000000000..d1613af76e909 --- /dev/null +++ b/pkgs/tools/misc/plfit/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, python ? null +, swig +, llvmPackages +}: + +stdenv.mkDerivation rec { + pname = "plfit"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "ntamas"; + repo = "plfit"; + rev = version; + hash = "sha256-y4n6AlGtuuUuA+33oF7lGOYuKSqea4GMSJlv9PaSpQ8="; + }; + + patches = [ + # https://github.com/ntamas/plfit/pull/41 + (fetchpatch { + name = "use-cmake-install-full-dir.patch"; + url = "https://github.com/ntamas/plfit/commit/d0e77c80e6e899298240e6be465cf580603f6ee2.patch"; + hash = "sha256-wi3qCp6ZQtrKuM7XDA6xCXunCiqsyhnkxmg2eSmxjYM="; + }) + ]; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (!isNull python) [ + python + swig + ]; + + cmakeFlags = [ + "-DPLFIT_USE_OPENMP=ON" + ] ++ lib.optionals (!isNull python) [ + "-DPLFIT_COMPILE_PYTHON_MODULE=ON" + ]; + + buildInputs = lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; + + meta = with lib; { + description = "Fitting power-law distributions to empirical data"; + homepage = "https://github.com/ntamas/plfit"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 307e5e9c74611..72f7f66c9e43a 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -1,17 +1,27 @@ -{ lib, python3Packages }: +{ lib +, python3Packages +, fetchFromGitHub + # tests +, cargo +, dotnet-sdk +, git +, go +, nodejs +}: with python3Packages; buildPythonPackage rec { pname = "pre-commit"; - version = "2.17.0"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit version; - pname = "pre_commit"; - sha256 = "c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a"; + src = fetchFromGitHub { + owner = "pre-commit"; + repo = "pre-commit"; + rev = "v${version}"; + sha256 = "sha256-d/ukUTjNgpqr6IeDJHDaOXQm0EdsX+vq0sVX7HG3gSE="; }; patches = [ @@ -32,18 +42,103 @@ buildPythonPackage rec { importlib-resources ]; - # slow and impure - doCheck = false; + checkInputs = [ + cargo + dotnet-sdk + git + go + nodejs + pytest-env + pytest-xdist + pytestCheckHook + re-assert + ]; + + doCheck = true; - preFixup = '' - substituteInPlace $out/${python.sitePackages}/pre_commit/resources/hook-tmpl \ + postPatch = '' + substituteInPlace pre_commit/resources/hook-tmpl \ --subst-var-by pre-commit $out - substituteInPlace $out/${python.sitePackages}/pre_commit/languages/python.py \ + substituteInPlace pre_commit/languages/python.py \ --subst-var-by virtualenv ${virtualenv} - substituteInPlace $out/${python.sitePackages}/pre_commit/languages/node.py \ + substituteInPlace pre_commit/languages/node.py \ --subst-var-by nodeenv ${nodeenv} + + patchShebangs pre_commit/resources/hook-tmpl + ''; + + pytestFlagsArray = [ + "--numprocesses $NIX_BUILD_CORES" + "--forked" + ]; + + preCheck = '' + export GIT_AUTHOR_NAME=test GIT_COMMITTER_NAME=test \ + GIT_AUTHOR_EMAIL=test@example.com GIT_COMMITTER_EMAIL=test@example.com \ + VIRTUALENV_NO_DOWNLOAD=1 PRE_COMMIT_NO_CONCURRENCY=1 LANG=en_US.UTF-8 + + git init -b master + + export HOME=$(mktemp -d) + + python -m venv --system-site-packages venv + source "$PWD/venv/bin/activate" + #$out/bin/pre-commit install + python setup.py develop ''; + postCheck = '' + deactivate + ''; + + disabledTests = [ + # ERROR: The install method you used for conda--probably either `pip install conda` + # or `easy_install conda`--is not compatible with using conda as an application. + "test_conda_" + "test_local_conda_" + + # /build/pytest-of-nixbld/pytest-0/test_install_ruby_with_version0/rbenv-2.7.2/libexec/rbenv-init: + # /usr/bin/env: bad interpreter: No such file or directory + "ruby" + + # network + "test_additional_dependencies_roll_forward" + "test_additional_golang_dependencies_installed" + "test_additional_node_dependencies_installed" + "test_additional_rust_cli_dependencies_installed" + "test_additional_rust_lib_dependencies_installed" + "test_dart_hook" + "test_dotnet_hook" + "test_golang_hook" + "test_golang_hook_still_works_when_gobin_is_set" + "test_installs_without_links_outside_env" + "test_local_dart_additional_dependencies" + "test_local_golang_additional_dependencies" + "test_local_lua_additional_dependencies" + "test_local_perl_additional_dependencies" + "test_local_rust_additional_dependencies" + "test_lua_hook" + "test_perl_hook" + "test_r_hook" + "test_r_inline_hook" + "test_r_local_with_additional_dependencies_hook" + "test_r_with_additional_dependencies_hook" + "test_run_a_node_hook_default_version" + "test_run_versioned_node_hook" + + # python2, no explanation needed + "python2" + "test_switch_language_versions_doesnt_clobber" + + # docker + "test_run_a_docker_hook" + + # i don't know why these fail + "test_install_existing_hooks_no_overwrite" + "test_installed_from_venv" + "test_uninstall_restores_legacy_hooks" + ]; + pythonImportsCheck = [ "pre_commit" ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index ad045aa1d9245..1ed9a9fd237c6 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.10"; + version = "4.11"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "sha256-JK/JtGDmmTJ+g0kmM7mSJi7+/N552GKtlMkh7quOBjo="; + sha256 = "1ybip45bfmvajw046v6mxjbf3vv0y7zgfb454rjy56zhx40l232v"; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix deleted file mode 100644 index 3bf1f5cd34b61..0000000000000 --- a/pkgs/tools/misc/teleconsole/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "teleconsole"; - version = "0.4.0"; - - goPackagePath = "github.com/gravitational/teleconsole"; - - src = fetchFromGitHub { - owner = "gravitational"; - repo = "teleconsole"; - rev = version; - sha256 = "01552422n0bj1iaaw6pvg9l1qr66r69sdsngxbcdjn1xh3mj74sm"; - }; - - srcTeleport = fetchFromGitHub { - owner = "gravitational"; - repo = "teleport"; - rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223"; - sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk"; - }; - - preBuild = '' - cp -r ${srcTeleport} ./go/src/github.com/gravitational/teleport - ''; - - CGO_ENABLED = 1; - - meta = with lib; { - homepage = "https://www.teleconsole.com/"; - description = "Share your terminal session with people you trust"; - license = licenses.asl20; - # Builds for Aarch64 not possible in the current release due to - # incompatibilities further up the dependency chain. - # See: - # - https://github.com/gravitational/teleport/issues/679 - # - https://github.com/kr/pty/issues/27 - broken = stdenv.isAarch64; - maintainers = [ maintainers.kimburgess ]; - }; -} diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 06e886e4d04fb..11875e73f9301 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,18 +1,39 @@ -{ lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt -, xauth, util-linux, which, fontsConf, gawk, coreutils }: -let - xvfb-run = fetchurl { - name = "xvfb-run"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/9cb733cefa92af3fca608fb051d5251160c9bbff/trunk/xvfb-run"; - sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; - }; -in -stdenv.mkDerivation { +{ lib +, stdenvNoCC +, fetchFromGitHub +, makeWrapper +, xorgserver +, getopt +, xauth +, util-linux +, which +, fontsConf +, gawk +, coreutils +, installShellFiles +, xterm +}: +stdenvNoCC.mkDerivation rec { name = "xvfb-run"; - nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' + version = "1+g87f6705"; + + src = fetchFromGitHub { + owner = "archlinux"; + repo = "svntogit-packages"; + rev = "87f67054c49b32511893acd22be94c47ecd44b4a"; + sha256 = "sha256-KEg92RYgJd7naHFDKbdXEy075bt6NLcmX8VhQROHVPs="; + }; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + dontUnpack = true; + dontBuild = true; + dontConfigure = true; + + installPhase = '' mkdir -p $out/bin - cp ${xvfb-run} $out/bin/xvfb-run + cp $src/trunk/xvfb-run $out/bin/xvfb-run + installManPage $src/trunk/xvfb-run.1 chmod a+x $out/bin/xvfb-run patchShebangs $out/bin/xvfb-run @@ -21,8 +42,23 @@ stdenv.mkDerivation { --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]} ''; + doInstallCheck = true; + installCheckPhase = '' + ( + unset PATH + echo "running xterm with xvfb-run" + $out/bin/xvfb-run ${lib.getBin xterm}/bin/xterm -e true + ) + ''; + + passthru = { + updateScript = ./update.sh; + }; + meta = with lib; { + description = "Convenience script to run a virtualized X-Server"; platforms = platforms.linux; license = licenses.gpl2; + maintainers = [ maintainers.artturin ]; }; } diff --git a/pkgs/tools/misc/xvfb-run/update.sh b/pkgs/tools/misc/xvfb-run/update.sh new file mode 100755 index 0000000000000..e592323154e22 --- /dev/null +++ b/pkgs/tools/misc/xvfb-run/update.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch jq common-updater-scripts +# shellcheck shell=bash + +set -e + +info=$(nix-prefetch-git --quiet --url "https://github.com/archlinux/svntogit-packages" --rev "refs/heads/packages/xorg-server") + +rev=$(jq -r '.rev' <<< "$info") +sha256=$(nix hash to-sri --type sha256 "$(jq -r '.sha256' <<< "$info")") +dir=$(jq -r '.path' <<< "$info") + +newXvfbsha=$(sha256sum "$dir/trunk/xvfb-run") +oldXvfbsha=$(sha256sum "$(nix build --quiet ".#xvfb-run.src" --json --no-link | jq -r '.[].outputs.out')/trunk/xvfb-run") + +if [[ "$newXvfbsha" != "$oldXvfbsha" ]]; then + ( + cd "$(git rev-parse --show-toplevel)" + update-source-version xvfb-run "1+g${rev:0:7}" "$sha256" --rev="$rev" + ) +fi diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index bfd48893165cd..c032ba61c123a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -54,14 +54,14 @@ assert zstdSupport -> zstd != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.81.0"; + version = "7.82.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-Hno41wGOwGDx8W34OYVPCInpThIsTPpdOjfC3Fbx4lg="; + sha256 = "sha256-RtmgQAozQI/ZkncLBKRKdDSzA28ugImsKLV1c9WdNx8="; }; patches = [ diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 035a99103fc7d..0fb559afc990c 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -7,6 +7,7 @@ , openssl , protobuf , zlib +, catch2 }: stdenv.mkDerivation rec { @@ -20,6 +21,10 @@ stdenv.mkDerivation rec { hash = "sha256-cCZbG0CD5V/FTj1BuVr083EJ+BCgIcKHomNtpJb3lOo="; }; + preBuild = '' + cp ${catch2}/include/catch2/catch.hpp ../external_imported/Catch2/single_include/catch2/catch.hpp + ''; + nativeBuildInputs = [ cmake ]; @@ -42,6 +47,8 @@ stdenv.mkDerivation rec { "-std=c++17" ]; + doCheck = true; + meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix index 13cac74446174..c8f42b3ad4a73 100644 --- a/pkgs/tools/networking/gost/default.nix +++ b/pkgs/tools/networking/gost/default.nix @@ -13,8 +13,33 @@ buildGoModule rec { vendorSha256 = "1cgb957ipkiix3x0x84c77a1i8l679q3kqykm1lhb4f19x61dqjh"; - # Many tests fail. - doCheck = false; + postPatch = '' + substituteInPlace http2_test.go \ + --replace "TestH2CForwardTunnel" "SkipH2CForwardTunnel" \ + --replace "TestH2ForwardTunnel" "SkipH2ForwardTunnel" + + substituteInPlace resolver_test.go \ + --replace '{NameServer{Addr: "1.1.1.1"}, "github", true},' "" \ + --replace '{NameServer{Addr: "1.1.1.1"}, "github.com", true},' "" \ + --replace '{NameServer{Addr: "1.1.1.1:53"}, "github.com", true},' "" \ + --replace '{NameServer{Addr: "1.1.1.1:53", Protocol: "tcp"}, "github.com", true},' "" \ + --replace '{NameServer{Addr: "1.1.1.1:853", Protocol: "tls"}, "github.com", true},' "" \ + --replace '{NameServer{Addr: "1.1.1.1:853", Protocol: "tls", Hostname: "cloudflare-dns.com"}, "github.com", true},' "" \ + --replace '{NameServer{Addr: "https://cloudflare-dns.com/dns-query", Protocol: "https"}, "github.com", true},' "" \ + --replace '{NameServer{Addr: "https://1.0.0.1/dns-query", Protocol: "https"}, "github.com", true},' "" + + # Skip TestShadowTCP, TestShadowUDP: #70 #71 #72 #78 #83 #85 #86 #87 #93 + substituteInPlace ss_test.go \ + --replace '{url.User("xchacha20"), url.UserPassword("xchacha20", "123456"), false},' "" \ + --replace '{url.UserPassword("xchacha20", "123456"), url.User("xchacha20"), false},' "" \ + --replace '{url.UserPassword("xchacha20", "123456"), url.UserPassword("xchacha20", "abc"), false},' "" \ + --replace '{url.UserPassword("CHACHA20-IETF-POLY1305", "123456"), url.UserPassword("CHACHA20-IETF-POLY1305", "123456"), true},' "" \ + --replace '{url.UserPassword("AES-128-GCM", "123456"), url.UserPassword("AES-128-GCM", "123456"), true},' "" \ + --replace '{url.User("AES-192-GCM"), url.UserPassword("AES-192-GCM", "123456"), false},' "" \ + --replace '{url.UserPassword("AES-192-GCM", "123456"), url.User("AES-192-GCM"), false},' "" \ + --replace '{url.UserPassword("AES-192-GCM", "123456"), url.UserPassword("AES-192-GCM", "abc"), false},' "" \ + --replace '{url.UserPassword("AES-256-GCM", "123456"), url.UserPassword("AES-256-GCM", "123456"), true},' "" + ''; meta = with lib; { description = "A simple tunnel written in golang"; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 126b3b513a86e..c9d56044b0dc0 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.18.4"; + version = "1.18.6"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-EfuXD2Pi2ojfS22HWeTuZJlExRUkS5eb9Qp6bfHX8Zk="; + sha256 = "sha256-1PgEsxz1BCOcXx1Jc8YglcAMuh7pq7UDcY2sbRRqRwo="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 7823b7eb90963..8331e3686dc9f 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; - buildInputs = [ protobuf ncurses zlib openssl bash-completion perlPackages.perl ] + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perlPackages.perl ]; + buildInputs = [ protobuf ncurses zlib openssl bash-completion ] ++ lib.optional withUtempter libutempter; strictDeps = true; diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index c26cb527f55e9..2c7347defdd3b 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -1,26 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }: +{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }: stdenv.mkDerivation rec { pname = "nethogs"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; rev = "v${version}"; - sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9"; + sha256 = "10shdwvfj90lp2fxz9260342a1c2n1jbw058qy5pyq5kh3xwr9b8"; }; - patches = [ - # Pull upstream patch for ncurses-6.3 support: - # https://github.com/raboof/nethogs/pull/210 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/raboof/nethogs/commit/455daf357da7f394763e5b93b11b3defe1f82ed1.patch"; - sha256 = "0wkp0yr6qg1asgvmsn7blf7rq48sh5k4n3w0nxf5869hxvkhnnzs"; - }) - ]; - buildInputs = [ ncurses libpcap ]; makeFlags = [ "VERSION=${version}" "nethogs" ]; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 91e1767b75c11..f272470a98f41 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"; }; + patches = [ + # From https://patchwork.openembedded.org/patch/180019/ + ./glibc-2.34-fix.patch + ]; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/tools/networking/ntp/glibc-2.34-fix.patch b/pkgs/tools/networking/ntp/glibc-2.34-fix.patch new file mode 100644 index 0000000000000..256f125a77b26 --- /dev/null +++ b/pkgs/tools/networking/ntp/glibc-2.34-fix.patch @@ -0,0 +1,28 @@ +From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 31 Jul 2021 10:51:41 -0700 +Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc +In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which +could mean different stack sizes at runtime on different architectures +and it also causes compile failure. Default glibc thread stack size +or 64Kb set by ntp should be good in glibc these days. +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libntp/work_thread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/libntp/work_thread.c b/libntp/work_thread.c +index 03a5647..3ddd751 100644 +--- a/libntp/work_thread.c ++++ b/libntp/work_thread.c +@@ -41,7 +41,7 @@ + #ifndef THREAD_MINSTACKSIZE + # define THREAD_MINSTACKSIZE (64U * 1024) + #endif +-#ifndef __sun ++#if !defined(__sun) && !defined(__GLIBC__) + #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN + # undef THREAD_MINSTACKSIZE + # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN +-- +2.32.0 diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 0e1da29320f06..5dea456d00bfc 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -4,6 +4,7 @@ , pkg-config , openssl ? null , gnutls ? null +, p11-kit , gmp , libxml2 , stoken @@ -42,7 +43,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ] - ++ lib.optional stdenv.isDarwin PCSC; + ++ lib.optional stdenv.isDarwin PCSC + ++ lib.optional stdenv.isLinux p11-kit; nativeBuildInputs = [ pkg-config ] ++ lib.optional head autoreconfHook; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 36125a5893be7..77277f20950bc 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -6,11 +6,11 @@ in openssh = common rec { pname = "openssh"; - version = "8.8p1"; + version = "8.9p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "1s8z6f7mi1pwsl79cqai8cr350m5lf2ifcxff57wx6mvm478k425"; + sha256 = "sha256:1ry5prcax0134v6srkgznpl9ch5snkgq7yvjqvd8c5mbnxa7cjgx"; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index 8ac1e137ca432..fd4cdbaf977d1 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -1,34 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl, testVersion, smartdns }: stdenv.mkDerivation rec { pname = "smartdns"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "sha256-5822qe3mdn4wPO8fHW5AsgMA7xbJnMjZn9DbiMU3GX0="; + sha256 = "sha256-sjrRPmTJRCUnMrA08M/VdYhL7/OfQY30/t1loLPSrlQ="; }; buildInputs = [ openssl ]; - # Force the systemd service file to be regenerated from it's template. This - # file is erroneously added in version 35 and it has already been deleted from - # upstream's git repository. So this "postPatch" phase can be deleted in next - # release. - postPatch = '' - rm -f systemd/smartdns.service - ''; - makeFlags = [ "PREFIX=${placeholder "out"}" "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}/lib/systemd/system" "RUNSTATEDIR=/run" + # by default it is the build time... weird... https://github.com/pymumu/smartdns/search?q=ver + "VER=${version}" ]; installFlags = [ "SYSCONFDIR=${placeholder "out"}/etc" ]; + passthru.tests = { + version = testVersion { package = smartdns; }; + }; + meta = with lib; { description = "A local DNS server to obtain the fastest website IP for the best Internet experience"; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index b2d577dab330e..b92fb23d64e58 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -8,6 +8,8 @@ , libsodium , protobufc , hiredis +, python ? null +, swig , dns-root-data , pkg-config , makeWrapper @@ -35,6 +37,7 @@ # Avoid .lib depending on lib.getLib openssl # The build gets a little hacky, so in some cases we disable this approach. , withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP +, withPythonModule ? false , libnghttp2 }: @@ -49,11 +52,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals withPythonModule [ swig ]; buildInputs = [ openssl nettle expat libevent ] ++ lib.optionals withSystemd [ pkg-config systemd ] - ++ lib.optionals withDoH [ libnghttp2 ]; + ++ lib.optionals withDoH [ libnghttp2 ] + ++ lib.optionals withPythonModule [ python ]; configureFlags = [ "--with-ssl=${openssl.dev}" @@ -69,6 +74,8 @@ stdenv.mkDerivation rec { "--disable-flto" ] ++ lib.optionals withSystemd [ "--enable-systemd" + ] ++ lib.optionals withPythonModule [ + "--with-pythonmodule" ] ++ lib.optionals withDoH [ "--with-libnghttp2=${libnghttp2.dev}" ] ++ lib.optionals withECS [ @@ -100,12 +107,21 @@ stdenv.mkDerivation rec { doCheck = true; + postPatch = lib.optionalString withPythonModule '' + substituteInPlace Makefile.in \ + --replace "\$(DESTDIR)\$(PYTHON_SITE_PKG)" "$out/${python.sitePackages}" + ''; + installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; postInstall = '' make unbound-event-install wrapProgram $out/bin/unbound-control-setup \ --prefix PATH : ${lib.makeBinPath [ openssl ]} + '' + lib.optionalString withPythonModule '' + wrapProgram $out/bin/unbound \ + --prefix PYTHONPATH : "$out/${python.sitePackages}" \ + --argv0 $out/bin/unbound ''; preFixup = lib.optionalString withSlimLib diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4510948b436be..4ad17072dc85d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -68,6 +68,17 @@ in lib.makeExtensible (self: { nix_2_7 = common { version = "2.7.0"; sha256 = "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24="; + patches = [ + # remove when there's a 2.7.1 release + # https://github.com/NixOS/nix/pull/6297 + # https://github.com/NixOS/nix/issues/6243 + # https://github.com/NixOS/nixpkgs/issues/163374 + (fetchpatch { + url = "https://github.com/NixOS/nix/commit/c9afca59e87afe7d716101e6a75565b4f4b631f7.patch"; + sha256 = "sha256-xz7QnWVCI12lX1+K/Zr9UpB93b10t1HS9y/5n5FYf8Q="; + }) + ]; + }; stable = self.nix_2_7; diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 4e59333ed79bd..cae4431ea65b4 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -24,13 +24,13 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "1.12.6"; + version = "1.13.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MXKER2ijU+2yPnsBFH0cu/hjHI4uNt++AqggH5rhnaU="; + sha256 = "sha256-5+bjjljmk3AHaDVjYzNuC7lkkvlpLa9/grKgdmERC7k="; }; # this patch allows us to run additional tests that invoke pdm, which checks @@ -41,19 +41,12 @@ buildPythonApplication rec { # doesn't appear to respect the settings in `$HOME`; possibly a bug upstream patches = [ ./check-update.patch - (fetchurl { - # Mark test that require network access - url = "https://github.com/pdm-project/pdm/files/7911962/mark-network-tests.patch.txt"; - hash = "sha256:1dizf9j3z7zk4lxvnszwx63xzd9r68f2iva5sszzf8s8na831dvd"; - }) ]; - postPatch = '' - substituteInPlace pyproject.toml --replace "pdm-pep517>=0.9,<0.10" "pdm-pep517" - ''; propagatedBuildInputs = [ blinker click + findpython installer packaging pdm-pep517 @@ -82,22 +75,19 @@ buildPythonApplication rec { "-m 'not network'" ]; - preCheck = "HOME=$TMPDIR"; + preCheck = '' + export HOME=$TMPDIR + ''; disabledTests = [ # sys.executable and expected executable are different "test_set_non_exist_python_path" # pythonfinder isn't aware of nix's python infrastructure "test_auto_isolate_site_packages" - "test_use_invalid_wrapper_python" "test_use_wrapper_python" - # tries to read/write files without proper permissions - "test_completion_command" - "test_plugin_add" - "test_plugin_list" - "test_plugin_remove" - # tries to treat a gzip file as a zipfile and fails - "test_resolve_local_artifacts" + "test_find_python_in_path" + # calls pip install and exits != 0 + "test_pre_and_post_hooks" ]; meta = with lib; { diff --git a/pkgs/tools/security/aeskeyfind/default.nix b/pkgs/tools/security/aeskeyfind/default.nix new file mode 100644 index 0000000000000..08b2481ff00da --- /dev/null +++ b/pkgs/tools/security/aeskeyfind/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "aeskeyfind"; + version = "1.0"; + + src = fetchurl { + url = "https://citpsite.s3.amazonaws.com/memory-content/src/aeskeyfind-${version}.tar.gz"; + sha256 = "sha256-FBflwbYehruVJ9sfW+4ZlaDuqCR12zy8iA4Ev3Bgg+Q="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp aeskeyfind $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Locates 128-bit and 256-bit AES keys in a captured memory image"; + homepage = "https://citp.princeton.edu/our-work/memory/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fedx-sudo ]; + }; + +} + diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix deleted file mode 100644 index 88002fc1ce436..0000000000000 --- a/pkgs/tools/security/aws-okta/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, libiconv }: - -buildGoPackage rec { - pname = "aws-okta"; - version = "1.0.11"; - - goPackagePath = "github.com/segmentio/aws-okta"; - - src = fetchFromGitHub { - owner = "segmentio"; - repo = "aws-okta"; - rev = "v${version}"; - sha256 = "sha256-1cprKpIFgM3+lUEHNvda34nJTH4Ch3LtTRq/Dp6QBQ8="; - }; - - tags = [ "release" ]; - - ldflags = [ "-X main.Version=${version}" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 libiconv ]; - - meta = with lib; { - description = "aws-vault like tool for Okta authentication"; - license = licenses.mit; - maintainers = with maintainers; [imalsogreg Chili-Man]; - homepage = "https://github.com/segmentio/aws-okta"; - downloadPage = "https://github.com/segmentio/aws-okta"; - }; -} diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 63d36e99032ec..d36a1fa8a4a68 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jAkTIO+tmb1vjS2eRWU9Fau7qzPCBlXJCk00iwNpULE="; + sha256 = "sha256-TyU5aznt3xra23Q52LUmvWlHYkw0s7E3Wqw9ppmzScw="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-E9zeRlPIIoXo/EfagHC3aDnW747SdsPiqIA384D7NQI="; + vendorSha256 = "sha256-WhixkCKW/vQ6J3vJp+KX0JmZxHN38nzzAi5TS2lF3CM="; subPackages = [ "cmd/cosign" diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index b0339846a67db..d9c17f935eda6 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "fprintd"; - version = "1.94.1"; + version = "1.94.2"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XHfHPffVp0jV3Md9Gui9v/nyOJ/bTWM3+hiR7WdEsgQ="; + sha256 = "sha256-ePhcIZyXoGr8XlBuzKjpibU9D/44iCXYBlpVR9gcswQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index cc436a16b5871..e11e76cc971b0 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -16,8 +16,6 @@ buildGoModule rec { vendorSha256 = "1isp2jd6k4ppns5zi9irj09090imnc0xp6vcps135ymgp8qg4163"; - doCheck = false; - meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; homepage = "https://github.com/OJ/gobuster"; diff --git a/pkgs/tools/security/vaultwarden/vault.nix b/pkgs/tools/security/vaultwarden/vault.nix index 5ec014de9593b..f37fbe12f1c62 100644 --- a/pkgs/tools/security/vaultwarden/vault.nix +++ b/pkgs/tools/security/vaultwarden/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vaultwarden-vault"; - version = "2.25.0"; + version = "2.27.0"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "sha256-0uxkHz/oHWl4MdzV7zRVKgkEqOkrl7Fd405TOf472gw="; + sha256 = "sha256-r4z45gjVB+RMZM0IE/ec0yf+rt4YDz5IpZEz5FlQSds="; }; buildCommand = '' diff --git a/pkgs/tools/security/whatweb/Gemfile b/pkgs/tools/security/whatweb/Gemfile new file mode 100644 index 0000000000000..a376a3baae36d --- /dev/null +++ b/pkgs/tools/security/whatweb/Gemfile @@ -0,0 +1,6 @@ +source 'https://rubygems.org' +gem 'ipaddr' +gem 'addressable' +gem 'json' +gem 'mongo' +gem 'rchardet' diff --git a/pkgs/tools/security/whatweb/Gemfile.lock b/pkgs/tools/security/whatweb/Gemfile.lock new file mode 100644 index 0000000000000..7bfd24112b1ac --- /dev/null +++ b/pkgs/tools/security/whatweb/Gemfile.lock @@ -0,0 +1,25 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + bson (4.14.1) + ipaddr (1.2.4) + json (2.6.1) + mongo (2.17.1) + bson (>= 4.8.2, < 5.0.0) + public_suffix (4.0.6) + rchardet (1.8.0) + +PLATFORMS + ruby + +DEPENDENCIES + addressable + ipaddr + json + mongo + rchardet + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/security/whatweb/default.nix b/pkgs/tools/security/whatweb/default.nix new file mode 100644 index 0000000000000..30d866da869af --- /dev/null +++ b/pkgs/tools/security/whatweb/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchFromGitHub, bundlerEnv, ruby }: + +let + gems = bundlerEnv { + name = "whatweb-env"; + inherit ruby; + gemdir = ./.; + }; + +in stdenv.mkDerivation rec { + pname = "whatweb"; + version = "0.5.5"; + + src = fetchFromGitHub { + owner = "urbanadventurer"; + repo = "whatweb"; + rev = "v${version}"; + sha256 = "sha256-HLF55x4C8n8aPO4SI0d6Z9wZe80krtUaGUFmMaYRBIE="; + }; + + prePatch = '' + substituteInPlace Makefile \ + --replace "/usr/local" "$out" \ + --replace "/usr" "$out" + ''; + + buildInputs = [ gems ]; + + installPhase = '' + runHook preInstall + + raw=$out/share/whatweb/whatweb + rm $out/bin/whatweb + cat << EOF >> $out/bin/whatweb + #!/bin/sh -e + exec ${gems}/bin/bundle exec ${ruby}/bin/ruby "$raw" "\$@" + EOF + chmod +x $out/bin/whatweb + + runHook postInstall + ''; + + meta = with lib; { + description = "Next generation web scanner"; + homepage = "https://github.com/urbanadventurer/whatweb"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/whatweb/gemset.nix b/pkgs/tools/security/whatweb/gemset.nix new file mode 100644 index 0000000000000..22d469b53e27d --- /dev/null +++ b/pkgs/tools/security/whatweb/gemset.nix @@ -0,0 +1,74 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + type = "gem"; + }; + version = "2.8.0"; + }; + bson = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03n3w96vpblaxvk1qk8hq7sbsmg4nv7qdkdr8f7nfvalgpakp5i5"; + type = "gem"; + }; + version = "4.14.1"; + }; + ipaddr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; + type = "gem"; + }; + version = "1.2.4"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; + type = "gem"; + }; + version = "2.6.1"; + }; + mongo = { + dependencies = ["bson"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19sihy8ihi3hmdg3gxbf4qvzmjnzx8xygg9534012j9z0wmhs7h1"; + type = "gem"; + }; + version = "2.17.1"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + rchardet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; + type = "gem"; + }; + version = "1.8.0"; + }; +} diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 3943a8f4eef86..1152e66bd8870 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -1,12 +1,18 @@ -{ lib, python3Packages }: +{ lib +, stdenv +, python3Packages +, nix-update-script +, s-tui +, testVersion +}: python3Packages.buildPythonPackage rec { pname = "s-tui"; - version = "1.0.1"; + version = "1.1.3"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1gqrb2xxii43j7kszy7kvv4f6hr8ac4p0m9q8i1xs5fhsqcx186i"; + sha256 = "sha256-t3h8d0yc7i3UvO8CVfBd3/3h3RfGN6yE6hutymOZUdA="; }; propagatedBuildInputs = with python3Packages; [ @@ -14,12 +20,16 @@ python3Packages.buildPythonPackage rec { psutil ]; - LC_ALL = "en_US.UTF-8"; + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + tests = testVersion { package = s-tui; }; + }; meta = with lib; { homepage = "https://amanusk.github.io/s-tui/"; description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; + broken = stdenv.isDarwin; # https://github.com/amanusk/s-tui/issues/49 }; } diff --git a/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch new file mode 100644 index 0000000000000..d41bada82def8 --- /dev/null +++ b/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch @@ -0,0 +1,177 @@ +From c52a5046e19718a43d48c9b3cfdc121d964e8c3b Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Fri, 28 Jan 2022 17:43:35 +0100 +Subject: [PATCH] Exclude all tests from the build + +For some reason it isn't sufficient to set `-DJPP_ENABLE_TESTS=OFF`. +Doing that because the tests on 2.0.0-rc3 don't seem to be working and +the vendored catch2 doesn't build with glibc 2.34. +--- + src/CMakeLists.txt | 3 +-- + src/core/CMakeLists.txt | 11 +---------- + src/core/analysis/CMakeLists.txt | 2 -- + src/core/codegen/CMakeLists.txt | 3 --- + src/core/spec/CMakeLists.txt | 2 -- + src/core/training/CMakeLists.txt | 2 -- + src/jumandic/CMakeLists.txt | 8 +------- + src/rnn/CMakeLists.txt | 5 +---- + src/util/CMakeLists.txt | 2 -- + 9 files changed, 4 insertions(+), 34 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 169dff5..64b6a07 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -67,7 +67,6 @@ function(jpp_feature_codegen) + endfunction(jpp_feature_codegen) + + add_subdirectory(util) +-add_subdirectory(testing) + add_subdirectory(core) + add_subdirectory(jumandic) +-add_subdirectory(rnn) +\ No newline at end of file ++add_subdirectory(rnn) +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index c63d134..01c825e 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -55,20 +55,11 @@ set(core_hdrs + ${core_hdrs} + ) + +-set(core_test_srcs +- ${core_test_srcs} +- ${core_tsrcs} +- test/test_analyzer_env.h +- ../testing/test_analyzer.h +- ) +- + add_library(jpp_core ${core_srcs} ${core_hdrs} ${libs3p_pegtl_headers}) +-jpp_test_executable(jpp_core_tests ${core_test_srcs}) + + target_include_directories(jpp_core PUBLIC ${jpp_core_cfg_dir}) + + target_link_libraries(jpp_core PUBLIC jpp_util jpp_rnn PRIVATE pathie) +-target_link_libraries(jpp_core_tests jpp_core jpp_core_train) + + if (${JPP_USE_PROTOBUF}) + target_include_directories(jpp_core PUBLIC ${Protobuf_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +@@ -78,4 +69,4 @@ endif() + add_subdirectory(benchmarks) + if (${JPP_ENABLE_DEV_TOOLS}) + add_subdirectory(devtools) +-endif () +\ No newline at end of file ++endif () +diff --git a/src/core/analysis/CMakeLists.txt b/src/core/analysis/CMakeLists.txt +index 526263e..1b32f8d 100644 +--- a/src/core/analysis/CMakeLists.txt ++++ b/src/core/analysis/CMakeLists.txt +@@ -79,5 +79,3 @@ jpp_core_files(core_hdrs + ) + + +-jpp_test_executable(jpp_core_analysis_tests ${core_analysis_tsrc}) +-target_link_libraries(jpp_core_analysis_tests jpp_core) +diff --git a/src/core/codegen/CMakeLists.txt b/src/core/codegen/CMakeLists.txt +index a905cee..fa759c7 100644 +--- a/src/core/codegen/CMakeLists.txt ++++ b/src/core/codegen/CMakeLists.txt +@@ -30,7 +30,4 @@ set(jpp_codegen_tsrcs + + add_library(jpp_core_codegen ${jpp_codegen_srcs} ${jpp_codegen_hdrs}) + +-jpp_test_executable(jpp_codegen_tests ${jpp_codegen_tsrcs}) +-target_include_directories(jpp_codegen_tests PRIVATE ${cgtest02_INCLUDE}) + target_link_libraries(jpp_core_codegen jpp_core) +-target_link_libraries(jpp_codegen_tests jpp_core_codegen) +\ No newline at end of file +diff --git a/src/core/spec/CMakeLists.txt b/src/core/spec/CMakeLists.txt +index f495d67..da827b9 100644 +--- a/src/core/spec/CMakeLists.txt ++++ b/src/core/spec/CMakeLists.txt +@@ -33,5 +33,3 @@ jpp_core_files(core_hdrs + + ) + +-jpp_test_executable(jpp_core_spec_tests ${core_spec_tsrc} ${libs3p_pegtl_headers}) +-target_link_libraries(jpp_core_spec_tests jpp_core) +\ No newline at end of file +diff --git a/src/core/training/CMakeLists.txt b/src/core/training/CMakeLists.txt +index 960437e..4ede9e1 100644 +--- a/src/core/training/CMakeLists.txt ++++ b/src/core/training/CMakeLists.txt +@@ -39,7 +39,5 @@ set(core_train_hdrs + + + add_library(jpp_core_train ${core_train_src} ${core_train_hdrs}) +-jpp_test_executable(jpp_core_train_tests ${core_train_tsrc}) + + target_link_libraries(jpp_core_train jpp_core) +-target_link_libraries(jpp_core_train_tests jpp_core_train) +\ No newline at end of file +diff --git a/src/jumandic/CMakeLists.txt b/src/jumandic/CMakeLists.txt +index bef3149..85a8b5d 100644 +--- a/src/jumandic/CMakeLists.txt ++++ b/src/jumandic/CMakeLists.txt +@@ -53,10 +53,6 @@ if (${JPP_USE_PROTOBUF}) + endif () + + +-jpp_test_executable(jpp_jumandic_tests ${jumandic_tests}) +-jpp_test_executable(jpp_bug_tests ${bug_test_sources}) +-target_include_directories(jpp_jumandic_tests PRIVATE ${jpp_jumandic_cg_INCLUDE}) +- + add_executable(jpp_jumandic_bootstrap main/bootstrap.cc) + add_executable(jumanpp_v2 main/jumanpp.cc) + add_executable(jumanpp_v2_train main/jumanpp_train.cc main/jumanpp_train.h) +@@ -64,11 +60,9 @@ add_executable(jpp_jumandic_pathdiff main/path_diff.cc) + target_include_directories(jpp_jumandic_pathdiff PRIVATE ${jpp_jumandic_cg_INCLUDE}) + + target_link_libraries(jpp_jumandic jpp_jumandic_spec) +-target_link_libraries(jpp_jumandic_tests jpp_jumandic jpp_core_train) +-target_link_libraries(jpp_bug_tests jpp_jumandic jpp_core_train) + target_link_libraries(jpp_jumandic_bootstrap jpp_jumandic) + target_link_libraries(jumanpp_v2 jpp_jumandic) + target_link_libraries(jumanpp_v2_train jpp_jumandic jpp_core_train) + target_link_libraries(jpp_jumandic_pathdiff jpp_jumandic) + +-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin) +\ No newline at end of file ++install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin) +diff --git a/src/rnn/CMakeLists.txt b/src/rnn/CMakeLists.txt +index 448ba51..ca09a00 100644 +--- a/src/rnn/CMakeLists.txt ++++ b/src/rnn/CMakeLists.txt +@@ -1,12 +1,9 @@ + set(jpp_rnn_sources mikolov_rnn.cc) + set(jpp_rnn_includes mikolov_rnn.h simple_rnn_impl.h mikolov_rnn_impl.h rnn_arg_parse.h) +-set(jpp_rnn_tests mikolov_rnn_test.cc) + + add_library(jpp_rnn ${jpp_rnn_sources} ${jpp_rnn_includes} ) + add_library(jumanpp_rnn_legacy legacy/rnnlmlib.h legacy/rnnlmlib_static.h legacy/rnnlmlib_static.cpp) + +-jpp_test_executable(jpp_rnn_tests ${jpp_rnn_tests}) + target_link_libraries(jpp_rnn jpp_util) +-target_link_libraries(jpp_rnn_tests jpp_rnn jumanpp_rnn_legacy) + +-target_link_libraries(jumanpp_rnn_legacy jpp_util) +\ No newline at end of file ++target_link_libraries(jumanpp_rnn_legacy jpp_util) +diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt +index 53b6c57..c4599d5 100644 +--- a/src/util/CMakeLists.txt ++++ b/src/util/CMakeLists.txt +@@ -25,8 +25,6 @@ endif() + + + add_library(jpp_util ${jpp_util_sources} ${jpp_util_headers} ${BACKWARD_headers}) +-jpp_test_executable(jpp_util_test ${jpp_util_test_srcs} ${jpp_util_headers}) +-target_link_libraries(jpp_util_test jpp_util) + target_link_libraries(jpp_util ${CMAKE_THREAD_LIBS_INIT}) + target_include_directories(jpp_util PUBLIC ${JPP_LIBS_DIR} ${JPP_SRC_DIR}) + target_compile_features(jpp_util PUBLIC +-- +2.33.1 + diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 5fb5ec88d6793..5bea259bccafc 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; }; + patches = [ ./0001-Exclude-all-tests-from-the-build.patch ]; + cmakeFlags = [ "-DJPP_ENABLE_TESTS=OFF" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 8230768e997a9..998ae80e306e8 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -11,13 +11,6 @@ let }; }); - changeVersionHash = overrideFunc: version: hash: overrideFunc (oldAttrs: rec { - inherit version; - src = oldAttrs.src.override { - inherit version hash; - }; - }); - localPython = python3.override { self = localPython; @@ -26,7 +19,15 @@ let botocore = changeVersion super.botocore.overridePythonAttrs "1.23.54" "sha256-S7m6FszO5fWiYCBJvD4ttoZTRrJVBmfzATvfM7CgHOs="; colorama = changeVersion super.colorama.overridePythonAttrs "0.4.3" "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9"; future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; - requests = changeVersionHash super.requests.overridePythonAttrs "2.26.0" "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; + requests = super.requests.overridePythonAttrs (oldAttrs: rec { + version = "2.26.0"; + checkInputs = oldAttrs.checkInputs ++ [ super.trustme ]; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; + }; + } + ); six = changeVersion super.six.overridePythonAttrs "1.14.0" "02lw67hprv57hyg3cfy02y3ixjk3nzwc0dx3c4ynlvkfwkfdnsr3"; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; |