mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-04 03:03:42 +00:00
Merge pull request #199643 from NickCao/sysdig
Revert "sysdig: pin to openssl_1_1"
This commit is contained in:
commit
24ca01fb3a
@ -25683,7 +25683,6 @@ with pkgs;
|
||||
swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { };
|
||||
|
||||
sysdig = callPackage ../os-specific/linux/sysdig {
|
||||
openssl = openssl_1_1;
|
||||
kernel = null;
|
||||
}; # sysdig is a client, for a driver look at linuxPackagesFor
|
||||
|
||||
|
@ -442,9 +442,7 @@ in {
|
||||
|
||||
rr-zen_workaround = callPackage ../development/tools/analysis/rr/zen_workaround.nix { };
|
||||
|
||||
sysdig = callPackage ../os-specific/linux/sysdig {
|
||||
openssl = pkgs.openssl_1_1;
|
||||
};
|
||||
sysdig = callPackage ../os-specific/linux/sysdig {};
|
||||
|
||||
systemtap = callPackage ../development/tools/profiling/systemtap { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user