diff options
Diffstat (limited to 'pkgs/tools')
21 files changed, 454 insertions, 86 deletions
diff --git a/pkgs/tools/X11/xosview/default.nix b/pkgs/tools/X11/xosview/default.nix index ca8eac38aa21..3b09b150a0fc 100644 --- a/pkgs/tools/X11/xosview/default.nix +++ b/pkgs/tools/X11/xosview/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xosview"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "hills"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-CoBVFTCpvZkIe/g+17JNV1y0G9K+t+p3EE9C5kuBe2k="; + hash = "sha256-9Pr7voJiCH7oBziMFRHCWxoyuGdndcdRD2POjiNT7yw="; }; dontConfigure = true; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index e3b2ae74ca4b..ed9d9007a936 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.127.0"; + version = "0.128.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-WCkVCND3c8HYLi0UrgF3zoEykIs1/D7HgeblZETvU4M="; + sha256 = "sha256-CKtDj9Ht81i8EcpjHqluWfwkEU15a/TZd6N+jCSzIc8="; }; - vendorHash = "sha256-FBKwWApiIs0y0IZqJOJwzdBq1ihaPv8mqqSTO42ggi0="; + vendorHash = "sha256-aSXj21JNqX/cc62oFqyedmvczmudcV7RhLyWrKsdOMQ="; doCheck = false; diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 88621f236569..1471f039d395 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-s2M763M4Hoy8gjgkHT69pCUCsWepmt0zEyXYpGzYTn0="; + sha256 = "sha256-So6S/AyuuHpezu4FMDOXDOdJqvEexbgpmLhDnDbbUuM="; }; - vendorHash = "sha256-JWdc0BN0GRw79uhb2uubSG1bnZlTHTVrmS0Jft1ZNh8="; + vendorHash = "sha256-wFKQv/9GtXMnTP+HkmmHO0RgQ98jm1GZeIGIJiqWx1I="; subPackages = [ "cmd/console" ]; diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index e8ea32984965..07d507e2923a 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.20.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-8ssYzsjXwYH3xVFxtk8zYcJnrc+wKuoV1js0ONRKBGQ="; + sha256 = "sha256-PmfyULkB93PvouOWp96F4YXyNFQqRmoy6LpOFGz0EZk="; }; - cargoHash = "sha256-eg5EXvpwIlza7mXc5MFTpaFLQSR2z/7GSPGyBgzzOj4="; + cargoHash = "sha256-L5/qOnyxfj3KfcZDI9Xp2IgE33P8yzQjVg6+4jmGQyM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/f2/default.nix b/pkgs/tools/misc/f2/default.nix index 943ce72cc6ce..48b14b867059 100644 --- a/pkgs/tools/misc/f2/default.nix +++ b/pkgs/tools/misc/f2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "f2"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "ayoisaiah"; repo = "f2"; rev = "v${version}"; - sha256 = "sha256-bNcPzvjVBH7x60kNjlUILiQGG3GDmqIB5T2WP3+nZ+s="; + sha256 = "sha256-2+wp9hbPDH8RAeQNH1OYDfFlev+QTsEHixYb/luR9F0="; }; - vendorSha256 = "sha256-Cahqk+7jDMUtZq0zhBll1Tfryu2zSPBN7JKscV38360="; + vendorHash = "sha256-sOTdP+MuOH9jB3RMajeUx84pINSuWVRw5p/9lrOj6uo="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 3b11dfcb64fd..a3bb87d56cca 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.34.0"; - vendorHash = "sha256-Z0ifACsdSIYevsvRD5KACFSRlvrL1jIJbrzjDFeLbEQ="; + version = "2.34.1"; + vendorHash = "sha256-0C2uUq8GKM3IMjhH30Fa702uDmXbVbEDWJ6wKIWYTQw="; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "v${version}"; - sha256 = "sha256-SDZzbUh3wbDfzkE/5GgFstDuMYLiM8+MXRZ79jYGoaQ="; + sha256 = "sha256-7jkhr6fav7YwwFyO3m6mj2jl3RoX3sbS4YBBeMT/Go8="; }; postInstall = '' diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index 02e783fa1e09..ef31e582f5c1 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-P/MxIehxj+FE5hvWge7Q2EwL57ObV8ibRZtmko0mphY="; + sha256 = "sha256-GSjS/6wetm3kHXdGyeenzALZ3tVi7BMM/GLS1ZhMQas="; }; - cargoSha256 = "sha256-dQDfL5yN2ufFpQCXZ5Il0Qzhb/d7FETCVJg3DOMJPWQ="; + cargoHash = "sha256-dgbi0mUI8WqqXF1VNOTbHuCKcvb4B18/1vBlJZ8Jivs="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 0429e854338b..0ad5b060119e 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,34 +1,299 @@ -{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools -, python3, git +{ lib +, stdenv +, autoconf +, automake +, bash +, curl +, fetchFromGitHub +, fetchMavenArtifact +, fetchurl +, git +, jdk8 +, makeWrapper +, nettools +, python3 }: -let jdk = jdk8; jre = jdk8.jre; in - -stdenv.mkDerivation rec { +let + jdk = jdk8; + jre = jdk8.jre; + artifacts = { + apache = [ + (fetchMavenArtifact { + groupId = "org.apache.commons"; + artifactId = "commons-math3"; + version = "3.4.1"; + hash = "sha256-0QdbFKcQhwOLC/0Zjw992OSbWzUp2OLrqZ59nrhWXks="; + }) + ]; + guava = [ + (fetchMavenArtifact { + groupId = "com.google.guava"; + artifactId = "guava"; + version = "18.0"; + hash = "sha256-1mT7/APS5c6cqypE+wHx0L+d/r7MwaRzsfnqMfefb5k="; + }) + ]; + gwt = [ + (fetchMavenArtifact { + groupId = "com.google.gwt"; + artifactId = "gwt-dev"; + version = "2.6.0"; + hash = "sha256-4MLdI7q5fkftHTMoN7W3l5zsq1QB2R/8bF86vEqBI+A="; + }) + (fetchMavenArtifact { + groupId = "com.google.gwt"; + artifactId = "gwt-user"; + version = "2.6.0"; + hash = "sha256-HR5/aopn605inHeENNHBAqKrjkvIl9wPDM+nOwOpiEg="; + }) + (fetchMavenArtifact { + groupId = "net.opentsdb"; + artifactId = "opentsdb-gwt-theme"; + version = "1.0.0"; + hash = "sha256-JJsjcRlQmIrwpOtMweH12e/Ut5NG8R50VPiOAMMGEdc="; + }) + ]; + hamcrest = [ + (fetchMavenArtifact { + url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; + groupId = "org.hamcrest"; + artifactId = "hamcrest-core"; + version = "1.3"; + hash = "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok="; + }) + ]; + hbase = [ + (fetchMavenArtifact { + groupId = "org.hbase"; + artifactId = "asynchbase"; + version = "1.8.2"; + hash = "sha256-D7mKprHMW23dE0SzdNsagv3Hp2G5HUN7sKfs1nVzQF4="; + }) + ]; + jackson = [ + (fetchMavenArtifact { + groupId = "com.fasterxml.jackson.core"; + artifactId = "jackson-annotations"; + version = "2.9.5"; + hash = "sha256-OKDkUASfZDVwrayZiIqjSA7C3jhXkKcJaQi/Q7/AhdY="; + }) + (fetchMavenArtifact { + groupId = "com.fasterxml.jackson.core"; + artifactId = "jackson-core"; + version = "2.9.5"; + hash = "sha256-or66oyWtJUVbAhScZ+YFI2en1/wc533gAO7ShKUhTqw="; + }) + (fetchMavenArtifact { + groupId = "com.fasterxml.jackson.core"; + artifactId = "jackson-databind"; + version = "2.9.5"; + hash = "sha256-D7TgecEY51LMlMFa0i5ngrDfxdwJFF9IE/s52C5oYEc="; + }) + ]; + javacc = [ + (fetchMavenArtifact { + groupId = "net.java.dev.javacc"; + artifactId = "javacc"; + version = "6.1.2"; + hash = "sha256-7Qxclglhz+tDE4LPAVKCewEVZ0fbN5LRv5PoHjLCBKs="; + }) + ]; + javassist = [ + (fetchMavenArtifact { + groupId = "org.javassist"; + artifactId = "javassist"; + version = "3.21.0-GA"; + hash = "sha256-eqWeAx+UGYSvB9rMbKhebcm9OkhemqJJTLwDTvoSJdA="; + }) + ]; + jexl = [ + (fetchMavenArtifact { + groupId = "commons-logging"; + artifactId = "commons-logging"; + version = "1.1.1"; + hash = "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8="; + }) + (fetchMavenArtifact { + groupId = "org.apache.commons"; + artifactId = "commons-jexl"; + version = "2.1.1"; + hash = "sha256-A8mp+uXaeM5SwL8kRnzDc1W34jGW3/SDniwP8BigEwY="; + }) + ]; + jgrapht = [ + (fetchMavenArtifact { + groupId = "org.jgrapht"; + artifactId = "jgrapht-core"; + version = "0.9.1"; + hash = "sha256-5u8cEVaJ7aCBQrhtUkYg2mQ7bp8BNAUletB/QtxcaXg="; + }) + ]; + junit = [ + (fetchMavenArtifact { + groupId = "junit"; + artifactId = "junit"; + version = "4.11"; + hash = "sha256-kKjhYD7spI5+h586+8lWBxUyKYXzmidPb2BwtD+dBv4="; + }) + ]; + kryo = [ + (fetchMavenArtifact { + groupId = "org.ow2.asm"; + artifactId = "asm"; + version = "4.0"; + hash = "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc="; + }) + (fetchMavenArtifact { + groupId = "com.esotericsoftware.kryo"; + artifactId = "kryo"; + version = "2.21.1"; + hash = "sha256-adEG73euU3sZBp9WUQNLZBN6Y3UAZXTAxjsuvDuy7q4="; + }) + (fetchMavenArtifact { + groupId = "com.esotericsoftware.minlog"; + artifactId = "minlog"; + version = "1.2"; + hash = "sha256-pnjLGqj10D2QHJksdXQYQdmKm8PVXa0C6E1lMVxOYPI="; + }) + (fetchMavenArtifact { + groupId = "com.esotericsoftware.reflectasm"; + artifactId = "reflectasm"; + version = "1.07"; + classifier = "shaded"; + hash = "sha256-CKcOrbSydO2u/BGUwfdXBiGlGwqaoDaqFdzbe5J+fHY="; + }) + ]; + logback = [ + (fetchMavenArtifact { + groupId = "ch.qos.logback"; + artifactId = "logback-classic"; + version = "1.0.13"; + hash = "sha256-EsGTDKkWU0IqxJ/qM/zovhsfzS0iIM6jg8R5SXbHQY8="; + }) + (fetchMavenArtifact { + groupId = "ch.qos.logback"; + artifactId = "logback-core"; + version = "1.0.13"; + hash = "sha256-7NjyT5spQShOmPFU/zND5yDLMcj0e2dVSxRXRfWW87g="; + }) + ]; + mockito = [ + (fetchMavenArtifact { + groupId = "org.mockito"; + artifactId = "mockito-core"; + version = "1.9.5"; + hash = "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o="; + }) + ]; + netty = [ + (fetchMavenArtifact { + groupId = "io.netty"; + artifactId = "netty"; + version = "3.10.6.Final"; + hash = "sha256-h2ilD749k6iNjmAA6l1o4w9Q3JFbN2TDxYcPcMT7O0k="; + }) + ]; + objenesis = [ + (fetchMavenArtifact { + groupId = "org.objenesis"; + artifactId = "objenesis"; + version = "1.3"; + hash = "sha256-3U7z0wkQY6T+xXjLsrvmwfkhwACRuimT3Nmv0l/5REo="; + }) + ]; + powermock = [ + (fetchMavenArtifact { + groupId = "org.powermock"; + artifactId = "powermock-mockito-release-full"; + version = "1.5.4"; + classifier = "full"; + hash = "sha256-GWXaFG/ZtPlc7uKrghQHNAPzEu2k5VGYCYTXIlbylb4="; + }) + ]; + protobuf = [ + (fetchMavenArtifact { + groupId = "com.google.protobuf"; + artifactId = "protobuf-java"; + version = "2.5.0"; + hash = "sha256-4MHGRXXABWAXJefGoCzr+eEoXoiPdWsqHXP/qNclzHQ="; + }) + ]; + slf4j = [ + (fetchMavenArtifact { + groupId = "org.slf4j"; + artifactId = "log4j-over-slf4j"; + version = "1.7.7"; + hash = "sha256-LjcWxCtsAm/jzd2pK7oaVZsTZjjcexj7qKQSxBiVecI="; + }) + (fetchMavenArtifact { + groupId = "org.slf4j"; + artifactId = "slf4j-api"; + version = "1.7.7"; + hash = "sha256-aZgMA4yhsTGSZWFZFhfZwl+r/Hspgor5FZfKhXDPNf4="; + }) + ]; + suasync = [ + (fetchMavenArtifact { + groupId = "com.stumbleupon"; + artifactId = "async"; + version = "1.4.0"; + hash = "sha256-FJ1HH68JOkjNtkShjLTJ8K4NO/A/qu88ap7J7SEndrM="; + }) + ]; + validation-api = [ + (fetchMavenArtifact { + groupId = "javax.validation"; + artifactId = "validation-api"; + version = "1.0.0.GA"; + hash = "sha256-5FnzE+vG2ySD+M6q05rwcIY2G0dPqS5A9ELo3l2Yldw="; + }) + (fetchMavenArtifact { + groupId = "javax.validation"; + artifactId = "validation-api"; + version = "1.0.0.GA"; + classifier = "sources"; + hash = "sha256-o5TVKpt/4rsU8HGNKzyDCP/o836RGVYBI5jVXJ+fm1Q="; + }) + ]; + zookeeper = [ + (fetchMavenArtifact { + groupId = "org.apache.zookeeper"; + artifactId = "zookeeper"; + version = "3.4.6"; + hash = "sha256-ijdaHvmMvA4fbp39DZbZFLdNN60AtL+Bvrd/qPNNM64="; + }) + ]; + }; +in stdenv.mkDerivation rec { pname = "opentsdb"; - version = "2.4.0"; + version = "2.4.1"; - src = fetchurl { - url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; + src = fetchFromGitHub { + owner = "OpenTSDB"; + repo = "opentsdb"; + rev = "refs/tags/v${version}"; + hash = "sha256-899m1H0UCLsI/bnSrNFnnny4MxSw3XBzf7rgDuEajDs="; }; - patches = [ - (fetchpatch { - name = "CVE-2020-35476.patch"; - url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch"; - sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb"; - }) + nativeBuildInputs = [ + autoconf + automake + makeWrapper ]; - nativeBuildInputs = [ makeWrapper autoconf automake ]; buildInputs = [ curl jdk nettools python3 git ]; preConfigure = '' + chmod +x build-aux/fetchdep.sh.in patchShebangs ./build-aux/ ./bootstrap ''; + preBuild = lib.concatStrings (lib.mapAttrsToList (dir: lib.concatMapStrings (artifact: '' + ln -s ${artifact}/share/java/* third_party/${dir} + '')) artifacts); + postInstall = '' wrapProgram $out/bin/tsdb \ --set JAVA_HOME "${jre}" \ diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 517aae1f7929..3a240fce5e82 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-n/5+IVhTaME4x0KFTueo4SSBkAvXgin1VJHNEe2JnPI="; + sha256 = "sha256-FHZMnq/7y450dME5+CfF8Nkv7jEZyVkMYBXPcinFVvM="; }; vendorHash = "sha256-W30f7QYgm+QyLDJICpjMn7mtUIziTR1igThEbv+Aa7M="; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index d711bc2726d4..6bf26bfb4d4c 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,19 +10,26 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "8.2.1"; + version = "8.2.2"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; - rev = version; - sha256 = "sha256-NlaQhQtGQzOaTD18NMiicQOrovRuTCUq54vxu34JqIU="; + rev = "refs/tags/${version}"; + hash = "sha256-9mtXtBq08lL6qQg1Pq1WNwbkG0yi99mCpxNuBvr14ms="; }; - cargoSha256 = "sha256-I9OyH02JNdNgGK3918XwS5wt+11VppCTqzo50LuhnvI="; + cargoHash = "sha256-pKNqO43aFXZ/cbjNWt3tmBBbSTSKqVF7biNCPI1flvI="; - nativeBuildInputs = [ installShellFiles perl ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = [ + installShellFiles + perl + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; postInstall = '' installManPage ${pname}.1 @@ -31,6 +38,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "The fastest and cross-platform subdomain enumerator"; homepage = "https://github.com/Edu4rdSHL/findomain"; + changelog = "https://github.com/Findomain/Findomain/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Br1ght0ne ]; }; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 339b2aecbaa5..69ab1b35c141 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "6.2.1"; + version = "6.3.0"; 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-8shgDywj7hEj7r9H7w9A2zhmJ+dbA0DKFhgsEPQXT6k="; + sha256 = "sha256-1xTXvuxQCksCT+pj4+eHyb8fAc4YcK9Tn3xIijB7P1s="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 0764c274084a..a5ecaa79e905 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3420.31"; + version = "1.3.3430.77"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-FKLYpn2HeAVGN9OjLowv2BJRLZKReqXLPFvbin/jaBo="; + sha256 = "sha256-tB6BAtLIlsU7mQmJ/Ec94X2r0mmGJlefc2NkyDhQ2Ek="; }; modRoot = "cli"; diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index 103c8aceed82..8180f9013df8 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-fvRSx/I4SM9xWhooPPKFuRLSCYOxE+scqi6jRsGFOXo="; + sha256 = "sha256-A5enH7JqnLZ9Tte+FMpMVqq1g1JveYJbzH1Qum5In5E="; }; - cargoSha256 = "sha256-5wXeFomQs/aEbImmlyUzmYyDRXFp3qZSFOzk0g7pNEo="; + cargoHash = "sha256-LVc7CgRS57p7TUaTo8L94YArYC7eI0wegzNMcTiJrEg="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index f265444f53ab..884be4650585 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "bitwarden"; - version = "2022.12.0"; + version = "2023.1.1"; src = fetchurl { url = "https://github.com/bitwarden/clients/releases/download/desktop-v${version}/Bitwarden-${version}-amd64.deb"; - sha256 = "sha256-deQG1GEYmnQmO5+jASsiQmDphb+4Jyq9aSn/A4z++uE="; + sha256 = "sha256-bL3ybErpY5jeCixF8qtU/DQ35xU+43K9aXreHsoCF7Q="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 3330d20ac32f..e61649c767ad 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.53.1"; + version = "3.54.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-ZgXUnHYaWRBjAW/k74o93SIJJbcI3zlw5GmwXE6Ri8U="; + sha256 = "sha256-R+mvifWHyUL8qBCKKFcn4x9eDoPi4qRuGPnoRS4QlQY="; }; vendorHash = "sha256-TwcEH+LD0E/JcptMCYb3UycO3HhZX3igzSlBW4hS784="; diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index b02c6a896c39..46d296453f7d 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotrue"; - version = "2.42.2"; + version = "2.44.0"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-nMSvc90oZsAbDGktvSBMWZNEAGzz/INLK5K6hawteew="; + hash = "sha256-LSA6h6hs5M80urBasVDWZSCNA3fWxjYjvbPRbHLOX0Y="; }; - vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU="; + vendorHash = "sha256-FIl30sKmdcXayK8KWGFl+N+lYExl4ibKZ2tcvelw8zo="; ldflags = [ "-s" diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 4ab4d468d068..486ee7ba654a 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -6,6 +6,7 @@ , libgpg-error , libxcb , libxkbcommon +, pkg-config , python3 , AppKit , Foundation @@ -16,20 +17,21 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-eUUHH6bPfYjkHo7C7GWzewTpT8je7TQK9M8mTM5v59s="; + hash = "sha256-4Xi4ePFJL56HxCkbTlu4WiCTRzLEqvfbEk/2q9QjAd8="; }; - cargoHash = "sha256-GtSvDfG9lRUirm4d6PSaOBLTHZJT2PH0Sx/9GVquX5M="; + cargoHash = "sha256-MEj7c87msMv/+D70EDWmWEHTtmQcx5DEMf2I/AXnwm8="; nativeBuildInputs = [ gpgme # for gpgme-config libgpg-error # for gpg-error-config + pkg-config python3 ]; diff --git a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix index c83c7fb4cfe3..345e36756f66 100644 --- a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix +++ b/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix @@ -1,25 +1,37 @@ { lib +, stdenv , rustPlatform , fetchFromGitLab , pkg-config , nettle +, openssl +, darwin }: rustPlatform.buildRustPackage rec { pname = "sequoia-chameleon-gnupg"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - hash = "sha256-liQNz833/3hi3eMi+/iEZ8fT9FFi+MrDIYbQD+dQ/p0="; + hash = "sha256-8aKT39gq6o7dnbhKbDxewd4R2e2IsbYU8vaDwYemes8="; }; - cargoHash = "sha256-bnScLSI94obYQH5YzoHY4DtGScKc4m24+SIg1d2kAKw="; + cargoHash = "sha256-Z6cXCHLrK+BcIeVCKH2l8n9SivZsZPhXGhaMObn6rjo="; - nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ]; - buildInputs = [ nettle ]; + nativeBuildInputs = [ + rustPlatform.bindgenHook + pkg-config + ]; + + buildInputs = [ + nettle + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # gpgconf: error creating socket directory doCheck = false; diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 6aec3dd105f2..49c0f8cd14fb 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -5,19 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "wapiti"; - version = "3.1.3"; + version = "3.1.6"; format = "setuptools"; src = fetchFromGitHub { owner = "wapiti-scanner"; repo = pname; - rev = version; - sha256 = "sha256-alrJVe4Miarkk8BziC8Y333b3swJ4b4oQpP2WAdT2rc="; + rev = "refs/tags/${version}"; + hash = "sha256-b377nPXvpxg+WDNgjxm2RoJ5jNt7MTES2Bspxsvo/wc="; }; propagatedBuildInputs = with python3.pkgs; [ aiocache aiosqlite + arsenic beautifulsoup4 brotli browser-cookie3 @@ -63,15 +64,15 @@ python3.pkgs.buildPythonApplication rec { "test_bad_separator_used" "test_blind" "test_chunked_timeout" - "test_cookies" - "test_drop_cookies" - "test_save_and_restore_state" - "test_explorer_extract_links" "test_cookies_detection" + "test_cookies" "test_csrf_cases" "test_detection" "test_direct" + "test_dom_detection" + "test_drop_cookies" "test_escape_with_style" + "test_explorer_extract_links" "test_explorer_filtering" "test_false" "test_frame" @@ -79,21 +80,21 @@ python |