diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/libraries/gupnp | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/libraries/gupnp')
-rw-r--r-- | pkgs/development/libraries/gupnp/default.nix | 37 | ||||
-rw-r--r-- | pkgs/development/libraries/gupnp/fix-requires.patch | 26 |
2 files changed, 12 insertions, 51 deletions
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 153eb681d63..c91d25123f6 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gobject-introspection , vala , gtk-doc @@ -15,45 +15,32 @@ , libsoup , libxml2 , libuuid -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.2.0"; + version = "1.2.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0911lv1bivsyv9wwdxm0i1w4r89j0vyyqp200gsfdnzk6v1a4x7x"; + url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-96AwfqUfXkTRuDL0k92QRURKOk4hHvhd/Zql3W6up9E="; }; patches = [ - # Nix’s pkg-config ignores Requires.private - # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d - # We are essentialy reverting the following patch for now - # https://bugzilla.gnome.org/show_bug.cgi?id=685477 - # at least until Requires.internal or something is implemented - # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7 - ./fix-requires.patch - - # fix deadlock in gupnp-igd tests - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch"; - sha256 = "02kzsb4glxhgb1npf6qqgafiki0ws75sly5h470431mihc6sgp4f"; - }) - # fix breakage in gupnp-igd tests (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch"; - sha256 = "0ba0rngk3a4n3z4dmq06wzgh0n3q9la1nr25qdxqbwlszmxfxpjf"; + name = "CVE-2021-33516.patch"; + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/ca6ec9dcb26fd7a2a630eb6a68118659b589afac.patch"; + sha256 = "sha256-G7e/xNQB7Kp2fPzqVeD/cH3h1co9hZXh55QOUBnAnvU="; }) ]; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gobject-introspection vala gtk-doc @@ -80,12 +67,12 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gupnp.org/"; description = "An implementation of the UPnP specification"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/pkgs/development/libraries/gupnp/fix-requires.patch deleted file mode 100644 index ffe9b68fd04..00000000000 --- a/pkgs/development/libraries/gupnp/fix-requires.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/libgupnp/meson.build -+++ b/libgupnp/meson.build -@@ -110,6 +110,7 @@ pkg.generate( - libraries : libgupnp, - subdirs: 'gupnp-1.2', - name : 'gupnp-1.2', -+ requires: requires, - description : 'GObject-based UPnP library', - version : meson.project_version(), - filebase : 'gupnp-1.2' ---- a/meson.build -+++ a/meson.build -@@ -18,6 +18,13 @@ add_global_arguments('-DHAVE_CONFIG_H=1', language : 'c') - - guul = subproject('guul', default_options : ['default_library=static']) - -+requires = [ -+ dependency('glib-2.0', version : '>= 2.44'), -+ dependency('gssdp-1.2', version : '>= 1.1'), -+ dependency('libsoup-2.4', version : '>= 2.48.0'), -+ dependency('libxml-2.0') -+] -+ - dependencies = [ - dependency('glib-2.0', version : '>= 2.44'), - dependency('gio-2.0', version : '>= 2.44'), |