git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #83618 from NixOS/staging-next

Staging next

commite50c67ad7eefa8e77436fbd0366b69638b1c8713 authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateSun 5 Apr 2020, 13:13 (7 years ago) parentdf77ecc866c5aa
335 files changed+2127−2104
nixos/doc/manual/release-notes/rl-2009.xml+3 nixos/modules/config/gtk/gtk-icon-cache.nix+1−1 nixos/modules/i18n/input-method/ibus.nix+1−1 nixos/modules/services/desktops/gnome3/gnome-keyring.nix+2 nixos/modules/services/networking/rxe.nix+9−20 nixos/modules/services/x11/desktop-managers/gnome3.nix+7−8 nixos/tests/rxe.nix+1−1 pkgs/applications/accessibility/contrast/default.nix+1 pkgs/applications/audio/jackmix/default.nix+1−2 pkgs/applications/audio/mixxx/default.nix+2−1 pkgs/applications/audio/rhvoice/default.nix+1−1 pkgs/applications/audio/sound-juicer/default.nix−1 pkgs/applications/editors/aseprite/default.nix+2 pkgs/applications/editors/aseprite/skia.nix+10−2 pkgs/applications/editors/gnome-builder/default.nix+5−18 pkgs/applications/graphics/fluxus/default.nix+1−1 pkgs/applications/kde/kitinerary.nix+5−1 pkgs/applications/misc/orca/default.nix+2−2 pkgs/applications/networking/instant-messengers/swift-im/default.nix+1−1 pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix+11 pkgs/applications/networking/modem-manager-gui/default.nix+9 pkgs/applications/office/notes-up/default.nix+4−3 pkgs/applications/radio/airspy/default.nix+24−27 pkgs/applications/radio/dump1090/default.nix+2−2 pkgs/applications/radio/hackrf/default.nix+8−3 pkgs/applications/science/electronics/dsview/default.nix+2−2 pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix+2−2 pkgs/applications/version-management/git-and-tools/git/default.nix+9−2 pkgs/applications/video/bombono/default.nix+8−2 pkgs/applications/video/kodi/plugins.nix+3−4 pkgs/applications/window-managers/cage/default.nix+1−1 pkgs/build-support/rust/default.nix+2 pkgs/build-support/setup-hooks/patch-shebangs.sh+2−2 pkgs/data/misc/nixos-artwork/icons.nix+1−1 pkgs/data/misc/osinfo-db/default.nix+1−1 pkgs/data/themes/arc/default.nix+1−1 pkgs/desktops/deepin/deepin-terminal/default.nix+9−1 pkgs/desktops/deepin/go-gir-generator/default.nix+10−1 pkgs/desktops/gnome-3/apps/accerciser/default.nix+2−2 pkgs/desktops/gnome-3/apps/evolution/default.nix+2−2 pkgs/desktops/gnome-3/apps/file-roller/default.nix+2−2 pkgs/desktops/gnome-3/apps/gedit/default.nix+7−5 pkgs/desktops/gnome-3/apps/glade/default.nix+1−1 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+4−4 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+4−4 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+48−10 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-music/default.nix+4−2 pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+44−11 pkgs/desktops/gnome-3/apps/polari/default.nix+15−4 pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch+24 pkgs/desktops/gnome-3/apps/seahorse/default.nix+4−2 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2 pkgs/desktops/gnome-3/core/dconf-editor/default.nix+2−2 pkgs/desktops/gnome-3/core/eog/default.nix+2−2 pkgs/desktops/gnome-3/core/epiphany/default.nix+14−2 pkgs/desktops/gnome-3/core/evince/default.nix+2−2 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+2−2 pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch+2−2 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+11−12 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+4−6 pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch+56−44 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix+4−12 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix+3−4 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-session/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix+3−10 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix+4−4 pkgs/desktops/gnome-3/core/gnome-shell/default.nix+46−12 pkgs/desktops/gnome-3/core/gnome-software/default.nix+4−2 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+3−4 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+4−4 pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch−25 pkgs/desktops/gnome-3/core/mutter/default.nix+18−12 pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch+5−5 pkgs/desktops/gnome-3/core/nautilus/default.nix+2−2 pkgs/desktops/gnome-3/core/simple-scan/default.nix+2−2 pkgs/desktops/gnome-3/core/vino/default.nix−98 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix+2−2 pkgs/desktops/gnome-3/core/yelp/default.nix+2−2 pkgs/desktops/gnome-3/default.nix+5−5 pkgs/desktops/gnome-3/devtools/devhelp/default.nix+2−2 pkgs/desktops/gnome-3/extensions/appindicator/default.nix+2−2 pkgs/desktops/gnome-3/extensions/arc-menu/default.nix+4−4 pkgs/desktops/gnome-3/extensions/caffeine/default.nix+5−5 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix+5−4 pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix+3−3 pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix+5−5 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2−2 pkgs/desktops/gnome-3/extensions/impatience/default.nix+2−2 pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix+3−3 pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix+17−7 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix+2−2 pkgs/desktops/gnome-3/extensions/system-monitor/default.nix+4−1 pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix+3−1 pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix+2−1 pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix+2−2 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-chess/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-mines/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-robots/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix+2−2 pkgs/desktops/gnome-3/games/hitori/default.nix+2−2 pkgs/desktops/gnome-3/games/iagno/default.nix+2−2 pkgs/desktops/gnome-3/games/lightsoff/default.nix+2−2 pkgs/desktops/gnome-3/games/quadrapassel/default.nix+2−2 pkgs/desktops/gnome-3/games/tali/default.nix+2−2 pkgs/desktops/gnome-3/misc/geary/default.nix+15−8 pkgs/desktops/gnome-3/misc/gnome-applets/default.nix+2−4 pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix+62−3 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix+4−5 pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix−96 pkgs/desktops/gnome-3/misc/gpaste/default.nix+2−15 pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix+5−5 pkgs/desktops/gnome-3/misc/metacity/default.nix+2−2 pkgs/desktops/pantheon/apps/elementary-terminal/default.nix+10−1 pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix+3−3 pkgs/desktops/pantheon/services/cerbere/default.nix+2−2 pkgs/desktops/plasma-5/breeze-plymouth/default.nix+2−2 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix+3−3 pkgs/development/compilers/gcc/9/default.nix+2−8 pkgs/development/compilers/gcc/builder.sh+2−2 pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch+52 pkgs/development/compilers/rust/1_41_0.nix−48 pkgs/development/compilers/rust/1_42.nix+44 pkgs/development/compilers/rust/rustc.nix+2−2 pkgs/development/compilers/vala/default.nix+8−1 pkgs/development/go-packages/generic/default.nix+2 pkgs/development/interpreters/python/cpython/default.nix+2−1 pkgs/development/interpreters/python/default.nix+3−2 pkgs/development/interpreters/python/hooks/default.nix+8 pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh+40 pkgs/development/interpreters/python/mk-python-derivation.nix+4 pkgs/development/interpreters/python/sitecustomize.py+16−3 pkgs/development/interpreters/python/tests.nix+11−1 pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix+25 pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix+11 pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py+18 pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.py pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typed pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py+2 pkgs/development/interpreters/python/tests/test_python.py+3−3 pkgs/development/interpreters/python/wrapper.nix+1−1 pkgs/development/interpreters/spidermonkey/68.nix+95 pkgs/development/libraries/SDL2/default.nix+2−2 pkgs/development/libraries/aravis/default.nix+2−2 pkgs/development/libraries/aspell/default.nix+1 pkgs/development/libraries/at-spi2-core/default.nix+2−2 pkgs/development/libraries/atk/default.nix+3−3 pkgs/development/libraries/cogl/default.nix+2−2 pkgs/development/libraries/dconf/default.nix+4−13 pkgs/development/libraries/folks/default.nix+2−2 pkgs/development/libraries/freenect/default.nix+2−2 pkgs/development/libraries/gcr/default.nix+16−2 pkgs/development/libraries/gjs/default.nix+79−14 pkgs/development/libraries/gjs/fix-paths.patch+13 pkgs/development/libraries/gjs/installed-tests-path.patch+24 pkgs/development/libraries/glib-networking/default.nix+2−2 pkgs/development/libraries/glib/default.nix+2−12 pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch−11 pkgs/development/libraries/gmime/3.nix+10−6 pkgs/development/libraries/gnome-menus/default.nix+2−2 pkgs/development/libraries/gnome-online-accounts/default.nix+2−3 pkgs/development/libraries/gobject-introspection/default.nix+19−7 pkgs/development/libraries/gpgme/default.nix+16−1 pkgs/development/libraries/grilo-plugins/default.nix−1 pkgs/development/libraries/gsettings-desktop-schemas/default.nix+3−3 pkgs/development/libraries/gstreamer/bad/default.nix+7 pkgs/development/libraries/gstreamer/base/default.nix+4−1 pkgs/development/libraries/gstreamer/core/default.nix+4−1 pkgs/development/libraries/gtk/3.x.nix+5 pkgs/development/libraries/gtksourceview/3.x.nix+1−1 pkgs/development/libraries/gtksourceviewmm/default.nix−1 pkgs/development/libraries/gvfs/default.nix+2−2 pkgs/development/libraries/http-parser/default.nix+3−3 pkgs/development/libraries/indilib/default.nix+30−6 pkgs/development/libraries/json-glib/default.nix+1−1 pkgs/development/libraries/libbluray/default.nix+3−3 pkgs/development/libraries/libcroco/default.nix−32 pkgs/development/libraries/libdazzle/default.nix+3−3 pkgs/development/libraries/libdvdnav/default.nix+3−3 pkgs/development/libraries/libdvdread/default.nix+3−3 pkgs/development/libraries/libev/default.nix+2−2 pkgs/development/libraries/libevdev/default.nix+1−1 pkgs/development/libraries/libfprint/default.nix+2−2 pkgs/development/libraries/libgweather/default.nix+2−2 pkgs/development/libraries/libhandy/default.nix+1−1 pkgs/development/libraries/libinput/default.nix+7−7 pkgs/development/libraries/libirecovery/default.nix+2−2 pkgs/development/libraries/libmodulemd/default.nix+27−8 pkgs/development/libraries/libmodulemd/glib-devdoc.patch+13 pkgs/development/libraries/libmodulemd/pygobject-dir.patch−45 pkgs/development/libraries/libosinfo/default.nix+51−13 pkgs/development/libraries/libpeas/default.nix+2−2 pkgs/development/libraries/libpsl/default.nix+1 pkgs/development/libraries/librsvg/default.nix+5−5 pkgs/development/libraries/libsecret/default.nix+1−1 pkgs/development/libraries/libsoup/default.nix+3−3 pkgs/development/libraries/libssh/default.nix+5−3 pkgs/development/libraries/libuninameslist/default.nix+3−3 pkgs/development/libraries/libunwind/default.nix+5−1 pkgs/development/libraries/libusb/default.nix+18−4 pkgs/development/libraries/libuv/default.nix+2−2 pkgs/development/libraries/libvorbis/default.nix+1−1 pkgs/development/libraries/libwnck/3.x.nix+2−12 pkgs/development/libraries/libxml2/default.nix+5 pkgs/development/libraries/libzip/default.nix+3−3 pkgs/development/libraries/mesa/default.nix+14−4 pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch+10−11 pkgs/development/libraries/mesa/missing-includes.patch−11 pkgs/development/libraries/neon/default.nix+3−3 pkgs/development/libraries/nghttp2/default.nix+23−5 pkgs/development/libraries/pango/default.nix+1 pkgs/development/libraries/pcl/default.nix+3−3 pkgs/development/libraries/pipewire/2.nix+49 pkgs/development/libraries/pipewire/default.nix+19−9 pkgs/development/libraries/popt/default.nix+3−2 pkgs/development/libraries/qt-5/5.12/default.nix+5 pkgs/development/libraries/rarian/default.nix−1 pkgs/development/libraries/serf/default.nix+1−1 pkgs/development/libraries/swiften/default.nix+1−1 pkgs/development/libraries/tepl/default.nix+6−3 pkgs/development/libraries/tracker-miners/default.nix+2−3 pkgs/development/libraries/tracker/default.nix+2−3 pkgs/development/libraries/vte/default.nix+6−2 pkgs/development/libraries/webkitgtk/default.nix+13−2 pkgs/development/libraries/webkitgtk/libglvnd-headers.patch−574 pkgs/development/libraries/xdg-desktop-portal/default.nix+2−2 pkgs/development/python-modules/azure-cosmos/default.nix+1−3 pkgs/development/python-modules/azure-keyvault-keys/default.nix+2 pkgs/development/python-modules/azure-keyvault-secrets/default.nix+2 pkgs/development/python-modules/azure-keyvault/default.nix+2 pkgs/development/python-modules/azure-loganalytics/default.nix+1−3 pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix+1−3 pkgs/development/python-modules/azure-mgmt-batchai/default.nix+1−4 pkgs/development/python-modules/azure-mgmt-billing/default.nix+1−4 pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−5 pkgs/development/python-modules/azure-mgmt-consumption/default.nix+1−5 pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix+1−5 pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix+2−5 pkgs/development/python-modules/azure-mgmt-datamigration/default.nix+1−5 pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix+1−5 pkgs/development/python-modules/azure-mgmt-dns/default.nix+1−4 pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix+1−4 pkgs/development/python-modules/azure-mgmt-keyvault/default.nix+1−5 pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix+1−4 pkgs/development/python-modules/azure-mgmt-maps/default.nix+1−4 pkgs/development/python-modules/azure-mgmt-monitor/default.nix+1−4 pkgs/development/python-modules/azure-mgmt-msi/default.nix+1−5 pkgs/development/python-modules/azure-mgmt-relay/default.nix+1−5 pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix+1−5 pkgs/development/python-modules/azure-mgmt-storage/default.nix+4−7 pkgs/development/python-modules/azure-multiapi-storage/default.nix+2−5 pkgs/development/python-modules/cddb/default.nix+3−2 pkgs/development/python-modules/deskcon/default.nix+2−1 pkgs/development/python-modules/gateone/default.nix+2−1 pkgs/development/python-modules/gst-python/default.nix+28−40 pkgs/development/python-modules/httplib2/default.nix+2−2 pkgs/development/python-modules/mutag/default.nix+2−1 pkgs/development/python-modules/notmuch/default.nix+5−7 pkgs/development/python-modules/pygobject/3.nix+2−2 pkgs/development/python-modules/slob/default.nix+2−2 pkgs/development/python-modules/tkinter/default.nix+2−1 pkgs/development/tools/build-managers/gn/default.nix+18−12 pkgs/development/tools/build-managers/scons/common.nix+10−10 pkgs/development/tools/build-managers/scons/default.nix+3−3 pkgs/development/tools/build-managers/scons/print-statements.patch−13 pkgs/development/tools/build-managers/wafHook/setup-hook.sh+15−5 pkgs/development/tools/misc/elfutils/default.nix−35 pkgs/development/tools/nsis/default.nix+1−1 pkgs/development/tools/profiling/sysprof/default.nix+2−2 pkgs/development/tools/sunxi-tools/default.nix+2−2 pkgs/games/crispy-doom/default.nix+2−2 pkgs/games/tdm/default.nix+1−1 pkgs/games/vdrift/default.nix+2−2 pkgs/misc/drivers/utsushi/default.nix+2−2 pkgs/misc/drivers/xboxdrv/default.nix+2−2 pkgs/misc/drivers/xow/default.nix+2−2 pkgs/misc/emulators/dolphin-emu/default.nix+72−15 pkgs/misc/emulators/dolphin-emu/master.nix+2−2 pkgs/misc/frescobaldi/default.nix+1−1 pkgs/os-specific/linux/apparmor/cross.patch−19 pkgs/os-specific/linux/apparmor/default.nix+2−9 pkgs/os-specific/linux/bcc/default.nix+1−1 pkgs/os-specific/linux/bluez/default.nix+2−2 pkgs/os-specific/linux/ffado/default.nix+9−1 pkgs/os-specific/linux/iproute/default.nix+2−2 pkgs/os-specific/linux/net-tools/default.nix+2−2 pkgs/os-specific/linux/plymouth/default.nix+24−26 pkgs/os-specific/linux/rdma-core/default.nix+2−7 pkgs/os-specific/linux/udisks/2-default.nix+7−1 pkgs/servers/amqp/qpid-cpp/default.nix+4−3 pkgs/servers/gpsd/default.nix+1−1 pkgs/servers/headphones/default.nix+1−1 pkgs/servers/http/hyp/default.nix+3−3 pkgs/servers/nosql/mongodb/mongodb.nix+1−1 pkgs/servers/sickbeard/sickrage.nix+1−1 pkgs/tools/X11/arandr/default.nix+4−1 pkgs/tools/admin/azure-cli/python-packages.nix+3−10 pkgs/tools/admin/bubblewrap/default.nix+2−1 pkgs/tools/compression/lz4/default.nix+3−11 pkgs/tools/compression/xz/default.nix+3−3 pkgs/tools/filesystems/davfs2/default.nix+15 pkgs/tools/misc/ddcutil/default.nix+2−2 pkgs/tools/misc/gringo/default.nix+1−1 pkgs/tools/misc/mimeo/default.nix+2−2 pkgs/tools/misc/rpm-ostree/default.nix+4−2 pkgs/tools/misc/trash-cli/default.nix+1−2 pkgs/tools/misc/uhubctl/default.nix+2−2 pkgs/tools/misc/unicode/default.nix+1−1 pkgs/tools/networking/network-manager/default.nix+2−2 pkgs/tools/networking/unbound/default.nix+2−2 pkgs/tools/security/acsccid/default.nix+34−6 pkgs/tools/security/chipsec/default.nix+1−1 pkgs/tools/security/gnupg/22.nix+2−2 pkgs/tools/security/knockknock/default.nix+4−3 pkgs/tools/security/neopg/default.nix+3−3 pkgs/tools/security/sshuttle/default.nix+3−3 pkgs/tools/security/sudo/default.nix+4−4 pkgs/tools/typesetting/rubber/default.nix+2−2 pkgs/tools/video/vnc2flv/default.nix+3−3 pkgs/tools/virtualization/euca2ools/default.nix+2−2 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+8−7 pkgs/top-level/python-packages.nix+25−2
nixos/doc/manual/release-notes/rl-2009.xml+3
@@ -23,6 +23,9 @@
2323 Support is planned until the end of April 2021, handing over to 21.03.
2424 </para>
2525 </listitem>
26+ <listitem>
27+ <para>GNOME desktop environment was upgraded to 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.</para>
28+ </listitem>
2629 <listitem>
2730 <para>
2831 PHP now defaults to PHP 7.4, updated from 7.3.
nixos/modules/config/gtk/gtk-icon-cache.nix+1−1
@@ -77,7 +77,7 @@ with lib;
7777
7878 if [ -w "$themedir" ]; then
7979 rm -f "$themedir"/icon-theme.cache
80− ${pkgs.gtk3.out}/bin/gtk-update-icon-cache --ignore-theme-index "$themedir"
80+ ${pkgs.buildPackages.gtk3.out}/bin/gtk-update-icon-cache --ignore-theme-index "$themedir"
8181 fi
8282 done
8383 '';
nixos/modules/i18n/input-method/ibus.nix+1−1
@@ -76,7 +76,7 @@ in
7676 XMODIFIERS = "@im=ibus";
7777 };
7878
79− xdg.portal.extraPortals = mkIf xdg.portal.enable [
79+ xdg.portal.extraPortals = mkIf config.xdg.portal.enable [
8080 ibusPackage
8181 ];
8282 };
nixos/modules/services/desktops/gnome3/gnome-keyring.nix+2
@@ -39,6 +39,8 @@ with lib;
3939
4040 services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ];
4141
42+ xdg.portal.extraPortals = [ pkgs.gnome3.gnome-keyring ];
43+
4244 security.pam.services.login.enableGnomeKeyring = true;
4345
4446 security.wrappers.gnome-keyring-daemon = {
nixos/modules/services/networking/rxe.nix+9−20
@@ -5,20 +5,6 @@ with lib;
55let
66 cfg = config.networking.rxe;
77
8− runRxeCmd = cmd: ifcs:
9− concatStrings ( map (x: "${pkgs.rdma-core}/bin/rxe_cfg -n ${cmd} ${x};") ifcs);
10−
11− startScript = pkgs.writeShellScriptBin "rxe-start" ''
12− ${pkgs.rdma-core}/bin/rxe_cfg -n start
13− ${runRxeCmd "add" cfg.interfaces}
14− ${pkgs.rdma-core}/bin/rxe_cfg
15− '';
16−
17− stopScript = pkgs.writeShellScriptBin "rxe-stop" ''
18− ${runRxeCmd "remove" cfg.interfaces }
19− ${pkgs.rdma-core}/bin/rxe_cfg -n stop
20− '';
21−
228in {
239 ###### interface
2410
@@ -31,9 +17,8 @@ in {
3117 example = [ "eth0" ];
3218 description = ''
3319 Enable RDMA on the listed interfaces. The corresponding virtual
34− RDMA interfaces will be named rxe0 ... rxeN where the ordering
35− will be as they are named in the list. UDP port 4791 must be
36− open on the respective ethernet interfaces.
20+ RDMA interfaces will be named rxe_<interface>.
21+ UDP port 4791 must be open on the respective ethernet interfaces.
3722 '';
3823 };
3924 };
@@ -44,7 +29,6 @@ in {
4429 config = mkIf cfg.enable {
4530
4631 systemd.services.rxe = {
47− path = with pkgs; [ kmod rdma-core ];
4832 description = "RoCE interfaces";
4933
5034 wantedBy = [ "multi-user.target" ];
@@ -54,8 +38,13 @@ in {
5438 serviceConfig = {
5539 Type = "oneshot";
5640 RemainAfterExit = true;
57− ExecStart = "${startScript}/bin/rxe-start";
58− ExecStop = "${stopScript}/bin/rxe-stop";
41+ ExecStart = map ( x:
42+ "${pkgs.iproute}/bin/rdma link add rxe_${x} type rxe netdev ${x}"
43+ ) cfg.interfaces;
44+
45+ ExecStop = map ( x:
46+ "${pkgs.iproute}/bin/rdma link delete rxe_${x}"
47+ ) cfg.interfaces;
5948 };
6049 };
6150 };
nixos/modules/services/x11/desktop-managers/gnome3.nix+7−8
@@ -184,7 +184,7 @@ in
184184 wmCommand = "${pkgs.gnome3.metacity}/bin/metacity";
185185 } ++ cfg.flashback.customSessions);
186186
187− security.pam.services.gnome-screensaver = {
187+ security.pam.services.gnome-flashback = {
188188 enableGnomeKeyring = true;
189189 };
190190
@@ -195,9 +195,10 @@ in
195195 inherit (wm) wmName;
196196 }) cfg.flashback.customSessions);
197197
198− services.dbus.packages = [
199− pkgs.gnome3.gnome-screensaver
200− ];
198+ # gnome-panel needs these for menu applet
199+ environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gnome-flashback}/share" ];
200+ # TODO: switch to sessionVariables (resolve conflict)
201+ environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome3.gnome-flashback}/etc/xdg" ];
201202 })
202203
203204 (mkIf serviceCfg.core-os-services.enable {
@@ -256,7 +257,6 @@ in
256257 systemd.packages = with pkgs.gnome3; [
257258 gnome-session
258259 gnome-shell
259− vino
260260 ];
261261
262262 services.avahi.enable = mkDefault true;
@@ -308,7 +308,7 @@ in
308308 environment = mkForce {};
309309 };
310310
311− # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst
311+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-shell.bst
312312 environment.systemPackages = with pkgs.gnome3; [
313313 adwaita-icon-theme
314314 gnome-backgrounds
@@ -327,11 +327,10 @@ in
327327 pkgs.hicolor-icon-theme
328328 pkgs.shared-mime-info # for update-mime-database
329329 pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
330− vino
331330 ];
332331 })
333332
334− # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-utilities.bst
333+ # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-utilities.bst
335334 (mkIf serviceCfg.core-utilities.enable {
336335 environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
337336 baobab
nixos/tests/rxe.nix+1−1
@@ -28,7 +28,7 @@ in {
2828 # Test if rxe interface comes up
2929 server.wait_for_unit("default.target")
3030 server.succeed("systemctl status rxe.service")
31− server.succeed("ibv_devices | grep rxe0")
31+ server.succeed("ibv_devices | grep rxe_eth1")
3232
3333 client.wait_for_unit("default.target")
3434
pkgs/applications/accessibility/contrast/default.nix+1
@@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec {
4040 pkgconfig
4141 python3
4242 wrapGAppsHook
43+ glib # for glib-compile-resources
4344 ];
4445
4546 buildInputs = [
pkgs/applications/audio/jackmix/default.nix+1−2
@@ -9,9 +9,8 @@ stdenv.mkDerivation {
99
1010 patches = [ ./no_error.patch ];
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ scons.py2 pkgconfig ];
1313 buildInputs = [
14− scons
1514 qt4
1615 lash
1716 jack
pkgs/applications/audio/mixxx/default.nix+2−1
@@ -28,10 +28,11 @@ mkDerivation rec {
2828 sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv";
2929 };
3030
31+ nativeBuildInputs = [ scons.py2 ];
3132 buildInputs = [
3233 chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile
3334 libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
34− qtx11extras rubberband scons sqlite taglib upower vamp-plugin-sdk
35+ qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk
3536 ];
3637
3738 enableParallelBuilding = true;
pkgs/applications/audio/rhvoice/default.nix+1−1
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
1515 };
1616
1717 nativeBuildInputs = [
18− scons pkgconfig
18+ scons.py2 pkgconfig
1919 ];
2020
2121 buildInputs = [
pkgs/applications/audio/sound-juicer/default.nix−1
@@ -27,7 +27,6 @@ in stdenv.mkDerivation rec{
2727 passthru = {
2828 updateScript = gnome3.updateScript {
2929 packageName = pname;
30− attrPath = "gnome3.${pname}";
3130 };
3231 };
3332
pkgs/applications/editors/aseprite/default.nix+2
@@ -98,6 +98,8 @@ stdenv.mkDerivation rec {
9898
9999 enableParallelBuilding = true;
100100
101+ passthru = { inherit skia; };
102+
101103 meta = with lib; {
102104 homepage = https://www.aseprite.org/;
103105 description = "Animated sprite editor & pixel art tool";
pkgs/applications/editors/aseprite/skia.nix+10−2
@@ -6,6 +6,14 @@
66let
77 # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly'
88 depSrcs = import ./skia-deps.nix { inherit fetchgit; };
9+ gnOld = gn.overrideAttrs (oldAttrs: rec {
10+ version = "20190403";
11+ src = fetchgit {
12+ url = "https://gn.googlesource.com/gn";
13+ rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b";
14+ sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy";
15+ };
16+ });
917in
1018stdenv.mkDerivation {
1119 name = "skia-aseprite-m71";
@@ -14,11 +22,11 @@ stdenv.mkDerivation {
1422 owner = "aseprite";
1523 repo = "skia";
1624 # latest commit from aseprite-m71 branch
17− rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2";
25+ rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; # TODO: Remove the gnOld override
1826 sha256 = "0n3vrkswvi6rib9zv2pzi18h3j5wm7flmgkgaikcm6q7iw4l2c7x";
1927 };
2028
21− nativeBuildInputs = [ python2 gn ninja ];
29+ nativeBuildInputs = [ python2 gnOld ninja ];
2230
2331 buildInputs = [
2432 fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib
pkgs/applications/editors/gnome-builder/default.nix+5−18
@@ -5,7 +5,6 @@
55, docbook_xsl
66, docbook_xml_dtd_43
77, fetchurl
8−, fetchpatch
98, flatpak
109, gnome3
1110, libgit2-glib
@@ -18,6 +17,7 @@
1817, jsonrpc-glib
1918, libdazzle
2019, libpeas
20+, libportal
2121, libxml2
2222, meson
2323, ninja
@@ -39,25 +39,13 @@
3939
4040stdenv.mkDerivation rec {
4141 pname = "gnome-builder";
42− version = "3.34.1";
42+ version = "3.36.0";
4343
4444 src = fetchurl {
4545 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
46− sha256 = "19018pq94cxf6fywd7fsmy98x56by5zfmh140pl530gaaw84cvhb";
46+ sha256 = "G0nl6DVzb3k6cN2guFIe/XNhFNhKbaq5e8wz62VA0Qo=";
4747 };
4848
49− patches = [
50− # Fix build with Meson 0.52
51− (fetchpatch {
52− url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f.patch";
53− sha256 = "0n8kg7nnjqmbnyag1ps6dvrlqrxc94djjncqx10d6y7ijwdxf4w8";
54− })
55− (fetchpatch {
56− url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/da26dfbf78468f5ed724e022b300a07862a95833.patch";
57− sha256 = "0psa65bzjpjj7vc5rknv2w2dz3p50jjv10s6j2fd6lpw8j2800k4";
58− })
59− ];
60−
6149 nativeBuildInputs = [
6250 appstream-glib
6351 desktop-file-utils
@@ -65,7 +53,7 @@ stdenv.mkDerivation rec {
6553 docbook_xml_dtd_43
6654 gobject-introspection
6755 gtk-doc
68− (meson.override ({ inherit stdenv; }))
56+ meson
6957 ninja
7058 pkgconfig
7159 python3
@@ -80,6 +68,7 @@ stdenv.mkDerivation rec {
8068 gnome3.glade
8169 libgit2-glib
8270 libpeas
71+ libportal
8372 vte
8473 gspell
8574 gtk3
@@ -109,8 +98,6 @@ stdenv.mkDerivation rec {
10998 patchShebangs build-aux/meson/post_install.py
11099 '';
111100
112− NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
113−
114101 mesonFlags = [
115102 "-Dpython_libprefix=${python3.libPrefix}"
116103 "-Ddocs=true"
pkgs/applications/graphics/fluxus/default.nix+1−1
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
6969 openssl.dev
7070 racket
7171 ];
72− nativeBuildInputs = [ scons ];
72+ nativeBuildInputs = [ scons.py2 ];
7373
7474 patches = [ ./fix-build.patch ];
7575 sconsFlags = [
pkgs/applications/kde/kitinerary.nix+5−1
@@ -2,6 +2,7 @@
22 mkDerivation, lib, extra-cmake-modules
33, qtbase, qtdeclarative, ki18n, kmime, kpkpass
44, poppler, kcontacts, kcalendarcore
5+, shared-mime-info
56}:
67
78mkDerivation {
@@ -10,7 +11,10 @@ mkDerivation {
1011 license = with lib.licenses; [ lgpl21 ];
1112 maintainers = [ lib.maintainers.bkchr ];
1213 };
13− nativeBuildInputs = [ extra-cmake-modules ];
14+ nativeBuildInputs = [
15+ extra-cmake-modules
16+ shared-mime-info # for update-mime-database
17+ ];
1418 buildInputs = [
1519 qtbase qtdeclarative ki18n kmime kpkpass poppler
1620 kcontacts kcalendarcore
pkgs/applications/misc/orca/default.nix+2−2
@@ -35,13 +35,13 @@
3535
3636buildPythonApplication rec {
3737 pname = "orca";
38− version = "3.34.2";
38+ version = "3.36.0";
3939
4040 format = "other";
4141
4242 src = fetchurl {
4343 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
44− sha256 = "0aaagz8mxvfigrsdbmg22q44vf5yhkbw4rh4cnizysbfvijk4dan";
44+ sha256 = "0yrkl0j1mm4fd5zib8jvbfgm2iyanlx05vhhnmjcmvpm464c7pf9";
4545 };
4646
4747 patches = [
pkgs/applications/networking/instant-messengers/swift-im/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 patches = [ ./qt-5.11.patch ./scons.patch ];
1616
17− nativeBuildInputs = [ pkgconfig qttools scons ];
17+ nativeBuildInputs = [ pkgconfig qttools scons.py2 ];
1818
1919 buildInputs = [
2020 GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix+11
@@ -1,5 +1,6 @@
11{ stdenv
22, fetchurl
3+, fetchpatch
34, pkgconfig
45, dconf
56, telepathy-glib
@@ -19,6 +20,16 @@ stdenv.mkDerivation rec {
1920 sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc";
2021 };
2122
23+ patches = [
24+ # Fix property name (new GLib is stricter)
25+ # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939
26+ # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141
27+ (fetchpatch {
28+ url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch";
29+ sha256 = "Sw+V5QcWQ5zugwTTdkwa3pqV+v5XD0OhH6xI5ymgkOU=";
30+ })
31+ ];
32+
2233 buildInputs = [
2334 python3
2435 ]; # ToDo: optional stuff missing
pkgs/applications/networking/modem-manager-gui/default.nix+9
@@ -2,6 +2,7 @@
22, pkgconfig
33, python3
44, fetchhg
5+, fetchpatch
56, gtk3
67, glib
78, gdbm
@@ -25,6 +26,14 @@ stdenv.mkDerivation rec {
2526 sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd";
2627 };
2728
29+ patches = [
30+ # Fix docs build
31+ (fetchpatch {
32+ url = "https://bitbucket.org/linuxonly/modem-manager-gui/commits/68fb09c12413b7de9b7477cbf4241c3527568325/raw";
33+ sha256 = "58XIT/RTZ9sjUK2e47h+SqpRWhQ2vbKb2h9MKiHNdgw=";
34+ })
35+ ];
36+
2837 nativeBuildInputs = [
2938 pkgconfig
3039 python3
pkgs/applications/office/notes-up/default.nix+4−3
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, pantheon
44, pkgconfig
5−, vala
5+, vala_0_46
66, cmake
77, ninja
88, gtk3
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
3030 nativeBuildInputs = [
3131 cmake
3232 ninja
33− vala
33+ # fails with newer vala: https://github.com/Philip-Scott/Notes-up/issues/349
34+ vala_0_46
3435 pkgconfig
3536 wrapGAppsHook
3637 ];
@@ -59,7 +60,7 @@ stdenv.mkDerivation rec {
5960 meta = with stdenv.lib; {
6061 description = "Markdown notes editor and manager designed for elementary OS"
6162 + stdenv.lib.optionalString withPantheon " - built with Contractor support";
62− homepage = https://github.com/Philip-Scott/Notes-up;
63+ homepage = "https://github.com/Philip-Scott/Notes-up";
6364 license = licenses.gpl2;
6465 maintainers = with maintainers; [ davidak worldofpeace ];
6566 platforms = platforms.linux;
pkgs/applications/radio/airspy/default.nix+24−27
@@ -1,36 +1,33 @@
11{ stdenv, lib, fetchFromGitHub
2−, cmake , pkgconfig, libusb
2+, cmake , pkgconfig, libusb1
33}:
44
5−let
5+stdenv.mkDerivation rec {
6+ pname = "airspy";
67 version = "1.0.9";
7−in
8− stdenv.mkDerivation {
9− pname = "airspy";
10− inherit version;
118
12− src = fetchFromGitHub {
13− owner = "airspy";
14− repo = "airspyone_host";
15− rev = "v${version}";
16− sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x";
17− };
9+ src = fetchFromGitHub {
10+ owner = "airspy";
11+ repo = "airspyone_host";
12+ rev = "v${version}";
13+ sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x";
14+ };
1815
19− postPatch = ''
20− substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d"
21− '';
16+ postPatch = ''
17+ substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d"
18+ '';
2219
23− nativeBuildInputs = [ cmake pkgconfig ];
24− buildInputs = [ libusb ];
20+ nativeBuildInputs = [ cmake pkgconfig ];
21+ buildInputs = [ libusb1 ];
2522
26− cmakeFlags =
27− lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ];
23+ cmakeFlags =
24+ lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ];
2825
29− meta = with stdenv.lib; {
30− homepage = https://github.com/airspy/airspyone_host;
31− description = "Host tools and driver library for the AirSpy SDR";
32− license = licenses.bsd3;
33− platforms = with platforms; linux ++ darwin;
34− maintainers = with maintainers; [ markuskowa ];
35− };
36− }
26+ meta = with stdenv.lib; {
27+ homepage = https://github.com/airspy/airspyone_host;
28+ description = "Host tools and driver library for the AirSpy SDR";
29+ license = licenses.bsd3;
30+ platforms = with platforms; linux ++ darwin;
31+ maintainers = with maintainers; [ markuskowa ];
32+ };
33+}
pkgs/applications/radio/dump1090/default.nix+2−2
@@ -2,7 +2,7 @@
22, fetchFromGitHub
33, pkgconfig
44, libbladeRF
5−, libusb
5+, libusb1
66, ncurses
77, rtl-sdr
88}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 buildInputs = [
2424 libbladeRF
25− libusb
25+ libusb1
2626 ncurses
2727 rtl-sdr
2828 ];
pkgs/applications/radio/hackrf/default.nix+8−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }:
1+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, fftwSinglePrec }:
22
33stdenv.mkDerivation rec {
44 pname = "hackrf";
@@ -11,9 +11,14 @@ stdenv.mkDerivation rec {
1111 sha256 = "0idh983xh6gndk9kdgx5nzz76x3mxb42b02c5xvdqahadsfx3b9w";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [
15+ cmake
16+ pkgconfig
17+ ];
18+
1519 buildInputs = [
16− cmake libusb fftwSinglePrec
20+ libusb1
21+ fftwSinglePrec
1722 ];
1823
1924 cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ];
pkgs/applications/science/electronics/dsview/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, pkgconfig, cmake,
22libzip, boost, fftw, qtbase,
3−libusb, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
3+libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl
44}:
55
66stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
2828
2929 buildInputs = [
30− boost fftw qtbase libusb libzip libsigrokdecode4dsl libsigrok4dsl
30+ boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
3131 ];
3232
3333 enableParallelBuilding = true;
pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, pkgconfig, autoreconfHook,
2−glib, libzip, libserialport, check, libusb, libftdi,
2+glib, libzip, libserialport, check, libusb1, libftdi,
33systemd, alsaLib, dsview
44}:
55
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
1515 nativeBuildInputs = [ pkgconfig autoreconfHook ];
1616
1717 buildInputs = [
18− glib libzip libserialport libusb libftdi systemd check alsaLib
18+ glib libzip libserialport libusb1 libftdi systemd check alsaLib
1919 ];
2020
2121 meta = with stdenv.lib; {
pkgs/applications/version-management/git-and-tools/git/default.nix+9−2
@@ -95,7 +95,15 @@ stdenv.mkDerivation {
9595 ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
9696 ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"])
9797 ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"]
98− ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1";
98+ ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1"
99+ # git-gui refuses to start with the version of tk distributed with
100+ # macOS Catalina. We can prevent git from building the .app bundle
101+ # by specifying an invalid tk framework. The postInstall step will
102+ # then ensure that git-gui uses tcl/tk from nixpkgs, which is an
103+ # acceptable version.
104+ #
105+ # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
106+ ++ stdenv.lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent";
99107
100108
101109 postBuild = ''
@@ -232,7 +240,6 @@ stdenv.mkDerivation {
232240 for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
233241 sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
234242 -e "s|exec wish|exec '${tk}/bin/wish'|g" \
235− -e "s|exec \"[^\"]*/MacOS/Wish\"|exec '${tk}/bin/wish'|g" \
236243 "$out/$prog"
237244 done
238245 ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk
pkgs/applications/video/bombono/default.nix+8−2
@@ -17,7 +17,13 @@ stdenv.mkDerivation rec {
1717 sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9";
1818 };
1919
20− patches = map fetchPatchFromAur [
20+ patches = [
21+ (fetchpatch {
22+ name = "bombono-dvd-1.2.4-scons3.patch";
23+ url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457";
24+ sha256 = "081116d0if6s2r1rgqfr1n5gl3kpvzk01pf4v2k7gg2rnid83qp4";
25+ })
26+ ] ++ (map fetchPatchFromAur [
2127 {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
2228 {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
2329 {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
@@ -26,7 +32,7 @@ stdenv.mkDerivation rec {
2632 {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
2733 {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
2834 {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
29− ];
35+ ]);
3036
3137 nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
3238
pkgs/applications/video/kodi/plugins.nix+3−4
@@ -1,6 +1,6 @@
11{ stdenv, callPackage, fetchFromGitHub
22, cmake, kodiPlain, libcec_platform, tinyxml, rapidxml
3−, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
3+, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib
44, python2Packages, expat, glib, nspr, nss, openssl
55, libssh, libarchive, lzma, bzip2, lz4, lzo }:
66
@@ -236,8 +236,7 @@ let self = rec {
236236 maintainers = with maintainers; [ edwtjo ];
237237 };
238238
239− extraBuildInputs = [ libusb pcre-cpp ];
240−
239+ extraBuildInputs = [ udev ];
241240 };
242241
243242 simpleplugin = mkKodiPlugin rec {
@@ -300,7 +299,7 @@ let self = rec {
300299 sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279";
301300 };
302301
303− extraBuildInputs = [ libusb ];
302+ extraBuildInputs = [ libusb1 ];
304303
305304 meta = {
306305 description = "Binary addon for steam controller.";
pkgs/applications/window-managers/cage/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 sha256 = "1gkqx26pvlw00b3fgx6sh87yyjfzyj51jwxvbf9k117npkrf4b2g";
2323 };
2424
25− nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ];
25+ nativeBuildInputs = [ meson ninja pkgconfig makeWrapper wayland ];
2626
2727 buildInputs = [
2828 wlroots wayland wayland-protocols pixman libxkbcommon
pkgs/build-support/rust/default.nix+2
@@ -181,6 +181,8 @@ stdenv.mkDerivation (args // {
181181
182182 doCheck = args.doCheck or true;
183183
184+ strictDeps = true;
185+
184186 inherit releaseDir;
185187
186188 installPhase = args.installPhase or ''
pkgs/build-support/setup-hooks/patch-shebangs.sh+2−2
@@ -42,7 +42,7 @@ patchShebangs() {
4242 local newInterpreterLine
4343
4444 if [ $# -eq 0 ]; then
45− echo "No arguments supplied to patchShebangs" >0
45+ echo "No arguments supplied to patchShebangs" >&2
4646 return 0
4747 fi
4848
@@ -66,7 +66,7 @@ patchShebangs() {
6666 # - options: something starting with a '-'
6767 # - environment variables: foo=bar
6868 if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
69− echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >0
69+ echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >&2
7070 exit 1
7171 fi
7272
pkgs/data/misc/nixos-artwork/icons.nix+1−1
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
99 sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a";
1010 };
1111 makeFlags = [ "DESTDIR=$(out)" "prefix=" ];
12− buildInputs = [ imagemagick ];
12+ nativeBuildInputs = [ imagemagick ];
1313}
pkgs/data/misc/osinfo-db/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 meta = with stdenv.lib; {
2121 description = "Osinfo database of information about operating systems for virtualization provisioning tools";
22− homepage = "https://libosinfo.org/";
22+ homepage = "https://gitlab.com/libosinfo/osinfo-db/";
2323 license = licenses.gpl2Plus;
2424 platforms = platforms.linux;
2525 maintainers = [ maintainers.bjornfor ];
pkgs/data/themes/arc/default.nix+1−1
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
3434 '';
3535
3636 configureFlags = [
37− "--with-gnome-shell=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}"
37+ "--disable-gnome-shell" # 3.36 not supported
3838 "--disable-unity"
3939 ];
4040
pkgs/desktops/deepin/deepin-terminal/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_40,
1+{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_40, fetchpatch,
22 gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
33 libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
44 libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2,
@@ -15,6 +15,14 @@ stdenv.mkDerivation rec {
1515 sha256 = "1929saj828b438d07caw3cjhqq60v6gni7mi3fqrg9wdjz81xwv7";
1616 };
1717
18+ patches = [
19+ # Fix build with VTE 0.60
20+ (fetchpatch {
21+ url = "https://github.com/linuxdeepin/deepin-terminal/commit/542d1035b609698ee81aa7971d20ca8e5930743d.patch";
22+ sha256 = "1pihiy70yc25fm5fx7i7v9gmi65v4mhldvi7xwv8rgr2z6hbfj41";
23+ })
24+ ];
25+
1826 nativeBuildInputs = [
1927 pkgconfig
2028 cmake
pkgs/desktops/deepin/go-gir-generator/default.nix+10−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, go, gobject-introspection,
1+{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, go, gobject-introspection,
22 libgudev, deepin }:
33
44stdenv.mkDerivation rec {
@@ -12,6 +12,15 @@ stdenv.mkDerivation rec {
1212 sha256 = "1ydzll8zlk897iqcihvv6p046p0rzr4qqz2drmz2nx95njp8n03a";
1313 };
1414
15+ patches = [
16+ # Fix compatibility with glib 2.63+
17+ # https://github.com/linuxdeepin/go-gir-generator/pull/11
18+ (fetchpatch {
19+ url = "https://github.com/linuxdeepin/go-gir-generator/commit/7dea15a1a491f28d2ac8c411068ccefeba01aae3.patch";
20+ sha256 = "7bn/mtruCcK+AIXMzhN2e3o7CuzuJ3mtTz0HOTEYTaA=";
21+ })
22+ ];
23+
1524 nativeBuildInputs = [
1625 pkgconfig
1726 go
pkgs/desktops/gnome-3/apps/accerciser/default.nix+2−2
@@ -17,13 +17,13 @@
1717
1818 python3.pkgs.buildPythonApplication rec {
1919 name = "accerciser-${version}";
20− version = "3.34.4";
20+ version = "3.36.0";
2121
2222 format = "other";
2323
2424 src = fetchurl {
2525 url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
26− sha256 = "0f1dixq5hc55dl3y0fr85bkrc2zk08n4dacqcjifij1dys4ks3z1";
26+ sha256 = "1iwi7mnayw1f90s439flh0zkgmj4qx10dzgj38nd5f3wvqmhabk3";
2727 };
2828
2929 nativeBuildInputs = [
pkgs/desktops/gnome-3/apps/evolution/default.nix+2−2
@@ -43,11 +43,11 @@
4343
4444stdenv.mkDerivation rec {
4545 pname = "evolution";
46− version = "3.34.4";
46+ version = "3.36.0";
4747
4848 src = fetchurl {
4949 url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
50− sha256 = "136vpaq94ymyn8pf3a3z1w45xlk1xbvwjdnzasq0d7iwbac0jwks";
50+ sha256 = "0ylqvg52s6vc9xmyizcv3im66ra8xixzrfgn7hsmp12fg47na5vj";
5151 };
5252
5353 nativeBuildInputs = [
pkgs/desktops/gnome-3/apps/file-roller/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "file-roller";
6− version = "3.32.4";
6+ version = "3.36.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "05s046br4fcli1d3wngh4jmwi0aikpfkl1px1cahskj4rfzjqfqv";
10+ sha256 = "0y04y58sbggsgqzmxkb6q7300bdzf30w40yp57n87x9nypl4s55r";
1111 };
1212
1313 LANG = "en_US.UTF-8"; # postinstall.py
pkgs/desktops/gnome-3/apps/gedit/default.nix+7−5
@@ -1,20 +1,21 @@
11{ stdenv, meson, fetchurl, python3
22, pkgconfig, gtk3, glib, adwaita-icon-theme
33, libpeas, gtksourceview4, gsettings-desktop-schemas
4−, wrapGAppsHook, ninja, libsoup, libxml2
5−, gnome3, gspell, perl, itstool, desktop-file-utils }:
4+, wrapGAppsHook, ninja, libsoup, tepl
5+, gnome3, gspell, perl, itstool, desktop-file-utils
6+}:
67
78stdenv.mkDerivation rec {
89 pname = "gedit";
9− version = "3.34.1";
10+ version = "3.36.0";
1011
1112 src = fetchurl {
1213 url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "1inm50sdfw63by1lf4f1swb59mpyxlly0g5rdg99j5l3357fzygb";
14+ sha256 = "0dclapyghbkg15cjcf6nljcyy4980ipjw1m3mbqpmnz9lh9dv0y9";
1415 };
1516
1617 nativeBuildInputs = [
17− pkgconfig wrapGAppsHook meson ninja libxml2
18+ pkgconfig wrapGAppsHook meson ninja
1819 python3 perl itstool desktop-file-utils
1920 ];
2021
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
2324 adwaita-icon-theme libsoup
2425 libpeas gtksourceview4
2526 gsettings-desktop-schemas gspell
27+ tepl
2628 ];
2729
2830 postPatch = ''
pkgs/desktops/gnome-3/apps/glade/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 };
1818
1919 nativeBuildInputs = [
20− pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobject-introspection
20+ pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection
2121 ];
2222 buildInputs = [
2323 gtk3 glib libxml2 python3 python3.pkgs.pygobject3
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+4−4
@@ -34,7 +34,7 @@
3434, mtools
3535, cdrkit
3636, libcdio
37−, libusb
37+, libusb1
3838, libarchive
3939, acl
4040, libgudev
@@ -51,11 +51,11 @@
5151
5252stdenv.mkDerivation rec {
5353 pname = "gnome-boxes";
54− version = "3.34.4";
54+ version = "3.36.0";
5555
5656 src = fetchurl {
5757 url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
58− sha256 = "1bqrl36nngbd8jpj31ipnywg2k0rg2j3bcgnyvn8r86ysh1gnm0f";
58+ sha256 = "0saxz2mwp7y348izzgp7mmp6vnv5zi57x5rbsyag8s7pd7yp211n";
5959 };
6060
6161 doCheck = true;
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
9999 librsvg
100100 libsecret
101101 libsoup
102− libusb
102+ libusb1
103103 libvirt
104104 libvirt-glib
105105 libxml2
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+4−4
@@ -1,16 +1,16 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
22, gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup
3−, glib, gnome-online-accounts, gsettings-desktop-schemas }:
3+, glib, gnome-online-accounts, gsettings-desktop-schemas, libhandy }:
44
55let
66 pname = "gnome-calendar";
7− version = "3.34.2";
7+ version = "3.36.0";
88in stdenv.mkDerivation rec {
99 name = "${pname}-${version}";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "1bnmd191044zn2kr6f5vg7sm5q59qf7z652awll1f7s6ahijr8rw";
13+ sha256 = "1cxy4qf83s8w1ys94rcc4ksf7ywi0hkkpfs0szkkip2v8g3j6kq2";
1414 };
1515
1616 passthru = {
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323 nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
2424 buildInputs = [
2525 gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
26− gsettings-desktop-schemas gnome3.adwaita-icon-theme
26+ gsettings-desktop-schemas gnome3.adwaita-icon-theme libhandy
2727 ];
2828
2929 postPatch = ''
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+48−10
@@ -1,16 +1,37 @@
1−{ stdenv, fetchurl
2−, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
3−, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
4−, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib
5−, gnome3, gdk-pixbuf, geoclue2, libgweather }:
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, gettext
6+, pkgconfig
7+, wrapGAppsHook
8+, itstool
9+, desktop-file-utils
10+, vala
11+, gobject-introspection
12+, libxml2
13+, gtk3
14+, glib
15+, gsound
16+, sound-theme-freedesktop
17+, gsettings-desktop-schemas
18+, adwaita-icon-theme
19+, gnome-desktop
20+, geocode-glib
21+, gnome3
22+, gdk-pixbuf
23+, geoclue2
24+, libgweather
25+, libhandy
26+}:
627
728stdenv.mkDerivation rec {
829 pname = "gnome-clocks";
9− version = "3.34.0";
30+ version = "3.36.0";
1031
1132 src = fetchurl {
1233 url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "0g7hjk55smhkd09hwa9kag3h5a12l494wj89w9smpdk3ghsmy6b1";
34+ sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc";
1435 };
1536
1637 passthru = {
@@ -23,12 +44,29 @@ stdenv.mkDerivation rec {
2344 doCheck = true;
2445
2546 nativeBuildInputs = [
26− vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils libxml2
47+ vala
48+ meson
49+ ninja
50+ pkgconfig
51+ gettext
52+ itstool
53+ wrapGAppsHook
54+ desktop-file-utils
55+ libxml2
2756 gobject-introspection # for finding vapi files
2857 ];
2958 buildInputs = [
30− gtk3 glib gsettings-desktop-schemas gdk-pixbuf adwaita-icon-theme
31− gnome-desktop geocode-glib geoclue2 libgweather gsound
59+ gtk3
60+ glib
61+ gsettings-desktop-schemas
62+ gdk-pixbuf
63+ adwaita-icon-theme
64+ gnome-desktop
65+ geocode-glib
66+ geoclue2
67+ libgweather
68+ gsound
69+ libhandy
3270 ];
3371
3472 preFixup = ''
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+2−2
@@ -5,13 +5,13 @@
55
66let
77 pname = "gnome-maps";
8− version = "3.34.3";
8+ version = "3.36.0";
99in stdenv.mkDerivation rec {
1010 name = "${pname}-${version}";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "1p58il8dqj96nlv41gf926y8nw6ya15vmv9yr52025sizxaqzydw";
14+ sha256 = "0kyd4f15bj409mhs97i94ggzwqdj3r3yjdmvvkn80pym0vw1xik5";
1515 };
1616
1717 doCheck = true;
pkgs/desktops/gnome-3/apps/gnome-music/default.nix+4−2
@@ -16,6 +16,7 @@
1616, grilo-plugins
1717, pkgconfig
1818, gtk3
19+, pango
1920, glib
2021, desktop-file-utils
2122, appstream-glib
@@ -29,13 +30,13 @@
2930
3031python3.pkgs.buildPythonApplication rec {
3132 pname = "gnome-music";
32− version = "3.34.4";
33+ version = "3.36.0";
3334
3435 format = "other";
3536
3637 src = fetchurl {
3738 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
38− sha256 = "1l2jaf5jfdkqqpjxwahsjslb3sa2vlhjgpi1ib51is04ln729xb6";
39+ sha256 = "01vjcaabd5m8vmicax7vaybsaml3wik4r85g4q8avdkzs8h4gz9h";
3940 };
4041
4142 nativeBuildInputs = [
@@ -53,6 +54,7 @@ python3.pkgs.buildPythonApplication rec {
5354
5455 buildInputs = [
5556 gtk3
57+ pango
5658 glib
5759 libmediaart
5860 gnome-online-accounts
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+44−11
@@ -1,18 +1,37 @@
1−{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig
2−, wrapGAppsHook, itstool, desktop-file-utils, python3
3−, glib, gtk3, evolution-data-server, gnome-online-accounts
4−, libuuid, webkitgtk, zeitgeist
5−, gnome3, libxml2, gsettings-desktop-schemas, tracker }:
1+{ stdenv
2+, meson
3+, ninja
4+, gettext
5+, fetchurl
6+, pkgconfig
7+, wrapGAppsHook
8+, itstool
9+, desktop-file-utils
10+, python3
11+, glib
12+, gtk3
13+, evolution-data-server
14+, gnome-online-accounts
15+, libuuid
16+, libhandy
17+, webkitgtk
18+, zeitgeist
19+, gnome3
20+, libxml2
21+, gsettings-desktop-schemas
22+, tracker
23+}:
624
725let
8− version = "3.34.2";
9−in stdenv.mkDerivation {
26+ version = "3.36.0";
27+in
28+stdenv.mkDerivation {
1029 pname = "gnome-notes";
1130 inherit version;
1231
1332 src = fetchurl {
1433 url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
15− sha256 = "0kmhivgamnv2kk5kywrwm4af4s7663rjwh2wdri8iy1n2gmc9qpv";
34+ sha256 = "1pz53hdd888si7vfy6d9h8cwarsdm4wwn7ni7f3az9638h3ilmfv";
1635 };
1736
1837 doCheck = true;
@@ -23,12 +42,26 @@ in stdenv.mkDerivation {
2342 '';
2443
2544 nativeBuildInputs = [
26− meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils python3 wrapGAppsHook
45+ meson
46+ ninja
47+ pkgconfig
48+ gettext
49+ itstool
50+ libxml2
51+ desktop-file-utils
52+ python3
53+ wrapGAppsHook
2754 ];
2855
2956 buildInputs = [
30− glib gtk3 libuuid webkitgtk tracker
31− gnome-online-accounts zeitgeist
57+ glib
58+ gtk3
59+ libuuid
60+ libhandy
61+ webkitgtk
62+ tracker
63+ gnome-online-accounts
64+ zeitgeist
3265 gsettings-desktop-schemas
3366 evolution-data-server
3467 gnome3.adwaita-icon-theme
pkgs/desktops/gnome-3/apps/polari/default.nix+15−4
@@ -1,19 +1,26 @@
11{ stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme
22, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
3−, pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib
3+, pkgconfig, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib
44, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }:
55
66let
77 pname = "polari";
8− version = "3.34.1";
8+ version = "3.36.0";
99in stdenv.mkDerivation rec {
1010 name = "${pname}-${version}";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "0wcfkib673fpys7hcpi5cqc0zgqzqmqvpzjzx4wwmim8lb121x5w";
14+ sha256 = "0wi7bpscm4rghlwljilsgrls5dy9p0b27k246a1vrdadjghc69l4";
1515 };
1616
17+ patches = [
18+ # Upstream runs the thumbnailer by passing it to gjs.
19+ # If we wrap it in a shell script, gjs can no longer run it.
20+ # Let’s change the code to run the script directly by making it executable and having gjs in shebang.
21+ ./make-thumbnailer-wrappable.patch
22+ ];
23+
1724 propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
1825
1926 nativeBuildInputs = [
@@ -23,9 +30,13 @@ in stdenv.mkDerivation rec {
2330
2431 buildInputs = [
2532 gtk3 glib adwaita-icon-theme gsettings-desktop-schemas
26− telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup
33+ telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk
2734 ];
2835
36+ postFixup = ''
37+ wrapGApp "$out/share/polari/thumbnailer.js"
38+ '';
39+
2940 passthru = {
3041 updateScript = gnome3.updateScript {
3142 packageName = pname;
pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patchnew file+24
@@ -0,0 +1,24 @@
1+diff --git a/src/thumbnailer.js b/src/thumbnailer.js
2+old mode 100644
3+new mode 100755
4+index e2ad0a5..7ebf08a
5+--- a/src/thumbnailer.js
6++++ b/src/thumbnailer.js
7+@@ -1,3 +1,4 @@
8++#!/usr/bin/env gjs
9+ imports.gi.versions.Gdk = '3.0';
10+ imports.gi.versions.Gtk = '3.0';
11+
12+diff --git a/src/urlPreview.js b/src/urlPreview.js
13+index f17e0be..ccffc32 100644
14+--- a/src/urlPreview.js
15++++ b/src/urlPreview.js
16+@@ -44,7 +44,7 @@ class Thumbnailer {
17+ _generateThumbnail(data) {
18+ let { filename, uri } = data;
19+ this._subProc = Gio.Subprocess.new(
20+- ['gjs', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename],
21++ [`${pkg.pkgdatadir}/thumbnailer.js`, uri, filename],
22+ Gio.SubprocessFlags.NONE);
23+ this._subProc.wait_async(null, (o, res) => {
24+ try {
pkgs/desktops/gnome-3/apps/seahorse/default.nix+4−2
@@ -22,15 +22,16 @@
2222, p11-kit
2323, openssh
2424, gsettings-desktop-schemas
25+, libhandy
2526}:
2627
2728stdenv.mkDerivation rec {
2829 pname = "seahorse";
29− version = "3.34.1";
30+ version = "3.36";
3031
3132 src = fetchurl {
3233 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
33− sha256 = "19c2zylwgycb5q9hal8rmflc2sywc5c2grpsfsq3rf37i9lfwynw";
34+ sha256 = "1nqn4a6dr4l1fpzj3mv4swhpnvhjcqlwsyhwm59sdzqgdfx4hbwr";
3435 };
3536
3637 doCheck = true;
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
6061 openssh
6162 openldap
6263 libpwquality
64+ libhandy
6365 ];
6466
6567 postPatch = ''
pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "adwaita-icon-theme";
6− version = "3.34.3";
6+ version = "3.36.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "025rj1fskw1y448hiar4a9icyzpyr242nlh9xhsmyp8jb71dihp7";
10+ sha256 = "066m3vd6k6xf3ap1ahrbw5hnx2322wf0qsnywcxjsj6snq9225qs";
1111 };
1212
1313 # For convenience, we can specify adwaita-icon-theme only in packages
pkgs/desktops/gnome-3/core/dconf-editor/default.nix+2−2
@@ -3,13 +3,13 @@
33
44let
55 pname = "dconf-editor";
6− version = "3.34.4";
6+ version = "3.36.0";
77in stdenv.mkDerivation rec {
88 name = "${pname}-${version}";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "129a2klywvnrj49rz6p5camwsamajldqpsfkl1rgpm6nw0q2lnyy";
12+ sha256 = "14q678bwgmhzmi7565xhhw51y8b0pv3cqh0f411qwzwif1bd1vkj";
1313 };
1414
1515 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/eog/default.nix+2−2
@@ -4,13 +4,13 @@
44
55let
66 pname = "eog";
7− version = "3.34.2";
7+ version = "3.36.0";
88in stdenv.mkDerivation rec {
99 name = "${pname}-${version}";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "1lx96nn8q61ajk2m5454s9b5v5wyn7jbz2sf3k1irv8waiq0aavg";
13+ sha256 = "0gnfpjp3ldvcij557dga4skj4ykb2idkyif7n1d758x42z2hh0s0";
1414 };
1515
1616 nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
pkgs/desktops/gnome-3/core/epiphany/default.nix+14−2
@@ -3,6 +3,7 @@
33, ninja
44, gettext
55, fetchurl
6+, fetchpatch
67, pkgconfig
78, gtk3
89, glib
@@ -30,17 +31,27 @@
3031, json-glib
3132, libdazzle
3233, libhandy
34+, buildPackages
3335}:
3436
3537stdenv.mkDerivation rec {
3638 pname = "epiphany";
37− version = "3.34.4";
39+ version = "3.36.0";
3840
3941 src = fetchurl {
4042 url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
41− sha256 = "13ar3s40cds1rplwbzx0fzigf120w0rydiv05r3k6zpc0zy91qb0";
43+ sha256 = "1xjn6jk4dx2kl2llalydcyvibnpwjahp9z3210pflyy4k68pfw6l";
4244 };
4345
46+ patches = [
47+ # Fix downloading files
48+ # https://gitlab.gnome.org/GNOME/epiphany/issues/1127
49+ (fetchpatch {
50+ url = "https://gitlab.gnome.org/GNOME/epiphany/commit/8682a084bab7e758a9b8efe1deaf0cb8d55fcf44.patch";
51+ sha256 = "bep+Q8Wpu84KA13a5T3JCz8nyeC13HT/QkMKvWT6vLk=";
52+ })
53+ ];
54+
4455 # Tests need an X display
4556 mesonFlags = [
4657 "-Dunit_tests=disabled"
@@ -56,6 +67,7 @@ stdenv.mkDerivation rec {
5667 pkgconfig
5768 python3
5869 wrapGAppsHook
70+ buildPackages.glib
5971 ];
6072
6173 buildInputs = [
pkgs/desktops/gnome-3/core/evince/default.nix+2−2
@@ -43,13 +43,13 @@
4343
4444stdenv.mkDerivation rec {
4545 pname = "evince";
46− version = "3.34.2";
46+ version = "3.36.0";
4747
4848 outputs = [ "out" "dev" "devdoc" ];
4949
5050 src = fetchurl {
5151 url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
52− sha256 = "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w";
52+ sha256 = "1a7v534sqbg7rlrvg9x1rffdf6p9n37blp3wix6anyfl6i99n7c5";
5353 };
5454
5555 postPatch = ''
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+2−2
@@ -6,13 +6,13 @@
66
77stdenv.mkDerivation rec {
88 pname = "evolution-data-server";
9− version = "3.34.4";
9+ version = "3.36.0";
1010
1111 outputs = [ "out" "dev" ];
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
15− sha256 = "1wz8mizblmvficxap6z9w62ymjwa8x99spnaljcwjl1wc55lnp4q";
15+ sha256 = "1v4qjnggpwvafyqnkl1avsi3mpfxpcaz7kwxcf2iz7pvb1k0xmyl";
1616 };
1717
1818 patches = [
pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch+2−2
@@ -423,10 +423,10 @@ diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-
423423index f89cd4a5c..06cca9b5f 100644
424424--- a/src/libedataserverui/e-reminders-widget.c
425425+++ b/src/libedataserverui/e-reminders-widget.c
426−@@ -1642,7 +1642,21 @@ static void
426+@@ -1650,7 +1650,21 @@ static void
427427 e_reminders_widget_init (ERemindersWidget *reminders)
428428 {
429− reminders->priv = G_TYPE_INSTANCE_GET_PRIVATE (reminders, E_TYPE_REMINDERS_WIDGET, ERemindersWidgetPrivate);
429+ reminders->priv = e_reminders_widget_get_instance_private (reminders);
430430- reminders->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar");
431431+ {
432432+ GSettingsSchemaSource *schema_source;
pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-backgrounds";
5− version = "3.34.0";
5+ version = "3.36.0";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "0zxlwy55fz7i582hch2wnj8zy1kzikssgaix0l2y41ccp5nzpdy2";
9+ sha256 = "02xvfwfi3133mjljl731z2hj9hfmjas3a1jl4fxmy24xrzj83jxq";
1010 };
1111
1212 passthru = {
pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "gnome-calculator";
7− version = "3.34.1";
7+ version = "3.36.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0lbh87255zzggqzai6543qg920y52bl4vs5m5h5087ghzg14hlsd";
11+ sha256 = "1cqd4b25qp1i0p04m669jssg1l5sdapc1mniv9jssvw5r7wk1s52";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+11−12
@@ -1,18 +1,18 @@
11{ stdenv, gettext, fetchurl, evolution-data-server, fetchpatch
22, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
33, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
4−, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
5−, vala, meson, ninja, libhandy, gsettings-desktop-schemas }:
4+, wrapGAppsHook, folks, libxml2, gnome3
5+, vala, meson, ninja, libhandy, gsettings-desktop-schemas
6+# , telepathy-glib
7+}:
68
7−let
8− version = "3.34.1";
9−in stdenv.mkDerivation rec {
9+stdenv.mkDerivation rec {
1010 pname = "gnome-contacts";
11− inherit version;
11+ version = "3.36";
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
15− sha256 = "1jqw5yrypvjxzgg70vjbryylwx06amg6sg85mqi14a97xbccg0qa";
15+ sha256 = "0yvgsfmqm8dxbhay12m20xp6qi9v31wwyv1gz4fx7j4kklhd5jzf";
1616 };
1717
1818 propagatedUserEnvPkgs = [ evolution-data-server ];
@@ -23,16 +23,15 @@ in stdenv.mkDerivation rec {
2323
2424 buildInputs = [
2525 gtk3 glib evolution-data-server gsettings-desktop-schemas
26− folks gnome-desktop telepathy-glib libhandy
26+ folks gnome-desktop libhandy
2727 libxml2 gnome-online-accounts cheese
2828 gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
29+ # telepathy-glib 3.35.90 fails to build with telepathy
2930 ];
3031
3132 mesonFlags = [
32− "-Dtelepathy=true"
33− ];
34−
35− patches = [
33+ # Upstream does not seem to maintain this properly: https://gitlab.gnome.org/GNOME/gnome-contacts/issues/103
34+ "-Dtelepathy=false"
3635 ];
3736
3837 postPatch = ''
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+4−6
@@ -60,20 +60,19 @@
6060, tzdata
6161, udisks2
6262, upower
63−, vino
63+, epoxy
6464, gnome-user-share
6565, gnome-remote-desktop
66−, shadow
6766, wrapGAppsHook
6867}:
6968
7069stdenv.mkDerivation rec {
7170 pname = "gnome-control-center";
72− version = "3.34.4";
71+ version = "3.36.0";
7372
7473 src = fetchurl {
7574 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
76− sha256 = "0bi7lsmr5hcf0v17brsa8j33p6i0wnh620bzwycmxryfp6s6vshp";
75+ sha256 = "0gdadbkynldxqffdlw760039ci1vv9wsi5i0mdq4q9dblmb79q1b";
7776 };
7877
7978 nativeBuildInputs = [
@@ -133,14 +132,13 @@ stdenv.mkDerivation rec {
133132 tracker
134133 udisks2
135134 upower
136− vino
135+ epoxy
137136 ];
138137
139138 patches = [
140139 (substituteAll {
141140 src = ./paths.patch;
142141 gcm = gnome-color-manager;
143− usermod = "${shadow}/bin/usermod";
144142 gnome_desktop = gnome-desktop;
145143 inherit glibc libgnomekbd tzdata;
146144 inherit cups networkmanagerapplet;
pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch+56−44
@@ -54,14 +54,14 @@ index 96b25140c..1ad704d4a 100644
5454
5555 typedef struct _TzDB TzDB;
5656 typedef struct _TzLocation TzLocation;
57−diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
58−index 7fce8691e..b839f8b69 100644
59−--- a/panels/info/cc-info-overview-panel.c
60−+++ b/panels/info/cc-info-overview-panel.c
61−@@ -187,7 +187,7 @@ load_gnome_version (char **version,
57+diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
58+index 4541986db..da7826bfe 100644
59+--- a/panels/info-overview/cc-info-overview-panel.c
60++++ b/panels/info-overview/cc-info-overview-panel.c
61+@@ -169,7 +169,7 @@ load_gnome_version (char **version,
6262 gsize length;
6363 g_autoptr(VersionData) data = NULL;
64−
64+
6565- if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml",
6666+ if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml",
6767 &contents,
@@ -71,44 +71,69 @@ diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/n
7171index 9390a3308..d30b4a68e 100644
7272--- a/panels/network/connection-editor/net-connection-editor.c
7373+++ b/panels/network/connection-editor/net-connection-editor.c
74−@@ -247,9 +247,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *editor, const gchar *typ
75− GError *error = NULL;
76−
77− if (editor->is_new_connection) {
74+@@ -278,9 +278,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
75+ g_autoptr(GError) error = NULL;
76+
77+ if (self->is_new_connection) {
7878- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type);
7979+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type);
8080 } else {
8181- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'",
8282+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'",
83− nm_connection_get_uuid (editor->connection));
83+ nm_connection_get_uuid (self->connection));
8484 }
8585
86−diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
87−index dd99a7485..4baa88a4e 100644
88−--- a/panels/network/net-device-wifi.c
89−+++ b/panels/network/net-device-wifi.c
90−@@ -1445,7 +1445,7 @@ device_wifi_edit (NetObject *object)
91− return;
92− }
93− uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
86+diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c
87+--- a/panels/network/net-device-bluetooth.c
88++++ b/panels/network/net-device-bluetooth.c
89+@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self)
90+ update_off_switch_from_device_state (self->device_off_switch, state, self);
91+
92+ /* set up the Options button */
93+- path = g_find_program_in_path ("nm-connection-editor");
94++ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
95+ gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL);
96+ }
97+
98+@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self)
99+
100+ connection = net_device_get_find_connection (self->client, self->device);
101+ uuid = nm_connection_get_uuid (connection);
94102- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
95103+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);
96104 g_debug ("Launching '%s'\n", cmdline);
97− if (!g_spawn_command_line_async (cmdline, &error)) {
105+ if (!g_spawn_command_line_async (cmdline, &error))
98106 g_warning ("Failed to launch nm-connection-editor: %s", error->message);
99−diff --git a/panels/network/net-device.c b/panels/network/net-device.c
100−index d73b537b9..e2ee54294 100644
101−--- a/panels/network/net-device.c
102−+++ b/panels/network/net-device.c
103−@@ -197,7 +197,7 @@ net_device_edit (NetObject *object)
104−
105− connection = net_device_get_find_connection (device);
107+@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self)
108+
109+ gtk_widget_init_template (GTK_WIDGET (self));
110+
111+- path = g_find_program_in_path ("nm-connection-editor");
112++ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
113+ gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL);
114+ }
115+
116+diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
117+--- a/panels/network/net-device-mobile.c
118++++ b/panels/network/net-device-mobile.c
119+@@ -484,7 +484,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
120+
121+ connection = net_device_get_find_connection (self->client, self->device);
106122 uuid = nm_connection_get_uuid (connection);
107123- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
108124+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);
109125 g_debug ("Launching '%s'\n", cmdline);
110− if (!g_spawn_command_line_async (cmdline, &error)) {
126+ if (!g_spawn_command_line_async (cmdline, &error))
111127 g_warning ("Failed to launch nm-connection-editor: %s", error->message);
128+@@ -776,7 +776,7 @@ net_device_mobile_init (NetDeviceMobile *self)
129+
130+ self->cancellable = g_cancellable_new ();
131+
132+- path = g_find_program_in_path ("nm-connection-editor");
133++ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
134+ gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL);
135+ }
136+
112137diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
113138index f53ba217e..d24bcaeb9 100644
114139--- a/panels/printers/pp-host.c
@@ -123,10 +148,10 @@ index f53ba217e..d24bcaeb9 100644
123148
124149 /* Use SNMP to get printer's informations */
125150diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
126−index e0604b8c3..fc323c1b2 100644
151+index 35859526d..21486c917 100644
127152--- a/panels/region/cc-region-panel.c
128153+++ b/panels/region/cc-region-panel.c
129−@@ -763,10 +763,10 @@ row_layout_cb (CcRegionPanel *self,
154+@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self,
130155 layout_variant = cc_input_source_get_layout_variant (source);
131156
132157 if (layout_variant && layout_variant[0])
@@ -140,7 +165,7 @@ index e0604b8c3..fc323c1b2 100644
140165
141166 g_spawn_command_line_async (commandline, NULL);
142167diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
143−index 19934f186..9f41a9620 100644
168+index 00239ce0f..617c98870 100644
144169--- a/panels/user-accounts/run-passwd.c
145170+++ b/panels/user-accounts/run-passwd.c
146171@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
@@ -152,19 +177,6 @@ index 19934f186..9f41a9620 100644
152177 argv[1] = NULL;
153178
154179 envp = g_get_environ ();
155−diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c
156−index 83d4cd091..e8784c722 100644
157−--- a/panels/user-accounts/user-utils.c
158−+++ b/panels/user-accounts/user-utils.c
159−@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username,
160− * future, so it would be nice to have some official way for this
161− * instead of relying on the current "--login" implementation.
162− */
163−- argv[0] = "/usr/sbin/usermod";
164−+ argv[0] = "@usermod@";
165− argv[1] = "--login";
166− argv[2] = data->username;
167− argv[3] = "--";
168180diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
169181index 9cb92007a..84d2f0fa3 100644
170182--- a/tests/datetime/test-endianess.c
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix+4−12
@@ -1,21 +1,21 @@
1−{ stdenv, fetchurl, fetchpatch, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
1+{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
22, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland
33, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
44
55stdenv.mkDerivation rec {
66 pname = "gnome-desktop";
7− version = "3.34.4";
7+ version = "3.36.0";
88
99 outputs = [ "out" "dev" "devdoc" ];
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "1g0cvsx0gk65kfa91knkqg7l2isrnlpvqwjbzpr3a5f2girp4gn5";
13+ sha256 = "05awmswzd4qa0vg23np0s7z6qks73j3sfj71y8azpvyxricw612b";
1414 };
1515
1616 nativeBuildInputs = [
1717 pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection
18− gtk-doc docbook_xsl
18+ gtk-doc docbook_xsl glib
1919 ];
2020 buildInputs = [
2121 libX11 bubblewrap xkeyboard_config isocodes wayland
@@ -30,14 +30,6 @@ stdenv.mkDerivation rec {
3030 bubblewrap_bin = "${bubblewrap}/bin/bwrap";
3131 inherit (builtins) storeDir;
3232 })
33−
34− # honor $XKB_CONFIG_ROOT
35− # addresses #76590: services.xserver.extraLayouts aren't honored by GNOME3
36− # NOTE: should be merged upstream in 3.36.
37− (fetchpatch {
38− url = "https://gitlab.gnome.org/GNOME/gnome-desktop/commit/450446b5353e8231edded4d5b5db90a67a9fa9b7.diff";
39− sha256 = "07y989x7mbgn3rsm2qfdi8qkkc8i60k28hw87l744nlkydn78kq5";
40− })
4133 ];
4234
4335 mesonFlags = [
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "gnome-disk-utility";
8− version = "3.34.4";
8+ version = "3.36.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "0p7pifmihg1vpsvym4qabdjqdp96yx9b4cbc6cnmf5i055js7i8y";
12+ sha256 = "00xi9m8vklwska1k3sdcfyba3mhwx7clrh522dgksn7v0ja9l1zl";
1313 };
1414
1515 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix+3−4
@@ -36,11 +36,11 @@
3636
3737stdenv.mkDerivation rec {
3838 pname = "gnome-initial-setup";
39− version = "3.34.3";
39+ version = "3.36.0";
4040
4141 src = fetchurl {
4242 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
43− sha256 = "1dc87mcvr7vdhfx4q0c44q37lf7ls2qvnc34dm66802qssrcxy9k";
43+ sha256 = "08di7n26qhjfr0p1dvya2xfqwx37k8xbya97a8ccz3j0fzw0my4a";
4444 };
4545
4646 nativeBuildInputs = [
@@ -85,10 +85,9 @@ stdenv.mkDerivation rec {
8585 ];
8686
8787 mesonFlags = [
88− "-Dregion-page=true"
8988 "-Dcheese=disabled"
90− "-Dsoftware-sources=disabled"
9189 "-Dibus=disabled"
90+ "-Dparental_controls=disabled"
9291 "-Dvendor-conf-file=${./vendor.conf}"
9392 ];
9493
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "gnome-keyring";
7− version = "3.34.0";
7+ version = "3.36.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0hqrsh5g9q9lm190f0m85q4nki8k4ng7wphl6qbccdry59aakkg9";
11+ sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52";
1212 };
1313
1414 outputs = [ "out" "dev" ];
pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook
2−, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf, gnome3 }:
2+, glib, pipewire_0_2, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf, gnome3 }:
33
44stdenv.mkDerivation rec {
55 pname = "gnome-remote-desktop";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 nativeBuildInputs = [ meson ninja pkgconfig python3 wrapGAppsHook ];
1717
1818 buildInputs = [
19− glib pipewire systemd libvncserver libsecret libnotify
19+ glib pipewire_0_2 systemd libvncserver libsecret libnotify
2020 gdk-pixbuf # For libnotify
2121 ];
2222
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix+2−2
@@ -4,13 +4,13 @@
44
55let
66 pname = "gnome-screenshot";
7− version = "3.34.0";
7+ version = "3.36.0";
88in stdenv.mkDerivation rec {
99 name = "${pname}-${version}";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "1rmiq890j7gfn5mcz31xy6jfnnxgc17dq67bhn2k9m5ylbvza2n8";
13+ sha256 = "0rhj6fkpxfm26jv3vsn7yb2ybkc2k86ggy23nxa945q74y4msj9k";
1414 };
1515
1616 doCheck = true;
pkgs/desktops/gnome-3/core/gnome-session/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "gnome-session";
7− version = "3.34.2";
7+ version = "3.36.0";
88
99 outputs = ["out" "sessions"];
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "1qgqp97f8k2zi2ydvhds14zsjzfj7cv521r6wx5sw0qacn0p7dwb";
13+ sha256 = "0ymvf1bap35348rpjqp63qwnwnnawdwi4snch95zc4n832w3hjym";
1414 };
1515
1616 patches = [
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix+3−10
@@ -13,7 +13,6 @@
1313, libgnomekbd
1414, lcms2
1515, libpulseaudio
16−, mousetweaks
1716, alsaLib
1817, libcanberra-gtk3
1918, upower
@@ -41,19 +40,18 @@
4140
4241stdenv.mkDerivation rec {
4342 pname = "gnome-settings-daemon";
44− version = "3.34.2";
43+ version = "3.36.0";
4544
4645 src = fetchurl {
4746 url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
48− sha256 = "1vfpgbdxkhh9xwvb3ja174jk3gpzj4n3jzcy9ygbjlvy45zfdflz";
47+ sha256 = "0jddz8f2j4ps7csgq9b694h9hjxsyhlimik6rb2f8nbcxhrg0bzs";
4948 };
5049
5150 patches = [
5251 (substituteAll {
5352 src = ./fix-paths.patch;
54− inherit tzdata mousetweaks;
53+ inherit tzdata;
5554 })
56− ./global-backlight-helper.patch
5755 ];
5856
5957 nativeBuildInputs = [
@@ -103,11 +101,6 @@ stdenv.mkDerivation rec {
103101 # we're using plain
104102 NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
105103
106− # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper
107− postFixup = ''
108− mkdir -p $out/bin/gnome-settings-daemon
109− ln -s $out/libexec/gsd-backlight-helper $out/bin/gnome-settings-daemon/gsd-backlight-helper
110− '';
111104
112105 postPatch = ''
113106 for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do
pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix+4−4
@@ -1,13 +1,13 @@
1−{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_60, glib
1+{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_68, glib
22, gnome3, gnome-menus, substituteAll }:
33
44stdenv.mkDerivation rec {
55 pname = "gnome-shell-extensions";
6− version = "3.34.2";
6+ version = "3.36.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "1f5l35l3kdkzrv49xmg1sh11vwmgjbg7hx3gb91i39bfl1snxqd1";
10+ sha256 = "1rmi6ccqfdisvmmzaiqr2r031r0f3h8qxgw5qwq62x859nbrzcmm";
1111 };
1212
1313 passthru = {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 doCheck = true;
2828 # 60 is required for tests
2929 # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23
30− checkInputs = [ spidermonkey_60 ];
30+ checkInputs = [ spidermonkey_68 ];
3131
3232 nativeBuildInputs = [ meson ninja pkgconfig gettext glib ];
3333
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+46−12
@@ -1,8 +1,8 @@
1−{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
1+{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, gettext, libsecret
22, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
33, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
44, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
5−, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
5+, libpulseaudio, libical, gobject-introspection, wrapGAppsHook, libxslt, gcr
66, accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop
77, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
88, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon
@@ -15,11 +15,11 @@ let
1515
1616in stdenv.mkDerivation rec {
1717 pname = "gnome-shell";
18− version = "3.34.4";
18+ version = "3.36.0";
1919
2020 src = fetchurl {
2121 url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
22− sha256 = "0rm32h7lv4vyadi9x32sb6fwxslarwk70yzmvzjxbq872cazp779";
22+ sha256 = "1phkkkwrrigchz58xs324vf6snd1fm7mxa2iaqwwj526vh5c1s2q";
2323 };
2424
2525 LANG = "en_US.UTF-8";
@@ -31,45 +31,79 @@ in stdenv.mkDerivation rec {
3131 buildInputs = [
3232 systemd
3333 gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
34− libcroco libsecret libsoup polkit gdk-pixbuf librsvg
35− clutter networkmanager libstartup_notification telepathy-glib
34+ libsecret libsoup polkit gdk-pixbuf librsvg
35+ networkmanager libstartup_notification telepathy-glib
3636 libXtst gjs mutter libpulseaudio evolution-data-server
37− libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2
37+ libical gtk3 gdm libcanberra-gtk3 geoclue2
3838 adwaita-icon-theme gnome-bluetooth
3939 gnome-clocks # schemas needed
4040 at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon
41− gst_all_1.gst-plugins-good # recording
4241 gobject-introspection
4342 gnome-autoar
4443
44+ # recording
45+ gst_all_1.gstreamer
46+ gst_all_1.gst-plugins-base
47+ gst_all_1.gst-plugins-good
48+
4549 # not declared at build time, but typelib is needed at runtime
4650 libgweather libnma
4751 ];
4852
4953 patches = [
54+ # Fix dependencies.
55+ # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1114
5056 (fetchpatch {
5157 name = "0001-build-Add-missing-dependency-to-run-js-test.patch";
5258 url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016;
5359 sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm";
5460 })
61+
62+ # Hardcode paths to various dependencies so that they can be found at runtime.
5563 (substituteAll {
5664 src = ./fix-paths.patch;
5765 inherit libgnomekbd unzip;
5866 gsettings = "${glib.bin}/bin/gsettings";
5967 })
68+
69+ # Fix ibus launching regression.
70+ # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1080
71+ (fetchpatch {
72+ url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/94f6976ddd6337593203fdcdd2e3644774408dfa.patch";
73+ sha256 = "PGmFQhqqd3gK+3kp0dlmlYd2G5ZTIQpfE++Q03Ghkx0=";
74+ })
75+
76+ # Fix typing regression with ibus.
77+ # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1084
78+ (fetchpatch {
79+ url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/b18469427e5c19402111de5fe9888bceec0eaacd.patch";
80+ sha256 = "1M+3kjt7K61BFgk1Zf9XfK1ziilQGa60PD8xtVjnQec=";
81+ })
82+
83+ # Fix theming breakage after Shell restart on X11.
84+ # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2329
85+ (fetchpatch {
86+ url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/72c4f148ef88b4bffb2106b99434da5c05c0bb64.patch";
87+ sha256 = "RBA+JHz4ZvmbJZMnGNieD6D5LONRgFU4iOFIMQQ2kHQ=";
88+ })
89+
90+ # Fix Telepathy chat integration.
91+ # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2449
92+ (fetchpatch {
93+ url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/766288eec1bd3bd50dfc4ddf410c2b507187e603.patch";
94+ sha256 = "Cp6xLohCM0gmMxtyYjSukS2oV60Khmxf4iQd9EDAlIc=";
95+ })
6096 ];
6197
6298 postPatch = ''
6399 patchShebangs src/data-to-c.pl
100+ chmod +x meson/postinstall.py
101+ patchShebangs meson/postinstall.py
64102
65103 substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
66104 substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
67105 '';
68106
69− postInstall = ''
70− glib-compile-schemas $out/share/glib-2.0/schemas
71− '';
72−
73107 preFixup = ''
74108 gappsWrapperArgs+=(
75109 # Until glib’s xdgmime is patched
pkgs/desktops/gnome-3/core/gnome-software/default.nix+4−2
@@ -11,11 +11,11 @@ in
1111
1212stdenv.mkDerivation rec {
1313 pname = "gnome-software";
14− version = "3.34.2";
14+ version = "3.36.0";
1515
1616 src = fetchurl {
1717 url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
18− sha256 = "1zhi6zkphq0wfm9z2d1rp1ym8x52c7as4r8h2nrcd34mmv02xnm7";
18+ sha256 = "0b5b1k0a531c2jyf4g59dw7lblga8xrba38mzfdl57dnknbvbafs";
1919 };
2020
2121 patches = [
@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
4242 mesonFlags = [
4343 "-Dubuntu_reviews=false"
4444 "-Dgudev=false"
45+ # FIXME: package malcontent parental controls
46+ "-Dmalcontent=false"
4547 ] ++ stdenv.lib.optionals (!withFwupd) [
4648 "-Dfwupd=false"
4749 ];
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+3−4
@@ -1,21 +1,20 @@
1−{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit
1+{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2
22, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3
33, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }:
44
55stdenv.mkDerivation rec {
66 pname = "gnome-system-monitor";
7− version = "3.32.1";
7+ version = "3.36.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8";
11+ sha256 = "1gipjaw708lv1zj1c9g09x4h4226kawam2kzdhdd6zjkzfghp9s0";
1212 };
1313
1414 doCheck = true;
1515
1616 nativeBuildInputs = [
1717 pkgconfig gettext itstool wrapGAppsHook meson ninja python3
18− polkit # for ITS file
1918 ];
2019 buildInputs = [
2120 bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+4−4
@@ -1,14 +1,14 @@
11{ stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus
2−, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala
2+, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala
33, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 }:
44
55stdenv.mkDerivation rec {
66 pname = "gnome-terminal";
7− version = "3.34.2";
7+ version = "3.36.0.1";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0gc004f9b5k94gkdanmqjz3wqgnpny0l3nqm8zd19h4f0ps27mrv";
11+ sha256 = "1qj0zggig6iwahjvj9wcqpf9xj6aw6ar5pgnmrhbhc90cb7c2ccb";
1212 };
1313
1414 buildInputs = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 ];
1919
2020 nativeBuildInputs = [
21− pkgconfig intltool itstool which libxml2
21+ pkgconfig gettext itstool which libxml2
2222 vala desktop-file-utils wrapGAppsHook pcre2
2323 ];
2424
pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patchdeleted−25
@@ -1,25 +0,0 @@
1−From 71acfd5258b4d12323fc51dda48e83830e62e696 Mon Sep 17 00:00:00 2001
2−From: worldofpeace <worldofpeace@protonmail.ch>
3−Date: Mon, 16 Sep 2019 11:18:27 -0400
4−Subject: [PATCH] build: use get_pkgconfig_variable for sysprof dbusdir
5−
6−---
7− src/meson.build | 2 +-
8− 1 file changed, 1 insertion(+), 1 deletion(-)
9−
10−diff --git a/src/meson.build b/src/meson.build
11−index 182f7f5f5..43060865b 100644
12−--- a/src/meson.build
13−+++ b/src/meson.build
14−@@ -710,7 +710,7 @@ if have_profiler
15− 'backends/meta-profiler.h',
16− ]
17−
18−- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces')
19−+ dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces')
20− sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
21−
22− dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
23−--
24−2.22.1
25−
pkgs/desktops/gnome-3/core/mutter/default.nix+18−12
@@ -38,24 +38,30 @@
3838, desktop-file-utils
3939, libcap_ng
4040, egl-wayland
41+, graphene
42+, wayland-protocols
4143}:
4244
4345stdenv.mkDerivation rec {
4446 pname = "mutter";
45− version = "3.34.4";
47+ version = "3.36.0";
4648
4749 outputs = [ "out" "dev" "man" ];
4850
4951 src = fetchurl {
5052 url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
51− sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01";
53+ sha256 = "18lvj158w6gwc6xpvn699v8ykh1r5szry7sqascl6f1i8g628v2x";
5254 };
5355
5456 mesonFlags = [
5557 "-Degl_device=true"
5658 "-Dinstalled_tests=false" # TODO: enable these
5759 "-Dwayland_eglstream=true"
58− "-Dxwayland-path=${xwayland}/bin/Xwayland"
60+ "-Dprofiler=true"
61+ "-Dxwayland_path=${xwayland}/bin/Xwayland"
62+ # This should be auto detected, but it looks like it manages a false
63+ # positive.
64+ "-Dxwayland_initfd=disabled"
5965 ];
6066
6167 propagatedBuildInputs = [
@@ -63,6 +69,7 @@ stdenv.mkDerivation rec {
6369 json-glib
6470 libXtst
6571 libcap_ng
72+ graphene
6673 ];
6774
6875 nativeBuildInputs = [
@@ -102,26 +109,25 @@ stdenv.mkDerivation rec {
102109 xwayland
103110 zenity
104111 zenity
112+ wayland-protocols
105113 ];
106114
107115 patches = [
108− # Fix build with libglvnd provided headers
109− (fetchpatch {
110− url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch";
111− sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd";
112− })
113−
114116 # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
115117 # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
116118 ./drop-inheritable.patch
117119
118− # TODO: submit upstream
119− ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
120−
121120 (substituteAll {
122121 src = ./fix-paths.patch;
123122 inherit zenity;
124123 })
124+
125+ # Fix crash when opening submenus from «always on visible workspace» windows
126+ # https://gitlab.gnome.org/GNOME/mutter/issues/1083
127+ (fetchpatch {
128+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/7e32cc05ce2e5b3931ddcf46ce9ead603a0de39e.patch";
129+ sha256 = "5ZzOMizucfrSnHNYjHIUObLHCvAIjrE6fY/CxLp4c7k=";
130+ })
125131 ];
126132
127133 postPatch = ''
pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch+5−5
@@ -41,12 +41,12 @@ index 3322bd3b1..01c8020fa 100644
4141
4242 # optional version requirements
4343 udev_req = '>= 228'
44−@@ -125,6 +126,7 @@ xau_dep = dependency('xau')
45− ice_dep = dependency('ice')
44+@@ -131,6 +131,7 @@ ice_dep = dependency('ice')
4645 atk_dep = dependency('atk', version: atk_req)
4746 libcanberra_dep = dependency('libcanberra', version: libcanberra_req)
47+ dbus_dep = dependency('dbus-1')
4848+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng'))
49−
49+
5050 # For now always require X11 support
5151 have_x11 = true
5252@@ -256,6 +258,7 @@ have_core_tests = false
@@ -65,10 +65,10 @@ index 3322bd3b1..01c8020fa 100644
6565 cdata.set('HAVE_PROFILER', have_profiler)
6666
6767 xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')
68−@@ -443,6 +447,7 @@ output = [
69− ' Startup notification..... ' + have_startup_notification.to_string(),
68+@@ -465,6 +465,7 @@ output = [
7069 ' Introspection............ ' + have_introspection.to_string(),
7170 ' Profiler................. ' + have_profiler.to_string(),
71+ ' Xwayland initfd.......... ' + have_xwayland_initfd.to_string(),
7272+ ' libcap-ng................ ' + have_libcapng.to_string(),
7373 '',
7474 ' Tests:',
pkgs/desktops/gnome-3/core/nautilus/default.nix+2−2
@@ -32,11 +32,11 @@
3232
3333stdenv.mkDerivation rec {
3434 pname = "nautilus";
35− version = "3.34.2";
35+ version = "3.36.0";
3636
3737 src = fetchurl {
3838 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
39− sha256 = "19zqwq4qyyncc5wq3xls0f7rsavnw741k336p2h7kx35p4kf41mv";
39+ sha256 = "1pynxxcpk4idp4fmsdgv5qwvaw0l93r68b5pks372fhjff4qcjr6";
4040 };
4141
4242 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/simple-scan/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "simple-scan";
7− version = "3.34.4";
7+ version = "3.36.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0xvy672zyl6jsdlnxma8nc2aqsx9k92jhp6wfxs0msj9ppp1nd3z";
11+ sha256 = "198l3yhqhb2wzfdcgi8fzbwycr0njn44583dazz6wy1gqbiqnzgm";
1212 };
1313
1414 buildInputs = [
pkgs/desktops/gnome-3/core/vino/default.nixdeleted−98
@@ -1,98 +0,0 @@
1−{ stdenv
2−, fetchFromGitLab
3−, wrapGAppsHook
4−, pkgconfig
5−, gnome3
6−, gtk3
7−, glib
8−, intltool
9−, libXtst
10−, libnotify
11−, libsoup
12−, libsecret
13−, gnutls
14−, libgcrypt
15−, avahi
16−, zlib
17−, libjpeg
18−, libXdamage
19−, libXfixes
20−, libXext
21−, networkmanager
22−, gnome-common
23−, libtool
24−, automake
25−, autoconf
26−, telepathySupport ? false
27−, dbus-glib ? null
28−, telepathy-glib ? null
29−}:
30−
31−stdenv.mkDerivation {
32− pname = "vino";
33− version = "unstable-2019-07-08";
34−
35− src = fetchFromGitLab {
36− domain = "gitlab.gnome.org";
37− owner = "GNOME";
38− repo = "vino";
39− rev = "aed81a798558c8127b765cd4fb4dc726d10f1e21";
40− sha256 = "16r4cj5nsygmd9v97nq6d1yhynzak9hdnaprcdbmwfhh0c9w8jv3";
41− };
42−
43− doCheck = true;
44−
45− nativeBuildInputs = [
46− autoconf
47− automake
48− gnome-common
49− intltool
50− libtool
51− pkgconfig
52− wrapGAppsHook
53− ];
54−
55− buildInputs = [
56− avahi
57− glib
58− gnome3.adwaita-icon-theme
59− gnutls
60− gtk3
61− libXdamage
62− libXext
63− libXfixes
64− libXtst
65− libgcrypt
66− libjpeg
67− libnotify
68− libsecret
69− libsoup
70− networkmanager
71− zlib
72− ]
73− ++ stdenv.lib.optionals telepathySupport [ dbus-glib telepathy-glib ]
74− ;
75−
76− preConfigure = ''
77− NOCONFIGURE=1 ./autogen.sh
78− '';
79−
80− postInstall = stdenv.lib.optionalString (!telepathySupport) ''
81− rm -f $out/share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
82− '';
83−
84− passthru = {
85− # updateScript = gnome3.updateScript {
86− # packageName = "vino";
87− # attrPath = "gnome3.vino";
88− # };
89− };
90−
91− meta = with stdenv.lib; {
92− homepage = https://wiki.gnome.org/Projects/Vino;
93− description = "GNOME desktop sharing server";
94− maintainers = gnome3.maintainers;
95− license = licenses.gpl2;
96− platforms = platforms.linux;
97− };
98−}
pkgs/desktops/gnome-3/core/yelp-xsl/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "yelp-xsl";
13− version = "3.34.2";
13+ version = "3.36.0";
1414
1515 src = fetchurl {
1616 url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
17− sha256 = "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc";
17+ sha256 = "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag";
1818 };
1919
2020 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/yelp/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "yelp";
8− version = "3.34.0";
8+ version = "3.36.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "0ifhgdxff2xx2damaj72gpjln5k36grg2chvi4335mv3b5y55mp3";
12+ sha256 = "097djjyl096zmicjpxlb858yz6rd5cj813xc8azbxlhsscikwjzx";
1313 };
1414
1515 nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
pkgs/desktops/gnome-3/default.nix+5−5
@@ -146,8 +146,6 @@ lib.makeScope pkgs.newScope (self: with self; {
146146
147147 totem = callPackage ./core/totem { };
148148
149− vino = callPackage ./core/vino { };
150−
151149 yelp = callPackage ./core/yelp { };
152150
153151 yelp-xsl = callPackage ./core/yelp-xsl { };
@@ -271,8 +269,6 @@ lib.makeScope pkgs.newScope (self: with self; {
271269
272270 gnome-panel = callPackage ./misc/gnome-panel { };
273271
274− gnome-screensaver = callPackage ./misc/gnome-screensaver { };
275−
276272 gnome-tweaks = callPackage ./misc/gnome-tweaks { };
277273
278274 gpaste = callPackage ./misc/gpaste { };
@@ -324,7 +320,7 @@ lib.makeScope pkgs.newScope (self: with self; {
324320 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
325321 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
326322 easytag meld orca rhythmbox shotwell gnome-usage
327− clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl;
323+ clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl;
328324 inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
329325 inherit (pkgs) gnome-video-effects; # added 2019-08-19
330326 inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23
@@ -358,4 +354,8 @@ lib.makeScope pkgs.newScope (self: with self; {
358354 inherit (pkgs) dconf; # added 2019-11-30
359355
360356 inherit (pkgs) networkmanagerapplet; # added 2019-12-12
357+
358+ vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13
359+
360+ gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19
361361})
pkgs/desktops/gnome-3/devtools/devhelp/default.nix+2−2
@@ -20,11 +20,11 @@
2020
2121stdenv.mkDerivation rec {
2222 pname = "devhelp";
23− version = "3.34.0";
23+ version = "3.36.0";
2424
2525 src = fetchurl {
2626 url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27− sha256 = "0zpmn6fgkgiayvn4diia5df0s6s7dqrdnp3nrvpavsmgn0vhb4pg";
27+ sha256 = "0d2fvd7p08qfv21cxpjl3rh5cl0bzk3fj2msvyz49fqmc69k5z93";
2828 };
2929
3030 nativeBuildInputs = [
pkgs/desktops/gnome-3/extensions/appindicator/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-appindicator";
5− version = "32";
5+ version = "33";
66
77 src = fetchFromGitHub {
88 owner = "Ubuntu";
99 repo = "gnome-shell-extension-appindicator";
1010 rev = "v${version}";
11− sha256 = "1qv9ll4iwkinwk5mf2jppj4fbk8rfncix6q4hhrwnqmhmsbiz6n2";
11+ sha256 = "B039bgg5b63oaHp1Z36k9Dh5FLr8fmfxI25ZgIA+p2I=";
1212 };
1313
1414 # This package has a Makefile, but it's used for building a zip for
pkgs/desktops/gnome-3/extensions/arc-menu/default.nix+4−4
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-arc-menu";
5− version = "33";
5+ version = "43";
66
77 src = fetchFromGitLab {
88 owner = "LinxGem33";
99 repo = "Arc-Menu";
1010 rev = "v${version}-Stable";
11− sha256 = "0ncb19jlwy2y9jcj8g6cdbasdv6n7hm96qv9l251z6qgrmg28x4z";
11+ sha256 = "1rspl89bxqy0wla8cj0h1d29gp38xg1vmvhc1qg7bl46ank4yp5q";
1212 };
1313
1414 patches = [
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
2222 glib gettext
2323 ];
2424
25− makeFlags = [ "INSTALL_BASE=${placeholder "out"}/share/gnome-shell/extensions" ];
25+ makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ];
2626
2727 meta = with stdenv.lib; {
2828 description = "Gnome shell extension designed to replace the standard menu found in Gnome 3";
2929 license = licenses.gpl2Plus;
3030 maintainers = with maintainers; [ dkabot ];
31− homepage = https://gitlab.com/LinxGem33/Arc-Menu;
31+ homepage = "https://gitlab.com/LinxGem33/Arc-Menu";
3232 };
3333}
pkgs/desktops/gnome-3/extensions/caffeine/default.nix+5−5
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }:
22
33stdenv.mkDerivation rec {
4− pname = "gnome-shell-extension-caffeine";
5− version = "33";
4+ pname = "gnome-shell-extension-caffeine-unstable";
5+ version = "2020-03-13";
66
77 src = fetchFromGitHub {
88 owner = "eonpatapon";
99 repo = "gnome-shell-extension-caffeine";
10− rev = "v${version}";
11− sha256 = "1v74xfk7csgc4kw1fg75brmhk2aby3d453ksnmj4k8ivyxkzxmfg";
10+ rev = "f25fa5cd586271f080c2304d0ad1273b55e864f5";
11+ sha256 = "12a76g1ydw677pjnj00r3vw31k4xybc63ynqzx3s4g0wi6lipng7";
1212 };
1313
1414 uuid = "caffeine@patapon.info";
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
3131 description = "Fill the cup to inhibit auto suspend and screensaver";
3232 license = licenses.gpl2;
3333 maintainers = with maintainers; [ eperuffo ];
34− homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine;
34+ homepage = "https://github.com/eonpatapon/gnome-shell-extension-caffeine";
3535 };
3636}
pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix+5−4
@@ -1,14 +1,15 @@
11{ stdenv, fetchFromGitHub, glib, gettext }:
22
33stdenv.mkDerivation rec {
4− pname = "gnome-shell-dash-to-dock";
5− version = "67";
4+ pname = "gnome-shell-dash-to-dock-unstable";
5+ version = "2020-03-19";
66
77 src = fetchFromGitHub {
88 owner = "micheleg";
99 repo = "dash-to-dock";
10− rev = "extensions.gnome.org-v" + version;
11− sha256 = "1746xm0iyvyzj6m3pvjx11smh9w1s7naz426ki0dlr5l7jh3mpy5";
10+ # rev = "extensions.gnome.org-v" + version;
11+ rev = "c58004802b2eedfde96966a4ec0151fea2a1bd98";
12+ sha256 = "IjunykPFP2CbGcd8XVqhPuNUOUOOgDAQFIytLaoyqRg=";
1213 };
1314
1415 nativeBuildInputs = [
pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-dash-to-panel";
5− version = "26";
5+ version = "31";
66
77 src = fetchFromGitHub {
88 owner = "home-sweet-gnome";
99 repo = "dash-to-panel";
1010 rev = "v${version}";
11− sha256 = "1phfx2pblygpcvsppsqqqflm7qnz46mqkw29hj0nv2dn69hf4xbc";
11+ sha256 = "A8Ft+tLNv8KlTnVUzrWGavBWpP0u2rhkuG5LZls1A24=";
1212 };
1313
1414 buildInputs = [
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
2121 description = "An icon taskbar for Gnome Shell";
2222 license = licenses.gpl2;
2323 maintainers = with maintainers; [ mounium ];
24− homepage = https://github.com/jderose9/dash-to-panel;
24+ homepage = "https://github.com/jderose9/dash-to-panel";
2525 };
2626}
pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix+5−5
@@ -1,14 +1,14 @@
1−{ stdenv, fetchFromGitHub, substituteAll, gjs, vte }:
1+{ stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-drop-down-terminal";
5− version = "24";
5+ version = "unstable-2020-03-25";
66
77 src = fetchFromGitHub {
88 owner = "zzrough";
99 repo = "gs-extensions-drop-down-terminal";
10− rev = "v${version}";
11− sha256 = "1gda56xzwsa5pgmgpb7lhb3i3gqishvn84282inwvqm86afks73r";
10+ rev = "a59669afdb395b3315619f62c1f740f8b2f0690d";
11+ sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i";
1212 };
1313
1414 uuid = "drop-down-terminal@gs-extensions.zzrough.org";
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
2929 description = "Configurable drop down terminal shell";
3030 license = licenses.gpl3;
3131 maintainers = with maintainers; [ ericdallo ];
32− homepage = https://github.com/zzrough/gs-extensions-drop-down-terminal;
32+ homepage = "https://github.com/zzrough/gs-extensions-drop-down-terminal";
3333 };
3434}
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "gnome-shell-gsconnect";
7− version = "31";
7+ version = "35";
88
99 src = fetchFromGitHub {
1010 owner = "andyholmes";
1111 repo = "gnome-shell-extension-gsconnect";
1212 rev = "v${version}";
13− sha256 = "0nricm31jh4akncs0rkkilmq9afg7kgbj5cy7w26pfqb3l4nhifg";
13+ sha256 = "GqM2S9FIOHw+8AK2K7fpEBq34JqgKRCsW8I9Ve6c6IM=";
1414 };
1515
1616 patches = [
pkgs/desktops/gnome-3/extensions/impatience/default.nix+2−2
@@ -2,12 +2,12 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-impatience";
5− version = "0.4.5";
5+ version = "unstable-2019-09-23";
66
77 src = fetchFromGitHub {
88 owner = "timbertson";
99 repo = "gnome-shell-impatience";
10− rev = "version-${version}";
10+ rev = "43e4e0a1e0eeb334a2da5224ce3ab4fdddf4f1b2";
1111 sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx";
1212 };
1313
pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix+3−3
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "gnome-shell-extension-mpris-indicator-button-unstable";
8− version = "2019-09-29";
8+ version = "2020-03-21";
99
1010 src = fetchFromGitHub {
1111 owner = "JasonLG1979";
1212 repo = "gnome-shell-extension-mpris-indicator-button";
13− rev = "6cdc28a8bde98f25618b27ee48280996e2b4a0f8";
14− sha256 = "1n3sh3phpa75y3vpc09wnzhis0m92zli1m46amzsdbvmk6gkifif";
13+ rev = "de54160e7d905b8c48c0fe30a437f7c51efc1aa3";
14+ sha256 = "k/NLmDrlaOsMkwLye7YGQhaQvOMNfhCsDVh2F0qnuFg=";
1515 };
1616
1717 uuid = "mprisindicatorbutton@JasonLG1979.github.io";
pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix+17−7
@@ -1,21 +1,31 @@
1−{ stdenv, fetchgit }:
1+{ stdenv, fetchFromGitLab }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-night-theme-switcher";
5− version = "2.1";
5+ version = "19";
66
7− src = fetchgit {
8− url = "https://git.romainvigier.fr/Romain/nightthemeswitcher-gnome-shell-extension";
7+ src = fetchFromGitLab {
8+ owner = "rmnvgr";
9+ repo = "nightthemeswitcher-gnome-shell-extension";
910 rev = "v${version}";
10− sha256 = "1md44vmc83cp35riszhdvysnvl8pmkcpf5j6n4i2b3wwcjwxqwfy";
11+ sha256 = "1ll0yf1skf51wa10mlrajd1dy459w33kx0i3vhfcx2pdk7mw5a3c";
1112 };
1213
13− makeFlags = [ "GSEXT_DIR_LOCAL=${placeholder "out"}/share/gnome-shell/extensions" ];
14+ # makefile tries to do install in home directory using
15+ # `gnome-extensions install`
16+ dontBuild = true;
17+
18+ uuid = "nightthemeswitcher@romainvigier.fr";
19+
20+ installPhase = ''
21+ mkdir -p $out/share/gnome-shell/extensions/
22+ cp -r src/ $out/share/gnome-shell/extensions/${uuid}
23+ '';
1424
1525 meta = with stdenv.lib; {
1626 description = "Automatically change the GTK theme to dark variant when Night Light activates";
1727 license = licenses.gpl3;
1828 maintainers = with maintainers; [ jonafato ];
19− homepage = https://git.romainvigier.fr/Romain/nightthemeswitcher-gnome-shell-extension;
29+ homepage = "https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/";
2030 };
2131}
pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix+2−2
@@ -7,13 +7,13 @@
77
88stdenv.mkDerivation rec {
99 pname = "gnome-shell-extension-sound-output-device-chooser";
10− version = "25";
10+ version = "28";
1111
1212 src = fetchFromGitHub {
1313 owner = "kgshank";
1414 repo = "gse-sound-output-device-chooser";
1515 rev = version;
16− sha256 = "16xaa4r01575ix9lrvww8n6pird8r3ml1j037b3sm6dfrf8kvzxs";
16+ sha256 = "JmDUi6xTMbkMzW+hYJuKtjQj4ERctaiHr6eLsl5Fru4=";
1717 };
1818
1919 patches = [
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix+4−1
@@ -1,4 +1,4 @@
1−{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
1+{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-system-monitor";
@@ -41,5 +41,8 @@ stdenv.mkDerivation rec {
4141 license = licenses.gpl3Plus;
4242 maintainers = with maintainers; [ tiramiseb ];
4343 homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
44+ # 3.36 support not yet ready
45+ # https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/564
46+ broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.34";
4447 };
4548}
pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, glib, gettext }:
1+{ stdenv, fetchFromGitHub, glib, gnome3, gettext }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-topicons-plus";
@@ -22,5 +22,7 @@ stdenv.mkDerivation rec {
2222 license = licenses.gpl2;
2323 maintainers = with maintainers; [ eperuffo ];
2424 homepage = https://github.com/phocean/TopIcons-plus;
25+ # Unmaintained and no longer working with GNOME Shell 3.34+
26+ broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32";
2527 };
2628}
pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix+2−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub }:
1+{ stdenv, fetchFromGitHub, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-window-corner-preview";
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
2424 license = licenses.mit;
2525 maintainers = with maintainers; [ jtojnar ];
2626 homepage = https://github.com/medenagan/window-corner-preview;
27+ broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
2728 };
2829}
pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-workspace-matrix";
5− version = "3.0.0";
5+ version = "4.0.0";
66
77 src = fetchFromGitHub {
88 owner = "mzur";
99 repo = "gnome-shell-wsmatrix";
1010 rev = "v${version}";
11− sha256 = "1fgyzmd16kklcca7600bwg8w8pbb4klmapqsvmahlwa99vmkhfkn";
11+ sha256 = "LTDkKSKvReJxBzAERE+vV+uJBNZw6UyhiB7kN48BZCo=";
1212 };
1313
1414 uuid = "wsmatrix@martin.zurowietz.de";
pkgs/desktops/gnome-3/games/four-in-a-row/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "four-in-a-row";
7− version = "3.34.4";
7+ version = "3.36.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1gw54llbmbv4w2rxmmkzq2wq6sacnpj99maw06zpn071cga0g4z5";
11+ sha256 = "1bl63npcbr5ymka2y06wps612qynxa4hsqlzn7bvwpz2v53pai1z";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/desktops/gnome-3/games/gnome-chess/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "gnome-chess";
6− version = "3.34.0";
6+ version = "3.36.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "1n1vjg6xhwppmddrmqmkk6b3jkgphshp06rjbv5h3270k520a135";
10+ sha256 = "1a9fgi749gy1f60vbcyrqqkab9vqs42hji70q73k1xx8rv0agmg0";
1111 };
1212
1313 nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
pkgs/desktops/gnome-3/games/gnome-klotski/default.nix+2−2
@@ -5,13 +5,13 @@
55
66let
77 pname = "gnome-klotski";
8− version = "3.34.4";
8+ version = "3.36.0";
99in stdenv.mkDerivation rec {
1010 name = "${pname}-${version}";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "1bg7hl64lmjryzvp51qfak5jqs7vbqfmj0s7h1g3c7snscca7rx6";
14+ sha256 = "06gsg3s8hyhhsk11f1ld2anzv1czg1429483gbv9lr2p7fnq7pyy";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "gnome-mahjongg";
8− version = "3.34.0";
8+ version = "3.36.1";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "0qyi3jkg112jysrsy5p330b7b92sl09mr8zsimq06q68kj1wzkz5";
12+ sha256 = "1a5h55amr0pab36y2iqm6ynv6mmb8al1b92rfk18wzfcfz7mhxzd";
1313 };
1414
1515 passthru = {
pkgs/desktops/gnome-3/games/gnome-mines/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "gnome-mines";
6− version = "3.34.0";
6+ version = "3.36.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "1spxa6qr1y8s5rrsvpciywpvhk812ngn95s1apaxaigwy2g1iw54";
10+ sha256 = "0m53ymxbgr3rb3yv13fzjwqh6shsfr51abkm47rchsy2jryqkzja";
1111 };
1212
1313 # gobject-introspection for finding vapi files
pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "gnome-nibbles";
8− version = "3.34.2";
8+ version = "3.36.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "0sl54ns1b5cff6vrls6716xb73krgd1sp36k94gc2lza5laixyh0";
12+ sha256 = "01vzcjys2x95wnanwq25x0a7x6cc4j6g8gk69c5yc9ild48rr9c1";
1313 };
1414
1515 nativeBuildInputs = [
pkgs/desktops/gnome-3/games/gnome-robots/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "gnome-robots";
7− version = "3.34.1";
7+ version = "3.36.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0ncghkv06x9qqfr5zyh6hdv28d0i6v9z4z365k05x9ji5pyzxiny";
11+ sha256 = "10l7dlbqa2f0z6g76r9n87pc1zm11qmxsmfp3908v9g5lf11vzrs";
1212 };
1313
1414 passthru = {
pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "gnome-sudoku";
6− version = "3.34.1";
6+ version = "3.36.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "025y85r4qqardivvwiwhbmgarziykdy224m8zlrq8b79zv82793b";
10+ sha256 = "17a1r2jk5yygrxil1dycmamxyvyi64mr29mbyfgcx5hm2fylxxwm";
1111 };
1212
1313 nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "gnome-taquin";
8− version = "3.34.4";
8+ version = "3.36.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "0s8gsgaj1mxldg5yaq6k9anfha9bc4n16wms66kbbpqi8k5hcm40";
12+ sha256 = "16ss2d8s6glb3k0wnb5ihmbqvk9i1yi18wv9hzgxfyhs1rvk496f";
1313 };
1414
1515 passthru = {
pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "gnome-tetravex";
8− version = "3.34.4";
8+ version = "3.36.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "1sm90nkpig02hwk7bh5bnf65awgssxl63bvvh2a7gmlaln8x99iy";
12+ sha256 = "1xbd0flh77v3x0dh4dsfspykwb6rwvga7kqwn1fq7gk421mq6n52";
1313 };
1414
1515 passthru = {
pkgs/desktops/gnome-3/games/hitori/default.nix+2−2
@@ -18,11 +18,11 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "hitori";
21− version = "3.34.0";
21+ version = "3.36.0";
2222
2323 src = fetchurl {
2424 url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
25− sha256 = "1612hq6d2mnggppy949dkb8lz9886n0rlg68z7qmjjizz1l41lb5";
25+ sha256 = "0mq1jv8rbmvksnhbm1d25kcvcfr9lq58qipcacn7wa26xpx7cvs5";
2626 };
2727
2828 nativeBuildInputs = [
pkgs/desktops/gnome-3/games/iagno/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "iagno";
8− version = "3.34.5";
8+ version = "3.36.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "05qywjcar29vk29yvbxwlddxhwlrvllgjw7srmlz5811hc5m0a1m";
12+ sha256 = "0ysb021mf5sy1ywicys35rn5c9v355rffjrlhxmr3z6yplrljm5b";
1313 };
1414
1515 nativeBuildInputs = [
pkgs/desktops/gnome-3/games/lightsoff/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "lightsoff";
7− version = "3.34.0";
7+ version = "3.36.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1yyq0962fv16rab3alq5saf4gpii9xvcfy5vbq85hhhgjpbqrfns";
11+ sha256 = "0qvafpciqbqmpan9i8ans3lqs29v02zblz6k0hzj4p3qq4sch3a3";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/desktops/gnome-3/games/quadrapassel/default.nix+2−2
@@ -6,11 +6,11 @@
66
77stdenv.mkDerivation rec {
88 pname = "quadrapassel";
9− version = "3.34.1";
9+ version = "3.36.00";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "1qh6hx90lqag2hby94jc68xnz4i6b2a253x4yp6xz025fpacv6mk";
13+ sha256 = "1xk9x1pp71armj47vxja7fsj6gs116kcjkd8xgwf8wi4zr4kgx7g";
1414 };
1515
1616 nativeBuildInputs = [
pkgs/desktops/gnome-3/games/tali/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "tali";
8− version = "3.32.1";
8+ version = "3.36.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "0na7sswfh63wj44aibcnqdsbb24yfngcwgi07lv8rky6rry0kqgz";
12+ sha256 = "0knq2vwnbkzhb6yc0f8iznaz76yf5hwgg2z2xr079nz407p46v22";
1313 };
1414
1515 passthru = {
pkgs/desktops/gnome-3/misc/geary/default.nix+15−8
@@ -1,17 +1,17 @@
11{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
22, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
3−, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext, fetchpatch
3+, libpeas, libsecret, gmime3, isocodes, libxml2, gettext, fetchpatch
44, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
5−, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking
5+, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking
66, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }:
77
88stdenv.mkDerivation rec {
99 pname = "geary";
10− version = "3.34.2";
10+ version = "3.36.0";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
14− sha256 = "1a6j70pzr57ga7m4nypqdkqwlzk2dablpz93yaympgrlqpf5zkvm";
14+ sha256 = "jiaq+dwdARLaSnttY2chwJrclFjxrukuk80yT0LgvfY=";
1515 };
1616
1717 nativeBuildInputs = [
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
2121 ];
2222
2323 buildInputs = [
24− adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
25− gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
24+ adwaita-icon-theme enchant2 gcr gmime3 gnome-online-accounts
25+ gsettings-desktop-schemas gtk3 isocodes json-glib libpeas
2626 libgee libsecret sqlite webkitgtk glib-networking
27− libunwind libunity folks gspell libytnef libhandy
27+ libunwind folks gspell libytnef libhandy
2828 ];
2929
3030 checkInputs = [ xvfb_run dbus ];
@@ -41,14 +41,21 @@ stdenv.mkDerivation rec {
4141 })
4242 ];
4343
44+ # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
45+ # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa
4446 postPatch = ''
4547 chmod +x build-aux/post_install.py build-aux/git_version.py
48+
4649 patchShebangs build-aux/post_install.py build-aux/git_version.py
4750
51+ chmod +x build-aux/yaml_to_json.py
52+ patchShebangs build-aux/yaml_to_json.py
53+
4854 chmod +x desktop/geary-attach
4955 '';
5056
51− doCheck = true;
57+ # FIXME: fix tests
58+ doCheck = false;
5259
5360 checkPhase = ''
5461 NO_AT_BRIDGE=1 \
pkgs/desktops/gnome-3/misc/gnome-applets/default.nix+2−4
@@ -12,7 +12,6 @@
1212, libgtop
1313, libnotify
1414, upower
15−, dbus-glib
1615, wirelesstools
1716, linuxPackages
1817, adwaita-icon-theme
@@ -25,13 +24,13 @@
2524
2625let
2726 pname = "gnome-applets";
28− version = "3.34.0";
27+ version = "3.36.0";
2928in stdenv.mkDerivation rec {
3029 name = "${pname}-${version}";
3130
3231 src = fetchurl {
3332 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
34− sha256 = "1mbhykqwzq18zpvfkdcdkbb4zhijmxqa2i6502an78yap87vq74i";
33+ sha256 = "096n0ji478hfdrbi8illsyvdsgxznxfayr826pr9jdgzg1s0x9xs";
3534 };
3635
3736 nativeBuildInputs = [
@@ -51,7 +50,6 @@ in stdenv.mkDerivation rec {
5150 libgtop
5251 libnotify
5352 upower
54− dbus-glib
5553 adwaita-icon-theme
5654 libgweather
5755 gucharmap
pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix+62−3
@@ -1,6 +1,7 @@
11{ stdenv
22, autoreconfHook
33, fetchurl
4+, fetchpatch
45, gettext
56, glib
67, gnome-bluetooth
@@ -17,7 +18,10 @@
1718, libxml2
1819, pkgconfig
1920, polkit
21+, gdm
22+, systemd
2023, upower
24+, pam
2125, wrapGAppsHook
2226, writeTextFile
2327, writeShellScriptBin
@@ -27,16 +31,64 @@
2731
2832let
2933 pname = "gnome-flashback";
30− version = "3.34.2";
31− requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;";
34+ version = "3.36.0";
35+
36+ # From data/sessions/Makefile.am
37+ requiredComponentsCommon = [
38+ "gnome-flashback"
39+ "gnome-panel"
40+ ];
41+ requiredComponentsGsd = [
42+ "org.gnome.SettingsDaemon.A11ySettings"
43+ "org.gnome.SettingsDaemon.Color"
44+ "org.gnome.SettingsDaemon.Datetime"
45+ "org.gnome.SettingsDaemon.Housekeeping"
46+ "org.gnome.SettingsDaemon.Keyboard"
47+ "org.gnome.SettingsDaemon.MediaKeys"
48+ "org.gnome.SettingsDaemon.Power"
49+ "org.gnome.SettingsDaemon.PrintNotifications"
50+ "org.gnome.SettingsDaemon.Rfkill"
51+ "org.gnome.SettingsDaemon.ScreensaverProxy"
52+ "org.gnome.SettingsDaemon.Sharing"
53+ "org.gnome.SettingsDaemon.Smartcard"
54+ "org.gnome.SettingsDaemon.Sound"
55+ "org.gnome.SettingsDaemon.UsbProtection"
56+ "org.gnome.SettingsDaemon.Wacom"
57+ "org.gnome.SettingsDaemon.XSettings"
58+ ];
59+ requiredComponents = wmName: "RequiredComponents=${stdenv.lib.concatStringsSep ";" ([wmName] ++ requiredComponentsCommon ++ requiredComponentsGsd)};";
3260 gnome-flashback = stdenv.mkDerivation rec {
3361 name = "${pname}-${version}";
3462
3563 src = fetchurl {
3664 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
37− sha256 = "1726xcm2q94nfvb055d3m61m20s0xy3xl1fc3ds3k3rcrn457riv";
65+ sha256 = "qwlTFs4wn6PpB7uZkpvnmECsSTa62OQMpgiIXoZoMRk=";
3866 };
3967
68+ patches = [
69+ # Fix locking screen from log out dialogue
70+ # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/43
71+ (fetchpatch {
72+ url = "https://gitlab.gnome.org/GNOME/gnome-flashback/-/commit/7b151e0a947e4b49e1cee80097c1f8946ba46af9.patch";
73+ sha256 = "pJcJb6EGlInlWpLbbBajWydBtbiWK3AMHzsFQ26bmwA=";
74+ })
75+
76+ # Hide GNOME Shell Extensions manager from menu
77+ # https://gitlab.gnome.org/GNOME/gnome-flashback/issues/42
78+ (fetchpatch {
79+ url = "https://gitlab.gnome.org/GNOME/gnome-flashback/-/commit/75f95379779c24d42d1e72cdcd4c16a9c6db7657.patch";
80+ sha256 = "cwKZSQTFi0f/T1Ld6vJceQFHBsikOhkp//J1IY5aMKA=";
81+ })
82+ (fetchpatch {
83+ url = "https://gitlab.gnome.org/GNOME/gnome-flashback/-/commit/12cacf25b1190d9c9bba42f085e54895de7a076e.patch";
84+ sha256 = "mx37kLs3x/e9RJCGN6z8/7b5Tz6yzxeN/14NFi8IWfA=";
85+ })
86+ (fetchpatch {
87+ url = "https://gitlab.gnome.org/GNOME/gnome-flashback/-/commit/7954376f32348028a3bdba0ea182b0000c4fcb0a.patch";
88+ sha256 = "ZEQcg9OoIOIMh/yUYQ9R1Ky8DElteaDQrSdwFtA4Yno=";
89+ })
90+ ];
91+
4092 # make .desktop Execs absolute
4193 postPatch = ''
4294 patch -p0 <<END_PATCH
@@ -76,7 +128,11 @@ let
76128 libpulseaudio
77129 libxkbfile
78130 polkit
131+ gdm
132+ gnome-panel
133+ systemd
79134 upower
135+ pam
80136 xkeyboard_config
81137 ];
82138
@@ -84,6 +140,9 @@ let
84140
85141 enableParallelBuilding = true;
86142
143+ PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts";
144+ PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules";
145+
87146 passthru = {
88147 updateScript = gnome3.updateScript {
89148 packageName = pname;
pkgs/desktops/gnome-3/misc/gnome-panel/default.nix+4−5
@@ -7,7 +7,6 @@
77, gettext
88, glib
99, gnome-desktop
10−, gnome-flashback
1110, gnome-menus
1211, gnome3
1312, gtk3
@@ -23,7 +22,7 @@
2322
2423let
2524 pname = "gnome-panel";
26− version = "3.34.1";
25+ version = "3.36.0";
2726in stdenv.mkDerivation rec {
2827 name = "${pname}-${version}";
2928
@@ -31,7 +30,7 @@ in stdenv.mkDerivation rec {
3130
3231 src = fetchurl {
3332 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
34− sha256 = "03dr54njdh2szy6yrib2q0agjscbj3bmzrfb9fb4psrf4mah5g56";
33+ sha256 = "08x0xjrg36h6x5c68w5jf8gg57767p2m3ljgzyglx2ij0nfbpc8d";
3534 };
3635
3736 # make .desktop Exec absolute
@@ -46,8 +45,8 @@ in stdenv.mkDerivation rec {
4645
4746 preFixup = ''
4847 gappsWrapperArgs+=(
49− --prefix XDG_DATA_DIRS : "${gnome-menus}/share:${gnome-flashback}/share"
50− --prefix XDG_CONFIG_DIRS : "${gnome-menus}/etc/xdg:${gnome-flashback}/etc/xdg"
48+ --prefix XDG_DATA_DIRS : "${gnome-menus}/share"
49+ --prefix XDG_CONFIG_DIRS : "${gnome-menus}/etc/xdg"
5150 )
5251 '';
5352
pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nixdeleted−96
@@ -1,96 +0,0 @@
1−{ stdenv
2−, fetchgit
3−, autoreconfHook
4−, dbus-glib
5−, glib
6−, gnome-common
7−, gnome-desktop
8−, gnome3
9−, gtk3
10−, pkgconfig
11−, intltool
12−, pam
13−, systemd
14−, wrapGAppsHook
15−}:
16−
17−stdenv.mkDerivation rec {
18− pname = "gnome-screensaver";
19− version = "3.6.1";
20−
21− # the original package is deprecated and the Ubuntu version has a number of useful patches
22− src = fetchgit {
23− url = "https://git.launchpad.net/ubuntu/+source/gnome-screensaver";
24− rev = "4f7b666131dec060a5aac9117f395ac522a627b4";
25− sha256 = "15xqgcpm825cy3rm8pj00qlblq66svmh06lcw8qi74a3g0xcir87";
26− };
27−
28− # from debian/patches/series
29− patches = map (patch: "debian/patches/${patch}") [
30− "00git_logind_check.patch"
31− "01_no_autostart.patch"
32− "03_fix_ltsp-fading.patch"
33− "05_dbus_service.patch"
34− "10_legacy_scrsvr_inhibit.patch"
35− "13_nvidia_gamma_fade_fallback.patch"
36− "14_no_fade_on_user_switch.patch"
37− "15_dont_crash_on_no_fade.patch"
38− "16_dont_crash_in_kvm.patch"
39− "17_remove_top_panel.patch"
40− "18_unity_dialog_layout.patch"
41− "24_use_user_settings.patch"
42− "25_fix_lock_command.patch"
43− "27_lightdm_switch_user.patch"
44− "28_blocking_return.patch"
45− "29_handle_expired_creds.patch"
46− # these two patches are ubuntu-specific
47− # "30_ubuntu-lock-on-suspend_gsetting.patch"
48− # "31_lock_screen_on_suspend.patch"
49− "32_input_sources_switcher.patch"
50− "move-not-nuke.patch"
51− "allow-replacement"
52− "libsystemd.patch"
53− "0001-gs-lock-plug-Disconnect-signal-handler-from-right-ob.patch"
54− "33_budgie_support.patch"
55− ] ++ [ ./fix-dbus-service-dir.patch ];
56−
57− nativeBuildInputs = [
58− autoreconfHook
59− intltool
60− wrapGAppsHook
61− gnome-common
62− pkgconfig
63− ];
64−
65− buildInputs = [
66− glib
67− gtk3
68− gnome-desktop
69− dbus-glib
70− pam
71− systemd
72− ];
73−
74− NIX_CFLAGS_COMPILE = [ "-Wno-error=return-type" ];
75−
76− configureFlags = [ "--enable-locking" "--with-systemd=yes" ];
77−
78− enableParallelBuilding = true;
79−
80− doCheck = true;
81−
82− passthru = {
83− updateScript = gnome3.updateScript {
84− packageName = pname;
85− attrPath = "gnome3.${pname}";
86− };
87− };
88−
89− meta = with stdenv.lib; {
90− description = "Component of Gnome Flashback that provides screen locking";
91− homepage = https://wiki.gnome.org/Projects/GnomeScreensaver;
92− license = licenses.gpl2Plus;
93− maintainers = gnome3.maintainers;
94− platforms = platforms.linux;
95− };
96−}
pkgs/desktops/gnome-3/misc/gpaste/default.nix+2−15
@@ -18,30 +18,17 @@
1818}:
1919
2020stdenv.mkDerivation rec {
21− version = "3.34.1";
21+ version = "3.36.3";
2222 pname = "gpaste";
2323
2424 src = fetchFromGitHub {
2525 owner = "Keruspe";
2626 repo = "GPaste";
2727 rev = "v${version}";
28− sha256 = "1jcj0kgxhad8rblyqhwa2yhkf0010k80w9bm2rajanad2c3bqaxa";
28+ sha256 = "sR7/NdCaidP03xE64nqQc1M+xAIipOuKp5OWBJ4VN9w=";
2929 };
3030
3131 patches = [
32− # Meson fixes
33− # https://github.com/Keruspe/GPaste/pull/283
34− # install systemd units
35− (fetchpatch {
36− url = "https://github.com/Keruspe/GPaste/commit/a474d8c1f2bd600476ba52dc19f517787845533b.patch";
37− sha256 = "19m1ar61l2n0vb5a5qfhdny8giivqlyq04l3j9i8llv16vx80rg2";
38− })
39− # apply symbol versioning
40− (fetchpatch {
41− url = "https://github.com/Keruspe/GPaste/commit/08047752e8dba9363673ddefd422c43075f08006.patch";
42− sha256 = "0jvcs1a17sijvb2wqyn3y8shdxrhv4kwzxs39kmh9y8nyx2dzhpf";
43− })
44−
4532 ./fix-paths.patch
4633 ];
4734
pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix+5−5
@@ -1,18 +1,18 @@
1−{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, gettext, gnome3
2−, libintl }:
1+{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, gettext, vala, gnome3
2+, libintl, meson, ninja }:
33
44let
55 pname = "libgnome-games-support";
6− version = "1.4.4";
6+ version = "1.6.0.1";
77in stdenv.mkDerivation rec {
88 name = "${pname}-${version}";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq";
12+ sha256 = "0xifkj5dg4n3cy0hi76zy1ixyssxxpgy4yi4li7iq39cqbnkc9d8";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig gettext ];
15+ nativeBuildInputs = [ meson ninja pkgconfig gettext vala ];
1616 buildInputs = [ libintl ];
1717 propagatedBuildInputs = [
1818 # Required by libgnome-games-support-1.pc
pkgs/desktops/gnome-3/misc/metacity/default.nix+2−2
@@ -16,13 +16,13 @@
1616
1717let
1818 pname = "metacity";
19− version = "3.34.1";
19+ version = "3.36.0";
2020in stdenv.mkDerivation rec {
2121 name = "${pname}-${version}";
2222
2323 src = fetchurl {
2424 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
25− sha256 = "0ga57b71i2gbd723gbs3pxy1jnf44q5mnwq5yhxzn2irbh2d3iri";
25+ sha256 = "1a06763x9hshymmq36w7c588q4rbzq0w5rkyam5l6yi8p75ic016";
2626 };
2727
2828 patches = [
pkgs/desktops/pantheon/apps/elementary-terminal/default.nix+10−1
@@ -1,5 +1,6 @@
11{ stdenv
22, fetchFromGitHub
3+, fetchpatch
34, pantheon
45, pkgconfig
56, meson
@@ -37,6 +38,14 @@ stdenv.mkDerivation rec {
3738 };
3839 };
3940
41+ patches = [
42+ # fix build with vte-2.91 https://github.com/elementary/terminal/pull/488
43+ (fetchpatch {
44+ url = "https://github.com/elementary/terminal/commit/48da5328cefdc481a3ac76fbdd771096f542d55a.patch";
45+ sha256 = "1y4043jxb0qzd3pp28kdij2yj1p9pg158il7q3aq1sf7c474gz4d";
46+ })
47+ ];
48+
4049 nativeBuildInputs = [
4150 appstream
4251 desktop-file-utils
@@ -72,7 +81,7 @@ stdenv.mkDerivation rec {
7281 A super lightweight, beautiful, and simple terminal. Comes with sane defaults, browser-class tabs, sudo paste protection,
7382 smart copy/paste, and little to no configuration.
7483 '';
75− homepage = https://github.com/elementary/terminal;
84+ homepage = "https://github.com/elementary/terminal";
7685 license = licenses.lgpl3;
7786 platforms = platforms.linux;
7887 maintainers = pantheon.maintainers;
pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix+3−3
@@ -5,7 +5,7 @@
55, meson
66, ninja
77, pkgconfig
8−, vala
8+, vala_0_46
99, libgee
1010, granite
1111, gtk3
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 meson
4040 ninja
4141 pkgconfig
42− vala
42+ vala_0_46
4343 ];
4444
4545 buildInputs = [
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
7070
7171 meta = with stdenv.lib; {
7272 description = "Switchboard Online Accounts Plug";
73− homepage = https://github.com/elementary/switchboard-plug-onlineaccounts;
73+ homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts";
7474 license = licenses.lgpl2Plus;
7575 platforms = platforms.linux;
7676 maintainers = pantheon.maintainers;
pkgs/desktops/pantheon/services/cerbere/default.nix+2−2
@@ -7,7 +7,7 @@
77, ninja
88, glib
99, libgee
10−, vala
10+, vala_0_46
1111, wrapGAppsHook
1212}:
1313
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 ninja
3434 pkgconfig
3535 python3
36− vala
36+ vala_0_46
3737 wrapGAppsHook
3838 ];
3939
pkgs/desktops/plasma-5/breeze-plymouth/default.nix+2−2
@@ -26,8 +26,8 @@ in
2626
2727mkDerivation {
2828 name = "breeze-plymouth";
29− nativeBuildInputs = [ extra-cmake-modules ];
30− buildInputs = [ plymouth ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ];
29+ nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ];
30+ buildInputs = [ plymouth ];
3131 patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
3232 cmakeFlags = []
3333 ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}"
pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala
1+{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala_0_46
22, dockbarx, gtk2, xfce, pythonPackages, wafHook }:
33
44stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 pythonPath = [ dockbarx ];
1717
1818 nativeBuildInputs = [ pkgconfig wafHook ];
19− buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ]
19+ buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ]
2020 ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ])
2121 ++ pythonPath;
2222
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 '';
3232
3333 meta = with stdenv.lib; {
34− homepage = https://github.com/TiZ-EX1/xfce4-dockbarx-plugin;
34+ homepage = "https://github.com/TiZ-EX1/xfce4-dockbarx-plugin";
3535 description = "A plugins to embed DockbarX into xfce4-panel";
3636 license = licenses.mit;
3737 platforms = platforms.linux;
pkgs/development/compilers/gcc/9/default.nix+2−8
@@ -43,7 +43,7 @@ with stdenv.lib;
4343with builtins;
4444
4545let majorVersion = "9";
46− version = "${majorVersion}.2.0";
46+ version = "${majorVersion}.3.0";
4747
4848 inherit (stdenv) buildPlatform hostPlatform targetPlatform;
4949
@@ -76,7 +76,7 @@ stdenv.mkDerivation ({
7676
7777 src = fetchurl {
7878 url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
79− sha256 = "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa";
79+ sha256 = "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi";
8080 };
8181
8282 inherit patches;
@@ -245,12 +245,6 @@ stdenv.mkDerivation ({
245245
246246 inherit (stdenv) is64bit;
247247
248− # In this particular combination it stopped creating lib output at all.
249− # TODO: perhaps find a better fix? (ideally understand what's going on)
250− postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.is32bit
251− then ''mkdir "$lib"''
252− else null;
253−
254248 meta = {
255249 homepage = https://gcc.gnu.org/;
256250 license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
pkgs/development/compilers/gcc/builder.sh+2−2
@@ -201,11 +201,11 @@ postConfigure() {
201201
202202
203203preInstall() {
204+ mkdir -p "$out/${targetConfig}/lib"
205+ mkdir -p "$lib/${targetConfig}/lib"
204206 # Make ‘lib64’ symlinks to ‘lib’.
205207 if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
206− mkdir -p "$out/${targetConfig}/lib"
207208 ln -s lib "$out/${targetConfig}/lib64"
208− mkdir -p "$lib/${targetConfig}/lib"
209209 ln -s lib "$lib/${targetConfig}/lib64"
210210 fi
211211}
pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patchnew file+52
@@ -0,0 +1,52 @@
1+From 036c87c82793f1da9f98445e8e27462cc19bbe0a Mon Sep 17 00:00:00 2001
2+From: John Ericson <John.Ericson@Obsidian.Systems>
3+Date: Sat, 22 Feb 2020 14:38:38 -0500
4+Subject: [PATCH] Allow getting `no_std` from the config file
5+
6+Currently, it is only set correctly in the sanity checking implicit
7+default fallback code. Having a config file at all will for force
8+`no_std = false`.
9+---
10+ src/bootstrap/config.rs | 3 +++
11+ src/bootstrap/sanity.rs | 4 +---
12+ 2 files changed, 4 insertions(+), 3 deletions(-)
13+
14+diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
15+index 110c8b844d5..83a6934d477 100644
16+--- a/src/bootstrap/config.rs
17++++ b/src/bootstrap/config.rs
18+@@ -350,6 +350,7 @@ struct TomlTarget {
19+ musl_root: Option<String>,
20+ wasi_root: Option<String>,
21+ qemu_rootfs: Option<String>,
22++ no_std: Option<bool>,
23+ }
24+
25+ impl Config {
26+@@ -610,6 +611,8 @@ impl Config {
27+ target.musl_root = cfg.musl_root.clone().map(PathBuf::from);
28+ target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from);
29+ target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
30++ target.no_std
31++ = cfg.no_std.unwrap_or(triple.contains("-none-") || triple.contains("nvptx"));
32+
33+ config.target_config.insert(INTERNER.intern_string(triple.clone()), target);
34+ }
35+diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
36+index 8ff7056e628..76e721ed8e3 100644
37+--- a/src/bootstrap/sanity.rs
38++++ b/src/bootstrap/sanity.rs
39+@@ -194,9 +194,7 @@ pub fn check(build: &mut Build) {
40+
41+ if target.contains("-none-") || target.contains("nvptx") {
42+ if build.no_std(*target).is_none() {
43+- let target = build.config.target_config.entry(target.clone()).or_default();
44+-
45+- target.no_std = true;
46++ build.config.target_config.entry(target.clone()).or_default();
47+ }
48+
49+ if build.no_std(*target) == Some(false) {
50+--
51+2.24.1
52+
pkgs/development/compilers/rust/1_41_0.nixdeleted−48
@@ -1,48 +0,0 @@
1−# New rust versions should first go to staging.
2−# Things to check after updating:
3−# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
4−# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
5−# This testing can be also done by other volunteers as part of the pull
6−# request review, in case platforms cannot be covered.
7−# 2. The LLVM version used for building should match with rust upstream.
8−# 3. Firefox and Thunderbird should still build on x86_64-linux.
9−
10−{ stdenv, lib
11−, buildPackages
12−, newScope, callPackage
13−, CoreFoundation, Security
14−, llvmPackages_5
15−, pkgsBuildTarget, pkgsBuildBuild
16−, fetchpatch
17−} @ args:
18−
19−import ./default.nix {
20− rustcVersion = "1.41.0";
21− rustcSha256 = "0jypz2mrzac41sj0zh07yd1z36g2s2rvgsb8g624sk4l14n84ijm";
22−
23− # Note: the version MUST be one version prior to the version we're
24− # building
25− bootstrapVersion = "1.40.0";
26−
27− # fetch hashes by running `print-hashes.sh 1.40.0`
28− bootstrapHashes = {
29− i686-unknown-linux-gnu = "d050d3a1c7c45ba9c50817d45bf6d7dd06e1a4d934f633c8096b7db6ae27adc1";
30− x86_64-unknown-linux-gnu = "fc91f8b4bd18314e83a617f2389189fc7959146b7177b773370d62592d4b07d0";
31− arm-unknown-linux-gnueabihf = "4be9949c4d3c572b69b1df61c3506a3a3ac044851f025d38599612e7caa933c5";
32− armv7-unknown-linux-gnueabihf = "ebfe3978e12ffe34276272ee6d0703786249a9be80ca50617709cbfdab557306";
33− aarch64-unknown-linux-gnu = "639271f59766d291ebdade6050e7d05d61cb5c822a3ef9a1e2ab185fed68d729";
34− i686-apple-darwin = "ea189b1fb0bfda367cde6d43c18863ab4c64ffca04265e5746bf412a186fe1a2";
35− x86_64-apple-darwin = "749ca5e0b94550369cc998416b8854c13157f5d11d35e9b3276064b6766bcb83";
36− };
37−
38− selectRustPackage = pkgs: pkgs.rust_1_41_0;
39−
40− rustcPatches = [
41− (fetchpatch {
42− url = "https://github.com/QuiltOS/rust/commit/f1803452b9e95bfdbc3b8763138b9f92c7d12b46.diff";
43− sha256 = "1mzxaj46bq7ll617wg0mqnbnwr1da3hd4pbap8bjwhs3kfqnr7kk";
44− })
45− ];
46−}
47−
48−(builtins.removeAttrs args [ "fetchpatch" ])
pkgs/development/compilers/rust/1_42.nixnew file+44
@@ -0,0 +1,44 @@
1+# New rust versions should first go to staging.
2+# Things to check after updating:
3+# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
4+# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
5+# This testing can be also done by other volunteers as part of the pull
6+# request review, in case platforms cannot be covered.
7+# 2. The LLVM version used for building should match with rust upstream.
8+# 3. Firefox and Thunderbird should still build on x86_64-linux.
9+
10+{ stdenv, lib
11+, buildPackages
12+, newScope, callPackage
13+, CoreFoundation, Security
14+, llvmPackages_5
15+, pkgsBuildTarget, pkgsBuildBuild
16+} @ args:
17+
18+import ./default.nix {
19+ rustcVersion = "1.42.0";
20+ rustcSha256 = "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j";
21+
22+ # Note: the version MUST be one version prior to the version we're
23+ # building
24+ bootstrapVersion = "1.41.0";
25+
26+ # fetch hashes by running `print-hashes.sh 1.42.0`
27+ bootstrapHashes = {
28+ i686-unknown-linux-gnu = "a93a34f9cf3d35de2496352cb615b42b792eb09db3149b3a278efd2c58fa7897";
29+ x86_64-unknown-linux-gnu = "343ba8ef7397eab7b3bb2382e5e4cb08835a87bff5c8074382c0b6930a41948b";
30+ arm-unknown-linux-gnueabihf = "d0b33fcc97eeb96d716b30573c7e66affdf9077ecdecb30df2498b49f8284047";
31+ armv7-unknown-linux-gnueabihf = "3c8e787fb4f4f304a065e78c38010f0b5722d809f9dafb0e904084bf0f54f7be";
32+ aarch64-unknown-linux-gnu = "79ddfb5e2563d0ee09a567fbbe121a2aed3c3bc61255b2787f2dd42183a10f27";
33+ i686-apple-darwin = "628134b3fbaf5c0e7a25bd9a2b8d25f6e68bb256c8b04a3332ec979f5a1cd339";
34+ x86_64-apple-darwin = "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a";
35+ };
36+
37+ selectRustPackage = pkgs: pkgs.rust_1_42;
38+
39+ rustcPatches = [
40+ ./0001-Allow-getting-no_std-from-the-config-file.patch
41+ ];
42+}
43+
44+(builtins.removeAttrs args [ "fetchpatch" ])
pkgs/development/compilers/rust/rustc.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
22, fetchurl, file, python3
3−, llvm_9, darwin, git, cmake, rust, rustPlatform
3+, llvm_9, darwin, cmake, rust, rustPlatform
44, pkgconfig, openssl
55, which, libffi
66, withBundledLLVM ? false
@@ -125,7 +125,7 @@ in stdenv.mkDerivation rec {
125125 dontUseCmakeConfigure = true;
126126
127127 nativeBuildInputs = [
128− file python3 rustPlatform.rust.rustc git cmake
128+ file python3 rustPlatform.rust.rustc cmake
129129 which libffi removeReferencesTo pkgconfig
130130 ];
131131
pkgs/development/compilers/vala/default.nix+8−1
@@ -36,6 +36,8 @@ let
3636
3737 "0.46" = ./disable-graphviz-0.46.1.patch;
3838
39+ "0.48" = ./disable-graphviz-0.46.1.patch;
40+
3941 }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");
4042
4143 disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz;
@@ -120,5 +122,10 @@ in rec {
120122 sha256 = "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s";
121123 };
122124
123− vala = vala_0_46;
125+ vala_0_48 = generic {
126+ version = "0.48.1";
127+ sha256 = "61c5TAqQj/Y2I9F54J+h6dazjTHH61l9MCFInyl+cdQ=";
128+ };
129+
130+ vala = vala_0_48;
124131}
pkgs/development/go-packages/generic/default.nix+2
@@ -214,6 +214,8 @@ let
214214 find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
215215 '';
216216
217+ strictDeps = true;
218+
217219 shellHook = ''
218220 d=$(mktemp -d "--suffix=-$name")
219221 '' + toString (map (dep: ''
pkgs/development/interpreters/python/cpython/default.nix+2−1
@@ -28,6 +28,7 @@
2828, stripTkinter ? false
2929, rebuildBytecode ? true
3030, stripBytecode ? false
31+, includeSiteCustomize ? true
3132, static ? false
3233}:
3334
@@ -238,7 +239,7 @@ in with passthru; stdenv.mkDerivation {
238239 '' + optionalString stripTests ''
239240 # Strip tests
240241 rm -R $out/lib/python*/test $out/lib/python*/**/test{,s}
241− '' + ''
242+ '' + optionalString includeSiteCustomize ''
242243 # Include a sitecustomize.py file
243244 cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
244245 '' + optionalString rebuildBytecode ''
pkgs/development/interpreters/python/default.nix+3−2
@@ -96,10 +96,10 @@ in {
9696 sourceVersion = {
9797 major = "3";
9898 minor = "7";
99− patch = "6";
99+ patch = "7";
100100 suffix = "";
101101 };
102− sha256 = "0gskry19ylw91p38pdq36qcgk6h3x5i4ia0ik977kw2943kwr8jm";
102+ sha256 = "0di1y2cna823qgk6sd2lvpjdm3g2qikdd50i2bjd330dpzqsk806";
103103 inherit (darwin) configd;
104104 inherit passthruFun;
105105 };
@@ -147,6 +147,7 @@ in {
147147 stripTkinter = true;
148148 rebuildBytecode = false;
149149 stripBytecode = true;
150+ includeSiteCustomize = false;
150151 }).overrideAttrs(old: {
151152 pname = "python3-minimal";
152153 meta = old.meta // {
pkgs/development/interpreters/python/hooks/default.nix+8
@@ -89,6 +89,14 @@ in rec {
8989 };
9090 } ./python-imports-check-hook.sh) {};
9191
92+ pythonNamespacesHook = callPackage ({}:
93+ makeSetupHook {
94+ name = "python-namespaces-hook.sh";
95+ substitutions = {
96+ inherit pythonSitePackages;
97+ };
98+ } ./python-namespaces-hook.sh) {};
99+
92100 pythonRemoveBinBytecodeHook = callPackage ({ }:
93101 makeSetupHook {
94102 name = "python-remove-bin-bytecode-hook";
pkgs/development/interpreters/python/hooks/python-namespaces-hook.shnew file+40
@@ -0,0 +1,40 @@
1+# Clean up __init__.py's found in namespace directories
2+echo "Sourcing python-namespaces-hook"
3+
4+pythonNamespacesHook() {
5+ echo "Executing pythonNamespacesHook"
6+
7+ for namespace in ${pythonNamespaces[@]}; do
8+ echo "Enforcing PEP420 namespace: ${namespace}"
9+
10+ # split namespace into segments. "azure.mgmt" -> "azure mgmt"
11+ IFS='.' read -ra pathSegments <<< $namespace
12+ constructedPath=$out/@pythonSitePackages@
13+
14+ # Need to remove the __init__.py at each namespace level
15+ # E.g `azure/__init__.py` and `azure/mgmt/__init__.py`
16+ # The __pycache__ entry also needs to be removed
17+ for pathSegment in ${pathSegments[@]}; do
18+ constructedPath=${constructedPath}/${pathSegment}
19+ pathToRemove=${constructedPath}/__init__.py
20+ pycachePath=${constructedPath}/__pycache__/__init__*
21+
22+ if [ -f "$pathToRemove" ]; then
23+ echo "Removing $pathToRemove"
24+ rm "$pathToRemove"
25+ fi
26+
27+ if [ -f "$pycachePath" ]; then
28+ echo "Removing $pycachePath"
29+ rm "$pycachePath"
30+ fi
31+ done
32+ done
33+
34+ echo "Finished executing pythonNamespacesHook"
35+}
36+
37+if [ -z "${dontUsePythonNamespacesHook-}" -a -n "${pythonNamespaces-}" ]; then
38+ postFixupHooks+=(pythonNamespacesHook)
39+fi
40+
pkgs/development/interpreters/python/mk-python-derivation.nix+4
@@ -16,6 +16,7 @@
1616, pipInstallHook
1717, pythonCatchConflictsHook
1818, pythonImportsCheckHook
19+, pythonNamespacesHook
1920, pythonRemoveBinBytecodeHook
2021, pythonRemoveTestsDirHook
2122, setuptoolsBuildHook
@@ -131,6 +132,9 @@ let
131132 ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
132133 # This is a test, however, it should be ran independent of the checkPhase and checkInputs
133134 pythonImportsCheckHook
135+ ] ++ lib.optionals (python.pythonAtLeast "3.3") [
136+ # Optionally enforce PEP420 for python3
137+ pythonNamespacesHook
134138 ] ++ nativeBuildInputs;
135139
136140 buildInputs = buildInputs ++ pythonPath;
pkgs/development/interpreters/python/sitecustomize.py+16−3
@@ -21,6 +21,19 @@ paths = os.environ.pop('NIX_PYTHONPATH', None)
2121if paths:
2222 functools.reduce(lambda k, p: site.addsitedir(p, k), paths.split(':'), site._init_pathinfo())
2323
24−executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None)
25−if 'PYTHONEXECUTABLE' not in os.environ and executable:
26− sys.executable = executable
24+# Check whether we are in a venv.
25+# Note Python 2 does not support base_prefix so we assume we are not in a venv.
26+in_venv = sys.version_info.major == 3 and sys.prefix != sys.base_prefix
27+
28+if not in_venv:
29+ executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None)
30+ prefix = os.environ.pop('NIX_PYTHONPREFIX', None)
31+
32+ if 'PYTHONEXECUTABLE' not in os.environ and executable is not None:
33+ sys.executable = executable
34+ if prefix is not None:
35+ # Because we cannot check with Python 2 whether we are in a venv,
36+ # creating a venv from a Nix env won't work as well with Python 2.
37+ # Also, note that sysconfig does not like it when sys.prefix is set to None
38+ sys.prefix = sys.exec_prefix = prefix
39+ site.PREFIXES.insert(0, prefix)
pkgs/development/interpreters/python/tests.nix+11−1
@@ -2,6 +2,7 @@
22, runCommand
33, substituteAll
44, lib
5+, callPackage
56}:
67
78let
@@ -36,6 +37,7 @@ let
3637 is_venv = "True";
3738 is_nixenv = "False";
3839 };
40+
3941 # Venv built using Python Nix environment (python.buildEnv)
4042 # TODO: Cannot create venv from a nix env
4143 # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1.
@@ -49,6 +51,14 @@ let
4951 # };
5052 };
5153
54+ # All PyPy package builds are broken at the moment
55+ integrationTests = lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec {
56+ # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages
57+ nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix {
58+ interpreter = python;
59+ };
60+ };
61+
5262 testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({
5363 inherit (python) pythonVersion;
5464 } // attrs) ''
@@ -60,4 +70,4 @@ let
6070 touch $out/success
6171 '';
6272
63−in lib.mapAttrs testfun envs
73+in lib.mapAttrs testfun envs // integrationTests
pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nixnew file+25
@@ -0,0 +1,25 @@
1+{ interpreter, writeText, runCommandNoCC }:
2+
3+let
4+
5+ python = let
6+ packageOverrides = self: super: {
7+ typeddep = super.callPackage ./typeddep {};
8+ };
9+ in interpreter.override {inherit packageOverrides; self = python;};
10+
11+ pythonEnv = python.withPackages(ps: [
12+ ps.typeddep
13+ ps.mypy
14+ ]);
15+
16+ pythonScript = writeText "myscript.py" ''
17+ from typeddep import util
18+ s: str = util.echo("hello")
19+ print(s)
20+ '';
21+
22+in runCommandNoCC "${interpreter.name}-site-prefix-mypy-test" {} ''
23+ ${pythonEnv}/bin/mypy ${pythonScript}
24+ touch $out
25+''
pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nixnew file+11
@@ -0,0 +1,11 @@
1+{ buildPythonPackage }:
2+
3+
4+buildPythonPackage {
5+
6+ pname = "typeddep";
7+ version = "1.3.3.7";
8+
9+ src = ./.;
10+
11+}
pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.pynew file+18
@@ -0,0 +1,18 @@
1+from setuptools import setup
2+
3+setup(**{
4+ 'name': 'typeddep',
5+ 'version': '1.3.3.7',
6+ 'description': 'Minimal repro to test mypy and site prefixes with Nix',
7+ 'long_description': None,
8+ 'author': 'adisbladis',
9+ 'author_email': 'adisbladis@gmail.com',
10+ 'maintainer': None,
11+ 'maintainer_email': None,
12+ 'url': None,
13+ 'packages': ['typeddep'],
14+ 'package_data': {'': ['*']},
15+ 'install_requires': [],
16+ 'entry_points': {},
17+ 'python_requires': '>=3.7,<4.0',
18+})
pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.pynew file

No changes to the content.

pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typednew file

No changes to the content.

pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.pynew file+2
@@ -0,0 +1,2 @@
1+def echo(s: str) -> str:
2+ return s
pkgs/development/interpreters/python/tests/test_python.py+3−3
@@ -27,7 +27,7 @@ class TestCasePython(unittest.TestCase):
2727 def test_interpreter(self):
2828 self.assertEqual(sys.executable, INTERPRETER)
2929
30− @unittest.skipIf(IS_NIXENV or IS_PYPY, "Prefix is incorrect and needs to be fixed.")
30+ @unittest.skipIf(IS_PYPY, "Prefix is incorrect and needs to be fixed.")
3131 def test_prefix(self):
3232 self.assertEqual(sys.prefix, ENV)
3333 self.assertEqual(sys.prefix, sys.exec_prefix)
@@ -35,9 +35,9 @@ class TestCasePython(unittest.TestCase):
3535 def test_site_prefix(self):
3636 self.assertTrue(sys.prefix in site.PREFIXES)
3737
38− @unittest.skipIf(sys.version_info.major==2, "Python 2 does not have base_prefix")
38+ @unittest.skipIf(IS_PYPY or sys.version_info.major==2, "Python 2 does not have base_prefix")
3939 def test_base_prefix(self):
40− if IS_VENV:
40+ if IS_VENV or IS_NIXENV:
4141 self.assertNotEqual(sys.prefix, sys.base_prefix)
4242 else:
4343 self.assertEqual(sys.prefix, sys.base_prefix)
pkgs/development/interpreters/python/wrapper.nix+1−1
@@ -37,7 +37,7 @@ let
3737 if [ -f "$prg" ]; then
3838 rm -f "$out/bin/$prg"
3939 if [ -x "$prg" ]; then
40− makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
40+ makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
4141 fi
4242 fi
4343 done
pkgs/development/interpreters/spidermonkey/68.nixnew file+95
@@ -0,0 +1,95 @@
1+{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages
2+, which, readline, zlib, icu, cargo, rustc, llvmPackages }:
3+
4+with stdenv.lib;
5+
6+let
7+ python3Env = buildPackages.python3.withPackages (p: [p.six]);
8+in stdenv.mkDerivation rec {
9+ pname = "spidermonkey";
10+ version = "68.4.2";
11+
12+ src = fetchurl {
13+ url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
14+ sha256 = "1x1fglg1b85hb0srd6k7n5svl0nlgdm4njc8q13s2750v5ck4ljx";
15+ };
16+
17+ outputs = [ "out" "dev" ];
18+ setOutputFlags = false; # Configure script only understands --includedir
19+
20+ nativeBuildInputs = [
21+ autoconf213
22+ pkgconfig
23+ perl
24+ which
25+ python2
26+ zip
27+ cargo
28+ rustc
29+ llvmPackages.llvm
30+ ];
31+
32+ buildInputs = [
33+ readline
34+ zlib
35+ icu
36+ ];
37+
38+ preConfigure = ''
39+ export CXXFLAGS="-fpermissive"
40+ export LIBXUL_DIST=$out
41+ export PYTHON3="${python3Env.interpreter}"
42+
43+ # We can't build in js/src/, so create a build dir
44+ mkdir obj
45+ cd obj/
46+ configureScript=../js/src/configure
47+ '';
48+
49+ configureFlags = [
50+ # Reccommended by gjs upstream
51+ "--disable-jemalloc"
52+ "--enable-unaligned-private-values"
53+ "--with-intl-api"
54+ "--enable-posix-nspr-emulation"
55+ "--with-system-zlib"
56+ "--with-system-icu"
57+
58+ "--with-libclang-path=${llvmPackages.libclang}/lib"
59+ "--with-clang-path=${llvmPackages.clang}/bin/clang"
60+
61+ "--enable-shared-js"
62+ "--enable-readline"
63+ # Fedora and Arch disable optimize, but it doesn't seme to be necessary
64+ # It turns on -O3 which some gcc version had a problem with:
65+ # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
66+ "--enable-optimize"
67+ "--enable-release"
68+ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
69+ # Spidermonkey seems to use different host/build terminology for cross
70+ # compilation here.
71+ "--host=${stdenv.buildPlatform.config}"
72+ "--target=${stdenv.hostPlatform.config}"
73+ ];
74+
75+ configurePlatforms = [];
76+
77+ depsBuildBuild = [ buildPackages.stdenv.cc ];
78+
79+ # Remove unnecessary static lib
80+ preFixup = ''
81+ moveToOutput bin/js60-config "$dev"
82+ rm $out/lib/libjs_static.ajs
83+ ln -s $out/bin/js60 $out/bin/js
84+ '';
85+
86+ enableParallelBuilding = true;
87+
88+ meta = with stdenv.lib; {
89+ description = "Mozilla's JavaScript engine written in C/C++";
90+ homepage = https://developer.mozilla.org/en/SpiderMonkey;
91+ license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
92+ maintainers = [ maintainers.abbradar ];
93+ platforms = platforms.linux;
94+ };
95+}
pkgs/development/libraries/SDL2/default.nix+2−2
@@ -24,11 +24,11 @@ with stdenv.lib;
2424
2525stdenv.mkDerivation rec {
2626 pname = "SDL2";
27− version = "2.0.10";
27+ version = "2.0.12";
2828
2929 src = fetchurl {
3030 url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz";
31− sha256 = "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl";
31+ sha256 = "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il";
3232 };
3333
3434 outputs = [ "out" "dev" ];
pkgs/development/libraries/aravis/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool
2−, audit, glib, libusb, libxml2
2+, audit, glib, libusb1, libxml2
33, wrapGAppsHook
44, gstreamer ? null
55, gst-plugins-base ? null
@@ -53,7 +53,7 @@ in
5353
5454 buildInputs =
5555 [ glib libxml2 ]
56− ++ stdenv.lib.optional enableUsb libusb
56+ ++ stdenv.lib.optional enableUsb libusb1
5757 ++ stdenv.lib.optional enablePacketSocket audit
5858 ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
5959 ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ];
pkgs/development/libraries/aspell/default.nix+1
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
2828 patch interfaces/cc/aspell.h < ${./clang.patch}
2929 '';
3030
31+ nativeBuildInputs = [ perl ];
3132 buildInputs = [ perl ];
3233
3334 doCheck = true;
pkgs/development/libraries/at-spi2-core/default.nix+2−2
@@ -20,11 +20,11 @@
2020
2121stdenv.mkDerivation rec {
2222 pname = "at-spi2-core";
23− version = "2.34.0";
23+ version = "2.36.0";
2424
2525 src = fetchurl {
2626 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27− sha256 = "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn";
27+ sha256 = "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8";
2828 };
2929
3030 outputs = [ "out" "dev" ];
pkgs/development/libraries/atk/default.nix+3−3
@@ -4,7 +4,7 @@
44
55let
66 pname = "atk";
7− version = "2.34.1";
7+ version = "2.35.1";
88in
99
1010stdenv.mkDerivation rec {
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l";
15+ sha256 = "111qajn7kxwmh40drc8i6jc3hnril2rp63n207q92pl47zx614xy";
1616 };
1717
1818 outputs = [ "out" "dev" ];
1919
2020 buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
2121
22− nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
22+ nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ];
2323
2424 propagatedBuildInputs = [
2525 # Required by atk.pc
pkgs/development/libraries/cogl/default.nix+2−2
@@ -7,11 +7,11 @@ let
77 pname = "cogl";
88in stdenv.mkDerivation rec {
99 name = "${pname}-${version}";
10− version = "1.22.4";
10+ version = "1.22.6";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj";
14+ sha256 = "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd";
1515 };
1616
1717 patches = [
pkgs/development/libraries/dconf/default.nix+4−13
@@ -1,26 +1,18 @@
11{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3
2−, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }:
2+, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }:
33
44let
55 pname = "dconf";
66in
77stdenv.mkDerivation rec {
88 name = "${pname}-${version}";
9− version = "0.34.0";
9+ version = "0.36.0";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll";
13+ sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz";
1414 };
1515
16− patches = [
17− # Fix build with Meson 0.52
18− (fetchpatch {
19− url = "https://gitlab.gnome.org/GNOME/dconf/commit/cc32667c5d7d9ff95e65cc21f59905d8f9218394.patch";
20− sha256 = "02gfadn34bg818a7vb3crhsiahskiflcvx9l6iqwf1v269q93mr8";
21− })
22− ];
23−
2416 postPatch = ''
2517 chmod +x meson_post_install.py tests/test-dconf.py
2618 patchShebangs meson_post_install.py
@@ -29,7 +21,7 @@ stdenv.mkDerivation rec {
2921
3022 outputs = [ "out" "lib" "dev" "devdoc" ];
3123
32− nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 gtk-doc docbook_xsl docbook_xml_dtd_42 ];
24+ nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 glib gtk-doc docbook_xsl docbook_xml_dtd_42 ];
3325 buildInputs = [ glib bash-completion dbus ];
3426
3527 mesonFlags = [
@@ -42,7 +34,6 @@ stdenv.mkDerivation rec {
4234 passthru = {
4335 updateScript = gnome3.updateScript {
4436 packageName = pname;
45− attrPath = "gnome3.${pname}";
4637 };
4738 };
4839
pkgs/development/libraries/folks/default.nix+2−2
@@ -32,13 +32,13 @@
3232
3333stdenv.mkDerivation rec {
3434 pname = "folks";
35− version = "0.13.2";
35+ version = "0.14.0";
3636
3737 outputs = [ "out" "dev" "devdoc" ];
3838
3939 src = fetchurl {
4040 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
41− sha256 = "0wq14yjs7m3axziy679a854vc7r7fj1l38p9jnyapb21vswdcqq2";
41+ sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn";
4242 };
4343
4444 mesonFlags = [
pkgs/development/libraries/freenect/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu
1+{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu
22, GLUT, Cocoa
33 }:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9";
1414 };
1515
16− buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ]
16+ buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ]
1717 ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];
1818
1919 nativeBuildInputs = [ cmake pkgconfig ];
pkgs/development/libraries/gcr/default.nix+16−2
@@ -1,6 +1,8 @@
11{ stdenv
22, fetchurl
33, pkgconfig
4+, meson
5+, ninja
46, gettext
57, gnupg
68, p11-kit
@@ -15,30 +17,38 @@
1517, vala
1618, gnome3
1719, python3
20+, shared-mime-info
1821}:
1922
2023stdenv.mkDerivation rec {
2124 pname = "gcr";
22− version = "3.34.0";
25+ version = "3.36.0";
2326
2427 src = fetchurl {
2528 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
26− sha256 = "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9";
29+ sha256 = "00b6bzpr8rj8mvj66r2273r417wg2y21m6n88mhkq9m22z8bxyda";
2730 };
2831
2932 postPatch = ''
3033 patchShebangs build/ gcr/fixtures/
34+
35+ chmod +x meson_post_install.py
36+ patchShebangs meson_post_install.py
3137 '';
3238
3339 outputs = [ "out" "dev" ];
3440
3541 nativeBuildInputs = [
3642 pkgconfig
43+ meson
44+ python3
45+ ninja
3746 gettext
3847 gobject-introspection
3948 libxslt
4049 makeWrapper
4150 vala
51+ shared-mime-info
4252 ];
4353
4454 buildInputs = [
@@ -58,6 +68,10 @@ stdenv.mkDerivation rec {
5868 python3
5969 ];
6070
71+ mesonFlags = [
72+ "-Dgtk_doc=false"
73+ ];
74+
6175 doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
6276
6377 enableParallelBuilding = true;
pkgs/development/libraries/gjs/default.nix+79−14
@@ -1,11 +1,14 @@
11{ fetchurl
2+, fetchpatch
23, stdenv
4+, meson
5+, ninja
36, pkgconfig
47, gnome3
58, gtk3
69, atk
710, gobject-introspection
8−, spidermonkey_60
11+, spidermonkey_68
912, pango
1013, cairo
1114, readline
@@ -14,21 +17,29 @@
1417, dbus
1518, gdk-pixbuf
1619, makeWrapper
20+, xvfb_run
1721, nixosTests
1822}:
1923
20−stdenv.mkDerivation rec {
24+let
25+ testDeps = [
26+ gobject-introspection # for Gio and cairo typelibs
27+ gtk3 atk pango.out gdk-pixbuf
28+ ];
29+in stdenv.mkDerivation rec {
2130 pname = "gjs";
22− version = "1.58.5";
31+ version = "1.64.0";
2332
2433 src = fetchurl {
2534 url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
26− sha256 = "0fm1szmhdawvgbf9fh6vvkv1fdvbn888fciyi2wkhx48kz09jvg7";
35+ sha256 = "0vynivp1d10jkxfcgb5vcjkba5dvi7amkm8axmyad7l4dfy4qf36";
2736 };
2837
2938 outputs = [ "out" "dev" "installedTests" ];
3039
3140 nativeBuildInputs = [
41+ meson
42+ ninja
3243 pkgconfig
3344 makeWrapper
3445 libxml2 # for xml-stripblanks
@@ -38,30 +49,84 @@ stdenv.mkDerivation rec {
3849 gobject-introspection
3950 cairo
4051 readline
41− spidermonkey_60
52+ spidermonkey_68
4253 dbus # for dbus-run-session
4354 ];
4455
56+ checkInputs = [
57+ xvfb_run
58+ ] ++ testDeps;
59+
4560 propagatedBuildInputs = [
4661 glib
4762 ];
4863
49− configureFlags = [
50− "--enable-installed-tests"
64+ mesonFlags = [
65+ "-Dprofiler=disabled"
66+ "-Dinstalled_test_prefix=${placeholder "installedTests"}"
67+ ];
68+
69+ patches = [
70+ # Hard-code various paths
71+ ./fix-paths.patch
72+
73+ # Clean-ups to make installing installed tests separately easier.
74+ # https://gitlab.gnome.org/GNOME/gjs/merge_requests/403
75+ (fetchpatch {
76+ url = "https://gitlab.gnome.org/GNOME/gjs/commit/14bae0e2bc7e817f53f0dcd8ecd032f554d12e6f.patch";
77+ sha256 = "4eaNl2ddRMlUfBoOUnRy10+RlQR4f/mDMhjQ2txmRcg=";
78+ })
79+ (fetchpatch {
80+ url = "https://gitlab.gnome.org/GNOME/gjs/commit/075f015d7980dc94fff48a1c4021cb50691dddb1.patch";
81+ sha256 = "Iw0XfGiOUazDbpT5SqFx3UVvBRtNm3Fds1gCsdxKucw=";
82+ })
83+ (fetchpatch {
84+ url = "https://gitlab.gnome.org/GNOME/gjs/commit/5cfd2c2ffd2d8c002d40f658e1c54027dc5d8506.patch";
85+ sha256 = "rJ5Je1zcfthIl7+hRoWw3cwzz/ZkS2rtjvFOQ8znBi8=";
86+ })
87+ (fetchpatch {
88+ url = "https://gitlab.gnome.org/GNOME/gjs/commit/1a81f40e8783fe97dd00f009eb0d9ad45297e831.patch";
89+ sha256 = "+k4Xv3sJ//iDqkVTkO51IA7FPtWsS0P9YUVTWnIym4I=";
90+ })
91+ (fetchpatch {
92+ url = "https://gitlab.gnome.org/GNOME/gjs/commit/361a319789310292787d9c62665cef9e386a9b20.patch";
93+ sha256 = "ofOP1OFs9q5nW9rE/2ovbwZR6gTrDDh8cczdYipoWNE=";
94+ })
95+
96+ # Allow installing installed tests to a separate output.
97+ ./installed-tests-path.patch
5198 ];
5299
100+ # Gio test is failing
101+ # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-599325843
102+ doCheck = false;
103+
53104 postPatch = ''
54− for f in installed-tests/*.test.in; do
55− substituteInPlace "$f" --subst-var-by pkglibexecdir "$installedTests/libexec/gjs"
56− done
105+ substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console
57106 '';
58107
59− postInstall = ''
60− moveToOutput "share/installed-tests" "$installedTests"
61− moveToOutput "libexec/gjs/installed-tests" "$installedTests"
108+ preCheck = ''
109+ # Our gobject-introspection patches make the shared library paths absolute
110+ # in the GIR files. When running tests, the library is not yet installed,
111+ # though, so we need to replace the absolute path with a local one during build.
112+ # We are using a symlink that will be overridden during installation.
113+ mkdir -p $out/lib $installedTests/libexec/gjs/installed-tests
114+ ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
115+ ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/gjs/installed-tests/libgimarshallingtests.so
116+ ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/gjs/installed-tests/libregress.so
117+ ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/gjs/installed-tests/libwarnlib.so
118+ '';
62119
120+ postInstall = ''
63121 wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \
64− --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk-pixbuf ]}:$installedTests/libexec/gjs/installed-tests"
122+ --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
123+ '';
124+
125+ checkPhase = ''
126+ runHook preCheck
127+ xvfb-run -s '-screen 0 800x600x24' \
128+ meson test --print-errorlogs
129+ runHook postCheck
65130 '';
66131
67132 separateDebugInfo = stdenv.isLinux;
pkgs/development/libraries/gjs/fix-paths.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh
2+index 0d118490..54c5507e 100755
3+--- a/installed-tests/debugger-test.sh
4++++ b/installed-tests/debugger-test.sh
5+@@ -3,7 +3,7 @@
6+ if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then
7+ gjs="$TOP_BUILDDIR/gjs-console"
8+ else
9+- gjs=gjs-console
10++ gjs=@gjsConsole@
11+ fi
12+
13+ echo 1..1
pkgs/development/libraries/gjs/installed-tests-path.patchnew file+24
@@ -0,0 +1,24 @@
1+diff --git a/installed-tests/meson.build b/installed-tests/meson.build
2+index 294d20c6..1e5029e0 100644
3+--- a/installed-tests/meson.build
4++++ b/installed-tests/meson.build
5+@@ -1,7 +1,7 @@
6+ ### Installed tests ############################################################
7+
8+-installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests'
9+-installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name()
10++installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests'
11++installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name()
12+
13+ # Simple shell script tests #
14+
15+diff --git a/meson_options.txt b/meson_options.txt
16+index 66f66024..008687cb 100644
17+--- a/meson_options.txt
18++++ b/meson_options.txt
19+@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,
20+ description: 'Skip tests that need a display connection')
21+ option('verbose_logs', type: 'boolean', value: false,
22+ description: 'Enable extra log messages that may decrease performance (not allowed in release builds)')
23++option('installed_test_prefix', type: 'string', value: '',
24++ description: 'Prefix for installed tests')
pkgs/development/libraries/glib-networking/default.nix+2−2
@@ -18,13 +18,13 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "glib-networking";
21− version = "2.62.3";
21+ version = "2.64.0";
2222
2323 outputs = [ "out" "installedTests" ];
2424
2525 src = fetchurl {
2626 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27− sha256 = "1xvzixzwwh8wk8f79qbm2gl7hp3hj1a7skv281v5qsx74dpzi8cc";
27+ sha256 = "1fm1462v7z556qivlwflvc3qpz36jwpzqxxvsihh45j7aka2gnjw";
2828 };
2929
3030 patches = [
pkgs/development/libraries/glib/default.nix+2−12
@@ -48,11 +48,11 @@ in
4848
4949stdenv.mkDerivation rec {
5050 pname = "glib";
51− version = "2.62.5";
51+ version = "2.64.1";
5252
5353 src = fetchurl {
5454 url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
55− sha256 = "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq";
55+ sha256 = "1ixvjmsrj45xq9bq3chhj98jhgcsqa08v627mjx6sjxlph1pd5hp";
5656 };
5757
5858 patches = optionals stdenv.isDarwin [
@@ -62,8 +62,6 @@ stdenv.mkDerivation rec {
6262 ./gobject_init_on_demand.patch
6363 ] ++ [
6464 ./schema-override-variable.patch
65− # Require substituteInPlace in postPatch
66− ./fix-gio-launch-desktop-path.patch
6765
6866 # GLib contains many binaries used for different purposes;
6967 # we will install them to different outputs:
@@ -126,9 +124,6 @@ stdenv.mkDerivation rec {
126124 ];
127125
128126 postPatch = ''
129− # substitute fix-gio-launch-desktop-path.patch
130− substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin"
131−
132127 chmod +x gio/tests/gengiotypefuncs.py
133128 patchShebangs gio/tests/gengiotypefuncs.py
134129 chmod +x docs/reference/gio/concat-files-helper.py
@@ -148,11 +143,6 @@ stdenv.mkDerivation rec {
148143 # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
149144 sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
150145 -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
151− '' + optionalString (!stdenv.isDarwin) ''
152− # Add gio-launch-desktop to $out so we can refer to it from $lib
153− mkdir $out/bin
154− mv "$bin/bin/gio-launch-desktop" "$out/bin/"
155− ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
156146 '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
157147 cp -r ${buildPackages.glib.devdoc} $devdoc
158148 '';
pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patchdeleted−11
@@ -1,11 +0,0 @@
1−--- a/gio/gdesktopappinfo.c
2−+++ b/gio/gdesktopappinfo.c
3−@@ -2725,7 +2725,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
4−
5− /* Fall back on usual searching in $PATH */
6− if (tmp == NULL)
7−- tmp = "gio-launch-desktop";
8−+ tmp = "@bindir@/gio-launch-desktop";
9− g_once_init_leave (&gio_launch_desktop_path, tmp);
10− }
11−
pkgs/development/libraries/gmime/3.nix+10−6
@@ -1,20 +1,24 @@
1−{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection }:
1+{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection
2+, vala }:
23
34stdenv.mkDerivation rec {
4− version = "3.2.5";
5+ version = "3.2.6";
56 pname = "gmime";
67
78 src = fetchurl {
89 url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz";
9− sha256 = "0ndsg1z1kq4w4caascydvialpyn4rfbjdn7xclzbzhw53x85cxgv";
10+ sha256 = "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb";
1011 };
1112
1213 outputs = [ "out" "dev" ];
1314
14− buildInputs = [ gobject-introspection zlib gpgme libidn2 libunistring ];
15+ buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ];
1516 nativeBuildInputs = [ pkgconfig ];
1617 propagatedBuildInputs = [ glib ];
17− configureFlags = [ "--enable-introspection=yes" ];
18+ configureFlags = [
19+ "--enable-introspection=yes"
20+ "--enable-vala=yes"
21+ ];
1822
1923 postPatch = ''
2024 substituteInPlace tests/testsuite.c \
@@ -28,7 +32,7 @@ stdenv.mkDerivation rec {
2832 enableParallelBuilding = true;
2933
3034 meta = with stdenv.lib; {
31− homepage = https://github.com/jstedfast/gmime/;
35+ homepage = "https://github.com/jstedfast/gmime/";
3236 description = "A C/C++ library for creating, editing and parsing MIME messages and structures";
3337 license = licenses.lgpl21Plus;
3438 maintainers = with maintainers; [ ];
pkgs/development/libraries/gnome-menus/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-menus";
5− version = "3.32.0";
5+ version = "3.36.0";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "0x2blzqrapmbsbfzxjcdcpa3vkw9hq5k96h9kvjmy9kl415wcl68";
9+ sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r";
1010 };
1111
1212 makeFlags = [
pkgs/development/libraries/gnome-online-accounts/default.nix+2−3
@@ -30,7 +30,7 @@
3030
3131stdenv.mkDerivation rec {
3232 pname = "gnome-online-accounts";
33− version = "3.34.1";
33+ version = "3.36.0";
3434
3535 # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
3636 src = fetchFromGitLab {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 owner = "GNOME";
3939 repo = "gnome-online-accounts";
4040 rev = version;
41− sha256 = "0ry06qw068rqn4y42953kwl6fkxpgfya58y87cd3zink6gj7q0fm";
41+ sha256 = "15j3xh93rqjphjw56j00g40m684nr4zy3hs7dsngm6a21l87fkfd";
4242 };
4343
4444 outputs = [ "out" "man" "dev" "devdoc" ];
@@ -92,7 +92,6 @@ stdenv.mkDerivation rec {
9292 passthru = {
9393 updateScript = gnome3.updateScript {
9494 packageName = pname;
95− attrPath = "gnome3.${pname}";
9695 };
9796 };
9897
pkgs/development/libraries/gobject-introspection/default.nix+19−7
@@ -7,17 +7,14 @@
77# it may be worth thinking about using multiple derivation outputs
88# In that case its about 6MB which could be separated
99
10−let
11− pname = "gobject-introspection";
12− version = "1.62.0";
13−in
1410with stdenv.lib;
1511stdenv.mkDerivation rec {
16− name = "${pname}-${version}";
12+ pname = "gobject-introspection";
13+ version = "1.64.0";
1714
1815 src = fetchurl {
19− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
20− sha256 = "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi";
16+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
17+ sha256 = "10pwykfnk7pw8k9k8iz3p72phxvyrh5q4d7gr3ysv08w15immh7a";
2118 };
2219
2320 outputs = [ "out" "dev" "man" ];
@@ -32,6 +29,8 @@ stdenv.mkDerivation rec {
3229
3330 mesonFlags = [
3431 "--datadir=${placeholder "dev"}/share"
32+ "-Ddoctool=disabled"
33+ "-Dcairo=disabled"
3534 ];
3635
3736 # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
@@ -56,6 +55,19 @@ stdenv.mkDerivation rec {
5655
5756 doCheck = !stdenv.isAarch64;
5857
58+ preBuild = ''
59+ # Our gobject-introspection patches make the shared library paths absolute
60+ # in the GIR files. When running tests, the library is not yet installed,
61+ # though, so we need to replace the absolute path with a local one during build.
62+ # We are using a symlink that we will delete before installation.
63+ mkdir -p $out/lib
64+ ln -s $PWD/tests/scanner/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary}
65+ cleanLibregressSymlink() {
66+ rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary}
67+ }
68+ preInstallPhases="$preInstallPhases cleanLibregressSymlink"
69+ '';
70+
5971 passthru = {
6072 updateScript = gnome3.updateScript {
6173 packageName = pname;
pkgs/development/libraries/gpgme/default.nix+16−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
1+{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
22, file, which, ncurses
33, texinfo
44, buildPackages
@@ -20,6 +20,21 @@ stdenv.mkDerivation rec {
2020 sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4";
2121 };
2222
23+ patches = [
24+ # Fix tests with gnupg > 2.2.19
25+ # https://dev.gnupg.org/T4820
26+ (fetchpatch {
27+ name = "cff600f1f65a2164ab25ff2b039cba008776ce62.patch";
28+ url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=cff600f1f65a2164ab25ff2b039cba008776ce62";
29+ sha256 = "9vB2aTv3zeAQS3UxCDfkRjqUlng8lkcyJPgMzdm+Qzc=";
30+ })
31+ (fetchpatch {
32+ name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch";
33+ url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992";
34+ sha256 = "pKL1tvUw7PB2w4FHSt2up4SvpFiprBH6TLdgKxYFC3g=";
35+ })
36+ ];
37+
2338 outputs = [ "out" "dev" "info" ];
2439 outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
2540
pkgs/development/libraries/grilo-plugins/default.nix−1
@@ -87,7 +87,6 @@ stdenv.mkDerivation rec {
8787 passthru = {
8888 updateScript = gnome3.updateScript {
8989 packageName = pname;
90− attrPath = "gnome3.${pname}";
9190 versionPolicy = "none";
9291 };
9392 };
pkgs/development/libraries/gsettings-desktop-schemas/default.nix+3−3
@@ -7,11 +7,11 @@
77
88stdenv.mkDerivation rec {
99 pname = "gsettings-desktop-schemas";
10− version = "3.34.0";
10+ version = "3.36.0";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
14− sha256 = "1bayr76aylawf2fhyjhv9zgk4kpv7ivrrmd80khb0h3h1wk092r8";
14+ sha256 = "19hfjqzddkmvxg80v23xpbd1my2pzjalx3d56d2k4dk5521vcjkn";
1515 };
1616
1717 passthru = {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939
4040 buildInputs = [ glib gobject-introspection ];
4141
42− nativeBuildInputs = [ pkgconfig python3 meson ninja ];
42+ nativeBuildInputs = [ pkgconfig python3 meson ninja glib ];
4343
4444 meta = with stdenv.lib; {
4545 maintainers = gnome3.maintainers;
pkgs/development/libraries/gstreamer/bad/default.nix+7
@@ -1,5 +1,6 @@
11{ stdenv
22, fetchurl
3+, fetchpatch
34, meson
45, ninja
56, gettext
@@ -96,6 +97,12 @@ in stdenv.mkDerivation rec {
9697 };
9798
9899 patches = [
100+ # Fix build with neon 0.31
101+ # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165
102+ (fetchpatch {
103+ url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/f10b424418e448211e3427a76fcd046e157ef0b7.patch";
104+ sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p";
105+ })
99106 ./fix_pkgconfig_includedir.patch
100107 ];
101108
pkgs/development/libraries/gstreamer/base/default.nix+4−1
@@ -37,6 +37,7 @@
3737, enableGl ? (enableX11 || enableWayland || enableCocoa)
3838, enableCdparanoia ? (!stdenv.isDarwin)
3939, cdparanoia
40+, glib
4041}:
4142
4243stdenv.mkDerivation rec {
@@ -60,13 +61,15 @@ stdenv.mkDerivation rec {
6061 pkgconfig
6162 python3
6263 gettext
64+ orc
65+ glib
6366 gobject-introspection
6467
6568 # docs
6669 gtk-doc
6770 docbook_xsl
6871 docbook_xml_dtd_43
69− ];
72+ ] ++ lib.optional enableWayland wayland;
7073
7174 buildInputs = [
7275 orc
pkgs/development/libraries/gstreamer/core/default.nix+4−1
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
4848 flex
4949 python3
5050 makeWrapper
51+ glib
5152 gobject-introspection
5253 bash-completion
5354
@@ -57,7 +58,9 @@ stdenv.mkDerivation rec {
5758 docbook_xml_dtd_43
5859 ];
5960
60− buildInputs = lib.optionals stdenv.isLinux [
61+ buildInputs = [
62+ bash-completion
63+ ] ++ lib.optionals stdenv.isLinux [
6164 libcap
6265 libunwind
6366 elfutils
pkgs/development/libraries/gtk/3.x.nix+5
@@ -70,6 +70,11 @@ stdenv.mkDerivation rec {
7070 url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
7171 sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
7272 })
73+ # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1528
74+ (fetchpatch {
75+ url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3c28751dee115e969a58a733f2f19e71062b9d2d.patch";
76+ sha256 = "1rqrmymwd22dsiy7agjw13mcyic3by6020rxyaw7zslnmyzfiwc3";
77+ })
7378 # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002
7479 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch
7580 ] ++ optionals stdenv.isDarwin [
pkgs/development/libraries/gtksourceview/3.x.nix+1−1
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545 passthru = {
4646 updateScript = gnome3.updateScript {
4747 packageName = "gtksourceview";
48− attrPath = "gnome3.gtksourceview";
48+ attrPath = "gtksourceview3";
4949 };
5050 };
5151
pkgs/development/libraries/gtksourceviewmm/default.nix−1
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
1212 passthru = {
1313 updateScript = gnome3.updateScript {
1414 packageName = "gtksourceviewmm";
15− attrPath = "gnome3.gtksourceviewmm";
1615 versionPolicy = "none";
1716 };
1817 };
pkgs/development/libraries/gvfs/default.nix+2−2
@@ -41,11 +41,11 @@
4141
4242stdenv.mkDerivation rec {
4343 pname = "gvfs";
44− version = "1.42.2";
44+ version = "1.44.0";
4545
4646 src = fetchurl {
4747 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
48− sha256 = "0jgrbid8a61hgh05wl8c4f4638x7dffd5vip02jmladxfdszjymm";
48+ sha256 = "165fa81v7b4ca6brsjxmhkv0r542f93204zvckhqsjswwsp6195w";
4949 };
5050
5151 postPatch = ''
pkgs/development/libraries/http-parser/default.nix+3−3
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub }:
22
33let
4− version = "2.9.3";
4+ version = "2.9.4";
55in stdenv.mkDerivation {
66 pname = "http-parser";
77 inherit version;
@@ -10,7 +10,7 @@ in stdenv.mkDerivation {
1010 owner = "nodejs";
1111 repo = "http-parser";
1212 rev = "v${version}";
13− sha256 = "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811";
13+ sha256 = "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c";
1414 };
1515
1616 NIX_CFLAGS_COMPILE = "-Wno-error";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
2222
2323 meta = with stdenv.lib; {
2424 description = "An HTTP message parser written in C";
25− homepage = https://github.com/nodejs/http-parser;
25+ homepage = "https://github.com/nodejs/http-parser";
2626 maintainers = with maintainers; [ matthewbauer ];
2727 license = licenses.mit;
2828 platforms = platforms.unix;
pkgs/development/libraries/indilib/default.nix+30−6
@@ -1,5 +1,15 @@
1−{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova
2−, curl, libjpeg, gsl }:
1+{ stdenv
2+, fetchurl
3+, cmake
4+, cfitsio
5+, libusb1
6+, zlib
7+, boost
8+, libnova
9+, curl
10+, libjpeg
11+, gsl
12+}:
313
414stdenv.mkDerivation {
515 name = "indilib-1.1.0";
@@ -9,13 +19,27 @@ stdenv.mkDerivation {
919 sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w";
1020 };
1121
12− patches = [ ./udev-dir.patch ] ;
22+ patches = [
23+ ./udev-dir.patch
24+ ];
1325
14− buildInputs = [ curl cmake cfitsio libusb zlib boost
15− libnova libjpeg gsl ];
26+ nativeBuildInputs = [
27+ cmake
28+ ];
29+
30+ buildInputs = [
31+ curl
32+ cfitsio
33+ libusb1
34+ zlib
35+ boost
36+ libnova
37+ libjpeg
38+ gsl
39+ ];
1640
1741 meta = {
18− homepage = https://www.indilib.org/;
42+ homepage = "https://www.indilib.org/";
1943 license = stdenv.lib.licenses.lgpl2Plus;
2044 description = "Implementaion of the INDI protocol for POSIX operating systems";
2145 platforms = stdenv.lib.platforms.unix;
pkgs/development/libraries/json-glib/default.nix+1−1
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
1414 };
1515
1616 propagatedBuildInputs = [ glib ];
17− nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
17+ nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ];
1818 buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
1919
2020 outputs = [ "out" "dev" ];
pkgs/development/libraries/libbluray/default.nix+3−3
@@ -19,11 +19,11 @@ assert withFonts -> freetype != null;
1919
2020stdenv.mkDerivation rec {
2121 pname = "libbluray";
22− version = "1.1.2";
22+ version = "1.2.0";
2323
2424 src = fetchurl {
2525 url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
26− sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3";
26+ sha256 = "04bcd53ml0zn8b4f9r1grs0yy20rcirji1v3pxzaf4i5zl3flhfd";
2727 };
2828
2929 patches = optional withJava ./BDJ-JARFILE-path.patch;
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
5656 ;
5757
5858 meta = with stdenv.lib; {
59− homepage = http://www.videolan.org/developers/libbluray.html;
59+ homepage = "http://www.videolan.org/developers/libbluray.html";
6060 description = "Library to access Blu-Ray disks for video playback";
6161 license = licenses.lgpl21;
6262 maintainers = with maintainers; [ abbradar ];
pkgs/development/libraries/libcroco/default.nixdeleted−32
@@ -1,32 +0,0 @@
1−{ stdenv, fetchurl, pkgconfig, libxml2, glib, gnome3 }:
2−
3−stdenv.mkDerivation rec {
4− pname = "libcroco";
5− version = "0.6.13";
6−
7− src = fetchurl {
8− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn";
10− };
11−
12− outputs = [ "out" "dev" ];
13− outputBin = "dev";
14−
15− configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
16−
17− nativeBuildInputs = [ pkgconfig ];
18− buildInputs = [ libxml2 glib ];
19−
20− passthru = {
21− updateScript = gnome3.updateScript {
22− packageName = pname;
23− };
24− };
25−
26− meta = with stdenv.lib; {
27− description = "GNOME CSS2 parsing and manipulation toolkit";
28− homepage = https://gitlab.gnome.org/GNOME/libcroco;
29− license = licenses.lgpl2;
30− platforms = platforms.unix;
31− };
32−}
pkgs/development/libraries/libdazzle/default.nix+3−3
@@ -3,17 +3,17 @@
33
44stdenv.mkDerivation rec {
55 pname = "libdazzle";
6− version = "3.34.1";
6+ version = "3.36.0";
77
88 outputs = [ "out" "dev" "devdoc" ];
99 outputBin = "dev";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "01cmcrd75b7ns7j2b4p6h7pv68vjhkcl9zbvzzx7pf4vknxir61x";
13+ sha256 = "0n6r16a07in82cnzw91vl675pbjzbvazkxwbqxq2kihganzipcw2";
1414 };
1515
16− nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run ];
16+ nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
1717 buildInputs = [ glib gtk3 ];
1818
1919 mesonFlags = [
pkgs/development/libraries/libdvdnav/default.nix+3−3
@@ -2,18 +2,18 @@
22
33stdenv.mkDerivation rec {
44 pname = "libdvdnav";
5− version = "6.0.1";
5+ version = "6.1.0";
66
77 src = fetchurl {
88 url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2";
9− sha256 = "0cv7j8irsv1n2dadlnhr6i1b8pann2ah6xpxic41f04my6ba6rp5";
9+ sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
1313 buildInputs = [libdvdread];
1414
1515 meta = {
16− homepage = http://dvdnav.mplayerhq.hu/;
16+ homepage = "http://dvdnav.mplayerhq.hu/";
1717 description = "A library that implements DVD navigation features such as DVD menus";
1818 license = stdenv.lib.licenses.gpl2;
1919 maintainers = [ stdenv.lib.maintainers.wmertens ];
pkgs/development/libraries/libdvdread/default.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libdvdread";
5− version = "6.0.2";
5+ version = "6.1.0";
66
77 src = fetchurl {
88 url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2";
9− sha256 = "1c7yqqn67m3y3n7nfrgrnzz034zjaw5caijbwbfrq89v46ph257r";
9+ sha256 = "033mnhq3mx0qz3z85vw01rz5wzmx5ynadl7q1wm2spvx3ryvs6sh";
1010 };
1111
1212 buildInputs = [libdvdcss];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 '';
1919
2020 meta = {
21− homepage = http://dvdnav.mplayerhq.hu/;
21+ homepage = "http://dvdnav.mplayerhq.hu/";
2222 description = "A library for reading DVDs";
2323 license = stdenv.lib.licenses.gpl2;
2424 maintainers = [ stdenv.lib.maintainers.wmertens ];
pkgs/development/libraries/libev/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libev";
5− version="4.31";
5+ version="4.33";
66
77 src = fetchurl {
88 url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz";
9− sha256 = "0nkfqv69wfyy2bpga4d53iqydycpik8jp8x6q70353hia8mmv1gd";
9+ sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh";
1010 };
1111
1212 configureFlags = stdenv.lib.optional (static) "LDFLAGS=-static";
pkgs/development/libraries/libevdev/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "17pb5375njb1r05xmk0r57a2j986ihglh2n5nqcylbag4rj8mqg7";
1010 };
1111
12− buildInputs = [ python3 ];
12+ nativeBuildInputs = [ python3 ];
1313
1414 meta = with stdenv.lib; {
1515 description = "Wrapper library for evdev devices";
pkgs/development/libraries/libfprint/default.nix+2−2
@@ -5,7 +5,7 @@
55, pkgconfig
66, meson
77, ninja
8−, libusb
8+, libusb1
99, pixman
1010, glib
1111, nss
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 ];
4848
4949 buildInputs = [
50− libusb
50+ libusb1 # drop in 2.0 for gusb
5151 pixman
5252 glib
5353 nss
pkgs/development/libraries/libgweather/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "libgweather";
6− version = "3.34.0";
6+ version = "3.36.0";
77
88 outputs = [ "out" "dev" "devdoc" ];
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "1fgiqswkhiaijanml3mb16ajn5aanrk7x6yiwagp9n9rssam6902";
12+ sha256 = "0bd30g3facfcgf18y2110xhc7ijly313y49mpwdkvl482z0fxzyj";
1313 };
1414
1515 nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
pkgs/development/libraries/libhandy/default.nix+1−1
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 };
2222
2323 nativeBuildInputs = [
24− meson ninja pkgconfig gobject-introspection vala
24+ meson ninja pkgconfig gobject-introspection vala libxml2
2525 gtk-doc docbook_xsl docbook_xml_dtd_43
2626 ];
2727 buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ];
pkgs/development/libraries/libinput/default.nix+7−7
@@ -27,11 +27,11 @@ in
2727with stdenv.lib;
2828stdenv.mkDerivation rec {
2929 pname = "libinput";
30− version = "1.15.2";
30+ version = "1.15.3";
3131
3232 src = fetchurl {
3333 url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
34− sha256 = "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p";
34+ sha256 = "0kb9i1xav8hmrl6g0qdq7jii589i9sjjrbh43fsc5284smyl44jv";
3535 };
3636
3737 outputs = [ "bin" "out" "dev" ];
@@ -45,12 +45,12 @@ stdenv.mkDerivation rec {
4545 ];
4646
4747 nativeBuildInputs = [ pkgconfig meson ninja ]
48− ++ optionals documentationSupport [ doxygen graphviz sphinx-build ]
49− ++ optionals testsSupport [ valgrind ];
48+ ++ optionals documentationSupport [ doxygen graphviz sphinx-build ];
5049
51− buildInputs = [ libevdev mtdev libwacom (python3.withPackages (pkgs: with pkgs; [ evdev ])) ]
52− ++ optionals eventGUISupport [ cairo glib gtk3 ]
53− ++ optionals testsSupport [ check ];
50+ buildInputs = [ libevdev mtdev libwacom ]
51+ ++ optionals eventGUISupport [ cairo glib gtk3 ];
52+
53+ checkInputs = [ (python3.withPackages (pkgs: with pkgs; [ evdev ])) check valgrind ];
5454
5555 propagatedBuildInputs = [ udev ];
5656
pkgs/development/libraries/libirecovery/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig
2−, libusb
2+, libusb1
33, readline
44}:
55
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 ];
2525
2626 buildInputs = [
27− libusb
27+ libusb1
2828 readline
2929 ];
3030
pkgs/development/libraries/libmodulemd/default.nix+27−8
@@ -1,46 +1,65 @@
11{ stdenv
2+, substituteAll
23, fetchFromGitHub
3−, pkgconfig
4+, fetchpatch
5+, pkg-config
46, meson
57, ninja
68, gobject-introspection
79, python3
810, libyaml
11+, rpm
12+, file
913, gtk-doc
10−, docbook_xsl
14+, docbook-xsl-nons
15+, help2man
1116, docbook_xml_dtd_412
1217, glib
1318}:
1419
1520stdenv.mkDerivation rec {
1621 pname = "libmodulemd";
17− version = "2.6.0";
22+ version = "2.9.2";
1823
19− outputs = [ "out" "devdoc" "py" ];
24+ outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ];
2025
2126 src = fetchFromGitHub {
2227 owner = "fedora-modularity";
2328 repo = pname;
2429 rev = "${pname}-${version}";
25− sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i";
30+ sha256 = "dm0uvzM5v1zDQVkonHbrT9l9ICnXZbCSiLRCMZRxhXY=";
2631 };
2732
2833 patches = [
29− ./pygobject-dir.patch
34+ # Use proper glib devdoc path.
35+ (substituteAll {
36+ src = ./glib-devdoc.patch;
37+ glib_devdoc = glib.devdoc;
38+ })
39+
40+ # Install pygobject overrides to our prefix instead of python3 one.
41+ # https://github.com/fedora-modularity/libmodulemd/pull/467
42+ (fetchpatch {
43+ url = "https://github.com/fedora-modularity/libmodulemd/commit/516cb64fd1488716a188add2715c8b3296960bd6.patch";
44+ sha256 = "ZWagkqKkD9CIkcYsKLtC0+qjLp80wH3taivUCn8jQbY=";
45+ })
3046 ];
3147
3248 nativeBuildInputs = [
33− pkgconfig
49+ pkg-config
3450 meson
3551 ninja
3652 gtk-doc
37− docbook_xsl
53+ docbook-xsl-nons
54+ help2man
3855 docbook_xml_dtd_412
3956 gobject-introspection
4057 ];
4158
4259 buildInputs = [
4360 libyaml
61+ rpm
62+ file # for libmagic
4463 glib
4564 ];
4665
pkgs/development/libraries/libmodulemd/glib-devdoc.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/meson.build b/meson.build
2+index a8b02b4..dd31a76 100644
3+--- a/meson.build
4++++ b/meson.build
5+@@ -67,7 +67,7 @@ test = find_program('test')
6+ with_docs = get_option('with_docs')
7+ if with_docs
8+ gtkdoc = dependency('gtk-doc')
9+- glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
10++ glib_docpath = join_paths('@glib_devdoc@', 'share', 'gtk-doc', 'html')
11+
12+ ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
13+ if ret.returncode() != 0
pkgs/development/libraries/libmodulemd/pygobject-dir.patchdeleted−45
@@ -1,45 +0,0 @@
1−diff --git a/bindings/python/meson.build b/bindings/python/meson.build
2−index 4358b79..61fd5a5 100644
3−--- a/bindings/python/meson.build
4−+++ b/bindings/python/meson.build
5−@@ -1,3 +1,5 @@
6−+pygobject_override_dir = get_option('pygobject_override_dir')
7−+
8− get_overridedir = '''
9− import os
10− import sysconfig
11−@@ -21,7 +23,7 @@ print(overridedir)
12− '''
13−
14− # Python 3
15−-if (get_option('with_py3_overrides'))
16−+if (get_option('with_py3_overrides')) and pygobject_override_dir == ''
17− ret = run_command([python3, '-c', get_overridedir])
18−
19− if ret.returncode() != 0
20−@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides'))
21− endif
22−
23− # Python 2
24−-if (get_option('with_py2_overrides'))
25−+if (get_option('with_py2_overrides')) and pygobject_override_dir == ''
26− ret2 = run_command([python2, '-c', get_overridedir])
27−
28− if ret2.returncode() != 0
29−@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides'))
30−
31− install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir)
32− endif
33−+
34−+if pygobject_override_dir != ''
35−+ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir)
36−+endif
37−diff --git a/meson_options.txt b/meson_options.txt
38−index 147419f..9071a04 100644
39−--- a/meson_options.txt
40−+++ b/meson_options.txt
41−@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false)
42− option('python_name', type : 'string')
43− option('with_py2_overrides', type : 'boolean', value : false)
44− option('with_py3_overrides', type : 'boolean', value : true)
45−+option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory')
pkgs/development/libraries/libosinfo/default.nix+51−13
@@ -1,24 +1,59 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, gtk-doc, docbook_xsl
2−, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, substituteAll
1+{ stdenv
2+, fetchurl
3+, fetchpatch
4+, pkgconfig
5+, meson
6+, ninja
7+, gettext
8+, gobject-introspection
9+, gtk-doc
10+, docbook_xsl
11+, glib
12+, libsoup
13+, libxml2
14+, libxslt
15+, check
16+, curl
17+, perl
18+, hwdata
19+, osinfo-db
20+, substituteAll
321, vala ? null
422}:
523
624stdenv.mkDerivation rec {
725 pname = "libosinfo";
8− version = "1.6.0";
26+ version = "1.7.1";
927
1028 src = fetchurl {
11− url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz";
12− sha256 = "1iwh35mahch1ls3sgq7wz8kamxrxisrff5ciqzyh2qxlrqf5qf1w";
29+ url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz";
30+ sha256 = "1s97sv24bybggjx6hgqba2qdqz3ivfpd4cmkh4zm5y59sim109mv";
1331 };
1432
1533 outputs = [ "out" "dev" "devdoc" ];
1634
1735 nativeBuildInputs = [
18− pkgconfig vala gettext gobject-introspection gtk-doc docbook_xsl
36+ pkgconfig
37+ meson
38+ ninja
39+ vala
40+ gettext
41+ gobject-introspection
42+ gtk-doc
43+ docbook_xsl
44+ perl # for pod2man
45+ ];
46+ buildInputs = [
47+ glib
48+ libsoup
49+ libxml2
50+ libxslt
51+ ];
52+ checkInputs = [
53+ check
54+ curl
55+ perl
1956 ];
20− buildInputs = [ glib libsoup libxml2 libxslt ];
21− checkInputs = [ check curl perl ];
2257
2358 patches = [
2459 (substituteAll {
@@ -27,13 +62,16 @@ stdenv.mkDerivation rec {
2762 })
2863 ];
2964
30− configureFlags = [
31− "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids"
32− "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids"
33− "--enable-gtk-doc"
65+ mesonFlags = [
66+ "-Dwith-usb-ids-path=${hwdata}/share/hwdata/usb.ids"
67+ "-Dwith-pci-ids-path=${hwdata}/share/hwdata/pci.ids"
68+ "-Denable-gtk-doc=true"
3469 ];
3570
36− doCheck = true;
71+ # FIXME: fails two new tests added in 1.7.1:
72+ # libosinfo:symbols / check-symfile
73+ # 3/24 libosinfo:symbols / check-symsorting
74+ doCheck = false;
3775
3876 meta = with stdenv.lib; {
3977 description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support";
pkgs/development/libraries/libpeas/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "libpeas";
7− version = "1.24.1";
7+ version = "1.26.0";
88
99 outputs = [ "out" "dev" ];
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw";
13+ sha256 = "0xkk9zhkw8f2fm7g9nb4ry4xxig5n27s7rjmx6l7jr2941zdfxm9";
1414 };
1515
1616 nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];
pkgs/development/libraries/libpsl/default.nix+1
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
3232 pkgconfig
3333 python3
3434 valgrind
35+ libxslt
3536 ];
3637
3738 buildInputs = [
pkgs/development/libraries/librsvg/default.nix+5−5
@@ -1,22 +1,22 @@
1−{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2, libgsf
2−, bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3
1+{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2
2+, bzip2, libintl, darwin, rustc, cargo, gnome3
33, vala, gobject-introspection }:
44
55let
66 pname = "librsvg";
7− version = "2.46.4";
7+ version = "2.48.0";
88in
99stdenv.mkDerivation rec {
1010 name = "${pname}-${version}";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl";
14+ sha256 = "19ndf9l99wcrmkwcrk20vd1ggrwgldksfz1kkj786ljcrxv8nd2a";
1515 };
1616
1717 outputs = [ "out" "dev" "installedTests" ];
1818
19− buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ];
19+ buildInputs = [ libxml2 bzip2 pango libintl ];
2020
2121 propagatedBuildInputs = [ glib gdk-pixbuf cairo ];
2222
pkgs/development/libraries/libsecret/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 propagatedBuildInputs = [ glib ];
2121 nativeBuildInputs = [
2222 pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl
23− gobject-introspection vala gtk-doc
23+ gobject-introspection vala gtk-doc glib
2424 ];
2525 buildInputs = [ libgcrypt ];
2626 # optional: build docs with gtk-doc? (probably needs a flag as well)
pkgs/development/libraries/libsoup/default.nix+3−3
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "libsoup";
7− version = "2.68.4";
7+ version = "2.70.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "151j5dc84gbl6a917pxvd0b372lw5za48n63lyv6llfc48lv2l1d";
11+ sha256 = "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l";
1212 };
1313
1414 postPatch = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 outputs = [ "out" "dev" ];
1919
2020 buildInputs = [ python3 sqlite libpsl brotli ];
21− nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ];
21+ nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ];
2222 propagatedBuildInputs = [ glib libxml2 ];
2323
2424 mesonFlags = [
pkgs/development/libraries/libssh/default.nix+5−3
@@ -1,11 +1,12 @@
11{ stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
22
33stdenv.mkDerivation rec {
4− name = "libssh-0.8.7";
4+ pname = "libssh";
5+ version = "0.8.8";
56
67 src = fetchurl {
7− url = "https://www.libssh.org/files/0.8/${name}.tar.xz";
8− sha256 = "14nmwfnnrhkwcfk5hn7azl905ivbh4wllmsbw5abd80b5yi4qc23";
8+ url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz";
9+ sha256 = "1qk5bm9r6199jbfk54f8w24vkl52051g8s3kmq4z2kdc6vbpy4jb";
910 };
1011
1112 postPatch = ''
@@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
2223
2324 meta = with stdenv.lib; {
2425 description = "SSH client library";
26+ homepage = "https://libssh.org";
2527 license = licenses.lgpl2Plus;
2628 maintainers = with maintainers; [ sander ];
2729 platforms = platforms.all;
pkgs/development/libraries/libuninameslist/default.nix+3−3
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "libuninameslist";
8− version = "20190701";
8+ version = "20200313";
99
1010 src = fetchFromGitHub {
1111 owner = "fontforge";
1212 repo = pname;
1313 rev = version;
14− sha256 = "sha256:034c8clnskvqbwyiq7si4dad1kbngi3jmnrj064i39msqixmpdzb";
14+ sha256 = "1rs4mrmfcw7864kssnk559ac1sdlpl8yrd10xspxrnfz08ynqxw8";
1515 };
1616
1717 nativeBuildInputs = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 ];
2020
2121 meta = with stdenv.lib; {
22− homepage = https://github.com/fontforge/libuninameslist/;
22+ homepage = "https://github.com/fontforge/libuninameslist/";
2323 description = "A Library of Unicode names and annotation data";
2424 license = licenses.bsd3;
2525 maintainers = with maintainers; [ erictapen ];
pkgs/development/libraries/libunwind/default.nix+5−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, autoreconfHook, xz }:
1+{ stdenv, lib, fetchurl, autoreconfHook, xz }:
22
33stdenv.mkDerivation rec {
44 pname = "libunwind";
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
1111
1212 patches = [ ./backtrace-only-with-glibc.patch ];
1313
14+ postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
15+ substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh"
16+ '';
17+
1418 nativeBuildInputs = [ autoreconfHook ];
1519
1620 outputs = [ "out" "dev" ];
pkgs/development/libraries/libusb/default.nix+18−4
@@ -1,14 +1,22 @@
1−{stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1}:
1+{ stdenv
2+, lib
3+, fetchFromGitHub
4+, autoreconfHook
5+, patchelf
6+, pkgconfig
7+, libusb1
8+}:
29
310stdenv.mkDerivation rec {
4− name = "libusb-compat-${version}";
11+ pname = "libusb-compat";
512 version = "0.1.7";
613
714 outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
815 outputBin = "dev";
916
10− nativeBuildInputs = [ pkgconfig autoreconfHook ];
11− propagatedBuildInputs = [ libusb1 ];
17+ nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ];
18+
19+ buildInputs = [ libusb1 ];
1220
1321 src = fetchFromGitHub {
1422 owner = "libusb";
@@ -19,6 +27,12 @@ stdenv.mkDerivation rec {
1927
2028 patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
2129
30+ # without this, libusb-compat is unable to find libusb1
31+ postFixup = ''
32+ find $out/lib -name \*.so\* -type f -exec \
33+ patchelf --set-rpath ${lib.makeLibraryPath buildInputs} {} \;
34+ '';
35+
2236 meta = with stdenv.lib; {
2337 homepage = "https://libusb.info/";
2438 repositories.git = "https://github.com/libusb/libusb-compat-0.1";
pkgs/development/libraries/libuv/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
22
33stdenv.mkDerivation rec {
4− version = "1.34.2";
4+ version = "1.35.0";
55 pname = "libuv";
66
77 src = fetchFromGitHub {
88 owner = pname;
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "14ax49daz7j86lybi242jiry49jrnnvlyc39k6va700n03py4h9n";
11+ sha256 = "0pd94h10ay38r8fwj0qqgw908rrj83n768n8mbbpnd5w2c7wy9fz";
1212 };
1313
1414 postPatch = let
pkgs/development/libraries/libvorbis/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 (fetchpatch {
1515 url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch";
1616 sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x";
17− name = "CVE-2017-14160";
17+ name = "CVE-2017-14160+CVE-2018-10393.patch";
1818 })
1919 (fetchpatch {
2020 url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff";
pkgs/development/libraries/libwnck/3.x.nix+2−12
@@ -21,26 +21,16 @@
2121
2222stdenv.mkDerivation rec{
2323 pname = "libwnck";
24− version = "3.32.0";
24+ version = "3.36.0";
2525
2626 outputs = [ "out" "dev" "devdoc" ];
2727 outputBin = "dev";
2828
2929 src = fetchurl {
3030 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
31− sha256 = "1jp3p1lnwnwi6fxl2rz3166cmwzwy9vqz896anpwc3wdy9f875cm";
31+ sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w";
3232 };
3333
34− patches = [
35− # https://gitlab.gnome.org/GNOME/libwnck/issues/139
36− (fetchpatch {
37− url = https://gitlab.gnome.org/GNOME/libwnck/commit/0d9ff7db63af568feef8e8c566e249058ccfcb4e.patch;
38− sha256 = "18f78aayq9jma54v2qz3rm2clmz1cfq5bngxw8p4zba7hplyqsl9";
39− })
40− # https://gitlab.gnome.org/GNOME/libwnck/merge_requests/12
41− ./fix-pc-file.patch
42− ];
43−
4434 nativeBuildInputs = [
4535 meson
4636 ninja
pkgs/development/libraries/libxml2/default.nix+5
@@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
3232 url = "https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch";
3333 sha256 = "0klvaxkzakkpyq0m44l9xrpn5kwaii194sqsivfm6zhnb9hhl15l";
3434 })
35+ (fetchpatch {
36+ name = "CVE-2019-20388.patch";
37+ url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch";
38+ sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl";
39+ })
3540 ];
3641
3742 outputs = [ "bin" "dev" "out" "man" "doc" ]
pkgs/development/libraries/libzip/default.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libzip";
5− version = "1.6.0";
5+ version = "1.6.1";
66
77 src = fetchurl {
88 url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz";
9− sha256 = "1zsspz6cbbqah11jkcc894jgxihlm8gicfh54yvny9gc3lsvpi3h";
9+ sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6";
1010 };
1111
1212 # Fix pkgconfig file paths
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 '';
2828
2929 meta = with stdenv.lib; {
30− homepage = https://www.nih.at/libzip;
30+ homepage = "https://www.nih.at/libzip";
3131 description = "A C library for reading, creating and modifying zip archives";
3232 license = licenses.bsd3;
3333 platforms = platforms.unix;
pkgs/development/libraries/mesa/default.nix+14−4
@@ -27,7 +27,7 @@
2727with stdenv.lib;
2828
2929let
30− version = "19.3.3";
30+ version = "20.0.2";
3131 branch = versions.major version;
3232in
3333
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
4242 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
4343 "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
4444 ];
45− sha256 = "02czqdqf64i3az5p1allnxycyjad3x35cj0hz0017mi5pc84ikl1";
45+ sha256 = "0vz8k07d23qdwy67fnna9y0ynnni0m8lgswcmdm60l4mcv5z2m5a";
4646 };
4747
4848 prePatch = "patchShebangs .";
@@ -191,8 +191,18 @@ stdenv.mkDerivation {
191191 };
192192
193193 meta = with stdenv.lib; {
194− description = "An open source implementation of OpenGL";
195− homepage = https://www.mesa3d.org/;
194+ description = "An open source 3D graphics library";
195+ longDescription = ''
196+ The Mesa project began as an open-source implementation of the OpenGL
197+ specification - a system for rendering interactive 3D graphics. Over the
198+ years the project has grown to implement more graphics APIs, including
199+ OpenGL ES (versions 1, 2, 3), OpenCL, OpenMAX, VDPAU, VA API, XvMC, and
200+ Vulkan. A variety of device drivers allows the Mesa libraries to be used
201+ in many different environments ranging from software emulation to
202+ complete hardware acceleration for modern GPUs.
203+ '';
204+ homepage = "https://www.mesa3d.org/";
205+ changelog = "https://www.mesa3d.org/relnotes/${version}.html";
196206 license = licenses.mit; # X11 variant, in most files
197207 platforms = platforms.mesaPlatforms;
198208 maintainers = with maintainers; [ vcunat ];
pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch+10−11
@@ -1,4 +1,4 @@
1−From 6d22383149e4cdc646c68e29238f41d895a4705b Mon Sep 17 00:00:00 2001
1+From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001
22From: David McFarland <corngood@gmail.com>
33Date: Mon, 6 Aug 2018 15:52:11 -0300
44Subject: [PATCH] disk_cache: include dri driver path in cache key
@@ -12,10 +12,10 @@ timestamps in /nix/store are zero.
1212 3 files changed, 15 insertions(+), 1 deletion(-)
1313
1414diff --git a/meson_options.txt b/meson_options.txt
15−index 626baf3..579c15b 100644
15+index 1a2dd8ebd12..2ac741af5a6 100644
1616--- a/meson_options.txt
1717+++ b/meson_options.txt
18−@@ -341,6 +341,12 @@ option(
18+@@ -348,6 +348,12 @@ option(
1919 value : true,
2020 description : 'Enable direct rendering in GLX and EGL for DRI',
2121 )
@@ -29,10 +29,10 @@ index 626baf3..579c15b 100644
2929 'I-love-half-baked-turnips',
3030 type : 'boolean',
3131diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
32−index 0cd92ca..fc1c173 100644
32+index d1f14736725..2ed328f292e 100644
3333--- a/src/util/disk_cache.c
3434+++ b/src/util/disk_cache.c
35−@@ -395,8 +395,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
35+@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
3636
3737 /* Create driver id keys */
3838 size_t id_size = strlen(driver_id) + 1;
@@ -43,7 +43,7 @@ index 0cd92ca..fc1c173 100644
4343 cache->driver_keys_blob_size += gpu_name_size;
4444
4545 /* We sometimes store entire structs that contains a pointers in the cache,
46−@@ -417,6 +419,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
46+@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
4747 uint8_t *drv_key_blob = cache->driver_keys_blob;
4848 DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size)
4949 DRV_KEY_CPY(drv_key_blob, driver_id, id_size)
@@ -52,13 +52,13 @@ index 0cd92ca..fc1c173 100644
5252 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size)
5353 DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size)
5454diff --git a/src/util/meson.build b/src/util/meson.build
55−index f69ebe9..e2bd8e2 100644
55+index 9da29cc7390..5f549bb1d99 100644
5656--- a/src/util/meson.build
5757+++ b/src/util/meson.build
58−@@ -158,7 +158,12 @@ _libmesa_util = static_library(
59− [files_mesa_util, format_srgb],
58+@@ -170,7 +170,12 @@ _libmesa_util = static_library(
6059 include_directories : inc_common,
6160 dependencies : deps_for_libmesa_util,
61+ link_with: libmesa_format,
6262- c_args : [c_msvc_compat_args, c_vis_args],
6363+ c_args : [
6464+ c_msvc_compat_args, c_vis_args,
@@ -70,5 +70,4 @@ index f69ebe9..e2bd8e2 100644
7070 )
7171
7272--
73−2.24.1
74−
73+2.25.1
pkgs/development/libraries/mesa/missing-includes.patch−11
@@ -9,17 +9,6 @@
99 #include "pipe/p_compiler.h"
1010 #include "pipe/p_state.h"
1111
12−--- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200
13−+++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200
14−@@ -24,6 +24,8 @@
15− #ifndef _THREADPOOL_H_
16− #define _THREADPOOL_H_
17−
18−+#include <pthread.h>
19−+
20− #define MAXTHREADS 1
21−
22− struct threadpool {
2312--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200
2413+++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200
2514@@ -23,7 +23,9 @@
pkgs/development/libraries/neon/default.nix+3−3
@@ -14,12 +14,12 @@ let
1414in
1515
1616stdenv.mkDerivation rec {
17− version = "0.30.2";
17+ version = "0.31.0";
1818 pname = "neon";
1919
2020 src = fetchurl {
2121 url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz";
22− sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv";
22+ sha256 = "19dx4rsqrck9jl59y4ad9jf115hzh6pz1hcl2dnlfc84hc86ymc0";
2323 };
2424
2525 patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242
4343 meta = with stdenv.lib; {
4444 description = "An HTTP and WebDAV client library";
45− homepage = http://www.webdav.org/neon/;
45+ homepage = "http://www.webdav.org/neon/";
4646 platforms = platforms.unix;
4747 license = licenses.lgpl2;
4848 };
pkgs/development/libraries/nghttp2/default.nix+23−5
@@ -9,14 +9,16 @@
99, enableGetAssets ? false, libxml2 ? null
1010, enableJemalloc ? false, jemalloc ? null
1111, enableApp ? !stdenv.hostPlatform.isWindows
12+, enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null
1213}:
1314
1415assert enableHpack -> jansson != null;
1516assert enableAsioLib -> boost != null;
1617assert enableGetAssets -> libxml2 != null;
1718assert enableJemalloc -> jemalloc != null;
19+assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null;
1820
19−let inherit (stdenv.lib) optional; in
21+let inherit (stdenv.lib) optional optionals optionalString; in
2022
2123stdenv.mkDerivation rec {
2224 pname = "nghttp2";
@@ -27,7 +29,8 @@ stdenv.mkDerivation rec {
2729 sha256 = "0kyrgd4s2pq51ps5z385kw1hn62m8qp7c4h6im0g4ibrf89qwxc2";
2830 };
2931
30− outputs = [ "bin" "out" "dev" "lib" ];
32+ outputs = [ "bin" "out" "dev" "lib" ]
33+ ++ optional enablePython "python";
3134
3235 nativeBuildInputs = [ pkgconfig ];
3336 buildInputs = [ openssl ]
@@ -37,16 +40,31 @@ stdenv.mkDerivation rec {
3740 ++ optional enableHpack jansson
3841 ++ optional enableAsioLib boost
3942 ++ optional enableGetAssets libxml2
40− ++ optional enableJemalloc jemalloc;
43+ ++ optional enableJemalloc jemalloc
44+ ++ optionals enablePython [ python ncurses setuptools ];
4145
4246 enableParallelBuilding = true;
4347
4448 configureFlags = [
4549 "--with-spdylay=no"
4650 "--disable-examples"
47− "--disable-python-bindings"
4851 (stdenv.lib.enableFeature enableApp "app")
49− ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib";
52+ ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"
53+ ++ (if enablePython then [
54+ "--with-cython=${cython}/bin/cython"
55+ ] else [
56+ "--disable-python-bindings"
57+ ]);
58+
59+ preInstall = optionalString enablePython ''
60+ mkdir -p $out/${python.sitePackages}
61+ # convince installer it's ok to install here
62+ export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}"
63+ '';
64+ postInstall = optionalString enablePython ''
65+ mkdir -p $python/${python.sitePackages}
66+ mv $out/${python.sitePackages}/* $python/${python.sitePackages}
67+ '';
5068
5169 #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc
5270
pkgs/development/libraries/pango/default.nix+1
@@ -23,6 +23,7 @@ in stdenv.mkDerivation rec {
2323
2424 nativeBuildInputs = [
2525 meson ninja
26+ glib # for glib-mkenum
2627 pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
2728 ];
2829 buildInputs = [
pkgs/development/libraries/pcl/default.nix+3−3
@@ -4,13 +4,13 @@
44}:
55
66stdenv.mkDerivation rec {
7− name = "pcl-1.10.0";
7+ name = "pcl-1.10.1";
88
99 src = fetchFromGitHub {
1010 owner = "PointCloudLibrary";
1111 repo = "pcl";
1212 rev = name;
13− sha256 = "1dbfkdk9mgwzadkw9jx3f5vzrcj88qcyv745kjxld7gcv8by9g6g";
13+ sha256 = "1i4zfcikvdl5z1s3lh0n46fgi42s9vbki4hfmy7656hamajfai0v";
1414 };
1515
1616 enableParallelBuilding = true;
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 ];
2626
2727 meta = {
28− homepage = http://pointclouds.org/;
28+ homepage = "http://pointclouds.org/";
2929 description = "Open project for 2D/3D image and point cloud processing";
3030 license = stdenv.lib.licenses.bsd3;
3131 maintainers = with stdenv.lib.maintainers; [viric];
pkgs/development/libraries/pipewire/2.nixnew file+49
@@ -0,0 +1,49 @@
1+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
2+, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg
3+, sbc, SDL2, makeFontsConf
4+}:
5+
6+let
7+ fontsConf = makeFontsConf {
8+ fontDirectories = [ ];
9+ };
10+in stdenv.mkDerivation rec {
11+ pname = "pipewire";
12+ version = "0.2.7";
13+
14+ src = fetchFromGitHub {
15+ owner = "PipeWire";
16+ repo = "pipewire";
17+ rev = version;
18+ sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc";
19+ };
20+
21+ outputs = [ "out" "lib" "dev" "doc" ];
22+
23+ nativeBuildInputs = [
24+ meson ninja pkgconfig doxygen graphviz valgrind
25+ ];
26+ buildInputs = [
27+ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer
28+ alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
29+ ];
30+
31+ mesonFlags = [
32+ "-Ddocs=true"
33+ "-Dgstreamer=enabled"
34+ ];
35+
36+ PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
37+
38+ FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
39+
40+ doCheck = true;
41+
42+ meta = with stdenv.lib; {
43+ description = "Server and user space API to deal with multimedia pipelines";
44+ homepage = https://pipewire.org/;
45+ license = licenses.lgpl21;
46+ platforms = platforms.linux;
47+ maintainers = with maintainers; [ jtojnar ];
48+ };
49+}
pkgs/development/libraries/pipewire/default.nix+19−9
@@ -1,5 +1,5 @@
11{ stdenv
2−, fetchFromGitHub
2+, fetchFromGitLab
33, meson
44, ninja
55, pkgconfig
@@ -17,6 +17,11 @@
1717, xorg
1818, sbc
1919, SDL2
20+, libsndfile
21+, bluez
22+, vulkan-headers
23+, vulkan-loader
24+, libpulseaudio
2025, makeFontsConf
2126}:
2227
@@ -27,15 +32,16 @@ let
2732in
2833stdenv.mkDerivation rec {
2934 pname = "pipewire";
30− version = "0.2.7";
35+ version = "0.3.1";
3136
3237 outputs = [ "out" "lib" "dev" "doc" ];
3338
34− src = fetchFromGitHub {
35− owner = "PipeWire";
39+ src = fetchFromGitLab {
40+ domain = "gitlab.freedesktop.org";
41+ owner = "pipewire";
3642 repo = "pipewire";
3743 rev = version;
38− sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc";
44+ sha256 = "DfUgXTSSCl+JszFEKwBha67nauQi4noR25m00auXDnA=";
3945 };
4046
4147 nativeBuildInputs = [
@@ -50,25 +56,29 @@ stdenv.mkDerivation rec {
5056 buildInputs = [
5157 SDL2
5258 alsaLib
59+ bluez
5360 dbus
5461 ffmpeg
5562 glib
5663 gst_all_1.gst-plugins-base
5764 gst_all_1.gstreamer
5865 libjack2
66+ libpulseaudio
67+ libsndfile
5968 libva
6069 sbc
6170 udev
71+ vulkan-headers
72+ vulkan-loader
6273 xorg.libX11
6374 ];
6475
6576 mesonFlags = [
6677 "-Ddocs=true"
67− "-Dgstreamer=enabled"
78+ "-Dman=false" # we don't have xmltoman
79+ "-Dgstreamer=true"
6880 ];
6981
70− PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
71−
7282 FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
7383
7484 doCheck = true;
@@ -76,7 +86,7 @@ stdenv.mkDerivation rec {
7686 meta = with stdenv.lib; {
7787 description = "Server and user space API to deal with multimedia pipelines";
7888 homepage = https://pipewire.org/;
79− license = licenses.lgpl21;
89+ license = licenses.mit;
8090 platforms = platforms.linux;
8191 maintainers = with maintainers; [ jtojnar ];
8292 };
pkgs/development/libraries/popt/default.nix+3−2
@@ -1,10 +1,11 @@
11{stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
4− name = "popt-1.16";
4+ pname = "popt";
5+ version = "1.16";
56
67 src = fetchurl {
7− url = "http://rpm5.org/files/popt/${name}.tar.gz";
8+ url = "mirror://debian/pool/main/p/popt/popt_${version}.orig.tar.gz";
89 sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
910 };
1011
pkgs/development/libraries/qt-5/5.12/default.nix+5
@@ -74,6 +74,11 @@ let
7474 url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915";
7575 sha256 = "1gpcbdpyazdxnmldvhsf3pfwr2gjvi08x3j6rxf543rq01bp6cpx";
7676 })
77+ (fetchpatch {
78+ name = "QTBUG-78937.patch";
79+ url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=67a9c600ad14ee44501a6df3509daa8234b97606";
80+ sha256 = "1jiky1w9j8rka78r4q0yabb8w2l5j6csdjysynz7gs1ry4xjfdxd";
81+ })
7782 ];
7883 qtdeclarative = [ ./qtdeclarative.patch ];
7984 qtscript = [ ./qtscript.patch ];
pkgs/development/libraries/rarian/default.nix−1
@@ -18,7 +18,6 @@ in stdenv.mkDerivation rec {
1818 passthru = {
1919 updateScript = gnome3.updateScript {
2020 packageName = pname;
21− attrPath = "gnome3.${pname}";
2221 };
2322 };
2423
pkgs/development/libraries/serf/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig scons ];
12+ nativeBuildInputs = [ pkgconfig scons.py2 ];
1313 buildInputs = [ apr openssl aprutil zlib libiconv ]
1414 ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
1515
pkgs/development/libraries/swiften/default.nix+1−1
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
33 pname = "swiften";
44 version = "4.0.2";
55
6− nativeBuildInputs = [ scons];
6+ nativeBuildInputs = [ scons.py2 ];
77 buildInputs = [ python ];
88 propagatedBuildInputs = [ openssl boost ];
99
pkgs/development/libraries/tepl/default.nix+6−3
@@ -1,14 +1,14 @@
11{ stdenv, fetchurl
22, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
33let
4− version = "4.3.1";
4+ version = "4.4.0";
55 pname = "tepl";
66in stdenv.mkDerivation {
77 name = "${pname}-${version}";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "08y6vss29b65pqzv708cyqmbszgxsqqgw7g0vh6f1389ayi2lvs0";
11+ sha256 = "0mm2z849hnni7597an05mrv0dckrxjngpf2xfa0g5s17i8x6gxp6";
1212 };
1313
1414 nativeBuildInputs = [
@@ -16,8 +16,11 @@ in stdenv.mkDerivation {
1616 ];
1717
1818 buildInputs = [
19− amtk
2019 libxml2
20+ ];
21+
22+ propagatedBuildInputs = [
23+ amtk
2124 gtksourceview4
2225 libuchardet
2326 gtk3
pkgs/development/libraries/tracker-miners/default.nix+2−3
@@ -45,11 +45,11 @@
4545
4646stdenv.mkDerivation rec {
4747 pname = "tracker-miners";
48− version = "2.3.2";
48+ version = "2.3.3";
4949
5050 src = fetchurl {
5151 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
52− sha256 = "1kizavw9gbdjkw4wykgv0fcl2y6fj788nycx9p4byn6ylb1277h6";
52+ sha256 = "dHKqKNeGJiDTyiu+w7ED31R9cxnBLpWn96qfn23uSxk=";
5353 };
5454
5555 nativeBuildInputs = [
@@ -125,7 +125,6 @@ stdenv.mkDerivation rec {
125125 passthru = {
126126 updateScript = gnome3.updateScript {
127127 packageName = pname;
128− attrPath = "gnome3.${pname}";
129128 versionPolicy = "none";
130129 };
131130 };
pkgs/development/libraries/tracker/default.nix+2−3
@@ -6,13 +6,13 @@
66
77stdenv.mkDerivation rec {
88 pname = "tracker";
9− version = "2.3.2";
9+ version = "2.3.4";
1010
1111 outputs = [ "out" "dev" "devdoc" ];
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
15− sha256 = "1nzbnvwwsk6kv6kqbxwlz8vk70l9ai6b4r9qypw51vp4qy72ny54";
15+ sha256 = "V3lSJEq5d8eLC4ji9jxBl+q6FuTWa/9pK39YmT4GUW0=";
1616 };
1717
1818 nativeBuildInputs = [
@@ -52,7 +52,6 @@ stdenv.mkDerivation rec {
5252 passthru = {
5353 updateScript = gnome3.updateScript {
5454 packageName = pname;
55− attrPath = "gnome3.${pname}";
5655 versionPolicy = "none";
5756 };
5857 };
pkgs/development/libraries/vte/default.nix+6−2
@@ -18,17 +18,19 @@
1818, pcre2
1919, fribidi
2020, zlib
21+, icu
22+, systemd
2123}:
2224
2325stdenv.mkDerivation rec {
2426 pname = "vte";
25− version = "0.58.3";
27+ version = "0.60.0";
2628
2729 outputs = [ "out" "dev" ];
2830
2931 src = fetchurl {
3032 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
31− sha256 = "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12";
33+ sha256 = "06rs356lpyq60r3szhms152f7kj5jnki6a49b2w7ai0bnig9blbj";
3234 };
3335
3436 passthru = {
@@ -51,6 +53,8 @@ stdenv.mkDerivation rec {
5153 gnutls
5254 pcre2
5355 zlib
56+ icu
57+ systemd
5458 ];
5559
5660 propagatedBuildInputs = [
pkgs/development/libraries/webkitgtk/default.nix+13−2
@@ -51,6 +51,7 @@
5151, xdg-dbus-proxy
5252, substituteAll
5353, gnome3
54+, glib
5455}:
5556
5657assert enableGeoLocation -> geoclue2 != null;
@@ -61,13 +62,13 @@ with stdenv.lib;
6162
6263stdenv.mkDerivation rec {
6364 pname = "webkitgtk";
64− version = "2.26.4";
65+ version = "2.28.0";
6566
6667 outputs = [ "out" "dev" ];
6768
6869 src = fetchurl {
6970 url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
70− sha256 = "0gqi9f9njrdn8vad1zvr59b25arwc8r0n8bp25sgkbfz2c3r11j3";
71+ sha256 = "12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn";
7172 };
7273
7374 patches = optionals stdenv.isLinux [
@@ -78,6 +79,14 @@ stdenv.mkDerivation rec {
7879 ./libglvnd-headers.patch
7980 ];
8081
82+ preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
83+ # Ignore gettext in cmake_prefix_path so that find_program doesn't
84+ # pick up the wrong gettext. TODO: Find a better solution for
85+ # this, maybe make cmake not look up executables in
86+ # CMAKE_PREFIX_PATH.
87+ cmakeFlags+=" -DCMAKE_IGNORE_PATH=${getBin gettext}/bin"
88+ '';
89+
8190 nativeBuildInputs = [
8291 bison
8392 cmake
@@ -89,6 +98,8 @@ stdenv.mkDerivation rec {
8998 pkgconfig
9099 python3
91100 ruby
101+ glib # for gdbus-codegen
102+ wayland # for wayland-scanner
92103 ];
93104
94105 buildInputs = [
pkgs/development/libraries/webkitgtk/libglvnd-headers.patch−574
@@ -1,577 +1,3 @@
1−diff --git a/Source/ThirdParty/ANGLE/scripts/generate_loader.py b/Source/ThirdParty/ANGLE/scripts/generate_loader.py
2−index a408dac4..92ddca90 100644
3−--- a/Source/ThirdParty/ANGLE/scripts/generate_loader.py
4−+++ b/Source/ThirdParty/ANGLE/scripts/generate_loader.py
5−@@ -201,6 +201,8 @@ def main():
6−
7− libegl_preamble = """#include <EGL/egl.h>
8− #include <EGL/eglext.h>
9−+#include <EGL/eglmesaext.h>
10−+#include <EGL/eglmesaext.h>
11− """
12−
13− util_gles_preamble = """#if defined(GL_GLES_PROTOTYPES) && GL_GLES_PROTOTYPES
14−@@ -215,6 +217,8 @@ util_egl_preamble = """#include "util/util_export.h"
15−
16− #include <EGL/egl.h>
17− #include <EGL/eglext.h>
18−+#include <EGL/eglmesaext.h>
19−+#include <EGL/eglmesaext.h>
20− """
21−
22− util_wgl_preamble = """
23−diff --git a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h
24−index 68c65d8b..0dc9c8e3 100644
25−--- a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h
26−+++ b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h
27−@@ -14,6 +14,7 @@
28−
29− #include <EGL/egl.h>
30− #include <EGL/eglext.h>
31−+#include <EGL/eglmesaext.h>
32− #include <angle_gl.h>
33−
34− #include <cstdint>
35−diff --git a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h
36−index cd651150..17719bc2 100644
37−--- a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h
38−+++ b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h
39−@@ -14,6 +14,7 @@
40−
41− #include <EGL/egl.h>
42− #include <EGL/eglext.h>
43−+#include <EGL/eglmesaext.h>
44− #include <angle_gl.h>
45−
46− #include <cstdint>
47−diff --git a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py
48−index 2f77e725..5ea54f1f 100644
49−--- a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py
50−+++ b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py
51−@@ -71,6 +71,7 @@ header_template = """// GENERATED FILE - DO NOT EDIT.
52− #include <angle_gl.h>
53− #include <EGL/egl.h>
54− #include <EGL/eglext.h>
55−+#include <EGL/eglmesaext.h>
56−
57− #include <cstdint>
58−
59−diff --git a/Source/ThirdParty/ANGLE/src/common/utilities.h b/Source/ThirdParty/ANGLE/src/common/utilities.h
60−index 7a1429a4..dd20bcca 100644
61−--- a/Source/ThirdParty/ANGLE/src/common/utilities.h
62−+++ b/Source/ThirdParty/ANGLE/src/common/utilities.h
63−@@ -11,6 +11,7 @@
64−
65− #include <EGL/egl.h>
66− #include <EGL/eglext.h>
67−+#include <EGL/eglmesaext.h>
68−
69− #include <math.h>
70− #include <string>
71−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
72−index 4134226d..5dd1065f 100644
73−--- a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
74−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp
75−@@ -15,6 +15,7 @@
76− #include <vector>
77−
78− #include <EGL/eglext.h>
79−+#include <EGL/eglmesaext.h>
80− #include "angle_gl.h"
81−
82− #include "common/debug.h"
83−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
84−index 13ae4e61..b964b755 100644
85−--- a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
86−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp
87−@@ -12,6 +12,7 @@
88− #include <iterator>
89−
90− #include <EGL/eglext.h>
91−+#include <EGL/eglmesaext.h>
92− #include <platform/Platform.h>
93−
94− #include "common/debug.h"
95−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
96−index 21064073..a46628bd 100644
97−--- a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
98−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp
99−@@ -17,6 +17,7 @@
100− #include <vector>
101−
102− #include <EGL/eglext.h>
103−+#include <EGL/eglmesaext.h>
104− #include <platform/Platform.h>
105−
106− #include "common/debug.h"
107−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h
108−index 37df5b0c..b2e3885b 100644
109−--- a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h
110−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h
111−@@ -11,6 +11,7 @@
112−
113− #include <EGL/egl.h>
114− #include <EGL/eglext.h>
115−+#include <EGL/eglmesaext.h>
116− #include "angle_gl.h"
117− #include "common/angleutils.h"
118− #include "common/debug.h"
119−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp
120−index b7bc84c8..538cb3e0 100644
121−--- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp
122−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp
123−@@ -10,6 +10,7 @@
124− #include "libANGLE/Stream.h"
125−
126− #include <EGL/eglext.h>
127−+#include <EGL/eglmesaext.h>
128− #include <platform/Platform.h>
129−
130− #include "common/debug.h"
131−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h
132−index 9157aa51..d8e58f2d 100644
133−--- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h
134−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h
135−@@ -14,6 +14,7 @@
136−
137− #include <EGL/egl.h>
138− #include <EGL/eglext.h>
139−+#include <EGL/eglmesaext.h>
140−
141− #include "common/angleutils.h"
142− #include "libANGLE/AttributeMap.h"
143−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
144−index 6daec4f6..941f34ca 100644
145−--- a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
146−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp
147−@@ -11,6 +11,7 @@
148− #include "libANGLE/Surface.h"
149−
150− #include <EGL/eglext.h>
151−+#include <EGL/eglmesaext.h>
152−
153− #include "libANGLE/Config.h"
154− #include "libANGLE/Context.h"
155−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
156−index ea1a0510..db7cf0c8 100644
157−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
158−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h
159−@@ -11,6 +11,7 @@
160−
161− #include <EGL/egl.h>
162− #include <EGL/eglext.h>
163−+#include <EGL/eglmesaext.h>
164−
165− #include "common/angleutils.h"
166− #include "libANGLE/Error.h"
167−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
168−index ba5cf532..43304da5 100644
169−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
170−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp
171−@@ -13,6 +13,7 @@
172− #include "libANGLE/Display.h"
173−
174− #include <EGL/eglext.h>
175−+#include <EGL/eglmesaext.h>
176−
177− namespace rx
178− {
179−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
180−index de60dfff..93b5bdf8 100644
181−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
182−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp
183−@@ -9,6 +9,7 @@
184− #include "libANGLE/renderer/d3d/DisplayD3D.h"
185−
186− #include <EGL/eglext.h>
187−+#include <EGL/eglmesaext.h>
188−
189− #include "libANGLE/Config.h"
190− #include "libANGLE/Context.h"
191−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
192−index a7255d0d..a7e37777 100644
193−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
194−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp
195−@@ -20,6 +20,7 @@
196− #include "libANGLE/renderer/d3d/TextureStorage.h"
197−
198− #include <EGL/eglext.h>
199−+#include <EGL/eglmesaext.h>
200−
201− namespace rx
202− {
203−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
204−index 61dc8ffa..87276514 100644
205−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
206−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp
207−@@ -19,6 +19,7 @@
208− #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
209−
210− #include <EGL/eglext.h>
211−+#include <EGL/eglmesaext.h>
212− #include <tchar.h>
213− #include <algorithm>
214−
215−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
216−index 443cadd6..e64bdfc4 100644
217−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
218−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h
219−@@ -12,6 +12,7 @@
220−
221− #include <EGL/egl.h>
222− #include <EGL/eglext.h>
223−+#include <EGL/eglmesaext.h>
224− #include <GLES2/gl2.h>
225−
226− #include "common/angleutils.h"
227−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
228−index 33dfa6b0..eb3393d2 100644
229−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
230−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
231−@@ -9,6 +9,7 @@
232− #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
233−
234− #include <EGL/eglext.h>
235−+#include <EGL/eglmesaext.h>
236− #include <versionhelpers.h>
237− #include <sstream>
238−
239−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
240−index fe4def6e..2550b52c 100644
241−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
242−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp
243−@@ -9,6 +9,7 @@
244− #include "libANGLE/renderer/d3d/d3d11/SwapChain11.h"
245−
246− #include <EGL/eglext.h>
247−+#include <EGL/eglmesaext.h>
248−
249− #include "libANGLE/features.h"
250− #include "libANGLE/renderer/d3d/DisplayD3D.h"
251−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
252−index f4a4ce43..0cad5540 100644
253−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
254−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp
255−@@ -9,6 +9,7 @@
256− #include "libANGLE/renderer/d3d/d3d9/Renderer9.h"
257−
258− #include <EGL/eglext.h>
259−+#include <EGL/eglmesaext.h>
260− #include <sstream>
261−
262− #include "common/utilities.h"
263−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
264−index a89e1365..0fe4fa98 100644
265−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
266−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp
267−@@ -18,6 +18,7 @@
268− #include "libANGLE/renderer/gl/SurfaceGL.h"
269−
270− #include <EGL/eglext.h>
271−+#include <EGL/eglmesaext.h>
272−
273− namespace rx
274− {
275−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
276−index 10b15594..7ae1ac6b 100644
277−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
278−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp
279−@@ -9,6 +9,7 @@
280− #include "libANGLE/renderer/gl/RendererGL.h"
281−
282− #include <EGL/eglext.h>
283−+#include <EGL/eglmesaext.h>
284−
285− #include "common/debug.h"
286− #include "libANGLE/AttributeMap.h"
287−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
288−index 115a7afb..abb200e6 100644
289−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
290−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h
291−@@ -11,6 +11,7 @@
292−
293− #include <EGL/egl.h>
294− #include <EGL/eglext.h>
295−+#include <EGL/eglmesaext.h>
296−
297− #include <string>
298− #include <vector>
299−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
300−index 47ed6ce0..9d11560c 100644
301−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
302−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
303−@@ -14,6 +14,7 @@
304− #include <unistd.h>
305−
306− #include <EGL/eglext.h>
307−+#include <EGL/eglmesaext.h>
308−
309− #include <drm_fourcc.h>
310− #include <gbm.h>
311−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
312−index 23b4a5c5..daeb5789 100644
313−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
314−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
315−@@ -9,6 +9,7 @@
316− #include "libANGLE/renderer/gl/glx/DisplayGLX.h"
317−
318− #include <EGL/eglext.h>
319−+#include <EGL/eglmesaext.h>
320− #include <algorithm>
321− #include <cstring>
322− #include <fstream>
323−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
324−index 698b51e2..32e6126f 100644
325−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
326−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp
327−@@ -27,6 +27,7 @@
328− #include "libANGLE/renderer/gl/formatutilsgl.h"
329−
330− #include <EGL/eglext.h>
331−+#include <EGL/eglmesaext.h>
332− #include <algorithm>
333− #include <sstream>
334−
335−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
336−index 5b686321..16ae890f 100644
337−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
338−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp
339−@@ -18,6 +18,7 @@
340− #include "libANGLE/renderer/gl/wgl/FunctionsWGL.h"
341−
342− #include <EGL/eglext.h>
343−+#include <EGL/eglmesaext.h>
344−
345− namespace rx
346− {
347−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
348−index 12679ba7..93503812 100644
349−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
350−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
351−@@ -28,6 +28,7 @@
352− #include "platform/Platform.h"
353−
354− #include <EGL/eglext.h>
355−+#include <EGL/eglmesaext.h>
356− #include <sstream>
357− #include <string>
358−
359−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp
360−index df900f4d..4385be88 100644
361−--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp
362−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp
363−@@ -13,6 +13,7 @@
364− #include "libANGLE/renderer/vulkan/vk_utils.h"
365−
366− #include <EGL/eglext.h>
367−+#include <EGL/eglmesaext.h>
368−
369− #include "common/debug.h"
370− #include "common/platform.h"
371−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
372−index 1c0b25f4..64e96f73 100644
373−--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
374−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp
375−@@ -22,6 +22,7 @@
376− #include "libANGLE/formatutils.h"
377−
378− #include <EGL/eglext.h>
379−+#include <EGL/eglmesaext.h>
380−
381− namespace egl
382− {
383−diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
384−index a671bb0d..248f0ae8 100644
385−--- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
386−+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h
387−@@ -15,6 +15,7 @@
388−
389− #include <EGL/egl.h>
390− #include <EGL/eglext.h>
391−+#include <EGL/eglmesaext.h>
392−
393− namespace gl
394− {
395−diff --git a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h
396−index ae4a427c..a802b65d 100644
397−--- a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h
398−+++ b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h
399−@@ -13,6 +13,7 @@
400−
401− #include <EGL/egl.h>
402− #include <EGL/eglext.h>
403−+#include <EGL/eglmesaext.h>
404−
405− extern PFNEGLCHOOSECONFIGPROC EGL_ChooseConfig;
406− extern PFNEGLCOPYBUFFERSPROC EGL_CopyBuffers;
407−diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
408−index 3c64b290..96201b31 100644
409−--- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
410−+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h
411−@@ -11,6 +11,7 @@
412−
413− #include <EGL/egl.h>
414− #include <EGL/eglext.h>
415−+#include <EGL/eglmesaext.h>
416− #include <export.h>
417−
418− extern "C" {
419−diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
420−index 777b09e1..dbb0bd2f 100644
421−--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
422−+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp
423−@@ -24,6 +24,7 @@
424−
425− #include <EGL/egl.h>
426− #include <EGL/eglext.h>
427−+#include <EGL/eglmesaext.h>
428−
429− #include "deClock.h"
430− #include "deMemory.h"
431−diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp
432−index 6b4a25bf..1c4ac864 100644
433−--- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp
434−+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp
435−@@ -22,6 +22,7 @@
436−
437− #include <EGL/egl.h>
438− #include <EGL/eglext.h>
439−+#include <EGL/eglmesaext.h>
440−
441− #include "egluGLContextFactory.hpp"
442− #include "tcuANGLENativeDisplayFactory.h"
443−diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp
444−index 90abb931..aea4e153 100644
445−--- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp
446−+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp
447−@@ -10,6 +10,7 @@
448−
449− #include <EGL/egl.h>
450− #include <EGL/eglext.h>
451−+#include <EGL/eglmesaext.h>
452− #include <X11/Xlib.h>
453−
454− #include "test_utils/ANGLETest.h"
455−diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h
456−index e888a239..71606b8c 100644
457−--- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h
458−+++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h
459−@@ -11,6 +11,7 @@
460−
461− #include <EGL/egl.h>
462− #include <EGL/eglext.h>
463−+#include <EGL/eglmesaext.h>
464−
465− #include <string>
466−
467−diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp
468−index 7fdddcc6..e40b8905 100644
469−--- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp
470−+++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp
471−@@ -10,6 +10,7 @@
472−
473− #include <EGL/egl.h>
474− #include <EGL/eglext.h>
475−+#include <EGL/eglmesaext.h>
476−
477− #include <map>
478− #include <string>
479−diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h
480−index 7bc7a027..ebb2827b 100644
481−--- a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h
482−+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h
483−@@ -16,6 +16,7 @@
484−
485− #include <EGL/egl.h>
486− #include <EGL/eglext.h>
487−+#include <EGL/eglmesaext.h>
488−
489− #include "GLSLANG/ShaderLang.h"
490− #include "angle_test_instantiate.h"
491−diff --git a/Source/ThirdParty/ANGLE/util/OSPixmap.h b/Source/ThirdParty/ANGLE/util/OSPixmap.h
492−index ba6ccf4a..563d2578 100644
493−--- a/Source/ThirdParty/ANGLE/util/OSPixmap.h
494−+++ b/Source/ThirdParty/ANGLE/util/OSPixmap.h
495−@@ -13,6 +13,7 @@
496−
497− #include <EGL/egl.h>
498− #include <EGL/eglext.h>
499−+#include <EGL/eglmesaext.h>
500−
501− #include "util/Event.h"
502− #include "util/util_export.h"
503−diff --git a/Source/ThirdParty/ANGLE/util/OSWindow.h b/Source/ThirdParty/ANGLE/util/OSWindow.h
504−index 3cdb458c..3178fa44 100644
505−--- a/Source/ThirdParty/ANGLE/util/OSWindow.h
506−+++ b/Source/ThirdParty/ANGLE/util/OSWindow.h
507−@@ -15,6 +15,7 @@
508−
509− #include <EGL/egl.h>
510− #include <EGL/eglext.h>
511−+#include <EGL/eglmesaext.h>
512−
513− #include "util/Event.h"
514− #include "util/util_export.h"
515−diff --git a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h
516−index 5fbec82f..77a30330 100644
517−--- a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h
518−+++ b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h
519−@@ -15,6 +15,7 @@
520−
521− #include <EGL/egl.h>
522− #include <EGL/eglext.h>
523−+#include <EGL/eglmesaext.h>
524−
525− ANGLE_UTIL_EXPORT extern PFNEGLCHOOSECONFIGPROC eglChooseConfig;
526− ANGLE_UTIL_EXPORT extern PFNEGLCOPYBUFFERSPROC eglCopyBuffers;
527−diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
528−index a8a82d70..050893a9 100644
529−--- a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
530−+++ b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
531−@@ -29,6 +29,7 @@
532− #else
533− #include <EGL/egl.h>
534− #include <EGL/eglext.h>
535−+#include <EGL/eglmesaext.h>
536− #endif
537−
538− #if USE(CAIRO)
539−diff --git a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp
540−index 05f92c22..636df34a 100644
541−--- a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp
542−+++ b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp
543−@@ -35,6 +35,7 @@
544− #include <wayland-egl.h>
545− #include <EGL/egl.h>
546− #include <EGL/eglext.h>
547−+#include <EGL/eglmesaext.h>
548− #include <wtf/Assertions.h>
549−
550− namespace WebCore {
551−diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
552−index 8c81119b..bf9ed4bd 100644
553−--- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
554−+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
555−@@ -38,6 +38,7 @@
556− #if USE(EGL)
557− #include <EGL/egl.h>
558− #include <EGL/eglext.h>
559−+#include <EGL/eglmesaext.h>
560− #endif
561−
562− namespace WebCore {
563−diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
564−index 973b3168..5586236a 100644
565−--- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
566−+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp
567−@@ -35,6 +35,7 @@
568− #include <gdk/gdkwayland.h>
569− #include <EGL/egl.h>
570− #include <EGL/eglext.h>
571−+#include <EGL/eglmesaext.h>
572− #include <WebCore/CairoUtilities.h>
573− #include <WebCore/GLContext.h>
574−
5751diff --git a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
5762index 8d848ce4..46d42c11 100644
5773--- a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
pkgs/development/libraries/xdg-desktop-portal/default.nix+2−2
@@ -6,7 +6,7 @@
66, pkgconfig
77, libxml2
88, glib
9−, pipewire
9+, pipewire_0_2
1010, fontconfig
1111, flatpak
1212, gsettings-desktop-schemas
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949
5050 buildInputs = [
5151 glib
52− pipewire
52+ pipewire_0_2
5353 fontconfig
5454 flatpak
5555 acl
pkgs/development/python-modules/azure-cosmos/default.nix+1−3
@@ -17,9 +17,7 @@ buildPythonPackage rec {
1717
1818 propagatedBuildInputs = [ six requests ];
1919
20− postInstall = ''
21− rm $out/${python.sitePackages}/azure/__init__.py
22− '';
20+ pythonNamespaces = [ "azure" ];
2321
2422 # requires an active Azure Cosmos service
2523 doCheck = false;
pkgs/development/python-modules/azure-keyvault-keys/default.nix+2
@@ -26,6 +26,8 @@ buildPythonPackage rec {
2626 cryptography
2727 ];
2828
29+ pythonNamespaces = [ "azure.keyvault" ];
30+
2931 # requires relative paths to utilities in the mono-repo
3032 doCheck = false;
3133 checkInputs = [ aiohttp pytestCheckHook ];
pkgs/development/python-modules/azure-keyvault-secrets/default.nix+2
@@ -21,6 +21,8 @@ buildPythonPackage rec {
2121 msrest
2222 ];
2323
24+ pythonNamespaces = [ "azure.keyvault" ];
25+
2426 # requires checkout from mono-repo
2527 doCheck = false;
2628
pkgs/development/python-modules/azure-keyvault/default.nix+2
@@ -22,6 +22,8 @@ buildPythonPackage rec {
2222 # this is just a meta package, which contains keys and secrets
2323 doCheck = false;
2424
25+ pythonNamespaces = [ "azure" ];
26+
2527 pythonImportsCheck = [
2628 "azure.keyvault.keys"
2729 "azure.keyvault.secrets"
pkgs/development/python-modules/azure-loganalytics/default.nix+1−3
@@ -22,9 +22,7 @@ buildPythonPackage rec {
2222 azure-common
2323 ];
2424
25− postInstall = lib.optionalString isPy3k ''
26− rm -rf $out/${python.sitePackages}/azure/__init__.py
27− '';
25+ pythonNamespaces = [ "azure" ];
2826
2927 # has no tests
3028 doCheck = false;
pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix+1−3
@@ -27,9 +27,7 @@ buildPythonPackage rec {
2727 azure-mgmt-nspkg
2828 ];
2929
30− postInstall = lib.optionalString isPy3k ''
31− rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
32− '';
30+ pythonNamespaces = [ "azure.mgmt" ];
3331
3432 # has no tests
3533 doCheck = false;
pkgs/development/python-modules/azure-mgmt-batchai/default.nix+1−4
@@ -24,10 +24,7 @@ buildPythonPackage rec {
2424 azure-mgmt-nspkg
2525 ];
2626
27− postInstall = lib.optionalString isPy3k ''
28− rm $out/${python.sitePackages}/azure/__init__.py
29− rm $out/${python.sitePackages}/azure/mgmt/__init__.py
30− '';
27+ pythonNamespaces = [ "azure.mgmt" ];
3128
3229 # has no tests
3330 doCheck = false;
pkgs/development/python-modules/azure-mgmt-billing/default.nix+1−4
@@ -30,10 +30,7 @@ buildPythonPackage rec {
3030 --replace "azure-namespace-package = azure-mgmt-nspkg" ""
3131 '';
3232
33− postInstall = lib.optionalString isPy3k ''
34− rm $out/${python.sitePackages}/azure/__init__.py
35− rm $out/${python.sitePackages}/azure/mgmt/__init__.py
36− '';
33+ pythonNamespaces = [ "azure.mgmt" ];
3734
3835 # has no tests
3936 doCheck = false;
pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−5
@@ -16,15 +16,12 @@ buildPythonPackage rec {
1616 sha256 = "00ygppmlx21dxvb0swfdyhqf5xhi0zxy26abcgql02w0lklw91nj";
1717 };
1818
19− postInstall = if isPy3k then "" else ''
20− echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
21− echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
22− '';
23−
2419 propagatedBuildInputs = [
2520 azure-mgmt-common
2621 ];
2722
23+ pythonNamespaces = [ "azure.mgmt" ];
24+
2825 # has no tests
2926 doCheck = false;
3027
pkgs/development/python-modules/azure-mgmt-consumption/default.nix+1−5
@@ -24,11 +24,7 @@ buildPythonPackage rec {
2424 azure-mgmt-nspkg
2525 ];
2626
27− # still needed when overriding to previous versions
28− # E.g. azure-cli
29− postInstall = lib.optionalString isPy3k ''
30− rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
31− '';
27+ pythonNamespaces = [ "azure.mgmt" ];
3228
3329 # has no tests
3430 doCheck = false;
pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix+1−5
@@ -24,11 +24,7 @@ buildPythonPackage rec {
2424 azure-mgmt-datalake-nspkg
2525 ];
2626
27− postInstall = lib.optionalString isPy3k ''
28− rm $out/${python.sitePackages}/azure/__init__.py
29− rm $out/${python.sitePackages}/azure/mgmt/__init__.py
30− rm $out/${python.sitePackages}/azure/mgmt/datalake/__init__.py
31− '';
27+ pythonNamespaces = [ "azure.mgmt.datalake" ];
3228
3329 # has no tests
3430 doCheck = false;
pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix+2−5
@@ -3,6 +3,7 @@
33, fetchPypi
44, python
55, isPy3k
6+, pythonNamespacesHook
67, msrestazure
78, azure-common
89, azure-mgmt-datalake-nspkg
@@ -24,11 +25,7 @@ buildPythonPackage rec {
2425 azure-mgmt-datalake-nspkg
2526 ];
2627
27− postInstall = lib.optionalString isPy3k ''
28− rm $out/${python.sitePackages}/azure/__init__.py
29− rm $out/${python.sitePackages}/azure/mgmt/__init__.py
30− rm $out/${python.sitePackages}/azure/mgmt/datalake/__init__.py
31− '';
28+ pythonNamespaces = [ "azure.mgmt.datalake" ];
3229
3330 # has no tests
3431 doCheck = false;
pkgs/development/python-modules/azure-mgmt-datamigration/default.nix+1−5
@@ -27,11 +27,7 @@ buildPythonPackage rec {
2727 azure-mgmt-nspkg
2828 ];
2929
30− # still needed when overriding to previous versions
31− # E.g. azure-cli
32− postInstall = lib.optionalString isPy3k ''
33− rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
34− '';
30+ pythonNamespaces = [ "azure.mgmt" ];
3531
3632 # has no tests
3733 doCheck = false;
pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix+1−5
@@ -27,11 +27,7 @@ buildPythonPackage rec {
2727 azure-mgmt-nspkg
2828 ];
2929
30− # still needed when overriding to previous versions
31− # E.g. azure-cli
32− postInstall = lib.optionalString isPy3k ''
33− rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
34− '';
30+ pythonNamespaces = [ "azure.mgmt" ];
3531
3632 # has no tests
3733 doCheck = false;
pkgs/development/python-modules/azure-mgmt-dns/default.nix+1−4
@@ -27,10 +27,7 @@ buildPythonPackage rec {
2727 ];
2828
2929 # this is still needed for when the version is overrided
30− # to previous versions. E.g azure-cli
31− postInstall = lib.optionalString isPy3k ''
32− rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
33− '';
30+ pythonNamespaces = [ "azure.mgmt" ];
3431
3532 # has no tests
3633 doCheck = false;
pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix+1−4
@@ -26,10 +26,7 @@ buildPythonPackage rec {
2626 azure-mgmt-nspkg
2727 ];
2828
29− postInstall = lib.optionalString isPy3k ''
30− rm $out/${python.sitePackages}/azure/__init__.py
31− rm $out/${python.sitePackages}/azure/mgmt/__init__.py
32− '';
29+ pythonNamespaces = [ "azure.mgmt" ];
3330
3431 # has no tests
3532 doCheck = false;
pkgs/development/python-modules/azure-mgmt-keyvault/default.nix+1−5
@@ -26,11 +26,7 @@ buildPythonPackage rec {
2626 azure-mgmt-nspkg
2727 ];
2828
29− # this is still need when overriding to prevoius versions
30− # E.g. azure-cli
31− postInstall = lib.optionalString isPy3k ''
32− rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
33− '';
29+ pythonNamespaces = [ "azure.mgmt" ];
3430
3531 # has no tests
3632 doCheck = false;
pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix+1−4
@@ -26,10 +26,7 @@ buildPythonPackage rec {
2626 azure-mgmt-nspkg
2727 ];
2828
29− postInstall = lib.optionalString isPy3k ''
30− rm $out/${python.sitePackages}/azure/__init__.py
31− rm $out/${python.sitePackages}/azure/mgmt/__init__.py
32− '';
29+ pythonNamespaces = [ "azure.mgmt" ];
3330
3431 # has no tests
3532 doCheck = false;
pkgs/development/python-modules/azure-mgmt-maps/default.nix+1−4
@@ -26,10 +26,7 @@ buildPythonPackage rec {
2626 azure-mgmt-nspkg
2727 ];
2828
29− postInstall = lib.optionalString isPy3k ''
30− rm $out/${python.sitePackages}/azure/__init__.py
31− rm $out/${python.sitePackages}/azure/mgmt/__init__.py
32− '';
29+ pythonNamespaces = [ "azure.mgmt" ];
3330
3431 # has no tests
3532 doCheck = false;
pkgs/development/python-modules/azure-mgmt-monitor/default.nix+1−4
@@ -27,10 +27,7 @@ buildPythonPackage rec {
2727 azure-mgmt-nspkg
2828 ];
2929
30− postInstall = lib.optionalString isPy3k ''
31− rm -rf $out/${python.sitePackages}/azure/__init__.py
32− rm -rf $out/${python.sitePackages}/azure/mgmt/__init__.py
33− '';
30+ pythonNamespaces = [ "azure.mgmt" ];
3431
3532 # has no tests
3633 doCheck = false;
pkgs/development/python-modules/azure-mgmt-msi/default.nix+1−5
@@ -26,11 +26,7 @@ buildPythonPackage rec {
2626 azure-mgmt-nspkg
2727 ];
2828
29− # still needed when overriding to previous versions
30− # E.g. azure-cli
31− postInstall = lib.optionalString isPy3k ''
32− rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
33− '';
29+ pythonNamespaces = [ "azure.mgmt" ];
3430
3531 # has no tests
3632 doCheck = false;
pkgs/development/python-modules/azure-mgmt-relay/default.nix+1−5
@@ -24,11 +24,7 @@ buildPythonPackage rec {
2424 azure-mgmt-nspkg
2525 ];
2626
27− # still needed when overriding to previous versions
28− # E.g. azure-cli
29− postInstall = lib.optionalString isPy3k ''
30− rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
31− '';
27+ pythonNamespaces = [ "azure.mgmt" ];
3228
3329 # has no tests
3430 doCheck = false;
pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix+1−5
@@ -26,11 +26,7 @@ buildPythonPackage rec {
2626 azure-mgmt-nspkg
2727 ];
2828
29− # this is still needed for overriding to previous versions
30− # E.g azure-cli
31− postInstall = lib.optionalString isPy3k ''
32− rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
33− '';
29+ pythonNamespaces = [ "azure.mgmt" ];
3430
3531 # has no tests
3632 doCheck = false;
pkgs/development/python-modules/azure-mgmt-storage/default.nix+4−7
@@ -13,16 +13,13 @@ buildPythonPackage rec {
1313 src = fetchPypi {
1414 inherit pname version;
1515 extension = "zip";
16− sha256 = "636778912823cebed1c212e4feacc4885d9e49e19a047da20fca9393bc6fac33";
16+ sha256 = "0cxcdyy974ya1yi7s14sw54rwpc8qjngxr0jqb8vxki3528phrv3";
1717 };
1818
19− postInstall = if isPy3k then "" else ''
20− echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
21− echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
22− '';
23−
2419 propagatedBuildInputs = [ azure-mgmt-common ];
2520
21+ pythonNamespaces = [ "azure.mgmt" ];
22+
2623 # has no tests
2724 doCheck = false;
2825
@@ -30,6 +27,6 @@ buildPythonPackage rec {
3027 description = "This is the Microsoft Azure Storage Management Client Library";
3128 homepage = "https://github.com/Azure/azure-sdk-for-python";
3229 license = licenses.mit;
33− maintainers = with maintainers; [ olcai mwilsoninsight ];
30+ maintainers = with maintainers; [ jonringer olcai mwilsoninsight ];
3431 };
3532}
pkgs/development/python-modules/azure-multiapi-storage/default.nix+2−5
@@ -16,11 +16,8 @@ buildPythonPackage rec {
1616
1717 propagatedBuildInputs = [ azure-common msrest msrestazure ];
1818
19− # fix namespace issues
20− postInstall = ''
21− rm $out/${python.sitePackages}/azure/__init__.py
22− rm $out/${python.sitePackages}/azure/multiapi/__init__.py
23− '';
19+ # fix namespace
20+ pythonNamespaces = [ "azure.multiapi" ];
2421
2522 # no tests included
2623 doCheck = false;
pkgs/development/python-modules/cddb/default.nix+3−2
@@ -5,13 +5,14 @@
55}:
66
77buildPythonPackage rec {
8− name = "CDDB-1.4";
8+ pname = "CDDB";
9+ version = "1.4";
910 disabled = isPy3k;
1011
1112 buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
1213
1314 src = pkgs.fetchurl {
14− url = "http://cddb-py.sourceforge.net/${name}.tar.gz";
15+ url = "http://cddb-py.sourceforge.net/${pname}-${version}.tar.gz";
1516 sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";
1617 };
1718
pkgs/development/python-modules/deskcon/default.nix+2−1
@@ -7,7 +7,8 @@
77}:
88
99buildPythonPackage {
10− name = "deskcon-0.3";
10+ pname = "deskcon";
11+ version = "0.3";
1112 disabled = isPy3k;
1213
1314 src = pkgs.fetchFromGitHub {
pkgs/development/python-modules/gateone/default.nix+2−1
@@ -8,7 +8,8 @@
88}:
99
1010buildPythonPackage {
11− name = "gateone-1.2-0d57c3";
11+ pname = "gateone";
12+ version = "1.2-0d57c3";
1213 disabled = isPy3k;
1314
1415 src = pkgs.fetchFromGitHub {
pkgs/development/python-modules/gst-python/default.nix+28−40
@@ -1,52 +1,42 @@
1−{ buildPythonPackage, fetchurl, meson, ninja, stdenv, pkgconfig, python, pygobject3
2−, gobject-introspection, gst-plugins-base, isPy3k
1+{ buildPythonPackage
2+, fetchurl
3+, meson
4+, ninja
5+, stdenv
6+, pkgconfig
7+, python
8+, pygobject3
9+, gobject-introspection
10+, gst-plugins-base
11+, isPy3k
312}:
413
5−let
14+buildPythonPackage rec {
615 pname = "gst-python";
7− version = "1.14.4";
8− name = "${pname}-${version}";
9−in buildPythonPackage rec {
10− inherit pname version;
16+ version = "1.16.2";
17+
1118 format = "other";
1219
1320 outputs = [ "out" "dev" ];
1421
1522 src = fetchurl {
16− urls = [
17− "${meta.homepage}/src/gst-python/${name}.tar.xz"
18− "mirror://gentoo/distfiles/${name}.tar.xz"
19− ];
20− sha256 = "06ssx19fs6pg4d32p9ph9w4f0xwmxaw2dxfj17rqkn5njd7v5zfh";
23+ url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz";
24+ sha256 = "II3zFI1z2fQW0BZWRzdYXY6nY9kSAXMtRLX+aIxiiKg=";
2125 };
2226
23− patches = [
24− # Meson build does not support Python 2 at the moment
25− # https://bugzilla.gnome.org/show_bug.cgi?id=796092
26− (fetchurl {
27− name = "0002-meson-use-new-python-module.patch";
28− url = https://bugzilla.gnome.org/attachment.cgi?id=371989;
29− sha256 = "1k46nvw175c1wvkqnx783i9d4w9vn431spcl48jb3y224jj3va08";
30− })
31− # Fixes `from gi.repository import Gst` when gst-python's site-package is in
32− # PYTHONPATH
33− (fetchurl {
34− url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/d64bbc1e0c3c948c148f505cc5f856ce56732880.diff;
35− sha256 = "1n9pxmcl1x491mp47avpcw2a6n71lm0haz6mfas168prkgsk8q3r";
36− })
37− # Fixes python2 build from the above changes
38− (fetchurl {
39− url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/f79ac2d1434d7ba9717f3e943cfdc76e121eb5dd.diff;
40− sha256 = "17a164b0v36g0kwiqdlkjx6g0pjhcs6ilizck7iky8bgjnmiypm1";
41− })
27+ nativeBuildInputs = [
28+ meson
29+ ninja
30+ pkgconfig
31+ python
32+ gobject-introspection
33+ gst-plugins-base
4234 ];
4335
44− # TODO: First python_dep in meson.build needs to be removed
45− postPatch = ''
46− substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"}
47− '';
48−
49− nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ];
36+ propagatedBuildInputs = [
37+ gst-plugins-base
38+ pygobject3
39+ ];
5040
5141 mesonFlags = [
5242 "-Dpython=python${if isPy3k then "3" else "2"}"
@@ -59,10 +49,8 @@ in buildPythonPackage rec {
5949 # https://github.com/NixOS/nixpkgs/issues/47390
6050 installCheckPhase = "meson test --print-errorlogs";
6151
62− propagatedBuildInputs = [ gst-plugins-base pygobject3 ];
63−
6452 meta = {
65− homepage = https://gstreamer.freedesktop.org;
53+ homepage = "https://gstreamer.freedesktop.org";
6654
6755 description = "Python bindings for GStreamer";
6856
pkgs/development/python-modules/httplib2/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "httplib2";
5− version = "0.15.0";
5+ version = "0.17.0";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "a5f914f18f99cb9541660454a159e3b3c63241fc3ab60005bb88d97cc7a4fb58";
9+ sha256 = "0qc2vn98a4icp3h04pdhiykddz5q6wfi905f19zfxl26kyjd15ny";
1010 };
1111
1212 # Needs setting up
pkgs/development/python-modules/mutag/default.nix+2−1
@@ -6,7 +6,8 @@
66}:
77
88buildPythonPackage {
9− name = "mutag-0.0.2-2ffa0258ca";
9+ pname = "mutag";
10+ version = "0.0.2-2ffa0258ca";
1011 disabled = ! isPy3k;
1112
1213 src = fetchgit {
pkgs/development/python-modules/notmuch/default.nix+5−7
@@ -1,20 +1,18 @@
11{ stdenv
22, buildPythonPackage
3−, pkgs
3+, notmuch
44, python
55}:
66
77buildPythonPackage {
8− name = "python-${pkgs.notmuch.name}";
8+ inherit (notmuch) pname version src;
99
10− src = pkgs.notmuch.src;
10+ sourceRoot = notmuch.pythonSourceRoot;
1111
12− sourceRoot = pkgs.notmuch.pythonSourceRoot;
13−
14− buildInputs = [ python pkgs.notmuch ];
12+ buildInputs = [ python notmuch ];
1513
1614 postPatch = ''
17− sed -i -e '/CDLL/s@"libnotmuch\.@"${pkgs.notmuch}/lib/libnotmuch.@' \
15+ sed -i -e '/CDLL/s@"libnotmuch\.@"${notmuch}/lib/libnotmuch.@' \
1816 notmuch/globals.py
1917 '';
2018
pkgs/development/python-modules/pygobject/3.nix+2−2
@@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
33
44buildPythonPackage rec {
55 pname = "pygobject";
6− version = "3.34.0";
6+ version = "3.36.0";
77
88 format = "other";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7";
12+ sha256 = "hoPS37W6qeUBqaZO66XCwRF+rbeBqxzXqdJVg0r22u8=";
1313 };
1414
1515 outputs = [ "out" "dev" ];
pkgs/development/python-modules/slob/default.nix+2−2
@@ -7,8 +7,8 @@
77}:
88
99buildPythonPackage {
10− name = "slob";
11− verison = "unstable-2016-11-03";
10+ pname = "slob";
11+ version = "unstable-2016-11-03";
1212 disabled = !isPy3k;
1313
1414 src = fetchFromGitHub {
pkgs/development/python-modules/tkinter/default.nix+2−1
@@ -6,7 +6,8 @@
66}:
77
88buildPythonPackage {
9− name = "tkinter-${python.version}";
9+ pname = "tkinter";
10+ version = python.version;
1011 src = py;
1112 format = "other";
1213
pkgs/development/tools/build-managers/gn/default.nix+18−12
@@ -1,31 +1,37 @@
11{ stdenv, lib, fetchgit, darwin, writeText
2−, git, ninja, python3 }:
2+, ninja, python3
3+}:
34
45let
5− rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b";
6− sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy";
6+ # Note: Please use the recommended version for Chromium, e.g.:
7+ # https://git.archlinux.org/svntogit/packages.git/tree/trunk/chromium-gn-version.sh?h=packages/gn
8+ rev = "fd3d768bcfd44a8d9639fe278581bd9851d0ce3a";
9+ revNum = "1718"; # git describe HEAD --match initial-commit | cut -d- -f3
10+ version = "2020-03-09";
11+ sha256 = "1asc14y8by7qcn10vbk467hvx93s30pif8r0brissl0sihsaqazr";
712
8− shortRev = builtins.substring 0 7 rev;
13+ revShort = builtins.substring 0 7 rev;
914 lastCommitPosition = writeText "last_commit_position.h" ''
1015 #ifndef OUT_LAST_COMMIT_POSITION_H_
1116 #define OUT_LAST_COMMIT_POSITION_H_
1217
13− #define LAST_COMMIT_POSITION "(${shortRev})"
18+ #define LAST_COMMIT_POSITION_NUM ${revNum}
19+ #define LAST_COMMIT_POSITION "${revNum} (${revShort})"
1420
1521 #endif // OUT_LAST_COMMIT_POSITION_H_
1622 '';
1723
18−in
19−stdenv.mkDerivation {
20− pname = "gn";
21− version = "20190403";
24+in stdenv.mkDerivation {
25+ pname = "gn-unstable";
26+ inherit version;
2227
2328 src = fetchgit {
29+ # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
2430 url = "https://gn.googlesource.com/gn";
2531 inherit rev sha256;
2632 };
2733
28− nativeBuildInputs = [ ninja python3 git ];
34+ nativeBuildInputs = [ ninja python3 ];
2935 buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
3036 libobjc
3137 cctools
@@ -49,8 +55,8 @@ stdenv.mkDerivation {
4955 setupHook = ./setup-hook.sh;
5056
5157 meta = with lib; {
52− description = "A meta-build system that generates NinjaBuild files";
53− homepage = https://gn.googlesource.com/gn;
58+ description = "A meta-build system that generates build files for Ninja";
59+ homepage = "https://gn.googlesource.com/gn";
5460 license = licenses.bsd3;
5561 platforms = platforms.unix;
5662 maintainers = with maintainers; [ stesie matthewbauer ];
pkgs/development/tools/build-managers/scons/common.nix+10−10
@@ -1,25 +1,22 @@
11{ version, sha256 }:
22
3−{ stdenv, fetchurl, python2Packages }:
3+{ stdenv, fetchurl, python3Packages, python2Packages, scons }:
44
5−let name = "scons";
6−in python2Packages.buildPythonApplication {
7− name = "${name}-${version}";
5+python3Packages.buildPythonApplication rec {
6+ pname = "scons";
7+ inherit version;
88
99 src = fetchurl {
10− url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
10+ url = "mirror://sourceforge/scons/${pname}-${version}.tar.gz";
1111 inherit sha256;
1212 };
1313
14− # Fix a regression in 3.0.0 (causes build errors for some packages)
15− patches = stdenv.lib.optional (version == "3.0.0") ./print-statements.patch;
16−
1714 setupHook = ./setup-hook.sh;
1815
16+ passthru.py2 = scons.override { python3Packages = python2Packages; };
17+
1918 meta = with stdenv.lib; {
20− homepage = http://scons.org/;
2119 description = "An improved, cross-platform substitute for Make";
22− license = licenses.mit;
2320 longDescription = ''
2421 SCons is an Open Source software construction tool. Think of
2522 SCons as an improved, cross-platform substitute for the classic
@@ -28,6 +25,9 @@ in python2Packages.buildPythonApplication {
2825 SCons is an easier, more reliable and faster way to build
2926 software.
3027 '';
28+ homepage = "https://scons.org/";
29+ changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt";
30+ license = licenses.mit;
3131 platforms = platforms.all;
3232 maintainers = [ maintainers.primeos ];
3333 };
pkgs/development/tools/build-managers/scons/default.nix+3−3
@@ -1,12 +1,12 @@
1−{ callPackage }:
1+{ callPackage, python2Packages }:
22
33let
44 mkScons = args: callPackage (import ./common.nix args) { };
55in {
6− scons_3_0_1 = mkScons {
6+ scons_3_0_1 = (mkScons {
77 version = "3.0.1";
88 sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4";
9− };
9+ }).override { python3Packages = python2Packages; };
1010 scons_latest = mkScons {
1111 version = "3.1.2";
1212 sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq";
pkgs/development/tools/build-managers/scons/print-statements.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
2−index 558e28f9..8fea9c4d 100644
3−--- src/engine/SCons/Script/SConscript.py
4−+++ src/engine/SCons/Script/SConscript.py
5−@@ -5,8 +5,6 @@
6−
7− """
8−
9−-from __future__ import print_function
10−-
11− #
12− # __COPYRIGHT__
13− #
pkgs/development/tools/build-managers/wafHook/setup-hook.sh+15−5
@@ -11,17 +11,23 @@ wafConfigurePhase() {
1111 fi
1212
1313 local flagsArray=(
14− @crossFlags@
1514 "${flagsArray[@]}"
1615 $wafConfigureFlags "${wafConfigureFlagsArray[@]}"
1716 ${configureTargets:-configure}
1817 )
18+ if [ -z "${dontAddWafCrossFlags:-}" ]; then
19+ flagsArray+=(@crossFlags@)
20+ fi
1921 echoCmd 'configure flags' "${flagsArray[@]}"
2022 python "$wafPath" "${flagsArray[@]}"
2123
2224 runHook postConfigure
2325}
2426
27+if [ -z "${dontUseWafConfigure-}" -a -z "${configurePhase-}" ]; then
28+ configurePhase=wafConfigurePhase
29+fi
30+
2531wafBuildPhase () {
2632 runHook preBuild
2733
@@ -41,6 +47,10 @@ wafBuildPhase () {
4147 runHook postBuild
4248}
4349
50+if [ -z "${dontUseWafBuild-}" -a -z "${buildPhase-}" ]; then
51+ buildPhase=wafBuildPhase
52+fi
53+
4454wafInstallPhase() {
4555 runHook preInstall
4656
@@ -51,7 +61,7 @@ wafInstallPhase() {
5161 local flagsArray=(
5262 $wafFlags ${wafFlagsArray[@]}
5363 $installFlags ${installFlagsArray[@]}
54− ${installTargets:-install}
64+ ${installTargets:-install}
5565 )
5666
5767 echoCmd 'install flags' "${flagsArray[@]}"
@@ -60,6 +70,6 @@ wafInstallPhase() {
6070 runHook postInstall
6171}
6272
63−configurePhase=wafConfigurePhase
64−buildPhase=wafBuildPhase
65−installPhase=wafInstallPhase
73+if [ -z "${dontUseWafInstall-}" -a -z "${installPhase-}" ]; then
74+ installPhase=wafInstallPhase
75+fi
pkgs/development/tools/misc/elfutils/default.nix−35
@@ -28,41 +28,6 @@ stdenv.mkDerivation rec {
2828
2929 enableParallelBuilding = true;
3030
31− # This program does not cross-build fine. So I only cross-build some parts
32− # I need for the linux perf tool.
33− # On the awful cross-building:
34− # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005
35− #
36− # I wrote this testing for the nanonote.
37−
38− buildPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
39− pushd libebl
40− make
41− popd
42− pushd libelf
43− make
44− popd
45− pushd libdwfl
46− make
47− popd
48− pushd libdw
49− make
50− popd
51− '';
52−
53− installPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
54− pushd libelf
55− make install
56− popd
57− pushd libdwfl
58− make install
59− popd
60− pushd libdw
61− make install
62− popd
63− cp version.h $out/include
64− '';
65−
6631 doCheck = false; # fails 3 out of 174 tests
6732 doInstallCheck = false; # fails 70 out of 174 tests
6833
pkgs/development/tools/nsis/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 chmod -R u+w $out/share/nsis
2323 '';
2424
25− nativeBuildInputs = [ scons ];
25+ nativeBuildInputs = [ scons.py2 ];
2626 buildInputs = [ zlib ];
2727
2828 sconsFlags = [
pkgs/development/tools/profiling/sysprof/default.nix+2−2
@@ -19,13 +19,13 @@
1919
2020stdenv.mkDerivation rec {
2121 pname = "sysprof";
22− version = "3.34.1";
22+ version = "3.36.0";
2323
2424 outputs = [ "out" "lib" "dev" ];
2525
2626 src = fetchurl {
2727 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
28− sha256 = "1l4kr1av7933vb4zql9c5lgzivlw64hyky4nr8xin1v5if6vnjw4";
28+ sha256 = "hnDbTaz3shnTDFdcRlsXyO1nJNut40fyzelUi/8DkQg=";
2929 };
3030
3131 nativeBuildInputs = [
pkgs/development/tools/sunxi-tools/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, libusb, zlib }:
1+{ stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }:
22
33stdenv.mkDerivation {
44 name = "sunxi-tools-20181113";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig ];
14− buildInputs = [ libusb zlib ];
14+ buildInputs = [ libusb1 zlib ];
1515
1616 makeFlags = [ "PREFIX=$(out)" ];
1717
pkgs/games/crispy-doom/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "crispy-doom";
5− version = "5.7";
5+ version = "5.7.1";
66
77 src = fetchFromGitHub {
88 owner = "fabiangreffrath";
99 repo = pname;
1010 rev = "${pname}-${version}";
11− sha256 = "1m9bk7hp3d4sdd3y3isvf26rxya7511mnwyv99l2f80adbsv3nq2";
11+ sha256 = "1gqivy4pxasy7phyznixsagylf9f70bk33b0knpfzzlks6cc6zzj";
1212 };
1313
1414 postPatch = ''
pkgs/games/tdm/default.nix+1−1
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
2424 sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6";
2525 };
2626 nativeBuildInputs = [
27− p7zip scons gnum4 makeWrapper
27+ p7zip scons.py2 gnum4 makeWrapper
2828 ];
2929 buildInputs = [
3030 glibc_multi mesa.dev xorg.libX11.dev openal
pkgs/games/vdrift/default.nix+2−2
@@ -20,8 +20,8 @@ let
2020 sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg";
2121 };
2222
23− nativeBuildInputs = [ pkgconfig ];
24− buildInputs = [ scons libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ];
23+ nativeBuildInputs = [ pkgconfig scons.py2 ];
24+ buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ];
2525
2626 patches = [ ./0001-Ignore-missing-data-for-installation.patch ];
2727
pkgs/misc/drivers/utsushi/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2
2−, imagemagick, sane-backends, tesseract4, udev, libusb}:
2+, imagemagick, sane-backends, tesseract4, udev, libusb1}:
33
44stdenv.mkDerivation rec {
55 pname = "utsushi";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 imagemagick
2424 sane-backends
2525 udev.dev
26− libusb.dev
26+ libusb1.dev
2727 ];
2828
2929 NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable";
pkgs/misc/drivers/xboxdrv/default.nix+2−2
@@ -13,8 +13,8 @@ in stdenv.mkDerivation {
1313 };
1414
1515 makeFlags = [ "PREFIX=$(out)" ];
16− nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ];
16+ nativeBuildInputs = [ pkgconfig scons.py2 ];
17+ buildInputs = [ libX11 libusb1 boost glib dbus-glib ];
1818 dontUseSconsInstall = true;
1919
2020 meta = with stdenv.lib; {
pkgs/misc/drivers/xow/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, libusb }:
1+{ stdenv, fetchFromGitHub, libusb1 }:
22
33stdenv.mkDerivation rec {
44 pname = "xow";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 "SYSDDIR=${placeholder ''out''}/lib/systemd/system"
2222 ];
2323 enableParallelBuilding = true;
24− buildInputs = [ libusb ];
24+ buildInputs = [ libusb1 ];
2525
2626 meta = with stdenv.lib; {
2727 homepage = "https://github.com/medusalix/xow";
pkgs/misc/emulators/dolphin-emu/default.nix+72−15
@@ -1,17 +1,44 @@
1−{ stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib
2−, libGLU, libGL , gettext, libpthreadstubs, libXrandr, libXext, readline
3−, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev
4−, wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml
5−, libpulseaudio ? null }:
1+{ stdenv
2+, lib
3+, fetchpatch
4+, pkgconfig
5+, cmake
6+, bluez
7+, ffmpeg
8+, libao
9+, gtk2
10+, glib
11+, libGLU
12+, libGL
13+, gettext
14+, libpthreadstubs
15+, libXrandr
16+, libXext
17+, readline
18+, openal
19+, libXdmcp
20+, portaudio
21+, fetchFromGitHub
22+, libusb1
23+, libevdev
24+, wxGTK30
25+, soundtouch
26+, miniupnpc
27+, mbedtls
28+, curl
29+, lzo
30+, sfml
31+, libpulseaudio ? null
32+}:
633
734stdenv.mkDerivation rec {
835 pname = "dolphin-emu";
936 version = "5.0";
1037
1138 src = fetchFromGitHub {
12− owner = "dolphin-emu";
13− repo = "dolphin";
14− rev = version;
39+ owner = "dolphin-emu";
40+ repo = "dolphin";
41+ rev = version;
1542 sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6";
1643 };
1744
@@ -44,15 +71,45 @@ stdenv.mkDerivation rec {
4471
4572 enableParallelBuilding = true;
4673
47− nativeBuildInputs = [ pkgconfig ];
48− buildInputs = [ cmake bluez ffmpeg libao libGLU libGL gtk2 glib
49− gettext libpthreadstubs libXrandr libXext readline openal
50− libevdev libXdmcp portaudio libusb libpulseaudio
51− libevdev libXdmcp portaudio libusb libpulseaudio
52− wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ];
74+ nativeBuildInputs = [
75+ pkgconfig
76+ cmake
77+ ];
78+
79+ buildInputs = [
80+ bluez
81+ ffmpeg
82+ libao
83+ libGLU
84+ libGL
85+ gtk2
86+ glib
87+ gettext
88+ libpthreadstubs
89+ libXrandr
90+ libXext
91+ readline
92+ openal
93+ libevdev
94+ libXdmcp
95+ portaudio
96+ libpulseaudio
97+ libevdev
98+ libXdmcp
99+ portaudio
100+ libusb1
101+ libpulseaudio
102+ wxGTK30
103+ soundtouch
104+ miniupnpc
105+ mbedtls
106+ curl
107+ lzo
108+ sfml
109+ ];
53110
54111 meta = with lib; {
55− homepage = https://dolphin-emu.org/;
112+ homepage = "https://dolphin-emu.org/";
56113 description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
57114 license = licenses.gpl2Plus;
58115 maintainers = with maintainers; [ MP2E ashkitten ];
pkgs/misc/emulators/dolphin-emu/master.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake
22, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext
3−, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
3+, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
44, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib
55, miniupnpc, enet, mbedtls, soundtouch, sfml
66, vulkan-loader ? null, libpulseaudio ? null
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
3737 buildInputs = [
3838 curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio
3939 libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo
40− portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml
40+ portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml
4141 qtbase
4242 ] ++ lib.optionals stdenv.isLinux [
4343 bluez udev libevdev alsaLib vulkan-loader
pkgs/misc/frescobaldi/default.nix+1−1
@@ -1,7 +1,7 @@
11{ lib, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }:
22
33buildPythonApplication rec {
4− name = "frescobaldi-${version}";
4+ pname = "frescobaldi";
55 version = "3.1.1";
66
77 src = fetchFromGitHub {
pkgs/os-specific/linux/apparmor/cross.patchdeleted−19
@@ -1,19 +0,0 @@
1−--- a/parser/libapparmor_re/Makefile 2018-10-14 07:38:06.000000000 +0800
2−+++ b/parser/libapparmor_re/Makefile 2019-06-28 16:16:33.741916660 +0800
3−@@ -10,6 +10,7 @@
4−
5− TARGET=libapparmor_re.a
6−
7−+AR ?= ar
8− CFLAGS ?= -g -Wall -O2 ${EXTRA_CFLAGS} -std=gnu++0x
9− CXXFLAGS := ${CFLAGS} ${INCLUDE_APPARMOR}
10−
11−@@ -22,7 +23,7 @@
12− UNITTESTS = tst_parse
13−
14− libapparmor_re.a: parse.o expr-tree.o hfa.o chfa.o aare_rules.o
15−- ar ${ARFLAGS} $@ $^
16−+ ${AR} ${ARFLAGS} $@ $^
17−
18− expr-tree.o: expr-tree.cc expr-tree.h
19−
pkgs/os-specific/linux/apparmor/default.nix+2−9
@@ -14,7 +14,7 @@
1414
1515let
1616 apparmor-series = "2.13";
17− apparmor-patchver = "3";
17+ apparmor-patchver = "4";
1818 apparmor-version = apparmor-series + "." + apparmor-patchver;
1919
2020 apparmor-meta = component: with stdenv.lib; {
@@ -27,7 +27,7 @@ let
2727
2828 apparmor-sources = fetchurl {
2929 url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
30− sha256 = "0fbnk9fzjsffwcijsv2wwykmybvfdckpqk99qlib3kb89him6w16";
30+ sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh";
3131 };
3232
3333 prePatchCommon = ''
@@ -49,13 +49,6 @@ let
4949 sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4";
5050 })
5151 # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12)
52− ] ++ [
53− ./cross.patch
54− # Support Python 3.8
55− (fetchpatch {
56− url = https://gitlab.com/apparmor/apparmor/commit/ccbf1e0bf1bf5c3bbab47029fbbc5415ef73bac1.patch;
57− sha256 = "0kfzc0wyjybj38n10yvwakaaqvglalzigd3kk7gcrbp1xdn70pq2";
58− })
5952 ];
6053
6154 # Set to `true` after the next FIXME gets fixed or this gets some
pkgs/os-specific/linux/bcc/default.nix+1−1
@@ -4,8 +4,8 @@
44}:
55
66python.pkgs.buildPythonApplication rec {
7+ pname = "bcc";
78 version = "0.13.0";
8− name = "bcc-${version}";
99
1010 src = fetchurl {
1111 url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
pkgs/os-specific/linux/bluez/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616stdenv.mkDerivation rec {
1717 pname = "bluez";
18− version = "5.53";
18+ version = "5.54";
1919
2020 src = fetchurl {
2121 url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
22− sha256 = "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq";
22+ sha256 = "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8";
2323 };
2424
2525 pythonPath = with python3.pkgs; [
pkgs/os-specific/linux/ffado/default.nix+9−1
@@ -43,7 +43,15 @@ mkDerivation rec {
4343
4444 outputs = [ "out" "bin" "dev" ];
4545
46− nativeBuildInputs = [ desktop-file-utils scons pkgconfig which python pyqt5 wrapQtAppsHook ];
46+ nativeBuildInputs = [
47+ desktop-file-utils
48+ scons.py2
49+ pkgconfig
50+ which
51+ python
52+ pyqt5
53+ wrapQtAppsHook
54+ ];
4755
4856 prefixKey = "PREFIX=";
4957 sconsFlags = [
pkgs/os-specific/linux/iproute/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf }:
1+{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf, libmnl }:
22
33stdenv.mkDerivation rec {
44 pname = "iproute2";
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
3636 "CONFDIR=$(out)/etc/iproute2"
3737 ];
3838
39− buildInputs = [ db iptables libelf ];
39+ buildInputs = [ db iptables libelf libmnl ];
4040 nativeBuildInputs = [ bison flex pkgconfig ];
4141
4242 enableParallelBuilding = true;
pkgs/os-specific/linux/net-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "net-tools";
5− version = "1.60_p20170221182432";
5+ version = "1.60_p20180626073013";
66
77 src = fetchurl {
88 url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz";
9− sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a";
9+ sha256 = "0mzsjjmz5kn676w2glmxwwd8bj0xy9dhhn21aplb435b767045q4";
1010 };
1111
1212 preBuild =
pkgs/os-specific/linux/plymouth/default.nix+24−26
@@ -26,34 +26,32 @@ stdenv.mkDerivation rec {
2626 -e "s#plymouththemedir=.*#plymouththemedir=/etc/plymouth/themes#" \
2727 -e "s#plymouthpolicydir=.*#plymouthpolicydir=/etc/plymouth/#" \
2828 configure.ac
29+ '';
2930
30− configureFlags="
31− --prefix=$out
32− --bindir=$out/bin
33− --sbindir=$out/sbin
34− --exec-prefix=$out
35− --libdir=$out/lib
36− --libexecdir=$out/lib
37− --sysconfdir=/etc
38− --with-systemdunitdir=$out/etc/systemd/system
39− --localstatedir=/var
40− --with-logo=/etc/plymouth/logo.png
41− --with-background-color=0x000000
42− --with-background-start-color-stop=0x000000
43− --with-background-end-color-stop=0x000000
44− --with-release-file=/etc/os-release
45− --without-system-root-install
46− --without-rhgb-compat-link
47− --enable-tracing
48− --enable-systemd-integration
49− --enable-pango
50− --enable-gdm-transition
51− --enable-gtk"
31+ configureFlags = [
32+ "--sysconfdir=/etc"
33+ "--with-systemdunitdir=${placeholder "out"}/etc/systemd/system"
34+ "--localstatedir=/var"
35+ "--with-logo=/etc/plymouth/logo.png"
36+ "--with-background-color=0x000000"
37+ "--with-background-start-color-stop=0x000000"
38+ "--with-background-end-color-stop=0x000000"
39+ "--with-release-file=/etc/os-release"
40+ "--without-system-root-install"
41+ "--without-rhgb-compat-link"
42+ "--enable-tracing"
43+ "--enable-systemd-integration"
44+ "--enable-pango"
45+ "--enable-gdm-transition"
46+ "--enable-gtk"
47+ ];
5248
53− installFlags="
54− plymouthd_defaultsdir=$out/share/plymouth
55− plymouthd_confdir=$out/etc/plymouth"
56− '';
49+ configurePlatforms = [ "host" ];
50+
51+ installFlags = [
52+ "plymouthd_defaultsdir=$(out)/share/plymouth"
53+ "plymouthd_confdir=$(out)/etc/plymouth"
54+ ];
5755
5856 meta = with stdenv.lib; {
5957 homepage = http://www.freedesktop.org/wiki/Software/Plymouth;
pkgs/os-specific/linux/rdma-core/default.nix+2−7
@@ -4,7 +4,7 @@
44} :
55
66let
7− version = "27.0";
7+ version = "28.0";
88
99in stdenv.mkDerivation {
1010 pname = "rdma-core";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
1414 owner = "linux-rdma";
1515 repo = "rdma-core";
1616 rev = "v${version}";
17− sha256 = "04mhcrcmbwxcjhswlkhnr6m5nl2389jgjv6aqhd4v0x555cwnfvw";
17+ sha256 = "0az2is6p5gkyphi2b978kwn7knry60y33kn6p7cxz49ca79a42cy";
1818 };
1919
2020 nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ];
@@ -26,11 +26,6 @@ in stdenv.mkDerivation {
2626 ];
2727
2828 postPatch = ''
29− substituteInPlace providers/rxe/rxe_cfg.in \
30− --replace ethtool "${ethtool}/bin/ethtool" \
31− --replace 'ip addr' "${iproute}/bin/ip addr" \
32− --replace 'ip link' "${iproute}/bin/ip link"
33−
3429 substituteInPlace srp_daemon/srp_daemon.sh.in \
3530 --replace /bin/rm rm
3631 '';
pkgs/os-specific/linux/udisks/2-default.nix+7−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, substituteAll, libtool, pkgconfig, gettext, gnused
1+{ stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused
22, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which
33, expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted
44, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake
@@ -37,6 +37,12 @@ stdenv.mkDerivation rec {
3737 xfsprogs ntfs3g parted utillinux
3838 ];
3939 })
40+
41+ # Fix tests: https://github.com/storaged-project/udisks/issues/724
42+ (fetchpatch {
43+ url = "https://github.com/storaged-project/udisks/commit/60a0c1c967821d317046d9494e45b9a8e4e7a1c1.patch";
44+ sha256 = "tWl49mSc1zDyB3kV6SKlhHFPi/Kg7mg6OWDlY7vGj2Y=";
45+ })
4046 ];
4147
4248 nativeBuildInputs = [
pkgs/servers/amqp/qpid-cpp/default.nix+4−3
@@ -1,7 +1,8 @@
11{ stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }:
22
33let
4− name = "qpid-cpp-${version}";
4+ pname = "qpid-cpp";
5+ name = "${pname}-${version}";
56 version = "1.39.0";
67
78 src = fetchurl {
@@ -20,7 +21,7 @@ let
2021 };
2122
2223 qpid-cpp = stdenv.mkDerivation {
23− inherit src meta name;
24+ inherit src meta pname version;
2425
2526 nativeBuildInputs = [ cmake ];
2627 buildInputs = [ boost libuuid ruby python2 ];
@@ -46,7 +47,7 @@ let
4647 };
4748
4849 python-frontend = buildPythonPackage {
49− inherit name meta src;
50+ inherit pname version meta src;
5051
5152 sourceRoot = "${name}/management/python";
5253
pkgs/servers/gpsd/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 };
1818
1919 nativeBuildInputs = [
20− scons pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc
20+ scons.py2 pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc
2121 python2Packages.python
2222 python2Packages.wrapPython
2323 ];
pkgs/servers/headphones/default.nix+1−1
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, python2, makeWrapper }:
22
33python2.pkgs.buildPythonApplication rec {
4− name = "headphones-${version}";
4+ pname = "headphones";
55 version = "0.5.19";
66
77 src = fetchFromGitHub {
pkgs/servers/http/hyp/default.nix+3−3
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, python3Packages }:
22
33python3Packages.buildPythonPackage rec {
4− name = "hyp-server-${version}";
4+ pname = "hyp-server";
55 version = "1.2.0";
66
7− src = fetchurl {
8− url = "mirror://pypi/h/hyp-server/${name}.tar.gz";
7+ src = python3Packages.fetchPypi {
8+ inherit pname version;
99 sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
1010 };
1111
pkgs/servers/nosql/mongodb/mongodb.nix+1−1
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
3232 inherit sha256;
3333 };
3434
35− nativeBuildInputs = [ scons ];
35+ nativeBuildInputs = [ scons.py2 ];
3636 buildInputs = [
3737 boost
3838 curl
pkgs/servers/sickbeard/sickrage.nix+1−1
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, python2, makeWrapper }:
22
33python2.pkgs.buildPythonApplication rec {
4− name = "sickrage-${version}";
4+ pname = "sickrage";
55 version = "v2018.07.21-1";
66
77 src = fetchFromGitHub {
pkgs/tools/X11/arandr/default.nix+4−1
@@ -5,8 +5,11 @@
55
66let
77 inherit (python3Packages) buildPythonApplication docutils pygobject3;
8+ pname = "arandr";
9+ version = "0.1.10";
10+ name = "${pname}-${version}";
811in buildPythonApplication rec {
9− name = "arandr-0.1.10";
12+ inherit pname version;
1013
1114 src = fetchurl {
1215 url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz";
pkgs/tools/admin/azure-cli/python-packages.nix+3−10
@@ -11,10 +11,7 @@ let
1111 '';
1212
1313 # Prevent these __init__'s from violating PEP420, only needed for python2
14− postInstall = (attrs.postInstall or "") + ''
15− rm $out/${python.sitePackages}/azure/{,__pycache__/}__init__.* \
16− $out/${python.sitePackages}/azure/cli/{,__pycache__/}__init__.*
17− '';
14+ pythonNamespaces = [ "azure.cli" ];
1815
1916 checkInputs = [ mock pytest ] ++ (attrs.checkInputs or []);
2017 checkPhase = attrs.checkPhase or ''
@@ -39,9 +36,7 @@ let
3936 '';
4037
4138 # force PEP420
42− postInstall = ''
43− rm -f $out/${py.sitePackages}/azure/{,mgmt/}__init__.py
44− '';
39+ pythonNamespaces = [ "azure.mgmt" ];
4540 });
4641
4742 py = python.override {
@@ -277,9 +272,7 @@ let
277272 propagatedBuildInputs = with self; [
278273 azure-common azure-nspkg msrest msrestazure cryptography
279274 ];
280− postInstall = ''
281− rm -f $out/${self.python.sitePackages}/azure/__init__.py
282− '';
275+ pythonNamespaces = [ "azure" ];
283276 pythonImportsCheck = [ ];
284277 });
285278
pkgs/tools/admin/bubblewrap/default.nix+2−1
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr";
1010 };
1111
12− nativeBuildInputs = [ libcap libxslt docbook_xsl ];
12+ nativeBuildInputs = [ libxslt docbook_xsl ];
13+ buildInputs = [ libcap ];
1314
1415 meta = with stdenv.lib; {
1516 description = "Unprivileged sandboxing tool";
pkgs/tools/compression/lz4/default.nix+3−11
@@ -4,23 +4,15 @@
44
55stdenv.mkDerivation rec {
66 pname = "lz4";
7− version = "1.9.1";
7+ version = "1.9.2";
88
99 src = fetchFromGitHub {
10− sha256 = "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0";
10+ sha256 = "0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61";
1111 rev = "v${version}";
1212 repo = pname;
1313 owner = pname;
1414 };
1515
16− patches = [
17− # Fix detection of Darwin
18− (fetchpatch {
19− url = "https://github.com/lz4/lz4/commit/024216ef7394b6411eeaa5b52d0cec9953a44249.patch";
20− sha256 = "0j0j2pr6pkplxf083hlwl5q4cfp86q3wd8mc64bcfcr7ysc5pzl3";
21− })
22− ];
23−
2416 # TODO(@Ericson2314): Separate binaries and libraries
2517 outputs = [ "bin" "out" "dev" ];
2618
@@ -61,7 +53,7 @@ stdenv.mkDerivation rec {
6153 multiple GB/s per core, typically reaching RAM speed limits on
6254 multi-core systems.
6355 '';
64− homepage = https://lz4.github.io/lz4/;
56+ homepage = "https://lz4.github.io/lz4/";
6557 license = with licenses; [ bsd2 gpl2Plus ];
6658 platforms = platforms.all;
6759 };
pkgs/tools/compression/xz/default.nix+3−3
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, enableStatic ? false }:
22
33stdenv.mkDerivation rec {
4− name = "xz-5.2.4";
4+ name = "xz-5.2.5";
55
66 src = fetchurl {
77 url = "https://tukaani.org/xz/${name}.tar.bz2";
8− sha256 = "1gxpayfagb4v7xfhs2w6h7k56c6hwwav1rk48bj8hggljlmgs4rk";
8+ sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si";
99 };
1010
1111 outputs = [ "bin" "dev" "out" "man" "doc" ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 postInstall = "rm -rf $out/share/doc";
2626
2727 meta = with stdenv.lib; {
28− homepage = https://tukaani.org/xz/;
28+ homepage = "https://tukaani.org/xz/";
2929 description = "XZ, general-purpose data compression software, successor of LZMA";
3030
3131 longDescription =
pkgs/tools/filesystems/davfs2/default.nix+15
@@ -1,5 +1,7 @@
11{ stdenv
22, fetchurl
3+, fetchpatch
4+, autoreconfHook
35, neon
46, procps
57, substituteAll
@@ -14,6 +16,10 @@ stdenv.mkDerivation rec {
1416 sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21";
1517 };
1618
19+ nativeBuildInputs = [
20+ autoreconfHook # neon-0.31.patch requires reconfiguration
21+ ];
22+
1723 buildInputs = [ neon zlib ];
1824
1925 patches = [
@@ -23,6 +29,15 @@ stdenv.mkDerivation rec {
2329 src = ./0001-umount_davfs-substitute-ps-command.patch;
2430 ps = "${procps}/bin/ps";
2531 })
32+
33+ # Fix build with neon 0.31
34+ # http://savannah.nongnu.org/bugs/?58101
35+ (fetchpatch {
36+ name = "neon-0.31.patch";
37+ url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737";
38+ sha256 = "EtQfcstWkn8AcbZo93midGt076gq20AvGGJyQ3FO/YQ=";
39+ extraPrefix = ""; # empty means add 'a/' and 'b/'
40+ })
2641 ];
2742
2843 configureFlags = [ "--sysconfdir=/etc" ];
pkgs/tools/misc/ddcutil/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
2−, glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }:
2+, glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }:
33
44stdenv.mkDerivation rec {
55 pname = "ddcutil";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ autoreconfHook pkgconfig ];
1616 buildInputs = [
1717 i2c-tools udev libgudev
18− glib libusb libdrm xorg.libXrandr
18+ glib libusb1 libdrm xorg.libXrandr
1919 ];
2020
2121 meta = with stdenv.lib; {
pkgs/tools/misc/gringo/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41";
1717 };
1818
19− buildInputs = [ bison re2c scons ];
19+ buildInputs = [ bison re2c scons.py2 ];
2020
2121 patches = [
2222 ./gringo-4.5.4-cmath.patch
pkgs/tools/misc/mimeo/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, desktop-file-utils, file, python3Packages }:
22
33python3Packages.buildPythonApplication rec {
4− name = "mimeo-${version}";
4+ pname = "mimeo";
55 version = "2019.7";
66
77 src = fetchurl {
8− url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
8+ url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz";
99 sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r";
1010 };
1111
pkgs/tools/misc/rpm-ostree/default.nix+4−2
@@ -83,11 +83,13 @@ stdenv.mkDerivation rec {
8383 pcre
8484 check
8585 python
86− # libdnf
86+
87+ # libdnf # vendored unstable branch
88+ # required by vendored libdnf
8789 json_c
8890 zchunk
8991 libmodulemd_1
90− utillinux
92+ utillinux # for smartcols.pc
9193 sqlite
9294 cppunit
9395 ];
pkgs/tools/misc/trash-cli/default.nix+1−2
@@ -2,9 +2,8 @@
22, python3Packages, substituteAll }:
33
44python3Packages.buildPythonApplication rec {
5− name = "trash-cli-${version}";
5+ pname = "trash-cli";
66 version = "0.17.1.14";
7− namePrefix = "";
87
98 src = fetchFromGitHub {
109 owner = "andreafrancia";
pkgs/tools/misc/uhubctl/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv
22, fetchFromGitHub
3−, libusb
3+, libusb1
44}:
55
66stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq";
1515 };
1616
17− buildInputs = [ libusb ];
17+ buildInputs = [ libusb1 ];
1818
1919 installFlags = [ "prefix=${placeholder "out"}" ];
2020 meta = with stdenv.lib; {
pkgs/tools/misc/unicode/default.nix+1−1
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, fetchurl, python3Packages }:
22
33python3Packages.buildPythonApplication rec {
4− name = "unicode-${version}";
4+ pname = "unicode";
55 version = "2.6";
66
77 src = fetchFromGitHub {
pkgs/tools/networking/network-manager/default.nix+2−2
@@ -10,11 +10,11 @@ let
1010 pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
1111in stdenv.mkDerivation rec {
1212 pname = "network-manager";
13− version = "1.22.8";
13+ version = "1.22.10";
1414
1515 src = fetchurl {
1616 url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
17− sha256 = "0kxbgln78lb1cxhd79vbpdbncsb0cppr15fycgqb9df6f8nbj4cm";
17+ sha256 = "0xyaizyp3yz6x3pladw3nvl3hf4n5g140zx9jnxfp9qvag0wqa9b";
1818 };
1919
2020 outputs = [ "out" "dev" "devdoc" "man" "doc" ];
pkgs/tools/networking/unbound/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "unbound";
5− version = "1.9.5";
5+ version = "1.10.0";
66
77 src = fetchurl {
88 url = "https://unbound.net/downloads/${pname}-${version}.tar.gz";
9− sha256 = "0myv8l886gmlh9nh4j3q5549idxnl51hf9cw20yxfqbwd47l13ca";
9+ sha256 = "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm";
1010 };
1111
1212 # https://github.com/NLnetLabs/unbound/pull/90
pkgs/tools/security/acsccid/default.nix+34−6
@@ -1,4 +1,16 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb, libiconv }:
1+{ stdenv
2+, fetchFromGitHub
3+, autoconf
4+, automake
5+, libtool
6+, gettext
7+, flex
8+, perl
9+, pkgconfig
10+, pcsclite
11+, libusb1
12+, libiconv
13+}:
214
315stdenv.mkDerivation rec {
416 version = "1.1.8";
@@ -11,11 +23,28 @@ stdenv.mkDerivation rec {
1123 sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3";
1224 };
1325
14− doCheck = true;
26+ nativeBuildInputs = [
27+ pkgconfig
28+ autoconf
29+ automake
30+ libtool
31+ gettext
32+ flex
33+ perl
34+ ];
35+
36+ buildInputs = [
37+ pcsclite
38+ libusb1
39+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
40+ libiconv
41+ ];
1542
16− nativeBuildInputs = [ pkgconfig ];
17− buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ]
18− ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
43+ configureFlags = [
44+ "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers"
45+ ];
46+
47+ doCheck = true;
1948
2049 postPatch = ''
2150 sed -e s_/bin/echo_echo_g -i src/Makefile.am
@@ -29,7 +58,6 @@ stdenv.mkDerivation rec {
2958 autoheader
3059 automake --force-missing --add-missing
3160 autoconf
32− configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers"
3361 '';
3462
3563 meta = with stdenv.lib; {
pkgs/tools/security/chipsec/default.nix+1−1
@@ -1,7 +1,7 @@
11{ stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf
22, kernel ? null, withDriver ? false }:
33pythonPackages.buildPythonApplication rec {
4− name = "chipsec-${version}";
4+ pname = "chipsec";
55 version = "1.4.7";
66
77 src = fetchFromGitHub {
pkgs/tools/security/gnupg/22.nix+2−2
@@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false;
1616stdenv.mkDerivation rec {
1717 pname = "gnupg";
1818
19− version = "2.2.19";
19+ version = "2.2.20";
2020
2121 src = fetchurl {
2222 url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2";
23− sha256 = "1h6yx6sdpz3lf9gdppgxqcf73baynr8gflmh43286fkgw3058994";
23+ sha256 = "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4";
2424 };
2525
2626 depsBuildBuild = [ buildPackages.stdenv.cc ];
pkgs/tools/security/knockknock/default.nix+4−3
@@ -1,8 +1,9 @@
11{ stdenv, fetchFromGitHub, python2Packages, hping }:
2−
3−python2Packages.buildPythonApplication rec {
2+let
43 rev = "bf14bbff";
5− name = "knockknock-r${rev}";
4+in python2Packages.buildPythonApplication rec {
5+ pname = "knockknock-r";
6+ version = rev;
67
78 src = fetchFromGitHub {
89 inherit rev;
pkgs/tools/security/neopg/default.nix+3−3
@@ -7,7 +7,7 @@
77, curl
88, gettext
99, pkgconfig
10−, libusb
10+, libusb1
1111, gnutls }:
1212
1313stdenv.mkDerivation rec {
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
2222 fetchSubmodules = true;
2323 };
2424
25− nativeBuildInputs = [ pkgconfig ];
25+ nativeBuildInputs = [ cmake gettext pkgconfig ];
2626
27− buildInputs = [ cmake sqlite botan2 boost curl gettext libusb gnutls ];
27+ buildInputs = [ sqlite botan2 boost curl libusb1 gnutls ];
2828
2929 doCheck = true;
3030 checkTarget = "test";
pkgs/tools/security/sshuttle/default.nix+3−3
@@ -2,12 +2,12 @@
22, coreutils, iptables, nettools, openssh, procps }:
33
44python3Packages.buildPythonApplication rec {
5− name = "sshuttle-${version}";
5+ pname = "sshuttle";
66 version = "0.78.5";
77
8− src = fetchurl {
8+ src = python3Packages.fetchPypi {
9+ inherit pname version;
910 sha256 = "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8";
10− url = "mirror://pypi/s/sshuttle/${name}.tar.gz";
1111 };
1212
1313 patches = [ ./sudo.patch ];
pkgs/tools/security/sudo/default.nix+4−4
@@ -6,11 +6,11 @@
66
77stdenv.mkDerivation rec {
88 pname = "sudo";
9− version = "1.8.31";
9+ version = "1.8.31p1";
1010
1111 src = fetchurl {
12− url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz";
13− sha256 = "0ks5mm9hda5idivncyfpiz4lrd8fv0dpmsl711788k7f7ixdka3y";
12+ url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz";
13+ sha256 = "1n0mdmgcs92af34xxsnsh1arrngymhdmwd9srjgjbk65q7xzsg67";
1414 };
1515
1616 prePatch = ''
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
7272 providing an audit trail of the commands and their arguments.
7373 '';
7474
75− homepage = https://www.sudo.ws/;
75+ homepage = "https://www.sudo.ws/";
7676
7777 license = https://www.sudo.ws/sudo/license.html;
7878
pkgs/tools/typesetting/rubber/default.nix+2−2
@@ -1,11 +1,11 @@
11{ fetchurl, stdenv, python3Packages, texinfo }:
22
33python3Packages.buildPythonApplication rec {
4− name = "rubber-${version}";
4+ pname = "rubber";
55 version = "1.5.1";
66
77 src = fetchurl {
8− url = "https://launchpad.net/rubber/trunk/${version}/+download/${name}.tar.gz";
8+ url = "https://launchpad.net/rubber/trunk/${version}/+download/${pname}-${version}.tar.gz";
99 sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p";
1010 };
1111
pkgs/tools/video/vnc2flv/default.nix+3−3
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, pythonPackages }:
22
33pythonPackages.buildPythonApplication rec {
4− name = "vnc2flv-20100207";
5− namePrefix = "";
4+ pname = "vnc2flv";
5+ version = "20100207";
66
77 src = fetchurl {
8− url = "mirror://pypi/v/vnc2flv/${name}.tar.gz";
8+ url = "mirror://pypi/v/vnc2flv/${pname}-${version}.tar.gz";
99 sha256 = "14d4nm8yim0bm0nd3wyj7z4zdsg5zk3d9bhhvwdc36x03r8d0sbq";
1010 };
1111
pkgs/tools/virtualization/euca2ools/default.nix+2−2
@@ -3,8 +3,8 @@
33let
44 inherit (python2Packages) buildPythonApplication boto m2crypto;
55in buildPythonApplication {
6− name = "euca2ools-2.1.4";
7− namePrefix = "";
6+ pname = "euca2ools";
7+ version = "2.1.4";
88
99 src = fetchgit {
1010 url = https://github.com/eucalyptus/euca2ools.git;
pkgs/top-level/aliases.nix+1
@@ -221,6 +221,7 @@ mapAliases ({
221221 libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25
222222 libcap_manpages = libcap.doc; # added 2016-04-29
223223 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
224+ libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # added 2020-03-04
224225 libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
225226 libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
226227 libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10
pkgs/top-level/all-packages.nix+8−7
@@ -4564,8 +4564,6 @@ in
45644564
45654565 libcoap = callPackage ../applications/networking/libcoap {};
45664566
4567− libcroco = callPackage ../development/libraries/libcroco { };
4568−
45694567 libcryptui = callPackage ../development/libraries/libcryptui { };
45704568
45714569 libsmi = callPackage ../development/libraries/libsmi { };
@@ -8926,13 +8924,13 @@ in
89268924 inherit (darwin) apple_sdk;
89278925 };
89288926
8929− rust_1_41_0 = callPackage ../development/compilers/rust/1_41_0.nix {
8927+ rust_1_42 = callPackage ../development/compilers/rust/1_42.nix {
89308928 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
89318929 };
8932− rust = rust_1_41_0;
8930+ rust = rust_1_42;
89338931
8934− rustPackages_1_41_0 = rust_1_41_0.packages.stable;
8935− rustPackages = rustPackages_1_41_0;
8932+ rustPackages_1_42 = rust_1_42.packages.stable;
8933+ rustPackages = rustPackages_1_42;
89368934
89378935 inherit (rustPackages) cargo clippy rustc rustPlatform;
89388936 inherit (rust) makeRustPlatform;
@@ -9126,6 +9124,7 @@ in
91269124 vala_0_40
91279125 vala_0_44
91289126 vala_0_46
9127+ vala_0_48
91299128 vala;
91309129
91319130 wcc = callPackage ../development/compilers/wcc { };
@@ -9562,6 +9561,7 @@ in
95629561 pipenv = callPackage ../development/tools/pipenv {};
95639562
95649563 pipewire = callPackage ../development/libraries/pipewire {};
9564+ pipewire_0_2 = callPackage ../development/libraries/pipewire/2.nix {};
95659565
95669566 pyradio = callPackage ../applications/radio/pyradio {};
95679567
@@ -9659,6 +9659,7 @@ in
96599659 stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
96609660 }));
96619661 spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { };
9662+ spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { };
96629663 spidermonkey = spidermonkey_38;
96639664
96649665 ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
@@ -22514,7 +22515,7 @@ in
2251422515
2251522516 chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {};
2251622517
22517− weston = callPackage ../applications/window-managers/weston { };
22518+ weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; };
2251822519
2251922520 whitebox-tools = callPackage ../applications/gis/whitebox-tools {
2252022521 inherit (darwin.apple_sdk.frameworks) Security;
pkgs/top-level/python-packages.nix+25−2
@@ -108,7 +108,22 @@ in {
108108 inherit buildSetupcfg;
109109
110110 inherit (callPackage ../development/interpreters/python/hooks { })
111− eggUnpackHook eggBuildHook eggInstallHook flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook pythonRemoveTestsDirHook setuptoolsBuildHook setuptoolsCheckHook venvShellHook wheelUnpackHook;
111+ eggUnpackHook
112+ eggBuildHook
113+ eggInstallHook
114+ flitBuildHook
115+ pipBuildHook
116+ pipInstallHook
117+ pytestCheckHook
118+ pythonCatchConflictsHook
119+ pythonImportsCheckHook
120+ pythonNamespacesHook
121+ pythonRemoveBinBytecodeHook
122+ pythonRemoveTestsDirHook
123+ setuptoolsBuildHook
124+ setuptoolsCheckHook
125+ venvShellHook
126+ wheelUnpackHook;
112127
113128 # helpers
114129
@@ -4524,6 +4539,12 @@ in {
45244539
45254540 nevow = callPackage ../development/python-modules/nevow { };
45264541
4542+ nghttp2 = (toPythonModule (pkgs.nghttp2.override {
4543+ inherit (self) python cython setuptools;
4544+ inherit (pkgs) ncurses;
4545+ enablePython = true;
4546+ })).python;
4547+
45274548 nibabel = callPackage ../development/python-modules/nibabel {};
45284549
45294550 nidaqmx = callPackage ../development/python-modules/nidaqmx { };
@@ -4581,7 +4602,9 @@ in {
45814602
45824603 notify2 = callPackage ../development/python-modules/notify2 {};
45834604
4584− notmuch = callPackage ../development/python-modules/notmuch { };
4605+ notmuch = callPackage ../development/python-modules/notmuch {
4606+ inherit (pkgs) notmuch;
4607+ };
45854608
45864609 emoji = callPackage ../development/python-modules/emoji { };
45874610