From 9f8d0107c6e56f3fd0d9cbdc46511482fe964a0f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Dec 2022 16:33:10 +0800 Subject: [PATCH 1/8] xidel: unpin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 612613a9e0b3..a1c70085f884 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16372,9 +16372,7 @@ with pkgs; srelay = callPackage ../tools/networking/srelay { }; - xidel = callPackage ../tools/text/xidel { - openssl = openssl_1_1; - }; + xidel = callPackage ../tools/text/xidel { }; asdf-vm = callPackage ../tools/misc/asdf-vm { }; From a02d834dd7a7113eb1eb0bbc10089f6aeeb15481 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Dec 2022 16:38:26 +0800 Subject: [PATCH 2/8] nfd: unpin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1c70085f884..feed2b68ef4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18547,9 +18547,7 @@ with pkgs; openssl = openssl_1_1; }; - nfd = callPackage ../servers/nfd { - openssl = openssl_1_1; - }; + nfd = callPackage ../servers/nfd { }; cddlib = callPackage ../development/libraries/cddlib {}; From d985007db9553496729d71e155c86654e88eed24 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Dec 2022 16:40:48 +0800 Subject: [PATCH 3/8] libstrophe: unpin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feed2b68ef4e..3273aada9af6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21048,9 +21048,7 @@ with pkgs; libstroke = callPackage ../development/libraries/libstroke { }; - libstrophe = callPackage ../development/libraries/libstrophe { - openssl = openssl_1_1; - }; + libstrophe = callPackage ../development/libraries/libstrophe { }; libspatialaudio = callPackage ../development/libraries/libspatialaudio { }; From 3b9cba8bdc646f0104c9694f359570d56e3f28a5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Dec 2022 16:42:50 +0800 Subject: [PATCH 4/8] quill: unpin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3273aada9af6..9be4e23f4d72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22223,7 +22223,6 @@ with pkgs; quill = callPackage ../tools/security/quill { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; From 66d43c605b914141d3bee374454712207a3786f1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Dec 2022 16:47:12 +0800 Subject: [PATCH 5/8] lighttpd: unpin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9be4e23f4d72..bfbb50f25667 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23956,9 +23956,7 @@ with pkgs; nodejs = nodejs-14_x; }; - lighttpd = callPackage ../servers/http/lighttpd { - openssl = openssl_1_1; - }; + lighttpd = callPackage ../servers/http/lighttpd { }; listmonk = callPackage ../servers/mail/listmonk { }; From 7f7561758b92dabadd7da945776625499022e566 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Dec 2022 16:56:47 +0800 Subject: [PATCH 6/8] kubo: unpin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfbb50f25667..5999c6fe6cf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8587,9 +8587,7 @@ with pkgs; kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; - kubo = callPackage ../applications/networking/kubo { - openssl = openssl_1_1; - }; + kubo = callPackage ../applications/networking/kubo { }; kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { }; kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { }; From 4c876c2646cd858761bb4baf42d5a7ea2544ccc9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Dec 2022 16:57:41 +0800 Subject: [PATCH 7/8] mdbook-plantuml: unpin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5999c6fe6cf2..78c24a1dd3d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8819,7 +8819,6 @@ with pkgs; mdbook-plantuml = callPackage ../tools/text/mdbook-plantuml { inherit (darwin.apple_sdk.frameworks) CoreServices; - openssl = openssl_1_1; }; mdbook-admonish = callPackage ../tools/text/mdbook-admonish { From a1d55b7102c37466de9de5516504135e96c67bba Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Dec 2022 17:03:18 +0800 Subject: [PATCH 8/8] nim: unpin to openssl_1_1 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c24a1dd3d6..e805f4e8f50f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14945,7 +14945,7 @@ with pkgs; muonlang = callPackage ../development/compilers/muonlang { }; - inherit (callPackages ../development/compilers/nim { openssl = openssl_1_1; }) + inherit (callPackages ../development/compilers/nim { }) nim-unwrapped nimble-unwrapped nim; nimPackages = recurseIntoAttrs nim.pkgs;