Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4c8695f835cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c35938870eef
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 22, 2019

  1. Revert "openssl: switch to linux-x86 and linux-x86_64 targets" 

    Mass-rebuild and should go to staging instead.

This reverts commit 4c8695f.
    @FRidh
    FRidh committed Oct 22, 2019
    Copy the full SHA
    c359388 View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −4 pkgs/development/libraries/openssl/default.nix
6 changes: 2 additions & 4 deletions pkgs/development/libraries/openssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -44,12 +44,10 @@ let
# TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = [];
configureScript = {
armv6l-linux = "./Configure linux-armv4 -march=armv6";
armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
i686-linux = "./Configure linux-x86";
x86_64-darwin = "./Configure darwin64-x86_64-cc";
x86_64-linux = "./Configure linux-x86_64";
x86_64-solaris = "./Configure solaris64-x86_64-gcc";
armv6l-linux = "./Configure linux-armv4 -march=armv6";
armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
}.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform
then "./config"