diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 4f4d30a2f24f..014ab75a080e 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -5,8 +5,8 @@ let base = callPackage generic (_args // { - version = "7.4.25"; - sha256 = "sha256-J5klcMrz4uUyOrezeFPETBUpsdMeqU2Xdu+pHVp4ExM="; + version = "7.4.26"; + sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 993b356fcb27..440f0f68fe7b 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.12"; - sha256 = "sha256-tIhtsd8yLcj7Eo2LNK5+lPb8aC7LKf9PWlkdTen+rb8="; + version = "8.0.13"; + sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix new file mode 100644 index 000000000000..77987362cb3f --- /dev/null +++ b/pkgs/development/libraries/libks/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, libuuid +, openssl +}: + +stdenv.mkDerivation rec { + pname = "libks"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "signalwire"; + repo = pname; + rev = "v${version}"; + sha256 = "1wvl8kzi1fx7pg58r5x1lw4gwkvrkljqajsn72yq6sbsd3iqn8wr"; + }; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/telephony/5ced7ea4fc9bd746273d564bf3c102f253d2182e/libs/libks/patches/01-find-libm.patch"; + sha256 = "1hyrsdxg69d08qzvf3mbrx2363lw52jcybw8i3ynzqcl228gcg8a"; + }) + ]; + + dontUseCmakeBuildDir = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libuuid + openssl + ]; + + meta = with lib; { + description = "Foundational support for signalwire C products"; + homepage = "https://github.com/signalwire/libks"; + maintainers = with lib.maintainers; [ misuzu ]; + platforms = platforms.linux; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index c9db54fd59c4..bbee609eb267 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.3"; + version = "1.13.6"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qMgZpLo/BHGJbJ0DDN8COHAhU3ujWgVK9oZOnnMwKas="; + sha256 = "0b1gq499ksgsi16f5nf3dzbj6s8knwkiak5j810jzdfm7vkm0vvm"; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 8dc0d4613f42..a724604c725e 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -48,7 +48,7 @@ let UCLIBC_HAS_FPU n ''; - version = "1.0.37"; + version = "1.0.38"; in stdenv.mkDerivation { @@ -58,7 +58,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2"; # from "${url}.sha256"; - sha256 = "sha256-wThkkRBA42CskGC8kUlgmxk88Qy2Z8qRfLqD6kP8JY0="; + sha256 = "sha256-7wexvOOfDpIsM3XcdhHxESz7GsOW+ZkiA0dfiN5rHrU="; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 4f85650b87f9..a4c7bc299b43 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -1,33 +1,36 @@ { lib -, stdenv -, fetchFromGitHub , rustPlatform +, fetchFromGitHub +, stdenv , Security }: rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y="; + sha256 = "0a2iwpmljkha6qlbw0373wph7pxz05qym5712vzbszw0z42f82l2"; }; cargoPatches = [ ./Cargo.toml.patch ]; - cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM="; + cargoSha256 = "0l3fhwgrdvjrlmiqdy90sfd8kb2s7y0lbfswlrr560ly0bi1lfbx"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildNoDefaultFeatures = true; + buildFeatures = [ "socks" ]; + meta = with lib; { description = "An RPKI Validator written in Rust"; homepage = "https://github.com/NLnetLabs/routinator"; + changelog = "https://github.com/NLnetLabs/routinator/blob/v${version}/Changelog.md"; license = licenses.bsd3; maintainers = with maintainers; [ _0x4A6F ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 98a1223d2799..c6c594ecaec8 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -88,12 +88,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "1i5n06pds3kvzhhzfwvhwxnvcb2p2fcr8k52157aplm2i7prl4q2"; + sha256 = "0npdvidvsi4dhwswdwilff4p3x04qmz7hgs9sdadiy2w83qb6alf"; }; postPatch = '' @@ -125,6 +125,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; + CFLAGS = "-D_ANSI_SOURCE"; + hardeningDisable = [ "format" ]; preConfigure = '' diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix index 202461d2cf9f..12d71e6d749c 100644 --- a/pkgs/servers/sip/freeswitch/modules.nix +++ b/pkgs/servers/sip/freeswitch/modules.nix @@ -11,6 +11,7 @@ , postgresql , spandsp3 , sofia_sip +, libks }: let @@ -139,7 +140,7 @@ in rtmp = mk "endpoints/mod_rtmp" []; skinny = mk "endpoints/mod_skinny" []; sofia = mk "endpoints/mod_sofia" [ sofia_sip ]; - verto = mk "endpoints/mod_verto" []; + verto = mk "endpoints/mod_verto" [ libks ]; }; event_handlers = { diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 50ad9f1e2574..9546069bbe88 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.35.2"; + version = "1.35.4"; src = with lib; fetchurl { url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "07cch4j2lcncfjv71351c1fxh200p83g2ijb3c9x8rv6nzcmiymz"; + sha256 = "sha256-GQL3uTddx4E6pQ35wjp1i6Qx0uikEWNFwetXdd2pSGg="; }; prePatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 638ee824d7b3..965caa1dd4f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16412,6 +16412,8 @@ in libkml = callPackage ../development/libraries/libkml { }; + libks = callPackage ../development/libraries/libks { }; + libksba = callPackage ../development/libraries/libksba { }; libksi = callPackage ../development/libraries/libksi { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0ecd4e9b56b4..3f147bb8d643 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -535,6 +535,7 @@ lib.makeScope pkgs.newScope (self: with self; { buildInputs = [ libxml2 ]; internalDeps = [ php.extensions.dom ]; NIX_CFLAGS_COMPILE = [ "-I../.." "-DHAVE_DOM" ]; + doCheck = false; configureFlags = [ "--enable-xmlreader" ] # Required to build on darwin. ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }