summaryrefslogtreecommitdiffstats
path: root/pkgs/tools
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/f2/default.nix6
-rw-r--r--pkgs/tools/misc/opentsdb/default.nix297
-rw-r--r--pkgs/tools/misc/steampipe/default.nix4
-rw-r--r--pkgs/tools/security/arti/default.nix6
-rw-r--r--pkgs/tools/security/gotrue/supabase.nix6
-rw-r--r--pkgs/tools/security/gpg-tui/default.nix8
-rw-r--r--pkgs/tools/system/s0ix-selftest-tool/default.nix81
-rw-r--r--pkgs/tools/text/difftastic/default.nix12
8 files changed, 381 insertions, 39 deletions
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/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/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/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/system/s0ix-selftest-tool/default.nix b/pkgs/tools/system/s0ix-selftest-tool/default.nix
new file mode 100644
index 000000000000..193fbb0aef5f
--- /dev/null
+++ b/pkgs/tools/system/s0ix-selftest-tool/default.nix
@@ -0,0 +1,81 @@
+{
+ acpica-tools,
+ bash,
+ bc,
+ coreutils,
+ fetchFromGitHub,
+ gawk,
+ gnugrep,
+ gnused,
+ linuxPackages,
+ lib,
+ pciutils,
+ powertop,
+ resholve,
+ stdenv,
+ util-linux,
+ xorg,
+ xxd,
+}:
+resholve.mkDerivation {
+ pname = "s0ix-selftest-tool";
+ version = "unstable-2022-11-04";
+
+ src = fetchFromGitHub {
+ owner = "intel";
+ repo = "S0ixSelftestTool";
+ rev = "1b6db3c3470a3a74b052cb728a544199661d18ec";
+ hash = "sha256-w97jfdppW8kC8K8XvBntmkfntIctXDQCWmvug+H1hKA=";
+ };
+
+ # don't use the bundled turbostat binary
+ postPatch = ''
+ substituteInPlace s0ix-selftest-tool.sh --replace '"$DIR"/turbostat' 'turbostat'
+ substituteInPlace s0ix-selftest-tool.sh --replace 'sudo ' ""
+
+ '';
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+ install -Dm555 s0ix-selftest-tool.sh "$out/bin/s0ix-selftest-tool"
+ runHook postInstall
+ '';
+
+ solutions = {
+ default = {
+ scripts = ["bin/s0ix-selftest-tool"];
+ interpreter = lib.getExe bash;
+ inputs = [
+ acpica-tools
+ bc
+ coreutils
+ gawk
+ gnugrep
+ gnused
+ linuxPackages.turbostat
+ pciutils
+ powertop
+ util-linux
+ xorg.xset
+ xxd
+ ];
+ execer = [
+ "cannot:${util-linux}/bin/dmesg"
+ "cannot:${powertop}/bin/powertop"
+ "cannot:${util-linux}/bin/rtcwake"
+ "cannot:${linuxPackages.turbostat}/bin/turbostat"
+ ];
+ };
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/intel/S0ixSelftestTool";
+ description = "A tool for testing the S2idle path CPU Package C-state and S0ix failures";
+ license = licenses.gpl2Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [adamcstephens];
+ };
+}
diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix
index 40ddc9263e8c..a8e8aa1a851d 100644
--- a/pkgs/tools/text/difftastic/default.nix
+++ b/pkgs/tools/text/difftastic/default.nix
@@ -8,13 +8,13 @@
rustPlatform.buildRustPackage rec {
pname = "difftastic";
- version = "0.43.0";
+ version = "0.43.1";
src = fetchFromGitHub {
owner = "wilfred";
repo = pname;
rev = version;
- sha256 = "sha256-YL2rKsP5FSoG1gIyxQtt9kovBAyu8Flko5RxXRQy5mQ=";
+ sha256 = "sha256-UI63OJukot+MH+51h/yLnimJAcy8OFan9sUbuZaJZXc=";
};
depsExtraArgs = {
@@ -39,13 +39,7 @@ rustPlatform.buildRustPackage rec {
popd
'';
};
- cargoSha256 = "sha256-SUNBnJP8B/HvlozcCbehL1A2/WudYE20DIPc7/fYF/k=";
-
- checkFlags = [
- # test is broken
- # https://github.com/Wilfred/difftastic/issues/479
- "--skip=files::tests::test_gzip_is_binary"
- ];
+ cargoSha256 = "sha256-IfwZ800PGbmzxQ0e6okieKR7A8jgt+II2j8FRDkiXfw=";
passthru.tests.version = testers.testVersion { package = difftastic; };
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-12 01:54:30 +0000