diff options
Diffstat (limited to 'nixpkgs/pkgs/tools')
334 files changed, 3530 insertions, 3612 deletions
diff --git a/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix b/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix index 2d1ce4a4e33f..5bffa1077647 100644 --- a/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix +++ b/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "OpenTabletDriver"; - version = "0.5.3.2"; + version = "0.5.3.3"; src = fetchFromGitHub { owner = "InfinityGhost"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "qRc/9Edp3x7/XVEWgBbPush76MSQz4biYSk+E9Gt68w="; + sha256 = "k4SoOMKAwHeYSQ80M8Af1DiiDSZIi3gS7lGr2ZrXrEI="; }; debPkg = fetchurl { url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "14k06iyc642x42yadyfmmf8ky84y8rc6kgd63b4ipskkcxyl1gvl"; + sha256 = "0v03qiiz28k1yzgxf5qc1mdg2n7kjx6h8vpx9dxz342wwbgqg6ic"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix index 05936d1d1f3d..d751cb8f087a 100644 --- a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation { buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ]; installTargets = [ "install" "install.man" ]; makeFlags = [ - "BINDIR=$(out)/bin" - "XAPPLOADDIR=$(out)/etc/X11/app-defaults" - "MANPATH=$(out)/man" + "BINDIR=${placeholder "out"}/bin" + "CONFDIR=${placeholder "out"}/etc/X11" + "LIBDIR=${placeholder "out"}/lib/X11" + "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" + "MANPATH=${placeholder "out"}/man" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/admin/awscli/default.nix b/nixpkgs/pkgs/tools/admin/awscli/default.nix index 0d0d2ec80ffe..cf87652ab39e 100644 --- a/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.97"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.20.31"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-kecuyQMk4GWH9G0/f4Gi/hWtW4Zme9Q4i7XclcZTlNc="; + sha256 = "sha256-qDKnxh4M+LOXYp1xCvW0S0IE5NnwvFpYelUCCjA18zQ="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 0c5d08fd25c5..4206136ec6d6 100644 --- a/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -2,13 +2,21 @@ let py = python3.override { packageOverrides = self: super: { + awscrt = super.awscrt.overridePythonAttrs (oldAttrs: rec { + version = "0.11.24"; + src = self.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-uKpovKQEvwCFvgVw7/W1QtAffo48D5sIWav+XgcBYv8="; + }; + }); botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev138"; + version = "2.0.0dev147"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "5f1971d2d9d2cf7090a8b71650ab40712319bca3"; - sha256 = "sha256-onptN++MDJrit3sIEXCX9oRJ0qQ5xzmI6J2iABiK7RA"; + rev = "afa015418df6b3aeef0f5645e8704de64adea3d7"; + sha256 = "sha256-ypqDhCQXPqG8JCsLWt1V/4s95Hm+lClz+eOA2GnIhYg="; }; propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt]; }); @@ -25,13 +33,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.2.30"; # N.B: if you change this, change botocore to a matching version too + version = "2.2.39"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-OPxo5RjdDCTPntiJInUtgcU43Nn5JEUbwRJXeBl/yYQ"; + sha256 = "sha256-3GYj6+08J05Lu17jjydmzlypI5TUuV+5HA398oExkiU="; }; patches = [ @@ -43,12 +51,13 @@ with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "awscrt==0.11.24" "awscrt" \ --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" + --replace "s3transfer>=0.4.2,<0.5.0" "s3transfer" \ + --replace "wcwidth<0.2.0" "wcwidth" \ + --replace "distro>=1.5.0,<1.6.0" "distro" ''; checkInputs = [ jsonschema mock nose ]; diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index b93ab0e867b3..f2fec6fe6be7 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.26.1"; + version = "2.28.0"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-AwchP0o3I2T37dLPNw51wldwYUmcRuWptyzrhOocEaQ="; + sha256 = "sha256-fTt6tIcc96f8t3NUaR0RG0JQ+LPgqSHuJSmVx4a6X7M="; }; # put packages that needs to be overriden in the py package scope @@ -28,6 +28,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { substituteInPlace setup.py \ --replace "javaproperties==0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ + --replace "scp~=0.13.2" "scp" \ --replace "jsondiff==1.2.0" "jsondiff~=1.2" \ --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \ --replace "mock~=4.0" "mock" @@ -125,9 +126,11 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-storage-blob azure-synapse-accesscontrol azure-synapse-artifacts + azure-synapse-managedprivateendpoints azure-synapse-spark colorama cryptography + distro Fabric jsmin knack diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 2cde5a1da579..b50543dbe3d2 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -87,18 +87,19 @@ let postPatch = '' substituteInPlace setup.py \ --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \ + --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" ''; doCheck = stdenv.isLinux; - # ignore tests that does network call + # ignore tests that does network call, or assume powershell checkPhase = '' rm azure/{,cli/}__init__.py python -c 'import azure.common; print(azure.common)' PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \ --ignore=azure/cli/core/tests/test_profile.py \ --ignore=azure/cli/core/tests/test_generic_update.py \ - -k 'not metadata_url' + -k 'not metadata_url and not test_send_raw_requests and not test_format_styled_text_legacy_powershell' ''; pythonImportsCheck = [ @@ -135,14 +136,17 @@ let azure-appconfiguration = overrideAzureMgmtPackage super.azure-appconfiguration "1.1.1" "zip" "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; - azure-batch = overrideAzureMgmtPackage super.azure-batch "10.0.0" "zip" - "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0"; + azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip" + "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32da"; azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; - azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "15.0.0" "zip" - "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb"; + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "16.0.0" "zip" + "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; + + azure-mgmt-batchai = overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip" + "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f"; @@ -150,20 +154,20 @@ let azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.3.0" "zip" "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1"; - azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" - "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.0.0" "zip" + "75103fb4541aeae30bb687dee1fedd9ca65530e6b97b2d9ea87f74816905202a"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "8.1.0b4" "zip" - "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs="; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "9.1.0b1" "zip" + "sha256-O/6dE6lUnowYTWwQLWt3u1dwV4jBof+Jok0PUhFEEs0="; - azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "1.0.0" "zip" - "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rza"; + azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.0.0" "zip" + "sha256-p9MTfVxGD1CsLUQGHWCnC08nedTKhEt3QZtXJeZeCb4="; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.12.0" "zip" - "sha256-mrw1Gs3LMOPFiL5mSSrm+g1/dxihplA6ItYHbwljJbM="; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.14.0" "zip" + "sha256-sXGUQEO6tba3m1l+0Iir/eptTt+XRXyTr8FxbDzr6I0="; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "18.0.0" "zip" - "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "19.0.0" "zip" + "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.0.0" "zip" "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; @@ -171,23 +175,23 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "12.0.0" "zip" "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "21.0.0" "zip" - "sha256-kifDdVpwvDd9cONeH8bx+rEJ3YiXT9LHEphnzKoQ+BM="; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "22.1.0" "zip" + "sha256-Kq1BSEOu4PVEJ/iH91NsxRVdaFJyjUTf7vYzrFITX9w="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; - azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" - "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; + azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "8.0.0" "zip" + "7aeb380af71fc35a71d6752fa25eb5b95fdb2a0027fa32e6f50bce87e2622916"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.0.0" "zip" - "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.1.0" "zip" + "sha256-NlTIrOK4ho0OqcTHjHT1HobiMzDH2KY20TIlN0fm8/Q="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.4.0" "zip" "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b"; - azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip" - "sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; + azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" + "04090062bc1e8f00c2f45315a3bceb0fb3b3479ec1474d71b88342e13499b087"; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; @@ -198,11 +202,14 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.0.0" "zip" - "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.1.0" "zip" + "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; + + azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "0.3.0" "zip" + "sha256-0Bt3JfP2jFpv8CGEqb3ajHdYiK9mN43YMUkD0KRuMrk="; - azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip" - "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0b1" "zip" + "sha256-WEF5HuiaUTnka/2w0cVX/VwRt8/GD0+5fqGkn1BVx4I="; azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; @@ -216,14 +223,14 @@ let azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip" - "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "11.0.0" "zip" + "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d"; azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.0.0" "zip" "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8"; - azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "0.1.0" "zip" - "sha256-wSDiELthdo2ineJNKLgvjUKuJOUjlutlabSZcJ4i8AY="; + azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" + "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e"; azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; @@ -234,8 +241,8 @@ let azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; - azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "3.0.0" "zip" - "sha256-iUR3VyXFJTYU0ldXbYQe5or6NPVwsFwJJKf3Px2yiiQ="; + azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "7.0.0" "zip" + "sha256-tF6CpZTtkc1ap6XNXQHwOLesPPEiM+e6K+qqNHeQDo4="; azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; @@ -246,11 +253,11 @@ let azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "2.0.0" "zip" "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e"; - azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" - "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; + azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.0.0" "zip" + "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980"; - azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "7.0.0rc1" "zip" - "086wk31wsl8dx14qpd0g1bly8i9a8fix007djlj9cybva2f2bk6k"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "13.0.0" "zip" + "283f776afe329472c20490b1f2c21c66895058cb06fb941eccda42cc247217f1"; azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; @@ -258,23 +265,23 @@ let azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "8.0.0" "zip" "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e"; - azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip" - "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3"; + azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "1.0.0" "zip" + "ae1cff598dfe80e93406e524c55c3f2cbffced9f9b7a5577e3375008a4c3bcad"; azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.0.0b2" "zip" "sha256-FTxY8qoihHG4OZuKT3sRRlKfORbIoqDqug9Ko+6S9dw="; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.29.0" "zip" - "sha256-a8epWPoGI4SA01DkjToaHmTx8lSPgwMB7dutI/zaoAA="; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "3.0.1" "zip" + "129042cc011225e27aee6ef2697d585fa5722e5d1aeb0038af6ad2451a285457"; - azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" - "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; + azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b1" "zip" + "sha256-SrFTvU+67U3CpMLPZMawXuRdSIbTsfav2jFZIsZWPmw="; azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.0.0" "zip" "bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8"; - azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip" - "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; + azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "9.0.0" "zip" + "sha256-cDc9vrNad2ikc0G7O1cMVZGXvBujb8j4vxUTnkyLrXA="; azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; @@ -282,14 +289,14 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip" "186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.0.0" "zip" - "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.1.0" "zip" + "sha256-zTXoHEo8+BKt5L3PH3zPS1t4qAHvlnNAASpqyf5h3tI="; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip" "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.0.0" "zip" - "480eb5d1bb910da4e87a5d7047e2f3e426083b14911ac64c48badd0218e9e756"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.1.0" "zip" + "62efbb03275d920894d79879ad0ed59605163abd32177dcf24e90c1862ebccbd"; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; @@ -309,8 +316,8 @@ let azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "6.0.0" "zip" "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; - azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" - "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; + azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" + "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "8.0.0" "zip" "2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000"; @@ -367,6 +374,16 @@ let }; }); + azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs(oldAttrs: rec { + version = "0.3.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-fN1IuZ9fjxgRZv6qh9gg6v6KYpnKlXfnoLqfZCDXoRY="; + extension = "zip"; + }; + }); + azure-synapse-spark = super.azure-synapse-spark.overrideAttrs(oldAttrs: rec { version = "0.2.0"; src = super.fetchPypi { diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index d152ef128392..9dcdfef17e78 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.62.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-1WIkUXqcDagrAivozgLjXsiIUsVQ7mOp2ODivHEfNkQ="; + sha256 = "sha256-taKLOL3bdKFdLc6WbF7Q1vCqkRvv/X1NTvSSaYRYHyU="; }; - vendorSha256 = "sha256-AWNTjqEeSEoXO9wcpEXM3y1AeqQYlbswjr0kXvXqGjk="; + vendorSha256 = "sha256-AHkMFuL1zWnv6Z4kCnKsZdqZZaYsQ8AIDmMOLQ+HvkI="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 544ffcaf1ab3..f217408c28d0 100644 --- a/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.40.2"; + version = "1.42.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-J5Wid/Xq3wYY+2/RoFgdY5ZDdNQu8TkTF9W6YLvnwvM="; + sha256 = "sha256-t6/w998mTsFl/V/zcbVxokJk4VZWDoOXsjr93GW7Zh4="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix b/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix new file mode 100644 index 000000000000..c96c6c0ad090 --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "fits-cloudctl"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "fi-ts"; + repo = "cloudctl"; + rev = "v${version}"; + sha256 = "09v5fgqf4c2d6k2z638g29mcsmdisg3zfq1g7330wsd7yaxv9m23"; + }; + + vendorSha256 = "1rdqih04mlp33m69y9zxm4llx8cafwqhjhfxw873s8b35j0xz2m5"; + + meta = with lib; { + description = "Command-line client for FI-TS Finance Cloud Native services"; + homepage = "https://github.com/fi-ts/cloudctl"; + license = licenses.mit; + maintainers = with maintainers; [ j0xaf ]; + mainProgram = "cloudctl"; + }; +} diff --git a/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile new file mode 100644 index 000000000000..cc5420979ff5 --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'bolt' diff --git a/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock new file mode 100644 index 000000000000..4d5554b1173a --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock @@ -0,0 +1,176 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.6) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + aws-eventstream (1.1.1) + aws-partitions (1.493.0) + aws-sdk-core (3.119.1) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-ec2 (1.260.0) + aws-sdk-core (~> 3, >= 3.119.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.4) + aws-eventstream (~> 1, >= 1.0.2) + bindata (2.4.10) + bolt (3.17.0) + CFPropertyList (~> 2.2) + addressable (~> 2.5) + aws-sdk-ec2 (~> 1) + concurrent-ruby (~> 1.0) + ffi (>= 1.9.25, < 2.0.0) + hiera-eyaml (~> 3) + jwt (~> 2.2) + logging (~> 2.2) + minitar (~> 0.6) + net-scp (~> 1.2) + net-ssh (>= 4.0) + net-ssh-krb (~> 0.5) + orchestrator_client (~> 0.5) + puppet (>= 6.18.0) + puppet-resource_api (>= 1.8.1) + puppet-strings (~> 2.3) + puppetfile-resolver (~> 0.5) + r10k (~> 3.1) + ruby_smb (~> 1.0) + terminal-table (~> 1.8) + winrm (~> 2.0) + winrm-fs (~> 1.3) + builder (3.2.4) + colored2 (3.1.2) + concurrent-ruby (1.1.9) + connection_pool (2.2.5) + cri (2.15.10) + deep_merge (1.2.1) + erubi (1.10.0) + facter (4.2.3) + hocon (~> 1.3) + thor (>= 1.0.1, < 2.0) + faraday (0.17.4) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.14.0) + faraday (>= 0.7.4, < 1.0) + fast_gettext (1.1.2) + ffi (1.15.3) + gettext (3.2.9) + locale (>= 2.0.5) + text (>= 1.3.0) + gettext-setup (0.34) + fast_gettext (~> 1.1.0) + gettext (>= 3.0.2, < 3.3.0) + locale + gssapi (1.3.1) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) + hiera (3.7.0) + hiera-eyaml (3.2.2) + highline + optimist + highline (2.0.3) + hocon (1.3.1) + httpclient (2.8.3) + jmespath (1.4.0) + jwt (2.2.3) + little-plugger (1.1.4) + locale (2.1.3) + log4r (1.1.10) + logging (2.3.0) + little-plugger (~> 1.1) + multi_json (~> 1.14) + minitar (0.9) + molinillo (0.8.0) + multi_json (1.15.0) + multipart-post (2.1.1) + net-http-persistent (4.0.1) + connection_pool (~> 2.2) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (6.1.0) + net-ssh-krb (0.5.1) + gssapi (~> 1.3.0) + net-ssh (>= 2.0) + nori (2.6.0) + optimist (3.0.1) + orchestrator_client (0.5.2) + faraday + net-http-persistent + public_suffix (4.0.6) + puppet (7.10.0) + concurrent-ruby (~> 1.0) + deep_merge (~> 1.0) + facter (> 2.0.1, < 5) + fast_gettext (~> 1.1) + hiera (>= 3.2.1, < 4) + locale (~> 2.1) + multi_json (~> 1.10) + puppet-resource_api (~> 1.5) + scanf (~> 1.0) + semantic_puppet (~> 1.0) + puppet-resource_api (1.8.14) + hocon (>= 1.0) + puppet-strings (2.8.0) + rgen + yard (~> 0.9.5) + puppet_forge (2.3.4) + faraday (>= 0.9.0, < 0.18.0, != 0.13.1) + faraday_middleware (>= 0.9.0, < 0.15.0) + gettext-setup (~> 0.11) + minitar + semantic_puppet (~> 1.0) + puppetfile-resolver (0.5.0) + molinillo (~> 0.6) + semantic_puppet (~> 1.0) + r10k (3.11.0) + colored2 (= 3.1.2) + cri (= 2.15.10) + fast_gettext (~> 1.1.0) + gettext (>= 3.0.2, < 3.3.0) + gettext-setup (~> 0.24) + jwt (~> 2.2.3) + log4r (= 1.1.10) + multi_json (~> 1.10) + puppet_forge (~> 2.3.0) + rgen (0.8.2) + ruby_smb (1.1.0) + bindata + rubyntlm + windows_error + rubyntlm (0.6.3) + rubyzip (2.3.2) + scanf (1.0.0) + semantic_puppet (1.0.4) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + text (1.3.1) + thor (1.1.0) + unicode-display_width (1.7.0) + windows_error (0.1.2) + winrm (2.3.6) + builder (>= 2.1.2) + erubi (~> 1.8) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-fs (1.3.5) + erubi (~> 1.8) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 2.0) + winrm (~> 2.0) + yard (0.9.26) + +PLATFORMS + ruby + +DEPENDENCIES + bolt + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix new file mode 100644 index 000000000000..0ad9dc5ec87d --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix @@ -0,0 +1,13 @@ +{ bundlerApp, makeWrapper }: + +bundlerApp { + pname = "bolt"; + gemdir = ./.; + exes = [ "bolt" ]; + buildInputs = [ makeWrapper ]; + + postBuild = '' + # Set BOLT_GEM=1 to remove warning + wrapProgram $out/bin/bolt --set BOLT_GEM 1 + ''; +} diff --git a/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix new file mode 100644 index 000000000000..9ea6423f29d9 --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix @@ -0,0 +1,710 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + type = "gem"; + }; + version = "2.8.0"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3"; + type = "gem"; + }; + version = "1.1.1"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qq2fsccafv3lag6c86xai9nbiszfhzfdj9hla9iphjpa1wlfqcp"; + type = "gem"; + }; + version = "1.493.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l09wjfa3y38jc5njqcxmj4f6gra79adhxzmsym2cvcrazcv272w"; + type = "gem"; + }; + version = "3.119.1"; + }; + aws-sdk-ec2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07l9nsd9fk42qbc727s73qylrrbag6l1qig5xgcfqjh2m2qjb9b4"; + type = "gem"; + }; + version = "1.260.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cb9hsg0x9v4yk6sxif8968sg646qphmsjaqy9z8p7y3my5bkrf0"; + type = "gem"; + }; + version = "1.2.4"; + }; + bindata = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; + type = "gem"; + }; + version = "2.4.10"; + }; + bolt = { + dependencies = ["CFPropertyList" "addressable" "aws-sdk-ec2" "concurrent-ruby" "ffi" "hiera-eyaml" "jwt" "logging" "minitar" "net-scp" "net-ssh" "net-ssh-krb" "orchestrator_client" "puppet" "puppet-resource_api" "puppet-strings" "puppetfile-resolver" "r10k" "ruby_smb" "terminal-table" "winrm" "winrm-fs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zszklla2j1dh4w9drz03zn20ls5im4vji5wsvn6zbyaj2ivkdiq"; + type = "gem"; + }; + version = "3.17.0"; + }; + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + CFPropertyList = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid"; + type = "gem"; + }; + version = "2.3.6"; + }; + colored2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; + type = "gem"; + }; + version = "2.2.5"; + }; + cri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h45kw2s4bjwgbfsrncs30av0j4zjync3wmcc6lpdnzbcxs7yms2"; + type = "gem"; + }; + version = "2.15.10"; + }; + deep_merge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q3picw7zx1xdkybmrnhmk2hycxzaa0jv4gqrby1s90dy5n7fmsb"; + type = "gem"; + }; + version = "1.2.1"; + }; + erubi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + type = "gem"; + }; + version = "1.10.0"; + }; + facter = { + dependencies = ["hocon" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08n13ygl2fripg9a8wxf2p6qpv48dkmq079cbcpw3g351pq38gzk"; + type = "gem"; + }; + version = "4.2.3"; + }; + faraday = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "172dirvq89zk57rv42n00rhbc2qwv1w20w4zjm6zvfqz4rdpnrqi"; + type = "gem"; + }; + version = "0.17.4"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc"; + type = "gem"; + }; + version = "0.14.0"; + }; + fast_gettext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ci71w9jb979c379c7vzm88nc3k6lf68kbrsgw9nlx5g4hng0s78"; + type = "gem"; + }; + version = "1.1.2"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; + type = "gem"; + }; + version = "1.15.3"; + }; + gettext = { + dependencies = ["locale" "text"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; + type = "gem"; + }; + version = "3.2.9"; + }; + gettext-setup = { + dependencies = ["fast_gettext" "gettext" "locale"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vfnayz20xd8q0sz27816kvgia9z2dpj9fy7z15da239wmmnz7ga"; + type = "gem"; + }; + version = "0.34"; + }; + gssapi = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; + type = "gem"; + }; + version = "1.3.1"; + }; + gyoku = { + dependencies = ["builder"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; + type = "gem"; + }; + version = "1.3.1"; + }; + hiera = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g1bagbb4lvs334gpqyylvcrs7h6q2kn1h162dnvhzqa4rzxap8a"; + type = "gem"; + }; + version = "3.7.0"; + }; + hiera-eyaml = { + dependencies = ["highline" "optimist"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fqn73wdh0ar63f863bda3wj1ii5p8gc3vqzv39l2cwkax6vcqgj"; + type = "gem"; + }; + version = "3.2.2"; + }; + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + type = "gem"; + }; + version = "2.0.3"; + }; + hocon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mifv4vfvppfdpkd0cwgy634sj0aplz6ys84sp8s11qrnm6vlnmn"; + type = "gem"; + }; + version = "1.3.1"; + }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + type = "gem"; + }; + version = "1.4.0"; + }; + jwt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "036i5fc09275ms49mw43mh4i9pwaap778ra2pmx06ipzyyjl6bfs"; + type = "gem"; + }; + version = "2.2.3"; + }; + little-plugger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + locale = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn"; + type = "gem"; + }; + version = "2.1.3"; + }; + log4r = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ri90q0frfmigkirqv5ihyrj59xm8pq5zcmf156cbdv4r4l2jicv"; + type = "gem"; + }; + version = "1.1.10"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; + type = "gem"; + }; + version = "2.3.0"; + }; + minitar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13"; + type = "gem"; + }; + version = "0.9"; + }; + molinillo = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg"; + type = "gem"; + }; + version = "0.8.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; + net-http-persistent = { + dependencies = ["connection_pool"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yfypmfg1maf20yfd22zzng8k955iylz7iip0mgc9lazw36g8li7"; + type = "gem"; + }; + version = "4.0.1"; + }; + net-scp = { + dependencies = ["net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + type = "gem"; + }; + version = "1.2.1"; + }; + net-ssh = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; + type = "gem"; + }; + version = "6.1.0"; + }; + net-ssh-krb = { + dependencies = ["gssapi" "net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "120mns6drrapn8i63cbgxngjql4cyclv6asyrkgc87bv5prlh50c"; + type = "gem"; + }; + version = "0.5.1"; + }; + nori = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; + }; + optimist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + type = "gem"; + }; + version = "3.0.1"; + }; + orchestrator_client = { + dependencies = ["faraday" "net-http-persistent"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a0yd89bflsgn7apai7ar76h39jbk56pbhd86x68wnwfbib32nmc"; + type = "gem"; + }; + version = "0.5.2"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + puppet = { + dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "hiera" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bfqwz6jyx746sf06bh14blf1g2xh7lv5bqpradzpfkxgxcy9j2b"; + type = "gem"; + }; + version = "7.10.0"; + }; + puppet-resource_api = { + dependencies = ["hocon"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dchnnrrx0wd0pcrry5aaqwnbbgvp81g6f3brqhgvkc397kly3lj"; + type = "gem"; + }; + version = "1.8.14"; + }; + puppet-strings = { + dependencies = ["rgen" "yard"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pfxccfyl7i565x95kbaz574scrd5vrrlhx3x5kbcpalps9b06b1"; + type = "gem"; + }; + version = "2.8.0"; + }; + puppet_forge = { + dependencies = ["faraday" "faraday_middleware" "gettext-setup" "minitar" "semantic_puppet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jp9jczc11vxr6y57lxhxxd59vqa763h4qbsbjh1j0yhfagcv877"; + type = "gem"; + }; + version = "2.3.4"; + }; + puppetfile-resolver = { + dependencies = ["molinillo" "semantic_puppet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1npaafsafvi2mhcz76gycnshxwrrqq33fl2493v7grq6jw0bsann"; + type = "gem"; + }; + version = "0.5.0"; + }; + r10k = { + dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "jwt" "log4r" "multi_json" "puppet_forge"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004z9nhgc3w33snrcyjikhrw53nk5nprysq9l3dkssv79ygfw5dg"; + type = "gem"; + }; + version = "3.11.0"; + }; + rgen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "077kbdnn4cp6jks0w4xsybpiw2cc8y2c7hw7zx5dpf9cwzl7mq0p"; + type = "gem"; + }; + version = "0.8.2"; + }; + ruby_smb = { + dependencies = ["bindata" "rubyntlm" "windows_error"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "125pimmaskp13nkk5j138nfk1kd8n91sfdlx4dhj2j9zk342wsf4"; + type = "gem"; + }; + version = "1.1.0"; + }; + rubyntlm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + type = "gem"; + }; + version = "0.6.3"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + scanf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "000vxsci3zq8m1wl7mmppj7sarznrqlm6v2x2hdfmbxcwpvvfgak"; + type = "gem"; + }; + version = "1.0.0"; + }; + semantic_puppet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gg1bizlgb8wswxwy3irgppqvd6mlr27qsp0fzpm459wffzq10sx"; + type = "gem"; + }; + version = "1.0.4"; + }; + terminal-table = { + dependencies = ["unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; + text = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; + type = "gem"; + }; + version = "1.3.1"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + type = "gem"; + }; + version = "1.1.0"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + type = "gem"; + }; + version = "1.7.0"; + }; + windows_error = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kbcv9j5sc7pvjzf1dkp6h69i6lmj205zyy2arxcfgqg11bsz2kp"; + type = "gem"; + }; + version = "0.1.2"; + }; + winrm = { + dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + type = "gem"; + }; + version = "2.3.6"; + }; + winrm-fs = { + dependencies = ["erubi" "logging" "rubyzip" "winrm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; + type = "gem"; + }; + version = "1.3.5"; + }; + yard = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; + type = "gem"; + }; + version = "0.9.26"; + }; +} diff --git a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index d812cd4b294f..549b60c6dbeb 100644 --- a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.0"; + version = "1.7.3"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CO+2BpMIUSaOhdia75zDGR4RZQSaxY05Z6TOKxBlKIw="; + sha256 = "sha256-Hlh2nfqQD+HMoJ2n1vfffn5ieEKSMtXpdoM0ydFQqrc="; }; - vendorSha256 = "sha256-LOSHoEP0YRjfHav3MXSYPPrrjX6/ItxeVMOihRx0DTQ="; + vendorSha256 = "sha256-DTNwgerJ7qZxH4imdrST7TaR20oevDluEDgAlubg5hw="; subPackages = [ "cmd/stripe" diff --git a/nixpkgs/pkgs/tools/archivers/cpio/default.nix b/nixpkgs/pkgs/tools/archivers/cpio/default.nix index 5b88e10b1c37..5b57dc20e3bf 100644 --- a/nixpkgs/pkgs/tools/archivers/cpio/default.nix +++ b/nixpkgs/pkgs/tools/archivers/cpio/default.nix @@ -1,19 +1,32 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: -let +stdenv.mkDerivation rec { + pname = "cpio"; version = "2.13"; - name = "cpio-${version}"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://gnu/cpio/${name}.tar.bz2"; + url = "mirror://gnu/cpio/cpio-${version}.tar.bz2"; sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga"; }; - preConfigure = if stdenv.isCygwin then '' + patches = let + fp = suffix: rev: sha256: fetchpatch { + name = "CVE-2021-38185-${suffix}.patch"; + url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=${rev}"; + inherit sha256; + }; + in [ + (fp "1" "dd96882877721703e19272fe25034560b794061b" + "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32") + (fp "2" "dfc801c44a93bed7b3951905b188823d6a0432c8" + "1qkrhi3lbxk6hflp6w3h4sgssc0wblv8r0qgxqzbjrm36pqwxiwh") + (fp "3" "236684f6deb3178043fe72a8e2faca538fa2aae1" + "0pidkbxalpj5yz4fr95x8h0rizgjij0xgvjgirfkjk460giawwg6") + ]; + + preConfigure = lib.optionalString stdenv.isCygwin '' sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,' - '' else null; + ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/archivers/sharutils/default.nix b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix index c785211e682f..ec0f096915f1 100644 --- a/nixpkgs/pkgs/tools/archivers/sharutils/default.nix +++ b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext, coreutils }: stdenv.mkDerivation rec { - name = "sharutils-4.15.2"; + pname = "sharutils"; + version = "4.15.2"; src = fetchurl { - url = "mirror://gnu/sharutils/${name}.tar.xz"; + url = "mirror://gnu/sharutils/sharutils-${version}.tar.xz"; sha256 = "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b"; }; diff --git a/nixpkgs/pkgs/tools/archivers/unzip/default.nix b/nixpkgs/pkgs/tools/archivers/unzip/default.nix index e74637ca25ec..584f981aff70 100644 --- a/nixpkgs/pkgs/tools/archivers/unzip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unzip/default.nix @@ -3,11 +3,12 @@ , enableNLS ? false, libnatspec }: -stdenv.mkDerivation { - name = "unzip-6.0"; +stdenv.mkDerivation rec { + pname = "unzip"; + version = "6.0"; src = fetchurl { - url = "mirror://sourceforge/infozip/unzip60.tar.gz"; + url = "mirror://sourceforge/infozip/unzip${lib.replaceStrings ["."] [""] version}.tar.gz"; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; diff --git a/nixpkgs/pkgs/tools/archivers/zip/default.nix b/nixpkgs/pkgs/tools/archivers/zip/default.nix index 58c748fe4e8a..ab91cfc64834 100644 --- a/nixpkgs/pkgs/tools/archivers/zip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/zip/default.nix @@ -2,12 +2,13 @@ assert enableNLS -> libnatspec != null; -stdenv.mkDerivation { - name = "zip-3.0"; +stdenv.mkDerivation rec { + pname = "zip"; + version = "3.0"; src = fetchurl { urls = [ - "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz" + "ftp://ftp.info-zip.org/pub/infozip/src/zip${lib.replaceStrings ["."] [""] version}.tgz" "https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz" ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; diff --git a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 16c6e0fc8a07..073d61a3d4c0 100644 --- a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.06.27"; + version = "2021.09.15"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-tLKxs1p1CIU/2XV1fMgWrwdtePeXOBZUMjz46kgp9C0="; + sha256 = "sha256-BrEgvrAHNfJpFTlI8tec+9w3G+5YR15lbzh/RKKpQ1c="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/audio/dir2opus/default.nix b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix index d23c334ad62f..c9729fa43d87 100644 --- a/nixpkgs/pkgs/tools/audio/dir2opus/default.nix +++ b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, mutagen, wrapPython, opusTools, mpg123 }: +{ lib, stdenv, fetchFromGitHub, python, mutagen, wrapPython, opusTools, mpg123 }: let version = "0.12.2"; in stdenv.mkDerivation rec { @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { buildInputs = [ wrapPython ]; propagatedBuildInputs = [ opusTools mpg123 ]; - src = fetchurl { - url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz"; - name = "${pname}-${version}.tar.gz"; - sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d"; + src = fetchFromGitHub { + owner = "ehmry"; + repo = "dir2opus"; + rev = version; + hash = "sha256-ZEsXwqxikWxFOz99wTI3rEK/rEYA+BSWGrCwW4q+FFc="; }; postPatch = "sed -i -e 's|#!/usr/bin/python|#!${python}/bin/python|' dir2opus"; diff --git a/nixpkgs/pkgs/tools/audio/kaldi/default.nix b/nixpkgs/pkgs/tools/audio/kaldi/default.nix index 2d61a984a00d..ef725408b13e 100644 --- a/nixpkgs/pkgs/tools/audio/kaldi/default.nix +++ b/nixpkgs/pkgs/tools/audio/kaldi/default.nix @@ -54,6 +54,9 @@ stdenv.mkDerivation { # fix up this call: # https://github.com/kaldi-asr/kaldi/blob/c9d8b9ad3fef89237ba5517617d977b7d70a7ed5/cmake/VersionHelper.cmake#L8 echo 0 + elif [[ "$1" == "rev-parse" ]]; then + echo ${openfst.rev} + echo 0 fi true EOF diff --git a/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix index b90ab80befdc..71d823244fae 100644 --- a/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mpd-mpris"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "natsukagami"; repo = pname; rev = "v${version}"; - sha256 = "1kzjbv04b2garb99l64wdq8yksnm4pbhkgyzh89j5j3gb9k55zal"; + sha256 = "sha256-eI7/E5rhNCZfURwGkfa0f+Yie1EU8zR9r+1eAqrlmVY="; }; - vendorSha256 = "1ggrqwd3h602rav1dc3amsf4wxsq8mdq4ijkdsg759sqhpzl6rqs"; + vendorSha256 = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/audio/playerctl/default.nix b/nixpkgs/pkgs/tools/audio/playerctl/default.nix index 15ebb93e4e80..d9f408bf9eda 100644 --- a/nixpkgs/pkgs/tools/audio/playerctl/default.nix +++ b/nixpkgs/pkgs/tools/audio/playerctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "playerctl"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "00z5c6amlxd3q42l7x8i0ngl627dxglgg5vikbbhjp9ms34xbxdn"; + sha256 = "sha256-OiGKUnsKX0ihDRceZoNkcZcEAnz17h2j2QUOSVcxQEY="; }; nativeBuildInputs = [ meson ninja pkg-config gtk-doc docbook_xsl gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/audio/tts/default.nix b/nixpkgs/pkgs/tools/audio/tts/default.nix index 2f8a9ac82a67..d15a03bc83ee 100644 --- a/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -16,13 +16,13 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-hhL6/hBs2umR8/VEumr2LzuCAOkroK8vBfDuNVY0ygw="; + sha256 = "sha256-/CeetLm3jgS5Q69zTVkLm+Wh4nD7D4c6j9MTujMc3fU="; }; postPatch = '' @@ -69,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server # cython modules are not installed for some reasons ( - cd TTS/tts/layers/glow_tts/monotonic_align + cd TTS/tts/utils/monotonic_align ${python3.interpreter} setup.py install --prefix=$out ) ''; diff --git a/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix b/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix index 5ecdcc4e7edb..f103149a83d7 100644 --- a/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }: stdenv.mkDerivation rec { pname = "automysqlbackup"; - version = "3.0_rc6"; + version = "3.0.7"; - src = fetchurl { - url = "mirror://sourceforge/automysqlbackup/AutoMySQLBackup/AutoMySQLBackup%20VER%203.0/automysqlbackup-v${version}.tar.gz"; - sha256 = "1h1wq86q6my1a682nr8pjagjhai4lxz967m17lhpw1vb116hd7l8"; + src = fetchFromGitHub { + owner = "sixhop"; + repo = pname; + rev = version; + sha256 = "sha256-C0p1AY4yIxybQ6a/HsE3ZTHumtvQw5kKM51Ap+Se0ZI="; }; - sourceRoot = "."; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A script to run daily, weekly and monthly backups for your MySQL database"; - homepage = "https://sourceforge.net/projects/automysqlbackup/"; + homepage = "https://github.com/sixhop/AutoMySQLBackup"; platforms = platforms.linux; maintainers = [ maintainers.aanderse ]; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/backup/autorestic/default.nix b/nixpkgs/pkgs/tools/backup/autorestic/default.nix new file mode 100644 index 000000000000..ab299db1c675 --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/autorestic/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, installShellFiles, buildGoModule }: + +buildGoModule rec { + pname = "autorestic"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "cupcakearmy"; + repo = pname; + rev = "v${version}"; + sha256 = "yQgSJ0SQNWPMyrYn8rep+1b549HP8sOERh+kOiAK3+c="; + }; + + vendorSha256 = "7648gAguqeqLKFS9xRcx20wpSLb+ykZ7rOqR5PKe71o="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd autorestic \ + --bash <($out/bin/autorestic completion bash) \ + --fish <($out/bin/autorestic completion fish) \ + --zsh <($out/bin/autorestic completion zsh) + ''; + + meta = with lib; { + description = "High level CLI utility for restic"; + homepage = "https://github.com/cupcakearmy/autorestic"; + license = licenses.asl20; + maintainers = with maintainers; [ renesat ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/nixpkgs/pkgs/tools/backup/borgmatic/default.nix index b27ee0508e19..2fe7d0866745 100644 --- a/nixpkgs/pkgs/tools/backup/borgmatic/default.nix +++ b/nixpkgs/pkgs/tools/backup/borgmatic/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.5.13"; + version = "1.5.18"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "12390ffdg30ncc5k92pvagwbvnsh42xl35a3nagbskznyfd23mw3"; + sha256 = "sha256-dX1U1zza8zMhDiTLE+DgtN6RLRciLks4NDOukpKH/po="; }; checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ borgbackup colorama - pykwalify + jsonschema ruamel_yaml requests setuptools diff --git a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix index f861a9cfdfb0..7b34bccecb5c 100644 --- a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -3,7 +3,7 @@ (fetchNuGet { name = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) (fetchNuGet { name = "JsonExtensions"; version = "1.1.0"; sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.14"; sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.19"; sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) (fetchNuGet { name = "MiniRazor.CodeGen"; version = "2.1.4"; sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; }) (fetchNuGet { name = "MiniRazor.Runtime"; version = "2.1.4"; sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; }) diff --git a/nixpkgs/pkgs/tools/backup/rdedup/default.nix b/nixpkgs/pkgs/tools/backup/rdedup/default.nix index 482d1aec8da6..8f3cc71de1bc 100644 --- a/nixpkgs/pkgs/tools/backup/rdedup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdedup/default.nix @@ -4,20 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rdedup"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "dpc"; repo = "rdedup"; - rev = "rdedup-v${version}"; - sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7"; + rev = "v${version}"; + sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs="; }; - cargoSha256 = "1k0pl9i7zf1ki5ch2zxc1fqsf94bxjlvjrkh0500cycwqcdys296"; - - cargoPatches = [ - ./v3.1.1-fix-Cargo.lock.patch - ]; + cargoSha256 = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI="; nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ]; buildInputs = [ openssl libsodium xz ] diff --git a/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch b/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch deleted file mode 100644 index 7dafc7765b7d..000000000000 --- a/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 96be83a..fe07471 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -880,12 +880,12 @@ dependencies = [ - - [[package]] - name = "rdedup" --version = "3.1.0" -+version = "3.1.1" - dependencies = [ - "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "rdedup-lib 3.0.0", -+ "rdedup-lib 3.1.0", - "rpassword 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slog 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -900,7 +900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "rdedup-lib" --version = "3.0.0" -+version = "3.1.0" - dependencies = [ - "backblaze-b2 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix b/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix index 3ded8c6b8482..7a903288c671 100644 --- a/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix +++ b/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rsnapshot"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz"; - sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b"; + sha256 = "sha256-wct8t0jFqWVsOGNivfbCZ5WXN3JKu1Bfv56UCp2YhXk="; }; propagatedBuildInputs = [perl openssh rsync logger]; diff --git a/nixpkgs/pkgs/tools/backup/wal-e/default.nix b/nixpkgs/pkgs/tools/backup/wal-e/default.nix index 8e54b58e2017..544f61918de9 100644 --- a/nixpkgs/pkgs/tools/backup/wal-e/default.nix +++ b/nixpkgs/pkgs/tools/backup/wal-e/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python3Packages, lzop, postgresql, pv }: +{ lib, fetchFromGitHub, python3Packages, lzop, postgresql, pv }: python3Packages.buildPythonApplication rec { pname = "wal-e"; @@ -6,9 +6,11 @@ python3Packages.buildPythonApplication rec { namePrefix = ""; - src = fetchurl { - url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz"; - sha256 = "5TTd7NTO73+MCJf3dHIcNojjHdoaKJ1T051iW7Kt9Ow="; + src = fetchFromGitHub { + owner = "wal-e"; + repo = "wal-e"; + rev = "v${version}"; + hash = "sha256-I6suHkAYzDtlNFNPH4SziY93Ryp+NTHkCBuojDvv+U4="; }; # needs tox @@ -27,7 +29,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; homepage = "https://github.com/wal-e/wal-e"; - maintainers = []; + maintainers = [ ]; license = lib.licenses.bsd3; platforms = lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/backup/zbackup/default.nix b/nixpkgs/pkgs/tools/backup/zbackup/default.nix index 12913ed62225..795a45f8864d 100644 --- a/nixpkgs/pkgs/tools/backup/zbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/zbackup/default.nix @@ -1,13 +1,18 @@ -{ lib, stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : -stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind }: +stdenv.mkDerivation rec { pname = "zbackup"; version = "1.4.4"; - src = fetchurl { - url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz"; - sha256 = "11csla7n44lg7x6yqg9frb21vnkr8cvnh6ardibr3nj5l39crk7g"; + + src = fetchFromGitHub { + owner = "zbackup"; + repo = "zbackup"; + rev = version; + hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI="; }; + buildInputs = [ zlib openssl protobuf lzo libunwind ]; nativeBuildInputs = [ cmake protobufc ]; + meta = { description = "A versatile deduplicating backup tool"; homepage = "http://zbackup.org/"; diff --git a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix index 600967e996c0..c8dc645d69b4 100644 --- a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix +++ b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "1yjni0mr3rqrrk4ynwb8i0whpqhd56cck4mxd97qmxn7wbr826i9"; + sha256 = "0w6990ggns4xsdmgj3aq527q15frrxfmxwa3m6igabd4ai498n6x"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/compression/upx/default.nix b/nixpkgs/pkgs/tools/compression/upx/default.nix index 10e02626c017..aff00402ed97 100644 --- a/nixpkgs/pkgs/tools/compression/upx/default.nix +++ b/nixpkgs/pkgs/tools/compression/upx/default.nix @@ -8,15 +8,19 @@ stdenv.mkDerivation rec { sha256 = "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7"; }; - CXXFLAGS = "-Wno-unused-command-line-argument"; - buildInputs = [ ucl zlib perl ]; preConfigure = '' export UPX_UCLDIR=${ucl} ''; - makeFlags = [ "-C" "src" "CHECK_WHITESPACE=true" ]; + makeFlags = [ + "-C" "src" + "CHECK_WHITESPACE=true" + + # Disable blanket -Werror. Triggers failues on minor gcc-11 warnings. + "CXXFLAGS_WERROR=" + ]; installPhase = '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/tools/compression/xz/default.nix b/nixpkgs/pkgs/tools/compression/xz/default.nix index cc021a1ef051..8304c34af897 100644 --- a/nixpkgs/pkgs/tools/compression/xz/default.nix +++ b/nixpkgs/pkgs/tools/compression/xz/default.nix @@ -8,10 +8,11 @@ # files. stdenv.mkDerivation rec { - name = "xz-5.2.5"; + pname = "xz"; + version = "5.2.5"; src = fetchurl { - url = "https://tukaani.org/xz/${name}.tar.bz2"; + url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; }; diff --git a/nixpkgs/pkgs/tools/compression/zstd/default.nix b/nixpkgs/pkgs/tools/compression/zstd/default.nix index f87a144f7cc9..1f9b4a505ac4 100644 --- a/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep , fixDarwinDylibNames , file +, fetchpatch , legacySupport ? false , static ? stdenv.hostPlatform.isStatic # these need to be ran on the host, thus disable when cross-compiling @@ -27,6 +28,12 @@ stdenv.mkDerivation rec { # This patches makes sure we do not attempt to use the MD5 implementation # of the host platform when running the tests ./playtests-darwin.patch + + # Fixes linking for static builds + (fetchpatch { + url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; + sha256 = "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; + }) ]; postPatch = lib.optionalString (!static) '' diff --git a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix index ba6cb79fbd57..f6dfdd84d8c4 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, util-linux, bash }: +{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash }: stdenv.mkDerivation rec { pname = "bcache-tools"; version = "1.0.7"; - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz"; - sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; + src = fetchFromGitHub { + owner = "g2p"; + repo = "bcache-tools"; + rev = "v${version}"; + hash = "sha256-Ors2xXRrVTf8Cq3BYnSVSfJy/nyGjT5BGLSNpxOcHR4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 158c7d593992..bdd26041d33a 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.13"; + version = "5.14.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-Tikh0iA9Jl4qlBu9brB37dXjmBHi1p6MEbLwPc9eWEM="; + sha256 = "sha256-1UqTRlRcpG3xKOPMt31gwJfZDJO34xSZAjbijPr4xVs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix index 2deeeb2fc09e..b945198e01aa 100644 --- a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "1r30345wzpg8yk542fmgh3khdb91s4sr9hnqxh1s71ifjsrgmpph"; + sha256 = "12928pvwd6jr4x81nxi5691axianm4vz5gql1jazlij0ahc2f905"; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index 59b65d4e72ed..8cb9d58bc4ea 100644 --- a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -2,6 +2,8 @@ , stdenv , buildGoModule , fetchFromGitHub +, fuse +, makeWrapper , openssl , pandoc , pkg-config @@ -22,6 +24,7 @@ buildGoModule rec { vendorSha256 = "sha256-Q/oBT5xdLpgQCIk7KES6c8+BaCQVUIwCwVufl4oTFRs="; nativeBuildInputs = [ + makeWrapper pkg-config pandoc ]; @@ -48,6 +51,12 @@ buildGoModule rec { popd ''; + postInstall = '' + wrapProgram $out/bin/gocryptfs \ + --prefix PATH : ${lib.makeBinPath [ fuse ]} + ln -s $out/bin/gocryptfs $out/bin/mount.fuse.gocryptfs + ''; + meta = with lib; { description = "Encrypted overlay filesystem written in Go"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index dc1d77bfa7ed..898ba9ed3c15 100644 --- a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.115"; + version = "3.0.116"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq"; + sha256 = "sha256-/+l4BURvL1R6te6tlXRJx7YBDyYuMrGnzzhMc9XeXKc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix index f833d562972a..cef1af964b02 100644 --- a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "reiser4progs"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-WmIkISnRp5BngSfPEKY95HVEt5TBtPKu+RMBwlLsnuA="; + sha256 = "sha256-DBR2C5h6ue4aqHmDG50jCLXe13DSWAYwfibrzTM+7Sw="; }; buildInputs = [libaal]; diff --git a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix index b196b2948395..35d0b7af0736 100644 --- a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { - sha256 = "sha256-67sVT72i8tOMdGH/+Oh1N7Vh/2/qD56ImGWI+tprMOM="; + sha256 = "sha256-b64EEES7gO9s24hk3sZMd9guEhJNfc3DV4/NnBIcJYw="; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix index 238223c4981e..017fda14cc65 100644 --- a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; postPatch = '' + # Drop blanket -Werror to avoid build failure on fresh toolchains + # like gcc-11. + substituteInPlace squashfs-tools/Makefile --replace ' -Werror' ' ' cd squashfs-tools ''; diff --git a/nixpkgs/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch b/nixpkgs/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch new file mode 100644 index 000000000000..70c941ddd125 --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch @@ -0,0 +1,27 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "adler32" + version = "1.2.0" +@@ -530,13 +532,13 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "lexical-core" +-version = "0.7.4" ++version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" ++checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" + dependencies = [ + "arrayvec", + "bitflags 1.2.1", +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "ryu", + "static_assertions", + ] diff --git a/nixpkgs/pkgs/tools/filesystems/supertag/default.nix b/nixpkgs/pkgs/tools/filesystems/supertag/default.nix index a9a16582c115..4e7cb8beae57 100644 --- a/nixpkgs/pkgs/tools/filesystems/supertag/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/supertag/default.nix @@ -14,7 +14,11 @@ rustPlatform.buildRustPackage rec { sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam"; }; - cargoSha256 = "093vrpp4in8854hb0h1lxrp8v6i9vfja0l69dnnp7z15qkpbir4f"; + # lexical-core is outdated and incompatible with newer versions of rust + # patches Cargo.lock to include a more up-to-date version of lexical-core + cargoPatches = [ ./cargo-lock-update-lexical-core.patch ]; + + cargoSha256 = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ="; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix b/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix index cd042f701d3a..41a47566eec5 100644 --- a/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.8.21"; + version = "0.8.22"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-oYCL6agif/BklMY5/ub6PExS6D/ZlTxi1QaabMOsEfw="; + sha256 = "sha256-z8w/xzNEebnQJTO4H5PlU5W+69MY1wQwmuz5inXBl1k="; }; sourceRoot = "source/cmd/tar2ext4"; diff --git a/nixpkgs/pkgs/tools/games/ajour/default.nix b/nixpkgs/pkgs/tools/games/ajour/default.nix index fad140d7456a..ed75e347db0b 100644 --- a/nixpkgs/pkgs/tools/games/ajour/default.nix +++ b/nixpkgs/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-nz54KPvPmrFGXB52Jn6LKl1aSYgLngARcfC7YIAaC70="; + sha256 = "sha256-tUm5d2JTvYyNFnKgId8mivWTB+v4TURZX293fMd11pk="; }; - cargoSha256 = "sha256-nsuo8PdQpdVJcDY8VDCLISnOz5+Z+MqG/OJC3FYCfEo="; + cargoSha256 = "sha256-SPmfXJLIA4OGEm/S2mi5xmIE9ng7hY3aHm/PCT7pg0E="; nativeBuildInputs = [ autoPatchelfHook diff --git a/nixpkgs/pkgs/tools/games/steam-acf/default.nix b/nixpkgs/pkgs/tools/games/steam-acf/default.nix new file mode 100644 index 000000000000..ea6572216104 --- /dev/null +++ b/nixpkgs/pkgs/tools/games/steam-acf/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "steam-acf"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "chisui"; + repo = "acf"; + rev = "v${version}"; + sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2"; + }; + + cargoSha256 = "0fzlvn0sl7613hpsb7ncykmcl53dgl8rzsg317nwkj2w679q4xq6"; + + meta = with lib; { + description = "Tool to convert Steam .acf files to JSON"; + homepage = "https://github.com/chisui/acf"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ chisui ]; + mainProgram = "acf"; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix index a4117790a148..ceca22eca35d 100644 --- a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix +++ b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix @@ -4,24 +4,22 @@ stdenv.mkDerivation rec { pname = "argyllcms"; - version = "2.2.0"; + version = "2.2.1"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "sha256-EcVwYJfJbWWXl58O3ulsrWgUYTgR4uWdMgb0Z140Pu4="; + sha256 = "sha256-umY3wQfG26Okqnw+MCUnlwWTAyJ6MR/FHe5oe61KBh0="; }; - patches = [ ./gcc5.patch ]; - # The contents of this file comes from the Jamtop file from the # root of the ArgyllCMS distribution, rewritten to pick up Nixpkgs # library paths. When ArgyllCMS is updated, make sure that changes # in that file is reflected here. jamTop = writeText "argyllcms_jamtop" '' DESTDIR = "/" ; - REFSUBDIR = "ref" ; + REFSUBDIR = "share/argyllcms" ; # Keep this DESTDIR anchored to Jamtop. PREFIX is used literally ANCHORED_PATH_VARS = DESTDIR ; @@ -41,11 +39,21 @@ stdenv.mkDerivation rec { # enable dummy Demo Instrument (only if code is available) USE_DEMOINST = true ; + # enable Video Test Patch Generator and 3DLUT device support + # (V2.0.0 and above) + USE_VTPGLUT = false ; + + # enable Printer device support + USE_PRINTER = false ; + + # enable CMF Measurement device and accessory support (if present) + USE_CMFM = false ; + # Use ArgyllCMS version of libusb (deprecated - don't use) USE_LIBUSB = false ; - # For testing CCast - DEFINES += CCTEST_PATTERN ; + # Compile in graph plotting code (Not fully implemented) + USE_PLOT = true ; # [true] JPEGLIB = ; JPEGINC = ; @@ -97,16 +105,11 @@ stdenv.mkDerivation rec { # Install udev rules, but remove lines that set up the udev-acl # stuff, since that is handled by udev's own rules (70-udev-acl.rules) - # - # Move ref to a better place (there must be a way to make the install target - # do that for us) postInstall = '' rm -v $out/bin/License.txt mkdir -p $out/etc/udev/rules.d sed -i '/udev-acl/d' usb/55-Argyll.rules cp -v usb/55-Argyll.rules $out/etc/udev/rules.d/ - mkdir -p $out/share/ - mv $out/ref $out/share/argyllcms ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/graphics/argyllcms/gcc5.patch b/nixpkgs/pkgs/tools/graphics/argyllcms/gcc5.patch deleted file mode 100644 index 28067455c33e..000000000000 --- a/nixpkgs/pkgs/tools/graphics/argyllcms/gcc5.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix FTBFS with GCC 5 -Author: James Cowgill <james410@cowgill.org.uk> -Bug-Debian: https://bugs.debian.org/777779 -Forwarded: no ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/icc/icc.h -+++ b/icc/icc.h -@@ -100,7 +100,11 @@ - #define CF64PREC "LL" /* Constant precision specifier */ - - #ifndef ATTRIBUTE_NORETURN -+#ifdef _MSC_VER - # define ATTRIBUTE_NORETURN __declspec(noreturn) -+#else -+# define ATTRIBUTE_NORETURN __attribute__((noreturn)) -+#endif - #endif - - #else /* !__STDC_VERSION__ */ diff --git a/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix b/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix index c04862610b69..ea5008dcf5cb 100644 --- a/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix +++ b/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: +{ lib, stdenv, fetchFromGitHub, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation rec { pname = "jbig2enc"; version = "0.28"; - src = fetchurl { - url = "https://github.com/agl/jbig2enc/archive/${version}-dist.tar.gz"; - sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; + src = fetchFromGitHub { + owner = "agl"; + repo = "jbig2enc"; + rev = "${version}-dist"; + hash = "sha256-Y3IVTjvO5tqn/O076y/llnTyenKpbx1WyT/JFZ/s0VY="; }; propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; diff --git a/nixpkgs/pkgs/tools/graphics/resvg/default.nix b/nixpkgs/pkgs/tools/graphics/resvg/default.nix index ce03561badf8..54f3152ebec0 100644 --- a/nixpkgs/pkgs/tools/graphics/resvg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A54KTToi69l0/Nrz4K8EqFpCodbomYUI/zTP++Y4FF0="; + sha256 = "sha256-/r1rTU+te8pKKiPGCHJTTBkg9RZ/N1yFTlaDAhWWxjs="; }; - cargoSha256 = "sha256-RbgLZvNZSNjYImVm8Ax5cAL3R0XqlVz5ApPYKj93GEE="; + cargoSha256 = "sha256-pHZRKXZo5fyyXjgNTDBZjRiMDOaoCfFUSl53yE2t210="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix b/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix new file mode 100644 index 000000000000..1c3eb7c18cde --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix @@ -0,0 +1,35 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, nasm }: + +rustPlatform.buildRustPackage rec { + pname = "sic-image-cli"; + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "foresterre"; + repo = "sic"; + rev = "v${version}"; + sha256 = "11km8ngndmzp6sxyfnbll80nigi790s353v7j31jvqcgyn9gjdq9"; + }; + + cargoSha256 = "sha256-mHfQ36Xo37VRRq0y0xvUYy0MAlrfnOfMy1t3IZFdrE8="; + + nativeBuildInputs = [ installShellFiles nasm ]; + + postBuild = '' + cargo run --example gen_completions + ''; + + postInstall = '' + installShellCompletion sic.{bash,fish} + installShellCompletion --zsh _sic + ''; + + meta = with lib; { + description = "Accessible image processing and conversion from the terminal"; + homepage = "https://github.com/foresterre/sic-image-cli"; + changelog = "https://github.com/foresterre/sic/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "sic"; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix index 389f6415e9be..2e3740dabb7c 100644 --- a/nixpkgs/pkgs/tools/graphics/svgbob/default.nix +++ b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.5.4"; + version = "0.6.2"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "0qq7hkg32bqyw3vz3ibip7yrjg5m2ch9kdnwqrzaqqy9wb8d7154"; + sha256 = "sha256-9JASoUN/VzZS8ihepTQL2SXZitxKBMSJEv+13vzQd3w="; }; - cargoSha256 = "0p37qkgh1xpqmkr2p88njwhifpyqfh27qcwmmhwxdqcpzmmmkjhr"; + cargoSha256 = "sha256-pkdiow+9gsQ9rrSHwukd17r5CfsaJgYj6KA4wYKbtA0="; meta = with lib; { description = "Convert your ascii diagram scribbles into happy little SVG"; diff --git a/nixpkgs/pkgs/tools/graphics/xcolor/default.nix b/nixpkgs/pkgs/tools/graphics/xcolor/default.nix index 95f21efe1ad9..707e9a95a127 100644 --- a/nixpkgs/pkgs/tools/graphics/xcolor/default.nix +++ b/nixpkgs/pkgs/tools/graphics/xcolor/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "xcolor"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Soft"; repo = pname; rev = version; - sha256 = "0i04jwvjasrypnsfwdnvsvcygp8ckf1a5sxvjxaivy73cdvy34vk"; + sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE="; }; - cargoSha256 = "1r2s4iy5ls0svw5ww51m37jhrbvnj690ig6n9c60hzw1hl4krk30"; + cargoSha256 = "sha256-Zh73+FJ63SkusSavCqSCLbHVnU++4ZFSMFUIM7TnOj0="; nativeBuildInputs = [ pkg-config python3 installShellFiles copyDesktopItems ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/kime/default.nix b/nixpkgs/pkgs/tools/inputmethods/kime/default.nix index 8566143f6807..6cac37da7db2 100644 --- a/nixpkgs/pkgs/tools/inputmethods/kime/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/kime/default.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation rec { pname = "kime"; - version = "2.5.3"; + version = "2.5.5"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "1kjw22hy2x90dc7xfm252v1pdr9x13mpm92rcgfy8zbkiqq242bl"; + sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "05kb9vnifaw01qw5cmdh4wzcf50szb0y00085wx41m8h4f28hfbk"; + sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4="; }; # Replace autostart path diff --git a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix index d2bd7a14663b..69d05ceaed1e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,26 +1,67 @@ -{ lib, stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: +{ stdenv, lib +, fetchFromGitHub +, fetchpatch +, systemd +, libinput +, pugixml +, cairo +, xorg +, gtk3-x11 +, pcre +, pkg-config +, cmake +, pantheon +, withPantheon ? false +}: stdenv.mkDerivation rec { pname = "touchegg"; - version = "1.1.1"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${pname}-${version}.tar.gz"; - sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; + version = "2.0.11"; + src = fetchFromGitHub { + owner = "JoseExposito"; + repo = pname; + rev = version; + sha256 = "1zfiqs5vqlb6drnqx9nsmhgy8qc6svzr8zyjkqvwkpbgrc6ifap9"; }; - buildInputs = [ xorgserver libGLU libGL xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ + systemd + libinput + pugixml + cairo + gtk3-x11 + pcre + ] ++ (with xorg; [ + libX11 + libXtst + libXrandr + libXi + libXdmcp + libpthreadstubs + libxcb + ]); - preConfigure = '' - sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro) - sed -e "s@/usr/@$out/@g" -i $(find ./src/touchegg/config/ -name Config.cpp) - ''; + nativeBuildInputs = [ + pkg-config + cmake + ]; - meta = { + patches = lib.optionals withPantheon [ + # Disable per-application gesture by default to make sure the default + # config does not conflict with Pantheon switchboard settings. + (fetchpatch { + url = "https://github.com/elementary/os-patches/commit/ada4e726540a2bb57b606c98e2531cfaaea57211.patch"; + sha256 = "0is9acwvgiqdhbiw11i3nq0rp0zldcza779fbj8k78cp329rbqb4"; + }) + ]; + + meta = with lib; { homepage = "https://github.com/JoseExposito/touchegg"; - description = "Macro binding for touch surfaces"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + description = "Linux multi-touch gesture recognizer"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/tools/misc/apparix/default.nix b/nixpkgs/pkgs/tools/misc/apparix/default.nix index 8e682aefcc39..1c78a7854256 100644 --- a/nixpkgs/pkgs/tools/misc/apparix/default.nix +++ b/nixpkgs/pkgs/tools/misc/apparix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apparix-11-062"; + pname = "apparix"; + version = "11-062"; src = fetchurl { - url = "https://micans.org/apparix/src/${name}.tar.gz"; + url = "https://micans.org/apparix/src/apparix-${version}.tar.gz"; sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235"; }; diff --git a/nixpkgs/pkgs/tools/misc/apt-offline/default.nix b/nixpkgs/pkgs/tools/misc/apt-offline/default.nix index 3dc3fa1bbe24..d59134a033b7 100644 --- a/nixpkgs/pkgs/tools/misc/apt-offline/default.nix +++ b/nixpkgs/pkgs/tools/misc/apt-offline/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "apt-offline"; - version = "unstable-2021-04-11"; + version = "unstable-2021-07-25"; src = fetchFromGitHub { owner = "rickysarraf"; repo = pname; - rev = "4e4b3281d004d1ece4833b7680e2b5b091402a03"; - sha256 = "1lk4186h2wc8fphd592rhq7yj4kgc7jjawx4pjrs6pg4n0q32pl6"; + rev = "7cfa5fc2736be2c832d0ddfa9255175a1f33158d"; + sha256 = "xX2wcvqoPdgqBAWvQmSd//YWMC4pPmrq0vQjhDUKwEA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix b/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix index 0b6984526e4b..0df8ae1e7337 100644 --- a/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix +++ b/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix @@ -52,6 +52,18 @@ resholvePackage rec { # packages resholve should resolve executables from inputs = [ coreutils gawk util-linux ]; + + # TODO: no good way to resolve mount/umount in Nix builds for now + # see https://github.com/abathur/resholve/issues/29 + fake = { + external = [ "mount" "umount" ]; + }; + + # TODO: remove the execer lore override below after + # https://github.com/abathur/binlore/issues/1 + execer = [ + "cannot:${util-linux}/bin/unshare" + ]; }; }; diff --git a/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix b/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix index 7e60d4988424..9b03e2dd1bdb 100644 --- a/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "aws-mturk-clt-1.3.0"; + pname = "aws-mturk-clt"; + version = "1.3.0"; src = fetchurl { - url = "https://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; + url = "https://mturk.s3.amazonaws.com/CLTSource/aws-mturk-clt-${version}.tar.gz"; sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3"; }; diff --git a/nixpkgs/pkgs/tools/misc/bfr/default.nix b/nixpkgs/pkgs/tools/misc/bfr/default.nix index 80ec398ef8c7..7bda1d92afbe 100644 --- a/nixpkgs/pkgs/tools/misc/bfr/default.nix +++ b/nixpkgs/pkgs/tools/misc/bfr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "bfr-1.6"; + pname = "bfr"; version = "1.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix index 30a17bf188a6..0446a58efbc4 100644 --- a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix +++ b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix @@ -1,9 +1,11 @@ {fetchurl, lib, stdenv, flex, db}: stdenv.mkDerivation rec { - name = "bogofilter-1.2.4"; + pname = "bogofilter"; + version = "1.2.4"; + src = fetchurl { - url = "mirror://sourceforge/bogofilter/${name}.tar.bz2"; + url = "mirror://sourceforge/bogofilter/bogofilter-${version}.tar.bz2"; sha256 = "1d56n2m9inm8gnzm88aa27xl2a7sp7aff3484vmflpqkinjqf0p1"; }; diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index fd08f09b9607..094b9453358a 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.42"; + version = "3.2.43"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-NbtgtbhauEo7EGvNUNltUQRBpLlzBjAR0GLL9CadgsQ="; + sha256 = "sha256-68mt+bkdEBUODvyf3hh09snL+ecMfmSqNlVleOOJ2K8="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/tools/misc/ccze/default.nix b/nixpkgs/pkgs/tools/misc/ccze/default.nix index af37d7a33c1a..348cbb1f529c 100644 --- a/nixpkgs/pkgs/tools/misc/ccze/default.nix +++ b/nixpkgs/pkgs/tools/misc/ccze/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoconf, ncurses, pcre }: stdenv.mkDerivation rec { - name = "ccze-0.2.1-2"; + pname = "ccze"; + version = "0.2.1-2"; src = fetchurl { - url = "https://github.com/madhouse/ccze/archive/${name}.tar.gz"; + url = "https://github.com/madhouse/ccze/archive/ccze-${version}.tar.gz"; sha256 = "1amavfvyls4v0gnikk43n2rpciaspxifgrmvi99qj6imv3mfg66n"; }; diff --git a/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix b/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix index 249e814fd303..a3f5c7b076c2 100644 --- a/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix +++ b/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cicero-tui"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "eyeplum"; repo = "cicero-tui"; rev = "v${version}"; - sha256 = "sha256-j/AIuNE5WBNdUeXuKvvc4NqsVVk252tm4KR3w0e6bT8="; + sha256 = "sha256-5/yH5ZK/JgMsRUcJ0qQEShEqxrtKJa+P6pcHAn5Jx0c="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "sha256-yup6hluGF2x+0XDwK+JETyNu4TFNPmqD4Y0Wthxrbcc="; + cargoSha256 = "sha256-AraisWGTPEj+tHcLonEwfevBu+mMTPkq3O9zNYgI9X8="; meta = with lib; { description = "Unicode tool with a terminal user interface"; diff --git a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix index 6f5a6ec25fbb..f1f7d1bf2392 100644 --- a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,27 +1,24 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.13"; + version = "1.25.0"; - goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; - - subPackages = [ "cmd/cloud_sql_proxy" ]; - - src = fetchgit { - rev = version; - url = "https://${goPackagePath}"; - sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532"; + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "cloudsql-proxy"; + rev = "v${version}"; + sha256 = "0vz5fm1bgh2g7b320hchpfb4iql1src1rpm7324sqcd26p7w3mnl"; }; - goDeps = ./deps.nix; + subPackages = [ "cmd/cloud_sql_proxy" ]; - ldflags = [ "-X main.versionString=${version}" ]; + vendorSha256 = "04y6zx3jdyj07d68a4vk4p5rzvvjnvdwk9kkipmlmqg1xqwlb84m"; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; - homepage = "https://${goPackagePath}"; + homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; license = licenses.asl20; - maintainers = [ maintainers.nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/deps.nix deleted file mode 100644 index 6898833b6f12..000000000000 --- a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e"; - sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk"; - }; - } - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "dba8c2c195294739180b3e6865f8893eb808676e"; - sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344"; - sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8"; - sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "39567f0042a03aeb2691599961ed4454e43d5063"; - sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/misc/convbin/default.nix b/nixpkgs/pkgs/tools/misc/convbin/default.nix index 7405535edd43..e350092a0e36 100644 --- a/nixpkgs/pkgs/tools/misc/convbin/default.nix +++ b/nixpkgs/pkgs/tools/misc/convbin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convbin"; - version = "3.4"; + version = "3.7"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JM9ixxOI3NnK3h54byFycTCJ/A+JTcNHKR71zxRed/s="; + sha256 = "sha256-zCRM62xwaPaN8+cg+CeaqK/9hKpZmSBBeUOQqAvQGYw="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/nixpkgs/pkgs/tools/misc/convmv/default.nix b/nixpkgs/pkgs/tools/misc/convmv/default.nix index b9b775a1bff9..6ed8c78361ec 100644 --- a/nixpkgs/pkgs/tools/misc/convmv/default.nix +++ b/nixpkgs/pkgs/tools/misc/convmv/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "convmv-2.05"; + pname = "convmv"; + version = "2.05"; src = fetchurl { - url = "https://www.j3e.de/linux/convmv/${name}.tar.gz"; + url = "https://www.j3e.de/linux/convmv/convmv-${version}.tar.gz"; sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk"; }; diff --git a/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix b/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix new file mode 100644 index 000000000000..b351b6e4efb6 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -0,0 +1,44 @@ +{ lib, python3, fetchFromGitHub }: + +let + # csvs-to-sqlite is currently not compatible with Click 8. See the following + # https://github.com/simonw/csvs-to-sqlite/issues/80 + # + # Workaround the issue by providing click 7 explicitly. + python = python3.override { + packageOverrides = self: super: { + click = self.callPackage ../../../development/python-modules/click/7.nix { }; + }; + }; +in with python.pkgs; buildPythonApplication rec { + pname = "csvs-to-sqlite"; + version = "1.2"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = version; + sha256 = "0p99cg76d3s7jxvigh5ad04dzhmr6g62qzzh4i6h7x9aiyvdhvk4"; + }; + + propagatedBuildInputs = [ + click + dateparser + pandas + py-lru-cache + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Convert CSV files into a SQLite database"; + homepage = "https://github.com/simonw/csvs-to-sqlite"; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; + +} diff --git a/nixpkgs/pkgs/tools/misc/dbacl/default.nix b/nixpkgs/pkgs/tools/misc/dbacl/default.nix index d8510975915b..eb2b445d069d 100644 --- a/nixpkgs/pkgs/tools/misc/dbacl/default.nix +++ b/nixpkgs/pkgs/tools/misc/dbacl/default.nix @@ -1,9 +1,11 @@ {fetchurl, lib, stdenv}: stdenv.mkDerivation rec { - name = "dbacl-1.14"; + pname = "dbacl"; + version = "1.14"; + src = fetchurl { - url = "https://www.lbreyer.com/gpl/${name}.tar.gz"; + url = "https://www.lbreyer.com/gpl/dbacl-${version}.tar.gz"; sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"; }; diff --git a/nixpkgs/pkgs/tools/misc/detox/default.nix b/nixpkgs/pkgs/tools/misc/detox/default.nix index 6aa66b349dc7..774ba885b4b1 100644 --- a/nixpkgs/pkgs/tools/misc/detox/default.nix +++ b/nixpkgs/pkgs/tools/misc/detox/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, flex}: -stdenv.mkDerivation { - name = "detox-1.2.0"; +stdenv.mkDerivation rec { + pname = "detox"; + version = "1.2.0"; src = fetchurl { - url = "mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz"; + url = "mirror://sourceforge/detox/${version}/detox-${version}.tar.gz"; sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45"; }; diff --git a/nixpkgs/pkgs/tools/misc/dmg2img/default.nix b/nixpkgs/pkgs/tools/misc/dmg2img/default.nix index a3f023e2ad5c..7f9c41cda32c 100644 --- a/nixpkgs/pkgs/tools/misc/dmg2img/default.nix +++ b/nixpkgs/pkgs/tools/misc/dmg2img/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: stdenv.mkDerivation rec { - name = "dmg2img-1.6.7"; + pname = "dmg2img"; + version = "1.6.7"; src = fetchurl { - url = "http://vu1tur.eu.org/tools/${name}.tar.gz"; + url = "http://vu1tur.eu.org/tools/dmg2img-${version}.tar.gz"; sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2"; }; diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 56880b6448df..719bb90b43dd 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.4"; + version = "2.14.7"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-0L5IiB/J4RO/KGSk/zZKLPpAneNGPDvhmPsNiZxImac="; + sha256 = "sha256-HkNWFWdyjpnJJANfnRDhmnhYbZIhrM9aIVN/Ov3/hK0="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-Mb59ZkIQVAZ01e3njdIR+0pM+PKQgEDaUP4saMGYn/8="; + cargoSha256 = "sha256-nfQGAjekd6cegvKPDxyOfcIhgagH61MT+2YVB2WppvQ="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/dust/default.nix b/nixpkgs/pkgs/tools/misc/dust/default.nix index 01c0ff4315e1..f5ce9db11027 100644 --- a/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.6.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-5GhoL3by4sXhFJrNZi/UlERBa+s2oqDVVJODY0kdfxI="; + sha256 = "sha256-0r0cDzW18uF7DHvzkUCHHHN+2M21xdi2ffPwDGMtyw8="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-cgH3jrZPGUHiBDeJ9qj80dU+Vbz+wHMOsCaGAvJY6mg="; + cargoSha256 = "sha256-LAow4DVqON5vrYBU8v8wzg/HcHxm1GqS9DMre3y12Jo="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/dvtm/default.nix b/nixpkgs/pkgs/tools/misc/dvtm/default.nix index 695187b3e840..ea5a051c62b1 100644 --- a/nixpkgs/pkgs/tools/misc/dvtm/default.nix +++ b/nixpkgs/pkgs/tools/misc/dvtm/default.nix @@ -1,9 +1,10 @@ {callPackage, fetchurl}: callPackage ./dvtm.nix rec { - name = "dvtm-0.15"; + pname = "dvtm"; + version = "0.15"; src = fetchurl { - url = "http://www.brain-dump.org/projects/dvtm/${name}.tar.gz"; + url = "https://www.brain-dump.org/projects/dvtm/dvtm-${version}.tar.gz"; sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g"; }; diff --git a/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix index 9a42655b7378..feb9c7a92f82 100644 --- a/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix +++ b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, ncurses, customConfig ? null, name, src, patches ? [] }: +{ lib, stdenv, ncurses, customConfig ? null, pname, version, src, patches ? [] }: stdenv.mkDerivation { - inherit name src patches; + inherit pname version src patches; CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; diff --git a/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix b/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix index 6ee2a465c69a..65e62be07497 100644 --- a/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix +++ b/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix @@ -1,6 +1,7 @@ {callPackage, fetchFromGitHub, fetchpatch}: callPackage ./dvtm.nix { - name = "dvtm-unstable-2018-03-31"; + pname = "dvtm-unstable"; + version = "2018-03-31"; src = fetchFromGitHub { owner = "martanne"; diff --git a/nixpkgs/pkgs/tools/misc/ent/default.nix b/nixpkgs/pkgs/tools/misc/ent/default.nix index b0dc4f1e3df9..de2f2cc8a865 100644 --- a/nixpkgs/pkgs/tools/misc/ent/default.nix +++ b/nixpkgs/pkgs/tools/misc/ent/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "ent-1.1"; + pname = "ent"; + version = "1.1"; src = fetchurl { url = "https://www.fourmilab.ch/random/random.zip"; diff --git a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix index 777415de5800..cc2123c9d33b 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20210728.0"; + version = "20210908.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OmlMrPLFMIV0Nu3aEKFotFXCZ2RKH9wYaev0SKvMBfQ="; + sha256 = "sha256-Oz/87FFP9AEK7vVTjgqIA6hSSQJLKet759S2t5Ci1oA="; }; # no tests diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index 4c58632e0df6..a4678e357008 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.8.2"; + version = "2021.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-R+5eefPUZc6y/B8cZbxsLVrVwvBbVISZQAb1KwiYdFg="; + sha256 = "sha256-JWUGOvY34wZSBTZdpuApPjEfBtgPSFKiVk89TUK441I="; }; patches = [ @@ -48,6 +48,7 @@ with python.pkgs; buildPythonApplication rec { # - validate_cryptography_installed # - validate_pillow_installed propagatedBuildInputs = [ + aioesphomeapi click colorama cryptography diff --git a/nixpkgs/pkgs/tools/misc/fasd/default.nix b/nixpkgs/pkgs/tools/misc/fasd/default.nix index a3cdc388cdf7..7e50c3e75513 100644 --- a/nixpkgs/pkgs/tools/misc/fasd/default.nix +++ b/nixpkgs/pkgs/tools/misc/fasd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "fasd"; - name = "${pname}-unstable-2016-08-11"; + version = "unstable-2016-08-11"; src = fetchFromGitHub { owner = "clvv"; diff --git a/nixpkgs/pkgs/tools/misc/fclones/default.nix b/nixpkgs/pkgs/tools/misc/fclones/default.nix index 1072bbcc5da3..14ade9ce32be 100644 --- a/nixpkgs/pkgs/tools/misc/fclones/default.nix +++ b/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -1,29 +1,35 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }: +{ lib, stdenv +, fetchFromGitHub +, libiconv +, rustPlatform +, AppKit +}: rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "1ni5amy903cy822yhw070bcrrixrw2m1vr66q1h32bc98pyv4w05"; + sha256 = "sha256-8NUneKJpnBjC4OcAABEpI9p+saBqAk+l43FS8/tIYjc="; }; - cargoSha256 = "1gcb46k7bwdfsf6hyvmi6dna1nf6myzy63bhjfp0wy7c8g4m2mg8"; + cargoSha256 = "sha256-5qX45FJFaiE1vTXjllM9U1w57MX18GgKEFOEBMc64Jk="; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ udev ]; + buildInputs = lib.optionals stdenv.isDarwin [ + AppKit + libiconv + ]; - # tests in dedupe.rs fail due to - # "creation time is not available for the filesystem" - doCheck = false; + # device::test_physical_device_name test fails on Darwin + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Efficient Duplicate File Finder and Remover"; homepage = "https://github.com/pkolaczk/fclones"; license = licenses.mit; - maintainers = with maintainers; [ cyounkins ]; + maintainers = with maintainers; [ cyounkins msfjarvis ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/figlet/default.nix b/nixpkgs/pkgs/tools/misc/figlet/default.nix index 01ff40b2b743..b16b6821e318 100644 --- a/nixpkgs/pkgs/tools/misc/figlet/default.nix +++ b/nixpkgs/pkgs/tools/misc/figlet/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch }: -stdenv.mkDerivation { - name = "figlet-2.2.5"; +stdenv.mkDerivation rec { + pname = "figlet"; + version = "2.2.5"; # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz"; + url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz"; sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; diff --git a/nixpkgs/pkgs/tools/misc/file/default.nix b/nixpkgs/pkgs/tools/misc/file/default.nix index 108cc5b82fd6..2c1e634023b6 100644 --- a/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/nixpkgs/pkgs/tools/misc/file/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, file, zlib, libgnurx }: +{ lib, stdenv, fetchurl, file, zlib, libgnurx, fetchpatch }: stdenv.mkDerivation rec { pname = "file"; @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; + patches = [ + # Fix the mime type detection of xz file. Is merged in master. + (fetchpatch { + url = "https://github.com/file/file/commit/9b0459afab309a82aa4e46f73a4e50dd641f3d39.patch"; + sha256 = "sha256-6vjyIn5gVbgmhUlfXJKFRVltm8YKATKmh0/X6+2lLnM="; + }) + ]; + doCheck = true; makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; diff --git a/nixpkgs/pkgs/tools/misc/fileschanged/default.nix b/nixpkgs/pkgs/tools/misc/fileschanged/default.nix index 2c64c4c1edca..f44011a98a71 100644 --- a/nixpkgs/pkgs/tools/misc/fileschanged/default.nix +++ b/nixpkgs/pkgs/tools/misc/fileschanged/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gamin }: stdenv.mkDerivation rec { - name = "fileschanged-0.6.9"; + pname = "fileschanged"; + version = "0.6.9"; src = fetchurl { - url = "mirror://savannah/fileschanged/${name}.tar.gz"; + url = "mirror://savannah/fileschanged/fileschanged-${version}.tar.gz"; sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc"; }; diff --git a/nixpkgs/pkgs/tools/misc/fontforge/default.nix b/nixpkgs/pkgs/tools/misc/fontforge/default.nix index 0f66fa55acad..6bb728af99ca 100644 --- a/nixpkgs/pkgs/tools/misc/fontforge/default.nix +++ b/nixpkgs/pkgs/tools/misc/fontforge/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { 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"; + }) ]; # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps diff --git a/nixpkgs/pkgs/tools/misc/git-fire/default.nix b/nixpkgs/pkgs/tools/misc/git-fire/default.nix index 15dc34cd5267..32d7a169d72e 100644 --- a/nixpkgs/pkgs/tools/misc/git-fire/default.nix +++ b/nixpkgs/pkgs/tools/misc/git-fire/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "git-fire-unstable-2017-08-27"; + pname = "git-fire"; + version = "unstable-2017-08-27"; src = fetchFromGitHub { owner = "qw3rtman"; diff --git a/nixpkgs/pkgs/tools/misc/github-backup/default.nix b/nixpkgs/pkgs/tools/misc/github-backup/default.nix index 1fcaf3a47119..3ab7f10909e3 100644 --- a/nixpkgs/pkgs/tools/misc/github-backup/default.nix +++ b/nixpkgs/pkgs/tools/misc/github-backup/default.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "github-backup"; - version = "0.39.0"; + version = "0.40.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "71829df4bdbe5bd55c324a97008405a6b4c6113edb1a2a6a8b73a7059fe64a47"; + sha256 = "sha256-Qrj0+4WXlW0UgG2xV/P8e0QgUG3VurY4HIAiiUF3LW8="; }; makeWrapperArgs = [ diff --git a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index e26509dd11dd..13b9f661a640 100644 --- a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.176.0"; + version = "0.179.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7xqzt/QJOkZLVY3MbBf7QYBrEgO500ft6ahvngaw9rs="; + sha256 = "sha256-E8a1S6CPPd8xsdt/tu1VmWxQCMUp8dEPB5H2IL4jj1k="; }; - vendorSha256 = "sha256-xdK98JWfxvufewcXiMjo6hslFrCbmWrgTAwJM7f00n4="; + vendorSha256 = "sha256-qF7mULIQrFs/SAMm/dUcYPs1urLKKg6w7hgkuJ2AivQ="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/misc/grex/default.nix b/nixpkgs/pkgs/tools/misc/grex/default.nix index 4d391b099437..62c216adcbef 100644 --- a/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.2.0"; + version = "1.3.0"; - cargoSha256 = "sha256-aEwMJ9f08SJhrL8kLaTp54yP1hYGb3Ob5KNzZ5r752s="; + cargoSha256 = "sha256-zNwTk4RcTv2dGbKWelOPSvasBmj7tnjLhQ0DZhZ9hxk="; src = fetchFromGitHub { owner = "pemistahl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3M6wQB7+1MKPcxSvjDTNs33TrFjCEeFlbh1akwJHLLU="; + sha256 = "sha256-NMz35jgd7XPemVdA8nol2H6cgWD3yEPh0FEMPw8kgKQ="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/tools/misc/grub/default.nix b/nixpkgs/pkgs/tools/misc/grub/default.nix index 2371bdb0e055..bf66a467620d 100644 --- a/nixpkgs/pkgs/tools/misc/grub/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }: -stdenv.mkDerivation { - name = "grub-0.97-73"; +stdenv.mkDerivation rec { + pname = "grub"; + version = "0.97-73"; src = fetchurl { - url = "https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz"; + url = "https://alpha.gnu.org/gnu/grub/grub-${lib.versions.majorMinor version}.tar.gz"; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; diff --git a/nixpkgs/pkgs/tools/misc/hashit/default.nix b/nixpkgs/pkgs/tools/misc/hashit/default.nix index edda48bdc924..e26a0abbde3a 100644 --- a/nixpkgs/pkgs/tools/misc/hashit/default.nix +++ b/nixpkgs/pkgs/tools/misc/hashit/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A simple app for checking usual checksums - Designed for elementary OS"; homepage = "https://github.com/artemanufrij/hashit"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index 248351272d89..c5485a5b3fb1 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ removeReferencesTo ]; + nativeBuildInputs = [ removeReferencesTo ] + ++ optional (gfortran != null) gfortran; buildInputs = [] - ++ optional (gfortran != null) gfortran ++ optional (szip != null) szip ++ optional javaSupport jdk; diff --git a/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/nixpkgs/pkgs/tools/misc/ipxe/default.nix index 4be0b3d417e4..70b1ae48ae9c 100644 --- a/nixpkgs/pkgs/tools/misc/ipxe/default.nix +++ b/nixpkgs/pkgs/tools/misc/ipxe/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done + for opt in ${lib.escapeShellArgs enabledOptions}; do echo "#define $opt" >> src/config/general.h; done sed -i '/cp \''${ISOLINUX_BIN}/s/$/ --no-preserve=mode/' src/util/geniso substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo runHook postConfigure diff --git a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix index abd8398601cd..22b16c7f9b34 100644 --- a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix +++ b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix @@ -10,11 +10,12 @@ let type = "Application"; }; in -stdenv.mkDerivation { - name = "jdiskreport-1.4.1"; +stdenv.mkDerivation rec { + pname = "jdiskreport"; + version = "1.4.1"; src = fetchurl { - url = "http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip"; + url = "https://www.jgoodies.com/download/jdiskreport/jdiskreport-${lib.replaceStrings ["."] ["_"] version}.zip"; sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; diff --git a/nixpkgs/pkgs/tools/misc/kalker/default.nix b/nixpkgs/pkgs/tools/misc/kalker/default.nix index 503edb910f0c..230e5c629fbe 100644 --- a/nixpkgs/pkgs/tools/misc/kalker/default.nix +++ b/nixpkgs/pkgs/tools/misc/kalker/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub -, m4 +, gcc +, gmp, mpfr, libmpc , rustPlatform }: rustPlatform.buildRustPackage rec { @@ -16,7 +17,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-fBWnMlOLgwrOBPS2GIfOUDHQHcMMaU5r9JZVMbA+W58="; - nativeBuildInputs = [ m4 ]; + # https://gitlab.com/tspiteri/gmp-mpfr-sys/-/issues/20 + nativeBuildInputs = [ gcc ]; + buildInputs = [ gmp mpfr libmpc ]; outputs = [ "out" "lib" ]; @@ -24,6 +27,8 @@ rustPlatform.buildRustPackage rec { moveToOutput "lib" "$lib" ''; + CARGO_FEATURE_USE_SYSTEM_LIBS = "1"; + meta = with lib; { homepage = "https://kalker.strct.net"; changelog = "https://github.com/PaddiM8/kalker/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/tools/misc/kermit/default.nix b/nixpkgs/pkgs/tools/misc/kermit/default.nix index 8af0674f54bf..33644e911c63 100644 --- a/nixpkgs/pkgs/tools/misc/kermit/default.nix +++ b/nixpkgs/pkgs/tools/misc/kermit/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, ncurses, glibc }: stdenv.mkDerivation { - name = "kermit-9.0.302"; + pname = "kermit"; + version = "9.0.302"; src = fetchurl { url = "ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix index 73d86e7dfc65..31bc0b2b6a12 100644 --- a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix @@ -17,11 +17,12 @@ let in -stdenv.mkDerivation { - name = "kisslicer-1.6.3"; +stdenv.mkDerivation rec { + pname = "kisslicer"; + version = "1.6.3"; src = fetchzip { - url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.3_release.zip"; + url = "https://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_${version}_release.zip"; sha256 = "1xmywj5jrcsqv1d5x3mphhvafs4mfm9l12npkhk7l03qxbwg9j82"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/misc/ksnip/default.nix b/nixpkgs/pkgs/tools/misc/ksnip/default.nix new file mode 100644 index 000000000000..d78b45d9b7ac --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ksnip/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, lib +, cmake +, extra-cmake-modules +, fetchFromGitHub +, kcolorpicker +, kimageannotator +, qtsvg +, qttranslations +, qtx11extras +}: + +stdenv.mkDerivation rec { + pname = "ksnip"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "ksnip"; + repo = "ksnip"; + rev = "v${version}"; + sha256 = "1izsk586n9fbm0di0hj6pxs7r0a6w554gpad1ghf247icr0pfc1l"; + }; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcolorpicker + kimageannotator + qtsvg + qttranslations + qtx11extras + ]; + + meta = with lib; { + homepage = "https://github.com/ksnip/ksnip"; + description = "Cross-platform screenshot tool wihth many annotation features"; + longDescription = '' + Features: + + - Supports Linux (X11, Plasma Wayland, GNOME Wayland and xdg-desktop-portal Wayland), Windows and macOS. + - Screenshot of a custom rectangular area that can be drawn with mouse cursor. + - Screenshot of last selected rectangular area without selecting again. + - Screenshot of the screen/monitor where the mouse cursor is currently located. + - Screenshot of full-screen, including all screens/monitors. + - Screenshot of window that currently has focus. + - Screenshot of window under mouse cursor. + - Screenshot with or without mouse cursor. + - Capture mouse cursor as annotation item that can be moved and deleted. + - Customizable capture delay for all capture options. + - Upload screenshots directly to imgur.com in anonymous or user mode. + - Upload screenshots via custom user defined scripts. + - Command-line support, for capturing screenshots and saving to default location, filename and format. + - Filename wildcards for Year ($Y), Month ($M), Day ($D), Time ($T) and Counter (multiple # characters for number with zero-leading padding). + - Print screenshot or save it to PDF/PS. + - Annotate screenshots with pen, marker, rectangles, ellipses, texts and other tools. + - Annotate screenshots with stickers and add custom stickers. + - Obfuscate image regions with blur and pixelate. + - Add effects to image (Drop Shadow, Grayscale, invert color or Border). + - Add watermarks to captured images. + - Global hotkeys for capturing screenshots (currently only for Windows and X11). + - Tabs for screenshots and images. + - Open existing images via dialog, drag-and-drop or paste from clipboard. + - Run as single instance application (secondary instances send cli parameter to primary instance). + - Pin screenshots in frameless windows that stay atop other windows. + - User-defined actions for taking screenshot and post-processing. + - Many configuration options. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ x3ro ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/logtop/default.nix b/nixpkgs/pkgs/tools/misc/logtop/default.nix index 2113da9976fb..0aa99fd18aa7 100644 --- a/nixpkgs/pkgs/tools/misc/logtop/default.nix +++ b/nixpkgs/pkgs/tools/misc/logtop/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, ncurses, uthash, pkg-config }: -stdenv.mkDerivation { - name = "logtop-0.7"; +stdenv.mkDerivation rec { + pname = "logtop"; + version = "0.7"; src = fetchFromGitHub { - rev = "a0935ab2e7056feb3e8a90f5129990c9b335a587"; + rev = "logtop-${version}"; owner = "JulienPalard"; repo ="logtop"; sha256 = "1f8vk9gybldxvc0kwz38jxmwvzwangsvlfslpsx8zf04nvbkqi12"; diff --git a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix index 09e90ca07940..e4b5e71a2560 100644 --- a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix +++ b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, gettext, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "lrzsz-0.12.20"; + pname = "lrzsz"; + version = "0.12.20"; src = fetchurl { - url = "https://ohse.de/uwe/releases/${name}.tar.gz"; + url = "https://ohse.de/uwe/releases/lrzsz-${version}.tar.gz"; sha256 = "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2"; }; diff --git a/nixpkgs/pkgs/tools/misc/macchina/default.nix b/nixpkgs/pkgs/tools/misc/macchina/default.nix index 91f23e1bc1d5..042902d080c1 100644 --- a/nixpkgs/pkgs/tools/misc/macchina/default.nix +++ b/nixpkgs/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "1.1.3"; + version = "1.1.6"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0afsv8n12z98z3dxdb4nflc6z8ss6n2prfqmjzy655ly9rrhkcrw"; + sha256 = "sha256-JiyJU+5bKXHUgaRyUKdgINbMxkv2XXAkuoouQv9SEow="; }; - cargoSha256 = "sha256:0jc2030217xz5v5h3ry2pb7rkakn9zmrcap55bv2r8p7hi5gvh60"; + cargoSha256 = "sha256-pychP3OHXMv23TtZbaMOPBbEoJh4R03ySzEdwADTmFI="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/nixpkgs/pkgs/tools/misc/makebootfat/default.nix b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix index 1f512d04a225..d55b5727d00c 100644 --- a/nixpkgs/pkgs/tools/misc/makebootfat/default.nix +++ b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "makebootfat-1.4"; + pname = "makebootfat"; + version = "1.4"; src = fetchurl { - url = "mirror://sourceforge/advancemame/${name}.tar.gz"; + url = "mirror://sourceforge/advancemame/makebootfat-${version}.tar.gz"; sha256 = "0v0g1xax0y6hmw2x10nfhchp9n7vqyvgc33gcxqax8jdq2pxm1q2"; }; diff --git a/nixpkgs/pkgs/tools/misc/man-db/default.nix b/nixpkgs/pkgs/tools/misc/man-db/default.nix index 9c8adc1d8d41..f1739cbd50dd 100644 --- a/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.9.4"; + pname = "man-db"; + version = "2.9.4"; src = fetchurl { - url = "mirror://savannah/man-db/${name}.tar.xz"; + url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; sha256 = "sha256-tmyZ7frRatkoyIn4fPdjgCY8FgkyPCgLOp5pY/2xZ1Y="; }; diff --git a/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/nixpkgs/pkgs/tools/misc/mcfly/default.nix index 0d55da7fdfa4..e613e4bb3ea1 100644 --- a/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -11,6 +11,12 @@ rustPlatform.buildRustPackage rec { sha256 = "0i3qjgq1b8h3bzc7rxa60kq1yc2im9m6dgzrvial086a1zk8s81r"; }; + postPatch = '' + substituteInPlace mcfly.bash --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly' + substituteInPlace mcfly.zsh --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly' + substituteInPlace mcfly.fish --replace '(which mcfly)' '${placeholder "out"}/bin/mcfly' + ''; + cargoSha256 = "084v4fsdi25ahz068ssq29z7d5d3k3jh3s8b07irwybdsy18c629"; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 64fdb40f52a8..b6d0bc9ede23 100644 --- a/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -11,21 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-hcGpd23CM5r8tq7Wyf4/aJwTCVJ9POmZJHZvIdcF4Qg="; + sha256 = "sha256-DqH/6Uu4L0fWbnGX8s3jCGwBgPE2PLIkS/dZIj+BA9Q="; }; - cargoSha256 = "sha256-TnafvDbCZhIDnjGJThgYnwFs6O6/RvKFsll3gUh2mjQ="; + cargoSha256 = "sha256-LgdVO41e56DIRkky1aF0X80ixs7ZH93Qk9Yx67vkO9E="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - checkFlags = [ "--skip=cant_navigate_up_the_root" ]; + checkFlags = [ + "--skip=bind_ipv4_ipv6::case_2" + "--skip=cant_navigate_up_the_root" + ]; postInstall = '' installShellCompletion --cmd miniserve \ diff --git a/nixpkgs/pkgs/tools/misc/mmv-go/default.nix b/nixpkgs/pkgs/tools/misc/mmv-go/default.nix index 640b0d611e47..efca64bdc44a 100644 --- a/nixpkgs/pkgs/tools/misc/mmv-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmv-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmv-go"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "itchyny"; repo = "mmv"; rev = "v${version}"; - sha256 = "12k5zzyr0lhjadc9kza04v0zgb20v7m4syaqwc7qvn3kfvv1mz8s"; + sha256 = "sha256-n7yW+0cabJGDgppt6Qcj7ID3sD85094NDOPk2o9xDwY="; }; - vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68"; + vendorSha256 = "sha256-3Xk8S2Em28r5R7894Ubo2OOlGhrKplV/gY4ftCjPvMo="; ldflags = [ "-s" "-w" "-X main.revision=${src.rev}" ]; diff --git a/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix index f0556b69f23e..680e37387683 100644 --- a/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, perl }: # The homepage says this script is mature.. -stdenv.mkDerivation { - name = "mysql2pgsql-0.0.1a"; +stdenv.mkDerivation rec { + pname = "mysql2pgsql"; + version = "0.0.1a"; src = fetchurl { - url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz"; + url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-${version}.tgz"; sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp"; }; diff --git a/nixpkgs/pkgs/tools/misc/nomino/default.nix b/nixpkgs/pkgs/tools/misc/nomino/default.nix new file mode 100644 index 000000000000..d30d40527e10 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/nomino/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "nomino"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "yaa110"; + repo = pname; + rev = version; + sha256 = "1nnyz4gkwrc2zccw0ir5kvmiyyv3r0vxys9r7j4cf0ymngal5kwp"; + }; + + cargoSha256 = "0501w3124vkipb1rnksjaizkghw3jf3nmmmmf3zprmcaim1b4szg"; + + meta = with lib; { + description = "Batch rename utility for developers"; + homepage = "https://github.com/yaa110/nomino"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix index 052c46cef8cb..2dbffe3384ce 100644 --- a/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix +++ b/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3, runtimeShell }: stdenv.mkDerivation { - name = "odroid-xu3-bootloader-2015-12-04"; + pname = "odroid-xu3-bootloader"; + version = "unstable-2015-12-04"; src = fetchFromGitHub { owner = "hardkernel"; diff --git a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index 678c2607b614..bc7baa55fecd 100644 --- a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools +{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools , python, git }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-35476.patch"; + url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch"; + sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ autoconf automake curl jdk nettools python git ]; @@ -33,8 +41,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = [ ]; - knownVulnerabilities = [ - "CVE-2020-35476" # https://github.com/OpenTSDB/opentsdb/issues/2051 - ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/pal/default.nix b/nixpkgs/pkgs/tools/misc/pal/default.nix index 635c6e0b5245..c37325170ace 100644 --- a/nixpkgs/pkgs/tools/misc/pal/default.nix +++ b/nixpkgs/pkgs/tools/misc/pal/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, glib, gettext, readline, pkg-config }: stdenv.mkDerivation rec { - name = "pal-0.4.3"; + pname = "pal"; + version = "0.4.3"; src = fetchurl { - url = "mirror://sourceforge/palcal/${name}.tgz"; + url = "mirror://sourceforge/palcal/pal-${version}.tgz"; sha256 = "072mahxvd7lcvrayl32y589w4v3vh7bmlcnhiksjylknpsvhqiyf"; }; diff --git a/nixpkgs/pkgs/tools/misc/parted/default.nix b/nixpkgs/pkgs/tools/misc/parted/default.nix index e954bfbe5e4d..e4ac6b624ce4 100644 --- a/nixpkgs/pkgs/tools/misc/parted/default.nix +++ b/nixpkgs/pkgs/tools/misc/parted/default.nix @@ -15,10 +15,11 @@ }: stdenv.mkDerivation rec { - name = "parted-3.4"; + pname = "parted"; + version = "3.4"; src = fetchurl { - url = "mirror://gnu/parted/${name}.tar.xz"; + url = "mirror://gnu/parted/parted-${version}.tar.xz"; sha256 = "sha256-4SmAIkctpVibfyvh1e48G2bsPZbfutA9xkKv0AnaU0I="; }; diff --git a/nixpkgs/pkgs/tools/misc/pg_top/default.nix b/nixpkgs/pkgs/tools/misc/pg_top/default.nix index f5d42431e4f2..9521136977f3 100644 --- a/nixpkgs/pkgs/tools/misc/pg_top/default.nix +++ b/nixpkgs/pkgs/tools/misc/pg_top/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ncurses, postgresql }: stdenv.mkDerivation rec { - name = "pg_top-3.7.0"; + pname = "pg_top"; + version = "3.7.0"; src = fetchurl { - url = "http://pgfoundry.org/frs/download.php/1781/${name}.tar.gz"; + url = "https://pgfoundry.org/frs/download.php/1781/pg_top-${version}.tar.gz"; sha256 = "17xrv0l58rv3an06gkajzw0gg6v810xx6vl137an1iykmhvfh7h2"; }; diff --git a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix index 971f924faaac..f0f20d4b3a7b 100644 --- a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -13,10 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which gnused makeWrapper ]; installPhase = '' + runHook preInstall + ./install-sh $out wrapProgram $out/bin/phoronix-test-suite \ --set PHP_BIN ${php}/bin/php \ --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]} + + runHook postInstall ''; passthru.tests = { diff --git a/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix b/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix new file mode 100644 index 000000000000..15468773e422 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchCrate, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "pipe-rename"; + version = "1.4.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-AMBdDsn3jS2dXUnEDKZILUlLHS9FIECZhc3EjxLoOZU="; + }; + + cargoSha256 = "sha256-ulNyTRRFtHQ7+sRaKczLiDPIKG2TIcbbsD9x1di2ypw="; + + checkInputs = [ python3 ]; + + preCheck = '' + patchShebangs tests/editors/env-editor.py + ''; + + meta = with lib; { + description = "Rename your files using your favorite text editor"; + homepage = "https://github.com/marcusbuffet/pipe-rename"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "renamer"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix index 009d841bf557..b6678f52d748 100644 --- a/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: -stdenv.mkDerivation { - name = "pk2cmd-1.20"; +stdenv.mkDerivation rec { + pname = "pk2cmd"; + version = "1.20"; src = fetchurl { - url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz"; + url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv${version}LinuxMacSource.tar.gz"; sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; diff --git a/nixpkgs/pkgs/tools/misc/profetch/default.nix b/nixpkgs/pkgs/tools/misc/profetch/default.nix new file mode 100644 index 000000000000..c113f48fd13d --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/profetch/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchFromGitHub, gprolog }: + +stdenv.mkDerivation rec { + pname = "profetch"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "RustemB"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-JsjpPUXMN0jytRS4yzSjrseqHiEQ+YinklG+tIIy+Zo="; + }; + + nativeBuildInputs = [ gprolog ]; + + buildPhase = '' + runHook preBuild + gplc profetch.pl --no-top-level --no-debugger \ + --no-fd-lib --no-fd-lib-warn \ + --min-size -o profetch + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin profetch + runHook postInstall + ''; + + meta = with lib; { + description = "System Information Fetcher Written in GNU/Prolog"; + homepage = "https://github.com/RustemB/profetch"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.vel ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix b/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix index 7743793143a2..1319a6bfabe9 100644 --- a/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix +++ b/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, openssl }: -stdenv.mkDerivation { - name = "proxytunnel-1.9.0"; +stdenv.mkDerivation rec { + pname = "proxytunnel"; + version = "1.9.0"; src = fetchurl { - url = "mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz"; + url = "mirror://sourceforge/proxytunnel/proxytunnel-${version}.tgz"; sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f"; }; diff --git a/nixpkgs/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix index 4ac9d972a9a7..26427d38039d 100644 --- a/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.3.4"; + version = "5.3.5"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-wju69kC6koYy2yABjx7/rWsuJXV1vjwSBztNlu13TJs="; + sha256 = "sha256-xJ7kgEvIsTufAZa5x3YpElTc74nEs9C+baVjbheHySM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/pv/default.nix b/nixpkgs/pkgs/tools/misc/pv/default.nix index 013ddb8e3dab..6bc92b147689 100644 --- a/nixpkgs/pkgs/tools/misc/pv/default.nix +++ b/nixpkgs/pkgs/tools/misc/pv/default.nix @@ -1,13 +1,27 @@ -{ lib, stdenv, fetchurl } : +{ lib +, stdenv +, fetchurl +, fetchpatch +}: stdenv.mkDerivation rec { - name = "pv-1.6.6"; + pname = "pv"; + version = "1.6.20"; + name = "pv-1.6.20"; src = fetchurl { - url = "https://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0"; + url = "https://www.ivarch.com/programs/sources/pv-${version}.tar.bz2"; + sha256 = "00y6zla8h653sn4axgqz7rr0x79vfwl62a7gn6lzn607zwg9acg8"; }; + patches = [ + # Fix build on aarch64-darwin using patch from Homebrew + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/homebrew-core/0780f1df9fdbd8914ff50ac24eb0ec0d3561c1b7/Formula/pv.rb"; + sha256 = "001xayskfprri4s2gd3bqwajw6nz6nv0ggb0835par7q7bsd0dzr"; + }) + ]; + meta = { homepage = "http://www.ivarch.com/programs/pv"; description = "Tool for monitoring the progress of data through a pipeline"; diff --git a/nixpkgs/pkgs/tools/misc/qjoypad/default.nix b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix index 7fc578ec8579..0c3b4a9ed2f8 100644 --- a/nixpkgs/pkgs/tools/misc/qjoypad/default.nix +++ b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, pkg-config, libX11, libXtst, qt4 }: stdenv.mkDerivation rec { - name = "qjoypad-4.1.0"; + pname = "qjoypad"; + version = "4.1.0"; src = fetchurl { - url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; + url = "mirror://sourceforge/qjoypad/qjoypad-${version}.tar.gz"; sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix index 00d46de8f96d..133a1a87d661 100644 --- a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix +++ b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix @@ -4,11 +4,11 @@ let inherit (lib) getDev; in mkDerivation rec { pname = "qt5ct"; - version = "1.1"; + version = "1.3"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1lnx4wqk87lbr6lqc64w5g5ppjjv75kq2r0q0bz9gfpryzdw8xxg"; + sha256 = "sha256-3UQ7FOWQr/dqFuExbVbmiIguMkjEcN9PcbyVJWnzw7w="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/nixpkgs/pkgs/tools/misc/renameutils/default.nix b/nixpkgs/pkgs/tools/misc/renameutils/default.nix index e730b583d7c8..2dff399cc9a4 100644 --- a/nixpkgs/pkgs/tools/misc/renameutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/renameutils/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, readline}: -stdenv.mkDerivation { - name = "renameutils-0.12.0"; +stdenv.mkDerivation rec { + pname = "renameutils"; + version = "0.12.0"; src = fetchurl { - url = "mirror://savannah/renameutils/renameutils-0.12.0.tar.gz"; + url = "mirror://savannah/renameutils/renameutils-${version}.tar.gz"; sha256 = "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb"; }; diff --git a/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix index c60dd9f7c7a0..bce293d7cf8d 100644 --- a/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix +++ b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-1.10.4"; + pname = "riemann-c-client"; + version = "1.10.4"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; - rev = name; + rev = "riemann-c-client-${version}"; sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr"; }; diff --git a/nixpkgs/pkgs/tools/misc/ristate/default.nix b/nixpkgs/pkgs/tools/misc/ristate/default.nix new file mode 100644 index 000000000000..7c8dbb52181d --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ristate/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitLab }: + +rustPlatform.buildRustPackage rec { + pname = "ristate"; + version = "unstable-2021-09-10"; + + src = fetchFromGitLab { + owner = "snakedye"; + repo = pname; + rev = "34dfd0a0bab5b36df118d8da3956fd938c625b15"; + sha256 = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY="; + }; + + cargoSha256 = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw="; + + meta = with lib; { + description = "A river-status client written in Rust"; + homepage = "https://gitlab.com/snakedye/ristate"; + license = licenses.mit; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix b/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix index b96d9be8a4dd..fa37c98966eb 100644 --- a/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libusb1 }: stdenv.mkDerivation rec { - name = "rkflashtool-5.1"; + pname = "rkflashtool"; + version = "5.1"; src = fetchurl { - url = "mirror://sourceforge/rkflashtool/${name}-src.tar.bz2"; + url = "mirror://sourceforge/rkflashtool/rkflashtool-${version}-src.tar.bz2"; sha256 = "0dbp1crw7pjav9gffrnskhkf0gxlj4xgp65clqhvfmv32460xb9c"; }; diff --git a/nixpkgs/pkgs/tools/misc/rrdtool/default.nix b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix index 2f8b9092eeaa..b03cd4a9a7e6 100644 --- a/nixpkgs/pkgs/tools/misc/rrdtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix @@ -2,10 +2,11 @@ , tcl-8_5, darwin }: perl.pkgs.toPerlModule (stdenv.mkDerivation rec { - name = "rrdtool-1.7.2"; + pname = "rrdtool"; + version = "1.7.2"; src = fetchurl { - url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/rrdtool/pub/rrdtool-${version}.tar.gz"; sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"; }; diff --git a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix index d604f1a68fe2..78434414b1a4 100644 --- a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix +++ b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix @@ -2,23 +2,17 @@ buildPythonApplication { pname = "scfbuild"; - version = "1.0.3"; + version = "2.0.0"; format = "other"; src = fetchFromGitHub { owner = "13rac1"; repo = "scfbuild"; - rev = "9acc7fc5fedbf48683d8932dd5bd7583bf922bae"; - sha256 = "1zlqsxkpg7zvmhdjgbqwwc9qgac2b8amzq8c5kwyh5cv95zcp6qn"; + rev = "6d84339512a892972185d894704efa67dd82e87a"; + sha256 = "0wkyzkhshlax9rvdmn441gv87n9abfr0qqmgs8bkg9kbcjb4bhad"; }; - patches = [ - # Convert to Python 3 - # https://github.com/13rac1/scfbuild/pull/19 - ./python-3.patch - ]; - propagatedBuildInputs = [ pyyaml fonttools fontforge ]; installPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/scfbuild/python-3.patch b/nixpkgs/pkgs/tools/misc/scfbuild/python-3.patch deleted file mode 100644 index 5a0178ad8c8e..000000000000 --- a/nixpkgs/pkgs/tools/misc/scfbuild/python-3.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/bin/scfbuild -+++ b/bin/scfbuild -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from __future__ import (absolute_import, division, print_function, ---- a/scfbuild/builder.py -+++ b/scfbuild/builder.py -@@ -287,8 +287,8 @@ def _add_name_record(self, text, name_id, platform_id, plat_enc_id, lang_id): - # TODO: The installed version of fontTools doesn't have - # table__n_a_m_e.setName(). - record = NameRecord() -- # PyYAML creates strings, force to Unicode -- record.string = unicode(text) -+ # PyYAML creates strings, which are unicode as of Python3 -+ record.string = text - record.nameID = name_id - record.platformID = platform_id - record.platEncID = plat_enc_id ---- a/scfbuild/fforge.py -+++ b/scfbuild/fforge.py -@@ -84,7 +84,7 @@ def add_glyphs(font, svg_filepaths, conf): - u_ids = [int(u_id, 16) for u_id in filename.split("-")] - # Example: (0x1f441, 0x1f5e8) - -- u_str = ''.join(map(unichr, u_ids)) -+ u_str = ''.join(map(chr, u_ids)) - # Example: "U\0001f441U\0001f5e8" - - # Replace sequences with correct ZWJ/VS16 versions as needed ---- a/scfbuild/main.py -+++ b/scfbuild/main.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - # SCFBuild is released under the GNU General Public License v3. -index 0000000..99418b5 ---- /dev/null -+++ b/scfbuild/requirements.txt -@@ -0,0 +1,2 @@ -+fonttools>=3.41.2 -+PyYAML>=5.1 diff --git a/nixpkgs/pkgs/tools/misc/sixpair/default.nix b/nixpkgs/pkgs/tools/misc/sixpair/default.nix index 52c61d917b12..71a0af158246 100644 --- a/nixpkgs/pkgs/tools/misc/sixpair/default.nix +++ b/nixpkgs/pkgs/tools/misc/sixpair/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { - name = "sixpair-2007-04-18"; + pname = "sixpair"; + version = "unstable-2007-04-18"; src = fetchurl { url = "http://www.pabr.org/sixlinux/sixpair.c"; diff --git a/nixpkgs/pkgs/tools/misc/slop/default.nix b/nixpkgs/pkgs/tools/misc/slop/default.nix index a73dd8d3cbe7..69fa8d694541 100644 --- a/nixpkgs/pkgs/tools/misc/slop/default.nix +++ b/nixpkgs/pkgs/tools/misc/slop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "slop"; - version = "7.5"; + version = "7.6"; src = fetchFromGitHub { owner = "naelstrof"; repo = "slop"; rev = "v${version}"; - sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837"; + sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/slsnif/default.nix b/nixpkgs/pkgs/tools/misc/slsnif/default.nix index 7f6f9fa40c2b..fd2b4c53d60a 100644 --- a/nixpkgs/pkgs/tools/misc/slsnif/default.nix +++ b/nixpkgs/pkgs/tools/misc/slsnif/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "slsnif-0.4.4"; +stdenv.mkDerivation rec { + pname = "slsnif"; + version = "0.4.4"; src = fetchurl { - url = "mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz"; + url = "mirror://sourceforge/slsnif/slsnif-${version}.tar.gz"; sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; diff --git a/nixpkgs/pkgs/tools/misc/smc/default.nix b/nixpkgs/pkgs/tools/misc/smc/default.nix index 5b0342621e80..4c1156a83663 100644 --- a/nixpkgs/pkgs/tools/misc/smc/default.nix +++ b/nixpkgs/pkgs/tools/misc/smc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, jre, runtimeShell }: -stdenv.mkDerivation { - name = "smc-6.6.3"; +stdenv.mkDerivation rec { + pname = "smc"; + version = "6.6.3"; src = fetchurl { - url = "mirror://sourceforge/project/smc/smc/6_6_3/smc_6_6_3.tgz"; + url = "mirror://sourceforge/project/smc/smc/${lib.replaceStrings ["."] ["_"] version}/smc_${lib.replaceStrings ["."] ["_"] version}.tgz"; sha256 = "1gv0hrgdl4wp562virpf9sib6pdhapwv4zvwbl0d5f5xyx04il11"; }; diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index 7ad62ab9d2e0..5202527b8c0d 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.57.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cxTBK6eZTlqEaVfWYARQk6BjNuANy39eaXC6qFs/+6k="; + sha256 = "sha256-s84fIpCyTF7FrJZGATjIJHt/+aknlhlz1V9s+c4f+Ig="; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-TFHRDgIxqJCkcSwpdbcx8vguKU1QuTyslmAsRznxt2s="; + cargoSha256 = "sha256-5YOF0nXn4rdp3uxatzdvaqdAbLlHK6nq5H4+ZX/7joM="; preCheck = '' HOME=$TMPDIR diff --git a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 37462910dcfe..360e16b1fc18 100644 --- a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.3"; + version = "4.5"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "04gmiqg6mq96fw4v1v6947i216fsf0vcnjp3ya8bbii5na91y1aa"; + sha256 = "sha256-TiJWy5WU1VsseodfgfemAsUc5/hDwSlM03ITRYTvJbg="; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/nixpkgs/pkgs/tools/misc/sysz/default.nix b/nixpkgs/pkgs/tools/misc/sysz/default.nix new file mode 100644 index 000000000000..4f5f90d04b0e --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/sysz/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, fzf, gawk }: + +stdenvNoCC.mkDerivation rec { + pname = "sysz"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "joehillen"; + repo = pname; + rev = version; + sha256 = "HNwsYE1Cv90IDi3A5PmRv3uHANR3ya+VOGBQ3+zkBLM="; + }; + + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm755 sysz $out/libexec/sysz + makeWrapper $out/libexec/sysz $out/bin/sysz \ + --prefix PATH : ${lib.makeBinPath [ fzf gawk ]} + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/joehillen/sysz"; + description = "A fzf terminal UI for systemctl"; + license = licenses.unlicense; + maintainers = with maintainers; [ hleboulanger ]; + platforms = platforms.unix; + changelog = "https://github.com/joehillen/sysz/blob/${version}/CHANGELOG.md"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/t1utils/default.nix b/nixpkgs/pkgs/tools/misc/t1utils/default.nix index d581b71d16e2..8e91013521fb 100644 --- a/nixpkgs/pkgs/tools/misc/t1utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/t1utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.lcdf.org/type/t1utils-${version}.tar.gz"; - sha256 = "sha256-YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; + sha256 = "YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/taoup/cachefile.patch b/nixpkgs/pkgs/tools/misc/taoup/cachefile.patch new file mode 100644 index 000000000000..7c92b2180c67 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/taoup/cachefile.patch @@ -0,0 +1,35 @@ +--- a/taoup-fortune 2021-09-05 12:16:23.408295791 +0800 ++++ b/taoup-fortune 2021-09-05 13:02:52.286440200 +0800 +@@ -5,31 +5,9 @@ + # - https://github.com/matheuss/parrotsay + # - https://github.com/busyloop/lolcat + # - https://github.com/sckott/cowsay (enhanced version) +-dir=`dirname "${BASH_SOURCE[0]}"` +- +-# USER ALERT!!! @ronjouch complained about execution speed at https://github.com/globalcitizen/taoup/issues/11 +-# ... therefore we add caching ... therefore first ensure we have an up to date cache via one of ... +-# md5sum +-if [ `which md5sum 2>/dev/null` ]; then +- MD5SUM=`md5sum ${dir}/taoup | cut -d ' ' -f1` +-# md5 +-elif [ `which md5 2>/dev/null` ]; then +- MD5SUM=`md5 -q ${dir}/taoup | cut -d ' ' -f1` +-# openssl +-elif [ `which openssl 2>/dev/null` ]; then +- MD5SUM=`cat ${dir}/taoup | openssl md5 | grep -o '[[:xdigit:]][[:xdigit:]]*$' |cut -d '=' -f2- |cut -c 2-` +-# ruby +-elif [ `which ruby 2>/dev/null` ]; then +- MD5SUM=`ruby -rdigest/md5 -e"puts Digest::MD5.file'${dir}/taoup'"` +-fi + + # determine cachefile name +-cachefile=${dir}/.taoup-fortune.cache.${MD5SUM} +- +-# create if necessary +-if [ ! -r $cachefile ]; then +- ${dir}/taoup $@ >${cachefile} +-fi ++cachefile=@out@/lib/taoup/cache + + # handle all classes of society + if [ `which cowsay 2>/dev/null` ]; then diff --git a/nixpkgs/pkgs/tools/misc/taoup/default.nix b/nixpkgs/pkgs/tools/misc/taoup/default.nix new file mode 100644 index 000000000000..969df132be82 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/taoup/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, fetchFromGitHub, ruby, bash, ncurses }: +let + rubyEnv = ruby.withPackages (ps: with ps; [ ansi ]); +in +stdenv.mkDerivation rec { + pname = "taoup"; + version = "1.1.14"; + + src = fetchFromGitHub { + owner = "globalcitizen"; + repo = pname; + rev = "v${version}"; + sha256 = "1gs6f66fg1l504riw481nvyw7cchbr3qjks4mkj2qb3s9147ad8j"; + }; + + buildInputs = [ rubyEnv bash ncurses ]; + + patches = [ + # Pre-create a cache within this derivation + ./cachefile.patch + # Remove the need to test for `tput`, depend on ncurses directly + ./tput.patch + # Fix the script name in `taoup --help` output + ./help.patch + ]; + + postPatch = '' + substituteInPlace taoup \ + --subst-var-by ncurses ${ncurses} \ + --subst-var-by pname ${pname} + substituteInPlace taoup-fortune \ + --subst-var-by out $out \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/{bin,lib/taoup} + + cp taoup $out/lib/taoup + cat > $out/bin/taoup <<EOF + #!${bash}/bin/bash + exec ${rubyEnv}/bin/ruby "$out/lib/taoup/taoup" "\$@" + EOF + chmod +x $out/bin/taoup + + # Populate the cache created by cachedir.patch above + $out/bin/taoup > $out/lib/taoup/cache + + cp taoup-fortune $out/bin + chmod +x $out/bin/taoup-fortune + ''; + + meta = { + description = "The Tao of Unix Programming (Ruby-powered ANSI colored fortunes)"; + homepage = "https://github.com/globalcitizen/taoup"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.zakame ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/taoup/help.patch b/nixpkgs/pkgs/tools/misc/taoup/help.patch new file mode 100644 index 000000000000..e8b5f91f3c8a --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/taoup/help.patch @@ -0,0 +1,21 @@ +--- a/taoup 2021-09-07 16:45:00.000000000 +0800 ++++ b/taoup 2021-09-07 16:46:00.000000000 +0800 +@@ -7,12 +7,12 @@ + + # show help if requested + if ARGV[0] == '--help' or ARGV[0] == '-h' then +- puts "usage: " + $0 + " [arguments]" +- puts " " + $0 + " Display all fortunes and sections." +- puts " " + $0 + " < --help | -h > This help." +- puts " " + $0 + " --whitetrash Convert ANSI colors for light/white terminals." +- puts " " + $0 + " --machine Remove ANSI colors." +- puts " " + $0 + " --fortune Convert output to fortune format (and lose colors)." ++ puts "usage: " + "@pname@" + " [arguments]" ++ puts " " + "@pname@" + " Display all fortunes and sections." ++ puts " " + "@pname@" + " < --help | -h > This help." ++ puts " " + "@pname@" + " --whitetrash Convert ANSI colors for light/white terminals." ++ puts " " + "@pname@" + " --machine Remove ANSI colors." ++ puts " " + "@pname@" + " --fortune Convert output to fortune format (and lose colors)." + exit(0) + end + # ... but optionally make sure ANSI escape sequences are filtered out diff --git a/nixpkgs/pkgs/tools/misc/taoup/tput.patch b/nixpkgs/pkgs/tools/misc/taoup/tput.patch new file mode 100644 index 000000000000..5c82024885bf --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/taoup/tput.patch @@ -0,0 +1,17 @@ +--- a/taoup 2021-09-05 12:43:48.334615538 +0800 ++++ b/taoup 2021-09-05 12:55:07.631617799 +0800 +@@ -26,11 +26,9 @@ + zero_colors = true + fortunify = true + else +- if `which tput` then +- colors = `tput colors` +- if colors.chop == "-1" then +- zero_colors = true +- end ++ colors = `@ncurses@/bin/tput colors` ++ if colors.chop == "-1" then ++ zero_colors = true + end + end + if ARGV[0] == '--whitetrash' then diff --git a/nixpkgs/pkgs/tools/misc/timidity/default.nix b/nixpkgs/pkgs/tools/misc/timidity/default.nix index 760284140b11..368efcf9de30 100644 --- a/nixpkgs/pkgs/tools/misc/timidity/default.nix +++ b/nixpkgs/pkgs/tools/misc/timidity/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, libjack2, ncurses, pkg-config }: -stdenv.mkDerivation { - name = "timidity-2.15.0"; +stdenv.mkDerivation rec { + pname = "timidity"; + version = "2.15.0"; src = fetchurl { - url = "mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2"; + url = "mirror://sourceforge/timidity/TiMidity++-${version}.tar.bz2"; sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"; }; diff --git a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix index 1ef486fa8556..7389e0c4c593 100644 --- a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, psmisc }: -stdenv.mkDerivation { - name = "tmpwatch-2.11"; +stdenv.mkDerivation rec { + pname = "tmpwatch"; + version = "2.11"; src = fetchurl { - url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-2.11.tar.bz2"; + url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-${version}.tar.bz2"; sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; diff --git a/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix index 830c365fa403..c69853635e90 100644 --- a/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, tmux }: stdenv.mkDerivation { - name = "tmux-cssh-20151015"; + pname = "tmux-cssh"; + version = "unstable-2015-10-15"; src = fetchFromGitHub { owner = "dennishafemann"; diff --git a/nixpkgs/pkgs/tools/misc/toybox/default.nix b/nixpkgs/pkgs/tools/misc/toybox/default.nix index 9e3b1ecc6b5a..0f41f15d9fdb 100644 --- a/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross - buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; + buildInputs = lib.optionals (enableStatic && stdenv.cc.libc ? static) + [ stdenv.cc.libc stdenv.cc.libc.static ]; postPatch = "patchShebangs ."; diff --git a/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix b/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix index fcab21eb92b3..7e0c12535bb6 100644 --- a/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, freetype }: -stdenv.mkDerivation { - name = "ttf2pt1-3.4.4"; +stdenv.mkDerivation rec { + pname = "ttf2pt1"; + version = "3.4.4"; src = fetchurl { - url = "mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz"; + url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${version}.tgz"; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; diff --git a/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix b/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix index bc1279a7dec7..77bc9f172c6f 100644 --- a/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: stdenv.mkDerivation { - name = "ttf-mkfontdir-3.0.9-6"; + pname = "ttf-mkfontdir"; + version = "3.0.9-6"; src = fetchurl { url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix index d59b759503f8..9e95cddda32d 100644 --- a/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "unclutter-xfixes"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "Airblader"; repo = "unclutter-xfixes"; rev = "v${version}"; - sha256 = "148m4wx8v57s3l2wb69y9imb00y8ca2li27hsxibwnl1wrkb7z4b"; + sha256 = "sha256-suKmaoJq0PBHZc7NzBQ60JGwJkAtWmvzPtTHWOPJEdc="; }; nativeBuildInputs = [ pkg-config asciidoc libxslt docbook_xsl ]; diff --git a/nixpkgs/pkgs/tools/misc/unclutter/default.nix b/nixpkgs/pkgs/tools/misc/unclutter/default.nix index 66344c9fdeef..74fc46563c7e 100644 --- a/nixpkgs/pkgs/tools/misc/unclutter/default.nix +++ b/nixpkgs/pkgs/tools/misc/unclutter/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, xlibsWrapper}: -stdenv.mkDerivation { - name = "unclutter-8"; +stdenv.mkDerivation rec { + pname = "unclutter"; + version = "8"; src = fetchurl { - url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz"; + url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-${version}.tar.gz"; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; diff --git a/nixpkgs/pkgs/tools/misc/uucp/default.nix b/nixpkgs/pkgs/tools/misc/uucp/default.nix index 42084fa6296e..443c4b10457e 100644 --- a/nixpkgs/pkgs/tools/misc/uucp/default.nix +++ b/nixpkgs/pkgs/tools/misc/uucp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uucp-1.07"; + pname = "uucp"; + version = "1.07"; src = fetchurl { - url = "mirror://gnu/uucp/${name}.tar.gz"; + url = "mirror://gnu/uucp/uucp-${version}.tar.gz"; sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306"; }; diff --git a/nixpkgs/pkgs/tools/misc/uudeview/default.nix b/nixpkgs/pkgs/tools/misc/uudeview/default.nix index 47bc916ceb50..6875e6f12343 100644 --- a/nixpkgs/pkgs/tools/misc/uudeview/default.nix +++ b/nixpkgs/pkgs/tools/misc/uudeview/default.nix @@ -1,18 +1,35 @@ -{ lib, stdenv, fetchurl, tcl, tk }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, tcl +, tk +}: stdenv.mkDerivation rec { - name = "uudeview-0.5.20"; + pname = "uudeview"; + version = "0.5.20"; + src = fetchurl { - url = "http://www.fpx.de/fp/Software/UUDeview/download/${name}.tar.gz"; + url = "http://www.fpx.de/fp/Software/UUDeview/download/${pname}-${version}.tar.gz"; sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4"; }; buildInputs = [ tcl tk ]; - hardeningDisable = [ "format" ]; + configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ]; - # https://wiki.tcl.tk/3577 - patches = [ ./matherr.patch ]; + patches = [ + # https://wiki.tcl.tk/3577 + ./matherr.patch + # format hardening + (fetchpatch { + url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch"; + sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw"; + extraPrefix = ""; + }) + ]; + postPatch = '' substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish" ''; @@ -20,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nice and Friendly Decoder"; homepage = "http://www.fpx.de/fp/Software/UUDeview/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index 6c559ada9632..cf76462eb612 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -55,13 +55,15 @@ rustPlatform.buildRustPackage rec { doCheck = !stdenv.isDarwin; # healthcheck_grafana_cloud is trying to make a network access # test_stream_errors is flaky on linux-aarch64 + # tcp_with_tls_intermediate_ca is flaky on linux-x86_64 checkPhase = '' TZDIR=${tzdata}/share/zoneinfo cargo test \ --no-default-features \ --features ${lib.concatStringsSep "," features} \ -- --test-threads 1 \ --skip=sinks::loki::tests::healthcheck_grafana_cloud \ - --skip=kubernetes::api_watcher::tests::test_stream_errors + --skip=kubernetes::api_watcher::tests::test_stream_errors \ + --skip=sources::socket::test::tcp_with_tls_intermediate_ca ''; # recent overhauls of DNS support in 0.9 mean that we try to resolve diff --git a/nixpkgs/pkgs/tools/misc/vimpager/build.nix b/nixpkgs/pkgs/tools/misc/vimpager/build.nix index ec1766d7af31..a610a461656c 100644 --- a/nixpkgs/pkgs/tools/misc/vimpager/build.nix +++ b/nixpkgs/pkgs/tools/misc/vimpager/build.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { rev = version; }; - buildInputs = [ coreutils sharutils ]; # for uuencode + nativeBuildInputs = [ sharutils ]; # for uuencode + buildInputs = [ coreutils ]; makeFlags = [ "PREFIX=$(out)" diff --git a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix index 7aebfeab2cee..b0b4e5e34e12 100644 --- a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix +++ b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libogg, libvorbis }: stdenv.mkDerivation rec { - name = "vorbisgain-0.37"; + pname = "vorbisgain"; + version = "0.37"; src = fetchurl { - url = "https://sjeng.org/ftp/vorbis/${name}.tar.gz"; + url = "https://sjeng.org/ftp/vorbis/vorbisgain-${version}.tar.gz"; sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx"; }; diff --git a/nixpkgs/pkgs/tools/misc/wv2/default.nix b/nixpkgs/pkgs/tools/misc/wv2/default.nix index c0f85b4b8de7..105a1f734dc9 100644 --- a/nixpkgs/pkgs/tools/misc/wv2/default.nix +++ b/nixpkgs/pkgs/tools/misc/wv2/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: stdenv.mkDerivation rec { - name = "wv2-0.4.2"; + pname = "wv2"; + version = "0.4.2"; src = fetchurl { - url = "mirror://sourceforge/wvware/${name}.tar.bz2"; + url = "mirror://sourceforge/wvware/wv2-${version}.tar.bz2"; sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz"; }; diff --git a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix index 28c952400f17..4a89db07c45c 100644 --- a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix @@ -1,7 +1,8 @@ { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { - name = "xdxf2slob-unstable-2015-06-30"; + pname = "xdxf2slob"; + version = "unstable-2015-06-30"; src = fetchFromGitHub { owner = "itkach"; diff --git a/nixpkgs/pkgs/tools/misc/xflux/default.nix b/nixpkgs/pkgs/tools/misc/xflux/default.nix index 92c00d7e44d1..54a339f1d775 100644 --- a/nixpkgs/pkgs/tools/misc/xflux/default.nix +++ b/nixpkgs/pkgs/tools/misc/xflux/default.nix @@ -1,6 +1,7 @@ {lib, stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: stdenv.mkDerivation { - name = "xflux-2013-09-01"; + pname = "xflux"; + version = "unstable-2013-09-01"; src = fetchurl { url = "https://justgetflux.com/linux/xflux64.tgz"; sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; diff --git a/nixpkgs/pkgs/tools/misc/xfstests/default.nix b/nixpkgs/pkgs/tools/misc/xfstests/default.nix index 769e23c389c7..a35b57626110 100644 --- a/nixpkgs/pkgs/tools/misc/xfstests/default.nix +++ b/nixpkgs/pkgs/tools/misc/xfstests/default.nix @@ -4,7 +4,8 @@ , time, util-linux, which, writeScript, xfsprogs, runtimeShell }: stdenv.mkDerivation { - name = "xfstests-2019-09-08"; + pname = "xfstests"; + version = "unstable-2019-09-08"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; diff --git a/nixpkgs/pkgs/tools/misc/xtitle/default.nix b/nixpkgs/pkgs/tools/misc/xtitle/default.nix index 5199977e587f..2820958443ed 100644 --- a/nixpkgs/pkgs/tools/misc/xtitle/default.nix +++ b/nixpkgs/pkgs/tools/misc/xtitle/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: -stdenv.mkDerivation { - name = "xtitle-0.4.4"; +stdenv.mkDerivation rec { + pname = "xtitle"; + version = "0.4.4"; src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/0.4.4.tar.gz"; + url = "https://github.com/baskerville/xtitle/archive/${version}.tar.gz"; sha256 = "0w490a6ki90si1ri48jzhma473a598l1b12j8dp4ckici41z9yy2"; }; diff --git a/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix b/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix index 9cb2d1dea0da..581e36ecd741 100644 --- a/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix +++ b/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix @@ -12,6 +12,7 @@ , rtmpSupport ? true , phantomjsSupport ? false , hlsEncryptedSupport ? true +, withAlias ? false # Provides bin/youtube-dl for backcompat }: buildPythonPackage rec { @@ -19,20 +20,14 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.9.2"; + version = "2021.9.25"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-yn53zbBVuiaD31sIB6qxweEgy+AsjzXZ0yk9lNva6mM="; + sha256 = "e7b8dd0ee9498abbd80eb38d9753696d6ca3d02f64980322ab3bf39ba1bc31ee"; }; - # build_lazy_extractors assumes this directory exists but it is not present in - # the PyPI package - postPatch = '' - mkdir -p ytdlp_plugins/extractor - ''; - propagatedBuildInputs = [ websockets mutagen ] ++ lib.optional hlsEncryptedSupport pycryptodome; @@ -56,6 +51,10 @@ buildPythonPackage rec { # Requires network doCheck = false; + postInstall = lib.optionalString withAlias '' + ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" + ''; + meta = with lib; { homepage = "https://github.com/yt-dlp/yt-dlp/"; description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; diff --git a/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix index 827eaec048ff..6d80cd2400d2 100644 --- a/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-2.0.0"; + pname = "yubico-piv-tool"; + version = "2.0.0"; src = fetchurl { - url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs"; }; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix index af6843e38202..7e311b6ea23f 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -2,10 +2,11 @@ , libyubikey, yubikey-personalization }: mkDerivation rec { - name = "yubikey-personalization-gui-3.1.25"; + pname = "yubikey-personalization-gui"; + version = "3.1.25"; src = fetchurl { - url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/yubikey-personalization-gui-${version}.tar.gz"; sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; diff --git a/nixpkgs/pkgs/tools/misc/zellij/default.nix b/nixpkgs/pkgs/tools/misc/zellij/default.nix index 2d07c45e61db..81400bcd38fd 100644 --- a/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -6,21 +6,20 @@ , pkg-config , libiconv , openssl -, expect }: rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-2DYNgPURQzHaR8wHKEzuXSzubrxsQHpl3H3ko4okY7M="; + sha256 = "sha256-ZV908Zrvx075TTbrYsw0JdQD+66XRfd7EW48lNZLNik="; }; - cargoSha256 = "sha256-AxtXWBfOzdLCpRchaQJbBBs+6rIyF+2ralOflRvkY4k="; + cargoSha256 = "sha256-Wpg75RU1ANEnxgx28oy1kp4xt3HwIThNjHwmN8CRkjA="; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -32,9 +31,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installShellCompletion --cmd $pname \ - --bash <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion bash) \ - --fish <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion fish) \ - --zsh <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion zsh) + --bash <($out/bin/zellij setup --generate-completion bash) \ + --fish <($out/bin/zellij setup --generate-completion fish) \ + --zsh <($out/bin/zellij setup --generate-completion zsh) ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/nixpkgs/pkgs/tools/misc/zoxide/default.nix index 7a66c7f92c58..c2eba8c01b46 100644 --- a/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-vw/3pWqb1Qtat+17tzhBvpS+Z2DRe69HGmgzhMQPUw8="; + sha256 = "sha256-DcfWNp9fELRzLfNAU2qGXfLDkSbWGrsfW/Wy0t2ISXU="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-xybP9A2QfhuSSjsBVsJgSfDC/1/OahtF5xfsXAlmpjs="; + cargoSha256 = "sha256-O2IPmb9LH0ct0O2kR581Hfxl1sdb8himfq5U733JwGk="; postInstall = '' installManPage man/* diff --git a/nixpkgs/pkgs/tools/networking/atftp/default.nix b/nixpkgs/pkgs/tools/networking/atftp/default.nix index 0e76cb94346b..ca06afe7bdbf 100644 --- a/nixpkgs/pkgs/tools/networking/atftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/atftp/default.nix @@ -1,21 +1,27 @@ -{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: +{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }: stdenv.mkDerivation rec { pname = "atftp"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; - sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; + sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k"; }; + # fix test script + postPatch = '' + patchShebangs . + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ readline tcp_wrappers pcre gcc ]; # Expects pre-GCC5 inline semantics NIX_CFLAGS_COMPILE = "-std=gnu89"; - doCheck = false; # fails + doCheck = true; + checkInputs = [ ps ]; meta = { description = "Advanced tftp tools"; diff --git a/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix b/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix new file mode 100644 index 000000000000..35f2e801f531 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix @@ -0,0 +1,168 @@ +{ lib +, stdenv +, fetchFromGitLab +, mkDerivation +, buildGoModule +, wrapQtAppsHook +, python3Packages +, pkg-config +, openvpn +, cmake +, qmake +, which +, iproute2 +, iptables +, procps +, qmltermwidget +, qtbase +, qtdeclarative +, qtinstaller +, qtquickcontrols +, qtquickcontrols2 +, qttools +, CoreFoundation +, Security +, provider ? "riseup" +}: +let + version = "0.21.6"; + + src = fetchFromGitLab { + domain = "0xacab.org"; + owner = "leap"; + repo = "bitmask-vpn"; + rev = version; + sha256 = "sha256-LMz+ZgQVFGujoLA8rlyZ3VnW/NSlPipD5KwCe+cFtnY="; + }; + + # bitmask-root is only used on GNU/Linux + # and may one day be replaced by pkg/helper + bitmask-root = mkDerivation { + inherit src version; + sourceRoot = "source/helpers"; + pname = "bitmask-root"; + nativeBuildInputs = [ python3Packages.wrapPython ]; + postPatch = '' + substituteInPlace bitmask-root \ + --replace 'swhich("ip")' '"${iproute2}/bin/ip"' \ + --replace 'swhich("iptables")' '"${iptables}/bin/iptables"' \ + --replace 'swhich("ip6tables")' '"${iptables}/bin/ip6tables"' \ + --replace 'swhich("sysctl")' '"${procps}/bin/sysctl"' \ + --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn + substituteInPlace se.leap.bitmask.policy \ + --replace /usr/sbin/bitmask-root $out/bin/bitmask-root + ''; + installPhase = '' + runHook preInstall + + install -m 755 -D -t $out/bin bitmask-root + install -m 444 -D -t $out/share/polkit-1/actions se.leap.bitmask.policy + wrapPythonPrograms + + runHook postInstall + ''; + }; +in + +buildGoModule rec { + inherit src version; + pname = "${provider}-vpn"; + vendorSha256 = null; + + postPatch = '' + substituteInPlace pkg/pickle/helpers.go \ + --replace /usr/share $out/share + + # Using $PROVIDER is not working, + # thus replacing directly into the vendor.conf + substituteInPlace providers/vendor.conf \ + --replace "provider = riseup" "provider = ${provider}" + + patchShebangs gui/build.sh + wrapPythonProgramsIn branding/scripts + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace pkg/helper/linux.go \ + --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn + substituteInPlace pkg/vpn/launcher_linux.go \ + --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn \ + --replace /usr/sbin/bitmask-root ${bitmask-root}/bin/bitmask-root \ + --replace /usr/bin/lxpolkit /run/wrappers/bin/polkit-agent-helper-1 \ + --replace '"polkit-gnome-authentication-agent-1",' '"polkit-gnome-authentication-agent-1","polkitd",' + ''; + + nativeBuildInputs = [ + cmake + pkg-config + python3Packages.wrapPython + qmake + qtquickcontrols + qtquickcontrols2 + qttools + which + wrapQtAppsHook + ] ++ lib.optional (!stdenv.isLinux) qtinstaller; + + buildInputs = [ + qtbase + qmltermwidget + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + # FIXME: building on Darwin currently fails + # due to missing debug symbols for Qt, + # this should be fixable once darwin.apple_sdk >= 10.13 + # See https://bugreports.qt.io/browse/QTBUG-76777 + + # Not using buildGoModule's buildPhase: + # gui/build.sh will build Go modules into lib/libgoshim.a + buildPhase = '' + runHook preBuild + + make gen_providers_json + make generate + # Remove timestamps in comments + sed -i -e '/^\/\//d' pkg/config/version/version.go + + # Not using -j$NIX_BUILD_CORES because the Makefile's rules + # are not thread-safe: lib/libgoshim.h is used before being built. + make build + + runHook postBuild + ''; + + postInstall = '' + install -m 755 -D -t $out/bin build/qt/release/${provider}-vpn + + VERSION=${version} VENDOR_PATH=providers branding/scripts/generate-debian branding/templates/debian/data.json + (cd branding/templates/debian && ${python3Packages.python}/bin/python3 generate.py) + install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${provider}-vpn.desktop + '' + lib.optionalString stdenv.isLinux '' + install -m 444 -D -t $out/share/polkit-1/actions ${bitmask-root}/share/polkit-1/actions/se.leap.bitmask.policy + ''; + + # Some tests need access to the Internet: + # Post "https://api.black.riseup.net/3/cert": dial tcp: lookup api.black.riseup.net on [::1]:53: read udp [::1]:56553->[::1]:53: read: connection refused + doCheck = false; + + passthru = { inherit bitmask-root; }; + + meta = { + description = "Generic VPN client by LEAP"; + longDescription = '' + Bitmask, by LEAP (LEAP Encryption Access Project), + is an application to provide easy and secure encrypted communication + with a VPN (Virtual Private Network). It allows you to select from + a variety of trusted service provider all from one app. + Current providers include Riseup Networks + and The Calyx Institute, where the former is default. + The <literal>${provider}-vpn</literal> executable should appear + in your desktop manager's XDG menu or could be launch in a terminal + to get an execution log. A new icon should then appear in your systray + to control the VPN and configure some options. + ''; + homepage = "https://bitmask.net"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ julm ]; + # darwin requires apple_sdk >= 10.13 + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/boundary/default.nix b/nixpkgs/pkgs/tools/networking/boundary/default.nix index 02dc1cd9c487..c55eeff8c101 100644 --- a/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.6.0"; + version = "0.6.1"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-9xgvSnfMh5kX/RtC/B+tkbSNcB82U6SYzCs5V04VzW0="; - aarch64-linux = "sha256-ARSZygm1OayiOxF7I+/5ebwtaO0z/lYztuwNSD4Zu+0="; - x86_64-darwin = "sha256-GFLLpOt3BEJI14xKjnjK6nd4h/0+/aSLOagZphOKErE="; + x86_64-linux = "sha256-E+AQhm2ddaDU8G0KuK0dC4wUU4YFELwO/q+8d2kpnV8="; + aarch64-linux = "sha256-RG4hazKsuUCYYBfDJ9OWghHlBNLEaxVOz5YGHP+ySbA="; + x86_64-darwin = "sha256-h0EjoEU+U3HQhmnPBKGijFJrkg9yPPP7zyWNbrn2e5Q="; }; in fetchzip { diff --git a/nixpkgs/pkgs/tools/networking/curl/default.nix b/nixpkgs/pkgs/tools/networking/curl/default.nix index 984a6ecaaef8..b3572e01c96d 100644 --- a/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -7,8 +7,9 @@ , gnutlsSupport ? false, gnutls ? null , wolfsslSupport ? false, wolfssl ? null , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null -, gssSupport ? with stdenv.hostPlatform; !( +, gssSupport ? with stdenv.hostPlatform; ( !isWindows && + # disable gss becuase of: undefined reference to `k5_bcmp' # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 !isStatic && # the "mig" tool does not configure its compiler correctly. This could be @@ -63,6 +64,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + strictDeps = true; + nativeBuildInputs = [ pkg-config perl ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -93,15 +96,15 @@ stdenv.mkDerivation rec { "--without-ca-bundle" "--without-ca-path" # The build fails when using wolfssl with --with-ca-fallback - ( if wolfsslSupport then "--without-ca-fallback" else "--with-ca-fallback") + (lib.withFeature (!wolfsslSupport) "ca-fallback") "--disable-manual" - ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) - ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" ) - ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) - ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) - ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) - ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) - ( if brotliSupport then "--with-brotli" else "--without-brotli" ) + (lib.withFeatureAs sslSupport "ssl" openssl.dev) + (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev) + (lib.withFeatureAs scpSupport "libssh2" libssh2.dev) + (lib.enableFeature ldapSupport "ldap") + (lib.enableFeature ldapSupport "ldaps") + (lib.withFeatureAs idnSupport "libidn" libidn.dev) + (lib.withFeature brotliSupport "brotli") ] ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" ++ lib.optional c-aresSupport "--enable-ares=${c-ares}" @@ -142,5 +145,7 @@ stdenv.mkDerivation rec { license = licenses.curl; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; + # Fails to link against static brotli or gss + broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); }; } diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/README.md b/nixpkgs/pkgs/tools/networking/dd-agent/README.md deleted file mode 100644 index 8cff23b9574c..000000000000 --- a/nixpkgs/pkgs/tools/networking/dd-agent/README.md +++ /dev/null @@ -1,17 +0,0 @@ -To update datadog-agent v6 (v5 is deprecated and should be removed): - -1. Bump `version`, `rev`, `sha256` and `payloadVersion` in `datadog-agent.nix` -2. `git clone https://github.com/DataDog/datadog-agent.git && cd datadog-agent` -3. `git checkout <tag>` -4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz` -5. `dep2nix` -6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix` - -To update datadog-process-agent: - -1. Bump `version`, `rev` and `sha256` in `datadog-process-agent.nix` -2. `git clone https://github.com/DataDog/datadog-process-agent.git && cd datadog-process-agent` -3. `git checkout <tag>` -4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz` -5. `dep2nix` -6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix` diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix deleted file mode 100644 index fb6f66b5a4e4..000000000000 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix +++ /dev/null @@ -1,1353 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "git"; - url = "https://github.com/adjust/goautoneg"; - rev = "d788f35a0315672bc90f50a6145d1252a230ee0d"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/DataDog/agent-payload"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/agent-payload"; - rev = "c76e9d5be7457cafb7b3e056c6e8ae127b1f0431"; - sha256 = "0wva55yz5gs5gw23icz1z23hwhjw5vmijx4aa3fp3bq6pi63s873"; - }; - } - { - goPackagePath = "github.com/DataDog/datadog-go"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/datadog-go"; - rev = "e67964b4021ad3a334e748e8811eb3cd6becbc6e"; - sha256 = "1b2dzyk9c9icdwcyfiwh3djzh8gb5z4hmhp796ns7hh72cdnnys1"; - }; - } - { - goPackagePath = "github.com/DataDog/gohai"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/gohai"; - rev = "43b075bb9705588cd89c71363d6d72937e3020c7"; - sha256 = "195z5g8gdxcx4cq51p2xqha3j8m7mk5d5lr6i3hbaxp948hgc8dh"; - }; - } - { - goPackagePath = "github.com/DataDog/mmh3"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/mmh3"; - rev = "2cfb68475274527a10701355c739f31dd404718c"; - sha256 = "09jgzxi08pkxllxk3f5qwipz96jxrw5v035fj2bkid1d4akn8y0b"; - }; - } - { - goPackagePath = "github.com/DataDog/viper"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/viper"; - rev = "v1.5.0"; - sha256 = "1sv0xvmfaif7zpfwk0j6qf11hxnfdsb2zfj63b9zx7l0zzhjzh06"; - }; - } - { - goPackagePath = "github.com/DataDog/zstd"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/zstd"; - rev = "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab"; - sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8"; - }; - } - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "67921128fb397dd80339870d2193d6b1e6856fd4"; - sha256 = "1m3ajjwpdmbzhn5iclhzgyknfncw06fnd5n91yxlf75qsq235rz3"; - }; - } - { - goPackagePath = "github.com/Microsoft/hcsshim"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/hcsshim"; - rev = "0acf63599bff447edf6bbfb8bbb38cb5fb33aa1e"; - sha256 = "009jx133302pj0jf1bxsj4r5zy7j0lxmr7l53czi7930516b0rh3"; - }; - } - { - goPackagePath = "github.com/NYTimes/gziphandler"; - fetch = { - type = "git"; - url = "https://github.com/NYTimes/gziphandler"; - rev = "2600fb119af974220d3916a5916d6e31176aac1b"; - sha256 = "0bh6qqz2iyrnxhhj02s8mqayqwqxy182ldxh97q1vg7phlbm52xx"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"; - sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad457846296e2031421a34e2568e304e35"; - sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; - }; - } - { - goPackagePath = "github.com/StackExchange/wmi"; - fetch = { - type = "git"; - url = "https://github.com/StackExchange/wmi"; - rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; - sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "bff41fb23b7550368282029f6478819d6a99ae0f"; - sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn"; - }; - } - { - goPackagePath = "github.com/beevik/ntp"; - fetch = { - type = "git"; - url = "https://github.com/beevik/ntp"; - rev = "cb3dae3a7588ae35829eb5724df611cd75152fba"; - sha256 = "0nc6f7d0xw23y18z9qxrmm8kvnywihassyk706mn9v4makmhalnz"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "2ea60e5f094469f9e65adb9cd103795b73ae743e"; - sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; - }; - } - { - goPackagePath = "github.com/cihub/seelog"; - fetch = { - type = "git"; - url = "https://github.com/cihub/seelog"; - rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115"; - sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p"; - }; - } - { - goPackagePath = "github.com/clbanning/mxj"; - fetch = { - type = "git"; - url = "https://github.com/clbanning/mxj"; - rev = "1f00e0bf9bacd7ea9c93d27594d1d1f5a41bac36"; - sha256 = "1cb7kib79xrzr8n91p6kskmn30ayqrhbqql2ppyf879967wbm8qy"; - }; - } - { - goPackagePath = "github.com/containerd/cgroups"; - fetch = { - type = "git"; - url = "https://github.com/containerd/cgroups"; - rev = "3024bc7cc0c88af4b32d38a14444f38e65ab169f"; - sha256 = "09jmzwl0zjzwhyd77pp8x3xwihcjxlxa9wamkx22rvd1pqlgszw7"; - }; - } - { - goPackagePath = "github.com/containerd/containerd"; - fetch = { - type = "git"; - url = "https://github.com/containerd/containerd"; - rev = "9754871865f7fe2f4e74d43e2fc7ccd237edcbce"; - sha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"; - }; - } - { - goPackagePath = "github.com/containerd/continuity"; - fetch = { - type = "git"; - url = "https://github.com/containerd/continuity"; - rev = "c7c5070e6f6e090ab93b0a61eb921f2196fc3383"; - sha256 = "0xyf9w4xn501jspl4r6ml84am90bfgljnjlbd4i1pxkm372qzvzf"; - }; - } - { - goPackagePath = "github.com/containerd/cri"; - fetch = { - type = "git"; - url = "https://github.com/containerd/cri"; - rev = "f3687c59470b76ee57c90d4b3dd92888dec58c2b"; - sha256 = "00lasx5yylmgsj1f9znl3xyxm2bngj4xfj69vcwb4qzdy0vclc7w"; - }; - } - { - goPackagePath = "github.com/containerd/fifo"; - fetch = { - type = "git"; - url = "https://github.com/containerd/fifo"; - rev = "3d5202aec260678c48179c56f40e6f38a095738c"; - sha256 = "11jp12vgfj0xg9m2w5cfay72fwrxb6w8za7rkcqw8yy8hypiqqxq"; - }; - } - { - goPackagePath = "github.com/containerd/typeurl"; - fetch = { - type = "git"; - url = "https://github.com/containerd/typeurl"; - rev = "a93fcdb778cd272c6e9b3028b2f42d813e785d40"; - sha256 = "0aqnf5rzc5pldln0czhxlr0fqaf5553ab7wzsq85p90lg1ryqnd6"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "c9504f61fc7f29b0ad30bf8bab02d9e1b600e962"; - sha256 = "1ap8zhfz6pcn2ipn27s84ihpyrvpjrb48mpy4n5pr6khrni83p1a"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "40e2722dffead74698ca12a750f64ef313ddce05"; - sha256 = "0kq7aa0pbn8gv9ny2a1gfx3ybsqyryfwz9gv7fck6zfc8xxbl1fa"; - }; - } - { - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"; - sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "83389a148052d74ac602f5f1d62f86ff2f3c4aa5"; - sha256 = "0ypps7340k1g1njcdbn83c9233hrki0mxyj66av1i55ji378ayyn"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"; - sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; - sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; - }; - } - { - goPackagePath = "github.com/docker/go-events"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-events"; - rev = "9461782956ad83b30282bf90e31fa6a70c255ba9"; - sha256 = "0vn0kd0w253jwdk86gv1h6s8p6bzxiyif74xdzlb39zr6fdrr145"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - { - goPackagePath = "github.com/docker/spdystream"; - fetch = { - type = "git"; - url = "https://github.com/docker/spdystream"; - rev = "bc6354cbbc295e925e4c611ffe90c1f287ee54db"; - sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya"; - }; - } - { - goPackagePath = "github.com/dsnet/compress"; - fetch = { - type = "git"; - url = "https://github.com/dsnet/compress"; - rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; - sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; - sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "3658237ded108b4134956c1b3050349d93e7b895"; - sha256 = "07sm3b5dlrqld4r8r1w79s37y41fk4zmw4afhi2ragjy1iarqck3"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful-swagger12"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful-swagger12"; - rev = "dcef7f55730566d41eae5db10e7d6981829720f6"; - sha256 = "0zz1f6n1qfbyrp592mgyrkyfhki3r0ksic6ja9lxisg8br1ibrvq"; - }; - } - { - goPackagePath = "github.com/evanphx/json-patch"; - fetch = { - type = "git"; - url = "https://github.com/evanphx/json-patch"; - rev = "afac545df32f2287a079e2dfb7ba2745a643747e"; - sha256 = "1d90prf8wfvndqjn6nr0k405ykia5vb70sjw4ywd49s9p3wcdyn8"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"; - sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a"; - }; - } - { - goPackagePath = "github.com/go-ole/go-ole"; - fetch = { - type = "git"; - url = "https://github.com/go-ole/go-ole"; - rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; - sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "3a0015ad55fa9873f41605d3e8f28cd279c32ab2"; - sha256 = "02an755ashhckqwxyq2avgn8mm4qq3hxda2jsj1a3bix2gkb45v7"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "3fb327e6747da3043567ee86abd02bb6376b6be2"; - sha256 = "0zwsrmqqcihm0lj2pc18cpm7wnn1dzwr4kvrlyrxf0lnn7dsdsbm"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "bcff419492eeeb01f76e77d2ebc714dc97b607f5"; - sha256 = "00z8sv766kjdrdvpyzm9c5x3d45gssbwsm77qihmkflric6a3d3l"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "811b1089cde9dad18d4d0c2d09fbdbf28dbd27a5"; - sha256 = "0hkbrq4jq9s4nrz7xpx03z1zljss1zdylm3zb76hhjpp0s7hz418"; - }; - } - { - goPackagePath = "github.com/godbus/dbus"; - fetch = { - type = "git"; - url = "https://github.com/godbus/dbus"; - rev = "a389bdde4dd695d414e47b755e95e72b7826432c"; - sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9"; - }; - } - { - goPackagePath = "github.com/gogo/googleapis"; - fetch = { - type = "git"; - url = "https://github.com/gogo/googleapis"; - rev = "08a7655d27152912db7aaf4f983275eaf8d128ef"; - sha256 = "0mzjclx31hkdgad0xjdihz23qphrsljkvzx5gnwn96m7agx6vkvr"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; - sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "24b0969c4cb722950103eed87108c8d291a8df00"; - sha256 = "0rj588dxg4ncanj8vcsixi00161xq54nz7siv47d5ijmzgxs82zf"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "7c663266750e7d82587642f65e60bc4083f1f84e"; - sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "9cad4c3443a7200dd6400aef47183728de563a38"; - sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "fb848fc48818f58690db09d14640513aa6bf3c02"; - sha256 = "0ra38xrh6ghcnix8w6gjs33yr2ra1n5jvf8lww4csr4dgw5bh5b1"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; - sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; - sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; - sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; - sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; - }; - } - { - goPackagePath = "github.com/hashicorp/serf"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/serf"; - rev = "d6574a5bb1226678d7010325fb6c985db20ee458"; - sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; - }; - } - { - goPackagePath = "github.com/hectane/go-acl"; - fetch = { - type = "git"; - url = "https://github.com/hectane/go-acl"; - rev = "7f56832555fc229dad908c67d65ed3ce6156b70c"; - sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58"; - sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "1624edc4454b8682399def8740d46db5e4362ba4"; - sha256 = "11wn4hpmrs8bmpvd93wqk49jfbbgylakhi35f9k5qd7jd479ci4s"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - { - goPackagePath = "github.com/kubernetes-incubator/custom-metrics-apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver"; - rev = "85ebc283a57287a8fcb3ad4b488d633cd63ef7d8"; - sha256 = "06m3xa9j46035bagv9r2ghsmdx6pr0r3lcj4hz1cx943dllj0n6v"; - }; - } - { - goPackagePath = "github.com/lxn/walk"; - fetch = { - type = "git"; - url = "https://github.com/lxn/walk"; - rev = "02935bac0ab8448d5f9bf72ebeeb7ca0d5553f9b"; - sha256 = "0m0dva6nyv6vxc188c9003g5ylxb6clmlcvqjgaibbcrxkxjw1d5"; - }; - } - { - goPackagePath = "github.com/lxn/win"; - fetch = { - type = "git"; - url = "https://github.com/lxn/win"; - rev = "7e1250ba2e7749fb9eb865da9ee93fb5a2fe73f1"; - sha256 = "1n5ksvy3va3zd0iqpl64advjscm2w9n8kxn45ahahvbrbi7zy1zw"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mholt/archiver"; - fetch = { - type = "git"; - url = "https://github.com/mholt/archiver"; - rev = "26cf5bb32d07aa4e8d0de15f56ce516f4641d7df"; - sha256 = "1r2gcxh8gkyn1l0h7sshachg2fxz6542lbqcar9zym6n2dni30mm"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; - sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"; - sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7"; - }; - } - { - goPackagePath = "github.com/mitchellh/reflectwalk"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/reflectwalk"; - rev = "63d60e9d0dbc60cf9164e6510889b0db6683d98c"; - sha256 = "1hpq6sjr6l1h25x68mz13q7sd52dv1mjfxbl5p7m3j7cv85khnvc"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; - }; - } - { - goPackagePath = "github.com/nwaples/rardecode"; - fetch = { - type = "git"; - url = "https://github.com/nwaples/rardecode"; - rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"; - sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw"; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - }; - } - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "d60099175f88c47cd379c4738d158884749ed235"; - sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "baf6536d6259209c3edfa2b22237af82942d3dfa"; - sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7"; - }; - } - { - goPackagePath = "github.com/opencontainers/runtime-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runtime-spec"; - rev = "d810dbc60d8c5aeeb3d054bd1132fab2121968ce"; - sha256 = "0yqya0wslhv87nlidsmrw2720y3r3jpvqc2sh28y79ciyypxbk38"; - }; - } - { - goPackagePath = "github.com/openshift/api"; - fetch = { - type = "git"; - url = "https://github.com/openshift/api"; - rev = "0d921e363e951d89f583292c60d013c318df64dc"; - sha256 = "171xac4hr665q08mp17fld2zfpp95h9mjws2wikcr0brwq878p3s"; - }; - } - { - goPackagePath = "github.com/patrickmn/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/patrickmn/go-cache"; - rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; - sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "e790cca94e6cc75c7064b1332e63811d4aae1a53"; - sha256 = "0y1crv4wkly2naki2f68ln9sc8l9skswkc696vr8vc43p4p67wam"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/petar/GoLLRB"; - fetch = { - type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; - sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; - }; - } - { - goPackagePath = "github.com/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; - sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "1958fd8fff7f115e79725b1288e0b878b3e06b00"; - sha256 = "1c4xi40bvcp91a3lw9nw1hylvdmb51hviwrqv5f6zj1sswkv24ps"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "89d80287644767070914e30199b4d959e491bd3d"; - sha256 = "0nvbjr8nhkyakgjariskl3bvyb18723dzjmmxph6ppf4khi50j0w"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "7d6f385de8bea29190f15ba9931442a0eaef9af7"; - sha256 = "18cish8yas5r6xhgp8p8n7lg4wh3d4szzirszxra8m7rwy3swxxq"; - }; - } - { - goPackagePath = "github.com/samuel/go-zookeeper"; - fetch = { - type = "git"; - url = "https://github.com/samuel/go-zookeeper"; - rev = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"; - sha256 = "0i7mxg9hz8ymglq2xcwwswy1pvcr53qd57lzcdlf3d5bjki73a4w"; - }; - } - { - goPackagePath = "github.com/sbinet/go-python"; - fetch = { - type = "git"; - url = "https://github.com/sbinet/go-python"; - rev = "f976f61134dc6f5b4920941eb1b0e7cec7e4ef4c"; - sha256 = "15l7wip7kr1z6v3315m9y0070wmwq447q7gwz6490xwnclrq85kl"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "ccc1c1016bc5d10e803189ee43417c50cdde7f1b"; - sha256 = "0dk7644fc86n0974a00m2w5nbhzcgs1jjnillic90044w7rycg66"; - }; - } - { - goPackagePath = "github.com/shirou/w32"; - fetch = { - type = "git"; - url = "https://github.com/shirou/w32"; - rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; - sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "3e01752db0189b9157070a0e1668a620f9a85da2"; - sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "787d034dfe70e44075ccc060d346146ef53270ad"; - sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/cast"; - rev = "1ee8c8bd14a3d768a7ff681617ed56bc6c204940"; - sha256 = "0sgqmhicy672250cxgqd8zlni3qlj57r8liyiaq15g9spyhflhl0"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; - sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/syndtr/gocapability"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/gocapability"; - rev = "33e07d32887e1e06b7c025f27ce52f62c7990bc0"; - sha256 = "1x88c0b320b13w7samicf19dqx9rr4dnrh3yglk3cba21nwsp57i"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "af6442a0fcf6e2a1b824f70dd0c734f01e817751"; - sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "8c0409fcbb70099c748d71f714529204975f6c3f"; - sha256 = "0z61j0cniq3n5af0q57dbpyfmidihzimrwnysfphfzwyd0ic4rcv"; - }; - } - { - goPackagePath = "github.com/ulikunitz/xz"; - fetch = { - type = "git"; - url = "https://github.com/ulikunitz/xz"; - rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; - sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; - }; - } - { - goPackagePath = "github.com/urfave/negroni"; - fetch = { - type = "git"; - url = "https://github.com/urfave/negroni"; - rev = "5dbbc83f748fc3ad38585842b0aedab546d0ea1e"; - sha256 = "10w4ygc78hgsryxwmjmz8w51d84bjh7jm8j0xfv4vnpz5gscc8dj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; - sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "bceb7ef27cc623473a5b664d2a3450576dddff0f"; - sha256 = "0xky2417wm61j2p5ki3k4237fxyz8f5ds19nak0lm741s3xs2rqx"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "97aa3a539ec716117a9d15a4659a911f50d13c3c"; - sha256 = "1738bi8l50f0iq0il6h4qy1cgy39yh3q4gh1lwp5y5j7jyy33ccd"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"; - sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "ff3583edef7de132f219f0efc00e097cabcc0ec0"; - sha256 = "0bpzxk85fgvznmdf9356nzh8riqhwzcil9r2a955rbfn27lh4lmy"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; - sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; - }; - } - { - goPackagePath = "gopkg.in/Knetic/govaluate.v3"; - fetch = { - type = "git"; - url = "https://github.com/Knetic/govaluate"; - rev = "d216395917cc49052c7c7094cf57f09657ca08a8"; - sha256 = "1b0sy89hy5d1720i43ikqfcxr4v6p9g9c7rnbif8s6256a7c2rsq"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; - sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; - fetch = { - type = "git"; - url = "https://github.com/natefinch/lumberjack"; - rev = "a96e63847dc3c67d17befa69c303767e2f84e54f"; - sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://github.com/square/go-jose"; - rev = "ef984e69dd356202fd4e4910d4d9c24468bdf0b8"; - sha256 = "0pxyrygc9mh6yn169rm6i3shax7zmmzps22px6mq3kl87zkk9b8h"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; - }; - } - { - goPackagePath = "gopkg.in/zorkian/go-datadog-api.v2"; - fetch = { - type = "git"; - url = "https://github.com/zorkian/go-datadog-api"; - rev = "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a"; - sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "4e7be11eab3ffcfc1876898b8272df53785a9504"; - sha256 = "0klwmkvsnim66y8mvcmkqql12fbr5cja4qgjzp36197i6i335b62"; - }; - } - { - goPackagePath = "k8s.io/apiextensions-apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apiextensions-apiserver"; - rev = "b499623aa7a31f7c85b37017e068b21206a68e25"; - sha256 = "1c0z71f0wqkwkc5x730l9gmzibkqk6af4mg5l6ks9lk69cbpxk0a"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "def12e63c512da17043b4f0293f52d1006603d9f"; - sha256 = "0dghch5avwcy3zx5k005hi71i9bl3603pk927xdjr5jlajzwm9xd"; - }; - } - { - goPackagePath = "k8s.io/apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apiserver"; - rev = "d296c96c12b7d15d7fb5fea7a05fb165f8fd4014"; - sha256 = "0a413zpkm8afhh0jab8zrwvd61kvackll85kcdb6gyinw7f6qv7x"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "f2f85107cac6fe04c30435ca0ac0c3318fd1b94c"; - sha256 = "153a3q172kmpbp6cq5005dgasdw0x36pg9xz1mfgv966k8rwws74"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "b742be413d0a6f781c123bed504c8fb39264c57d"; - sha256 = "13ik6dri0f9fzs8p6987h6n3y2aqjz5cj957826xwkpv4fj2zgq8"; - }; - } - { - goPackagePath = "k8s.io/kubernetes"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kubernetes"; - rev = "bb9ffb1654d4a729bb4cec18ff088eacc153c239"; - sha256 = "0c5xpxg7ns5irrr0ydk8n394yp3922i0m61l26qyc183phr32wxi"; - }; - } - { - goPackagePath = "k8s.io/metrics"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/metrics"; - rev = "972ef826b8401c180b89cefc7457daa2d116daa9"; - sha256 = "0ba9mfy253d4pcqdvialh2shs4d43l0q84pn3569wiib8cisbc68"; - }; - } - { - goPackagePath = "k8s.io/utils"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/utils"; - rev = "cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb"; - sha256 = "1wpqijsvf8s4iqjrrzgbxi3gay6vaglscyq14vxma4iacg8fx1jk"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index ad37245d57ca..7f500b2c09fc 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,22 +1,25 @@ -{ lib, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: +{ lib, buildGoModule, makeWrapper, fetchFromGitHub, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: let # keep this in sync with github.com/DataDog/agent-payload dependency - payloadVersion = "4.7.1"; + payloadVersion = "4.78.0"; python = pythonPackages.python; - -in buildGoPackage rec { - pname = "datadog-agent"; - version = "6.11.2"; owner = "DataDog"; repo = "datadog-agent"; + goPackagePath = "github.com/${owner}/${repo}"; + +in buildGoModule rec { + pname = "datadog-agent"; + version = "7.30.2"; src = fetchFromGitHub { inherit owner repo; - rev = version; - sha256 = "1dwdiaf357l9c6b2cps5mdyfma3c1mp96zzxg1826fvz3x8ix68z"; + rev = version; + sha256 = "17ahrxhb87sj7f04wg44xv4k9wrlvf04j92ac5936a6maygp01rd"; }; + vendorSha256 = "06ryy501vibc6n14qwg94394c76l060525y6qg261qb748mbi8qi"; + subPackages = [ "cmd/agent" "cmd/cluster-agent" @@ -24,15 +27,12 @@ in buildGoPackage rec { "cmd/py-launcher" "cmd/trace-agent" ]; - goDeps = ./datadog-agent-deps.nix; - goPackagePath = "github.com/${owner}/${repo}"; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ systemd ]; PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; - preBuild = let ldFlags = lib.concatStringsSep " " [ "-X ${goPackagePath}/pkg/version.Commit=${src.rev}" @@ -43,6 +43,8 @@ in buildGoPackage rec { ]; in '' buildFlagsArray=( "-tags" "ec2 systemd cpython process log secrets ${lib.concatStringsSep " " extraTags}" "-ldflags" "${ldFlags}") + # Keep directories to generate in sync with tasks/go.py + go generate ./pkg/status ./cmd/agent/gui ''; # DataDog use paths relative to the agent binary, so fix these. @@ -61,7 +63,7 @@ in buildGoPackage rec { cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages} - cp -R $src/pkg/status/dist/templates $out/share/datadog-agent + cp -R $src/pkg/status/templates $out/share/datadog-agent wrapProgram "$out/bin/agent" \ --set PYTHONPATH "$out/${python.sitePackages}" \ diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix deleted file mode 100644 index 4533b31dd231..000000000000 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix +++ /dev/null @@ -1,669 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "git"; - url = "https://github.com/adjust/goautoneg"; - rev = "d788f35a0315672bc90f50a6145d1252a230ee0d"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/DataDog/agent-payload"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/agent-payload"; - rev = "f0521943f60221829c6bb5de1c7f788cd4411372"; - sha256 = "19m3kiwi0g2a0rysjabrb2nkkz7yx632g7s05mylv1x2ixparhrg"; - }; - } - { - goPackagePath = "github.com/DataDog/datadog-agent"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/datadog-agent"; - rev = "d7712d570b91f4f97af9f155ad1c676921d8325d"; - sha256 = "1gi921z79la4hjhm8xhl4jz167200qljvhhsy4blj4vinkgfpm8w"; - }; - } - { - goPackagePath = "github.com/DataDog/datadog-go"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/datadog-go"; - rev = "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d"; - sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki"; - }; - } - { - goPackagePath = "github.com/DataDog/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/gopsutil"; - rev = "233cd0cf42c26d835ed6f0e46f2103432a88b526"; - sha256 = "0rvxs1jjzv3j834dns28zr25bznarjmpgdy0z6gpimnq5nyicys5"; - }; - } - { - goPackagePath = "github.com/DataDog/viper"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/viper"; - rev = "v1.5.0"; - sha256 = "1sv0xvmfaif7zpfwk0j6qf11hxnfdsb2zfj63b9zx7l0zzhjzh06"; - }; - } - { - goPackagePath = "github.com/DataDog/zstd"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/zstd"; - rev = "2b373cbe6ac0c8e6960bbd18026ceb269eef89f5"; - sha256 = "157kh7w173igxbypknmr8hc8934ykmnb02pkb76k1jwq4sphn8qj"; - }; - } - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "97e4973ce50b2ff5f09635a57e2b88a037aae829"; - sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; - }; - } - { - goPackagePath = "github.com/StackExchange/wmi"; - fetch = { - type = "git"; - url = "https://github.com/StackExchange/wmi"; - rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; - sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "bff41fb23b7550368282029f6478819d6a99ae0f"; - sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; - sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "b7325b0f3f1097c6546ea5e83c4a23267e58ad71"; - sha256 = "0vx4ggryxd9w111mf1bi2g51559r8sh99gdqah72k4dfj3vrv19d"; - }; - } - { - goPackagePath = "github.com/cihub/seelog"; - fetch = { - type = "git"; - url = "https://github.com/cihub/seelog"; - rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115"; - sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"; - sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"; - sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e"; - sha256 = "11szydahzjz7zia3hr8kplnlxsg9papbvc2mgr1vlwrahxpdx7l7"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40"; - sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "ccc981bf80385c528a65fbfdd49bf2d8da22aa23"; - sha256 = "0hcrfmiyx27izac3v0ii0qq2kfjvhr9ma1i79hrl6a6y2ayagzz7"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee"; - sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333"; - sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg"; - }; - } - { - goPackagePath = "github.com/go-ole/go-ole"; - fetch = { - type = "git"; - url = "https://github.com/go-ole/go-ole"; - rev = "7a0fa49edf48165190530c675167e2f319a05268"; - sha256 = "00v6fixm35pj8jyqbj0z3kyv7bhrqa2dr2fgmlc9xqwbf0nayssy"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "d76fbc1373015ced59b43ac267f28d546b955683"; - sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; - sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "44d81051d367757e1c7c6a5a86423ece9afcf63c"; - sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "0c5108395e2debce0d731cf0287ddf7242066aba"; - sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"; - sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "65a6292f0157eff210d03ed1bf6c59b190b8b906"; - sha256 = "00qgmygfa4vgf9v3lpz4vp1ca1hcfcxnjqjrvp6z4jjklc8x4mqf"; - }; - } - { - goPackagePath = "github.com/hectane/go-acl"; - fetch = { - type = "git"; - url = "https://github.com/hectane/go-acl"; - rev = "7f56832555fc229dad908c67d65ed3ce6156b70c"; - sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630"; - }; - } - { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc"; - sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g"; - }; - } - { - goPackagePath = "github.com/iovisor/gobpf"; - fetch = { - type = "git"; - url = "https://github.com/iovisor/gobpf"; - rev = "98ebf56442afb10e1b43145127de3c1777ed7e95"; - sha256 = "0m2aah77b1k2yf31za975mcix5n0jijqkqmhgakip00klihx383k"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682"; - sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - { - goPackagePath = "github.com/kubernetes-incubator/custom-metrics-apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver"; - rev = "bb8bae16c5550f2aeef3151259a1b36078a0e544"; - sha256 = "1f1n4dh9w2qfs704yw8nhbv50n6f9fxy8ndir96l37lnwd2dvj8p"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "60711f1a8329503b04e1c88535f419d0bb440bff"; - sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "fa473d140ef3c6adf42d6b391fe76707f1f243c8"; - sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; - }; - } - { - goPackagePath = "github.com/patrickmn/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/patrickmn/go-cache"; - rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; - sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; - sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; - sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; - sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "e7e903064f5e9eb5da98208bae10b475d4db0f8c"; - sha256 = "0mn6x6za7br81vc9s8d58ivylpx5j4xdq72n7kz3aybniif49r3i"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"; - sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "65c1f6f8f0fc1e2185eb9863a3bc751496404259"; - sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "071446942108a03a13cf0717275ad3bdbcb691b4"; - sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp"; - }; - } - { - goPackagePath = "github.com/shirou/w32"; - fetch = { - type = "git"; - url = "https://github.com/shirou/w32"; - rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; - sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "4a4406e478ca629068e7768fc33f3f044173c0a6"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c10c31b5e94b6f7a0283272dc2bb27163dcea24b"; - sha256 = "1a4k61xrwmr99fib2m1rcavbaxihnsmy1bgqhff5hkcv4n7bpsl2"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "0ff817254b04da935cce10d2d1270ccf047fbbd7"; - sha256 = "0hzsis106xh3hcydjribcar75va3ghp4hwbj9982h2msi27v54x4"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a9d3bda3a223baa6bba6ef412cb273f0fd163c05"; - sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; - sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "a4bde12657593d5e90d0533a3e4fd95e635124cb"; - sha256 = "07r227rrqgwkchm63dzmdyv5yplbla1vnwkn6qrr940l4psy15aw"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; - }; - } - { - goPackagePath = "gopkg.in/zorkian/go-datadog-api.v2"; - fetch = { - type = "git"; - url = "https://github.com/zorkian/go-datadog-api"; - rev = "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a"; - sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "9e5ffd1f1320950b238cfce291b926411f0af722"; - sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "e386b2658ed20923da8cc9250e552f082899a1ee"; - sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz"; - }; - } - { - goPackagePath = "k8s.io/apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apiserver"; - rev = "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3"; - sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "23781f4d6632d88e869066eaebb743857aa1ef9b"; - sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v"; - }; - } - { - goPackagePath = "k8s.io/metrics"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/metrics"; - rev = "0d9ea2ac660031c8f2726a735dda29441f396f99"; - sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index e2c497dad405..1dbedea50232 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -1,24 +1,11 @@ -{ lib, fetchFromGitHub, buildGoPackage }: - -buildGoPackage rec { +{ lib, datadog-agent }: +datadog-agent.overrideAttrs (attrs: { pname = "datadog-process-agent"; - version = "6.11.1"; - owner = "DataDog"; - repo = "datadog-process-agent"; - - src = fetchFromGitHub { - inherit owner repo; - rev = version; - sha256 = "0fc2flm0pa44mjxvn4fan0mkvg9yyg27w68xdgrnpdifj99kxxjf"; - }; - - goDeps = ./datadog-process-agent-deps.nix; - goPackagePath = "github.com/${owner}/${repo}"; - - meta = with lib; { - description = "Live process collector for the DataDog Agent v6"; - homepage = "https://www.datadoghq.com"; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar rvl ]; - }; -} + meta = with lib; + attrs.meta // { + description = "Live process collector for the DataDog Agent v7"; + maintainers = with maintainers; [ domenkozar rvl ]; + }; + subPackages = [ "cmd/process-agent" ]; + postInstall = null; +}) diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix b/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix index 16b0b1ea09d6..d7dbb65b4f58 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -41,10 +41,10 @@ let src = pkgs.fetchFromGitHub { owner = "DataDog"; repo = "integrations-core"; - rev = "7e9bebbb5b79ac30c16814ecefdc8f5c63cb4ea4"; - sha256 = "0yi7dlbd0rkzzl8cag713r86f40vl87aqrj97ral58csnnj7vfzb"; + rev = version; + sha256 = "0424zsnf747s10kfzv5y0m0ac9sgczip78yvghhrc2i089i5z2h4"; }; - version = "git-2018-09-18"; + version = "7.30.1"; # Build helper to build a single datadog integration package. buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // { @@ -65,7 +65,7 @@ let pname = "checks-base"; sourceRoot = "datadog_checks_base"; propagatedBuildInputs = with python.pkgs; [ - requests protobuf prometheus-client uuid simplejson uptime + requests protobuf prometheus-client simplejson uptime ]; }; @@ -76,6 +76,7 @@ let network = (ps: [ ps.psutil ]); nginx = (ps: []); postgres = (ps: with ps; [ pg8000 psycopg2 ]); + process = (ps: []); }; # All integrations (default + extra): diff --git a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 77f1bf694459..b7b75037ebb0 100644 --- a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.39.4"; + version = "0.39.7"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dF3xyyOqWzjHW8cFdGlb3BCCGVy+eWW5OesKEK7pEjw="; + sha256 = "sha256-jU5O+t8muaIM7JhuNhqfWh1pWezaFvdg+oRPYAQpIkk="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/flannel/plugin.nix b/nixpkgs/pkgs/tools/networking/flannel/plugin.nix index 657be79b61bf..40d0fa9ecc55 100644 --- a/nixpkgs/pkgs/tools/networking/flannel/plugin.nix +++ b/nixpkgs/pkgs/tools/networking/flannel/plugin.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "cni-plugin-flannel"; - version = "unstable-2021-09-10"; + version = "1.0"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; - rev = "8ce83510da59681da905dccb8364af9472cac341"; - sha256 = "sha256-x6F8n+IJ1pZdbDwniWWmoGKgQm235ax3mbOcbYqWLCs="; + rev = "v${version}"; + sha256 = "sha256-s2gibebXTqM/12nDHwc89geWxA6gZi9/if5VnUFoTDE="; }; vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs="; diff --git a/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/nixpkgs/pkgs/tools/networking/gobgp/default.nix index 6ba0752222ac..9c39b6783b3c 100644 --- a/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "2.29.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; + sha256 = "sha256-Q55BA5iMZP5D8lLfJn82fsxQ0SP5e4OdXtGly4j3dXU="; }; - vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; + vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; postConfigure = '' export CGO_ENABLED=0 diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 32fa2af818bf..529339e34650 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.13"; + version = "2.3.14"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "0mz2vga8wwhqa8n4psphbqfd5q33n4m8ar7ac9chhn0i397s8lf6"; + sha256 = "0ah6xsxlk1a7jsxdg0pbdhzhssz9ysrfxd3bs5hm1shql1jmqzh4"; }; buildInputs = [ openssl zlib ] diff --git a/nixpkgs/pkgs/tools/networking/hurl/default.nix b/nixpkgs/pkgs/tools/networking/hurl/default.nix index de3b08bee2ad..7caabc9d37cc 100644 --- a/nixpkgs/pkgs/tools/networking/hurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/hurl/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "sha256-bAUuNKaS0BQ31GxTd8C2EVZiD8ryevFBOfxLCq6Ccz4="; + sha256 = "sha256-BmBqFJ64Nolq+eGZ5D3LQU3Ek2Gs+HpH/bptCQScbIg="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "sha256-dc1hu5vv2y4S1sskO7YN7bm+l2j5Jp5xOLMvXzX8Ago="; + cargoSha256 = "sha256-tAg3xwmh7SjJsm9r5TnhXHIDLpUQpz3YDS6gWxFgps4="; meta = with lib; { description = "Command line tool that performs HTTP requests defined in a simple plain text format."; diff --git a/nixpkgs/pkgs/tools/networking/i2p/default.nix b/nixpkgs/pkgs/tools/networking/i2p/default.nix index a3b52d19e2dc..fc1280be6c78 100644 --- a/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -1,42 +1,12 @@ -{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: - -let wrapper = stdenv.mkDerivation rec { - pname = "wrapper"; - version = "3.5.44"; - - src = fetchurl { - url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "1iq4j7srzy5p8q3nci9316bnwx4g71jyvzd1i5hp3s8v1k61910g"; - }; - - buildInputs = [ jdk ]; - - buildPhase = '' - export ANT_HOME=${ant} - export JAVA_HOME=${jdk}/lib/openjdk/jre/ - export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME - export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar - sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make - ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"} - ''; - - installPhase = '' - mkdir -p $out/{bin,lib} - cp bin/wrapper $out/bin/wrapper - cp lib/wrapper.jar $out/lib/wrapper.jar - cp lib/libwrapper.so $out/lib/libwrapper.so - ''; -}; - -in +{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which, java-service-wrapper }: stdenv.mkDerivation rec { pname = "i2p"; - version = "0.9.48"; + version = "1.5.0"; src = fetchurl { url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2"; - sha256 = "0cnm4bwl1gqcx89i96j2qlq6adphy4l72h5whamqwv86n8bmpig8"; + sha256 = "sha256-JuX02VsaB2aHD5ezDlfJqOmGkCecO/CRmOMO/6vsxFA="; }; buildInputs = [ jdk ant gettext which ]; @@ -52,9 +22,9 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share} cp -r pkg-temp/* $out - cp ${wrapper}/bin/wrapper $out/i2psvc - cp ${wrapper}/lib/wrapper.jar $out/lib - cp ${wrapper}/lib/libwrapper.so $out/lib + cp ${java-service-wrapper}/bin/wrapper $out/i2psvc + cp ${java-service-wrapper}/lib/wrapper.jar $out/lib + cp ${java-service-wrapper}/lib/libwrapper.so $out/lib sed -i $out/i2prouter -i $out/runplain.sh \ -e "s#uname#${coreutils}/bin/uname#" \ diff --git a/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 48ebf33c41bf..a4534d1fc8bb 100644 --- a/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.38.0"; + version = "2.39.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-8wy6Zdnw0JgnHFLa1U3qlzjpDIqi2gykbkkV7lh+Zag="; + sha256 = "sha256-j8kHuX5Ca90ODjmF94HpGvjSpocDSuSxfVmvbIYRAKo="; }; buildInputs = with lib; [ boost zlib openssl ] diff --git a/nixpkgs/pkgs/tools/networking/innernet/default.nix b/nixpkgs/pkgs/tools/networking/innernet/default.nix index a00164670e1a..cf63342fbb65 100644 --- a/nixpkgs/pkgs/tools/networking/innernet/default.nix +++ b/nixpkgs/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ss3BtwRnRAUPfM6yjl14rQrYZ7PHAT3s/MEHnbV7IEU="; + sha256 = "sha256-9oL91jacfUADaPvdTTvvXhpwzr9OnNnVLwy1okORss4="; }; - cargoSha256 = "sha256-hhsRLm8wsmvnu3wRK9s4Fjdy0bKLboAKw6qS2XQ1nsI="; + cargoSha256 = "sha256-jHWt7Jqv4B7u6Mvo3q69Omcn8kdnXGJSyzod1lDzvKE="; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/nixpkgs/pkgs/tools/networking/jwhois/default.nix b/nixpkgs/pkgs/tools/networking/jwhois/default.nix index 5a79a09281c3..025169a9fd35 100644 --- a/nixpkgs/pkgs/tools/networking/jwhois/default.nix +++ b/nixpkgs/pkgs/tools/networking/jwhois/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + # Work around error from <stdio.h> on aarch64-darwin: + # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] + # TODO: this should probably be fixed at a lower level than this? + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-undef-prefix"; + meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = "https://www.gnu.org/software/jwhois/"; diff --git a/nixpkgs/pkgs/tools/networking/kapp/default.nix b/nixpkgs/pkgs/tools/networking/kapp/default.nix index 437089cc3967..cb568d4182ab 100644 --- a/nixpkgs/pkgs/tools/networking/kapp/default.nix +++ b/nixpkgs/pkgs/tools/networking/kapp/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kapp"; - version = "0.38.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-sUP+C4ynqeODAKkjUWhL1yqlzXkXydd1ENgHQw4enA4="; + sha256 = "sha256-9nvYxLE35IwmVB1Dzw7t3DZw4/kSiMPIqzl2PUKODtU="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 893537e167ad..e36390f85271 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-07-27T06-46-19Z"; + version = "2021-09-02T09-21-27Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1h0r8c22v94w2hhbc0hv9rc9jyr5ar7gpa76lhr9l8ra0k3qra43"; + sha256 = "sha256-6G0MyeDYc8Y6eib2T+2VB5mDjyO13FdBsufy57osIEk="; }; - vendorSha256 = "1s1bq166dlhqll0r5lcdjpd2446cwi1slbi895582jgs38zpkzvw"; + vendorSha256 = "sha256-J1khnNTiHkTPRjNlU2yQu8b+bwKP/KBF1KxTIvGLs+U="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modemmanager/default.nix index 9d8f13a40709..e352e67d3fe5 100644 --- a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/modemmanager/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - pname = "modem-manager"; - version = "1.16.8"; + pname = "modemmanager"; + version = "1.16.10"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-If36+UFxJhrZ2ZdxiU9a3kvDnvPR/x1CEFTRRxPpeIA="; + sha256 = "sha256-LM8fcWwtEh6OZwm8+K8p7oaXGpCtrMoujWKIswJ4hi4="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/mosh/default.nix b/nixpkgs/pkgs/tools/networking/mosh/default.nix index 92c241967ae0..00746a7afbd2 100644 --- a/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -31,6 +31,14 @@ stdenv.mkDerivation rec { ./bash_completion_datadir.patch ]; postPatch = '' + # Fix build with Xcode 12.5 toolchain/case-insensitive filesystems + # Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538; + # remove on next upstream release. + patch -p0 < ${fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/70ca3f65e622c17582fd938602d800157ed951c3/net/mosh/files/patch-version-subdir.diff"; + sha256 = "1yyh6d07y9zbdx4fb0r56zkq9nd9knwzj22v4dfi55k4k42qxapd"; + }} + substituteInPlace scripts/mosh.pl \ --subst-var-by ssh "${openssh}/bin/ssh" substituteInPlace scripts/mosh.pl \ diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 63c52a337103..8a1a6dd8fa1b 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.32.6"; + version = "1.32.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-PSdGBR87MylArCk1TgFpEVnUZ4PXL9IyvTbpgijOWgk="; + sha256 = "sha256-PlzMZoBWWePxGnGOOlmflya3mgHW/xSBS+ati8Xai7g="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/nixpkgs/pkgs/tools/networking/ntttcp/default.nix b/nixpkgs/pkgs/tools/networking/ntttcp/default.nix new file mode 100644 index 000000000000..662e4d32fb72 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/ntttcp/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ntttcp"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "ntttcp-for-linux"; + rev = version; + sha256 = "sha256-6O7qSrR6EFr7k9lHQHGs/scZxJJ5DBNDxlSL5hzlRf4="; + }; + + preBuild = "cd src"; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp ntttcp $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "A Linux network throughput multiple-thread benchmark tool"; + homepage = "https://github.com/microsoft/ntttcp-for-linux"; + license = licenses.mit; + maintainers = with maintainers; [ delroth ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/nixpkgs/pkgs/tools/networking/oneshot/default.nix index 2e809eb2d1bd..9c0f4469982b 100644 --- a/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oneshot"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "sha256-LxLMETZzoeu7qEHpUFmo/h+7sdly+R5ZWsNhyttcbpA="; + sha256 = "sha256-5NCGKgmioTOHGJEWMIEsZlA+072XXL9L8KbEH6+caHc="; }; vendorSha256 = "sha256-rL/NWIIggvngTrdTDm1g1uH3vC55JF3cWllPc6Yb5jc="; diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 606b3b4ee9e6..e3491460e0ae 100644 --- a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "5.2.0"; + version = "5.2.1"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-mZYGCIR7XOvONnNFDM86qSM7iug48noNgBcHdik81vk="; + sha256 = "sha256-stRtSZCvPUQuTiKOHmJ7k8o3Gtly9Up+gicrDOeWjIs="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix b/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix index d7359ea0e70c..31057a8f5271 100644 --- a/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix +++ b/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix @@ -5,6 +5,8 @@ , libnetfilter_queue , libnfnetlink , lib +, coreutils +, iptables }: buildGoModule rec { @@ -32,6 +34,12 @@ buildGoModule rec { postBuild = '' mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd + mkdir -p $out/lib/systemd/system + substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ + --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ + --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ + --replace "/bin/mkdir" "${coreutils}/bin/mkdir" + sed -i '/\[Service\]/a Environment=PATH=${iptables}/bin' $out/lib/systemd/system/opensnitchd.service ''; vendorSha256 = "sha256-LMwQBFkHg1sWIUITLOX2FZi5QUfOivvrkcl9ELO3Trk="; diff --git a/nixpkgs/pkgs/tools/networking/openssh/common.nix b/nixpkgs/pkgs/tools/networking/openssh/common.nix index 40011a14c893..eaa42039dbaa 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -123,5 +123,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ eelco aneeshusa ]; + mainProgram = "ssh"; } // extraMeta; } diff --git a/nixpkgs/pkgs/tools/networking/openssh/default.nix b/nixpkgs/pkgs/tools/networking/openssh/default.nix index 4cc943fc75f5..b57633b750f8 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -1,15 +1,16 @@ -{ callPackage, fetchurl, fetchpatch, autoreconfHook }: +{ callPackage, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }: let - common = opts: callPackage (import ./common.nix opts) {}; -in { + common = opts: callPackage (import ./common.nix opts) { }; +in +{ openssh = common rec { pname = "openssh"; - version = "8.6p1"; + version = "8.7p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "1bnpivgk98h2f9afpp88jv6g9ps83vnpxd031n2jqxi12vdf9rn3"; + sha256 = "090yxpi03pxxzb4ppx8g8hdpw7c4nf8p0avr6c7ybsaana5lp8vw"; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -20,9 +21,11 @@ in { version = "8.4p1"; extraDesc = " with high performance networking patches"; - src = fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540"; + src = fetchFromGitHub { + owner = "rapier1"; + repo = "openssh-portable"; + rev = "hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}"; + hash = "sha256-SYQPDGxZR41m4g603RaZaOYm4vCr9uZnFnZoKhruueY="; }; extraPatches = [ diff --git a/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix b/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix new file mode 100644 index 000000000000..cc1cc9daf656 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix @@ -0,0 +1,24 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "proxychains-ng"; + version = "4.15"; + + src = fetchFromGitHub { + owner = "rofl0r"; + repo = pname; + rev = "v${version}"; + sha256 = "128d502y8pn7q2ls6glx9bvibwzfh321sah5r5li6b6iywh2zqlc"; + }; + + meta = with lib; { + description = "A preloader which hooks calls to sockets in dynamically linked programs and redirects it through one or more socks/http proxies"; + homepage = "https://github.com/rofl0r/proxychains-ng"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ zenithal ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/sipsak/default.nix b/nixpkgs/pkgs/tools/networking/sipsak/default.nix index 556204972860..a55a32c21a9a 100644 --- a/nixpkgs/pkgs/tools/networking/sipsak/default.nix +++ b/nixpkgs/pkgs/tools/networking/sipsak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, c-ares, openssl ? null }: stdenv.mkDerivation rec { pname = "sipsak"; @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "--std=gnu89"; - src = fetchurl { - url = "https://github.com/sipwise/sipsak/archive/mr${version}.tar.gz"; - sha256 = "769fe59966b1962b67aa35aad7beb9a2110ebdface36558072a05c6405fb5374"; + src = fetchFromGitHub { + owner = "sipwise"; + repo = "sipsak"; + rev = "mr${version}"; + hash = "sha256-y9P6t3xjazRNT6lDZAx+CttdyXruC6Q14b8XF9loeU4="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/sish/default.nix b/nixpkgs/pkgs/tools/networking/sish/default.nix index 769b0c57698c..45d1479e86fe 100644 --- a/nixpkgs/pkgs/tools/networking/sish/default.nix +++ b/nixpkgs/pkgs/tools/networking/sish/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sish"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "antoniomika"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tljJp6Yoc19kkG7F3g1XhSDK2Y/D/2oRHiDkkOP3nn0="; + sha256 = "sha256-v/7DhakTVlcbnhujZOoVx5mpeyMwVI4CfYV12QqR7I4="; }; - vendorSha256 = "sha256-AHCa6ErxXzDPUFuq4ATD08e2Wz0tNibV2lLXoD7Sygk="; + vendorSha256 = "sha256-eMqHPxewQ9mvBpcBb+13HmaLDabCGt6C+qfbgaW8/YE="; meta = with lib; { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; diff --git a/nixpkgs/pkgs/tools/networking/smartdns/default.nix b/nixpkgs/pkgs/tools/networking/smartdns/default.nix index 91fcc0e982eb..8ac1e137ca43 100644 --- a/nixpkgs/pkgs/tools/networking/smartdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/smartdns/default.nix @@ -2,17 +2,25 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "33"; + version = "35"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "0cmzpm4y1yi96mg2cz2byqw6vl62dgnikldy08q43vi7jl3y0749"; + sha256 = "sha256-5822qe3mdn4wPO8fHW5AsgMA7xbJnMjZn9DbiMU3GX0="; }; 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" diff --git a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix index 5800df6950ba..502ab323e8e2 100644 --- a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix +++ b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UZLVkTkuJPzju9fl4N6Lgdn3gNBpKruNFxDcoTwdtYc="; + sha256 = "sha256-P8ubw523sw1O6Gpruy1Wa/Y0I3qJgvMdT53wBBoEGhE="; }; - cargoSha256 = "sha256-bHwp0U83uvhFOi9oaeVwNrqHkxK2IQs/bvxqUl/rpjI="; + cargoSha256 = "sha256-+Wh+/C9LvYppCghv11e8NKNhiMy0SV4S3nEWA6b1hQk="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix b/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix index 1eacd685463e..379caedaaf1b 100644 --- a/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix @@ -1,28 +1,34 @@ -{ lib, stdenv , fetchurl, libpcap, libnet +{ lib +, stdenv +, fetchFromGitHub +, libpcap +, libnet }: stdenv.mkDerivation rec { - pkgname = "tcptraceroute"; - name = "${pkgname}-${version}"; - version = "1.5beta7"; + pname = "tcptraceroute"; + version = "1.5beta7"; - src = fetchurl { - url = "https://github.com/mct/${pkgname}/archive/${name}.tar.gz"; - sha256 = "1rz8bgc6r1isb40awv1siirpr2i1paa2jc1cd3l5pg1m9522xzap"; - }; + src = fetchFromGitHub { + owner = "mct"; + repo = "tcptraceroute"; + rev = "${pname}-${version}"; + hash = "sha256-KU4MLWtOFzzNr+I99fRbhBokhS1JUNL+OgVltkOGav4="; + }; - # for reasons unknown --disable-static configure flag doesn't disable static - # linking.. we instead override CFLAGS with -static omitted - preBuild = '' - makeFlagsArray=(CFLAGS=" -g -O2 -Wall") - ''; - buildInputs = [ libpcap libnet ]; + # for reasons unknown --disable-static configure flag doesn't disable static + # linking.. we instead override CFLAGS with -static omitted + preBuild = '' + makeFlagsArray=(CFLAGS=" -g -O2 -Wall") + ''; - meta = { - description = "A traceroute implementation using TCP packets"; - homepage = "https://github.com/mct/tcptraceroute"; - license = lib.licenses.gpl2; - maintainers = [ ]; - }; + buildInputs = [ libpcap libnet ]; + + meta = { + description = "A traceroute implementation using TCP packets"; + homepage = "https://github.com/mct/tcptraceroute"; + license = lib.licenses.gpl2; + maintainers = [ ]; + }; } diff --git a/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 5afd8aec348e..1f363ae3f9f1 100644 --- a/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.12"; + version = "0.34.13"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CBE0ErHIafJ9OYC8DR3KriYX1aiqKUJk2UoBkIdO1QY="; + sha256 = "sha256-z3rbDdk68PTvJ/LPnAx8kOjCGXMfxQA0LK9GLYgaiUY="; }; - vendorSha256 = "sha256-cW3YKdF1dAfeewQ/0mhoillIpIMuC2KDsW1XWc7WRoI="; + vendorSha256 = "sha256-bwDyis/dHKSqBFw5jFWSZip5YjBe1bq/ieg6Jg0P/TM="; subPackages = [ "cmd/tendermint" ]; diff --git a/nixpkgs/pkgs/tools/networking/termshark/default.nix b/nixpkgs/pkgs/tools/networking/termshark/default.nix index d35e70ad52e4..932d46269bc9 100644 --- a/nixpkgs/pkgs/tools/networking/termshark/default.nix +++ b/nixpkgs/pkgs/tools/networking/termshark/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "termshark"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "gcla"; repo = "termshark"; rev = "v${version}"; - sha256 = "sha256-vS6j8Mcri3SI/6HqtFX/EzVl8S0lx8fWU+0ddjzJz8g="; + sha256 = "sha256-ekIxKBnqGTIXncvSTItBL43WN5mdX5dxROWHXUtH3o8="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - vendorSha256 = "sha256-md9HHiYOsBimCBjD1FyjTqnskCZksQiEggWd5UW0RPM="; + vendorSha256 = "sha256-16JPVgo3heJMjOHNOP13kyhRveQjF9h9kRznhSZM+ik="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/tracebox/default.nix b/nixpkgs/pkgs/tools/networking/tracebox/default.nix index 3d50b11f8e1a..79efc95036d9 100644 --- a/nixpkgs/pkgs/tools/networking/tracebox/default.nix +++ b/nixpkgs/pkgs/tools/networking/tracebox/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcrafter, libpcap, lua }: stdenv.mkDerivation rec { pname = "tracebox"; version = "0.2"; - src = fetchzip { - url = "https://github.com/tracebox/tracebox/archive/v${version}.zip"; - sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns"; + src = fetchFromGitHub { + owner = "tracebox"; + repo = "tracebox"; + rev = "v${version}"; + hash = "sha256-2r503xEF3/F9QQCEaSnd4Hw/RbbAhVj9C0SVZepVrT8="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/networking/tunnelto/default.nix b/nixpkgs/pkgs/tools/networking/tunnelto/default.nix index e750327e4bab..924d2c3afa0f 100644 --- a/nixpkgs/pkgs/tools/networking/tunnelto/default.nix +++ b/nixpkgs/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.12"; + version = "0.1.18"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; rev = version; - sha256 = "1vvb619cq3n88y2s8lncwcyrhb5s4gpjfiyia91pilcpnfdb04y2"; + sha256 = "sha256-dCHl5EXjUagOKeHxqb3GlAoSDw0u3tQ4GKEtbFF8OSs="; }; - cargoSha256 = "1pjd62yz7pavcinc96g2x0f5giadl9aqvz1i5vhfanh6mj6mrbl1"; + cargoSha256 = "sha256-6HU1w69cJj+tE1IUUNoxh0cHEwlRKF5qWx7FiOHeUNk="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/nixpkgs/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix index 249376abbb06..a24ac1f38888 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg="; + sha256 = "sha256-ChO1R/O5KgJrXr0EI/VMmR5XGAN/2fckRYF/agQOGoM="; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/nixpkgs/pkgs/tools/networking/wavemon/default.nix b/nixpkgs/pkgs/tools/networking/wavemon/default.nix index c54c4f8691ad..e7589862e511 100644 --- a/nixpkgs/pkgs/tools/networking/wavemon/default.nix +++ b/nixpkgs/pkgs/tools/networking/wavemon/default.nix @@ -1,24 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libnl, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, libnl +, ncurses +, pkg-config +}: stdenv.mkDerivation rec { pname = "wavemon"; - version = "0.9.3"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses libnl ]; + version = "0.9.4"; src = fetchFromGitHub { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "0m9n5asjxs1ir5rqprigqcrm976mgjvh4yql1jhfnbszwbf95193"; + sha256 = "0s3yz15vzx90fxyb8bgryksn0cr2gpz9inbcx4qjrgs7zfbm4pgh"; }; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libnl + ncurses + ]; + meta = with lib; { description = "Ncurses-based monitoring application for wireless network devices"; homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin fpletz ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/wget/default.nix b/nixpkgs/pkgs/tools/networking/wget/default.nix index efdd16e630bc..423363b56c28 100644 --- a/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "wget"; - version = "1.21.1"; + version = "1.21.2"; src = fetchurl { url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; - sha256 = "sha256-25u+U0fm+qBvx4gF7rgIsmiXlFXq2QA6YIVpydT8kK0="; + sha256 = "sha256-FyejMKhqyss+V2Fc4mj18pl4v3rexKvmow03Age8kbM="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/networking/wifite2/default.nix b/nixpkgs/pkgs/tools/networking/wifite2/default.nix index 2482c1749959..8a4b5f2e0514 100644 --- a/nixpkgs/pkgs/tools/networking/wifite2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wifite2/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, python3, wirelesstools , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools -, hcxdumptool, pyrit, which, bully }: +, hcxdumptool, pyrit, which, bully, pixiewps }: python3.pkgs.buildPythonApplication rec { version = "2.5.7"; @@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { pyrit which bully + pixiewps ]; postFixup = let diff --git a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index e237850b12ae..5df98954ae16 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20210424"; + version = "1.0.20210914"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "sha256-0aGaE4EBb4wb5g32Wugakt7w41sb97Hqqkac7qE641M="; + sha256 = "sha256-eGGkTVdPPTWK6iEyowW11F4ywRhd+0IXJTZCqY3OZws="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/tools/networking/xh/default.nix b/nixpkgs/pkgs/tools/networking/xh/default.nix index 90f99120cd49..75eaa8774df2 100644 --- a/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-icJBQdFWdiHCYrZ7U90g6CdXdAkv3Y/WJu0IfZAdGv0="; + sha256 = "sha256-fTd4VSUUj9Im+kCEuFgDsA7eofM1xQfrRzigr1vyJ3I="; }; - cargoSha256 = "sha256-htv5OQnat4Qi6A6lmVonuz+8/DWz8fOGYPbnCnlizBo="; + cargoSha256 = "sha256-yZdGw/6iVg8PaUyjTrxj6h/2yhBtqEqvMhdRHhMwDZc="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index 4a44843e947b..f2afb6d3baeb 100644 --- a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "0dlnrb59vnxa3pjkgfqd5jil9kl6axh23v0bffi4kx8jwzpdwas8"; + sha256 = "0pi22252c21gxmjcgwmagkrnp5y1hhqrm9jkjj9pg1nlzzrlyrnm"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix b/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix index a9c83305df3e..a94ae45ccea5 100644 --- a/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.3.1"; + version = "1.0.3.3"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1kkf6cqq8aba8vmfcww30ah9j44bwakanyfdb6595vmaq5hrsq92"; + sha256 = "1x26s9gzcygn96600g0r1a1sxqav6c38iq981rhmc808mqlyxmp8"; rev = "v${version}"; }; isLibrary = true; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix index 82c52419c67c..b871b4a53b21 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "RustSec"; repo = "rustsec"; rev = "cargo-audit%2Fv${version}"; - sha256 = "1rmhizgld35996kzp3fal2zl20aqpnmkzx0clc80n30p814isdrw"; + sha256 = "1j5ijrjhzqimamhj51qhpbaxx485hcxhaj64lknkn0xrda3apkx8"; }; - cargoSha256 = "10li9w3m4xxb8943802y74dgb1wsgjkn74hwn2x47c0w0yjiig7p"; + cargoSha256 = "1qvrzaila3wbjmc7ri5asa3di2nzln78ys9innzd84fr36c90kkc"; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 5e1562fa431b..47ce3dad62d6 100644 --- a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -1,7 +1,7 @@ -{ gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check +{ lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check , json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm, zchunk }: -gcc9Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "libdnf"; version = "0.63.1"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-index/default.nix b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix index a8a2c2242fd5..10449a331f93 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-index/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, openssl, curl -, nix, Security +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl +, Security }: rustPlatform.buildRustPackage rec { @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "161lz96a52s53rhhkxxhcg41bsmh8w6rv6nl8gwqmg3biszy7hah"; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl ] ++ lib.optional stdenv.isDarwin Security; @@ -26,14 +26,12 @@ rustPlatform.buildRustPackage rec { cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh substituteInPlace $out/etc/profile.d/command-not-found.sh \ --replace "@out@" "$out" - wrapProgram $out/bin/nix-index \ - --prefix PATH : "${lib.makeBinPath [ nix ]}" ''; meta = with lib; { description = "A files database for nixpkgs"; homepage = "https://github.com/bennofs/nix-index"; license = with licenses; [ bsd3 ]; - maintainers = [ maintainers.bennofs ]; + maintainers = with maintainers; [ bennofs ncfavier ]; }; } diff --git a/nixpkgs/pkgs/tools/package-management/nix-index/wrapper.nix b/nixpkgs/pkgs/tools/package-management/nix-index/wrapper.nix new file mode 100644 index 000000000000..94611e74c2a5 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/nix-index/wrapper.nix @@ -0,0 +1,14 @@ +{ lib, symlinkJoin, nix-index-unwrapped, makeWrapper, nix }: + +symlinkJoin { + inherit (nix-index-unwrapped) name meta; + + paths = [ nix-index-unwrapped ]; + + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/nix-index \ + --prefix PATH : ${lib.makeBinPath [ nix ]} + ''; +} diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index 61c6ab3efb51..fd85cd2e72ae 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -234,13 +234,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210908_${lib.substring 0 7 src.rev}"; + suffix = "pre20210922_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "3c56f62093601143838af923195f630d8ffae2d4"; - sha256 = "sha256-pjdzLOEt8i1NQe4drLpp8+LrRd2MgsISSQEsMebz2kc="; + rev = "bcd73ebf60bb9ba6cb09f8df4366d5474c16e4a4"; + sha256 = "sha256-wRbz8c22tlRn2/va/yOoLJijdJn+JJqLRDPRlifaEEA="; }; boehmgc = boehmgc_nixUnstable; diff --git a/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/nixpkgs/pkgs/tools/package-management/rpm/default.nix index f942efe6dd7b..910b86e13184 100644 --- a/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch +{ stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages , sqlite, zstd @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "rpm"; - version = "4.16.1.3"; + version = "4.17.0"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - sha256 = "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai"; + sha256 = "2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a"; }; outputs = [ "out" "dev" "man" ]; @@ -36,16 +36,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - # Small fixes for ndb on darwin - # https://github.com/rpm-software-management/rpm/pull/1465 - patches = [ - (fetchpatch { - name = "darwin-support.patch"; - url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch"; - sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171"; - }) - ]; - postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; diff --git a/nixpkgs/pkgs/tools/security/agebox/default.nix b/nixpkgs/pkgs/tools/security/agebox/default.nix index 29199870c7f7..060961f3a367 100644 --- a/nixpkgs/pkgs/tools/security/agebox/default.nix +++ b/nixpkgs/pkgs/tools/security/agebox/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "agebox"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "slok"; repo = pname; rev = "v${version}"; - sha256 = "0zn7jibhw5jd9wp1alx9ahj4szaig4a54ci3676kk5zqxr2hjz0c"; + sha256 = "1mg16xxvsbm5jxlkdjyi3nsvzj37858d9ksh1wsa9ycxj2qipgw2"; }; - vendorSha256 = "0bc2pwz3yhzwqi0bcwqkkkrglg473qxhmz5s5955fvgajvjk7drn"; + vendorSha256 = "1gw83bd14ig18y8si3f94iivx2ir1vw4b5b95fp6r7qhfp0rgbih"; ldflags = [ "-s" "-w" diff --git a/nixpkgs/pkgs/tools/security/amber/default.nix b/nixpkgs/pkgs/tools/security/amber/default.nix new file mode 100644 index 000000000000..76b0c1fa9824 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/amber/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + # Renaming it to amber-secret because another package named amber exists + pname = "amber-secret"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "fpco"; + repo = "amber"; + rev = "v${version}"; + sha256 = "1l5c7vdi885z56nqqbm4sw9hvqk3rfzm0mgcwk5cbwjlrz7yjq4m"; + }; + + cargoSha256 = "0dmhlyrw6yd7p80v7anz5nrd28bcrhq27vzy605dinddvncjn13q"; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "Manage secret values in-repo via public key cryptography"; + homepage = "https://github.com/fpco/amber"; + license = licenses.mit; + maintainers = with maintainers; [ psibi ]; + mainProgram = "amber"; + }; +} diff --git a/nixpkgs/pkgs/tools/security/cosign/default.nix b/nixpkgs/pkgs/tools/security/cosign/default.nix index 0f81fb4a3d18..64e64e3854bf 100644 --- a/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FG6LAaz6n2l77Wr7SYmwzL10G5gyHPCPG05hQlsOQBI="; + sha256 = "sha256-peR/TPydR4O6kGkRUpOgUCJ7xGRLbl9pYB1lAehjVK4="; }; buildInputs = @@ -17,13 +17,13 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "sha256-OKQVgF/pg4cigMkckX/dclieHCoD39ltR+DegaUfSDk="; + vendorSha256 = "sha256-DyRMQ43BJOkDtWEqmAzqICyaSyQJ9H4i69VJ4dCGF44="; - excludedPackages = "\\(copasetic\\)"; + excludedPackages = "\\(copasetic\\|sample\\|webhook\\)"; tags = lib.optionals pivKeySupport [ "pivkey" ]; - ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.GitVersion=v${version}" ]; meta = with lib; { homepage = "https://github.com/sigstore/cosign"; diff --git a/nixpkgs/pkgs/tools/security/expliot/default.nix b/nixpkgs/pkgs/tools/security/expliot/default.nix index 02a9ea5ee74f..2a3c1df0e8f7 100644 --- a/nixpkgs/pkgs/tools/security/expliot/default.nix +++ b/nixpkgs/pkgs/tools/security/expliot/default.nix @@ -1,29 +1,28 @@ { lib -, aiocoap -, awsiotpythonsdk -, bluepy -, buildPythonApplication -, can -, cmd2 -, cryptography , fetchFromGitLab -, paho-mqtt -, pyi2cflash -, pymodbus -, pynetdicom -, pyparsing -, pyserial -, pyspiflash -, pythonOlder -, upnpy -, xmltodict -, zeroconf +, python3 }: +let + py = python3.override { + packageOverrides = self: super: { + + cmd2 = super.cmd2.overridePythonAttrs (oldAttrs: rec { + version = "1.5.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0qiax309my534drk81lihq9ghngr96qnm40kbmgc9ay4fncqq6kh"; + }; + }); + }; + }; +in +with py.pkgs; buildPythonApplication rec { pname = "expliot"; version = "0.9.8"; - disabled = pythonOlder "3.7"; + + disabled = python3.pythonOlder "3.7"; src = fetchFromGitLab { owner = "expliot_framework"; @@ -53,6 +52,7 @@ buildPythonApplication rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "expliot" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 911592736801..c2aafacee4f9 100644 --- a/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-10"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-OU9IchkouABYw0k4O4WBLu1aklLCH/S90IPMPLOZWY0="; + sha256 = "sha256-KjeldF3oBX4QLba7pTmvRwymxZ+x8HPfIKT7IevrOlU="; }; installPhase = '' @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Archive of public exploits and corresponding vulnerable software"; license = with licenses; [ gpl2Plus gpl3Plus mit ]; maintainers = with maintainers; [ applePrincess ]; + mainProgram = "searchsploit"; }; } diff --git a/nixpkgs/pkgs/tools/security/faraday-cli/default.nix b/nixpkgs/pkgs/tools/security/faraday-cli/default.nix new file mode 100644 index 000000000000..c220fe4ded0f --- /dev/null +++ b/nixpkgs/pkgs/tools/security/faraday-cli/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "faraday-cli"; + version = "2.0.2"; + + disabled = python3.pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "infobyte"; + repo = pname; + rev = "v${version}"; + sha256 = "1jq8sim0b6k830lv1qzbrd1mx0nc2x1jq24fbama76gzqlb2axi7"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + click + colorama + faraday-plugins + jsonschema + pyyaml + simple-rest-client + tabulate + validators + spinners + termcolor + cmd2 + log-symbols + arrow + ]; + + # Tests requires credentials + doCheck = false; + + pythonImportsCheck = [ "faraday_cli" ]; + + meta = with lib; { + description = "Command Line Interface for Faraday"; + homepage = "https://github.com/infobyte/faraday-cli"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/gpg-tui/default.nix b/nixpkgs/pkgs/tools/security/gpg-tui/default.nix index 2f23d218c456..fb9bbcab212b 100644 --- a/nixpkgs/pkgs/tools/security/gpg-tui/default.nix +++ b/nixpkgs/pkgs/tools/security/gpg-tui/default.nix @@ -5,6 +5,7 @@ , gpgme , libgpgerror , libxcb +, libxkbcommon , python3 , AppKit , Foundation @@ -15,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-PJLiP8o4HMkaHMrsnObpUdGtKLxIuXZhxva34U26i40="; + sha256 = "sha256-UUfZd6wTBoOyBdkidzxa3Fyc3GjeGdCT0n7jKmhdNa0="; }; - cargoSha256 = "sha256-6fHMchoJO5Tss6kFTulDmI4aXS3YF5k6RqEWQbh5mNc="; + cargoSha256 = "sha256-yX/g/An06nx95IaxjfYVUofvDDS2ZjiNAZf3ivi6ZF0="; nativeBuildInputs = [ gpgme # for gpgme-config @@ -36,6 +37,7 @@ rustPlatform.buildRustPackage rec { gpgme libgpgerror libxcb + libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation diff --git a/nixpkgs/pkgs/tools/security/grype/default.nix b/nixpkgs/pkgs/tools/security/grype/default.nix index 4dc119980a5d..dde9da346efc 100644 --- a/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/nixpkgs/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-410mCfYzbqgj3hb3dgVOGPWPCIYrB41soLA8dXK23NE="; + sha256 = "sha256-xSjmwD0V4+LKfLwknQU8PAFOG3zpJ87ghHdA2c+nYQM="; }; - vendorSha256 = "sha256-KkS/1VSObniAykAwv7uW+RCrdvb5BM6DbHzDWZ6kPoQ="; + vendorSha256 = "sha256-mlsKB/WOiQ2Ud9C19rsQhVtJfblh0CGd8tDs+3SSfcg="; propagatedBuildInputs = [ docker ]; diff --git a/nixpkgs/pkgs/tools/security/hcxtools/default.nix b/nixpkgs/pkgs/tools/security/hcxtools/default.nix index d0fa57820795..2a08ce6a1c8f 100644 --- a/nixpkgs/pkgs/tools/security/hcxtools/default.nix +++ b/nixpkgs/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.2.0"; + version = "6.2.4"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "sha256-4/kqy0oIe2FdKWtVj11PAUbdWPcKmZ1aIxLx/Zw1E2w="; + sha256 = "sha256-C6nAZkkdtBSv4WDxoXPsHzcGglB8PEX3ioFaTydiHsU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/security/hologram/default.nix b/nixpkgs/pkgs/tools/security/hologram/default.nix index c4e90bd94bb2..ebb884378267 100644 --- a/nixpkgs/pkgs/tools/security/hologram/default.nix +++ b/nixpkgs/pkgs/tools/security/hologram/default.nix @@ -2,13 +2,12 @@ buildGoPackage rec { pname = "hologram"; - version = "2018-03-19"; - rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac"; + version = "unstable-2018-03-19"; src = fetchFromGitHub { owner = "AdRoll"; repo = "hologram"; - inherit rev; + rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac"; sha256 = "00scryz8js6gbw8lp2y23qikbazz2dd992r97rqh0l1q4baa0ckn"; }; diff --git a/nixpkgs/pkgs/tools/security/kerbrute/default.nix b/nixpkgs/pkgs/tools/security/kerbrute/default.nix new file mode 100644 index 000000000000..997f3b63437e --- /dev/null +++ b/nixpkgs/pkgs/tools/security/kerbrute/default.nix @@ -0,0 +1,29 @@ +{ lib, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "kerbrute"; + version = "0.0.2"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-ok/yttRSkCaEdV4aM2670qERjgDBll6Oi3L5TV5YEEA="; + }; + + # This package does not have any tests + doCheck = false; + + propagatedBuildInputs = with python3.pkgs; [ + impacket + ]; + + installChechPhase = '' + $out/bin/kerbrute --version + ''; + + meta = { + homepage = "https://github.com/TarlogicSecurity/kerbrute"; + description = "Kerberos bruteforce utility"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ applePrincess ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/kubescape/default.nix b/nixpkgs/pkgs/tools/security/kubescape/default.nix index d3113af0cd08..2bf6bb8cad66 100644 --- a/nixpkgs/pkgs/tools/security/kubescape/default.nix +++ b/nixpkgs/pkgs/tools/security/kubescape/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.64"; + version = "1.0.85"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "0vc673w40cgjw6jxlwg9ggwzb7yvmsqshihms6ahspc3qiwz56ah"; + sha256 = "19r7dgr0y1k9qa4llxbgaf69j88vs9h2gx29bwbh6dq17q58sfdl"; }; vendorSha256 = "18mvv70g65pq1c7nn752j26d0vasx6cl2rqp5g1hg3cb61hjbn0n"; diff --git a/nixpkgs/pkgs/tools/security/kubesec/default.nix b/nixpkgs/pkgs/tools/security/kubesec/default.nix index 5d634630128d..d15fab720f96 100644 --- a/nixpkgs/pkgs/tools/security/kubesec/default.nix +++ b/nixpkgs/pkgs/tools/security/kubesec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubesec"; - version = "2.11.2"; + version = "2.11.4"; src = fetchFromGitHub { owner = "controlplaneio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W9c3L8lYjF1W0kwSODhMldlqX1h+2mZIRtElZ20skn4="; + sha256 = "sha256-z1v+xm0ZWs8F5KtltBSDx9W+xNqRsfvAgQUKgrZa+28="; }; - vendorSha256 = "sha256-zfQu1EdwvR+LGmsbE8RA4pcOGgsukG1TMTCgPyNoVsc="; + vendorSha256 = "sha256-/2u92KvfzbJxJjh1cy9+4AuM5Qw1tK9Hu0xjRs0nhBE="; # Tests wants to download the kubernetes schema for use with kubeval doCheck = false; diff --git a/nixpkgs/pkgs/tools/security/libtpms/default.nix b/nixpkgs/pkgs/tools/security/libtpms/default.nix index baca0ed8b771..64bb10cb8bf2 100644 --- a/nixpkgs/pkgs/tools/security/libtpms/default.nix +++ b/nixpkgs/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.8.4"; + version = "0.8.6"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-9e7O9SE7e8D6ULXhICabNCrL+QTH55jQm0AI7DVteE0="; + sha256 = "sha256-XvugcpoFQhdCBBg7hOgsUzSn4ad7RUuAEkvyiPLg4Lw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/mbox/default.nix b/nixpkgs/pkgs/tools/security/mbox/default.nix index d7a303a3672f..a39d226aac57 100644 --- a/nixpkgs/pkgs/tools/security/mbox/default.nix +++ b/nixpkgs/pkgs/tools/security/mbox/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "mbox"; - version = "20140526"; + version = "unstable-2014-05-26"; src = fetchFromGitHub { owner = "tsgates"; @@ -28,13 +28,12 @@ stdenv.mkDerivation { ./testall.sh ''; - meta = with lib; - { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; - homepage = "http://pdos.csail.mit.edu/mbox/"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - broken = true; - }; - + meta = with lib; { + description = "Lightweight sandboxing mechanism that any user can use without special privileges"; + homepage = "http://pdos.csail.mit.edu/mbox/"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + broken = true; + }; } diff --git a/nixpkgs/pkgs/tools/security/meo/default.nix b/nixpkgs/pkgs/tools/security/meo/default.nix index 4b96f2b42c23..491bef3e0543 100644 --- a/nixpkgs/pkgs/tools/security/meo/default.nix +++ b/nixpkgs/pkgs/tools/security/meo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "meo"; - version = "20121113"; + version = "unstable-2012-11-13"; src = fetchhg { url = "http://oss.stamfest.net/hg/meo"; @@ -25,12 +25,12 @@ stdenv.mkDerivation { cp meo-gui/meo-gui $out/bin ''; - meta = { + meta = with lib; { homepage = "http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only"; description = "Tools to use cryptography for things like four-eyes principles"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ viric ]; + platforms = platforms.linux; broken = true; }; } diff --git a/nixpkgs/pkgs/tools/security/metabigor/default.nix b/nixpkgs/pkgs/tools/security/metabigor/default.nix index b511690192c6..4e03e11f4985 100644 --- a/nixpkgs/pkgs/tools/security/metabigor/default.nix +++ b/nixpkgs/pkgs/tools/security/metabigor/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "metabigor"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "j3ssie"; repo = pname; rev = "v${version}"; - sha256 = "0gjqjz35m9hj4dpch9akkjs895qrp8fwhcsn474lz6z2q6sb65pr"; + sha256 = "sha256-ADpnSsGZQbXaSGidPmxwkQOl+P8ZupqRaDUh7t+XoDw="; }; - vendorSha256 = "071s3vlz0maz1597l8y899758g24vh58s4kam4q2mxkzfynzs0cr"; + vendorSha256 = "sha256-la7bgeimycltFB7l6vNBYdlBIv4kD+HX7f2mo+eZhXM="; # Disabled for now as there are some failures ("undefined:") doCheck = false; diff --git a/nixpkgs/pkgs/tools/security/nuclei/default.nix b/nixpkgs/pkgs/tools/security/nuclei/default.nix index d02ac5503afd..4d8107902e6e 100644 --- a/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SdN8M3Mr3bywpBUwIVOIctYdkueq/0no4wlI7Ft8Uws="; + sha256 = "1rn4qys3af41f40zr4gi23zy9gawbbjddssm95v5a4zyd5xjfr6b"; }; - vendorSha256 = "sha256-Tz96AXGMyHNHG/3JrmZvisOEty/tDhoK1ZUngDSXOcc="; + vendorSha256 = "04q9japkv41127kl0x2268n6j13y22qg1icd783cl40584ajk2am"; modRoot = "./v2"; subPackages = [ diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix index 74f8694f224c..58630c4ec9f3 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pass-tomb"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-tomb"; rev = "v${version}"; - sha256 = "0wxa673yyzasjlkpd5f3yl5zf7bhsw7h1jbhf6sdjz65bypr2596"; + sha256 = "sha256-kbbMHmYmeyt7HM8YiNhknePm1vUaXWWXPWePKGpbU+o="; }; buildInputs = [ tomb ]; diff --git a/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index 085610f17994..34352f74b55f 100644 --- a/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "proxmark3-rrg"; - version = "4.13441"; + version = "4.14434"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${version}"; - sha256 = "1ffchqnm8023zcm4ywncf1j6076s78226h72m9dfmi0zbj3pbj4m"; + sha256 = "sha256-QscV/RxycpU8ypP1Pv6eKtQrOVC+oikass4tvxUszMI="; }; nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; diff --git a/nixpkgs/pkgs/tools/security/prs/default.nix b/nixpkgs/pkgs/tools/security/prs/default.nix index 30e12467f830..5a020dde9cc4 100644 --- a/nixpkgs/pkgs/tools/security/prs/default.nix +++ b/nixpkgs/pkgs/tools/security/prs/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.13"; + version = "0.3.2"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "sha256-UZm147oNBbgagGKgJcaT5354Tl+MXkK+/bB+tuncH5o="; + sha256 = "sha256-90Ed/mafACSJvH+DjCbdXs3eeyT+pGflRzDD9l3b0/s="; }; - cargoSha256 = "sha256-u31xzgZVlXbraq2lTRJCKZVoHqRg8iH2kE3tkq5NwLk="; + cargoSha256 = "sha256-5teiF8s11Ml8UtbVn6fXur2OQzE52JZnsgyDihbEFTQ="; postPatch = '' # The GPGME backend is recommended diff --git a/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix b/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix new file mode 100644 index 000000000000..7342c34ee367 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "ssh-to-age"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "ssh-to-age"; + rev = version; + sha256 = "sha256-ccwCHu6RlWqMnt5nBy54bVEzfE9/3PEL4C5LnYTtnwU="; + }; + + vendorSha256 = "sha256-jiFPcdWnAk54RJv4mHB3A+5tqKzqitfsiRXYZLa3Gu0="; + + checkPhase = '' + runHook preCheck + go test ./... + runHook postCheck + ''; + + doCheck = true; + + meta = with lib; { + description = "Convert ssh private keys in ed25519 format to age keys"; + homepage = "https://github.com/Mic92/ssh-to-age"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/security/swtpm/default.nix b/nixpkgs/pkgs/tools/security/swtpm/default.nix index 2bd0326d4d92..daceff1486e3 100644 --- a/nixpkgs/pkgs/tools/security/swtpm/default.nix +++ b/nixpkgs/pkgs/tools/security/swtpm/default.nix @@ -1,68 +1,49 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitHub, fetchpatch , autoreconfHook , pkg-config -, libtasn1, openssl, fuse, glib, libseccomp +, libtasn1, openssl, fuse, glib, libseccomp, json-glib , libtpms , unixtools, expect, socat , gnutls , perl -, python3, python3Packages }: stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk="; + sha256 = "sha256-7YzdwGAGECj7PhaCOf/dLSILPXqtbylCkN79vuFBw5Y="; }; - pythonPath = with python3Packages; requiredPythonModules [ - setuptools - cryptography - ]; - patches = [ - # upstream looks for /usr directory in $prefix to check - # whether or not to proceed with installation of python - # tools (swtpm_setup utility). - ./python-installation.patch + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/stefanberger/swtpm/pull/527.patch"; + sha256 = "sha256-cpKHP15a27ifmmswSgHoNzGPO6TY/ZuJIfM5xLOlqlU="; + }) ]; - prePatch = '' - patchShebangs src/swtpm_setup/setup.py - patchShebangs samples/setup.py - ''; - nativeBuildInputs = [ pkg-config unixtools.netstat expect socat perl # for pod2man autoreconfHook - python3 ]; buildInputs = [ libtpms openssl libtasn1 libseccomp - fuse glib + fuse glib json-glib gnutls - python3.pkgs.wrapPython ]; - propagatedBuildInputs = pythonPath; configureFlags = [ "--with-cuse" ]; - postInstall = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath" - ''; - enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch b/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch deleted file mode 100644 index d2689f051c5b..000000000000 --- a/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 353794feb596d95e3f8893e39b174c5a89d1013e -Author: Arthur Gautier <baloo@superbaloo.net> -Date: Wed Feb 17 02:27:40 2021 +0000 - - python-install - - Signed-off-by: Arthur Gautier <baloo@superbaloo.net> - -diff --git a/samples/Makefile.am b/samples/Makefile.am -index 7d69bf8..1803bb9 100644 ---- a/samples/Makefile.am -+++ b/samples/Makefile.am -@@ -39,19 +39,9 @@ python-uninstall: - $(PIP3) uninstall -y $(PY_PACKAGE_NAME) - - if PYTHON_INSTALLATION --install-exec-local: $(PY_PACKAGE) -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ -- else \ -- $(MAKE) python-install; \ -- fi -+install-exec-local: python-install - --uninstall-local: -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Cleanup for distcheck build not implemented" ; \ -- else \ -- $(MAKE) python-uninstall; \ -- fi -+uninstall-local: python-uninstall - endif - - -diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am -index 529eefe..533b1b3 100644 ---- a/src/swtpm_setup/Makefile.am -+++ b/src/swtpm_setup/Makefile.am -@@ -29,19 +29,9 @@ python-uninstall: - $(PIP3) uninstall -y $(PY_PACKAGE_NAME) - - if PYTHON_INSTALLATION --install-exec-local: $(PY_PACKAGE) -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ -- else \ -- $(MAKE) python-install; \ -- fi -+install-exec-local: python-install - --uninstall-local: -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Cleanup for distcheck build not implemented" ; \ -- else \ -- $(MAKE) python-uninstall; \ -- fi -+uninstall-local: python-uninstall - endif - - # for out-of-tree builds we need to clean up diff --git a/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index 4342c8f3ac95..eb4de54c303e 100644 --- a/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/vaultwarden/default.nix @@ -8,16 +8,16 @@ let in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "sha256-aXbnNO3mTAgE1yNx7YVDo1vPpO8ACZpBGHQ633fNZ3k="; + sha256 = "sha256-37+Gor3xyo0yb3I4rrleJoPnqTA7G3WmeMSTltthi2E="; }; - cargoSha256 = "sha256-SFzq3OU0a0s3zlEzUkqGdZb/knYafqDamLy4ghH4i8I="; + cargoSha256 = "sha256-+zu5OfvXj8DMglf5Xv5ZcaUlbE03cwyD8TN7YftgWO0="; nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] diff --git a/nixpkgs/pkgs/tools/security/wapiti/default.nix b/nixpkgs/pkgs/tools/security/wapiti/default.nix index cd89d4039e5f..38ba47a51223 100644 --- a/nixpkgs/pkgs/tools/security/wapiti/default.nix +++ b/nixpkgs/pkgs/tools/security/wapiti/default.nix @@ -104,6 +104,8 @@ python3.pkgs.buildPythonApplication rec { # Requires a PHP installation "test_timesql" "test_cookies" + # E TypeError: Expected bytes or bytes-like object got: <class 'str'> + "test_persister_upload" ]; pythonImportsCheck = [ "wapitiCore" ]; diff --git a/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix b/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix new file mode 100644 index 000000000000..93531d3a2b67 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -0,0 +1,26 @@ +{ lib, libnotify, buildGoModule, fetchFromGitHub, pkg-config }: + +buildGoModule rec { + pname = "yubikey-touch-detector"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "maximbaz"; + repo = "yubikey-touch-detector"; + rev = version; + sha256 = "sha256-I9dRCQhbXd8K1zp291z9XVwHI9DcxgvrzYaHICZH5v0="; + }; + vendorSha256 = "sha256-UeDLGwYrXwLOtQt/8fEmficc/1j0x+zr/JLa6lLF5cs="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libnotify ]; + + meta = with lib; { + description = "A tool to detect when your YubiKey is waiting for a touch (to send notification or display a visual indicator on the screen)."; + homepage = "https://github.com/maximbaz/yubikey-touch-detector"; + maintainers = with maintainers; [ sumnerevans ]; + license = licenses.isc; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix b/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix index 28d771f07b20..427fe12267ec 100644 --- a/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix +++ b/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix @@ -1,14 +1,14 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, substituteAll }: python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.6.4"; + version = "1.6.9"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9WYuAWcJGosYEsnnkqvZLXXvqF+1nBEozh6F84Kit6w="; + sha256 = "1pri182cgbrhr0adq2784gpv6q8c8kjr0jsh8wpvd1wvfsbqywrm"; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; @@ -16,8 +16,16 @@ python3Packages.buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "auto_cpufreq" ]; - # patch to prevent script copying and to disable install - patches = [ ./prevent-install-and-copy.patch ]; + patches = [ + # hardcodes version output + (substituteAll { + src = ./fix-version-output.patch; + inherit version; + }) + + # patch to prevent script copying and to disable install + ./prevent-install-and-copy.patch + ]; postInstall = '' # copy script manually diff --git a/nixpkgs/pkgs/tools/system/auto-cpufreq/fix-version-output.patch b/nixpkgs/pkgs/tools/system/auto-cpufreq/fix-version-output.patch new file mode 100644 index 000000000000..69293a4c3dc2 --- /dev/null +++ b/nixpkgs/pkgs/tools/system/auto-cpufreq/fix-version-output.patch @@ -0,0 +1,37 @@ +--- a/auto_cpufreq/core.py ++++ b/auto_cpufreq/core.py +@@ -68,32 +68,8 @@ dist_name = distro.id() + + # display running version of auto-cpufreq + def app_version(): +- +- print("auto-cpufreq version:") +- +- # snap package +- if os.getenv("PKG_MARKER") == "SNAP": +- print(getoutput("echo Snap: $SNAP_VERSION")) +- # aur package +- elif dist_name in ["arch", "manjaro", "garuda"]: +- aur_pkg_check = call("pacman -Qs auto-cpufreq > /dev/null", shell=True) +- if aur_pkg_check == 1: +- print( +- "Git commit:", +- check_output(["git", "describe", "--always"]).strip().decode(), +- ) +- else: +- print(getoutput("pacman -Qi auto-cpufreq | grep Version")) +- else: +- # source code (auto-cpufreq-installer) +- try: +- print( +- "Git commit:", +- check_output(["git", "describe", "--always"]).strip().decode(), +- ) +- except Exception as e: +- print(repr(e)) +- pass ++ print("auto-cpufreq version: @version@") ++ print("Git commit: v@version@") + + + def app_res_use(): diff --git a/nixpkgs/pkgs/tools/system/bottom/default.nix b/nixpkgs/pkgs/tools/system/bottom/default.nix index 1401f2a78a90..ad049784c3c8 100644 --- a/nixpkgs/pkgs/tools/system/bottom/default.nix +++ b/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-hXEaQL4jTd/MfEUVKUTs7oTRAffau1YA/IUUtD+V9KI="; + sha256 = "sha256-4L8TUfpEfhjfE1E8GjpRnXPf8kfXdJ02FEusXB/dZWo="; }; prePatch = '' @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-aeR6fcIWkY4AWZy8tVotUAVRVSiO/0S0DU/A9/ATrF4="; + cargoSha256 = "sha256-pfDj3lbJpoqnUnzGL64Azcj2HU/UhRe1k55Unh85C/k="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/system/btop/default.nix b/nixpkgs/pkgs/tools/system/btop/default.nix new file mode 100644 index 000000000000..5425b6e5f5b7 --- /dev/null +++ b/nixpkgs/pkgs/tools/system/btop/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "btop"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "aristocratos"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-pa9i65ndx8LMTMRXyL2GXCauM6Q8gAb16zGOylQFwL0="; + }; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A monitor of resources"; + homepage = "https://github.com/aristocratos/btop"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ rmcgibbo ]; + }; +} diff --git a/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/nixpkgs/pkgs/tools/system/fakeroot/default.nix index bf42e987c4d3..c4d3845df803 100644 --- a/nixpkgs/pkgs/tools/system/fakeroot/default.nix +++ b/nixpkgs/pkgs/tools/system/fakeroot/default.nix @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { # glibc 2.33 patches from ArchLinux (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8="; }) ] diff --git a/nixpkgs/pkgs/tools/system/fio/default.nix b/nixpkgs/pkgs/tools/system/fio/default.nix index b108c9dd3d16..dedcbc6f1e4c 100644 --- a/nixpkgs/pkgs/tools/system/fio/default.nix +++ b/nixpkgs/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.27"; + version = "3.28"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-/VzqmDbCTOOwFBMDj9nYuAW7ZJNM8B2LQ3QxReWG+iw="; + sha256 = "sha256-8F31tyZ4/Qk14uwkg0DRPMdSaZGRVnI1dUDOITWhYAA="; }; buildInputs = [ python3 zlib ] diff --git a/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock index 1bafc658cbc0..dac60786a63f 100644 --- a/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock +++ b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock @@ -4,6 +4,10 @@ GEM foreman (0.87.2) PLATFORMS + aarch64-darwin + aarch64-linux + ruby + x86_64-darwin x86_64-linux DEPENDENCIES diff --git a/nixpkgs/pkgs/tools/system/gdu/default.nix b/nixpkgs/pkgs/tools/system/gdu/default.nix index 630cc66da0ef..8c70910a9925 100644 --- a/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.7.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zotCn8J6zQtHd/YDT87l6Vh4Xh51tOJENBCdxZ5rqWU="; + sha256 = "1410mmijzjvcylrynyq4p2fayi1wjy61sibd3kws96k3k7ylb14n"; }; - vendorSha256 = "sha256-TBWhF2YmlJPNFr3sKSFhuzoBD0Hp1tnYAMJDUwO/QFM="; + vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/system/htop/default.nix b/nixpkgs/pkgs/tools/system/htop/default.nix index 9c254ab33d81..350c20ae101d 100644 --- a/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/nixpkgs/pkgs/tools/system/htop/default.nix @@ -11,13 +11,13 @@ assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.0.5"; + version = "3.1.0"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-9zecDd3oZ24RyOLnKdJmR29Chx6S24Kvuf/F7RYzl4I="; + sha256 = "sha256-/48Ca7JPzhPS4eYsPbwbSVcx9aS1f0LHcqsbNVWL+9k="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/nixpkgs/pkgs/tools/system/hwinfo/default.nix index 9ee77bfc6d3d..bf9e5cd9438b 100644 --- a/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.75"; + version = "21.76"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-w2Lb+4FvPXw2uFqwsmzVdKIXY8IXV/TAb8FHFPl/K40="; + sha256 = "sha256-C0aYEgJC+ITxWcYBLPehNz9J1Y25gS1+UDVc3+7nIKQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/system/illum/default.nix b/nixpkgs/pkgs/tools/system/illum/default.nix index 42aae9d81a28..ffa016cabfee 100644 --- a/nixpkgs/pkgs/tools/system/illum/default.nix +++ b/nixpkgs/pkgs/tools/system/illum/default.nix @@ -1,18 +1,19 @@ -{ lib, stdenv, fetchgit, pkg-config, ninja, libevdev, libev }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ninja, libevdev, libev, udev }: -stdenv.mkDerivation { - version = "0.4"; +stdenv.mkDerivation rec { pname = "illum"; + version = "0.5"; - src = fetchgit { - url = "https://github.com/jmesmon/illum.git"; + src = fetchFromGitHub { + owner = "jmesmon"; + repo = "illum"; + rev = "v${version}"; + sha256 = "S4lUBeRnZlRUpIxFdN/bh979xvdS7roF6/6Dk0ZUrnM="; fetchSubmodules = true; - rev = "48ce8631346b1c88a901a8e4fa5fa7e8ffe8e418"; - sha256 = "05v3hz7n6b1mlhc6zqijblh1vpl0ja1y8y0lafw7mjdz03wxhfdb"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ninja libevdev libev ]; + buildInputs = [ ninja libevdev libev udev ]; configurePhase = '' bash ./configure diff --git a/nixpkgs/pkgs/tools/system/ipmitool/default.nix b/nixpkgs/pkgs/tools/system/ipmitool/default.nix index 416fab94ddc9..2ad0d11f95f0 100644 --- a/nixpkgs/pkgs/tools/system/ipmitool/default.nix +++ b/nixpkgs/pkgs/tools/system/ipmitool/default.nix @@ -1,11 +1,8 @@ { stdenv, lib, fetchurl, openssl, fetchpatch, static ? stdenv.hostPlatform.isStatic }: -let +stdenv.mkDerivation rec { pname = "ipmitool"; version = "1.8.18"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix b/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix index 4d1417b4b831..5d4df37a2b66 100644 --- a/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix +++ b/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.45"; + version = "3.5.46"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "sha256-rnlloa0DicWT1RlP2szDvBINvT5/RZ17GOarUzvX1AI="; + sha256 = "sha256-guHQyFSI0TidAuOr4zWaf3WRGeNW4+Or1sbWdhWuWtg="; }; buildInputs = [ jdk ]; diff --git a/nixpkgs/pkgs/tools/system/loadwatch/default.nix b/nixpkgs/pkgs/tools/system/loadwatch/default.nix index 722e5a9afde1..27e33a22d4b9 100644 --- a/nixpkgs/pkgs/tools/system/loadwatch/default.nix +++ b/nixpkgs/pkgs/tools/system/loadwatch/default.nix @@ -1,17 +1,20 @@ -{ lib, stdenv, fetchgit, ... }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "loadwatch"; version = "1.1-1-g6d2544c"; + src = fetchgit { url = "git://woffs.de/git/fd/loadwatch.git"; sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b"; rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e"; }; + installPhase = '' mkdir -p $out/bin install loadwatch lw-ctl $out/bin ''; + meta = with lib; { description = "Run a program using only idle cycles"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/system/localtime/default.nix b/nixpkgs/pkgs/tools/system/localtime/default.nix index 4c12c9eb27da..0ad17c6c6595 100644 --- a/nixpkgs/pkgs/tools/system/localtime/default.nix +++ b/nixpkgs/pkgs/tools/system/localtime/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "localtime"; - version = "2017-11-07"; + version = "unstable-2017-11-07"; src = fetchFromGitHub { owner = "Stebalien"; @@ -32,6 +32,7 @@ buildGoPackage rec { meta = with lib; { description = "A daemon for keeping the system timezone up-to-date based on the current location"; homepage = "https://github.com/Stebalien/localtime"; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index 25d0366ef715..3c025247377d 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -87,7 +87,10 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; - passthru.tests.netdata = nixosTests.netdata; + passthru = { + inherit withIpmi; + tests.netdata = nixosTests.netdata; + }; meta = { description = "Real-time performance monitoring tool"; diff --git a/nixpkgs/pkgs/tools/system/opencl-info/default.nix b/nixpkgs/pkgs/tools/system/opencl-info/default.nix index 173de5f607fe..124b53512d72 100644 --- a/nixpkgs/pkgs/tools/system/opencl-info/default.nix +++ b/nixpkgs/pkgs/tools/system/opencl-info/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "opencl-info"; - version = "2014-02-21"; + version = "unstable-2014-02-21"; src = fetchFromGitHub { owner = "marchv"; diff --git a/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix b/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix index 685697f861ff..993bfdaf834a 100644 --- a/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix +++ b/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "rowhammer-test"; - version = "20150811"; + version = "unstable-2015-08-11"; src = fetchFromGitHub { owner = "google"; repo = "rowhammer-test"; - rev = "c1d2bd9f629281402c10bb10e52bc1f1faf59cc4"; # 2015-08-11 + rev = "c1d2bd9f629281402c10bb10e52bc1f1faf59cc4"; sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; diff --git a/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/nixpkgs/pkgs/tools/system/rsyslog/default.nix index 6ff5c07721f4..8e1e51469dd1 100644 --- a/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2102.0"; + version = "8.2108.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "sha256-lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc="; + sha256 = "sha256-SCbCttCBqclfRp+wEVvj+VEgZSl9PeAOxRN1jNswsdk="; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix index 6dc84da1e14e..175c34020307 100644 --- a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix +++ b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix @@ -1,33 +1,89 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib, openjdk, perl, ant }: stdenv.mkDerivation rec { version = "4.11.0"; pname = "sleuthkit"; - src = fetchFromGitHub { + sleuthsrc = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = "${pname}-${version}"; - sha256 = "sha256-cY55zK6N3tyCLBJtZn4LhK9kLkikJjg640Pm/NA0ALY="; + sha256 = "1dh06k8grrj3wcx3h9m490p69bw41dz6cv8j5j1drpldmv67k3ki"; }; + # Fetch libraries using a fixed output derivation + rdeps = stdenv.mkDerivation rec { + + version = "1.0"; + pname = "sleuthkit-deps"; + nativeBuildInputs = [ openjdk ant ]; + + src = sleuthsrc; + + # unpack, build, install + dontConfigure = true; + + buildPhase = '' + export IVY_HOME=$NIX_BUILD_TOP/.ant + pushd bindings/java + ant retrieve-deps + popd + pushd case-uco/java + ant get-ivy-dependencies + popd + ''; + + installPhase = '' + export IVY_HOME=$NIX_BUILD_TOP/.ant + mkdir -m 755 -p $out/bindings/java + cp -r bindings/java/lib $out/bindings/java + mkdir -m 755 -p $out/case-uco/java + cp -r case-uco/java/lib $out/case-uco/java + cp -r $IVY_HOME/lib $out + chmod -R 755 $out/lib + ''; + + outputHashMode = "recursive"; + outputHash = "0fq7v6zlgybg4v6k9wqjlk4gaqgjrpihbnr182vaqriihflav2s8"; + outputHashAlgo = "sha256"; + }; + + src = sleuthsrc; + postPatch = '' substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset ''; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook openjdk perl ant rdeps ]; buildInputs = [ libewf afflib openssl zlib ]; - # Hack to fix the RPATH. - preFixup = "rm -rf */.libs"; + # Hack to fix the RPATH + preFixup = '' + rm -rf */.libs + ''; + + postUnpack = '' + export IVY_HOME="$NIX_BUILD_TOP/.ant" + export JAVA_HOME="${openjdk}" + export ant_args="-Doffline=true -Ddefault-jar-location=$IVY_HOME/lib" + + # pre-positioning these jar files allows -Doffline=true to work + mkdir -p source/{bindings,case-uco}/java $IVY_HOME + cp -r ${rdeps}/bindings/java/lib source/bindings/java + chmod -R 755 source/bindings/java + cp -r ${rdeps}/case-uco/java/lib source/case-uco/java + chmod -R 755 source/case-uco/java + cp -r ${rdeps}/lib $IVY_HOME + chmod -R 755 $IVY_HOME + ''; - meta = { + meta = with lib; { description = "A forensic/data recovery tool"; homepage = "https://www.sleuthkit.org/"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; - license = lib.licenses.ipl10; + maintainers = with maintainers; [ raskin gfrascadorio ]; + platforms = platforms.linux; + license = licenses.ipl10; }; } diff --git a/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 0b11f1d91890..6d748749a0c2 100644 --- a/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.13.00"; + version = "0.13.01"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-HO/kowV8FSKxRuYvYbgM5uLpnaLYXr4lvAP8RSKOWM0="; + sha256 = "sha256-839znk0VNDNgpHmAtn3Isqa/PU0+9yfVXi3Zmgtk+eo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/system/which/default.nix b/nixpkgs/pkgs/tools/system/which/default.nix index f4c871d5af08..de823f98596a 100644 --- a/nixpkgs/pkgs/tools/system/which/default.nix +++ b/nixpkgs/pkgs/tools/system/which/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "which-2.21"; + pname = "which"; + version = "2.21"; src = fetchurl { - url = "mirror://gnu/which/${name}.tar.gz"; + url = "mirror://gnu/which/which-${version}.tar.gz"; sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; }; diff --git a/nixpkgs/pkgs/tools/text/align/default.nix b/nixpkgs/pkgs/tools/text/align/default.nix new file mode 100644 index 000000000000..4f67d747da4c --- /dev/null +++ b/nixpkgs/pkgs/tools/text/align/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "align"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "Guitarbum722"; + repo = pname; + rev = "v${version}"; + sha256 = "17gs3417633z71kc6l5zqg4b3rjhpn2v8qs8rnfrk4nbwzz4nrq3"; + }; + + vendorSha256 = null; + + meta = with lib; { + homepage = "https://github.com/Guitarbum722/align"; + description = "A general purpose application and library for aligning text"; + maintainers = with maintainers; [ hrhino ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/tools/text/catdocx/default.nix b/nixpkgs/pkgs/tools/text/catdocx/default.nix index adf78397fcb3..c762e15c80e2 100644 --- a/nixpkgs/pkgs/tools/text/catdocx/default.nix +++ b/nixpkgs/pkgs/tools/text/catdocx/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, unzip, catdoc }: stdenv.mkDerivation { - name = "catdocx-20170102"; + pname = "catdocx"; + version = "unstable-2017-01-02"; src = fetchFromGitHub { owner = "jncraton"; diff --git a/nixpkgs/pkgs/tools/text/convertlit/default.nix b/nixpkgs/pkgs/tools/text/convertlit/default.nix index 18dc01c01d02..4225934d2d4e 100644 --- a/nixpkgs/pkgs/tools/text/convertlit/default.nix +++ b/nixpkgs/pkgs/tools/text/convertlit/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchzip, libtommath}: -stdenv.mkDerivation { - name = "convertlit-1.8"; +stdenv.mkDerivation rec { + pname = "convertlit"; + version = "1.8"; src = fetchzip { - url = "http://www.convertlit.com/convertlit18src.zip"; + url = "http://www.convertlit.com/convertlit${lib.replaceStrings ["."] [""] version}src.zip"; sha256 = "182nsin7qscgbw2h92m0zadh3h8q410h5cza6v486yjfvla3dxjx"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix b/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix index 10353227b70a..f5c489681e93 100644 --- a/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix +++ b/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.6.5"; + version = "3.7.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-9bw85dFazlcbZhx/bUoxW4iIsw+RdE3d+O5Cj3Obb7A="; + sha256 = "sha256-2TQL5k2ndckFjOOXNz7clVpwPUMStR4xgd1P+qUhNC8="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/nixpkgs/pkgs/tools/text/diffstat/default.nix b/nixpkgs/pkgs/tools/text/diffstat/default.nix index c8ff1e973a50..3e156cf3132d 100644 --- a/nixpkgs/pkgs/tools/text/diffstat/default.nix +++ b/nixpkgs/pkgs/tools/text/diffstat/default.nix @@ -1,12 +1,13 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "diffstat-1.64"; + pname = "diffstat"; + version = "1.64"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" - "https://invisible-mirror.net/archives/diffstat/${name}.tgz" + "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" + "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" ]; sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w="; }; diff --git a/nixpkgs/pkgs/tools/text/difftastic/default.nix b/nixpkgs/pkgs/tools/text/difftastic/default.nix index bfe430957484..06bd7d0376b2 100644 --- a/nixpkgs/pkgs/tools/text/difftastic/default.nix +++ b/nixpkgs/pkgs/tools/text/difftastic/default.nix @@ -1,23 +1,34 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, tree-sitter }: rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "0103py4v4v7xqv85yiczhd9w9h1aa54svhhdibvbl6x4b35y2mk5"; + sha256 = "sha256-spncRJjROytGnIig6ujqHu0e/XBTN4dsJ3og4aIu+l8="; }; - cargoSha256 = "1k0d7yadicfzfc2m1aqs4c4a2k3srb54fpwarc3kwn26v3vfjai1"; + cargoSha256 = "sha256-2xGwS4wjLQ7zmfZ2gMdlUAkjPDF6SmUaiX2j1KYy0vo="; + + postPatch = '' + pushd vendor + for grammar in */; do + if [ -d "${tree-sitter.grammars}/$grammar" ]; then + rm -r "$grammar" + ln -s "${tree-sitter.grammars}/$grammar" + fi + done + popd + ''; meta = with lib; { description = "A syntax-aware diff"; homepage = "https://github.com/Wilfred/difftastic"; changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ethancedwards8 ]; + maintainers = with maintainers; [ ethancedwards8 figsoda ]; }; } diff --git a/nixpkgs/pkgs/tools/text/diffutils/default.nix b/nixpkgs/pkgs/tools/text/diffutils/default.nix index d95e7ae399db..d5f27747cf1c 100644 --- a/nixpkgs/pkgs/tools/text/diffutils/default.nix +++ b/nixpkgs/pkgs/tools/text/diffutils/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "diffutils"; - version = "3.7"; + version = "3.8"; src = fetchurl { url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz"; - sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; + sha256 = "sha256-pr3X0bMSZtEcT03mwbdI1GB6sCMa9RiPwlM9CuJDj+w="; }; outputs = [ "out" "info" ]; diff --git a/nixpkgs/pkgs/tools/text/ebook-tools/default.nix b/nixpkgs/pkgs/tools/text/ebook-tools/default.nix index bb93b217ea24..1a46110e2a42 100644 --- a/nixpkgs/pkgs/tools/text/ebook-tools/default.nix +++ b/nixpkgs/pkgs/tools/text/ebook-tools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: stdenv.mkDerivation rec { - name = "ebook-tools-0.2.2"; + pname = "ebook-tools"; + version = "0.2.2"; src = fetchurl { - url = "mirror://sourceforge/ebook-tools/${name}.tar.gz"; + url = "mirror://sourceforge/ebook-tools/ebook-tools-${version}.tar.gz"; sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; diff --git a/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch b/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch index c8c56ffdb622..eb5ec5748553 100644 --- a/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch +++ b/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch @@ -1,26 +1,26 @@ -From 84797e8fb8ead8822ebfd251b47c72433555860e Mon Sep 17 00:00:00 2001 +From 99bfed6f7278ae9b5edfc42644e57eb0ae7669e1 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" <rmcgibbo@gmail.com> -Date: Fri, 5 Mar 2021 16:59:41 -0500 -Subject: [PATCH 1/1] Create cargo lock file for 0.4.5 +Date: Wed, 22 Sep 2021 16:00:13 -0400 +Subject: [PATCH 1/1] Create cargo lock file for 0.4.7 --- - Cargo.lock | 916 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 916 insertions(+) + Cargo.lock | 881 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 881 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..136677d +index 0000000..37e9c5f --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,916 @@ +@@ -0,0 +1,881 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "anyhow" -+version = "1.0.38" ++version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" ++checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" + +[[package]] +name = "atty" @@ -56,15 +56,15 @@ index 0000000..136677d + +[[package]] +name = "bitflags" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bstr" -+version = "0.2.15" ++version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" ++checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "lazy_static", + "memchr", @@ -74,21 +74,15 @@ index 0000000..136677d + +[[package]] +name = "bumpalo" -+version = "3.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" -+ -+[[package]] -+name = "byteorder" -+version = "1.4.2" ++version = "3.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" ++checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" + +[[package]] +name = "cast" -+version = "0.2.3" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" ++checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +dependencies = [ + "rustc_version", +] @@ -118,16 +112,16 @@ index 0000000..136677d + +[[package]] +name = "criterion" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" ++checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" +dependencies = [ + "atty", + "cast", + "clap", + "criterion-plot", + "csv", -+ "itertools 0.10.0", ++ "itertools", + "lazy_static", + "num-traits", + "oorandom", @@ -144,12 +138,12 @@ index 0000000..136677d + +[[package]] +name = "criterion-plot" -+version = "0.4.3" ++version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" ++checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" +dependencies = [ + "cast", -+ "itertools 0.9.0", ++ "itertools", +] + +[[package]] @@ -164,33 +158,33 @@ index 0000000..136677d + +[[package]] +name = "crossbeam-channel" -+version = "0.5.0" ++version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" ++checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if 1.0.0", -+ "crossbeam-utils 0.8.3", ++ "crossbeam-utils 0.8.5", +] + +[[package]] +name = "crossbeam-deque" -+version = "0.8.0" ++version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", -+ "crossbeam-utils 0.8.3", ++ "crossbeam-utils 0.8.5", +] + +[[package]] +name = "crossbeam-epoch" -+version = "0.9.3" ++version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" ++checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +dependencies = [ + "cfg-if 1.0.0", -+ "crossbeam-utils 0.8.3", ++ "crossbeam-utils 0.8.5", + "lazy_static", + "memoffset", + "scopeguard", @@ -209,20 +203,19 @@ index 0000000..136677d + +[[package]] +name = "crossbeam-utils" -+version = "0.8.3" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" ++checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ -+ "autocfg", + "cfg-if 1.0.0", + "lazy_static", +] + +[[package]] +name = "csv" -+version = "1.1.5" ++version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97" ++checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr", + "csv-core", @@ -260,7 +253,7 @@ index 0000000..136677d + +[[package]] +name = "fst" -+version = "0.4.5" ++version = "0.4.7" +dependencies = [ + "doc-comment", + "fnv", @@ -271,21 +264,12 @@ index 0000000..136677d +] + +[[package]] -+name = "fst" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f" -+dependencies = [ -+ "utf8-ranges", -+] -+ -+[[package]] +name = "fst-bench" +version = "0.0.1" +dependencies = [ + "criterion", + "fnv", -+ "fst 0.4.5", ++ "fst", +] + +[[package]] @@ -298,7 +282,7 @@ index 0000000..136677d + "clap", + "crossbeam-channel 0.4.4", + "csv", -+ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fst", + "memmap", + "num_cpus", + "regex-automata", @@ -319,9 +303,9 @@ index 0000000..136677d + +[[package]] +name = "getrandom" -+version = "0.2.2" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" ++checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if 1.0.0", + "libc", @@ -336,42 +320,33 @@ index 0000000..136677d + +[[package]] +name = "hermit-abi" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "itertools" -+version = "0.9.0" ++version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "itertools" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" ++checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" -+version = "0.4.7" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "js-sys" -+version = "0.3.48" ++version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78" ++checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +dependencies = [ + "wasm-bindgen", +] @@ -384,9 +359,9 @@ index 0000000..136677d + +[[package]] +name = "libc" -+version = "0.2.88" ++version = "0.2.102" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" ++checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" + +[[package]] +name = "log" @@ -405,9 +380,9 @@ index 0000000..136677d + +[[package]] +name = "memchr" -+version = "2.3.4" ++version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memmap" @@ -421,9 +396,9 @@ index 0000000..136677d + +[[package]] +name = "memoffset" -+version = "0.6.1" ++version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" ++checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] @@ -455,9 +430,9 @@ index 0000000..136677d + +[[package]] +name = "plotters" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" ++checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" +dependencies = [ + "num-traits", + "plotters-backend", @@ -468,15 +443,15 @@ index 0000000..136677d + +[[package]] +name = "plotters-backend" -+version = "0.3.0" ++version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590" ++checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" + +[[package]] +name = "plotters-svg" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211" ++checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" +dependencies = [ + "plotters-backend", +] @@ -489,9 +464,9 @@ index 0000000..136677d + +[[package]] +name = "proc-macro2" -+version = "1.0.24" ++version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +dependencies = [ + "unicode-xid", +] @@ -530,14 +505,14 @@ index 0000000..136677d + +[[package]] +name = "rand" -+version = "0.8.3" ++version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" ++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "libc", -+ "rand_chacha 0.3.0", -+ "rand_core 0.6.2", -+ "rand_hc 0.3.0", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.3", ++ "rand_hc 0.3.1", +] + +[[package]] @@ -552,12 +527,12 @@ index 0000000..136677d + +[[package]] +name = "rand_chacha" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", -+ "rand_core 0.6.2", ++ "rand_core 0.6.3", +] + +[[package]] @@ -571,11 +546,11 @@ index 0000000..136677d + +[[package]] +name = "rand_core" -+version = "0.6.2" ++version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ -+ "getrandom 0.2.2", ++ "getrandom 0.2.3", +] + +[[package]] @@ -589,18 +564,18 @@ index 0000000..136677d + +[[package]] +name = "rand_hc" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" ++checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ -+ "rand_core 0.6.2", ++ "rand_core 0.6.3", +] + +[[package]] +name = "rayon" -+version = "1.5.0" ++version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" ++checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +dependencies = [ + "autocfg", + "crossbeam-deque", @@ -610,51 +585,50 @@ index 0000000..136677d + +[[package]] +name = "rayon-core" -+version = "1.9.0" ++version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" ++checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +dependencies = [ -+ "crossbeam-channel 0.5.0", ++ "crossbeam-channel 0.5.1", + "crossbeam-deque", -+ "crossbeam-utils 0.8.3", ++ "crossbeam-utils 0.8.5", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" -+version = "0.2.5" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" -+version = "1.4.3" ++version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" ++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-automata" -+version = "0.1.9" ++version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" ++checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ -+ "byteorder", -+ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fst", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.22" ++version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" ++checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "remove_dir_all" @@ -667,9 +641,9 @@ index 0000000..136677d + +[[package]] +name = "rustc_version" -+version = "0.2.3" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] @@ -697,33 +671,24 @@ index 0000000..136677d + +[[package]] +name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+dependencies = [ -+ "semver-parser", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" + +[[package]] +name = "serde" -+version = "1.0.123" ++version = "1.0.130" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" ++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cbor" -+version = "0.11.1" ++version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" ++checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", @@ -731,9 +696,9 @@ index 0000000..136677d + +[[package]] +name = "serde_derive" -+version = "1.0.123" ++version = "1.0.130" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" ++checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +dependencies = [ + "proc-macro2", + "quote", @@ -742,9 +707,9 @@ index 0000000..136677d + +[[package]] +name = "serde_json" -+version = "1.0.64" ++version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +dependencies = [ + "itoa", + "ryu", @@ -753,9 +718,9 @@ index 0000000..136677d + +[[package]] +name = "syn" -+version = "1.0.61" ++version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed22b90a0e734a23a7610f4283ac9e5acfb96cbb30dfefa540d66f866f1c09c5" ++checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +dependencies = [ + "proc-macro2", + "quote", @@ -770,7 +735,7 @@ index 0000000..136677d +dependencies = [ + "cfg-if 1.0.0", + "libc", -+ "rand 0.8.3", ++ "rand 0.8.4", + "redox_syscall", + "remove_dir_all", + "winapi", @@ -797,15 +762,15 @@ index 0000000..136677d + +[[package]] +name = "unicode-width" -+version = "0.1.8" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "utf8-ranges" @@ -815,9 +780,9 @@ index 0000000..136677d + +[[package]] +name = "walkdir" -+version = "2.3.1" ++version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", @@ -838,9 +803,9 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7" ++checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", @@ -848,9 +813,9 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8" ++checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +dependencies = [ + "bumpalo", + "lazy_static", @@ -863,9 +828,9 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b" ++checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", @@ -873,9 +838,9 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e" ++checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +dependencies = [ + "proc-macro2", + "quote", @@ -886,15 +851,15 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1" ++checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" + +[[package]] +name = "web-sys" -+version = "0.3.48" ++version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b" ++checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -931,5 +896,5 @@ index 0000000..136677d +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -- -2.29.2 +2.29.3 diff --git a/nixpkgs/pkgs/tools/text/fst/default.nix b/nixpkgs/pkgs/tools/text/fst/default.nix index 99c904005220..1e3759c6a578 100644 --- a/nixpkgs/pkgs/tools/text/fst/default.nix +++ b/nixpkgs/pkgs/tools/text/fst/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "fst"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "01qdj7zzgwb1zqcznfmnks3dnl6hnf8ib0sm0sgimsbcvajmhab3"; + sha256 = "sha256-fXbX6idoGBtQiKM37C0z89OH/5H2PkZdwYLksXbbakE="; }; cargoPatches = [ @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ]; cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "0440p0hb3nlq9wwk3zac9dldanslrddvqn4gib0vl7aikxkcvh4l"; + cargoSha256 = "sha256-2gy4i4CwZP6LB5ea1LBSfeAV6bNnsvDbxw0Unur0Hm4="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/nixpkgs/pkgs/tools/text/gawk/default.nix b/nixpkgs/pkgs/tools/text/gawk/default.nix index fd746ca117e8..3eb9ed3000c2 100644 --- a/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -15,9 +15,6 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; -let - inherit (lib) optional; -in stdenv.mkDerivation rec { pname = "gawk"; version = "5.1.0"; @@ -28,14 +25,14 @@ stdenv.mkDerivation rec { }; # When we do build separate interactive version, it makes sense to always include man. - outputs = [ "out" "info" ] ++ optional (!interactive) "man"; + outputs = [ "out" "info" ] + ++ lib.optional (!interactive) "man"; - nativeBuildInputs = optional (doCheck && stdenv.isLinux) glibcLocales; + nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales; - buildInputs = - optional withSigsegv libsigsegv - ++ optional interactive readline - ++ optional stdenv.isDarwin locale; + buildInputs = lib.optional withSigsegv libsigsegv + ++ lib.optional interactive readline + ++ lib.optional stdenv.isDarwin locale; configureFlags = [ (if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv") @@ -60,7 +57,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.gnu.org/software/gawk/"; description = "GNU implementation of the Awk programming language"; - longDescription = '' Many computer users need to manipulate text files: extract and then operate on data from parts of certain lines while discarding the rest, @@ -74,11 +70,8 @@ stdenv.mkDerivation rec { makes it possible to handle many data-reformatting jobs with just a few lines of code. ''; - license = licenses.gpl3Plus; - platforms = platforms.unix ++ platforms.windows; - maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/tools/text/gnugrep/default.nix b/nixpkgs/pkgs/tools/text/gnugrep/default.nix index 42a9d913dd20..c5a661af1153 100644 --- a/nixpkgs/pkgs/tools/text/gnugrep/default.nix +++ b/nixpkgs/pkgs/tools/text/gnugrep/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation { maintainers = [ maintainers.eelco ]; platforms = platforms.all; + mainProgram = "grep"; }; passthru = {inherit pcre;}; diff --git a/nixpkgs/pkgs/tools/text/hck/default.nix b/nixpkgs/pkgs/tools/text/hck/default.nix index 271e4d9b7168..c17488bf67ac 100644 --- a/nixpkgs/pkgs/tools/text/hck/default.nix +++ b/nixpkgs/pkgs/tools/text/hck/default.nix @@ -1,7 +1,7 @@ -{ cmake -, fetchFromGitHub -, lib +{ lib , rustPlatform +, fetchFromGitHub +, cmake , stdenv , libiconv , CoreFoundation @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "02yvpgvzdprysg0spa0abn7d3vjj5spzc3528rwbpl4cw2yx8j6w"; + sha256 = "sha256-+gBxZCBJmwe92DhfVorkfXsjpjkgm7JO/p/SHta9ly8="; }; - cargoSha256 = "0n6wywb1xyaxkbr0fs39992dfv55wzvp05i1vk9mxgnsim9s7aw8"; + cargoSha256 = "sha256-lAKMaUrXjplh5YhMZuLhTNDQBzDPHCfFrELHicwgi6U="; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/text/hottext/default.nix b/nixpkgs/pkgs/tools/text/hottext/default.nix index ca0cbf9d1a09..6fe7a686c100 100644 --- a/nixpkgs/pkgs/tools/text/hottext/default.nix +++ b/nixpkgs/pkgs/tools/text/hottext/default.nix @@ -1,81 +1,30 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, nim, gentium, SDL2, makeDesktopItem }: +{ lib, nimPackages, fetchurl, gentium, makeDesktopItem }: -let - treeformLibs = lib.attrsets.mapAttrsToList (repo: args: - fetchFromGitHub ({ - inherit repo; - owner = "treeform"; - } // args)) { - bumpy = { - rev = "1.0.3"; - sha256 = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0="; - }; - chroma = { - rev = "0.2.5"; - sha256 = "sha256-6lNHpO2aMorgkaPfo6kRcOs9r5R6T/kislVmkeoulw8="; - }; - flatty = { - rev = "0.2.1"; - sha256 = "sha256-TqNnRh2+i6n98ktLRVQxt9CVw17FGLNYq29rJoMus/0="; - }; - pixie = { - rev = "1.1.3"; - sha256 = "sha256-xKIejVxOd19mblL1ZwpJH91dgKQS5g8U08EL8lGGelA="; - }; - typography = { - rev = "0.7.9"; - sha256 = "sha256-IYjw3PCp5XzVed2fGGCt9Hb60cxFeF0BUZ7L5PedTLU="; - }; - vmath = { - rev = "1.0.3"; - sha256 = "sha256-zzSKXjuTZ46HTFUs0N47mxEKTKIdS3dwr+60sQYSdn0="; - }; - }; - - nimLibs = treeformLibs ++ [ - (fetchFromGitHub { - owner = "nim-lang"; - repo = "sdl2"; - rev = "v2.0.2"; - sha256 = "sha256-Ivx/gxDa2HVDjCVrJVu23i4d0pDzzv+ThmwqNjtkjsA="; - }) - (fetchFromGitHub { - owner = "guzba"; - repo = "nimsimd"; - rev = "1.0.0"; - sha256 = "sha256-kp61fylAJ6MSN9hLYLi7CU2lxVR/lbrNCvZTe0LJLGo="; - }) - (fetchFromGitHub { - owner = "guzba"; - repo = "zippy"; - rev = "0.5.6"; - sha256 = "sha256-axp4t9+8TFSpvnATlRKZyuOGLA0e/XKfvrVSwreXpC4="; - }) - ]; - -in stdenv.mkDerivation rec { +nimPackages.buildNimPackage rec { pname = "hottext"; version = "1.4"; + nimBinOnly = true; + src = fetchurl { url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz"; sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY="; }; - nativeBuildInputs = [ nim ]; - buildInputs = [ SDL2 ]; - - nimFlags = [ "-d:release" ] ++ map (lib: "--path:${lib}/src") nimLibs; + buildInputs = with nimPackages; [ + bumpy + chroma + flatty + nimsimd + pixie + sdl2 + typography + vmath + zippy + ]; HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; - buildPhase = '' - runHook preBuild - HOME=$TMPDIR - nim $nimFlags compile src/$pname - runHook postBuild - ''; - desktopItem = makeDesktopItem { categories = "Utility;"; comment = meta.description; @@ -84,11 +33,8 @@ in stdenv.mkDerivation rec { name = pname; }; - installPhase = '' - runHook preInstall - install -Dt $out/bin src/$pname + postInstall = '' cp -r $desktopItem/* $out - runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/text/html2text/default.nix b/nixpkgs/pkgs/tools/text/html2text/default.nix index ae92f3ba9d9a..fff3e44baf69 100644 --- a/nixpkgs/pkgs/tools/text/html2text/default.nix +++ b/nixpkgs/pkgs/tools/text/html2text/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "html2text-1.3.2a"; +stdenv.mkDerivation rec { + pname = "html2text"; + version = "1.3.2a"; src = fetchurl { - url = "http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz"; + url = "http://www.mbayer.de/html2text/downloads/html2text-${version}.tar.gz"; sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; }; diff --git a/nixpkgs/pkgs/tools/text/hyx/default.nix b/nixpkgs/pkgs/tools/text/hyx/default.nix index c2b055be7df9..c287b37dd1b5 100644 --- a/nixpkgs/pkgs/tools/text/hyx/default.nix +++ b/nixpkgs/pkgs/tools/text/hyx/default.nix @@ -1,11 +1,5 @@ -{ lib, stdenv, fetchurl }: -let - # memstream — POSIX memory streams for BSD - memstream = fetchurl { - url = "https://piumarta.com/software/memstream/memstream-0.1.tar.gz"; - sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a"; - }; -in +{ lib, stdenv, fetchurl, memstreamHook }: + stdenv.mkDerivation rec { pname = "hyx"; version = "2020-06-09"; @@ -15,11 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1x8dmll93hrnj24kn5knpwj36y6r1v2ygwynpjwrg2hwd4c1a8hi"; }; - postUnpack = lib.optionalString stdenv.isDarwin '' - tar --strip=1 -C $sourceRoot -xf ${memstream} --wildcards "memstream-0.1/memstream.[hc]" + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "-Wl,-z,relro,-z,now -fpic -pie" "" ''; - patches = lib.optional stdenv.isDarwin ./memstream.patch; + buildInputs = lib.optional (stdenv.system == "x86_64-darwin") memstreamHook; installPhase = '' install -vD hyx $out/bin/hyx diff --git a/nixpkgs/pkgs/tools/text/hyx/memstream.patch b/nixpkgs/pkgs/tools/text/hyx/memstream.patch deleted file mode 100644 index a02509ced762..000000000000 --- a/nixpkgs/pkgs/tools/text/hyx/memstream.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur hyx-2020.06.09.org/Makefile hyx-2020.06.09/Makefile ---- hyx-2020.06.09.org/Makefile 2020-06-09 15:19:50.000000000 +0300 -+++ hyx-2020.06.09/Makefile 2020-07-22 11:46:40.000000000 +0300 -@@ -1,6 +1,6 @@ - - all: CFLAGS ?= -O2 -Wl,-s \ -- -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all -+ -D_FORTIFY_SOURCE=2 -fstack-protector-all - all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG - all: hyx - -@@ -13,7 +13,7 @@ - hyx: *.h *.c - $(CC) \ - $(CFLAGS) \ -- hyx.c common.c blob.c history.c view.c input.c \ -+ hyx.c common.c blob.c history.c view.c input.c memstream.c \ - -o hyx - - clean: -diff -Naur hyx-2020.06.09.org/view.c hyx-2020.06.09/view.c ---- hyx-2020.06.09.org/view.c 2020-06-09 15:19:50.000000000 +0300 -+++ hyx-2020.06.09/view.c 2020-07-22 11:49:09.000000000 +0300 -@@ -4,6 +4,7 @@ - #include "view.h" - #include "input.h" - #include "ansi.h" -+#include "memstream.h" - - #include <stdlib.h> - #include <stdio.h> diff --git a/nixpkgs/pkgs/tools/text/kakasi/default.nix b/nixpkgs/pkgs/tools/text/kakasi/default.nix index 609b8aff9b56..d2cf1f701ee9 100644 --- a/nixpkgs/pkgs/tools/text/kakasi/default.nix +++ b/nixpkgs/pkgs/tools/text/kakasi/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "kakasi-2.3.6"; + pname = "kakasi"; + version = "2.3.6"; buildInputs = lib.optional stdenv.isDarwin [ libiconv ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://kakasi.namazu.org/stable/${name}.tar.xz"; + url = "http://kakasi.namazu.org/stable/kakasi-${version}.tar.xz"; sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f"; }; diff --git a/nixpkgs/pkgs/tools/text/mairix/default.nix b/nixpkgs/pkgs/tools/text/mairix/default.nix index 57e05bf19f6e..aa58ecdd35a9 100644 --- a/nixpkgs/pkgs/tools/text/mairix/default.nix +++ b/nixpkgs/pkgs/tools/text/mairix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2, bison, flex }: stdenv.mkDerivation rec { - name = "mairix-0.24"; + pname = "mairix"; + version = "0.24"; src = fetchurl { - url = "mirror://sourceforge/mairix/${name}.tar.gz"; + url = "mirror://sourceforge/mairix/mairix-${version}.tar.gz"; sha256 = "0msaxz5c5hf7k1ci16i67m4ynrbrpsxbqzk84nz6z2vnkh3jww50"; }; diff --git a/nixpkgs/pkgs/tools/text/mark/default.nix b/nixpkgs/pkgs/tools/text/mark/default.nix index 653af8b79692..b7a4537addaf 100644 --- a/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mark"; - version = "6.2"; + version = "6.3"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-Nk7DbZdz8BbsZO/Sx36ALNXRtSUju3X6S8M0yFs+Yz0="; + sha256 = "sha256-HKP8ZYhYDJizZ91q4MRwS00YIMvgB6EJ3au5rMg02hg="; }; vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0="; diff --git a/nixpkgs/pkgs/tools/text/mawk/default.nix b/nixpkgs/pkgs/tools/text/mawk/default.nix index d5f228d78730..62a23318ca2f 100644 --- a/nixpkgs/pkgs/tools/text/mawk/default.nix +++ b/nixpkgs/pkgs/tools/text/mawk/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mawk-1.3.4-20200120"; + pname = "mawk"; + version = "1.3.4-20200120"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/mawk/${name}.tgz" - "https://invisible-mirror.net/archives/mawk/${name}.tgz" + "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz" + "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz" ]; sha256 = "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z"; }; diff --git a/nixpkgs/pkgs/tools/text/mpage/default.nix b/nixpkgs/pkgs/tools/text/mpage/default.nix index 99cfec97a70b..b48f89d66180 100644 --- a/nixpkgs/pkgs/tools/text/mpage/default.nix +++ b/nixpkgs/pkgs/tools/text/mpage/default.nix @@ -1,9 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "mpage-2.5.7"; + pname = "mpage"; + version = "2.5.7"; + src = fetchurl { - url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; + url = "https://www.mesa.nl/pub/mpage/mpage-${version}.tgz"; sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi"; }; diff --git a/nixpkgs/pkgs/tools/text/multitran/data/default.nix b/nixpkgs/pkgs/tools/text/multitran/data/default.nix index a94f5bc96887..bfc148df782b 100644 --- a/nixpkgs/pkgs/tools/text/multitran/data/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/data/default.nix @@ -6,7 +6,9 @@ # The store file mentioned is in "${glibc.out}/lib/locale/locale-archive" stdenv.mkDerivation { - name = "multitran-data-0.3"; + pname = "multitran-data"; + version = "0.3"; + src = fetchurl { url = "mirror://sourceforge/multitran/multitran-data.tar.bz2"; sha256 = "9c2ff5027c2fe72b0cdf056311cd7543f447feb02b455982f20d4a3966b7828c"; diff --git a/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix b/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix index 893c1e1d9316..91c4bb0ea7f8 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl} : -stdenv.mkDerivation { - name = "libbtree-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libbtree"; + version = "0.0.1alpha2"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libbtree-${version}.tar.bz2"; sha256 = "34a584e45058950337ff9342693b6739b52c3ce17e66440526c4bd6f9575802c"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix b/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix index 3895f3a922c2..0e6dd0d6e652 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libmtsupport }: -stdenv.mkDerivation { - name = "libfacet-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libfacet"; + version = "0.0.1alpha2"; src = fetchurl { - url = "mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libfacet-${version}.tar.bz2"; sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; }; diff --git a/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix b/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix index 3b7dd681e8ae..5cc8e724e71f 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, multitrandata } : -stdenv.mkDerivation { - name = "libmtquery-0.0.1alpha3"; +stdenv.mkDerivation rec { + pname = "libmtquery"; + version = "0.0.1alpha3"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2"; + url = "mirror://sourceforge/multitran/libmtquery-${version}.tar.bz2"; sha256 = "e24c7c15772445f1b14871928d84dd03cf93bd88f9d2b2ed1bf0257c2cf2b15e"; }; diff --git a/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix b/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix index eebc88189f25..454709b8eb79 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl} : -stdenv.mkDerivation { - name = "libmtsupport-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libmtsupport"; + version = "0.0.1alpha2"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libmtsupport-${version}.tar.bz2"; sha256 = "481f0f1ec15d7274f1e4eb93e7d060df10a181efd037eeff5e8056d283a9298b"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix b/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix index 00325276fdb1..2428caada5b8 100644 --- a/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, libmtquery, help2man} : -stdenv.mkDerivation { - name = "mt-utils-0.0.1alpha3"; +stdenv.mkDerivation rec { + pname = "mt-utils"; + version = "0.0.1alpha3"; + src = fetchurl { - url = "mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2"; + url = "mirror://sourceforge/multitran/mt-utils-${version}.tar.bz2"; sha256 = "e407702c90c5272882386914e1eeca5f6c5039393af9a44538536b94867b0a0e"; }; diff --git a/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix deleted file mode 100644 index 0dff6d76fffe..000000000000 --- a/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ fetchFromGitHub -, ghostscript -, img2pdf -, jbig2enc -, leptonica -, pngquant -, python3 -, python3Packages -, qpdf -, lib -, stdenv -, tesseract4 -, unpaper -, substituteAll -}: -let - inherit (python3Packages) buildPythonApplication; - - runtimeDeps = with python3Packages; [ - ghostscript - jbig2enc - leptonica - pngquant - qpdf - tesseract4 - unpaper - pillow - ]; - -in -buildPythonApplication rec { - pname = "ocrmypdf"; - version = "12.3.0"; - - src = fetchFromGitHub { - owner = "jbarlow83"; - repo = "OCRmyPDF"; - rev = "v${version}"; - sha256 = "122yv3p0v4fbx30zgppcznwnm7svg97gv0sa103xb6zcld68ggn2"; - }; - - nativeBuildInputs = with python3Packages; [ - setuptools - setuptools-scm-git-archive - setuptools-scm - ]; - - propagatedBuildInputs = with python3Packages; [ - cffi - chardet - coloredlogs - img2pdf - pdfminer - pluggy - pikepdf - pillow - reportlab - setuptools - tqdm - ]; - - checkInputs = with python3Packages; [ - pypdf2 - pytest - pytest-helpers-namespace - pytest-xdist - pytest-cov - python-xmp-toolkit - pytestCheckHook - ] ++ runtimeDeps; - - patches = [ - (substituteAll { - src = ./liblept.patch; - liblept = "${lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"; - }) - ]; - - makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; - - meta = with lib; { - homepage = "https://github.com/jbarlow83/OCRmyPDF"; - description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; - license = with licenses; [ mpl20 mit ]; - platforms = platforms.linux; - maintainers = [ maintainers.kiwi ]; - changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst"; - }; -} diff --git a/nixpkgs/pkgs/tools/text/ocrmypdf/liblept.patch b/nixpkgs/pkgs/tools/text/ocrmypdf/liblept.patch deleted file mode 100644 index ed413a8b37bd..000000000000 --- a/nixpkgs/pkgs/tools/text/ocrmypdf/liblept.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ocrmypdf/leptonica.py b/src/ocrmypdf/leptonica.py -index 328b063..b993cc9 100644 ---- a/src/ocrmypdf/leptonica.py -+++ b/src/ocrmypdf/leptonica.py -@@ -46,7 +46,7 @@ if os.name == 'nt': - os.environ['PATH'] = shim_paths_with_program_files() - else: - libname = 'lept' --_libpath = find_library(libname) -+_libpath = '@liblept@' - if not _libpath: - raise MissingDependencyError( - """ diff --git a/nixpkgs/pkgs/tools/text/peco/default.nix b/nixpkgs/pkgs/tools/text/peco/default.nix index 2928d5322072..36951be7edbc 100644 --- a/nixpkgs/pkgs/tools/text/peco/default.nix +++ b/nixpkgs/pkgs/tools/text/peco/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "peco"; - version = "0.5.8"; + version = "0.5.10"; subPackages = [ "cmd/peco" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "peco"; repo = "peco"; rev = "v${version}"; - sha256 = "12xbqisk7bcy38fmjxcs069a0600gncbqzscqw6x37lgw6hlw52x"; + sha256 = "sha256-Iu2MclUbUYX1FuMnE65Qdk0S+5+K3HW86WIdQrNUyY8="; }; - vendorSha256 = "1p8pc50ql2vqnn0crx0y558i3m0d6vcdaj3995h3f0908pnk6x7q"; + vendorSha256 = "sha256-+HQz7UUgATdgSWlI1dg2DdQRUSke9MyAtXgLikFhF90="; meta = with lib; { description = "Simplistic interactive filtering tool"; diff --git a/nixpkgs/pkgs/tools/text/proselint/default.nix b/nixpkgs/pkgs/tools/text/proselint/default.nix index 143c43f660d1..d00b71977a22 100644 --- a/nixpkgs/pkgs/tools/text/proselint/default.nix +++ b/nixpkgs/pkgs/tools/text/proselint/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "proselint"; - version = "0.10.2"; + version = "0.12.0"; doCheck = false; # fails to pass because it tries to run in home directory src = fetchurl { url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz"; - sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs"; + sha256 = "2a98d9c14382d94ed9122a6c0b0657a814cd5c892c77d9477309fc99f86592e6"; }; propagatedBuildInputs = [ click future six ]; diff --git a/nixpkgs/pkgs/tools/text/qprint/default.nix b/nixpkgs/pkgs/tools/text/qprint/default.nix index e2621ab18766..19f2d7b1cbd6 100644 --- a/nixpkgs/pkgs/tools/text/qprint/default.nix +++ b/nixpkgs/pkgs/tools/text/qprint/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "qprint-1.1"; + pname = "qprint"; + version = "1.1"; src = fetchurl { - url = "https://www.fourmilab.ch/webtools/qprint/${name}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/qprint/qprint-${version}.tar.gz"; sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz"; }; diff --git a/nixpkgs/pkgs/tools/text/rust-petname/default.nix b/nixpkgs/pkgs/tools/text/rust-petname/default.nix new file mode 100644 index 000000000000..4a3c0f596cfb --- /dev/null +++ b/nixpkgs/pkgs/tools/text/rust-petname/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "rust-petname"; + version = "1.1.1"; + + src = fetchCrate { + inherit version; + crateName = "petname"; + sha256 = "sha256-X1p9W+N0Nhh7CSh776ofzHmG0ayi5COLJjBncxmL8CM="; + }; + + cargoSha256 = "sha256-jxN2EKLjf9yKkhZ4wsH72sNdk6UYAcCUrg4+qx75bWs="; + + meta = with lib; { + description = "Generate human readable random names"; + homepage = "https://github.com/allenap/rust-petname"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "petname"; + }; +} diff --git a/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix b/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix index 785ef3205967..f87bd5d7b1a1 100644 --- a/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix +++ b/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, opensp, perl }: stdenv.mkDerivation rec { - name = "openjade-1.3.2"; + pname = "openjade"; + version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/${name}.tar.gz"; + url = "mirror://sourceforge/openjade/openjade-${version}.tar.gz"; sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; diff --git a/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix b/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix index 1c9131d29dc5..6924c8953eef 100644 --- a/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix +++ b/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 , libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: -stdenv.mkDerivation { - name = "opensp-1.5.2"; +stdenv.mkDerivation rec { + pname = "opensp"; + version = "1.5.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz"; + url = "mirror://sourceforge/openjade/OpenSP-${version}.tar.gz"; sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"; }; diff --git a/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/nixpkgs/pkgs/tools/text/snippetpixie/default.nix index 301831d1a830..e66a5404f439 100644 --- a/nixpkgs/pkgs/tools/text/snippetpixie/default.nix +++ b/nixpkgs/pkgs/tools/text/snippetpixie/default.nix @@ -86,9 +86,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ - ianmjones - ] ++ pantheon.maintainers; + maintainers = with maintainers; [ ianmjones ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/text/source-highlight/default.nix b/nixpkgs/pkgs/tools/text/source-highlight/default.nix index 6e1a7b24b594..8817b7a09fda 100644 --- a/nixpkgs/pkgs/tools/text/source-highlight/default.nix +++ b/nixpkgs/pkgs/tools/text/source-highlight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost }: +{ lib, stdenv, fetchpatch, fetchurl, boost }: stdenv.mkDerivation rec { pname = "source-highlight"; @@ -9,10 +9,19 @@ stdenv.mkDerivation rec { sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs"; }; + patches = [ + # gcc-11 compat upstream patch + (fetchpatch { + url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; + sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47"; + excludes = [ "ChangeLog" ]; + }) + ]; + # source-highlight uses it's own binary to generate documentation. # During cross-compilation, that binary was built for the target # platform architecture, so it can't run on the build host. - patchPhase = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace Makefile.in --replace "src doc tests" "src tests" ''; @@ -21,7 +30,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost=${boost.out}" ]; - enableParallelBuilding = false; + doCheck = !stdenv.cc.isClang; + + enableParallelBuilding = true; + # Upstream uses the same intermediate files in multiple tests, running + # them in parallel by make will eventually break one or more tests. + enableParallelChecking = false; outputs = [ "out" "doc" "dev" ]; diff --git a/nixpkgs/pkgs/tools/text/tv/default.nix b/nixpkgs/pkgs/tools/text/tv/default.nix index 1f0e4078f3f1..686433ff4290 100644 --- a/nixpkgs/pkgs/tools/text/tv/default.nix +++ b/nixpkgs/pkgs/tools/text/tv/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "tv"; - version = "0.5.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "uzimaru0000"; repo = pname; rev = "v${version}"; - sha256 = "07gcs64j468213jxcjjv9vywzvfair7gbaiqzqm9wwsdgjyw0wwc"; + sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM="; }; - cargoSha256 = "00fi7wimr0rihf6qx20r77w85w2i55kn823gp283lsszbw1z8as9"; + cargoSha256 = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI="; meta = with lib; { description = "Format json into table view"; homepage = "https://github.com/uzimaru0000/tv"; + changelog = "https://github.com/uzimaru0000/tv/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/nixpkgs/pkgs/tools/text/uni2ascii/default.nix b/nixpkgs/pkgs/tools/text/uni2ascii/default.nix index e2bda04d13f1..d83e9393f941 100644 --- a/nixpkgs/pkgs/tools/text/uni2ascii/default.nix +++ b/nixpkgs/pkgs/tools/text/uni2ascii/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uni2ascii-4.18"; + pname = "uni2ascii"; + version = "4.18"; + src = fetchurl { - url = "https://billposer.org/Software/Downloads/${name}.tar.gz"; + url = "https://billposer.org/Software/Downloads/uni2ascii-${version}.tar.gz"; sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; }; diff --git a/nixpkgs/pkgs/tools/text/vale/default.nix b/nixpkgs/pkgs/tools/text/vale/default.nix index d5c64aa9f7b2..25a98d299a75 100644 --- a/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.10.5"; + version = "2.10.6"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-SxNM63MCtsBmjzFbO/leCQwWWew5nN8wTUdmzHkx7dQ="; + sha256 = "sha256-exBrs/MQhfqCxAJrnxECdKnxvsK9LvXIqpnYkR5h7uA="; }; vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc="; diff --git a/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 30482196322f..0e2c8b824f5e 100644 --- a/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "basex"; exec = "basexgui %f"; - icon = ./basex.svg; # icon copied from Ubuntu basex package + icon = "${./basex.svg}"; # icon copied from Ubuntu basex package comment = "Visually query and analyse your XML data"; desktopName = "BaseX XML Database"; genericName = "XML database tool"; diff --git a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix index 4c312250bf65..265ab10e5ac8 100644 --- a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libxml2 }: -stdenv.mkDerivation { - name = "xml2-0.5"; +stdenv.mkDerivation rec { + pname = "xml2"; + version = "0.5"; src = fetchurl { - url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz"; + url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-${version}.tar.gz"; sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; diff --git a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix index e179c3153e10..39d53088babf 100644 --- a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "xmlstarlet-1.6.1"; + pname = "xmlstarlet"; + version = "1.6.1"; src = fetchurl { - url = "mirror://sourceforge/xmlstar/${name}.tar.gz"; + url = "mirror://sourceforge/xmlstar/xmlstarlet-${version}.tar.gz"; sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; diff --git a/nixpkgs/pkgs/tools/text/xml/xpf/default.nix b/nixpkgs/pkgs/tools/text/xml/xpf/default.nix index 29170394d1e6..ce0813c2ef4a 100644 --- a/nixpkgs/pkgs/tools/text/xml/xpf/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xpf/default.nix @@ -2,11 +2,12 @@ assert libxml2.pythonSupport == true; -stdenv.mkDerivation { - name = "xpf-0.2"; +stdenv.mkDerivation rec { + pname = "xpf"; + version = "0.2"; src = fetchurl { - url = "http://tarballs.nixos.org/xpf-0.2.tar.gz"; + url = "http://tarballs.nixos.org/xpf-${version}.tar.gz"; sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; diff --git a/nixpkgs/pkgs/tools/text/yaml-merge/default.nix b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix index 7c4ecc49df5d..e5794b439a53 100644 --- a/nixpkgs/pkgs/tools/text/yaml-merge/default.nix +++ b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation { - name= "yaml-merge-2016-02-16"; + pname = "yaml-merge"; + version = "unstable-2016-02-16"; src = fetchFromGitHub { owner = "abbradar"; diff --git a/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix b/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix index cd10ac9117c8..0b7b67f69b59 100644 --- a/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perlPackages, makeWrapper, zip, libxslt }: stdenv.mkDerivation rec { - name = "docbook2odf-0.244"; + pname = "docbook2odf"; + version = "0.244"; src = fetchurl { - url = "http://open.comsultia.com/docbook2odf/dwn/${name}.tar.gz"; + url = "http://open.comsultia.com/docbook2odf/dwn/docbook2odf-${version}.tar.gz"; sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix b/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix index 4b9e571c0ad3..aac992552d31 100644 --- a/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix @@ -4,10 +4,11 @@ , makeWrapper }: stdenv.mkDerivation rec { - name = "docbook2X-0.8.8"; + pname = "docbook2X"; + version = "0.8.8"; src = fetchurl { - url = "mirror://sourceforge/docbook2x/${name}.tar.gz"; + url = "mirror://sourceforge/docbook2x/docbook2X-${version}.tar.gz"; sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/halibut/default.nix b/nixpkgs/pkgs/tools/typesetting/halibut/default.nix index d077ef823ffc..ec5598e4d689 100644 --- a/nixpkgs/pkgs/tools/typesetting/halibut/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/halibut/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "halibut-1.2"; + pname = "halibut"; + version = "1.2"; src = fetchurl { - url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz"; + url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz"; sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/hevea/default.nix b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix index ad6427e56224..8253d73e3dbb 100644 --- a/nixpkgs/pkgs/tools/typesetting/hevea/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.35"; + pname = "hevea"; + version = "2.35"; src = fetchurl { - url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; + url = "https://pauillac.inria.fr/~maranget/hevea/distri/hevea-${version}.tar.gz"; sha256 = "sha256-8Ym62l0+WzWFXf39tbJwyZT8eiNmsBJQ12E1mtZsnss="; }; diff --git a/nixpkgs/pkgs/tools/typesetting/lout/default.nix b/nixpkgs/pkgs/tools/typesetting/lout/default.nix index 4737c5d74097..f5bf22c0f338 100644 --- a/nixpkgs/pkgs/tools/typesetting/lout/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/lout/default.nix @@ -1,13 +1,14 @@ {lib, stdenv, fetchurl, ghostscript}: stdenv.mkDerivation rec { - name = "lout-3.40"; + pname = "lout"; + version = "3.40"; src = fetchurl { urls = [ - "ftp://ftp.cs.usyd.edu.au/jeff/lout/${name}.tar.gz" - "mirror://savannah/lout/${name}.tar.gz" # new! - "mirror://sourceforge/lout/${name}.tar.gz" # to be phased out + "ftp://ftp.cs.usyd.edu.au/jeff/lout/${pname}-${version}.tar.gz" + "mirror://savannah/lout/${pname}-${version}.tar.gz" # new! + "mirror://sourceforge/lout/${pname}-${version}.tar.gz" # to be phased out # XXX: We could add the CTAN mirrors # (see https://www.ctan.org/tex-archive/support/lout/). ]; diff --git a/nixpkgs/pkgs/tools/typesetting/psutils/default.nix b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix index fe3223ae6c90..c7f68f2bd52b 100644 --- a/nixpkgs/pkgs/tools/typesetting/psutils/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl }: -stdenv.mkDerivation { - name = "psutils-17"; +stdenv.mkDerivation rec { + pname = "psutils"; + version = "17"; src = fetchurl { - url = "ftp://ftp.knackered.org/pub/psutils/psutils-p17.tar.gz"; + url = "ftp://ftp.knackered.org/pub/psutils/psutils-p${version}.tar.gz"; sha256 = "1r4ab1fvgganm02kmm70b2r1azwzbav2am41gbigpa2bb1wynlrq"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/nixpkgs/pkgs/tools/typesetting/sile/default.nix index 049938581b67..27c8aada14c9 100644 --- a/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -38,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.11.1"; + version = "0.12.0"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "06bx94zx6skhizk2bbrid82sldwgxfycvjh6zx1zy1xz8gajgrm3"; + sha256 = "1rkdzf4khyvsn5qg455mdhnlacxlqgi9vchy369a66qp5nrs50y9"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix index 4f896ef32baf..6b866b43d1b9 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "lkproof-3.1"; + pname = "lkproof"; + version = "3.1"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/lkproof.zip"; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix index fe928615eb42..0a2667f284e9 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "pgfplots-1.5.1"; +stdenv.mkDerivation rec { + pname = "pgfplots"; + version = "1.5.1"; src = fetchurl { - url = "mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip"; + url = "mirror://sourceforge/pgfplots/pgfplots_${version}.tds.zip"; sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix index 0f6bf5d0d55c..d15386417218 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix @@ -1,15 +1,16 @@ { lib, stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed, automake }: -stdenv.mkDerivation { - name = "tetex-3.0"; +stdenv.mkDerivation rec { + pname = "tetex"; + version = "3.0"; src = fetchurl { - url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz"; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-src-${version}.tar.gz"; sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww"; }; texmf = fetchurl { - url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz"; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-texmf-${version}.tar.gz"; sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 05c1644c8c7d..9aa2cde0f3c9 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -103,7 +103,9 @@ core = stdenv.mkDerivation rec { installTargets = [ "install" "texlinks" ]; # TODO: perhaps improve texmf.cnf search locations - postInstall = /* a few texmf-dist files are useful; take the rest from pkgs */ '' + postInstall = /* links format -> engine will be regenerated in texlive.combine */ '' + PATH="$out/bin:$PATH" ${texlinks} --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" + '' + /* a few texmf-dist files are useful; take the rest from pkgs */ '' mv "$out/share/texmf-dist/web2c/texmf.cnf" . rm -r "$out/share/texmf-dist" mkdir -p "$out"/share/texmf-dist/{web2c,scripts/texlive/TeXLive} diff --git a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index e5f98df3f010..eef08eec0a1f 100644 --- a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,24 +11,26 @@ }: let + sha256 = "08j7j9fpxh08vkczjqahb8r55bwks8p3ykrv6a2kfi309629nm96"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.102.0"; + specVersion = "4.104.0"; + specSha256 = "0lbky0djqsndp33067q6yir5525m3zcgkpvf1z16mkspkixzadqs"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = "16njk21gdk8r8a9v607ndw2rs0q6za9ylkgdxmix4j0zvrbrw0qv"; + sha256 = specSha256; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.8.2"; + version = "5.9.0"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "sha256-JlWbhElgRDeFMjtPPy7Sk69SMlpQYfnZ3AjAfl2SRyI="; + inherit sha256; }; # remove need for git history @@ -60,6 +62,8 @@ buildPythonApplication rec { installShellCompletion --cmd linode-cli --bash <($out/bin/linode-cli --skip-config completion bash) ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "The Linode Command Line Interface"; homepage = "https://github.com/linode/linode-cli"; diff --git a/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh b/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh new file mode 100755 index 000000000000..281d0e1df970 --- /dev/null +++ b/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq yq-go + +set -eu -o pipefail + +cd $(dirname "${BASH_SOURCE[0]}") + +SPEC_VERSION=$(curl -s https://www.linode.com/docs/api/openapi.yaml | yq eval '.info.version' -) + +SPEC_SHA256=$(nix-prefetch-url --quiet https://raw.githubusercontent.com/linode/linode-api-docs/v${SPEC_VERSION}/openapi.yaml) + +VERSION=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/linode/linode-cli/tags" \ + | jq 'map(.name)' \ + | grep '"' \ + | sed 's/[ ",(^v)]//g' \ + | grep -v -e rc -e list \ + | cut -d '"' -f4 | sort -rV | head -n 1) + +SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/${VERSION}.tar.gz) + +setKV () { + sed -i "s/$1 = \".*\"/$1 = \"$2\"/" default.nix +} + +setKV specVersion ${SPEC_VERSION} +setKV specSha256 ${SPEC_SHA256} +setKV version ${VERSION} +setKV sha256 ${SHA256} diff --git a/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix index 7fe09aa6b426..6994cc25b384 100644 --- a/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.27"; + version = "0.3.30"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-VbcOoIMhY4FpfQbC2ESFaPoV9AS5DpGvid8jcQxLuEE="; + sha256 = "sha256-NaCG0oG9j1yoXOsfnQXFd+PdZfJTOdvYndFIftIAnxE="; }; vendorSha256 = "sha256-YClNdtnakJJOEytTbopTXeZy218N4vHP3tQLavLgPbg="; diff --git a/nixpkgs/pkgs/tools/wayland/cliphist/default.nix b/nixpkgs/pkgs/tools/wayland/cliphist/default.nix new file mode 100644 index 000000000000..44a870db387c --- /dev/null +++ b/nixpkgs/pkgs/tools/wayland/cliphist/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cliphist"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "sentriz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-CZW7dhOd7E74VNjnvhxvSSUZQtbkGi4uRUM9YQCuJZw="; + }; + + vendorSha256 = "sha256-UrKSDvskGwHjwkb/fjvaJZ8xXFD98BFeSJxwJpc8A+M="; + + meta = with lib; { + description = "Wayland clipboard manager"; + homepage = "https://github.com/sentriz/cliphist"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix b/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix index 36e223f8d4ca..401144f74d2a 100644 --- a/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix +++ b/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix @@ -1,8 +1,8 @@ -{ lib, nim, stdenv, fetchFromGitLab +{ lib, nimPackages, fetchFromGitLab , enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ] }: -stdenv.mkDerivation { +nimPackages.buildNimPackage { name = "swaycwd"; version = "0.0.1"; @@ -13,27 +13,18 @@ stdenv.mkDerivation { hash = "sha256-MkyY3wWByQo0l0J28xKDfGtxfazVPRyZHCObl9Fszh4="; }; - configurePhase = '' - runHook preConfigure + preConfigure = '' { echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}' echo 'export enabledShells' } > shells.nim - runHook postConfigure + cat << EOF > swaycwd.nimble + srcDir = "." + bin = "swaycwd" + EOF ''; - nativeBuildInputs = [ nim ]; - - buildPhase = '' - export HOME=$TMPDIR - nim c --opt:speed -d:release swaycwd.nim - ''; - - installPhase = '' - runHook preInstall - install -D -m555 -t $out/bin swaycwd - runHook postInstall - ''; + nimFlags = [ "--opt:speed" ]; meta = with lib; { homepage = "https://gitlab.com/cab404/swaycwd"; |