Merge pull request #199643 from NickCao/sysdig

Revert "sysdig: pin to openssl_1_1"
This commit is contained in:
Mario Rodas
2022-11-05 01:24:24 -05:00
committed by GitHub
2 changed files with 1 additions and 4 deletions
-1
View File
@@ -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
+1 -3
View File
@@ -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 { };