Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #205469 from r-ryantm/auto-update/libre

libre: 2.9.0 -> 3.6.0

authored by 7c6f434c and committed by GitHub f02a75ff 9a49f0cb

+23 -8
+2 -2
pkgs/applications/networking/instant-messengers/baresip/default.nix
··· 27 27 , dbusSupport ? true 28 28 }: 29 29 stdenv.mkDerivation rec { 30 - version = "2.9.0"; 30 + version = "3.6.0"; 31 31 pname = "baresip"; 32 32 src = fetchFromGitHub { 33 33 owner = "baresip"; 34 34 repo = "baresip"; 35 35 rev = "v${version}"; 36 - sha256 = "sha256-B4d8D4IfLYAIYVN80Lrh5bywD5iacSnUVwEzbc6Xq7g="; 36 + hash = "sha256-cp9aaOtvFl9RUHPQRMkSjPvf0fJ29Bclh4SKnAHo7fE="; 37 37 }; 38 38 prePatch = lib.optionalString (!dbusSupport) '' 39 39 substituteInPlace cmake/modules.cmake --replace 'list(APPEND MODULES ctrl_dbus)' ""
+18 -5
pkgs/development/libraries/libre/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, zlib, openssl 2 - , cmake }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , zlib 5 + , openssl 6 + , cmake 7 + , SystemConfiguration 8 + }: 3 9 4 10 stdenv.mkDerivation rec { 5 - version = "2.9.0"; 11 + version = "3.6.0"; 6 12 pname = "libre"; 7 13 src = fetchFromGitHub { 8 14 owner = "baresip"; 9 15 repo = "re"; 10 16 rev = "v${version}"; 11 - sha256 = "sha256-YNAfHmohMqGGF8N/VdndJJ32PF/GMBoNtjo/t2lt6HA="; 17 + sha256 = "sha256-pFtrmrNRSL1lw10LjayOoNFrW/tTPXwmUipwC5v1MZs="; 12 18 }; 13 - buildInputs = [ zlib openssl ]; 19 + 20 + buildInputs = [ 21 + openssl 22 + zlib 23 + ] ++ lib.optionals stdenv.isDarwin [ 24 + SystemConfiguration 25 + ]; 26 + 14 27 nativeBuildInputs = [ cmake ]; 15 28 makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] 16 29 ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
+3 -1
pkgs/top-level/all-packages.nix
··· 23086 23086 inherit (lomiri) cmake-extras; 23087 23087 }; 23088 23088 23089 - libre = callPackage ../development/libraries/libre { }; 23089 + libre = callPackage ../development/libraries/libre { 23090 + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; 23091 + }; 23090 23092 23091 23093 librecast = callPackage ../development/libraries/librecast { }; 23092 23094