danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

remove openssl_1_0_2

Browse source 
With rust-amqp gone this isn't referenced anymore.
This commit is contained in:
Daiderd Jordan 2020-05-24 17:31:20 +02:00
parent 3810d18a52
commit 9aecc91a09
No known key found for this signature in database
GPG key ID: D02435D05B810C96
4 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
default.nix
View file

@ -1,7 +1,4 @@
{ pkgs ? import ./nix { { pkgs ? import ./nix {
config.permittedInsecurePackages = [
"openssl-1.0.2u"
];
overlays = [ (import ./nix/overlay.nix) ]; overlays = [ (import ./nix/overlay.nix) ];
} }
, ofborgCrates ? import ./Cargo.nix { , ofborgCrates ? import ./Cargo.nix {

7
nix/overlay.nix
View file

@ -9,13 +9,6 @@
buildInputs = with self.darwin.apple_sdk.frameworks; buildInputs = with self.darwin.apple_sdk.frameworks;
super.lib.optional super.stdenv.isDarwin Security; 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";
};
}; };
}) })

6
release.nix
View file

@ -3,9 +3,6 @@
}: }:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
config.permittedInsecurePackages = [
"openssl-1.0.2u"
];
overlays = [ (import ./nix/overlay.nix) ]; overlays = [ (import ./nix/overlay.nix) ];
}; };
inherit (pkgs) lib; inherit (pkgs) lib;
@ -21,9 +18,6 @@ let
collector // { collector // {
"${system}" = import ./. { "${system}" = import ./. {
pkgs = import nixpkgs { pkgs = import nixpkgs {
config.permittedInsecurePackages = [
"openssl-1.0.2u"
];
inherit system; inherit system;
overlays = [ overlays = [
(import ./nix/overlay.nix) (import ./nix/overlay.nix)

8
shell.nix
View file

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