diff options
Diffstat (limited to 'pkgs/development/libraries')
62 files changed, 422 insertions, 313 deletions
diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index b33c45adb41..e514b8b5c31 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl, gtk3 -, pkgconfig, gnome3, dbus, xvfb_run }: -let - version = "5.1.1"; +{ stdenv +, fetchurl +, gtk3 +, pkgconfig +, gobject-introspection +, gnome3 +, dbus +, xvfb_run +}: + +stdenv.mkDerivation rec { pname = "amtk"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "5.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wax6mim8dj0m21k8ima7ysm3bzzp54r00jganwbzakq8bfnnrgr"; + sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2"; }; nativeBuildInputs = [ pkgconfig dbus + gobject-introspection ]; buildInputs = [ diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 6a1ca6d24d3..04f8c266131 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-atk"; - version = "2.34.2"; + version = "2.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh"; + sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8="; }; nativeBuildInputs = [ meson ninja pkgconfig ]; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 2c959434f01..ba77020ec70 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.36.1"; + version = "2.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m3crrdbc9vdn9dr4lssdwrjmm8z5wxs2qhhnbkh1w5vkn87nhcp"; + sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index b54ba531301..aa132515b3e 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -17,9 +17,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ # Required by atk.pc diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 8295be238fc..a195a2c7bb9 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -146,11 +146,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which ] + ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu - ++ optional stdenv.isDarwin fixDarwinDylibNames ++ optional enablePython python ++ optional enableNumpy python.pkgs.numpy; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 08b3b96784a..f2a69e87d85 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -7,11 +7,11 @@ let pname = "cogl"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.22.6"; + version = "1.22.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd"; + sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8"; }; patches = [ @@ -29,12 +29,6 @@ in stdenv.mkDerivation rec { url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056"; sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490"; }) - - # Fix build with libglvnd headers (these headers used to be provided by mesa) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/cogl/commit/9c4764224aded552fb855b1c2b85b26d2b894adf.patch"; - sha256 = "1v9drpzgcd5pq2shhdcw5px7mdiggk6ga13qjbklq8xpd92ac0i1"; - }) ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 1ffb5359992..cd3fa3bb7fd 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "devdoc" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames pruneLibtoolFiles ]; + nativeBuildInputs = [ autoreconfHook pruneLibtoolFiles ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ openssl db gettext kerberos ] ++ lib.optional enableLdap openldap diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 444b1430dd5..c9c1b9be922 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , meson , ninja , python3 @@ -19,24 +18,15 @@ stdenv.mkDerivation rec { pname = "dconf"; - version = "0.36.0"; + version = "0.38.0"; outputs = [ "out" "lib" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz"; + sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5"; }; - patches = [ - # Fix bash-completion installation - # https://gitlab.gnome.org/GNOME/dconf/merge_requests/58 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/dconf/commit/b3c9423c6151f3c28e526083ea2f04987a780fdf.patch"; - sha256 = "0kdapiw3zq041jhzsx90kk08vqfgzr6vy2k541iav984d0m0zcnf"; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index e9df0ef4016..6181cb45e19 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -16,7 +16,6 @@ , nss , dbus , libgee -, telepathy-glib , evolution-data-server , libsecret , db @@ -26,6 +25,8 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +, telepathy-glib +, telepathySupport ? false }: # TODO: enable more folks backends @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" + "-Dtelepathy_backend=${stdenv.lib.boolToString telepathySupport}" ]; nativeBuildInputs = [ @@ -69,8 +71,7 @@ stdenv.mkDerivation rec { nspr nss readline - telepathy-glib - ]; + ] ++ stdenv.lib.optional telepathySupport telepathy-glib; propagatedBuildInputs = [ glib @@ -109,6 +110,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Folks"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 55827b1ad0b..212b087fbe2 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.36.0"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00b6bzpr8rj8mvj66r2273r417wg2y21m6n88mhkq9m22z8bxyda"; + sha256 = "1q97pba4bzjndm1vlvicyv8mrl0n589qsw71dp8jrz2payvcfk56"; }; postPatch = '' diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 1f4bc5c12ad..9b2fd0b778b 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -61,9 +61,7 @@ stdenv.mkDerivation rec { gobject-introspection makeWrapper glib - ] ++ stdenv.lib.optional stdenv.isDarwin [ - fixDarwinDylibNames - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ glib diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 1cad5c0deb9..9437d76335d 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -8,7 +8,7 @@ , gtk3 , atk , gobject-introspection -, spidermonkey_68 +, spidermonkey_78 , pango , cairo , readline @@ -29,11 +29,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.64.4"; + version = "1.66.1"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0k6l2qc2vkws34zrgdhl57qxf0jjkar2iziz6qn4n1w7va73mk53"; + sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld"; }; outputs = [ "out" "dev" "installedTests" ]; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { gobject-introspection cairo readline - spidermonkey_68 + spidermonkey_78 dbus # for dbus-run-session ]; @@ -88,22 +88,22 @@ in stdenv.mkDerivation rec { # in the GIR files. When running tests, the library is not yet installed, # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that will be overridden during installation. - mkdir -p $out/lib $installedTests/libexec/gjs/installed-tests + mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 - ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/gjs/installed-tests/libgimarshallingtests.so - ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/gjs/installed-tests/libregress.so - ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/gjs/installed-tests/libwarnlib.so + ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so + ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so + ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so ''; postInstall = '' - # TODO: make the glib setup hook handle this + # TODO: make the glib setup hook handle moving the schemas in other outputs. installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}" mkdir -p "$installedTestsSchemaDatadir" mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir" ''; postFixup = '' - wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \ + wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \ --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" ''; diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch index f9b1515b68e..09cd8eaff43 100644 --- a/pkgs/development/libraries/gjs/installed-tests-path.patch +++ b/pkgs/development/libraries/gjs/installed-tests-path.patch @@ -1,22 +1,22 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build -index 7e842025..1e5029e0 100644 +index 04c7910f..9647908c 100644 --- a/installed-tests/meson.build +++ b/installed-tests/meson.build @@ -1,7 +1,7 @@ ### Installed tests ############################################################ --installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests' +-installed_tests_execdir = get_option('prefix') / get_option('libexecdir') / 'installed-tests' / meson.project_name() -installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name() -+installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests' ++installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / meson.project_name() +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name() # Simple shell script tests # diff --git a/meson.build b/meson.build -index 084d5396..e5d73fcd 100644 +index 9ab29475..42ffe07f 100644 --- a/meson.build +++ b/meson.build -@@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp', +@@ -557,7 +557,7 @@ install_data('installed-tests/extra/lsan.supp', install_dir: get_option('datadir') / api_name / 'lsan') if get_option('installed_tests') @@ -26,7 +26,7 @@ index 084d5396..e5d73fcd 100644 meson.add_install_script('build/compile-gschemas.py', schemadir) endif diff --git a/meson_options.txt b/meson_options.txt -index 66f66024..008687cb 100644 +index 825ba77a..21f0323c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false, diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 1b9fcb9586b..fbc1cb818ca 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libGL ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ] - ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ]; + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 59bf8485971..fc85b50e07f 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.64.3"; + version = "2.66.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0s518l4bwvdvcp51lbjqcw8g0vq18bznpf5hq2zi6a054jqhcylk"; + sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5"; }; patches = [ diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index df19b9fc88c..5a498991c67 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.64.5"; + version = "2.66.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04fczq693wivkqd2qxvvi3sncqgznsvzfiiwsll1rbayf795pgcw"; + sha256 = "0q7g70j6vjvcw4xf6bbfkm4j6mradcabdcdcy4gs5hxwkzkgysd2"; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 7b254b922bc..b8369db59fb 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.36.0"; + version = "3.37.90"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "15j3xh93rqjphjw56j00g40m684nr4zy3hs7dsngm6a21l87fkfd"; + sha256 = "05ahib6bjbfyj2gbqjijzg9i7x1q0r67hyph0fbrgnnadlpk2cv8"; }; outputs = [ "out" "man" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 03b0d1767d9..97b3ea9a8f1 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.64.1"; + version = "1.66.1"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"; + sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"; }; patches = [ @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { bison gtk-doc docbook-xsl-nons - docbook_xml_dtd_43 # FIXME: remove in next release docbook_xml_dtd_45 python3 setupHook # move .gir files @@ -91,6 +90,12 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; + # During configurePhase, two python scripts are generated and need this. See + # https://github.com/NixOS/nixpkgs/pull/98316#issuecomment-695785692 + postConfigure = '' + patchShebangs tools/* + ''; + preCheck = '' # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running tests, the library is not yet installed, diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 3dced2d6211..9073a501c09 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wyd3n5mn7b77hxylkc3f62v01mlavh96901pz342hwrn42ydqnx"; + sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6"; }; patches = [ diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 12f069891e8..858e8d81fd4 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -4,7 +4,7 @@ let pname = "grilo"; - version = "0.3.12"; # if you change minor, also change ./setup-hook.sh + version = "0.3.13"; # if you change minor, also change ./setup-hook.sh in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0w8sq5g6g1rg85h53vbll8va70fcp6082mlpmy98aa03444ddyyv"; + sha256 = "0ywjvh7xw4ql1q4fvl0q5n06n08pga1g1nc9l7c3x5214gr3fj6i"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 6a94944e9f1..1032f15196c 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -1,22 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection +{ stdenv +, fetchurl +, pkgconfig +, glib +, gobject-introspection , meson , ninja , python3 # just for passthru -, gnome3 }: +, gnome3 +}: stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.36.1"; + version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; - }; + nativeBuildInputs = [ + glib + meson + ninja + pkgconfig + python3 + ]; + + buildInputs = [ + glib + gobject-introspection + ]; + + postPatch = '' + chmod +x build-aux/meson/post-install.py + patchShebangs build-aux/meson/post-install.py + ''; # meson installs the schemas to share/glib-2.0/schemas # We add the override file there too so it will be compiled and later moved by @@ -32,16 +51,15 @@ stdenv.mkDerivation rec { EOF ''; - postPatch = '' - chmod +x build-aux/meson/post-install.py - patchShebangs build-aux/meson/post-install.py - ''; - - buildInputs = [ glib gobject-introspection ]; - - nativeBuildInputs = [ pkgconfig python3 meson ninja glib ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { + description = "Collection of GSettings schemas for settings shared by various components of a desktop"; + license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 17e98b8e409..582244f4f49 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -2,7 +2,7 @@ let pname = "gspell"; - version = "1.8.3"; + version = "1.8.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1s1dns070pz8dg04ppshdbx1r86n9406vkxcfs8hdghn0bfi9ras"; + sha256 = "1d23pl9956dkpy52pbndp0vrba0y030msh1issdl84z82skickfg"; }; propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index bf78d15d39c..2cae9546b74 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -25,6 +25,7 @@ , epoxy , json-glib , libxkbcommon +, libxml2 , gmp , gnome3 , gsettings-desktop-schemas @@ -48,7 +49,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.21"; + version = "3.24.23"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "0llgq2adzn9p3bfq9rv2dhscmvzs35jp3glrfvy3vs1mrpknmsmf"; + sha256 = "1cg2vbwbcp7bc84ky0b69ipgdr9djhspnf5k8lajb8jphcj4v1jx"; }; patches = [ @@ -71,8 +72,8 @@ stdenv.mkDerivation rec { sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # Fix path handling in pkg-config - # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1793 + # Fix path handling in pkg-config. MR for the gtk-3-24 branch: + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2605 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch"; sha256 = "0rd1kjh0m4mrj2hkcqlsq1j0d6ahn5c237fd211r158gd1jiwys0"; @@ -97,11 +98,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' - # TODO: Remove in 3.24.21 - # https://gitlab.gnome.org/GNOME/gtk/issues/2669 - echo "${stdenv.shell}" > check-version.py - chmod +x check-version.py - files=( build-aux/meson/post-install.py demos/gtk-demo/geninclude.py @@ -130,6 +126,8 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 docbook_xsl gtk-doc + # For xmllint + libxml2 ]; buildInputs = [ diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index d882d3b1a6c..d32a0eebf13 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala -, libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }: +, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }: stdenv.mkDerivation rec { pname = "gtksourceview"; @@ -42,13 +42,6 @@ stdenv.mkDerivation rec { make check ''; - passthru = { - updateScript = gnome3.updateScript { - packageName = "gtksourceview"; - attrPath = "gtksourceview3"; - }; - }; - meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 565b7f782d5..2041e83fb0c 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.6.1"; + version = "4.8.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0x7q9lwgrc4kkciy7vgwd80v2ji7plyqiqbvkvx2yqarmfkqgx33"; + sha256 = "06jfbfbi73j9i3qsr7sxg3yl3643bn3aydbzx6xg3v8ca0hr3880"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 204c9d8dd74..a2e15769145 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,20 +1,26 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobject-introspection -, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44 +, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 , glib, systemd, libusb1, vala, hwdata }: + +let + pythonEnv = python3.withPackages(ps: with ps; [ + setuptools + ]); +in stdenv.mkDerivation rec { pname = "gusb"; - version = "0.3.3"; + version = "0.3.5"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz"; - sha256 = "14pbd0812151ga7jrpzi88fcrwkckx6m07ay84l7dzkxbdc44fgr"; + sha256 = "1pv5ivbwxb9anq2j34i68r8fgs8nwsi4hmss7h9v1i3wk7300ajv"; }; nativeBuildInputs = [ - meson ninja pkgconfig gettext + meson ninja pkgconfig gettext pythonEnv gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 gobject-introspection vala ]; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index cff6569be50..f79ffa579c8 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.44.1"; + version = "1.46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ipv0jgzim6glsgizmfjkx0m3gd1l9lr242m0jj6cdmhs52k5vsh"; + sha256 = "00r56kp8dhdn1ypyap66klymlwlh646n4f1ri797w2x6p70sc7k2"; }; postPatch = '' diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 81f75ad526a..d8e9bd16ab8 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -57,7 +57,7 @@ let # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; # remove dependency on bootstrap-tools in early stdenv build postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index a6eb5642395..4004c9f387e 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jbig2dec"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/${pname}-${version}.tar.gz"; - sha256 = "0pigfw2v0ppvr0lbysm69gx0zsa5q2q92yrb8af2j3im6x97f6cy"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz"; + sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517"; }; postPatch = '' diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 4ae4a71091e..f89d4bc4534 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index b641a547302..61f357689c4 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.34.0"; + version = "3.38.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j05x4xv2cp3cbmp30m68z8g4rdw7b030ip4wszyfj9ya15v5kni"; + sha256 = "3F8ZFKkRUrcPqPyaEe3hMUirSvZE2yejZjI4jJJ6ioI="; }; mesonFlags = [ diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 33eca603c26..14d426701ba 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ snappy ]; nativeBuildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildPhase = '' make all diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 95569c0a813..27db14e7166 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ]; cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 9b6a54d92f9..ae5154eac03 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcbor"; - version = "unstable-2019-07-25"; + version = "0.8.0"; src = fetchFromGitHub { owner = "PJK"; repo = pname; - rev = "82512d851205fbc7f65d96a0b4a8e1bad2e4f3c6"; - sha256 = "01hy7n21gxz4gp3gdwm2ywz822p415bj2k9ccxgwz3plvncs4xa1"; + rev = "v${version}"; + sha256 = "01dv4vxcmbvpphqy16vqiwh25wx11x630js5wfnx7cryarsh9ld7"; }; nativeBuildInputs = [ cmake ]; @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - NIX_CFLAGS_COMPILE = "-fno-lto"; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ]; meta = with stdenv.lib; { description = "CBOR protocol implementation for C and others"; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 5351b2c9fcb..6c430682251 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.36.0"; + version = "3.38.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0n6r16a07in82cnzw91vl675pbjzbvazkxwbqxq2kihganzipcw2"; + sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1"; }; nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index e23c7d55c5e..cbde3206717 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -23,10 +23,13 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional sslSupport "openssl" ; + nativeBuildInputs = [] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ; + buildInputs = [] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional stdenv.isCygwin findutils - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; doCheck = false; # needs the net diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 162b5d23395..50eac405706 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libgdata"; - version = "0.17.12"; + version = "0.17.13"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0613nihsvwvdnmlbjnwi8zqxgmpwyxdapzznq4cy1fp84246zzd0"; + sha256 = "0bj7ij6k3lxjn62jgh8vabr8vfjs48aylnnl3779warw5iwyzfga"; }; patches = [ diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 439dd3827ec..c7c3064acb8 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libgudev"; - version = "233"; + version = "234"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00xvva04lgqamhnf277lg32phjn971wgpc9cxvgf5x13xdq4jz2q"; + sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv"; }; nativeBuildInputs = [ pkgconfig gobject-introspection ]; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix new file mode 100644 index 00000000000..2923f2da25d --- /dev/null +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala +, gtk-doc, docbook_xsl, docbook_xml_dtd_43 +, gtk3, gnome3, glade +, dbus, xvfb_run, libxml2 +, hicolor-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "libhandy"; + version = "0.0.13"; + + outputs = [ "out" "dev" "devdoc" "glade" ]; + outputBin = "dev"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = pname; + rev = "v${version}"; + sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; + }; + + patches = [ + # Fix build with Glade 3.36.0 + # https://source.puri.sm/Librem5/libhandy/merge_requests/451 + (fetchpatch { + url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch"; + sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5"; + excludes = [ "glade/glade-hdy-header-bar.c" ]; + }) + ]; + + nativeBuildInputs = [ + meson ninja pkgconfig gobject-introspection vala libxml2 + gtk-doc docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ]; + checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dglade_catalog=enabled" + "-Dintrospection=enabled" + ]; + + PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; + PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; + + doCheck = true; + + checkPhase = '' + NO_AT_BRIDGE=1 \ + XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + ''; + + meta = with stdenv.lib; { + description = "A library full of GTK widgets for mobile phones"; + homepage = "https://source.puri.sm/Librem5/libhandy"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 2923f2da25d..835eaeac2bf 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,66 +1,89 @@ -{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala -, gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3, glade -, dbus, xvfb_run, libxml2 +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gobject-introspection +, vala +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, gtk3 +, gnome3 +, glade +, dbus +, xvfb_run +, libxml2 +, gdk-pixbuf +, librsvg , hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "libhandy"; - version = "0.0.13"; + version = "1.0.0"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; - src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; - repo = pname; - rev = "v${version}"; - sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + hash = "sha256-qTmFgvR7fXKSBdbqwMBo/vNarySf3Vfuo3JPhRjSZpk="; }; - patches = [ - # Fix build with Glade 3.36.0 - # https://source.puri.sm/Librem5/libhandy/merge_requests/451 - (fetchpatch { - url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch"; - sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5"; - excludes = [ "glade/glade-hdy-header-bar.c" ]; - }) + nativeBuildInputs = [ + docbook_xml_dtd_43 + docbook_xsl + gobject-introspection + gtk-doc + libxml2 + meson + ninja + pkgconfig + vala ]; - nativeBuildInputs = [ - meson ninja pkgconfig gobject-introspection vala libxml2 - gtk-doc docbook_xsl docbook_xml_dtd_43 + buildInputs = [ + gdk-pixbuf + glade + gtk3 + libxml2 + ]; + + checkInputs = [ + dbus + hicolor-icon-theme + xvfb_run ]; - buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ]; - checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ "-Dgtk_doc=true" - "-Dglade_catalog=enabled" - "-Dintrospection=enabled" ]; + # Uses define_variable in pkgconfig, but we still need it to use the glade output PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; - doCheck = true; + # Bail out! dbind-FATAL-WARNING: + # AT-SPI: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: + # The name org.a11y.Bus was not provided by any .service files + doCheck = false; checkPhase = '' NO_AT_BRIDGE=1 \ - XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" \ + XDG_DATA_DIRS="$XDG_DATA_DIRS:${hicolor-icon-theme}/share" + GDK_PIXBUF_MODULE_FILE="${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test --print-errorlogs ''; meta = with stdenv.lib; { - description = "A library full of GTK widgets for mobile phones"; - homepage = "https://source.puri.sm/Librem5/libhandy"; + changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}"; + description = "Building blocks for modern adaptive GNOME apps"; + homepage = "https://gitlab.gnome.org/GNOME/libhandy"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index eb3cbf4bfef..83ee19075de 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libmanette"; - version = "0.2.4"; + version = "0.2.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xrc6rh73v5w3kbkflzv1yg8sbxk4wf06hfk95raxhxlssza9q2g"; + sha256 = "gAbghIDAy9T3SewVWCfRAER88jkD+tgkCnxMMhqgmis="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 6c2276a08cc..1d360b45052 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.26.0"; + version = "1.28.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xkk9zhkw8f2fm7g9nb4ry4xxig5n27s7rjmx6l7jr2941zdfxm9"; + sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2"; }; nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index fb9e5b12bc6..67e87a5faab 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { lzip pkgconfig python3 - (stdenv.lib.optionalString (!stdenv.isDarwin) valgrind) libxslt + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + valgrind ]; buildInputs = [ @@ -56,15 +57,16 @@ stdenv.mkDerivation rec { configureFlags = [ # "--enable-gtk-doc" "--enable-man" - "--enable-valgrind-tests" "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" "--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt" + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + "--enable-valgrind-tests" ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with stdenv.lib; { description = "C library for the Publix Suffix List"; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index fb61b50346d..ecf518d04da 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -4,14 +4,14 @@ let pname = "librsvg"; - version = "2.48.8"; + version = "2.50.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "14i6xzghcidv64cyd3g0wdjbl82rph737yxn9s3x29nzpcjs707l"; + sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv"; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 9f4a5bac25b..65e0ced1d9b 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3 +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala -, libpsl, python3, brotli, lib }: +, libpsl, python3, brotli +}: stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.70.0"; + version = "2.72.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l"; + sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"; }; postPatch = '' @@ -17,7 +18,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ python3 sqlite libpsl brotli ]; + buildInputs = [ + python3 + sqlite + libpsl + brotli + ] ++ lib.optionals stdenv.isLinux [ + libsysprof-capture + ]; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ]; propagatedBuildInputs = [ glib libxml2 ]; @@ -27,6 +35,8 @@ stdenv.mkDerivation rec { "-Dvapi=enabled" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsysprof=disabled" ]; doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) @@ -41,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; homepage = "https://wiki.gnome.org/Projects/libsoup"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; }; } diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index d3578283737..f6c8c9d0bb8 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.9.0"; # Also update the hash for libva-utils! + version = "2.9.1"; # Also update the hash for libva-utils! src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "17m8k8fn41vzi1lzh9idf2mn4x73bwlkw60kl5zj396kpw4n1z1r"; + sha256 = "1c9rwrz30q2p47spzb9gsakwci9c5mw6i309z7p7hr2d8233ay4x"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index 71a1d085d12..675d85508b5 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1xylc940ffhqay9lyy48872cfw61ziky8dw21vm69psngfz3zs9n"; + sha256 = "1viqxq9r424hvbfgjlw4zb1idsq24fqr5cz6rk47j37rcnqclj2k"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 3c02e537d2a..3981e05ef06 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8"; + sha256 = "07b4s5ckcz9q5gwx8vchim19mhfgl8wysqwi30pndks3m4zrzad2"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/nss/3.44.nix b/pkgs/development/libraries/nss/3.44.nix index ad58bfccaee..1c89dd79331 100644 --- a/pkgs/development/libraries/nss/3.44.nix +++ b/pkgs/development/libraries/nss/3.44.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ zlib sqlite ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ zlib sqlite ]; propagatedBuildInputs = [ nspr ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e9ca475802d..395617aa7bc 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -20,10 +20,9 @@ in stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ]; - buildInputs = [ zlib sqlite ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ zlib sqlite ]; propagatedBuildInputs = [ nspr ]; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 6c3744493d2..7f27f7d1c17 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "1g2wdchlwdihqj0ynx58nwyrpncxanghlnykgir97p0wimg3hnxl"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ oracle-instantclient ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e3bdba9b3b1..45edbee1be4 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -9,26 +9,15 @@ with stdenv.lib; let pname = "pango"; - version = "1.45.3"; + version = "1.47.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0zg6gvzk227q997jf1c9p7j5ra87nm008hlgq6q8na9xmgmw2x8z"; + sha256 = "0ry3j9n0lvdfmjwi2w7wa4gkalnip56kghqq6bh8hcf45xjvh3bk"; }; - patches = [ - # Fix issue with Pango loading unsupported formats that - # breaks mixed x11/opentype font packages. - # See https://gitlab.gnome.org/GNOME/pango/issues/457 - # Remove on next release. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pango/commit/fe1ee773310bac83d8e5d3c062b13a51fb5fb4ad.patch"; - sha256 = "1px66g31l2jx4baaqi4md59wlmvw0ywgspn6zr919fxl4h1kkh0h"; - }) - ]; - # FIXME: docs fail on darwin outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc"; @@ -50,6 +39,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}" + "-Dlibthai=disabled" # Not packaged in Nixpkgs ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index 1dbfe0647f4..eaedc2c0ac3 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, alsaLib, ffmpeg_3, libjack2, udev, libva, xorg +, glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsaLib ffmpeg_3 libjack2 udev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 008f0f5b424..77cf9fd0247 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -1,28 +1,41 @@ -{ stdenv, fetchurl -, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }: -let - version = "4.4.0"; +{ stdenv +, fetchurl +, meson +, ninja +, amtk +, gnome3 +, gobject-introspection +, gtk3 +, gtksourceview4 +, icu +, pkg-config +}: + +stdenv.mkDerivation rec { pname = "tepl"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "5.0.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mm2z849hnni7597an05mrv0dckrxjngpf2xfa0g5s17i8x6gxp6"; + sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6"; }; nativeBuildInputs = [ - pkgconfig + meson + ninja + gobject-introspection + pkg-config ]; buildInputs = [ - libxml2 + icu ]; propagatedBuildInputs = [ amtk gtksourceview4 - libuchardet gtk3 ]; @@ -38,8 +51,8 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; description = "Text editor product line"; - maintainers = [ maintainers.manveru ]; - license = licenses.lgpl21Plus; + maintainers = teams.gnome.members ++ [ maintainers.manveru ]; + license = licenses.lgpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 2726ed7f237..89318dd4e75 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cmake python doxygen - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; checkInputs = [ gtest @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { openssl boost libpqxx - ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ]; # emulate the process of pulling catch down postPatch = '' diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index f93721bdfc1..0670fdcdbd1 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -1,7 +1,10 @@ { stdenv , fetchurl , substituteAll -, intltool +, asciidoc +, docbook-xsl-nons +, docbook_xml_dtd_45 +, gettext , itstool , libxslt , gexiv2 @@ -15,7 +18,6 @@ , dbus , evolution-data-server , exempi -, flac , giflib , glib , gnome3 @@ -35,9 +37,10 @@ , libsoup , libtiff , libuuid -, libvorbis , libxml2 +, networkmanager , poppler +, systemd , taglib , upower , totem-pl-parser @@ -45,15 +48,18 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "2.3.3"; + version = "3.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl"; + sha256 = "1kfi5d6pccqx28hbnja6k1mpwjd53k5zs704sg01rlzmbshz1zn6"; }; nativeBuildInputs = [ - intltool + asciidoc + docbook-xsl-nons + docbook_xml_dtd_45 + gettext itstool libxslt meson @@ -69,7 +75,6 @@ stdenv.mkDerivation rec { dbus evolution-data-server exempi - flac giflib glib gexiv2 @@ -92,9 +97,10 @@ stdenv.mkDerivation rec { libsoup libtiff libuuid - libvorbis libxml2 + networkmanager poppler + systemd taglib upower ]; @@ -102,19 +108,12 @@ stdenv.mkDerivation rec { mesonFlags = [ # TODO: tests do not like our sandbox "-Dfunctional_tests=false" - "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" ]; patches = [ (substituteAll { src = ./fix-paths.patch; - inherit tracker; - }) - # https://bugzilla.gnome.org/show_bug.cgi?id=795576 - (fetchurl { - url = "https://bugzilla.gnome.org/attachment.cgi?id=371427"; - sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf"; + inherit asciidoc; }) ]; diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch index ce44416055c..8661648eacd 100644 --- a/pkgs/development/libraries/tracker-miners/fix-paths.patch +++ b/pkgs/development/libraries/tracker-miners/fix-paths.patch @@ -1,11 +1,13 @@ ---- a/src/libtracker-miners-common/tracker-domain-ontology.c -+++ b/src/libtracker-miners-common/tracker-domain-ontology.c -@@ -323,7 +323,7 @@ - goto end; - } - } else { -- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies", -+ path = g_build_filename ("@tracker@", "share", "tracker", "domain-ontologies", - DEFAULT_RULE, NULL); - - if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { +diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build +index 0b8a64863..a09db59f0 100644 +--- a/docs/manpages/meson.build ++++ b/docs/manpages/meson.build +@@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_manpages + command: [xsltproc, + '--output', '@OUTPUT@', + '--stringparam', 'man.authors.section.enabled', '0', +- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], ++ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], + input: xml, + output: manpage, + install: true, diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index fb111829c7e..40ab73405ae 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -4,12 +4,11 @@ , meson , ninja , pkgconfig +, asciidoc , gobject-introspection , python3 , gtk-doc -, docbook_xsl -, docbook_xml_dtd_412 -, docbook_xml_dtd_43 +, docbook-xsl-nons , docbook_xml_dtd_45 , libxml2 , glib @@ -21,7 +20,6 @@ , gnome3 , icu , libuuid -, networkmanager , libsoup , json-glib , systemd @@ -31,19 +29,19 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "2.3.4"; + version = "3.0.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap"; + sha256 = "1rhcs75axga7p7hl37h6jzb2az89jddlcwc7ykrnb2khyhka78rr"; }; patches = [ (substituteAll { src = ./fix-paths.patch; - gdbus = "${glib.bin}/bin/gdbus"; + inherit asciidoc; }) ]; @@ -52,14 +50,13 @@ stdenv.mkDerivation rec { ninja vala pkgconfig + asciidoc gettext libxslt wrapGAppsHook gobject-introspection gtk-doc - docbook_xsl - docbook_xml_dtd_412 - docbook_xml_dtd_43 + docbook-xsl-nons docbook_xml_dtd_45 python3 # for data-generators systemd # used for checks to install systemd user service @@ -71,7 +68,6 @@ stdenv.mkDerivation rec { libxml2 sqlite icu - networkmanager libsoup libuuid json-glib @@ -83,8 +79,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - # "-Dfunctional_tests=true" "-Ddocs=true" ]; @@ -106,9 +100,17 @@ stdenv.mkDerivation rec { # though, so we need to replace the absolute path with a local one during build. # We are using a symlink that will be overridden during installation. mkdir -p $out/lib - ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0 - ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0 - ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so + ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0.so $out/lib/libtracker-sparql-3.0.so.0 + ''; + + checkPhase = '' + runHook preCheck + + dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --print-errorlogs + + runHook postCheck ''; postCheck = '' @@ -116,10 +118,6 @@ stdenv.mkDerivation rec { rm -r $out/lib ''; - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/tracker/fix-paths.patch b/pkgs/development/libraries/tracker/fix-paths.patch index f5c13c3fcda..5e4d8657f7b 100644 --- a/pkgs/development/libraries/tracker/fix-paths.patch +++ b/pkgs/development/libraries/tracker/fix-paths.patch @@ -1,12 +1,13 @@ ---- a/src/tracker-store/tracker-store.desktop.in -+++ b/src/tracker-store/tracker-store.desktop.in -@@ -1,8 +1,8 @@ - [Desktop Entry] - Name=Tracker Store - Comment=Metadata database store and lookup manager --Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 -+Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0 - Terminal=false - Type=Application - Categories=Utility; - X-GNOME-Autostart-enabled=true +diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build +index f90c757cf..40d9c939d 100644 +--- a/docs/manpages/meson.build ++++ b/docs/manpages/meson.build +@@ -32,7 +32,7 @@ foreach m : manpages + command: [xsltproc, + '--output', '@OUTPUT@', + '--stringparam', 'man.authors.section.enabled', '0', +- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], ++ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], + input: xml, + output: manpage, + install: true, diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 811921df3e7..014b2615d5b 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.60.2"; + version = "0.62.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m"; + sha256 = "139had0zcggzrxx9rjy0a67mahzm474amafh168y11421iyfhsf3"; }; passthru = { diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index d60e56763a1..814a1f22592 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -41,34 +41,33 @@ , enableGeoLocation ? true , geoclue2 , sqlite -, enableGtk2Plugins ? false -, gtk2 ? null , enableGLES ? true , gst-plugins-base , gst-plugins-bad , woff2 , bubblewrap , libseccomp +, systemd , xdg-dbus-proxy , substituteAll , glib }: assert enableGeoLocation -> geoclue2 != null; -assert enableGtk2Plugins -> gtk2 != null; -assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.28.4"; + version = "2.30.1"; outputs = [ "out" "dev" ]; + separateDebugInfo = stdenv.isLinux; + src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0r4lkk21pny2g4mmsw0ds14m5hhjys1l47gvy59dfgihr7l546c2"; + sha256 = "1cfnsl5kvwrbclmp7v9q9ynrz702i9ncb6xmx6972dxpmpyrvi8p"; }; patches = optionals stdenv.isLinux [ @@ -140,10 +139,10 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ bubblewrap libseccomp + systemd wayland xdg-dbus-proxy - ] ++ optional enableGeoLocation geoclue2 - ++ optional enableGtk2Plugins gtk2; + ] ++ optional enableGeoLocation geoclue2; propagatedBuildInputs = [ gtk3 @@ -167,8 +166,7 @@ stdenv.mkDerivation rec { "-DENABLE_X11_TARGET=OFF" "-DUSE_ACCELERATE=0" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; postPatch = '' patchShebangs . @@ -178,7 +176,7 @@ stdenv.mkDerivation rec { description = "Web content rendering engine, GTK port"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 98c94cfecca..95f09f59504 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -11,13 +11,11 @@ , libtool , gettext , dbus -, telepathy-glib , gtk3 , json-glib , librdf_raptor2 -, dbus-glib , pythonSupport ? true -, python2Packages +, python3 }: stdenv.mkDerivation rec { @@ -50,23 +48,21 @@ stdenv.mkDerivation rec { gettext gobject-introspection vala - python2Packages.python + python3 ]; buildInputs = [ glib sqlite dbus - telepathy-glib - dbus-glib gtk3 json-glib librdf_raptor2 - python2Packages.rdflib + python3.pkgs.rdflib ]; configureFlags = [ - "--with-session-bus-services-dir=${placeholder "out"}/share/dbus-1/services" + "--disable-telepathy" ]; enableParallelBuilding = true; @@ -80,14 +76,14 @@ stdenv.mkDerivation rec { ''; postFixup = stdenv.lib.optionalString pythonSupport '' - moveToOutput lib/${python2Packages.python.libPrefix} "$py" + moveToOutput lib/${python3.libPrefix} "$py" ''; meta = with stdenv.lib; { description = "A service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; maintainers = with maintainers; [ lethalman worldofpeace ]; - license = licenses.gpl2; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } |