remove openssl_1_0_2

With rust-amqp gone this isn't referenced anymore.
LnL7 · May 24, 2020 · 9aecc91 · 9aecc91
1 parent 3810d18
commit 9aecc91
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/default.nix b/default.nix
@@ -1,7 +1,4 @@
 { pkgs ? import ./nix {
-    config.permittedInsecurePackages = [
-      "openssl-1.0.2u"
-    ];
     overlays = [ (import ./nix/overlay.nix) ];
   }
 , ofborgCrates ? import ./Cargo.nix {

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -9,13 +9,6 @@
       buildInputs = with self.darwin.apple_sdk.frameworks;
         super.lib.optional super.stdenv.isDarwin Security;
     };
-    openssl-sys = attrs: {
-      buildInputs = [ self.openssl_1_0_2 ];
-      nativeBuildInputs = [ self.pkgconfig ];
-    };
-    openssl = attrs: {
-      DEP_OPENSSL_VERSION = "102";
-    };
   };
 })
 
diff --git a/release.nix b/release.nix
@@ -3,9 +3,6 @@
 }:
 let
   pkgs = import nixpkgs {
-    config.permittedInsecurePackages = [
-      "openssl-1.0.2u"
-    ];
     overlays = [ (import ./nix/overlay.nix) ];
   };
   inherit (pkgs) lib;
@@ -21,9 +18,6 @@ let
       collector // {
         "${system}" = import ./. {
           pkgs = import nixpkgs {
-            config.permittedInsecurePackages = [
-              "openssl-1.0.2u"
-            ];
             inherit system;
             overlays = [
               (import ./nix/overlay.nix)

diff --git a/shell.nix b/shell.nix
@@ -1,8 +1,4 @@
 { pkgs ? import ./nix {
-  config.permittedInsecurePackages = [
-    "openssl-1.0.2u"
-  ];
-
   overlays = [
     (import ./nix/overlay.nix)
     (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
@@ -45,7 +41,7 @@ let
       latest.rustChannels.stable.rust
       git
       pkgconfig
-      openssl_1_0_2.dev
+      openssl
     ]
       ++ stdenv.lib.optional stdenv.isDarwin pkgs.darwin.Security;
 
@@ -83,7 +79,7 @@ let
       nix-prefetch-git
       latest.rustChannels.stable.rust
       #rustfmt
-      openssl_1_0_2.dev
+      openssl
       pkgconfig
       git
     ]