alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #214215 from figsoda/oha

Browse source 
oha: 0.5.5 -> 0.5.6
This commit is contained in:
Weijia Wang 2023-02-02 21:52:36 +01:00 committed by GitHub
parent 6911585bd6 0efd891eeb
commit a9b9006177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/tools/networking/oha/default.nix
View file

@ -1,27 +1,34 @@
{ fetchFromGitHub, lib, pkg-config, rustPlatform, stdenv, openssl, Security }:
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, pkg-config
, openssl
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "oha";
version = "0.5.5";
version = "0.5.6";
src = fetchFromGitHub {
owner = "hatoo";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-NSre4OHzREVM8y9njMkS/whQ0+Ed+R+cLYfRWKmhA98=";
sha256 = "sha256-0Z8+dpZs0KMknyuw4Brkr8UosTDk75Kvy6zA/d91xgE=";
};
cargoSha256 = "sha256-GPP2eespnxDQoKZkqoPXEthRKk84szFl0LNTeqJQLNs=";
cargoSha256 = "sha256-isrfxnZbkIqQJ+jipYXvl1QgQ6hwRMdGA1kKFM1saDQ=";
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
nativeBuildInputs = lib.optionals stdenv.isLinux [
pkg-config
];
buildInputs = lib.optional stdenv.isLinux openssl
++ lib.optional stdenv.isDarwin Security;
# remove cargo config so it can find the linker
postPatch = ''
rm .cargo/config.toml
'';
buildInputs = lib.optionals stdenv.isLinux [
openssl
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
# tests don't work inside the sandbox
doCheck = false;

4
pkgs/top-level/all-packages.nix
View file

@ -10288,9 +10288,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
oha = callPackage ../tools/networking/oha {
inherit (darwin.apple_sdk.frameworks) Security;
};
oha = callPackage ../tools/networking/oha { };
onetun = callPackage ../tools/networking/onetun {
inherit (darwin.apple_sdk.frameworks) Security;