diff options
| author | Maxine Aubrey <maxeaubrey@gmail.com> | 2021-09-25 18:10:42 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-10-09 17:29:35 +0200 |
| commit | 9c578fc1263c9e8ea9b6585d9baa45f15a40bd60 (patch) | |
| tree | 4962be6073eedfd803cd93a9f1865305f008874e /pkgs/development/libraries/libsoup | |
| parent | 286f16ff47398336d91e10bc4e3eaae1518a0f58 (diff) | |
| download | nixpkgs-9c578fc1263c9e8ea9b6585d9baa45f15a40bd60.tar nixpkgs-9c578fc1263c9e8ea9b6585d9baa45f15a40bd60.tar.gz nixpkgs-9c578fc1263c9e8ea9b6585d9baa45f15a40bd60.tar.bz2 nixpkgs-9c578fc1263c9e8ea9b6585d9baa45f15a40bd60.tar.lz nixpkgs-9c578fc1263c9e8ea9b6585d9baa45f15a40bd60.tar.xz nixpkgs-9c578fc1263c9e8ea9b6585d9baa45f15a40bd60.tar.zst nixpkgs-9c578fc1263c9e8ea9b6585d9baa45f15a40bd60.zip | |
libsoup: 2.72.0 -> 2.74.0
- https://gitlab.gnome.org/GNOME/libsoup/-/blob/2.74.0/NEWS
Diffstat (limited to 'pkgs/development/libraries/libsoup')
| -rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 0cc4c8b3453..0bbfa5017d1 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -18,26 +18,17 @@ , libpsl , python3 , brotli -, fetchpatch }: stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.72.0"; + version = "2.74.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"; + sha256 = "sha256-M7HU4NY5RWxnXCJ4d+lKgHjXMSM+LVdonBGrzvfTxI4="; }; - patches = [ - (fetchpatch { - # https://gitlab.gnome.org/GNOME/libsoup/-/issues/222 - url = "https://gitlab.gnome.org/GNOME/libsoup/commit/b5e4f15a09d197b6a9b4b2d78b33779f27d828af.patch"; - sha256 = "1hqk8lqzc200hi0nwbwq9qm6f03z296cnd79d4ql30683s80xqws"; - }) - ]; - postPatch = '' patchShebangs libsoup/ ''; @@ -71,10 +62,18 @@ stdenv.mkDerivation rec { "-Dsysprof=disabled" ]; + NIX_CFLAGS_COMPILE = "-lpthread"; + doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) + postPatch = '' + patchShebangs libsoup/ + ''; + passthru = { - propagatedUserEnvPackages = [ glib-networking.out ]; + propagatedUserEnvPackages = [ + glib-networking.out + ]; updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; |