diff options
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 9 | ||||
-rw-r--r-- | pkgs/servers/squid/default.nix | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index d295bde3ae5e..530e9377828b 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -32,7 +32,6 @@ , jemalloc , rnnoise , abseil-cpp -, kcoreaddons # Transitive dependencies: , util-linuxMinimal , pcre @@ -74,7 +73,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.2.0"; + version = "4.2.4"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -83,13 +82,10 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1wpqn79pbarz48kmrh6gciw4a9y5hiki5qczlvj8smvx9is6yrf8"; + sha256 = "sha256-X2ZbjlL3YbPdXSgS+wqZL3FUW2xQ0DhqiOO5MR1QyLY="; }; postPatch = '' - substituteInPlace Telegram/CMakeLists.txt \ - --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ @@ -139,7 +135,6 @@ env.mkDerivation rec { jemalloc rnnoise tg_owt - kcoreaddons # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. pcre diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 23749170386c..41073e8cc839 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "5.6"; + version = "5.7"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz"; - sha256 = "sha256-ONJzOKNHWXzg6T0MO+bl9mtnUEF8R0yofuDWG7bRSNs="; + hash = "sha256-awdTqrpMnE79Mz5nEkyuz3rWzC04WB8Z0vAyH1t+zYE="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { perl openldap db cyrus_sasl expat libxml2 openssl ] ++ lib.optionals stdenv.isLinux [ libcap pam systemd ]; + enableParallelBuilding = true; + configureFlags = [ "--enable-ipv6" "--disable-strict-error-checking" |