Merge pull request #226880 from bobby285271/upd/rhythmbox

authored by

maxine and committed by
GitHub
1dac9895 1e1a6dc8

+12 -25
+5 -4
pkgs/applications/audio/rhythmbox/default.nix
··· 10 10 , glib 11 11 , gtk3 12 12 , libpeas 13 - , libsoup 13 + , libsoup_3 14 14 , libxml2 15 15 , libsecret 16 16 , libnotify ··· 36 36 37 37 stdenv.mkDerivation rec { 38 38 pname = "rhythmbox"; 39 - version = "3.4.6"; 39 + version = "3.4.7"; 40 40 41 41 src = fetchurl { 42 42 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 43 - sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ="; 43 + sha256 = "L21WwT/BpkxTT1AHiPtIKTbOVHs0PtkMZ94fK84M+n4="; 44 44 }; 45 45 46 46 nativeBuildInputs = [ ··· 56 56 57 57 buildInputs = [ 58 58 python3 59 - libsoup 59 + libsoup_3 60 60 libxml2 61 61 tdb 62 62 json-glib ··· 92 92 ]; 93 93 94 94 mesonFlags = [ 95 + "-Ddaap=enabled" 95 96 "-Dtests=disabled" 96 97 ]; 97 98
+2
pkgs/development/libraries/grilo-plugins/default.nix
··· 8 8 , gperf 9 9 , sqlite 10 10 , libarchive 11 + , libdmapsharing 11 12 , libsoup_3 12 13 , gnome 13 14 , libxml2 ··· 71 72 gnome-online-accounts 72 73 totem-pl-parser 73 74 libarchive 75 + libdmapsharing 74 76 libsoup_3 75 77 gmime 76 78 gom
+5 -21
pkgs/development/libraries/libdmapsharing/default.nix
··· 12 12 , gdk-pixbuf 13 13 , gst_all_1 14 14 , glib 15 - , gtk3 16 - , libgee 17 - , check 18 15 , gtk-doc 19 16 , docbook-xsl-nons 20 17 , docbook_xml_dtd_43 21 18 , gobject-introspection 22 - , libsoup 19 + , libsoup_3 23 20 }: 24 21 25 22 stdenv.mkDerivation rec { 26 23 pname = "libdmapsharing"; 27 - version = "3.9.10"; 24 + version = "3.9.12"; 28 25 29 26 outputs = [ "out" "dev" "devdoc" ]; 30 27 outputBin = "dev"; ··· 34 31 owner = "GNOME"; 35 32 repo = pname; 36 33 rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}"; 37 - sha256 = "04y1wjwnbw4pzg05h383d83p6an6ylwy4b4g32jmjxpfi388x33g"; 34 + sha256 = "tnQ25RR/bAZJKa8vTwzkGK1iPc7CMGFbyX8mBf6TKr4="; 38 35 }; 39 36 40 37 nativeBuildInputs = [ ··· 60 57 61 58 propagatedBuildInputs = [ 62 59 glib 63 - libsoup 64 - ]; 65 - 66 - nativeCheckInputs = [ 67 - libgee 68 - check 69 - gtk3 60 + libsoup_3 70 61 ]; 71 62 72 63 configureFlags = [ 73 64 "--enable-gtk-doc" 65 + "--disable-tests" # Tests require mDNS server. 74 66 ]; 75 67 76 - # Cannot disable tests here or `check` from nativeCheckInputs would not be included. 77 - # Cannot disable building the tests or docs will not build: 78 - # https://gitlab.gnome.org/GNOME/libdmapsharing/-/issues/49 79 - doCheck = true; 80 - 81 68 preConfigure = '' 82 69 NOCONFIGURE=1 ./autogen.sh 83 70 ''; 84 - 85 - # Tests require mDNS server. 86 - checkPhase = ":"; 87 71 88 72 meta = with lib; { 89 73 homepage = "https://www.flyn.org/projects/libdmapsharing/";