Unverified Commit c42e624f authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #292644 from NickCao/kore 

kore: unpin openssl_1_1
parents 92a114aa 487a5e9b

pkgs/development/web/kore/default.nix

+9 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, openssl, curl, postgresql, yajl }:





stdenv.mkDerivation rec {

  pname = "kore";

  version = "4.2.3";
@@ -27,9 +28,14 @@ stdenv.mkDerivation rec { 
    make platform.h

  '';



  # added to fix build w/gcc7 and clang5

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=pointer-compare"

    + lib.optionalString stdenv.cc.isClang " -Wno-error=unknown-warning-option";

  env.NIX_CFLAGS_COMPILE = toString ([

    "-Wno-error=deprecated-declarations"

  ] ++ lib.optionals stdenv.cc.isGNU [

    "-Wno-error=pointer-compare"

    "-Wno-error=discarded-qualifiers"

  ] ++ lib.optionals stdenv.cc.isClang [

    "-Wno-error=incompatible-pointer-types-discards-qualifiers"

  ]);



  enableParallelBuilding = true;

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -9749,9 +9749,7 @@ with pkgs; 














  kool = callPackage ../development/tools/misc/kool { };



























  kore = callPackage ../development/web/kore {













    openssl = openssl_1_1;













  };













  kore = callPackage ../development/web/kore { };





























  krakenx = callPackage ../tools/system/krakenx { };