diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-18 21:34:31 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-18 21:34:31 +0100 |
| commit | f2a8d55afc3d668850e1295caf71cc70c87840cb (patch) | |
| tree | d98231ac822807089e4dae1542be2a32d4bfcfe5 /pkgs/by-name/fr | |
| parent | f893cc7daacb331292b4bb7788846329b5fe79da (diff) | |
freefilesync: 13.3 -> 13.4
Diffstat (limited to 'pkgs/by-name/fr')
| -rw-r--r-- | pkgs/by-name/fr/freefilesync/curl-8.6.0.patch | 16 | ||||
| -rw-r--r-- | pkgs/by-name/fr/freefilesync/package.nix | 14 |
2 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/by-name/fr/freefilesync/curl-8.6.0.patch b/pkgs/by-name/fr/freefilesync/curl-8.6.0.patch deleted file mode 100644 index 60004b3f1ba68..0000000000000 --- a/pkgs/by-name/fr/freefilesync/curl-8.6.0.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/libcurl/curl_wrap.cpp b/libcurl/curl_wrap.cpp -index 11ac9dd..93edd44 100644 ---- a/libcurl/curl_wrap.cpp -+++ b/libcurl/curl_wrap.cpp -@@ -401,9 +401,10 @@ std::wstring zen::formatCurlStatusCode(CURLcode sc) - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PROXY); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CLIENTCERT); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNRECOVERABLE_POLL); -+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE); - ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST); - } -- static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1); -+ static_assert(CURL_LAST == CURLE_TOO_LARGE + 1); - - return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc))); - } diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index 73a00b8159871..eb8e8cf9b295d 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "13.3"; + version = "13.4"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f $out tryDownload "$url" ''; - hash = "sha256-mpCCecG1teBjIJqCzB3pGAQKT6t8bMKbK8KihMXOn3g="; + hash = "sha256-0c4HYlah9aHsMMyCz/TjgA59pTce4hogz5n6Xf9Myho="; }; sourceRoot = "."; @@ -56,14 +56,6 @@ stdenv.mkDerivation (finalAttrs: { patch = "Disable_wxWidgets_uncaught_exception_handling.patch"; hash = "sha256-Fem7eDDKSqPFU/t12Jco8OmYC8FM9JgB4/QVy/ouvbI="; }) - # Fix gui freeze - (fetchDebianPatch { - pname = "freefilesync"; - version = "13.3"; - debianRevision = "1"; - patch = "revert_buggy_gtk3_change_in_12.1.patch"; - hash = "sha256-eqush3zXxypQUxtO5110GoOJ30F5LZcF8XIC/Y8/fgM="; - }) # Disable update patch (fetchDebianPatch { pname = "freefilesync"; @@ -72,8 +64,6 @@ stdenv.mkDerivation (finalAttrs: { patch = "ffs_no_check_updates.patch"; hash = "sha256-lPyHpxhZz8BSnDI8QfAzKpKwVkp2jiF49RWjKNuZGII="; }) - # Fix build with curl 8.6.0 - ./curl-8.6.0.patch ]; nativeBuildInputs = [ |