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

Staging next

commit993e2b4ec2e670b3bb02b0ad19c83f0ae365c198 authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateThu 11 Apr 2019, 18:23 (8 years ago) parentb54bce2d85c466
298 files changed+3989−2838
nixos/doc/manual/installation/installing.xml+1−1 nixos/doc/manual/release-notes/rl-1909.xml+7 nixos/modules/config/system-path.nix+1−1 nixos/modules/module-list.nix+1 nixos/modules/services/desktops/gnome3/evince.nix+35 nixos/modules/services/networking/networkmanager.nix+4−4 nixos/modules/services/x11/desktop-managers/gnome3.nix+6−1 nixos/modules/services/x11/desktop-managers/pantheon.nix+1−1 pkgs/applications/audio/fluidsynth/default.nix+2−2 pkgs/applications/audio/rhythmbox/default.nix+2−11 pkgs/applications/editors/gnome-builder/default.nix+31−14 pkgs/applications/editors/gnome-latex/default.nix+2−2 pkgs/applications/editors/kdevelop5/kdev-php.nix−4 pkgs/applications/editors/kdevelop5/kdev-python.nix−1 pkgs/applications/graphics/seg3d/default.nix−1 pkgs/applications/graphics/shotwell/default.nix+74−16 pkgs/applications/misc/font-manager/default.nix+7−5 pkgs/applications/misc/gnome-usage/default.nix+38−12 pkgs/applications/misc/orca/default.nix+2−2 pkgs/applications/misc/synapse/default.nix+2−2 pkgs/applications/networking/browsers/w3m/default.nix+5−4 pkgs/applications/networking/instant-messengers/mikutter/default.nix+1 pkgs/applications/networking/p2p/synapse-bt/default.nix+2−1 pkgs/applications/science/biology/ants/default.nix+1−3 pkgs/applications/science/biology/mni_autoreg/default.nix+1−2 pkgs/applications/version-management/git-and-tools/git/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch+4−3 pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch+6−4 pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch+19−90 pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch+4−3 pkgs/applications/version-management/git-and-tools/git/ssh-path.patch+5−5 pkgs/applications/version-management/meld/default.nix+4−4 pkgs/applications/video/handbrake/default.nix+2−2 pkgs/applications/video/mpv/default.nix+2−2 pkgs/build-support/bintools-wrapper/default.nix+1 pkgs/build-support/rust/default.nix+63−12 pkgs/build-support/rust/make-rust-platform.nix−18 pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+4 pkgs/data/misc/shared-mime-info/default.nix+3−3 pkgs/desktops/deepin/default.nix+3−9 pkgs/desktops/gnome-3/apps/accerciser/default.nix+4−4 pkgs/desktops/gnome-3/apps/cheese/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+24−9 pkgs/desktops/gnome-3/apps/gnome-books/default.nix+52 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+4−4 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix+6−11 pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-music/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-photos/default.nix+16−4 pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix+12−11 pkgs/desktops/gnome-3/apps/gnome-todo/default.nix+52−13 pkgs/desktops/gnome-3/apps/gnome-weather/default.nix+14−11 pkgs/desktops/gnome-3/apps/polari/default.nix+2−2 pkgs/desktops/gnome-3/apps/seahorse/default.nix+4−4 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2 pkgs/desktops/gnome-3/core/baobab/default.nix+2−2 pkgs/desktops/gnome-3/core/dconf-editor/default.nix+8−4 pkgs/desktops/gnome-3/core/dconf/default.nix+5−4 pkgs/desktops/gnome-3/core/eog/default.nix+2−2 pkgs/desktops/gnome-3/core/epiphany/default.nix+5−5 pkgs/desktops/gnome-3/core/evince/default.nix+91−31 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+2−2 pkgs/desktops/gnome-3/core/gdm/default.nix+2−2 pkgs/desktops/gnome-3/core/gjs/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+4−4 pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+10−6 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+14−13 pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch+84−8 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix+8−12 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix+4−4 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix+4−3 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+76−15 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch+5−18 pkgs/desktops/gnome-3/core/gnome-shell/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch+4−4 pkgs/desktops/gnome-3/core/gnome-software/default.nix+5−3 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-user-share/default.nix+45−27 pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix+16−5 pkgs/desktops/gnome-3/core/gucharmap/default.nix+5−5 pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix+7−7 pkgs/desktops/gnome-3/core/mutter/default.nix+37−31 pkgs/desktops/gnome-3/core/mutter/fix-paths.patch+13 pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch+5−10 pkgs/desktops/gnome-3/core/nautilus/default.nix+4−4 pkgs/desktops/gnome-3/core/simple-scan/default.nix+2−2 pkgs/desktops/gnome-3/core/sushi/default.nix+8−8 pkgs/desktops/gnome-3/core/totem/default.nix+12−7 pkgs/desktops/gnome-3/core/tracker-miners/default.nix+3−2 pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch−22 pkgs/desktops/gnome-3/core/tracker/default.nix+10−17 pkgs/desktops/gnome-3/core/tracker/fix-paths.patch+12 pkgs/desktops/gnome-3/core/yelp-tools/default.nix+2−2 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix+2−2 pkgs/desktops/gnome-3/core/yelp/default.nix+4−4 pkgs/desktops/gnome-3/core/zenity/default.nix+2−2 pkgs/desktops/gnome-3/default.nix+3−1 pkgs/desktops/gnome-3/devtools/devhelp/default.nix+2−2 pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix+2−2 pkgs/desktops/gnome-3/extensions/appindicator/default.nix+4−3 pkgs/desktops/gnome-3/extensions/battery-status/default.nix+1 pkgs/desktops/gnome-3/extensions/caffeine/default.nix+3−3 pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix+2−2 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix+2−2 pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix+3−3 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+6−6 pkgs/desktops/gnome-3/extensions/icon-hider/default.nix+1 pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix+3−3 pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix+1 pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix+2−2 pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix+2−2 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix+3−3 pkgs/desktops/gnome-3/extensions/system-monitor/default.nix+1 pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix+14−15 pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch+47−29 pkgs/desktops/gnome-3/extensions/timepp/default.nix+4−4 pkgs/desktops/gnome-3/games/aisleriot/default.nix+6−6 pkgs/desktops/gnome-3/games/atomix/default.nix+2−2 pkgs/desktops/gnome-3/games/five-or-more/default.nix+7−4 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix+13−4 pkgs/desktops/gnome-3/games/gnome-chess/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix+16−5 pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix+17−6 pkgs/desktops/gnome-3/games/gnome-mines/default.nix+9−6 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-robots/default.nix+15−7 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+4−4 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+11−6 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix+15−5 pkgs/desktops/gnome-3/games/hitori/default.nix+48−12 pkgs/desktops/gnome-3/games/iagno/default.nix+9−4 pkgs/desktops/gnome-3/games/lightsoff/default.nix+7−8 pkgs/desktops/gnome-3/games/quadrapassel/default.nix+12−6 pkgs/desktops/gnome-3/games/swell-foop/default.nix+2−2 pkgs/desktops/gnome-3/games/tali/default.nix+15−7 pkgs/desktops/gnome-3/misc/geary/default.nix+11−18 pkgs/desktops/gnome-3/misc/gitg/default.nix+53−15 pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix+8−4 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+2−2 pkgs/desktops/gnome-3/misc/gpaste/default.nix+3−3 pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch+13−31 pkgs/desktops/mate/libmatekbd/default.nix+9−1 pkgs/desktops/pantheon/apps/elementary-photos/default.nix+9−1 pkgs/desktops/pantheon/default.nix+1−3 pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix+57−19 pkgs/desktops/plasma-5/fetch.sh+1−1 pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch+68−69 pkgs/desktops/plasma-5/srcs.nix+180−180 pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix+2−2 pkgs/development/compilers/go/1.11.nix+6−8 pkgs/development/compilers/go/1.12.nix+3−2 pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch+59 pkgs/development/compilers/llvm/5/llvm.nix+1 pkgs/development/compilers/rust/cargo.nix+7−9 pkgs/development/compilers/rust/default.nix+57−42 pkgs/development/compilers/rust/rustc.nix+84−41 pkgs/development/compilers/vala/default.nix+26−12 pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch−208 pkgs/development/compilers/vala/disable-graphviz-0.44.1.patch+261 pkgs/development/interpreters/python/cpython/2.7/default.nix−14 pkgs/development/interpreters/python/cpython/2.7/type_getattro.patch−62 pkgs/development/interpreters/python/default.nix+4−4 pkgs/development/libraries/arguments/default.nix+1−1 pkgs/development/libraries/at-spi2-atk/default.nix+2−2 pkgs/development/libraries/at-spi2-core/default.nix+2−2 pkgs/development/libraries/atk/default.nix+2−2 pkgs/development/libraries/boehm-gc/default.nix+2−2 pkgs/development/libraries/catch2/default.nix+1−3 pkgs/development/libraries/cracklib/default.nix+24−4 pkgs/development/libraries/db/generic.nix+2 pkgs/development/libraries/ffmpeg/generic.nix+2−2 pkgs/development/libraries/folks/default.nix+5−5 pkgs/development/libraries/fontconfig/make-fonts-conf.nix+2−1 pkgs/development/libraries/freetype/default.nix+4−4 pkgs/development/libraries/freetype/enable-subpixel-rendering.patch+8−9 pkgs/development/libraries/freetype/enable-table-validation.patch+5−7 pkgs/development/libraries/gdk-pixbuf/default.nix+3−12 pkgs/development/libraries/geocode-glib/default.nix+2−2 pkgs/development/libraries/gettext/default.nix+10−3 pkgs/development/libraries/gexiv2/default.nix+3−3 pkgs/development/libraries/glib-networking/default.nix+7−2 pkgs/development/libraries/glib/default.nix+5−5 pkgs/development/libraries/glibc/locales.nix+2 pkgs/development/libraries/gnome-menus/default.nix+4−4 pkgs/development/libraries/gobject-introspection/default.nix+3−3 pkgs/development/libraries/google-gflags/default.nix−1 pkgs/development/libraries/gpgme/default.nix+3−13 pkgs/development/libraries/gstreamer/core/default.nix+2−1 pkgs/development/libraries/gtk+/3.x.nix+2−14 pkgs/development/libraries/gtkmm/3.x.nix+2−2 pkgs/development/libraries/gtksourceview/3.x.nix+3−3 pkgs/development/libraries/gtksourceview/4.x.nix+4−4 pkgs/development/libraries/gvfs/default.nix+3−4 pkgs/development/libraries/itk/default.nix−1 pkgs/development/libraries/jasper/default.nix+2−2 pkgs/development/libraries/jsonrpc-glib/default.nix+2−2 pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch+2−2 pkgs/development/libraries/kde-frameworks/fetch.sh+1−1 pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix+2−2 pkgs/development/libraries/kde-frameworks/srcs.nix+316−316 pkgs/development/libraries/kerberos/krb5.nix+4−4 pkgs/development/libraries/libassuan/default.nix+4−3 pkgs/development/libraries/libatomic_ops/default.nix+2−2 pkgs/development/libraries/libdazzle/default.nix+2−2 pkgs/development/libraries/libdbusmenu/default.nix+5−5 pkgs/development/libraries/libedit/default.nix+4−5 pkgs/development/libraries/libgdata/default.nix−2 pkgs/development/libraries/libgpg-error/default.nix+4−4 pkgs/development/libraries/libgtop/default.nix+24−20 pkgs/development/libraries/libgweather/default.nix+2−2 pkgs/development/libraries/libheif/default.nix+2−2 pkgs/development/libraries/libhttpseverywhere/default.nix+11−4 pkgs/development/libraries/libmanette/default.nix+2−2 pkgs/development/libraries/libmbim/default.nix+21−10 pkgs/development/libraries/libminc/default.nix+1−2 pkgs/development/libraries/libqmi/default.nix+20−11 pkgs/development/libraries/librsvg/default.nix+4−4 pkgs/development/libraries/libseccomp/default.nix+2−2 pkgs/development/libraries/libsoup/default.nix+2−2 pkgs/development/libraries/nghttp2/default.nix+4−4 pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch+84 pkgs/development/libraries/nspr/default.nix+4 pkgs/development/libraries/ntrack/default.nix+3 pkgs/development/libraries/pango/default.nix+26−6 pkgs/development/libraries/poppler/default.nix+2−2 pkgs/development/libraries/qt-5/mkDerivation.nix−1 pkgs/development/libraries/science/biology/bicpl/default.nix+1−1 pkgs/development/libraries/science/biology/mirtk/default.nix+1−1 pkgs/development/libraries/srt/default.nix+2−2 pkgs/development/libraries/template-glib/default.nix+2−2 pkgs/development/libraries/vte/default.nix+2−2 pkgs/development/libraries/vte/ng.nix+10−1 pkgs/development/libraries/vtk/default.nix+1−2 pkgs/development/libraries/vxl/default.nix+1−1 pkgs/development/libraries/wayland/default.nix+4−4 pkgs/development/perl-modules/generic/default.nix+2−2 pkgs/development/python-modules/dbus/default.nix+5−1 pkgs/development/python-modules/dbus/fix-includedir.patch+8 pkgs/development/python-modules/hoomd-blue/default.nix−2 pkgs/development/python-modules/hypothesis/default.nix+1−1 pkgs/development/python-modules/pyatspi/default.nix+2−2 pkgs/development/python-modules/pygobject/3.nix+2−2 pkgs/development/python-modules/pylint/default.nix+3−1 pkgs/development/python-modules/pyqt/5.x.nix+8−6 pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patch+70 pkgs/development/python-modules/python-efl/default.nix+2−2 pkgs/development/tools/build-managers/cmake/setup-hook.sh+5 pkgs/development/tools/build-managers/meson/default.nix+2−2 pkgs/development/tools/misc/automake/automake-1.15.x.nix+43 pkgs/development/tools/misc/help2man/default.nix+2−2 pkgs/development/tools/profiling/sysprof/default.nix+2−2 pkgs/development/tools/valadoc/default.nix+2−2 pkgs/misc/themes/arc/default.nix+2 pkgs/os-specific/darwin/binutils/default.nix+5 pkgs/os-specific/linux/ffado/default.nix+30−34 pkgs/os-specific/linux/ffado/fix-build.patch+26 pkgs/os-specific/linux/iproute/default.nix+5−5 pkgs/os-specific/linux/kmod/default.nix+4−4 pkgs/servers/sql/postgresql/default.nix+8−8 pkgs/servers/x11/xorg/default.nix+224−211 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl+11−7 pkgs/servers/x11/xorg/overrides.nix+3−16 pkgs/servers/x11/xorg/tarballs.list+24−23 pkgs/tools/archivers/gnutar/default.nix+2 pkgs/tools/filesystems/cryfs/default.nix−1 pkgs/tools/filesystems/e2fsprogs/default.nix+9−9 pkgs/tools/inputmethods/ibus/default.nix+23−14 pkgs/tools/inputmethods/uim/default.nix+7−1 pkgs/tools/misc/coreutils/default.nix+19−13 pkgs/tools/misc/hdf4/default.nix−1 pkgs/tools/networking/modem-manager/default.nix+15−30 pkgs/tools/networking/network-manager/default.nix+8−6 pkgs/tools/networking/network-manager/fix-paths.patch+3−2 pkgs/tools/networking/network-manager/fortisslvpn/default.nix+4−4 pkgs/tools/package-management/appimagekit/default.nix−1 pkgs/tools/package-management/packagekit/default.nix+3−3 pkgs/top-level/all-packages.nix+50−27 pkgs/top-level/perl-packages.nix+276−225 pkgs/top-level/unix-tools.nix+4−1
nixos/doc/manual/installation/installing.xml+1−1
@@ -54,7 +54,7 @@
5454
5555 <para>
5656 To manually configure the network on the graphical installer, first disable
57− network-manager with <command>systemctl stop network-manager</command>.
57+ network-manager with <command>systemctl stop NetworkManager</command>.
5858 </para>
5959
6060 <para>
nixos/doc/manual/release-notes/rl-1909.xml+7
@@ -110,6 +110,13 @@
110110 DynamicUser mechanism</link> which obviates these options.
111111 </para>
112112 </listitem>
113+ <listitem>
114+ <para>
115+ The NetworkManager systemd unit was renamed back from network-manager.service to
116+ NetworkManager.service for better compatibility with other applications expecting this name.
117+ The same applies to ModemManager where modem-manager.service is now called ModemManager.service again.
118+ </para>
119+ </listitem>
113120 </itemizedlist>
114121 </section>
115122
nixos/modules/config/system-path.nix+1−1
@@ -7,7 +7,7 @@ with lib;
77
88let
99
10− requiredPackages = map lib.lowPrio
10+ requiredPackages = map (pkg: setPrio ((pkg.meta.priority or 5) + 3) pkg)
1111 [ config.nix.package
1212 pkgs.acl
1313 pkgs.attr
nixos/modules/module-list.nix+1
@@ -265,6 +265,7 @@
265265 ./services/desktops/pipewire.nix
266266 ./services/desktops/gnome3/at-spi2-core.nix
267267 ./services/desktops/gnome3/chrome-gnome-shell.nix
268+ ./services/desktops/gnome3/evince.nix
268269 ./services/desktops/gnome3/evolution-data-server.nix
269270 ./services/desktops/gnome3/file-roller.nix
270271 ./services/desktops/gnome3/gnome-disks.nix
nixos/modules/services/desktops/gnome3/evince.nixnew file+35
@@ -0,0 +1,35 @@
1+# Evince.
2+
3+{ config, pkgs, lib, ... }:
4+
5+with lib;
6+
7+{
8+
9+ ###### interface
10+
11+ options = {
12+
13+ services.gnome3.evince = {
14+
15+ enable = mkEnableOption
16+ "systemd and dbus services for Evince, the GNOME document viewer";
17+
18+ };
19+
20+ };
21+
22+
23+ ###### implementation
24+
25+ config = mkIf config.services.gnome3.evince.enable {
26+
27+ environment.systemPackages = [ pkgs.evince ];
28+
29+ services.dbus.packages = [ pkgs.evince ];
30+
31+ systemd.packages = [ pkgs.evince ];
32+
33+ };
34+
35+}
nixos/modules/services/networking/networkmanager.nix+4−4
@@ -466,7 +466,7 @@ in {
466466
467467 systemd.packages = cfg.packages;
468468
469− systemd.services."network-manager" = {
469+ systemd.services."NetworkManager" = {
470470 wantedBy = [ "network.target" ];
471471 restartTriggers = [ configFile ];
472472
@@ -478,9 +478,9 @@ in {
478478 };
479479
480480 systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled {
481− wantedBy = [ "network-manager.service" ];
482− before = [ "network-manager.service" ];
483− partOf = [ "network-manager.service" ];
481+ wantedBy = [ "NetworkManager.service" ];
482+ before = [ "NetworkManager.service" ];
483+ partOf = [ "NetworkManager.service" ];
484484 script = concatStrings (mapAttrsToList (n: d: ''
485485 mkdir -p "/run/NetworkManager/hostsdirs/${n}"
486486 chown "${d.user}:${d.group}" "/run/NetworkManager/hostsdirs/${n}"
nixos/modules/services/x11/desktop-managers/gnome3.nix+6−1
@@ -126,6 +126,7 @@ in {
126126 services.dleyna-renderer.enable = mkDefault true;
127127 services.dleyna-server.enable = mkDefault true;
128128 services.gnome3.at-spi2-core.enable = true;
129+ services.gnome3.evince.enable = mkDefault true;
129130 services.gnome3.evolution-data-server.enable = true;
130131 services.gnome3.file-roller.enable = mkDefault true;
131132 services.gnome3.gnome-disks.enable = mkDefault true;
@@ -160,7 +161,11 @@ in {
160161 # If gnome3 is installed, build vim for gtk3 too.
161162 nixpkgs.config.vim.gui = "gtk3";
162163
163− fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ];
164+ fonts.fonts = [
165+ pkgs.dejavu_fonts pkgs.cantarell-fonts
166+ pkgs.source-sans-pro
167+ pkgs.source-code-pro # Default monospace font in 3.32
168+ ];
164169
165170 services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ]
166171 ++ map
nixos/modules/services/x11/desktop-managers/pantheon.nix+1−1
@@ -122,6 +122,7 @@ in
122122 # pantheon has pantheon-agent-geoclue2
123123 services.geoclue2.enableDemoAgent = false;
124124 services.gnome3.at-spi2-core.enable = true;
125+ services.gnome3.evince.enable = mkDefault true;
125126 services.gnome3.evolution-data-server.enable = true;
126127 services.gnome3.file-roller.enable = mkDefault true;
127128 # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
@@ -168,7 +169,6 @@ in
168169 gnome3.geary
169170 gnome3.epiphany
170171 gnome3.gnome-font-viewer
171− evince
172172 ] ++ pantheon.apps) config.environment.pantheon.excludePackages)
173173 ++ (with pkgs;
174174 [
pkgs/applications/audio/fluidsynth/default.nix+2−2
@@ -11,8 +11,8 @@ let
1111 sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
1212 };
1313 "2" = {
14− fluidsynthVersion = "2.0.3";
15− sha256 = "00f6bhw4ddrinb5flvg5y53rcvnf4km23a6nbvnswmpq13568v78";
14+ fluidsynthVersion = "2.0.4";
15+ sha256 = "1v2vji02fbrjgypwb4fw2r90hnfwfbfh3d24j8vjwlbqxhxp16s0";
1616 };
1717 };
1818in
pkgs/applications/audio/rhythmbox/default.nix+2−11
@@ -17,24 +17,15 @@
1717}:
1818let
1919 pname = "rhythmbox";
20− version = "3.4.2";
20+ version = "3.4.3";
2121in stdenv.mkDerivation rec {
2222 name = "${pname}-${version}";
2323
2424 src = fetchurl {
2525 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
26− sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2";
26+ sha256 = "1yx3n7p9vmv23jsv98fxwq95n78awdxqm8idhyhxx2d6vk4w1hgx";
2727 };
2828
29− patches = [
30− # build with GStreamer 1.14 https://bugzilla.gnome.org/show_bug.cgi?id=788706
31− (fetchurl {
32− name = "fmradio-Fix-build-with-GStreamer-master.patch";
33− url = https://bugzilla.gnome.org/attachment.cgi?id=361178;
34− sha256 = "1h09mimlglj9hcmc3pfp0d6c277mqh2khwv9fryk43pkv3904d2w";
35− })
36− ];
37−
3829 nativeBuildInputs = [
3930 pkgconfig
4031 intltool perl perlPackages.XMLParser
pkgs/applications/editors/gnome-builder/default.nix+31−14
@@ -1,11 +1,11 @@
1−{ stdenv
1+{ gcc8Stdenv
22, ctags
3+, appstream-glib
34, desktop-file-utils
45, docbook_xsl
56, docbook_xml_dtd_43
67, fetchurl
78, flatpak
8−, glibcLocales
99, gnome3
1010, libgit2-glib
1111, gobject-introspection
@@ -31,28 +31,33 @@
3131, vte
3232, webkitgtk
3333, wrapGAppsHook
34+, dbus
35+, xvfb_run
3436}:
37+
3538let
36− version = "3.30.3";
39+ # Does not build with GCC 7
40+ # https://gitlab.gnome.org/GNOME/gnome-builder/issues/868
41+ stdenv = gcc8Stdenv;
42+in
43+stdenv.mkDerivation rec {
3744 pname = "gnome-builder";
38−in stdenv.mkDerivation {
39− name = "${pname}-${version}";
45+ version = "3.32.0";
4046
4147 src = fetchurl {
4248 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
43− sha256 = "11h6apjyah91djf77m8xkl5rvdz7mwpp3bjc4yzzs9lm3pag764r";
49+ sha256 = "00l7sshpndk995aw98mjmsc3mxhxzynlp7il551iwwjjdbc70qp4";
4450 };
4551
4652 nativeBuildInputs = [
47− #appstream-glib # tests fail if these tools are available
53+ appstream-glib
4854 desktop-file-utils
4955 docbook_xsl
5056 docbook_xml_dtd_43
51− glibcLocales # for Meson's gtkdochelper
5257 gobject-introspection
5358 gtk-doc
5459 hicolor-icon-theme
55− meson
60+ (meson.override ({ inherit stdenv; }))
5661 ninja
5762 pkgconfig
5863 python3
@@ -64,6 +69,7 @@ in stdenv.mkDerivation {
6469 ctags
6570 flatpak
6671 gnome3.devhelp
72+ gnome3.glade
6773 libgit2-glib
6874 libpeas
6975 vte
@@ -83,6 +89,11 @@ in stdenv.mkDerivation {
8389 webkitgtk
8490 ];
8591
92+ checkInputs = [
93+ dbus
94+ xvfb_run
95+ ];
96+
8697 outputs = [ "out" "devdoc" ];
8798
8899 prePatch = ''
@@ -91,19 +102,25 @@ in stdenv.mkDerivation {
91102
92103 mesonFlags = [
93104 "-Dpython_libprefix=${python3.libPrefix}"
94− "-Dwith_docs=true"
105+ "-Ddocs=true"
95106
96107 # Making the build system correctly detect clang header and library paths
97108 # is difficult. Somebody should look into fixing this.
98− "-Dwith_clang=false"
109+ "-Dplugin_clang=false"
110+
111+ # Do not try to check if appstream images exist
112+ "-Dnetwork_tests=false"
99113 ];
100114
101115 # Some tests fail due to being unable to find the Vte typelib, and I don't
102116 # understand why. Somebody should look into fixing this.
103− doCheck = false;
117+ doCheck = true;
104118
105− preInstall = ''
106− export LC_ALL="en_US.utf-8"
119+ checkPhase = ''
120+ export NO_AT_BRIDGE=1
121+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
122+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
123+ meson test --print-errorlogs
107124 '';
108125
109126 pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ];
pkgs/applications/editors/gnome-latex/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
22, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
33let
4− version = "3.30.2";
4+ version = "3.32.0";
55 pname = "gnome-latex";
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 = "0fn3vy6w714wy0bz3y11zpdprpwxbv5xfiyyxjwp2nix9mbvv2sm";
11+ sha256 = "1jdca9yhm7mm1aijd1a5amphgn15142kngky3id2am379ixrq1hg";
1212 };
1313
1414 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
pkgs/applications/editors/kdevelop5/kdev-php.nix−4
@@ -12,10 +12,6 @@ stdenv.mkDerivation rec {
1212 sha256 = "0yjn7y7al2xs8g0mrjvcym8gbjy4wmiv7lsljcrasjd7ymag1wgs";
1313 };
1414
15− cmakeFlags = [
16− "-DBUILD_TESTING=OFF"
17− ];
18−
1915 nativeBuildInputs = [ cmake extra-cmake-modules ];
2016 buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ];
2117
pkgs/applications/editors/kdevelop5/kdev-python.nix−1
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 cmakeFlags = [
16− "-DBUILD_TESTING=OFF"
1716 "-DPYTHON_EXECUTABLE=${python}/bin/python"
1817 ];
1918
pkgs/applications/graphics/seg3d/default.nix−1
@@ -23,7 +23,6 @@ stdenv.mkDerivation {
2323 "-DBUILD_BIOMESH3D=1"
2424 "-DWITH_TETGEN=1"
2525 "-DBUILD_TYPE=Release"
26− "-DBUILD_TESTING=0"
2726 "-DWITH_WXWIDGETS=ON"
2827 "-DITK_DIR=${itk}/lib/InsightToolkit"
2928 "-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a"
pkgs/applications/graphics/shotwell/default.nix+74−16
@@ -1,31 +1,89 @@
1−{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite
2−, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json-glib, gcr
3−, gettext, desktop-file-utils, gdk_pixbuf, librsvg, wrapGAppsHook
4−, gobject-introspection, itstool, libgdata, python3 }:
1+{ stdenv
2+, fetchurl
3+, fetchpatch
4+, meson
5+, ninja
6+, gtk3
7+, libexif
8+, libgphoto2
9+, libwebp
10+, libsoup
11+, libxml2
12+, vala
13+, sqlite
14+, webkitgtk
15+, pkgconfig
16+, gnome3
17+, gst_all_1
18+, libgudev
19+, libraw
20+, glib
21+, json-glib
22+, gcr
23+, libgee
24+, gexiv2
25+, librest
26+, gettext
27+, desktop-file-utils
28+, gdk_pixbuf
29+, librsvg
30+, wrapGAppsHook
31+, gobject-introspection
32+, itstool
33+, libgdata
34+, libchamplain
35+, python3
36+}:
537
638# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
739
8−let
40+stdenv.mkDerivation rec {
941 pname = "shotwell";
10− version = "0.30.2";
11−in stdenv.mkDerivation rec {
12− name = "${pname}-${version}";
42+ version = "0.31.0";
1343
1444 src = fetchurl {
15− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
16− sha256 = "0pam0si110vkc65kh59lrmgkv91f9zxmf1gpfm99ixjgw25rfi8r";
45+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
46+ sha256 = "1pwq953wl7h9cvw7rvlr6pcbq9w28kkr7ddb8x2si81ngp0imwyx";
1747 };
1848
1949 nativeBuildInputs = [
20− meson ninja vala pkgconfig itstool gettext desktop-file-utils python3 wrapGAppsHook gobject-introspection
50+ meson
51+ ninja
52+ vala
53+ pkgconfig
54+ itstool
55+ gettext
56+ desktop-file-utils
57+ python3
58+ wrapGAppsHook
59+ gobject-introspection
2160 ];
2261
2362 buildInputs = [
24− gtk3 libexif libgphoto2 libsoup libxml2 sqlite webkitgtk
25− gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
26− libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
27− libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
28− gcr gnome3.adwaita-icon-theme libgdata
63+ gtk3
64+ libexif
65+ libgphoto2
66+ libwebp
67+ libsoup
68+ libxml2
69+ sqlite
70+ webkitgtk
71+ gst_all_1.gstreamer
72+ gst_all_1.gst-plugins-base
73+ libgee
74+ libgudev
75+ gexiv2
76+ gnome3.gsettings-desktop-schemas
77+ libraw
78+ json-glib
79+ glib
80+ gdk_pixbuf
81+ librsvg
82+ librest
83+ gcr
84+ gnome3.adwaita-icon-theme
85+ libgdata
86+ libchamplain
2987 ];
3088
3189 postPatch = ''
pkgs/applications/misc/font-manager/default.nix+7−5
@@ -1,17 +1,17 @@
1−{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
1+{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
22 pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
33 vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
44}:
55
66stdenv.mkDerivation rec {
77 pname = "font-manager";
8− version = "0.7.4.3";
8+ version = "0.7.5";
99
1010 src = fetchFromGitHub {
1111 owner = "FontManager";
1212 repo = "master";
13− rev = version;
14− sha256 = "0v6zn25vxsn3ng31zgsgkb2wwrl0kdv4ikw4ij4yqv49aid3qjd5";
13+ rev = "cc057f3e93f5b1033b04decee03cdb44177e48b3";
14+ sha256 = "1xg80bi2465p5r8zfmb34iga9yqs3is1k4f13hw0ligvhb58gas0";
1515 };
1616
1717 nativeBuildInputs = [
@@ -38,7 +38,9 @@ stdenv.mkDerivation rec {
3838 gnome3.adwaita-icon-theme
3939 ];
4040
41− patches = [ ./correct-post-install.patch ];
41+ patches = [
42+ ./correct-post-install.patch
43+ ];
4244
4345 mesonFlags = [
4446 "-Ddisable_pycompile=true"
pkgs/applications/misc/gnome-usage/default.nix+38−12
@@ -1,21 +1,47 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gettext
2−, libxml2, desktop-file-utils, wrapGAppsHook
3−, glib, gtk3, libgtop, gnome3 }:
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, vala
7+, gettext
8+, libxml2
9+, desktop-file-utils
10+, wrapGAppsHook
11+, glib
12+, gtk3
13+, libgtop
14+, libdazzle
15+, gnome3
16+}:
417
5−let
18+stdenv.mkDerivation rec {
619 pname = "gnome-usage";
7− version = "3.30.0";
8−in stdenv.mkDerivation rec {
9− name = "${pname}-${version}";
20+ version = "3.32.0";
1021
1122 src = fetchurl {
12− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "0f1vccw916az8hzsqmx6f57jvl68s3sbd3qk4rpwn42ks1v7nmsh";
23+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
24+ sha256 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih";
1425 };
1526
16− nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];
27+ nativeBuildInputs = [
28+ desktop-file-utils
29+ gettext
30+ libxml2
31+ meson
32+ ninja
33+ pkgconfig
34+ vala
35+ wrapGAppsHook
36+ ];
1737
18− buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ];
38+ buildInputs = [
39+ glib
40+ gnome3.adwaita-icon-theme
41+ gtk3
42+ libdazzle
43+ libgtop
44+ ];
1945
2046 postPatch = ''
2147 chmod +x build-aux/meson/postinstall.sh
@@ -29,7 +55,7 @@ in stdenv.mkDerivation rec {
2955 };
3056
3157 meta = with stdenv.lib; {
32− description = "";
58+ description = "A nice way to view information about use of system resources, like memory and disk space";
3359 license = licenses.gpl3;
3460 platforms = platforms.linux;
3561 maintainers = gnome3.maintainers;
pkgs/applications/misc/orca/default.nix+2−2
@@ -9,13 +9,13 @@
99
1010buildPythonApplication rec {
1111 pname = "orca";
12− version = "3.30.2";
12+ version = "3.32.0";
1313
1414 format = "other";
1515
1616 src = fetchurl {
1717 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
18− sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53";
18+ sha256 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i";
1919 };
2020
2121 patches = [
pkgs/applications/misc/synapse/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee
2−, keybinder3, json-glib, zeitgeist, vala_0_38, hicolor-icon-theme, gobject-introspection
2+, keybinder3, json-glib, zeitgeist, vala, hicolor-icon-theme, gobject-introspection
33}:
44
55let
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
1313 };
1414
1515 nativeBuildInputs = [
16− pkgconfig gettext vala_0_38
16+ pkgconfig gettext vala
1717 # For setup hook
1818 gobject-introspection
1919 ];
pkgs/applications/networking/browsers/w3m/default.nix+5−4
@@ -25,13 +25,14 @@ let
2525 '';
2626 };
2727in stdenv.mkDerivation rec {
28− name = "w3m-0.5.3+git20180125";
28+ pname = "w3m";
29+ version = "0.5.3+git20190105";
2930
3031 src = fetchFromGitHub {
3132 owner = "tats";
32− repo = "w3m";
33− rev = "v0.5.3+git20180125";
34− sha256 = "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90";
33+ repo = pname;
34+ rev = "v${version}";
35+ sha256 = "1fbg2p8qh2gvi3g4iz4q6vc0k70pf248r4yndi5lcn2m3mzvjx0i";
3536 };
3637
3738 NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl";
pkgs/applications/networking/instant-messengers/mikutter/default.nix+1
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
5454 '';
5555
5656 meta = with stdenv.lib; {
57+ broken = true;
5758 description = "An extensible Twitter client";
5859 homepage = https://mikutter.hachune.net;
5960 platforms = ruby.meta.platforms;
pkgs/applications/networking/p2p/synapse-bt/default.nix+2−1
@@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1sc8c0w2dbvcdv16idw02y35x0jx5ff6ddzij09pmqjx55zgsjf7";
1515
16− buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
16+ nativeBuildInputs = [ pkgconfig ];
17+ buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
1718
1819 cargoBuildFlags = [ "--all" ];
1920
pkgs/applications/science/biology/ants/default.nix+1−3
@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ cmake makeWrapper ];
1616 buildInputs = [ itk vtk ];
1717
18− cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE"
19− # as cmake otherwise tries to download test data:
20− "-DBUILD_TESTING=FALSE" ];
18+ cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
2119
2220 enableParallelBuilding = true;
2321
pkgs/applications/science/biology/mni_autoreg/default.nix+1−2
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 buildInputs = [ libminc ];
1616 propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ];
1717
18− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBUILD_TESTING=FALSE" ];
18+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
1919 # testing broken: './minc_wrapper: Permission denied' from Testing/ellipse0.mnc
2020
2121 postFixup = ''
@@ -33,4 +33,3 @@ stdenv.mkDerivation rec {
3333 license = licenses.free;
3434 };
3535}
36−
pkgs/applications/version-management/git-and-tools/git/default.nix+2−2
@@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
2020assert svnSupport -> perlSupport;
2121
2222let
23− version = "2.19.2";
23+ version = "2.21.0";
2424 svn = subversionClient.override { perlBindings = perlSupport; };
2525in
2626
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
2929
3030 src = fetchurl {
3131 url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
32− sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw";
32+ sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc";
3333 };
3434
3535 outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch+4−3
@@ -3,9 +3,10 @@ and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
33node names).
44
55diff --git a/Documentation/Makefile b/Documentation/Makefile
6+index 26a2342bea..ceccd67ebb 100644
67--- a/Documentation/Makefile
78+++ b/Documentation/Makefile
8−@@ -122,7 +122,7 @@
9+@@ -132,7 +132,7 @@ HTML_REPO = ../../git-htmldocs
910
1011 MAKEINFO = makeinfo
1112 INSTALL_INFO = install-info
@@ -14,7 +15,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile
1415 DBLATEX = dblatex
1516 ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
1617 DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
17−@@ -240,7 +240,7 @@
18+@@ -250,7 +250,7 @@ man1: $(DOC_MAN1)
1819 man5: $(DOC_MAN5)
1920 man7: $(DOC_MAN7)
2021
@@ -23,7 +24,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile
2324
2425 pdf: user-manual.pdf
2526
26−@@ -256,10 +256,9 @@
27+@@ -266,10 +266,9 @@ install-man: man
2728
2829 install-info: info
2930 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch+6−4
@@ -1,7 +1,8 @@
11diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
2+index 1afe9fc858..05dd7c3a90 100644
23--- a/Documentation/git-send-email.txt
34+++ b/Documentation/git-send-email.txt
4−@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
5+@@ -215,8 +215,7 @@ a password is obtained using 'git-credential'.
56 specify a full pathname of a sendmail-like program instead;
67 the program must support the `-i` option. Default value can
78 be specified by the `sendemail.smtpServer` configuration
@@ -9,14 +10,15 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
910- `/usr/sbin`, `/usr/lib` and $PATH if such program is
1011+ option; the built-in default is to search in $PATH if such program is
1112 available, falling back to `localhost` otherwise.
12−
13+
1314 --smtp-server-port=<port>::
1415diff --git a/git-send-email.perl b/git-send-email.perl
16+index 8eb63b5a2f..74a61d8213 100755
1517--- a/git-send-email.perl
1618+++ b/git-send-email.perl
17−@@ -944,8 +944,7 @@ if (defined $reply_to) {
19+@@ -956,8 +956,7 @@ sub expand_one_alias {
1820 }
19−
21+
2022 if (!defined $smtp_server) {
2123- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
2224- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch+19−90
@@ -1,94 +1,23 @@
1+diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
2+index e1d917fd27..e90f8e1414 100644
13--- a/git-sh-i18n.sh
24+++ b/git-sh-i18n.sh
3−@@ -15,87 +15,11 @@
4− fi
5− export TEXTDOMAINDIR
6−
7−-# First decide what scheme to use...
8−-GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
9−-if test -n "$GIT_GETTEXT_POISON"
10−-then
11−- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
12−-elif test -n "@@USE_GETTEXT_SCHEME@@"
13−-then
14−- GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
15−-elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
16−-then
17−- : no probing necessary
5+@@ -26,7 +26,7 @@ then
6+ elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
7+ then
8+ : no probing necessary
189-elif type gettext.sh >/dev/null 2>&1
19−-then
20−- # GNU libintl's gettext.sh
21−- GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
22−-elif test "$(gettext -h 2>&1)" = "-h"
23−-then
24−- # gettext binary exists but no gettext.sh. likely to be a gettext
25−- # binary on a Solaris or something that is not GNU libintl and
26−- # lack eval_gettext.
27−- GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext
28−-fi
29−-export GIT_INTERNAL_GETTEXT_SH_SCHEME
30−-
31−-# ... and then follow that decision.
32−-case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
33−-gnu)
34−- # Use libintl's gettext.sh, or fall back to English if we can't.
10++elif type @gettext@/bin/gettext.sh >/dev/null 2>&1
11+ then
12+ # GNU libintl's gettext.sh
13+ GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
14+@@ -43,7 +43,8 @@ export GIT_INTERNAL_GETTEXT_SH_SCHEME
15+ case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
16+ gnu)
17+ # Use libintl's gettext.sh, or fall back to English if we can't.
3518- . gettext.sh
36−- ;;
37−-gettext_without_eval_gettext)
38−- # Solaris has a gettext(1) but no eval_gettext(1)
39−- eval_gettext () {
40−- gettext "$1" | (
41−- export PATH $(git sh-i18n--envsubst --variables "$1");
42−- git sh-i18n--envsubst "$1"
43−- )
44−- }
45−-
46−- eval_ngettext () {
47−- ngettext "$1" "$2" "$3" | (
48−- export PATH $(git sh-i18n--envsubst --variables "$2");
49−- git sh-i18n--envsubst "$2"
50−- )
51−- }
52−- ;;
53−-poison)
54−- # Emit garbage so that tests that incorrectly rely on translatable
55−- # strings will fail.
56−- gettext () {
57−- printf "%s" "# GETTEXT POISON #"
58−- }
59−-
60−- eval_gettext () {
61−- printf "%s" "# GETTEXT POISON #"
62−- }
63−-
64−- eval_ngettext () {
65−- printf "%s" "# GETTEXT POISON #"
66−- }
67−- ;;
68−-*)
69−- gettext () {
70−- printf "%s" "$1"
71−- }
72−-
73−- eval_gettext () {
74−- printf "%s" "$1" | (
75−- export PATH $(git sh-i18n--envsubst --variables "$1");
76−- git sh-i18n--envsubst "$1"
77−- )
78−- }
79−+# GNU gettext
80−+export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
81−+export PATH=@gettext@/bin:$PATH
82−
83−- eval_ngettext () {
84−- (test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
85−- export PATH $(git sh-i18n--envsubst --variables "$2");
86−- git sh-i18n--envsubst "$2"
87−- )
88−- }
89−- ;;
90−-esac
91−+. @gettext@/bin/gettext.sh
92−
93− # Git-specific wrapper functions
94− gettextln () {
19++ . @gettext@/bin/gettext.sh
20++ export PATH=@gettext@/bin:$PATH
21+ ;;
22+ gettext_without_eval_gettext)
23+ # Solaris has a gettext(1) but no eval_gettext(1)
pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch+4−3
@@ -1,12 +1,13 @@
11diff --git a/t/test-lib.sh b/t/test-lib.sh
2+index 8665b0a9b6..8bb892b1af 100644
23--- a/t/test-lib.sh
34+++ b/t/test-lib.sh
4−@@ -923,7 +923,7 @@
5+@@ -1227,7 +1227,7 @@ elif test -n "$GIT_TEST_INSTALLED"
56 then
67 GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) ||
78 error "Cannot run git from $GIT_TEST_INSTALLED."
8−- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH
9+- PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH
910+ PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH
1011 GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
1112 else # normal case, use ../bin-wrappers only unless $with_dashes:
12− git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
13+ if test -n "$no_bin_wrappers"
pkgs/applications/version-management/git-and-tools/git/ssh-path.patch+5−5
@@ -1,18 +1,18 @@
11diff --git a/connect.c b/connect.c
2−index c3a014c5b..fbca3262b 100644
2+index 4813f005ab..b3f12f3268 100644
33--- a/connect.c
44+++ b/connect.c
5−@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
6−
5+@@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
6+
77 ssh = getenv("GIT_SSH");
88 if (!ssh)
99- ssh = "ssh";
1010+ ssh = "@ssh@";
1111 variant = determine_ssh_variant(ssh, 0);
1212 }
13−
13+
1414diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
15−index 480a6b30d..781720424 100644
15+index 480a6b30d0..7817204241 100644
1616--- a/git-gui/lib/remote_add.tcl
1717+++ b/git-gui/lib/remote_add.tcl
1818@@ -139,7 +139,7 @@ method _add {} {
pkgs/applications/version-management/meld/default.nix+4−4
@@ -1,22 +1,22 @@
11{ stdenv, fetchurl, itstool, python3, intltool, wrapGAppsHook
22, libxml2, gobject-introspection, gtk3, gtksourceview, gnome3
3−, dbus, xvfb_run
3+, gsettings-desktop-schemas, dbus, xvfb_run
44}:
55
66python3.pkgs.buildPythonApplication rec {
77 pname = "meld";
8− version = "3.20.0";
8+ version = "3.20.1";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "11khi1sg02k3b9qdag3r939cwi27cql4kjim7jhxf9ckfhpzwh6b";
12+ sha256 = "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55";
1313 };
1414
1515 nativeBuildInputs = [
1616 intltool itstool libxml2 gobject-introspection wrapGAppsHook
1717 ];
1818 buildInputs = [
19− gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme
19+ gtk3 gtksourceview gsettings-desktop-schemas gnome3.adwaita-icon-theme
2020 gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
2121 ];
2222 propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ];
pkgs/applications/video/handbrake/default.nix+2−2
@@ -11,7 +11,7 @@
1111 # Codecs, audio
1212 libopus, lame, libvorbis, a52dec, speex, libsamplerate,
1313 # Text processing
14− libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2,
14+ libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz,
1515 # Optical media
1616 libdvdread, libdvdnav, libdvdcss, libbluray,
1717 useGtk ? true, wrapGAppsHook ? null,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444 buildInputs = [
4545 ffmpeg-full libogg libtheora x264 x265 libvpx
4646 libopus lame libvorbis a52dec speex libsamplerate
47− libiconv fribidi fontconfig freetype libass jansson libxml2
47+ libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz
4848 libdvdread libdvdnav libdvdcss libbluray
4949 ] ++ lib.optionals useGtk [
5050 glib gtk3 libappindicator-gtk3 libnotify
pkgs/applications/video/mpv/default.nix+2−2
@@ -1,7 +1,7 @@
11{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
22, docutils, perl, pkgconfig, python3, which, ffmpeg_4
33, freefont_ttf, freetype, libass, libpthreadstubs, mujs
4−, lua, libuchardet, libiconv ? null, darwin
4+, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
55
66, waylandSupport ? stdenv.isLinux
77 , wayland ? null
@@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
141141
142142 buildInputs = [
143143 ffmpeg_4 freetype libass libpthreadstubs
144− luaEnv libuchardet mujs
144+ luaEnv libuchardet mujs nv-codec-headers
145145 ] ++ optional alsaSupport alsaLib
146146 ++ optional archiveSupport libarchive
147147 ++ optional bluraySupport libbluray
pkgs/build-support/bintools-wrapper/default.nix+1
@@ -329,6 +329,7 @@ stdenv.mkDerivation {
329329 { description =
330330 stdenv.lib.attrByPath ["meta" "description"] "System binary utilities" bintools_
331331 + " (wrapper script)";
332+ priority = 10;
332333 } // optionalAttrs useMacosReexportHack {
333334 platforms = stdenv.lib.platforms.darwin;
334335 };
pkgs/build-support/rust/default.nix+63−12
@@ -1,4 +1,4 @@
1−{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3 }:
1+{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3, buildPackages }:
22
33{ name ? "${args.pname}-${args.version}"
44, cargoSha256 ? "unset"
@@ -9,14 +9,17 @@
99, sourceRoot ? null
1010, logLevel ? ""
1111, buildInputs ? []
12+, nativeBuildInputs ? []
1213, cargoUpdateHook ? ""
1314, cargoDepsHook ? ""
1415, cargoBuildFlags ? []
16+, buildType ? "release"
1517
1618, cargoVendorDir ? null
1719, ... } @ args:
1820
1921assert cargoVendorDir == null -> cargoSha256 != "unset";
22+assert buildType == "release" || buildType == "debug";
2023
2124let
2225 cargoDeps = if cargoVendorDir == null
@@ -37,20 +40,24 @@ let
3740 cargoDepsCopy="$sourceRoot/${cargoVendorDir}"
3841 '';
3942
43+ ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
44+ cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
45+ ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
46+ cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
47+ releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}";
48+
4049in stdenv.mkDerivation (args // {
4150 inherit cargoDeps;
4251
4352 patchRegistryDeps = ./patch-registry-deps;
4453
45− buildInputs = [ cacert git cargo rustc ] ++ buildInputs;
54+ nativeBuildInputs = [ cargo rustc git cacert ] ++ nativeBuildInputs;
55+ inherit buildInputs;
4656
4757 patches = cargoPatches ++ patches;
4858
49− configurePhase = args.configurePhase or ''
50− runHook preConfigure
51− # noop
52− runHook postConfigure
53− '';
59+ PKG_CONFIG_ALLOW_CROSS =
60+ if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
5461
5562 postUnpack = ''
5663 eval "$cargoDepsHook"
@@ -63,17 +70,51 @@ in stdenv.mkDerivation (args // {
6370 config=${./fetchcargo-default-config.toml};
6471 fi;
6572 substitute $config .cargo/config \
66− --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
73+ --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
6774
6875 unset cargoDepsCopy
6976
7077 export RUST_LOG=${logLevel}
7178 '' + (args.postUnpack or "");
7279
80+ configurePhase = args.configurePhase or ''
81+ runHook preConfigure
82+ mkdir -p .cargo
83+ cat >> .cargo/config <<'EOF'
84+ [target."${stdenv.buildPlatform.config}"]
85+ "linker" = "${ccForBuild}"
86+ ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
87+ [target."${stdenv.hostPlatform.config}"]
88+ "linker" = "${ccForHost}"
89+ ''}
90+ EOF
91+ cat .cargo/config
92+ runHook postConfigure
93+ '';
94+
7395 buildPhase = with builtins; args.buildPhase or ''
7496 runHook preBuild
75− echo "Running cargo build --release ${concatStringsSep " " cargoBuildFlags}"
76− cargo build --release --frozen ${concatStringsSep " " cargoBuildFlags}
97+
98+ (
99+ set -x
100+ env \
101+ "CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \
102+ "CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \
103+ "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \
104+ "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \
105+ cargo build \
106+ --${buildType} \
107+ --target ${stdenv.hostPlatform.config} \
108+ --frozen ${concatStringsSep " " cargoBuildFlags}
109+ )
110+
111+ # rename the output dir to a architecture independent one
112+ mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$')
113+ for target in "''${targets[@]}"; do
114+ rm -rf "$target/../../${buildType}"
115+ ln -srf "$target" "$target/../../"
116+ done
117+
77118 runHook postBuild
78119 '';
79120
@@ -86,11 +127,21 @@ in stdenv.mkDerivation (args // {
86127
87128 doCheck = args.doCheck or true;
88129
130+ inherit releaseDir;
131+
89132 installPhase = args.installPhase or ''
90133 runHook preInstall
91134 mkdir -p $out/bin $out/lib
92− find target/release -maxdepth 1 -type f -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin
93− find target/release -maxdepth 1 -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib
135+
136+ find $releaseDir \
137+ -maxdepth 1 \
138+ -type f \
139+ -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) \
140+ -print0 | xargs -r -0 cp -t $out/bin
141+ find $releaseDir \
142+ -maxdepth 1 \
143+ -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \
144+ -print0 | xargs -r -0 cp -t $out/lib
94145 rmdir --ignore-fail-on-non-empty $out/lib $out/bin
95146 runHook postInstall
96147 '';
pkgs/build-support/rust/make-rust-platform.nixdeleted−18
@@ -1,18 +0,0 @@
1−{ callPackage }:
2−{ rustc, cargo, ... }: {
3− rust = {
4− inherit rustc cargo;
5− };
6−
7− buildRustPackage = callPackage ./default.nix {
8− inherit rustc cargo;
9−
10− fetchcargo = callPackage ./fetchcargo.nix {
11− inherit cargo;
12− };
13− };
14−
15− rustcSrc = callPackage ../../development/compilers/rust/rust-src.nix {
16− inherit rustc;
17− };
18−}
pkgs/build-support/setup-hooks/wrap-gapps-hook.sh+4
@@ -30,6 +30,10 @@ wrapGAppsHook() {
3030 gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
3131 fi
3232
33+ if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A $prefix/lib/gio/modules)" ] ; then
34+ gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
35+ fi
36+
3337 for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
3438 eval local dummy="\$$v"
3539 gappsWrapperArgs+=(--prefix $v : "$dummy")
pkgs/data/misc/shared-mime-info/default.nix+3−3
@@ -1,13 +1,13 @@
11{stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool
22, libxml2, glib}:
33
4−let version = "1.10"; in
4+let version = "1.12"; in
55stdenv.mkDerivation rec {
66 name = "shared-mime-info-${version}";
77
88 src = fetchurl {
9− url = "http://freedesktop.org/~hadess/${name}.tar.xz";
10− sha256 = "1gxyvwym3xgpmp262gfn8jg5sla6k5hy6m6dmy6grgiq90xsh9f6";
9+ url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz";
10+ sha256 = "0gj0pp36qpsr9w6v4nywnjpcisadwkndapqsjn0ny3gd0zzg1chq";
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]);
pkgs/desktops/deepin/default.nix+3−9
@@ -1,4 +1,4 @@
1−{ pkgs, makeScope, libsForQt5, go_1_11 }:
1+{ pkgs, makeScope, libsForQt5 }:
22
33let
44 packages = self: with self; {
@@ -7,15 +7,9 @@ let
77 updateScript = callPackage ./update.nix { };
88
99 dbus-factory = callPackage ./dbus-factory { };
10− dde-api = callPackage ./dde-api {
11− # XXX: the build is finding references to Go when compiled with go v1.12
12− go = go_1_11;
13− };
10+ dde-api = callPackage ./dde-api { };
1411 dde-calendar = callPackage ./dde-calendar { };
15− dde-daemon = callPackage ./dde-daemon {
16− # XXX: the build is finding references to Go when compiled with go v1.12
17− go = go_1_11;
18− };
12+ dde-daemon = callPackage ./dde-daemon { };
1913 dde-polkit-agent = callPackage ./dde-polkit-agent { };
2014 dde-network-utils = callPackage ./dde-network-utils { };
2115 dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
pkgs/desktops/gnome-3/apps/accerciser/default.nix+4−4
@@ -1,18 +1,18 @@
11{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gobject-introspection
22, itstool, libxml2, python3Packages, at-spi2-core
3−, dbus, intltool, libwnck3 }:
3+, dbus, gettext, libwnck3 }:
44
55stdenv.mkDerivation rec {
66 name = "accerciser-${version}";
7− version = "3.22.0";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
11+ sha256 = "1j7wlks6j77kfjrw6lx1g0apsy2wwca63jsm5994av5l6xs8xd5m";
1212 };
1313
1414 nativeBuildInputs = [
15− pkgconfig wrapGAppsHook itstool intltool
15+ pkgconfig wrapGAppsHook itstool gettext
1616 gobject-introspection # For setup hook
1717 ];
1818 buildInputs = [
pkgs/desktops/gnome-3/apps/cheese/default.nix+2−2
@@ -6,11 +6,11 @@
66
77stdenv.mkDerivation rec {
88 name = "cheese-${version}";
9− version = "3.30.0";
9+ version = "3.32.0";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "0zz2bgjaf2lsmfs3zn24925vbjb0rycr39i288brlbzixrpcyljr";
13+ sha256 = "0ahkfs6v9qraz607k2sr4qw9a59lg2m8kiw5nxhc65qql110sjsl";
1414 };
1515
1616 passthru = {
pkgs/desktops/gnome-3/apps/evolution/default.nix+2−2
@@ -7,13 +7,13 @@
77, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
88
99let
10− version = "3.30.5";
10+ version = "3.32.0";
1111in stdenv.mkDerivation rec {
1212 name = "evolution-${version}";
1313
1414 src = fetchurl {
1515 url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
16− sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h";
16+ sha256 = "1skwhg3fbyg3acivknnpm7hs5xy0zwlvnyf5cxs59kxh1l41xmnc";
1717 };
1818
1919 propagatedUserEnvPkgs = [ evolution-data-server ];
pkgs/desktops/gnome-3/apps/file-roller/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "file-roller-${version}";
6− version = "3.30.1";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1";
10+ sha256 = "1id7f6qbgdxfixxyqjypgwy04mf1w1rbczklqmgpqx5ry4kk0a03";
1111 };
1212
1313 LANG = "en_US.UTF-8"; # postinstall.py
pkgs/desktops/gnome-3/apps/gedit/default.nix+24−9
@@ -1,28 +1,43 @@
1−{ stdenv, intltool, fetchurl
1+{ stdenv, meson, fetchurl, python3
22, pkgconfig, gtk3, glib, adwaita-icon-theme
3−, libpeas, gtksourceview, gsettings-desktop-schemas
4−, wrapGAppsHook, itstool, libsoup, libxml2
5−, gnome3, gspell }:
3+, libpeas, gtksourceview4, gsettings-desktop-schemas
4+, wrapGAppsHook, ninja, libsoup, libxml2
5+, gnome3, gspell, perl, itstool, desktop-file-utils }:
66
77stdenv.mkDerivation rec {
88 name = "gedit-${version}";
9− version = "3.30.2";
9+ version = "3.32.0";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza";
13+ sha256 = "1lray9vvbcrnhjv5cr5fc4bqfd68km2x79cj50byyqn9cnlf5qn9";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
16+ nativeBuildInputs = [
17+ pkgconfig wrapGAppsHook meson ninja libxml2
18+ python3 perl itstool desktop-file-utils
19+ ];
1720
1821 buildInputs = [
1922 gtk3 glib
2023 adwaita-icon-theme libsoup
21− libpeas gtksourceview
24+ libpeas gtksourceview4
2225 gsettings-desktop-schemas gspell
2326 ];
2427
25− enableParallelBuilding = true;
28+ postPatch = ''
29+ chmod +x build-aux/meson/post_install.py
30+ chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl
31+ patchShebangs build-aux/meson/post_install.py
32+ patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl
33+ '';
34+
35+ mesonFlags = [
36+ "--buildtype=plain" # don't require git
37+ ];
38+
39+ # Reliably fails to generate gedit-file-browser-enum-types.h in time
40+ enableParallelBuilding = false;
2641
2742 passthru = {
2843 updateScript = gnome3.updateScript {
pkgs/desktops/gnome-3/apps/gnome-books/default.nixnew file+52
@@ -0,0 +1,52 @@
1+{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs
2+, pkgconfig, gtk3, glib, tracker, tracker-miners, libxslt
3+, webkitgtk, gnome-desktop, libgepub, gnome3, gdk_pixbuf
4+, gsettings-desktop-schemas, adwaita-icon-theme, docbook_xsl
5+, docbook_xml_dtd_42, desktop-file-utils, python3
6+, gobject-introspection, wrapGAppsHook }:
7+
8+stdenv.mkDerivation rec {
9+ pname = "gnome-books";
10+ version = "3.32.0";
11+
12+ src = fetchurl {
13+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
14+ sha256 = "1wkcywcwwszj9mldr0lngczqdz7hys08rr1nd2k6rs8ykzs2z7m4";
15+ };
16+
17+ mesonFlags = [
18+ "--buildtype=plain"
19+ ];
20+
21+ nativeBuildInputs = [
22+ meson ninja pkgconfig gettext libxslt desktop-file-utils
23+ docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
24+ ];
25+
26+ buildInputs = [
27+ gtk3 glib gsettings-desktop-schemas
28+ gdk_pixbuf adwaita-icon-theme evince
29+ webkitgtk gjs gobject-introspection tracker
30+ tracker-miners gnome-desktop libgepub
31+ ];
32+
33+ postPatch = ''
34+ chmod +x meson_post_install.py # patchShebangs requires executable file
35+ patchShebangs meson_post_install.py
36+ '';
37+
38+ passthru = {
39+ updateScript = gnome3.updateScript {
40+ packageName = "gnome-books";
41+ attrPath = "gnome3.gnome-books";
42+ };
43+ };
44+
45+ meta = with stdenv.lib; {
46+ homepage = https://wiki.gnome.org/Apps/Books;
47+ description = "An e-book manager application for GNOME";
48+ maintainers = gnome3.maintainers;
49+ license = licenses.gpl2Plus;
50+ platforms = platforms.linux;
51+ };
52+}
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+4−4
@@ -3,19 +3,19 @@
33, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
44, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
55, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
6−, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk
6+, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
77}:
88
99# TODO: ovirt (optional)
1010
1111let
12− version = "3.30.3";
12+ version = "3.32.0.2";
1313in stdenv.mkDerivation rec {
1414 name = "gnome-boxes-${version}";
1515
1616 src = fetchurl {
1717 url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
18− sha256 = "0a9ljwhkanszzyzl0bhad8vmzk7v4wafl9b1zn09pf57znyymf3s";
18+ sha256 = "1239x1bbkn0gxxq82zpvjjr7srla2d5ghi5rqwxnhsab0c2ypswk";
1919 };
2020
2121 doCheck = true;
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
3232 libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
3333 tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
3434 gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
35− libcap_ng numactl xen libapparmor
35+ libcap_ng numactl xen libapparmor vte
3636 ];
3737
3838 preFixup = ''
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+2−2
@@ -4,13 +4,13 @@
44
55let
66 pname = "gnome-calendar";
7− version = "3.30.1";
7+ version = "3.32.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 = "1avi7a29y8d8kzwslp51nwy6s692alms7917454j0xpfc6hnw62s";
13+ sha256 = "0fyy1slcvc32nz37clps7lz3w40i30fj93fc5m0rqk664w682ys4";
1414 };
1515
1616 passthru = {
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "gnome-characters-${version}";
6− version = "3.30.0";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "08cwz39iwgsyyb2wqhb8vfbmh1cwfkgfiy7adp08w7rwqi99x3dp";
10+ sha256 = "1cwazk9x9fs4lf89jqxdian15dk8zfsnpypgl1kknnw8r9mv0bzd";
1111 };
1212
1313 postPatch = ''
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+2−2
@@ -6,11 +6,11 @@
66
77stdenv.mkDerivation rec {
88 name = "gnome-clocks-${version}";
9− version = "3.30.1";
9+ version = "3.32.0";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "009fr6zwv37wryi0c0syi4i7pxpdbn3gliws68l99cjsbn2qd6pc";
13+ sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc";
1414 };
1515
1616 passthru = {
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix+6−11
@@ -8,16 +8,19 @@
88
99stdenv.mkDerivation rec {
1010 name = "gnome-documents-${version}";
11− version = "3.30.0";
11+ version = "3.32.0";
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "0zchkjpc9algmxrpj0f9i2lc4h1yp8z0h76vn32xa9jr46x4lsh6";
15+ sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c";
1616 };
1717
1818 doCheck = true;
1919
20− mesonFlags = [ "-Dgetting-started=true" ];
20+ mesonFlags = [
21+ "-Dgetting-started=true"
22+ "--buildtype=plain"
23+ ];
2124
2225 nativeBuildInputs = [
2326 meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
@@ -31,14 +34,6 @@ stdenv.mkDerivation rec {
3134 gnome-desktop libzapojit libgepub
3235 ];
3336
34− patches = [
35− # fix RPATH to libgd
36− (fetchpatch {
37− url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/d18a92e0a940073ac766f609937539e4fc6cdbb7.patch";
38− sha256 = "0s3mk8vrl1gzk93yvgqbnz44i27qw1d9yvvmnck3fv23phrxkzk9";
39− })
40− ];
41−
4237 postPatch = ''
4338 chmod +x meson_post_install.py # patchShebangs requires executable file
4439 patchShebangs meson_post_install.py
pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-getting-started-docs-${version}";
5− version = "3.30.0";
5+ version = "3.32.0";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
9− sha256 = "10vihv6n8703rapf915waz1vzr7axk43bjlhmm3hb7kwm32rc61k";
9+ sha256 = "1nzba7l33dgijwvfs777kcyy29xp7bmyrjk9nrwvm5zww4l35gai";
1010 };
1111
1212 passthru = {
pkgs/desktops/gnome-3/apps/gnome-logs/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "gnome-logs-${version}";
6− version = "3.30.0";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "1rsk2whps7rwl01mmjmhwwww4iv09fsszils9zmgqd79y7l3fmyh";
10+ sha256 = "1cn0ms24y9sg1kvhmk4mj7v9fi0n6ylyf11jjh4k81wfjsaah7w4";
1111 };
1212
1313 mesonFlags = [
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+2−2
@@ -5,13 +5,13 @@
55
66let
77 pname = "gnome-maps";
8− version = "3.30.3";
8+ version = "3.32.1";
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 = "0s1k6v1yzchbv6big09fdhmm0rzyjdh2y7qg6fsp7d0x4qnch9nq";
14+ sha256 = "1q15qsp0ca67y4l0x31518cfakrj85x9g0cbcm0wysnbddi1aik0";
1515 };
1616
1717 doCheck = true;
pkgs/desktops/gnome-3/apps/gnome-music/default.nix+2−2
@@ -6,13 +6,13 @@
66
77python3.pkgs.buildPythonApplication rec {
88 pname = "gnome-music";
9− version = "3.30.2";
9+ version = "3.32.0";
1010
1111 format = "other";
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
15− sha256 = "1d9gd9rqy71hibfrz4zglimvgv6yn1pw22cnrn7pbdz6k4yq209d";
15+ sha256 = "075q8y4i66nh6wjga6vwdcivsm1dfbwv54hfvk4q8mbws7zfzky7";
1616 };
1717
1818 nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+2−2
@@ -5,13 +5,13 @@
55, gnome3, libxml2 }:
66
77let
8− version = "3.30.3";
8+ version = "3.32.0";
99in stdenv.mkDerivation rec {
1010 name = "gnome-notes-${version}";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
14− sha256 = "1mkpi2i9nqpip5l15ihjcscyiri113s0705sjgh6b89164ahyn5k";
14+ sha256 = "09l98yvgrfjw427wn271ap5v6hbwdf9liyrkp34bl0k3hv2d6dv3";
1515 };
1616
1717 doCheck = true;
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix+16−4
@@ -4,22 +4,25 @@
44, grilo, gnome-online-accounts
55, desktop-file-utils, wrapGAppsHook
66, gnome3, gdk_pixbuf, gexiv2, geocode-glib
7−, dleyna-renderer }:
7+, dleyna-renderer, dbus, meson, ninja, python3 }:
88
99let
1010 pname = "gnome-photos";
11− version = "3.30.1";
11+ version = "3.32.0";
1212in stdenv.mkDerivation rec {
1313 name = "${pname}-${version}";
1414
1515 src = fetchurl {
1616 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
17− sha256 = "1mf1887x0pk46h6l51rfkpn29fwp3yvmqkk99kr1iwpz0lakyx6f";
17+ sha256 = "160vqmcqvyzby27wd2lzwzgbfl6jxxk7phhnqh9498r3clr73haj";
1818 };
1919
2020 # doCheck = true;
2121
22− nativeBuildInputs = [ pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
22+ nativeBuildInputs = [
23+ pkgconfig gettext itstool meson ninja libxml2
24+ desktop-file-utils wrapGAppsHook python3
25+ ];
2326 buildInputs = [
2427 gtk3 glib gegl babl libgdata libdazzle
2528 gnome3.gsettings-desktop-schemas
@@ -28,8 +31,17 @@ in stdenv.mkDerivation rec {
2831 gnome-online-accounts tracker
2932 gexiv2 geocode-glib dleyna-renderer
3033 tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
34+ dbus
35+ ];
36+
37+ mesonFlags = [
38+ "--buildtype=plain" # don't do any git commands
3139 ];
3240
41+ postPatch = ''
42+ chmod +x meson_post_install.py
43+ patchShebangs meson_post_install.py
44+ '';
3345
3446 passthru = {
3547 updateScript = gnome3.updateScript {
pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix+2−2
@@ -14,13 +14,13 @@
1414
1515let
1616 pname = "gnome-power-manager";
17− version = "3.30.0";
17+ version = "3.32.0";
1818in stdenv.mkDerivation rec {
1919 name = "${pname}-${version}";
2020
2121 src = fetchurl {
2222 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
23− sha256 = "0m15x6i279wrfimz9ma2gfjv7jlkca2qbl2wcnxgx1pb3hzrwggm";
23+ sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g";
2424 };
2525
2626 passthru = {
pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix+12−11
@@ -1,25 +1,26 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3 }:
1+{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3
2+, meson, ninja, python3, hicolor-icon-theme, desktop-file-utils }:
23
34stdenv.mkDerivation rec {
45 pname = "gnome-sound-recorder";
5− version = "3.28.2";
6+ version = "3.32.0";
67
78 src = fetchurl {
89 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "1k63xr3d16qbzi88md913ndaf2mzwmhmi6hipj0123sm7nsz1p94";
10+ sha256 = "0rchzap5mg9ach3jcf4sci5v2h5pgpdjafjfllfd09w9yg3brspp";
1011 };
1112
12− patches = [
13− # Fix crash when trying to play recordings
14− (fetchpatch {
15− url = https://gitlab.gnome.org/GNOME/gnome-sound-recorder/commit/2b311ef67909bc20d0e87f334fe37bf5c4e9f29f.patch;
16− sha256 = "0hqmk846bxma0p66cqp94zd02zc1if836ywjq3sv5dsfwnz7jv3f";
17− })
13+ nativeBuildInputs = [
14+ pkgconfig gettext meson ninja gobject-introspection
15+ wrapGAppsHook python3 hicolor-icon-theme desktop-file-utils
1816 ];
19−
20− nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ];
2117 buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);
2218
19+ postPatch = ''
20+ chmod +x build-aux/meson_post_install.py
21+ patchShebangs build-aux/meson_post_install.py
22+ '';
23+
2324 # TODO: fix this in gstreamer
2425 # TODO: make stdenv.lib.getBin respect outputBin
2526 PKG_CONFIG_GSTREAMER_1_0_TOOLSDIR = "${gst_all_1.gstreamer.dev}/bin";
pkgs/desktops/gnome-3/apps/gnome-todo/default.nix+52−13
@@ -1,28 +1,67 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook
2−, gettext, gnome3, glib, gtk3, libpeas
3−, gnome-online-accounts, gsettings-desktop-schemas
4−, evolution-data-server, libxml2, libsoup, libical, librest, json-glib }:
1+{ stdenv
2+, fetchurl
3+, fetchpatch
4+, meson
5+, ninja
6+, pkgconfig
7+, python3
8+, wrapGAppsHook
9+, gettext
10+, gnome3
11+, glib
12+, gtk3
13+, libpeas
14+, gnome-online-accounts
15+, gsettings-desktop-schemas
16+, adwaita-icon-theme
17+, evolution-data-server
18+, libxml2
19+, libsoup
20+, libical
21+, librest
22+, json-glib
23+}:
524
6−let
25+stdenv.mkDerivation rec {
726 pname = "gnome-todo";
827 version = "3.28.1";
9−in stdenv.mkDerivation rec {
10− name = "${pname}-${version}";
1128
1229 src = fetchurl {
13− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
30+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1431 sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7";
1532 };
1633
34+ patches = [
35+ # fix build with e-d-s 3.32
36+ (fetchpatch {
37+ url = https://gitlab.gnome.org/GNOME/gnome-todo/commit/6cdabc4dd0c6c804a093b94c269461ce376fed4f.patch;
38+ sha256 = "08ldgyxv9216dgr8y9asqd7j2y82y9yqnqhkqaxc9i8a67yz1gzy";
39+ })
40+ ];
41+
1742 nativeBuildInputs = [
18− meson ninja pkgconfig gettext python3 wrapGAppsHook
43+ meson
44+ ninja
45+ pkgconfig
46+ gettext
47+ python3
48+ wrapGAppsHook
1949 ];
50+
2051 buildInputs = [
21− glib gtk3 libpeas gnome-online-accounts
22− gsettings-desktop-schemas gnome3.adwaita-icon-theme
52+ glib
53+ gtk3
54+ libpeas
55+ gnome-online-accounts
56+ gsettings-desktop-schemas
57+ gnome3.adwaita-icon-theme
2358 # Plug-ins
24− evolution-data-server libxml2 libsoup libical
25− librest json-glib
59+ evolution-data-server
60+ libxml2
61+ libsoup
62+ libical
63+ librest
64+ json-glib
2665 ];
2766
2867 postPatch = ''
pkgs/desktops/gnome-3/apps/gnome-weather/default.nix+14−11
@@ -1,29 +1,32 @@
11{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection
2−, libgweather, intltool, itstool, geoclue2, gnome-desktop }:
2+, libgweather, meson, ninja, geoclue2, gnome-desktop, python3 }:
33
44stdenv.mkDerivation rec {
55 name = "gnome-weather-${version}";
6− version = "3.26.0";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
10+ sha256 = "0b7cqd3wfrgm0hps0cb8vhjz0bpjw955hbc4r82l626g8l3hf86w";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
13+ nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
1414 buildInputs = [
1515 gtk3 gjs gobject-introspection gnome-desktop
1616 libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas
1717 ];
1818
19− # The .service file isn't wrapped with the correct environment
20− # so misses GIR files when started. By re-pointing from the gjs
21− # entry point to the wrapped binary we get back to a wrapped
22− # binary.
23− preConfigure = ''
24− substituteInPlace "data/org.gnome.Weather.Application.service.in" \
25− --replace "Exec=@pkgdatadir@/@PACKAGE_NAME@.Application" \
19+ postPatch = ''
20+ # The .service file is not wrapped with the correct environment
21+ # so misses GIR files when started. By re-pointing from the gjs
22+ # entry point to the wrapped binary we get back to a wrapped
23+ # binary.
24+ substituteInPlace "data/org.gnome.Weather.service.in" \
25+ --replace "Exec=@DATA_DIR@/@APP_ID@" \
2626 "Exec=$out/bin/gnome-weather"
27+
28+ chmod +x meson_post_install.py
29+ patchShebangs meson_post_install.py
2730 '';
2831
2932 passthru = {
pkgs/desktops/gnome-3/apps/polari/default.nix+2−2
@@ -5,13 +5,13 @@
55
66let
77 pname = "polari";
8− version = "3.30.2";
8+ version = "3.32.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 = "02wxkdq5s5ami9wj9vpqhs6n8qxr299bpmvpvd89mn49x73lq2w2";
14+ sha256 = "1jq1xvk9a05x37g9w349f5q069cvg5lfbhxj88gpbnf4fyndnr70";
1515 };
1616
1717 propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
pkgs/desktops/gnome-3/apps/seahorse/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, vala, meson, ninja
1+{ stdenv, fetchurl, vala, meson, ninja, libpwquality
22, pkgconfig, gtk3, glib, gobject-introspection
33, wrapGAppsHook, itstool, gnupg, libsoup
44, gnome3, gpgme, python3, openldap, gcr
@@ -6,11 +6,11 @@
66
77stdenv.mkDerivation rec {
88 pname = "seahorse";
9− version = "3.30.1.1";
9+ version = "3.32";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "12x7xmwh62yl0ax90v8nkx3jqzviaz9hz2g56yml78wzww20gawy";
13+ sha256 = "1wxcxq6ahlwab8dr83gqml67y95mnk56hsgw19d4h0xjvyz2ym52";
1414 };
1515
1616 doCheck = true;
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 gnome3.gsettings-desktop-schemas gnupg
2525 gnome3.adwaita-icon-theme gpgme
2626 libsecret avahi libsoup p11-kit
27− openssh openldap
27+ openssh openldap libpwquality
2828 ];
2929
3030 postPatch = ''
pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "adwaita-icon-theme-${version}";
6− version = "3.30.1";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "1kp1lis3dr16jmlgycz1b29jsr6ir8wmqj6laqwlhs663cmjlxbd";
10+ sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9";
1111 };
1212
1313 # For convenience, we can specify adwaita-icon-theme only in packages
pkgs/desktops/gnome-3/core/baobab/default.nix+2−2
@@ -4,13 +4,13 @@
44
55let
66 pname = "baobab";
7− version = "3.30.0";
7+ version = "3.32.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 = "0kx721s1hhw1g0nvbqhb93g8iq6f852imyhfhl02zcqy4ipx0kay";
13+ sha256 = "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r";
1414 };
1515
1616 nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
pkgs/desktops/gnome-3/core/dconf-editor/default.nix+8−4
@@ -1,18 +1,22 @@
11{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3
2−, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
2+, libxml2, gettext, docbook_xsl, hicolor-icon-theme, wrapGAppsHook, gobject-introspection }:
33
44let
55 pname = "dconf-editor";
6− version = "3.30.2";
6+ version = "3.32.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 = "06f736spn20s7qjsz00xw44v8r8bjhyrz1v3bix6v416jc5jp6ia";
12+ sha256 = "1fmsmlh16njjm948grz20mzrsvb4wjj7pl1fvkrkxqi7mhr177gi";
1313 };
1414
15− nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobject-introspection python3 ];
15+ nativeBuildInputs = [
16+ meson ninja vala libxslt pkgconfig wrapGAppsHook
17+ gettext docbook_xsl libxml2 gobject-introspection python3
18+ hicolor-icon-theme # for setup-hook
19+ ];
1620
1721 buildInputs = [ glib gtk3 gnome3.dconf ];
1822
pkgs/desktops/gnome-3/core/dconf/default.nix+5−4
@@ -6,11 +6,11 @@ let
66in
77stdenv.mkDerivation rec {
88 name = "${pname}-${version}";
9− version = "0.30.1";
9+ version = "0.32.0";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "1dq2dn7qmxr4fxzx9wnag89ck24gxq17p2n4gl81h4w8qdy3m6jl";
13+ sha256 = "1azz4hb9z76yxn34yrrsiib3iqz5z4vpwn5q7cncp55w365ygg38";
1414 };
1515
1616 patches = [
@@ -23,8 +23,9 @@ stdenv.mkDerivation rec {
2323 ];
2424
2525 postPatch = ''
26− chmod +x meson_post_install.py
26+ chmod +x meson_post_install.py tests/test-dconf.py
2727 patchShebangs meson_post_install.py
28+ patchShebangs tests/test-dconf.py
2829 '';
2930
3031 outputs = [ "out" "lib" "dev" "devdoc" ];
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
3738 "-Dgtk_doc=true"
3839 ];
3940
40− doCheck = true;
41+ doCheck = !stdenv.isAarch64;
4142
4243 passthru = {
4344 updateScript = gnome3.updateScript {
pkgs/desktops/gnome-3/core/eog/default.nix+2−2
@@ -4,13 +4,13 @@
44
55let
66 pname = "eog";
7− version = "3.28.4";
7+ version = "3.32.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 = "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55";
13+ sha256 = "005cjq0i4281yw9wa6dyp5ymbx1yiprx1k5lgvfdd37qpbkk017z";
1414 };
1515
1616 nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
pkgs/desktops/gnome-3/core/epiphany/default.nix+5−5
@@ -2,19 +2,19 @@
22, wrapGAppsHook, gnome3, libxml2, libxslt, itstool
33, webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
44, sqlite, gcr, isocodes, desktop-file-utils, python3
5−, gdk_pixbuf, gst_all_1, json-glib, libdazzle }:
5+, gdk_pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
66
77stdenv.mkDerivation rec {
88 name = "epiphany-${version}";
9− version = "3.30.3";
9+ version = "3.32.1.2";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "05qdzx18ld1m3xiajpz6y6snfj56bgyjsgm7f4rqrnpjdbdvikbn";
13+ sha256 = "1gi6g519i0dldwa8bmp047j9mdf8k0asr3ja2m593dy8pfwlya58";
1414 };
1515
1616 # Tests need an X display
17− mesonFlags = [ "-Dunit_tests=false" ];
17+ mesonFlags = [ "-Dunit_tests=disabled" ];
1818
1919 nativeBuildInputs = [
2020 meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 buildInputs = [
2424 gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
25− sqlite isocodes p11-kit icu
25+ sqlite isocodes p11-kit icu libhandy
2626 gdk_pixbuf gnome3.adwaita-icon-theme gcr
2727 glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
2828 gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
pkgs/desktops/gnome-3/core/evince/default.nix+91−31
@@ -1,56 +1,116 @@
1−{ fetchurl, stdenv, pkgconfig, intltool, libxml2
2−, glib, gtk3, pango, atk, gdk_pixbuf, shared-mime-info, itstool, gnome3
3−, poppler, ghostscriptX, djvulibre, libspectre, libarchive, libsecret, wrapGAppsHook
4−, librsvg, gobject-introspection, yelp-tools, gspell, adwaita-icon-theme, gsettings-desktop-schemas
1+{ fetchFromGitLab
2+, stdenv
3+, meson
4+, ninja
5+, pkgconfig
6+, gettext
7+, libxml2
8+, appstream
9+, glib
10+, gtk3
11+, pango
12+, atk
13+, gdk_pixbuf
14+, shared-mime-info
15+, itstool
16+, gnome3
17+, poppler
18+, ghostscriptX
19+, djvulibre
20+, libspectre
21+, libarchive
22+, libsecret
23+, wrapGAppsHook
24+, librsvg
25+, gobject-introspection
26+, yelp-tools
27+, gspell
28+, adwaita-icon-theme
29+, gsettings-desktop-schemas
30+, gnome-desktop
31+, dbus
32+, python3
33+, texlive
34+, t1lib
35+, gst_all_1
36+, supportMultimedia ? true # PDF multimedia
537, libgxps
6−, recentListSize ? null # 5 is not enough, allow passing a different number
7−, supportXPS ? false # Open XML Paper Specification via libgxps
8−, autoreconfHook, pruneLibtoolFiles
38+, supportXPS ? true # Open XML Paper Specification via libgxps
939}:
1040
1141stdenv.mkDerivation rec {
12− name = "evince-${version}";
13− version = "3.30.2";
42+ pname = "evince";
43+ version = "3.32.0";
1444
15− src = fetchurl {
16− url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
17− sha256 = "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9";
45+ src = fetchFromGitLab {
46+ domain = "gitlab.gnome.org";
47+ owner = "GNOME";
48+ repo = pname;
49+ rev = version;
50+ sha256 = "1klq8j70q8r8hyqv1wi6jcx8g76yh46bh8614y82zzggn4cx6y3r";
1851 };
1952
20− passthru = {
21− updateScript = gnome3.updateScript { packageName = "evince"; };
22− };
53+ postPatch = ''
54+ chmod +x meson_post_install.py
55+ patchShebangs meson_post_install.py
56+ '';
2357
2458 nativeBuildInputs = [
25− pkgconfig gobject-introspection intltool itstool wrapGAppsHook yelp-tools autoreconfHook pruneLibtoolFiles
59+ meson
60+ ninja
61+ pkgconfig
62+ gobject-introspection
63+ gettext
64+ itstool
65+ yelp-tools
66+ appstream
67+ wrapGAppsHook
68+ python3
2669 ];
2770
2871 buildInputs = [
29− glib gtk3 pango atk gdk_pixbuf libxml2
72+ glib
73+ gtk3
74+ pango
75+ atk
76+ gdk_pixbuf
77+ libxml2
3078 gsettings-desktop-schemas
31− poppler ghostscriptX djvulibre libspectre libarchive
32− libsecret librsvg adwaita-icon-theme gspell
33− ] ++ stdenv.lib.optional supportXPS libgxps;
79+ poppler
80+ ghostscriptX
81+ djvulibre
82+ libspectre
83+ libarchive
84+ libsecret
85+ librsvg
86+ adwaita-icon-theme
87+ gspell
88+ gnome-desktop
89+ dbus # only needed to find the service directory
90+ texlive.bin.core # kpathsea for DVI support
91+ t1lib
92+ ] ++ stdenv.lib.optional supportXPS libgxps
93+ ++ stdenv.lib.optionals supportMultimedia (with gst_all_1; [
94+ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]);
3495
35− configureFlags = [
36− "--disable-nautilus" # Do not build nautilus plugin
37− "--enable-ps"
38− "--enable-introspection"
39− (if supportXPS then "--enable-xps" else "--disable-xps")
96+ mesonFlags = [
97+ "-Dauto_features=enabled"
98+ "-Dnautilus=false"
99+ "-Dps=enabled"
100+ "-Dgtk_doc=false"
40101 ];
41102
42103 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
43104
44− preConfigure = stdenv.lib.optionalString (recentListSize != null) ''
45− sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
46− sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
47− '';
48−
49105 preFixup = ''
50106 gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
51107 '';
52108
53− enableParallelBuilding = true;
109+ passthru = {
110+ updateScript = gnome3.updateScript {
111+ packageName = pname;
112+ };
113+ };
54114
55115 meta = with stdenv.lib; {
56116 homepage = https://wiki.gnome.org/Apps/Evince;
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+2−2
@@ -6,13 +6,13 @@
66
77stdenv.mkDerivation rec {
88 name = "evolution-data-server-${version}";
9− version = "3.30.5";
9+ version = "3.32.0";
1010
1111 outputs = [ "out" "dev" ];
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "1s952wyhgcbmq9nfgk75v15zdy1h3wy5p5rmkqibaavmc0pk3mli";
15+ sha256 = "1pnxf0jcbmh86ahkjgn3l2521yvgypgmfz590wp350z4fi4vh44f";
1616 };
1717
1818 patches = [
pkgs/desktops/gnome-3/core/gdm/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 name = "gdm-${version}";
8− version = "3.30.3";
8+ version = "3.32.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "15f7lz7z75krgbq8vb800afj96h8mw2fpy1s28za2911x5vgq0ak";
12+ sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4";
1313 };
1414
1515 # Only needed to make it build
pkgs/desktops/gnome-3/core/gjs/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "gjs-${version}";
7− version = "1.54.3";
7+ version = "1.56.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "1cd65d4nq5xxlyjz1b83hm5zklyry6lillzf782nr0z97k60vcvn";
11+ sha256 = "06pcfpscpdv9nir0hrcfglbkq0whlv7sncmlmdgi1c5daiasv9v4";
1212 };
1313
1414 passthru = {
pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-backgrounds-${version}";
5− version = "3.30.0";
5+ version = "3.32.0";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
9− sha256 = "1179jrl16bp9gqabqhw7nnfp8qzf5y1vf9fi45bni6rfmwm3mrpc";
9+ sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz";
1010 };
1111
1212 passthru = {
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix+2−2
@@ -6,14 +6,14 @@ let
66 pname = "gnome-bluetooth";
77in stdenv.mkDerivation rec {
88 name = "${pname}-${version}";
9− version = "3.28.2";
9+ version = "3.32.1";
1010
1111 # TODO: split out "lib"
1212 outputs = [ "out" "dev" "devdoc" "man" ];
1313
1414 src = fetchurl {
1515 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
16− sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z";
16+ sha256 = "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4";
1717 };
1818
1919 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+4−4
@@ -1,14 +1,14 @@
11{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
2−, gtk3, glib, gtksourceview3, wrapGAppsHook, gobject-introspection, python3
2+, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3
33, gnome3, mpfr, gmp, libsoup, libmpc }:
44
55stdenv.mkDerivation rec {
66 name = "gnome-calculator-${version}";
7− version = "3.30.1";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "0qkzcmj51cjmljxl1nc84h6jgq1a51xj4g6jwh3ymgm19m3sqypc";
11+ sha256 = "0m4g7ml6ch9cc4wdchlyspakz3a9ak1rka26j08nvhhvllkdkqlw";
1212 };
1313
1414 nativeBuildInputs = [
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 ];
1818
1919 buildInputs = [
20− gtk3 glib libxml2 gtksourceview3 mpfr gmp
20+ gtk3 glib libxml2 gtksourceview4 mpfr gmp
2121 gnome3.adwaita-icon-theme
2222 gnome3.gsettings-desktop-schemas libsoup libmpc
2323 ];
pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix+2−2
@@ -2,13 +2,13 @@
22
33let
44 pname = "gnome-color-manager";
5− version = "3.30.0";
5+ version = "3.32.0";
66in stdenv.mkDerivation rec {
77 name = "${pname}-${version}";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "105bqqq3yvdn5lx94mkl0d450f0l8lmwfjjcwyls1pycmj0vifwh";
11+ sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w";
1212 };
1313
1414 nativeBuildInputs = [ meson ninja pkgconfig gettext itstool desktop-file-utils ];
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+10−6
@@ -2,16 +2,16 @@
22, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
33, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
44, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
5−, vala, meson, ninja }:
5+, vala, meson, ninja, libhandy }:
66
77let
8− version = "3.30.2";
8+ version = "3.32";
99in stdenv.mkDerivation rec {
1010 name = "gnome-contacts-${version}";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "1b0pkdwz9yqcv82zzdf76rs2w3wa5zli8pka09wnahikx1ykk43h";
14+ sha256 = "12vr75d5akhs0fzmjg6j21jrrlr8njdrf9dwhw94k8p73y1gjjgw";
1515 };
1616
1717 propagatedUserEnvPkgs = [ evolution-data-server ];
@@ -22,14 +22,18 @@ in stdenv.mkDerivation rec {
2222
2323 buildInputs = [
2424 gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas
25− folks gnome-desktop telepathy-glib
25+ folks gnome-desktop telepathy-glib libhandy
2626 libxml2 gnome-online-accounts cheese
2727 gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
2828 ];
2929
30+ mesonFlags = [
31+ "-Dtelepathy=true"
32+ ];
33+
3034 postPatch = ''
31− chmod +x meson_post_install.py
32− patchShebangs meson_post_install.py
35+ chmod +x build-aux/meson_post_install.py
36+ patchShebangs build-aux/meson_post_install.py
3337 '';
3438
3539 # In file included from src/gnome-contacts@exe/contacts-avatar-selector.c:30:0:
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+14−13
@@ -1,28 +1,27 @@
11{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook
22, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
3−, gdk_pixbuf, librsvg, libnotify, libgudev, libsecret, gnome-color-manager
3+, gdk_pixbuf, librsvg, libgudev, libsecret, gnome-color-manager
44, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
5−, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
6−, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
5+, libkrb5, networkmanagerapplet, networkmanager, glibc
6+, libwacom, samba, shared-mime-info, tzdata, libgnomekbd
77, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session
88, fontconfig, sound-theme-freedesktop, grilo, python3
99, gtk3, glib, glib-networking, gsettings-desktop-schemas
1010, gnome-desktop, gnome-settings-daemon, gnome-online-accounts
11−, vino, gnome-bluetooth, tracker, adwaita-icon-theme }:
11+, vino, gnome-bluetooth, tracker, adwaita-icon-theme
12+, udisks2, gsound, libhandy, cups }:
1213
13−let
14+stdenv.mkDerivation rec {
1415 pname = "gnome-control-center";
15− version = "3.30.3";
16−in stdenv.mkDerivation rec {
17− name = "${pname}-${version}";
16+ version = "3.32.1";
1817
1918 src = fetchurl {
20− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
21− sha256 = "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r";
19+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
20+ sha256 = "0xpcmwgnn29syi2kfxc8233a5f3j8cij5wcn76xmsmwxvxz5r85l";
2221 };
2322
2423 nativeBuildInputs = [
25− meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl
24+ meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xsl
2625 shared-mime-info python3
2726 ];
2827
@@ -30,10 +29,11 @@ in stdenv.mkDerivation rec {
3029 ibus gtk3 glib glib-networking upower gsettings-desktop-schemas
3130 libxml2 gnome-desktop gnome-settings-daemon polkit libgtop
3231 gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
33− accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify
34− grilo libpwquality cracklib vino libcanberra-gtk3 libgudev libsecret
32+ accountsservice libkrb5 networkmanagerapplet libwacom samba
33+ grilo libpwquality vino libcanberra-gtk3 libgudev libsecret
3534 gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
3635 networkmanager modemmanager gnome-bluetooth tracker
36+ udisks2 gsound libhandy
3737 ];
3838
3939 patches = [
@@ -41,6 +41,7 @@ in stdenv.mkDerivation rec {
4141 src = ./paths.patch;
4242 gcm = gnome-color-manager;
4343 inherit glibc libgnomekbd tzdata;
44+ inherit cups networkmanagerapplet;
4445 })
4546 ];
4647
pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch+84−8
@@ -1,6 +1,8 @@
1+diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
2+index 49ca35220..adefb87b9 100644
13--- a/panels/color/cc-color-panel.c
24+++ b/panels/color/cc-color-panel.c
3−@@ -599,7 +599,7 @@
5+@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs)
46
57 /* run with modal set */
68 argv = g_ptr_array_new_with_free_func (g_free);
@@ -9,7 +11,7 @@
911 g_ptr_array_add (argv, g_strdup ("--device"));
1012 g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));
1113 g_ptr_array_add (argv, g_strdup ("--parent-window"));
12−@@ -1038,7 +1038,7 @@
14+@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)
1315
1416 /* open up gcm-viewer as a info pane */
1517 argv = g_ptr_array_new_with_free_func (g_free);
@@ -18,7 +20,7 @@
1820 g_ptr_array_add (argv, g_strdup ("--profile"));
1921 g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
2022 g_ptr_array_add (argv, g_strdup ("--parent-window"));
21−@@ -1288,15 +1288,12 @@
23+@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)
2224 static void
2325 gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)
2426 {
@@ -35,6 +37,8 @@
3537 gtk_widget_set_sensitive (prefs->toolbutton_profile_view, TRUE);
3638 else
3739 gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE);
40+diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
41+index 96b25140c..1ad704d4a 100644
3842--- a/panels/datetime/tz.h
3943+++ b/panels/datetime/tz.h
4044@@ -27,11 +27,7 @@
@@ -50,24 +54,96 @@
5054
5155 typedef struct _TzDB TzDB;
5256 typedef struct _TzLocation TzLocation;
57+diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
58+index 9390a3308..d30b4a68e 100644
59+--- a/panels/network/connection-editor/net-connection-editor.c
60++++ b/panels/network/connection-editor/net-connection-editor.c
61+@@ -247,9 +247,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *editor, const gchar *typ
62+ GError *error = NULL;
63+
64+ if (editor->is_new_connection) {
65+- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type);
66++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type);
67+ } else {
68+- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'",
69++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'",
70+ nm_connection_get_uuid (editor->connection));
71+ }
72+
73+diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
74+index 360fbfc72..870157a11 100644
75+--- a/panels/network/net-device-wifi.c
76++++ b/panels/network/net-device-wifi.c
77+@@ -1385,7 +1385,7 @@ device_wifi_edit (NetObject *object)
78+ return;
79+ }
80+ uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
81+- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
82++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);
83+ g_debug ("Launching '%s'\n", cmdline);
84+ if (!g_spawn_command_line_async (cmdline, &error)) {
85+ g_warning ("Failed to launch nm-connection-editor: %s", error->message);
86+diff --git a/panels/network/net-device.c b/panels/network/net-device.c
87+index d73b537b9..e2ee54294 100644
88+--- a/panels/network/net-device.c
89++++ b/panels/network/net-device.c
90+@@ -197,7 +197,7 @@ net_device_edit (NetObject *object)
91+
92+ connection = net_device_get_find_connection (device);
93+ uuid = nm_connection_get_uuid (connection);
94+- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
95++ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid);
96+ g_debug ("Launching '%s'\n", cmdline);
97+ if (!g_spawn_command_line_async (cmdline, &error)) {
98+ g_warning ("Failed to launch nm-connection-editor: %s", error->message);
99+diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
100+index f53ba217e..d24bcaeb9 100644
101+--- a/panels/printers/pp-host.c
102++++ b/panels/printers/pp-host.c
103+@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task,
104+ devices = g_new0 (PpDevicesList, 1);
105+
106+ argv = g_new0 (gchar *, 3);
107+- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
108++ argv[0] = g_strdup ("@cups@/lib/cups/backend/snmp");
109+ argv[1] = g_strdup (priv->hostname);
110+
111+ /* Use SNMP to get printer's informations */
112+diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
113+index 35859526d..21486c917 100644
53114--- a/panels/region/cc-region-panel.c
54115+++ b/panels/region/cc-region-panel.c
55−@@ -1265,10 +1265,10 @@
56− }
116+@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self,
117+ layout_variant = cc_input_source_get_layout_variant (source);
57118
58− if (variant && variant[0])
119+ if (layout_variant && layout_variant[0])
59120- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
60121+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"",
61− layout, variant);
122+ layout, layout_variant);
62123 else
63124- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s",
64125+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s",
65126 layout);
66127
67128 g_spawn_command_line_async (commandline, NULL);
129+diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
130+index 00239ce0f..617c98870 100644
131+--- a/panels/user-accounts/run-passwd.c
132++++ b/panels/user-accounts/run-passwd.c
133+@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
134+ gchar **envp;
135+ gint my_stdin, my_stdout, my_stderr;
136+
137+- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
138++ argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
139+ argv[1] = NULL;
140+
141+ envp = g_get_environ ();
142+diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
143+index 9cb92007a..84d2f0fa3 100644
68144--- a/tests/datetime/test-endianess.c
69145+++ b/tests/datetime/test-endianess.c
70−@@ -26,7 +26,7 @@
146+@@ -26,7 +26,7 @@ test_endianess (void)
71147 g_autoptr(GDir) dir = NULL;
72148 const char *name;
73149
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix+8−12
@@ -1,22 +1,22 @@
1−{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, which, libX11, gnome3, gtk3, glib
2−, gettext, libxml2, xkeyboard_config, isocodes, itstool, wayland, fetchpatch
1+{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
2+, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch
33, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }:
44
55stdenv.mkDerivation rec {
66 name = "gnome-desktop-${version}";
7− version = "3.30.2.1";
7+ version = "3.32.0";
88
99 outputs = [ "out" "dev" "devdoc" ];
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "07s95fpfl3kjq51yxbrx6q87w812pq6bl0xdn0zzyi6qvg33m00v";
13+ sha256 = "0m3vs3rhhykr4xnwzi18h4bb1l05l8ykpiw4mi90dz19zk2ksfd6";
1414 };
1515
1616 enableParallelBuilding = true;
1717
1818 nativeBuildInputs = [
19− pkgconfig which itstool gettext libxslt libxml2 gobject-introspection
19+ pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection
2020 gtk-doc docbook_xsl
2121 ];
2222 buildInputs = [
@@ -32,15 +32,11 @@ stdenv.mkDerivation rec {
3232 bubblewrap_bin = "${bubblewrap}/bin/bwrap";
3333 inherit (builtins) storeDir;
3434 })
35− (fetchpatch {
36− name = "fix-missing-font-cache";
37− url = https://gitlab.gnome.org/GNOME/gnome-desktop/commit/b87de7495160dbf48f01aa1ddb361fc2556ffd0c.patch;
38− sha256 = "1aw7lw93kcflmqmbx25cwja25441i8xzvgjm1pfsxvw3vr8j6scb";
39− })
4035 ];
4136
42− configureFlags = [
43− "--enable-gtk-doc"
37+ mesonFlags = [
38+ "-Dgtk_doc=true"
39+ "-Ddesktop_docs=false"
4440 ];
4541
4642 passthru = {
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 name = "gnome-disk-utility-${version}";
8− version = "3.30.2";
8+ version = "3.32.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "1365fabz3q7n3bl775z82m1nzg18birxxyd7l2ssbbkqrx3h7wgi";
12+ sha256 = "1prnmfxll1hskqqbhd8lyz2zafbrj2dv04fn817rn3266dr94kpq";
1313 };
1414
1515 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix+4−4
@@ -1,20 +1,20 @@
11{ stdenv, meson, ninja, gettext, fetchurl
22, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme
3−, wrapGAppsHook, gnome3 }:
3+, wrapGAppsHook, gnome3, harfbuzz }:
44
55stdenv.mkDerivation rec {
66 name = "gnome-font-viewer-${version}";
7− version = "3.30.0";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5";
11+ sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3";
1212 };
1313
1414 doCheck = true;
1515
1616 nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ];
17− buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme ];
17+ buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ];
1818
1919 # Do not run meson-postinstall.sh
2020 preConfigure = "sed -i '2,$ d' meson-postinstall.sh";
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "gnome-keyring-${version}";
7− version = "3.28.2";
7+ version = "3.31.91";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
11+ sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4";
1212 };
1313
1414 outputs = [ "out" "dev" ];
pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix+4−3
@@ -1,18 +1,18 @@
11{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook
22, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection
3−, gettext, icu, glib-networking
3+, gettext, icu, glib-networking, hicolor-icon-theme
44, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos
55}:
66
77let
88 pname = "gnome-online-accounts";
9− version = "3.30.2";
9+ version = "3.32.0";
1010in stdenv.mkDerivation rec {
1111 name = "${pname}-${version}";
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5";
15+ sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w";
1616 };
1717
1818 outputs = [ "out" "man" "dev" "devdoc" ];
@@ -31,6 +31,7 @@ in stdenv.mkDerivation rec {
3131 nativeBuildInputs = [
3232 pkgconfig gobject-introspection vala gettext wrapGAppsHook
3333 libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc
34+ hicolor-icon-theme # for setup-hook
3435 ];
3536 buildInputs = [
3637 glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix+2−2
@@ -4,13 +4,13 @@
44
55let
66 pname = "gnome-screenshot";
7− version = "3.30.0";
7+ version = "3.32.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 = "06dx3svxq6sar4913mrz5lzb7hmc66wck138vmyxj8x8iv1iw0w8";
13+ sha256 = "09ha7dizjm5ymqpjyrqd10ijfb3xlqc1mwg9ajkrbfry11q9yq4b";
1414 };
1515
1616 doCheck = true;
pkgs/desktops/gnome-3/core/gnome-session/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "gnome-session-${version}";
7− version = "3.30.1";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "0fbpq103md4g9gi67rxnwvha21629nxx7qazddy6q6494sbqbzpa";
11+ sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v";
1212 };
1313
1414 patches = [
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix+76−15
@@ -1,15 +1,48 @@
1−{ fetchurl, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, gtk3, glib, libnotify, lcms2, libXtst
2−, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit, gsettings-desktop-schemas
3−, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
4−, gnome-desktop, geocode-glib, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss }:
1+{ stdenv
2+, substituteAll
3+, fetchurl
4+, meson
5+, ninja
6+, pkgconfig
7+, gnome3
8+, perl
9+, gettext
10+, gtk3
11+, glib
12+, libnotify
13+, libgnomekbd
14+, lcms2
15+, libpulseaudio
16+, alsaLib
17+, libcanberra-gtk3
18+, upower
19+, colord
20+, libgweather
21+, polkit
22+, gsettings-desktop-schemas
23+, geoclue2
24+, systemd
25+, libgudev
26+, libwacom
27+, libxslt
28+, libxml2
29+, networkmanager
30+, gnome-desktop
31+, geocode-glib
32+, docbook_xsl
33+, wrapGAppsHook
34+, python3
35+, tzdata
36+, nss
37+}:
538
639stdenv.mkDerivation rec {
7− name = "gnome-settings-daemon-${version}";
8− version = "3.30.2";
40+ pname = "gnome-settings-daemon";
41+ version = "3.32.0";
942
1043 src = fetchurl {
11− url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
44+ url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
45+ sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63";
1346 };
1447
1548 patches = [
@@ -19,13 +52,41 @@ stdenv.mkDerivation rec {
1952 })
2053 ];
2154
22− nativeBuildInputs = [ meson ninja pkgconfig perl gettext libxml2 libxslt docbook_xsl wrapGAppsHook python3 ];
55+ nativeBuildInputs = [
56+ meson
57+ ninja
58+ pkgconfig
59+ perl
60+ gettext
61+ libxml2
62+ libxslt
63+ docbook_xsl
64+ wrapGAppsHook
65+ python3
66+ ];
2367
2468 buildInputs = [
25− ibus gtk3 glib gsettings-desktop-schemas networkmanager
26− libnotify gnome-desktop lcms2 libXtst libxkbfile libpulseaudio alsaLib
27− libcanberra-gtk3 upower colord libgweather xkeyboard_config nss
28− polkit geocode-glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom
69+ gtk3
70+ glib
71+ gsettings-desktop-schemas
72+ networkmanager
73+ libnotify
74+ libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
75+ gnome-desktop
76+ lcms2
77+ libpulseaudio
78+ alsaLib
79+ libcanberra-gtk3
80+ upower
81+ colord
82+ libgweather
83+ nss
84+ polkit
85+ geocode-glib
86+ geoclue2
87+ systemd
88+ libgudev
89+ libwacom
2990 ];
3091
3192 mesonFlags = [
@@ -41,8 +102,8 @@ stdenv.mkDerivation rec {
41102
42103 passthru = {
43104 updateScript = gnome3.updateScript {
44− packageName = "gnome-settings-daemon";
45− attrPath = "gnome3.gnome-settings-daemon";
105+ packageName = pname;
106+ attrPath = "gnome3.${pname}";
46107 };
47108 };
48109
pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "gnome-shell-extensions-${version}";
6− version = "3.30.1";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "1grxn4f5x754r172wmnf0h0xpy69afmj359zsj1rwgqlzw4i4c5p";
10+ sha256 = "0wzrivhp6vs4754yldza38gkhkhah35rdncb3c3hxhhyv9fr3pl5";
1111 };
1212
1313 passthru = {
pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch+5−18
@@ -1,24 +1,11 @@
1−From f72924a59d4a30daefccf84526bd854ebbe65ac8 Mon Sep 17 00:00:00 2001
2−From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
3−Date: Tue, 3 Apr 2018 14:13:12 +0200
4−Subject: [PATCH] Fix gmenu typelib path
5−
6−---
7− extensions/apps-menu/extension.js | 2 ++
8− 1 file changed, 2 insertions(+)
9−
10−diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
11−index 5b38213..d706f64 100644
121--- a/extensions/apps-menu/extension.js
132+++ b/extensions/apps-menu/extension.js
14−@@ -1,5 +1,7 @@
3+@@ -1,6 +1,8 @@
154 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
5+ /* exported init enable disable */
166
177+imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@');
188+
19− const Atk = imports.gi.Atk;
20− const DND = imports.ui.dnd;
21− const GMenu = imports.gi.GMenu;
22−--
23−2.16.2
24−
9+ const {
10+ Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
11+ } = imports.gi;
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+2−2
@@ -14,11 +14,11 @@ let
1414
1515in stdenv.mkDerivation rec {
1616 name = "gnome-shell-${version}";
17− version = "3.30.2";
17+ version = "3.32.0";
1818
1919 src = fetchurl {
2020 url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
21− sha256 = "0kacd4w9lc5finsvs170i7827qkxwd1ddj0g2giizwffpjdjqqr2";
21+ sha256 = "1djkswsv3fhb3lf2w77bbl6z2kvji29cfxbwh5gqvyykwwx87y92";
2222 };
2323
2424 LANG = "en_US.UTF-8";
pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch+4−4
@@ -11,12 +11,12 @@
1111 null);
1212--- a/js/ui/status/keyboard.js
1313+++ b/js/ui/status/keyboard.js
14−@@ -1019,7 +1019,7 @@
14+@@ -1059,7 +1059,7 @@ class InputSourceIndicator extends PanelMenu.Button {
15+ let description = xkbLayout;
1516 if (xkbVariant.length > 0)
1617 description = description + '\t' + xkbVariant;
1718
1819- Util.spawn(['gkbd-keyboard-display', '-l', description]);
1920+ Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
20− },
21−
22− _containerGetPreferredWidth: function(container, for_height, alloc) {
21+ }
22+ });
pkgs/desktops/gnome-3/core/gnome-software/default.nix+5−3
@@ -1,15 +1,15 @@
11{ stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
22, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd
3−, gtk3, gsettings-desktop-schemas, gnome-desktop
3+, gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts, hicolor-icon-theme
44, json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils }:
55
66stdenv.mkDerivation rec {
77 name = "gnome-software-${version}";
8− version = "3.30.6";
8+ version = "3.32.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "00lh1ifgcs888i0774qdz2pzd5vnzcc5kvx20lcmgk37vvf0qqsl";
12+ sha256 = "19hrvkyavrfrhs19ii4ky5bpzsijiyq2vcxb5s4xk13xv8ys2151";
1313 };
1414
1515 patches = [
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
2222 nativeBuildInputs = [
2323 meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43
2424 valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection
25+ hicolor-icon-theme # for setup-hook
2526 ];
2627
2728 buildInputs = [
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
2930 gsettings-desktop-schemas gnome-desktop
3031 gspell json-glib libsecret ostree
3132 polkit flatpak fwupd
33+ libxmlb gnome-online-accounts
3234 ];
3335
3436 mesonFlags = [
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "gnome-system-monitor-${version}";
7− version = "3.30.0";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "0g0y565bjs6bdszrnxsz1f7hcm1x59i3mfvplysirh7nz3hpz888";
11+ sha256 = "1qvpibyhdcmscyja5a5i5nc206vmqw8xp3p8mgcignyi5njc805g";
1212 };
1313
1414 doCheck = true;
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "gnome-terminal-${version}";
7− version = "3.30.2";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "0f2y76gs72sw5l5lkkkvxzsvvwm0sg83h7nl8lk5kz1v1rrc47vb";
11+ sha256 = "1p4m2k63caprxmwf8d5ycpzkv3yj7146hhvnbjnr9dkl95bl41r4";
1212 };
1313
1414 buildInputs = [
pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-user-docs-${version}";
5− version = "3.30.2";
5+ version = "3.32.0";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
9− sha256 = "1pgsrvd79rqxa183wsmzh422y2zsg7fl5hskgc0s87jsc8b57fkg";
9+ sha256 = "0lqbhhihxkflwckm3b8dgq62rjljkzdghcc4k4ym7n2hyc304vxy";
1010 };
1111
1212 passthru = {
pkgs/desktops/gnome-3/core/gnome-user-share/default.nix+45−27
@@ -1,25 +1,30 @@
1−{ stdenv, intltool, fetchurl, apacheHttpd, nautilus
2−, pkgconfig, gtk3, glib, libxml2, systemd, adwaita-icon-theme
3−, wrapGAppsHook, itstool, libnotify, libtool, mod_dnssd
4−, gnome3, librsvg, gdk_pixbuf, file, libcanberra-gtk3 }:
1+{ stdenv
2+, gettext
3+, fetchurl
4+, apacheHttpd
5+, nautilus
6+, pkgconfig
7+, gtk3
8+, glib
9+, libxml2
10+, systemd
11+, wrapGAppsHook
12+, itstool
13+, libnotify
14+, mod_dnssd
15+, gnome3
16+, libcanberra-gtk3
17+}:
518
619stdenv.mkDerivation rec {
7− name = "gnome-user-share-${version}";
8− version = "3.28.0";
20+ pname = "gnome-user-share";
21+ version = "3.32.0.1";
922
1023 src = fetchurl {
11− url = "mirror://gnome/sources/gnome-user-share/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09";
24+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
25+ sha256 = "16w6n0cjyzp8vln3zspvab8jhjprpvs88xc9x7bvigg0wry74945";
1326 };
1427
15− passthru = {
16− updateScript = gnome3.updateScript { packageName = "gnome-user-share"; attrPath = "gnome3.gnome-user-share"; };
17− };
18−
19− doCheck = true;
20−
21− NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
22−
2328 preConfigure = ''
2429 sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \
2530 -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \
@@ -29,22 +34,35 @@ stdenv.mkDerivation rec {
2934 configureFlags = [
3035 "--with-httpd=${apacheHttpd.out}/bin/httpd"
3136 "--with-modules-path=${apacheHttpd.dev}/modules"
32− "--with-systemduserunitdir=$(out)/etc/systemd/user"
33− "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0"
37+ "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user"
38+ "--with-nautilusdir=${placeholder ''out''}/lib/nautilus/extensions-3.0"
39+ ];
40+
41+ nativeBuildInputs = [
42+ pkgconfig
43+ gettext
44+ itstool
45+ libxml2
46+ wrapGAppsHook
3447 ];
3548
36− nativeBuildInputs = [ pkgconfig ];
3749 buildInputs = [
38− gtk3 glib intltool itstool libxml2 libtool
39− wrapGAppsHook file gdk_pixbuf adwaita-icon-theme librsvg
40− nautilus libnotify libcanberra-gtk3 systemd
50+ gtk3
51+ glib
52+ nautilus
53+ libnotify
54+ libcanberra-gtk3
55+ systemd
4156 ];
4257
43− postInstall = ''
44− mkdir -p $out/share/gsettings-schemas/$name
45− mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
46− glib-compile-schemas "$out/share/gsettings-schemas/$name/glib-2.0/schemas"
47− '';
58+ doCheck = true;
59+
60+ passthru = {
61+ updateScript = gnome3.updateScript {
62+ packageName = pname;
63+ attrPath = "gnome3.${pname}";
64+ };
65+ };
4866
4967 meta = with stdenv.lib; {
5068 homepage = https://help.gnome.org/users/gnome-user-share/3.8;
pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix+16−5
@@ -1,23 +1,29 @@
11{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection
2+, meson
3+, ninja
4+, python3
25 # just for passthru
36, gnome3 }:
47
58stdenv.mkDerivation rec {
69 name = "gsettings-desktop-schemas-${version}";
7− version = "3.28.1";
10+ version = "3.32.0";
811
912 src = fetchurl {
1013 url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq";
14+ sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d";
1215 };
1316
1417 passthru = {
1518 updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; };
1619 };
1720
21+ # meson installs the schemas to share/glib-2.0/schemas
22+ # We add the override file there too so it will be compiled and later moved by
23+ # glib's setup hook.
1824 preInstall = ''
19− mkdir -p $out/share/gsettings-schemas/${name}/glib-2.0/schemas
20− cat - > $out/share/gsettings-schemas/${name}/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF
25+ mkdir -p $out/share/glib-2.0/schemas
26+ cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF
2127 [org.gnome.desktop.background]
2228 picture-uri='''
2329
@@ -26,9 +32,14 @@ stdenv.mkDerivation rec {
2632 EOF
2733 '';
2834
35+ postPatch = ''
36+ chmod +x build-aux/meson/post-install.py
37+ patchShebangs build-aux/meson/post-install.py
38+ '';
39+
2940 buildInputs = [ glib gobject-introspection ];
3041
31− nativeBuildInputs = [ pkgconfig intltool ];
42+ nativeBuildInputs = [ pkgconfig python3 meson ninja ];
3243
3344 meta = with stdenv.lib; {
3445 maintainers = gnome3.maintainers;
pkgs/desktops/gnome-3/core/gucharmap/default.nix+5−5
@@ -7,17 +7,17 @@
77let
88 unicode-data = callPackage ./unicode-data.nix {};
99in stdenv.mkDerivation rec {
10− name = "gucharmap-${version}";
11− version = "11.0.3";
10+ pname = "gucharmap";
11+ version = "12.0.1";
1212
1313 outputs = [ "out" "lib" "dev" "devdoc" ];
1414
1515 src = fetchFromGitLab {
1616 domain = "gitlab.gnome.org";
1717 owner = "GNOME";
18− repo = "gucharmap";
18+ repo = pname;
1919 rev = version;
20− sha256 = "1a590nxy8jdf6zxh6jdsyvhxyaz94ixx3aa1pj7gicf1aqp26vnh";
20+ sha256 = "0si3ymyfzc5v7ly0dmcs3qgw2wp8cyasycq5hmcr8frl09lr6gkw";
2121 };
2222
2323 nativeBuildInputs = [
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
4545
4646 passthru = {
4747 updateScript = gnome3.updateScript {
48− packageName = "gucharmap";
48+ packageName = pname;
4949 };
5050 };
5151
pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix+7−7
@@ -1,31 +1,31 @@
11{ fetchurl, stdenv, gnome3 }:
22stdenv.mkDerivation rec {
33 name = "unicode-data-${version}";
4− version = "11.0.0";
4+ version = "12.0.0";
55 srcs = [
66 (fetchurl {
77 url = "http://www.unicode.org/Public/${version}/ucd/Blocks.txt";
8− sha256 = "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b";
8+ sha256 = "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1";
99 })
1010 (fetchurl {
1111 url = "http://www.unicode.org/Public/${version}/ucd/DerivedAge.txt";
12− sha256 = "0rlqqd0b1sqbzvrj29dwdizx8lyvrbfirsnn8za9lb53x5fml4gb";
12+ sha256 = "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6";
1313 })
1414 (fetchurl {
1515 url = "http://www.unicode.org/Public/${version}/ucd/NamesList.txt";
16− sha256 = "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8";
16+ sha256 = "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61";
1717 })
1818 (fetchurl {
1919 url = "http://www.unicode.org/Public/${version}/ucd/Scripts.txt";
20− sha256 = "1mbnvf97nwa3pvyzx9nd2wa94f8s0npg9740kic2p2ag7jmc1wz9";
20+ sha256 = "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx";
2121 })
2222 (fetchurl {
2323 url = "http://www.unicode.org/Public/${version}/ucd/UnicodeData.txt";
24− sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9";
24+ sha256 = "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap";
2525 })
2626 (fetchurl {
2727 url = "http://www.unicode.org/Public/${version}/ucd/Unihan.zip";
28− sha256 = "0cy8gxb17ksi5h4ysypk4c09z61am1svjrvg97hm5m5ccjfrs1vj";
28+ sha256 = "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf";
2929 })
3030 ];
3131 phases = "installPhase";
pkgs/desktops/gnome-3/core/mutter/default.nix+37−31
@@ -1,39 +1,25 @@
1−{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
1+{ fetchurl, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
22, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
3−, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
3+, ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
44, gsettings-desktop-schemas, glib, gtk3, gnome-desktop
5−, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
5+, geocode-glib, pipewire, libgudev, libwacom, xwayland, meson
6+, gnome-settings-daemon
7+, xorgserver
8+, python3
9+, wrapGAppsHook
10+}:
611
712stdenv.mkDerivation rec {
813 name = "mutter-${version}";
9− version = "3.30.2";
14+ version = "3.32.0";
1015
1116 src = fetchurl {
1217 url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "0qr3w480p31nbiad49213rj9rk6p9fl82a68pzznpz36p30dq96z";
18+ sha256 = "068zir5c1awmzb31gx94zjykv6c3xb1p5pch7860y3xlihha4s3n";
1419 };
1520
16− patches = [
17− # https://gitlab.gnome.org/GNOME/mutter/issues/270
18− # Fixes direction of the desktop switching animation when using workspace
19− # grid extension with desktops arranged horizontally.
20− (fetchpatch {
21− url = https://gitlab.gnome.org/GNOME/mutter/commit/92cccf53dfe9e077f1d61ac4f896fd391f8cb689.patch;
22− sha256 = "11vmypypjss50xg7hhdbqrxvgqlxx4lnwy59089qsfl3akg4kk2i";
23− })
24− ];
25−
26− configureFlags = [
27− "--with-x"
28− "--disable-static"
29− "--enable-remote-desktop"
30− "--enable-shape"
31− "--enable-sm"
32− "--enable-startup-notification"
33− "--enable-xsync"
34− "--enable-verbose-mode"
35− "--with-libcanberra"
36− "--with-xwayland-path=${xwayland}/bin/Xwayland"
21+ mesonFlags = [
22+ "-Dxwayland-path=${xwayland}/bin/Xwayland"
3723 ];
3824
3925 propagatedBuildInputs = [
@@ -41,19 +27,39 @@ stdenv.mkDerivation rec {
4127 libXtst
4228 ];
4329
44− nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
30+ nativeBuildInputs = [
31+ meson
32+ pkgconfig
33+ gettext
34+ ninja
35+ python3
36+ # for cvt command
37+ xorgserver
38+ wrapGAppsHook
39+ ];
4540
4641 buildInputs = [
4742 glib gobject-introspection gtk3 gsettings-desktop-schemas upower
4843 gnome-desktop cairo pango cogl clutter zenity libstartup_notification
4944 geocode-glib libinput libgudev libwacom
5045 libcanberra-gtk3 zenity xkeyboard_config libxkbfile
51− libxkbcommon pipewire
46+ libxkbcommon pipewire xwayland
47+ gnome-settings-daemon
5248 ];
5349
54− preFixup = ''
55− wrapProgram "$out/bin/mutter" \
56− --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
50+ patches = [
51+ (substituteAll {
52+ src = ./fix-paths.patch;
53+ inherit zenity;
54+ })
55+ ];
56+
57+ postPatch = ''
58+ patchShebangs src/backends/native/gen-default-modes.py
59+ '';
60+
61+ postInstall = ''
62+ ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
5763 '';
5864
5965 enableParallelBuilding = true;
pkgs/desktops/gnome-3/core/mutter/fix-paths.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/src/core/util.c b/src/core/util.c
2+index 57b73747d..f424cc81c 100644
3+--- a/src/core/util.c
4++++ b/src/core/util.c
5+@@ -636,7 +636,7 @@ meta_show_dialog (const char *type,
6+
7+ args = g_ptr_array_new ();
8+
9+- append_argument (args, "zenity");
10++ append_argument (args, "@zenity@/bin/zenity");
11+ append_argument (args, type);
12+
13+ if (display)
pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch+5−10
@@ -1,20 +1,15 @@
11--- a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
22+++ a/src/gnome-desktop/gnome-desktop-thumbnail-script.c
3−@@ -514,14 +514,11 @@ add_bwrap (GPtrArray *array,
3+@@ -536,9 +536,9 @@ add_bwrap (GPtrArray *array,
44 g_return_val_if_fail (script->s_infile != NULL, FALSE);
55
66 add_args (array,
77- "bwrap",
88- "--ro-bind", "/usr", "/usr",
9−- "--ro-bind", "/lib", "/lib",
10−- "--ro-bind", "/lib64", "/lib64",
9+- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
1110+ "@bubblewrap_bin@",
1211+ "--ro-bind", "@storeDir@", "@storeDir@",
1312+ "--ro-bind", "/run/current-system", "/run/current-system",
14− "--proc", "/proc",
15− "--dev", "/dev",
16−- "--symlink", "usr/bin", "/bin",
17−- "--symlink", "usr/sbin", "/sbin",
18− "--chdir", "/",
19− "--setenv", "GIO_USE_VFS", "local",
20− "--unshare-all",
13+ NULL);
14+
15+ /* These directories might be symlinks into /usr/... */
pkgs/desktops/gnome-3/core/nautilus/default.nix+4−4
@@ -2,18 +2,18 @@
22, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
33, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
44, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
5−, substituteAll, bubblewrap
5+, substituteAll, bubblewrap, gst_all_1
66}:
77
88let
99 pname = "nautilus";
10− version = "3.30.5";
10+ version = "3.32.0";
1111in stdenv.mkDerivation rec {
1212 name = "${pname}-${version}";
1313
1414 src = fetchurl {
1515 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
16− sha256 = "144r4py9b8w9ycsg6fggjg05kwvymh003qsb3h6apgpch5y3zgnv";
16+ sha256 = "1pnh32fal7dkwadga5savg1nv0zqnbakhk0hxr5726087i6y6ii2";
1717 };
1818
1919 nativeBuildInputs = [
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323
2424 buildInputs = [
2525 glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
26− tracker tracker-miners gexiv2 libseccomp bubblewrap
26+ tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base
2727 gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas
2828 ];
2929
pkgs/desktops/gnome-3/core/simple-scan/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "simple-scan-${version}";
7− version = "3.30.2";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "0dknvdjlnxrp9nxd3yr8wyjc4kv94nwglss8pr6rfvl4hnlly53i";
11+ sha256 = "1b1nspiwzgxan2b11n96ax0c2q93dz17m67z1krdsrzdkyhh4hnh";
1212 };
1313
1414 buildInputs = [
pkgs/desktops/gnome-3/core/sushi/default.nix+8−8
@@ -1,25 +1,25 @@
1−{ stdenv, fetchurl, pkgconfig, file, intltool, gobject-introspection, glib
2−, clutter-gtk, clutter-gst, gnome3, aspell, hspell, gtksourceview, gjs
1+{ stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib
2+, clutter-gtk, clutter-gst, gnome3, gtksourceview, gjs
33, webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1
4−, gdk_pixbuf, librsvg, gtk3, harfbuzz }:
4+, gdk_pixbuf, librsvg, gtk3, harfbuzz, ninja }:
55
66stdenv.mkDerivation rec {
77 name = "sushi-${version}";
8− version = "3.30.0";
8+ version = "3.32.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "0zpaiw5r734fky3zq95a6szwn7srbkpixajqg2xvdivhhx4mbnnj";
12+ sha256 = "0f1i8qp39gq749h90f7nwgrj4q6y55jnyh62n1v8hxvlk0b2wqnx";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig file intltool gobject-introspection wrapGAppsHook ];
15+ nativeBuildInputs = [
16+ pkgconfig meson ninja gettext gobject-introspection wrapGAppsHook
17+ ];
1618 buildInputs = [
1719 glib gtk3 gnome3.evince icu harfbuzz
1820 clutter-gtk clutter-gst gjs gtksourceview gdk_pixbuf
1921 librsvg libmusicbrainz5 webkitgtk
2022 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
21− # cannot find -laspell, -lhspell
22− aspell hspell
2323 ];
2424
2525 enableParallelBuilding = true;
pkgs/desktops/gnome-3/core/totem/default.nix+12−7
@@ -1,24 +1,22 @@
1−{ stdenv, fetchurl, meson, ninja, intltool, gst_all_1
1+{ stdenv, fetchurl, meson, ninja, gettext, gst_all_1
22, clutter-gtk, clutter-gst, python3Packages, shared-mime-info
33, pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser
44, wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins
55, libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas
6−, gdk_pixbuf, tracker, nautilus }:
6+, gdk_pixbuf, tracker, nautilus, xvfb_run }:
77
88stdenv.mkDerivation rec {
99 name = "totem-${version}";
10− version = "3.30.0";
10+ version = "3.32.0";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "0rahkybxbmxhlmrrgrzxny1xm7wycx7ib4blxp1i2l1q3i8s84b0";
14+ sha256 = "12iykwslvnpgmrm4bcchx5rzn2g4rl5r9s86n2001djn58yw6m6r";
1515 };
1616
1717 doCheck = true;
1818
19− NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
20−
21− nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool gobject-introspection wrapGAppsHook ];
19+ nativeBuildInputs = [ meson ninja vala pkgconfig gettext python3Packages.python itstool gobject-introspection wrapGAppsHook ];
2220 buildInputs = [
2321 gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins
2422 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
@@ -41,6 +39,13 @@ stdenv.mkDerivation rec {
4139 "-Denable-vala=no"
4240 ];
4341
42+ checkInputs = [ xvfb_run ];
43+
44+ checkPhase = ''
45+ xvfb-run -s '-screen 0 800x600x24' \
46+ ninja test
47+ '';
48+
4449 wrapPrefixVariables = [ "PYTHONPATH" ];
4550
4651 passthru = {
pkgs/desktops/gnome-3/core/tracker-miners/default.nix+3−2
@@ -8,11 +8,11 @@ let
88 pname = "tracker-miners";
99in stdenv.mkDerivation rec {
1010 name = "${pname}-${version}";
11− version = "2.1.5";
11+ version = "2.2.1";
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "1kdq7fk9c80ngg65p31pjdk4za0fq7nfhblqsma9alvkam5kvzgm";
15+ sha256 = "1xbjbd994jxhdan7227kzdnmiblfy0f1vnsws5l809ydgk58f0qr";
1616 };
1717
1818 nativeBuildInputs = [
@@ -64,6 +64,7 @@ in stdenv.mkDerivation rec {
6464 # TODO: tests do not like our sandbox
6565 "-Dfunctional_tests=false"
6666 "-Ddbus_services=${placeholder "out"}/share/dbus-1/services"
67+ "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user"
6768 ];
6869
6970 patches = [
pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch−22
@@ -1,25 +1,3 @@
1−--- a/meson.build
2−+++ b/meson.build
3−@@ -25,15 +25,15 @@
4− #
5− # This check acts as a guard to make sure we are being configured with the
6− # right prefix, among other things.
7−- tracker_store = find_program(join_paths(get_option('prefix'), get_option('libexecdir'), 'tracker-store'))
8−+ tracker_store = find_program(join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'libexec', 'tracker-store'))
9− tracker_store_path = tracker_store.path()
10−
11− # If we are building against an installed version of tracker core rather than
12− # having it as a subproject, these 'uninstalled' locations point to the actual
13− # installed locations.
14−- tracker_uninstalled_domain_rule = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'domain-ontologies', 'default.rule')
15−- tracker_uninstalled_nepomuk_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'ontologies', 'nepomuk')
16−- tracker_uninstalled_stop_words_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'stop-words', 'default.rule')
17−+ tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule')
18−+ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk')
19−+ tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule')
20− else
21− tracker_subproject = subproject('tracker',
22− default_options: [
231--- a/src/libtracker-miners-common/tracker-domain-ontology.c
242+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
253@@ -323,7 +323,7 @@
pkgs/desktops/gnome-3/core/tracker/default.nix+10−17
@@ -1,11 +1,12 @@
1−{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python2
1+{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python3
22, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
33, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
4−, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }:
4+, gnome3, icu, libuuid, networkmanager, libsoup, json-glib
5+, substituteAll}:
56
67let
78 pname = "tracker";
8− version = "2.1.6";
9+ version = "2.2.1";
910in stdenv.mkDerivation rec {
1011 name = "${pname}-${version}";
1112
@@ -13,13 +14,13 @@ in stdenv.mkDerivation rec {
1314
1415 src = fetchurl {
1516 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
16− sha256 = "143zapq50lggj3mpqg2y4rh1hgnkbn9vgvzpqxr7waiawsmx0awq";
17+ sha256 = "1zx2mlnsv6clgh0j50f0b94b7cf1al1j7bkcz8cr31a0fkkgkkhc";
1718 };
1819
1920 nativeBuildInputs = [
2021 meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobject-introspection
2122 gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales
22− python2 # for data-generators
23+ python3 # for data-generators
2324 ];
2425
2526 buildInputs = [
@@ -33,27 +34,19 @@ in stdenv.mkDerivation rec {
3334 "-Dsystemd_user_services=lib/systemd/user"
3435 # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
3536 "-Dfunctional_tests=false"
37+ "-Ddocs=true"
3638 ];
3739
3840 patches = [
39− # Always generate tracker-sparql.h in time
40− (fetchurl {
41− url = https://gitlab.gnome.org/GNOME/tracker/commit/3cbfaa5b374e615098e60eb4430f108b642ebe76.diff;
42− sha256 = "0smavzvsglpghggrcl8sjflki13nh7pr0jl2yv6ymbf5hr1c4dws";
41+ (substituteAll {
42+ src = ./fix-paths.patch;
43+ glib_dev = glib.dev;
4344 })
4445 ];
4546
4647 postPatch = ''
4748 patchShebangs utils/g-ir-merge/g-ir-merge
4849 patchShebangs utils/data-generators/cc/generate
49−
50− # make .desktop Exec absolute
51− patch -p0 <<END_PATCH
52− +++ src/tracker-store/tracker-store.desktop.in.in
53− @@ -4 +4 @@
54− -Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
55− +Exec=${glib.dev}/bin/gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
56− END_PATCH
5750 '';
5851
5952 postInstall = ''
pkgs/desktops/gnome-3/core/tracker/fix-paths.patchnew file+12
@@ -0,0 +1,12 @@
1+--- a/src/tracker-store/tracker-store.desktop.in
2++++ b/src/tracker-store/tracker-store.desktop.in
3+@@ -1,8 +1,8 @@
4+ [Desktop Entry]
5+ Name=Tracker Store
6+ Comment=Metadata database store and lookup manager
7+-Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
8++Exec=@glib_dev@/bin/gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
9+ Terminal=false
10+ Type=Application
11+ Categories=Utility;
12+ X-GNOME-Autostart-enabled=true
pkgs/desktops/gnome-3/core/yelp-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "yelp-tools-${version}";
5− version = "3.28.0";
5+ version = "3.32.0";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
9− sha256 = "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2";
9+ sha256 = "037fd6xpy3zab7j5p7c0vfc6c3nk6qs0prvz1hbilzc31p8l1pdz";
1010 };
1111
1212 passthru = {
pkgs/desktops/gnome-3/core/yelp-xsl/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "yelp-xsl-${version}";
6− version = "3.30.1";
6+ version = "3.32.1";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "0ffgp3ymcc11r9sdndliwwngljcy1mfqpfxsdfbm8rlcjg2k3vzw";
10+ sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya";
1111 };
1212
1313 passthru = {
pkgs/desktops/gnome-3/core/yelp/default.nix+4−4
@@ -1,18 +1,18 @@
1−{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
1+{ stdenv, gettext, fetchurl, webkitgtk, pkgconfig, gtk3, glib
22, gnome3, sqlite
33, itstool, libxml2, libxslt, gst_all_1
44, wrapGAppsHook }:
55
66stdenv.mkDerivation rec {
77 name = "yelp-${version}";
8− version = "3.30.0";
8+ version = "3.32.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "060a902j15k76fyhk8xfl38ipvrrcc0qd7nm2mcck4ifb45b0zv4";
12+ sha256 = "090klk2mhd87y5w228gd1ia1lvvxaj913lkvxzcb1apz8n0i8mm7";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
15+ nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ];
1616 buildInputs = [
1717 gtk3 glib webkitgtk sqlite
1818 libxml2 libxslt gnome3.yelp-xsl
pkgs/desktops/gnome-3/core/zenity/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "zenity-${version}";
6− version = "3.30.0";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "1wipnp46pd238z9ck5rsckbaw7yla6c936fswq5w94k4c6bgcplr";
10+ sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7";
1111 };
1212
1313 preBuild = ''
pkgs/desktops/gnome-3/default.nix+3−1
@@ -54,7 +54,7 @@ lib.makeScope pkgs.newScope (self: with self; {
5454 libsoup = pkgs.libsoup.override { gnomeSupport = true; };
5555 libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
5656 gnome3 = self // { recurseForDerivations = false; };
57− vala = pkgs.vala_0_42;
57+ vala = pkgs.vala_0_44;
5858 gegl_0_4 = pkgs.gegl_0_4.override { gtk = pkgs.gtk3; };
5959
6060# ISO installer
@@ -229,6 +229,8 @@ lib.makeScope pkgs.newScope (self: with self; {
229229
230230 glade = callPackage ./apps/glade { };
231231
232+ gnome-books = callPackage ./apps/gnome-books { };
233+
232234 gnome-boxes = callPackage ./apps/gnome-boxes { };
233235
234236 gnome-calendar = callPackage ./apps/gnome-calendar { };
pkgs/desktops/gnome-3/devtools/devhelp/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "devhelp-${version}";
7− version = "3.30.1";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "036sddvhs0blqpc2ixmjdl9vxynvkn5jpgn0jxr1fxcm4rh3q07a";
11+ sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq";
1212 };
1313
1414 nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ];
pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-devel-docs-${version}";
5− version = "3.30.2";
5+ version = "3.32.0";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
9− sha256 = "1sssxagf0aaiyld8731247qq74bnrnq4arr7mpjrg0j6gwdfgxia";
9+ sha256 = "0kxa74ijsahipvpm57cpkvgllyg1qqap3lkxxqn6rbys474c5371";
1010 };
1111
1212 passthru = {
pkgs/desktops/gnome-3/extensions/appindicator/default.nix+4−3
@@ -1,14 +1,14 @@
1−{ stdenv, fetchFromGitHub }:
1+{ stdenv, fetchFromGitHub, gnome3 }:
22
33stdenv.mkDerivation rec {
44 name = "gnome-shell-extension-appindicator-${version}";
5− version = "22";
5+ version = "28";
66
77 src = fetchFromGitHub {
88 owner = "Ubuntu";
99 repo = "gnome-shell-extension-appindicator";
1010 rev = "v${version}";
11− sha256 = "1gqw54d55hxjj2hh04p0dx2j40bhi4ck9hgwlz8f7j4v7r37z0qw";
11+ sha256 = "03sgb2xkb4lzp8pbb7g56q29y1r764qzpc0j4d4m1gi0sb39sxrl";
1212 };
1313
1414 # This package has a Makefile, but it's used for building a zip for
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
2828 description = "AppIndicator/KStatusNotifierItem support for GNOME Shell";
2929 license = licenses.gpl2Plus;
3030 maintainers = with maintainers; [ jonafato ];
31+ platforms = gnome3.gnome-shell.meta.platforms;
3132 homepage = https://github.com/Ubuntu/gnome-shell-extension-appindicator;
3233 };
3334}
pkgs/desktops/gnome-3/extensions/battery-status/default.nix+1
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
2121 meta = with stdenv.lib; {
2222 description = "Configurable lightweight battery charge indicator and autohider";
2323 license = licenses.gpl2;
24+ broken = true; # not compatable with latest GNOME
2425 maintainers = with maintainers; [ jonafato ];
2526 homepage = https://github.com/milliburn/gnome-shell-extension-battery_status;
2627 };
pkgs/desktops/gnome-3/extensions/caffeine/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-shell-extension-caffeine-${version}";
5− version = "unstable-2018-09-25";
5+ version = "unstable-2019-04-02";
66
77 src = fetchFromGitHub {
88 owner = "eonpatapon";
99 repo = "gnome-shell-extension-caffeine";
10− rev = "71b6392c53e063563602c3d919c0ec6a4c5c9733";
11− sha256 = "170zyxa41hvyi463as650nw3ygr297901inr3xslrhvjq1qacxri";
10+ rev = "a6b37dee108cddf50a0f0a19f0101854a75bf173";
11+ sha256 = "1j3q12j36v97551sjb0c8qc8zr7a7gmxibygczryfdfmwjzp6icl";
1212 };
1313
1414 uuid = "caffeine@patapon.info";
pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix+2−2
@@ -1,7 +1,7 @@
11{stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}:
22
33let
4− version = "10";
4+ version = "10.1";
55
66 inherit (python3.pkgs) python pygobject3 requests;
77in stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz";
12− sha256 = "1wp6qvcp758yfj8xlj15sk1d3jsb1p8136y8xxwpi9wfdjpzjs8j";
12+ sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban";
1313 };
1414
1515 nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ];
pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-shell-dash-to-dock-${version}";
5− version = "65";
5+ version = "66";
66
77 src = fetchFromGitHub {
88 owner = "micheleg";
99 repo = "dash-to-dock";
1010 rev = "extensions.gnome.org-v" + version;
11− sha256 = "0ln49l9s0yfl30pi77pz7xlmh63l9vjppi863kry5lay10dsvz47";
11+ sha256 = "04krl6rxlp1qc97psraf2kwin7h0mx4c7pnfpi7vhplmvasrwkfh";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-shell-dash-to-panel-${version}";
5− version = "16";
5+ version = "19";
66
77 src = fetchFromGitHub {
8− owner = "jderose9";
8+ owner = "home-sweet-gnome";
99 repo = "dash-to-panel";
1010 rev = "v${version}";
11− sha256 = "1gi2qfinafihax0j0rbs1k5nf6msdv86gzl2vfkc8s6gfkncv9bp";
11+ sha256 = "0r26ph6zq87kvglydv00rf24mshz7l4r38zf9niyp3mxyzz6rwys";
1212 };
1313
1414 buildInputs = [
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+6−6
@@ -1,16 +1,16 @@
1−{ stdenv, fetchFromGitHub, substituteAll, python3, openssl
1+{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, folks, gsound
22, meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook
33, glib, gtk3, at-spi2-core, upower, openssh, gnome3 }:
44
55stdenv.mkDerivation rec {
66 name = "gnome-shell-gsconnect-${version}";
7− version = "20";
7+ version = "21";
88
99 src = fetchFromGitHub {
1010 owner = "andyholmes";
1111 repo = "gnome-shell-extension-gsconnect";
1212 rev = "v${version}";
13− sha256 = "1x5lrb4hdw482hr5dh4ki0p1651w1s0ijs96vs65vrh15cd60h02";
13+ sha256 = "0ikkb2rly3h4qglswn15vs8f2kl727gpri5c9x3jiy27ylag7yav";
1414 };
1515
1616 patches = [
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
3434 glib # libgobject
3535 gtk3
3636 at-spi2-core # atspi
37− gnome3.folks # libfolks
37+ folks # libfolks
3838 gnome3.nautilus # TODO: this contaminates the package with nautilus and gnome-autoar typelibs but it is only needed for the extension
3939 gnome3.nautilus-python
40− gnome3.gsound
40+ gsound
4141 upower
4242 gnome3.caribou
4343 gnome3.gjs # for running daemon
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
7070 preFixup = ''
7171 # TODO: figure out why folks GIR does not contain shared-library attribute
7272 # https://github.com/NixOS/nixpkgs/issues/47226
73− gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.folks ]}")
73+ gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ folks ]}")
7474 '';
7575
7676 postFixup = ''
pkgs/desktops/gnome-3/extensions/icon-hider/default.nix+1
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
2121 meta = with stdenv.lib; {
2222 description = "Icon Hider is a GNOME Shell extension for managing status area items";
2323 license = licenses.bsd3;
24+ broken = true; # not compatable with latest GNOME
2425 maintainers = with maintainers; [ jonafato ];
2526 platforms = platforms.linux;
2627 homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider;
pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-shell-extensions-mediaplayer-${version}";
5− version = "3.5";
5+ version = "unstable-2019-03-21";
66
77 src = fetchFromGitHub {
88 owner = "JasonLG1979";
99 repo = "gnome-shell-extensions-mediaplayer";
10− rev = version;
11− sha256 = "0b8smid9vdybgs0601q9chlbgfm1rzrj3vmd3i6p2a5d1n4fyvsc";
10+ rev = "b382c98481fa421501684e2ff3eafc53971ef22b";
11+ sha256 = "01z2dml8dvl5sljw62g7x19mz02dz1g4gkmyp0h5bx49djcw1nnh";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix+1
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
2929 description = "Integrates maximized windows with the top panel";
3030 homepage = https://github.com/franglais125/no-title-bar;
3131 license = licenses.gpl2;
32+ broken = true; # https://github.com/franglais125/no-title-bar/issues/114
3233 maintainers = with maintainers; [ jonafato svsdep ];
3334 platforms = platforms.linux;
3435 };
pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-shell-extension-nohotcorner-${version}";
5− version = "18.0";
5+ version = "19.0";
66
77 src = fetchFromGitHub {
88 owner = "HROMANO";
99 repo = "nohotcorner";
1010 rev = "v${version}";
11− sha256 = "0vajiys93gs7fs9v6brgf8fplkmh28j103in3wq04l34cx5sqkks";
11+ sha256 = "059n4gyz7d686hknaifyjax8gygrda1xab5m15a09p98jdrdfdhi";
1212 };
1313
1414 # Taken from the extension download link at
pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-shell-extension-remove-dropdown-arrows-${version}";
5− version = "9";
5+ version = "11";
66
77 src = fetchFromGitHub {
88 owner = "mpdeimos";
99 repo = "gnome-shell-remove-dropdown-arrows";
1010 rev = "version/${version}";
11− sha256 = "1z9icxr75rd3cas28xjlmsbbd3j3sm1qvj6mp95jhfaqj821q665";
11+ sha256 = "1g99r9bpjdhab3xj74wkl40gdnaf2w51kswcr8mi6bq72n4wjxwh";
1212 };
1313
1414 # This package has a Makefile, but it's used for publishing and linting, not
pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-shell-extension-sound-output-device-chooser";
5− version = "unstable-2018-12-30";
5+ version = "unstable-2019-03-10";
66
77 src = fetchFromGitHub {
88 owner = "kgshank";
99 repo = "gse-sound-output-device-chooser";
10− rev = "3ec8aded413034e7943eb36ee509405873ccc575";
11− sha256 = "1svc3d3pr2j7fr0660a0zj2n320vld8zkkddf5iphbdwivmkrh3n";
10+ rev = "26c66da6795104802f3240bd9f5741f64367c8e7";
11+ sha256 = "153cdd0pip4nbpc2a9y1v3y7qivafv3wk296zqdamcjrd0p94nqz";
1212 };
1313
1414 dontBuild = true;
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix+1
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
3939 meta = with stdenv.lib; {
4040 description = "Display system informations in gnome shell status bar";
4141 license = licenses.gpl3Plus;
42+ broken = true; # GNOME 3.32 support WIP: https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/510
4243 maintainers = with maintainers; [ aneeshusa tiramiseb ];
4344 homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
4445 };
pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix+14−15
@@ -1,36 +1,35 @@
1−{ stdenv, substituteAll, fetchFromGitHub, taskwarrior }:
1+{ stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
22
33stdenv.mkDerivation rec {
44 name = "gnome-shell-extension-taskwhisperer-${version}";
5− version = "11";
5+ version = "12";
66
77 src = fetchFromGitHub {
88 owner = "cinatic";
99 repo = "taskwhisperer";
1010 rev = "v${version}";
11− sha256 = "1g1301rwnfg5jci78bjpmgxrn78ra80m1zp2inhfsm8jssr1i426";
11+ sha256 = "187p6p498dd258avsfqqsm322g58y75pc2wbhb4jpmm9insqm1bj";
1212 };
1313
14− buildInputs = [ taskwarrior ];
14+ nativeBuildInputs = [
15+ gettext
16+ ];
17+
18+ buildInputs = [
19+ taskwarrior
20+ ];
1521
1622 uuid = "taskwhisperer-extension@infinicode.de";
1723
18− installPhase = ''
19− mkdir -p $out/share/gnome-shell/extensions/${uuid}
20− cp *.js $out/share/gnome-shell/extensions/${uuid}
21− cp -r extra $out/share/gnome-shell/extensions/${uuid}
22− cp -r icons $out/share/gnome-shell/extensions/${uuid}
23− cp -r locale $out/share/gnome-shell/extensions/${uuid}
24− cp -r schemas $out/share/gnome-shell/extensions/${uuid}
25− cp metadata.json $out/share/gnome-shell/extensions/${uuid}
26− cp settings.ui $out/share/gnome-shell/extensions/${uuid}
27− cp stylesheet.css $out/share/gnome-shell/extensions/${uuid}
28− '';
24+ makeFlags = [
25+ "INSTALLBASE=${placeholder ''out''}/share/gnome-shell/extensions"
26+ ];
2927
3028 patches = [
3129 (substituteAll {
3230 src = ./fix-paths.patch;
3331 task = "${taskwarrior}/bin/task";
32+ shell = "${runtimeShell}";
3433 })
3534 ];
3635
pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch+47−29
@@ -1,22 +1,22 @@
1−diff --git a/extra/create.sh b/extra/create.sh
1+diff --git a/taskwhisperer-extension@infinicode.de/extra/create.sh b/taskwhisperer-extension@infinicode.de/extra/create.sh
22index a69e369..35d5ea1 100755
3−--- a/extra/create.sh
4−+++ b/extra/create.sh
3+--- a/taskwhisperer-extension@infinicode.de/extra/create.sh
4++++ b/taskwhisperer-extension@infinicode.de/extra/create.sh
55@@ -1 +1 @@
66-bash -c "task add $1"
77+bash -c "@task@ add $1"
8−diff --git a/extra/modify.sh b/extra/modify.sh
8+diff --git a/taskwhisperer-extension@infinicode.de/extra/modify.sh b/taskwhisperer-extension@infinicode.de/extra/modify.sh
99index 7964a26..8edd21b 100755
10−--- a/extra/modify.sh
11−+++ b/extra/modify.sh
10+--- a/taskwhisperer-extension@infinicode.de/extra/modify.sh
11++++ b/taskwhisperer-extension@infinicode.de/extra/modify.sh
1212@@ -1 +1 @@
1313-bash -c "task $1 modify $2"
1414+bash -c "@task@ $1 modify $2"
15−diff --git a/taskService.js b/taskService.js
16−index dea40d8..ff35a80 100644
17−--- a/taskService.js
18−+++ b/taskService.js
19−@@ -186,7 +186,7 @@ const TaskService = new Lang.Class({
15+diff --git a/taskwhisperer-extension@infinicode.de/taskService.js b/taskwhisperer-extension@infinicode.de/taskService.js
16+index ead7a12..aa36db4 100644
17+--- a/taskwhisperer-extension@infinicode.de/taskService.js
18++++ b/taskwhisperer-extension@infinicode.de/taskService.js
19+@@ -182,7 +182,7 @@ const TaskService = class TaskService {
2020
2121 let project = projectName ? "project:" + projectName : "";
2222
@@ -25,57 +25,75 @@ index dea40d8..ff35a80 100644
2525 let reader = new SpawnReader.SpawnReader();
2626
2727 let buffer = "";
28−@@ -227,7 +227,7 @@ const TaskService = new Lang.Class({
28+@@ -220,7 +220,7 @@ const TaskService = class TaskService {
2929 break;
3030 }
3131
3232- let shellProc = Gio.Subprocess.new(['task', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE);
3333+ let shellProc = Gio.Subprocess.new(['@task@', status, 'projects'], Gio.SubprocessFlags.STDOUT_PIPE);
3434
35− shellProc.wait_async(null, function(obj, result){
35+ shellProc.wait_async(null, function (obj, result) {
3636 let shellProcExited = true;
37−@@ -274,7 +274,7 @@ const TaskService = new Lang.Class({
37+@@ -261,7 +261,7 @@ const TaskService = class TaskService {
3838 return;
3939 }
4040
4141- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE);
4242+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'done'], Gio.SubprocessFlags.STDOUT_PIPE);
4343
44− shellProc.wait_async(null, function(obj, result){
44+ shellProc.wait_async(null, function (obj, result) {
4545 let shellProcExited = true;
46−@@ -307,7 +307,7 @@ const TaskService = new Lang.Class({
46+@@ -290,7 +290,7 @@ const TaskService = class TaskService {
4747 return;
4848 }
4949
5050- let shellProc = Gio.Subprocess.new(['task', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE);
5151+ let shellProc = Gio.Subprocess.new(['@task@', 'modify', taskID.toString(), 'status:pending'], Gio.SubprocessFlags.STDOUT_PIPE);
5252
53− shellProc.wait_async(null, function(obj, result){
53+ shellProc.wait_async(null, function (obj, result) {
5454 let shellProcExited = true;
55−@@ -339,7 +339,7 @@ const TaskService = new Lang.Class({
56− {
55+@@ -318,7 +318,7 @@ const TaskService = class TaskService {
56+ if (!taskID) {
5757 return;
5858 }
5959- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE);
6060+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'start'], Gio.SubprocessFlags.STDOUT_PIPE);
61− shellProc.wait_async(null, function(obj, result){
61+ shellProc.wait_async(null, function (obj, result) {
6262 let shellProcExited = true;
6363 shellProc.wait_finish(result);
64−@@ -369,7 +369,7 @@ const TaskService = new Lang.Class({
65− {
64+@@ -344,7 +344,7 @@ const TaskService = class TaskService {
65+ if (!taskID) {
6666 return;
6767 }
6868- let shellProc = Gio.Subprocess.new(['task', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE);
6969+ let shellProc = Gio.Subprocess.new(['@task@', taskID.toString(), 'stop'], Gio.SubprocessFlags.STDOUT_PIPE);
70− shellProc.wait_async(null, function(obj, result){
70+ shellProc.wait_async(null, function (obj, result) {
7171 let shellProcExited = true;
7272 shellProc.wait_finish(result);
73−@@ -468,7 +468,7 @@ const TaskService = new Lang.Class({
73+@@ -374,7 +374,7 @@ const TaskService = class TaskService {
74+ // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the
75+ // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de)
76+ // bypassing problem with own shell script
77+- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
78++ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/modify.sh', taskID.toString(), params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
7479
75− try
76− {
80+ shellProc.wait_async(null, function (obj, result) {
81+ let shellProcExited = true;
82+@@ -403,7 +403,7 @@ const TaskService = class TaskService {
83+ // FIXME: Gio.Subprocess: due to only passing string vector is allowed, it's not possible to directly pass the
84+ // input of the user to subprocess (why & how, if you can answer then please send msg to fh@infinicode.de)
85+ // bypassing problem with own shell script
86+- let shellProc = Gio.Subprocess.new(['/bin/sh', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
87++ let shellProc = Gio.Subprocess.new(['@shell@', EXTENSIONDIR + '/extra/create.sh', params], Gio.SubprocessFlags.STDOUT_PIPE + Gio.SubprocessFlags.STDERR_MERGE);
88+
89+ shellProc.wait_async(null, function (obj, result) {
90+ let shellProcExited = true;
91+@@ -432,7 +432,7 @@ const TaskService = class TaskService {
92+ let shellProc;
93+
94+ try {
7795- shellProc = Gio.Subprocess.new(['task', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE);
7896+ shellProc = Gio.Subprocess.new(['@task@', 'sync'], Gio.SubprocessFlags.STDOUT_PIPE);
79− }
80− catch(err)
81− {
97+ } catch (err) {
98+ onError(err);
99+ return;
pkgs/desktops/gnome-3/extensions/timepp/default.nix+4−4
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "gnome-shell-extension-timepp-${version}";
5− version = "2018.03.17";
5+ version = "unstable-2019-03-30";
66
77 src = fetchFromGitHub {
88 owner = "zagortenay333";
99 repo = "timepp__gnome";
10− rev = "440cf85dc68d9e6ba876793f13910ee6239622cf";
11− sha256 = "0idsqsii5rvynvj78w2j7xiiz9rrl3384m5mj6bf6rg8vprpfi8v";
10+ rev = "f90fb5573b37ac89fb57bf62e07d6d3bdb6a2c63";
11+ sha256 = "0p6rsbm6lf61vzly775qkwc2rcjjl38bkqdxnv4sccqmw2wwclnp";
1212 };
1313
1414 uuid = "timepp@zagortenay333";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 '';
1919
2020 meta = with stdenv.lib; {
21− description = " A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension.";
21+ description = "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension.";
2222 homepage = https://github.com/zagortenay333/timepp__gnome;
2323 license = licenses.gpl3;
2424 maintainers = with maintainers; [ svsdep ];
pkgs/desktops/gnome-3/games/aisleriot/default.nix+6−6
@@ -3,12 +3,12 @@
33, guile_2_0, libcanberra-gtk3 }:
44
55stdenv.mkDerivation rec {
6− name = "aisleriot-${version}";
7− version = "3.22.7";
6+ pname = "aisleriot";
7+ version = "3.22.8";
88
99 src = fetchurl {
10− url = "mirror://gnome/sources/aisleriot/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "1ysljnrlvzssgbhxcgb28n9k3l0rybxi5lkrm8pg6a4nspaw5mc4";
10+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11+ sha256 = "15pm39679ymxki07sb5nvhycz4z53zwbvascyp5wm4864bn98815";
1212 };
1313
1414 configureFlags = [
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121
2222 passthru = {
2323 updateScript = gnome3.updateScript {
24− packageName = "aisleriot";
25− attrPath = "gnome3.aisleriot";
24+ packageName = pname;
25+ attrPath = "gnome3.${pname}";
2626 };
2727 };
2828
pkgs/desktops/gnome-3/games/atomix/default.nix+2−2
@@ -3,13 +3,13 @@
33
44let
55 pname = "atomix";
6− version = "3.30.0.1";
6+ version = "3.32.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 = "0hvr36m8ixa172zblv29fga1cn9yb84zqbisb21msfkwia2pabw3";
12+ sha256 = "0qxmdrmqsxpfv6w0l557jsjbd7cpdf3jni5mdhnsr4h2n8knf7m0";
1313 };
1414
1515 nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
pkgs/desktops/gnome-3/games/five-or-more/default.nix+7−4
@@ -1,16 +1,19 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook
2−, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3 }:
2+, librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }:
33
44stdenv.mkDerivation rec {
55 name = "five-or-more-${version}";
6− version = "3.30.0";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "00d729p251kh96624i7qg2370r5mxwafs016i6hy01vsr71jzb9x";
10+ sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn";
1111 };
1212
13− nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook ];
13+ nativeBuildInputs = [
14+ meson ninja pkgconfig gettext itstool libxml2 python3 wrapGAppsHook
15+ vala
16+ ];
1417 buildInputs = [
1518 gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme
1619 ];
pkgs/desktops/gnome-3/games/four-in-a-row/default.nix+13−4
@@ -1,18 +1,27 @@
11{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
2−, gettext, itstool, libcanberra-gtk3, librsvg, libxml2 }:
2+, gettext, meson, libcanberra-gtk3, librsvg, itstool, vala
3+, python3, ninja, desktop-file-utils }:
34
45stdenv.mkDerivation rec {
56 name = "four-in-a-row-${version}";
6− version = "3.28.0";
7+ version = "3.32.0";
78
89 src = fetchurl {
910 url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k";
11+ sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl";
1112 };
1213
13− nativeBuildInputs = [ pkgconfig wrapGAppsHook gettext itstool libxml2 ];
14+ nativeBuildInputs = [
15+ pkgconfig wrapGAppsHook gettext meson itstool vala
16+ ninja python3 desktop-file-utils
17+ ];
1418 buildInputs = [ gtk3 libcanberra-gtk3 librsvg gnome3.adwaita-icon-theme ];
1519
20+ postPatch = ''
21+ chmod +x build-aux/meson_post_install.py
22+ patchShebangs build-aux/meson_post_install.py
23+ '';
24+
1625 passthru = {
1726 updateScript = gnome3.updateScript {
1827 packageName = "four-in-a-row";
pkgs/desktops/gnome-3/games/gnome-chess/default.nix+2−2
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 name = "gnome-chess-${version}";
6− version = "3.30.1";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "1gzdm6z54kxx06lh616g33klrp4dby2a68wxvjpsavdll28kgwgl";
10+ sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639";
1111 };
1212
1313 nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
pkgs/desktops/gnome-3/games/gnome-klotski/default.nix+16−5
@@ -1,19 +1,30 @@
11{ stdenv, fetchurl, pkgconfig, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils
2−, glib, librsvg, libxml2, intltool, itstool, libgee, libgnome-games-support }:
2+, glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support
3+, meson, ninja, python3
4+}:
35
46let
57 pname = "gnome-klotski";
6− version = "3.22.3";
8+ version = "3.32.0";
79in stdenv.mkDerivation rec {
810 name = "${pname}-${version}";
911
1012 src = fetchurl {
1113 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f";
14+ sha256 = "1p4s15gxj6gasix22z9vlx2yrx196fvcxr6v6qrl569idfgjbi72";
1315 };
1416
15− nativeBuildInputs = [ pkgconfig vala wrapGAppsHook intltool itstool libxml2 appstream-glib desktop-file-utils ];
16− buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support gnome3.adwaita-icon-theme ];
17+ nativeBuildInputs = [
18+ pkgconfig vala meson ninja python3 wrapGAppsHook
19+ gettext itstool libxml2 appstream-glib desktop-file-utils
20+ gnome3.adwaita-icon-theme
21+ ];
22+ buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ];
23+
24+ postPatch = ''
25+ chmod +x build-aux/meson_post_install.py
26+ patchShebangs build-aux/meson_post_install.py
27+ '';
1728
1829 passthru = {
1930 updateScript = gnome3.updateScript {
pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix+17−6
@@ -1,25 +1,36 @@
11{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
2−, librsvg, intltool, itstool, libxml2 }:
2+, librsvg, gettext, itstool, libxml2
3+, meson, ninja, python3, vala, desktop-file-utils
4+}:
35
46stdenv.mkDerivation rec {
57 name = "gnome-mahjongg-${version}";
6− version = "3.22.0";
8+ version = "3.32.0";
79
810 src = fetchurl {
911 url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218";
12+ sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j";
1113 };
1214
1315 passthru = {
1416 updateScript = gnome3.updateScript { packageName = "gnome-mahjongg"; attrPath = "gnome3.gnome-mahjongg"; };
1517 };
1618
17− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [
20+ meson ninja vala python3 desktop-file-utils
21+ pkgconfig gnome3.adwaita-icon-theme
22+ libxml2 itstool gettext wrapGAppsHook
23+ ];
1824 buildInputs = [
19− gtk3 wrapGAppsHook librsvg intltool itstool libxml2
20− gnome3.adwaita-icon-theme
25+ gtk3 librsvg
2126 ];
2227
28+ postPatch = ''
29+ chmod +x data/meson_post_install.py
30+ patchShebangs data/meson_post_install.py
31+ '';
32+
33+
2334 meta = with stdenv.lib; {
2435 homepage = https://wiki.gnome.org/Apps/Mahjongg;
2536 description = "Disassemble a pile of tiles by removing matching pairs";
pkgs/desktops/gnome-3/games/gnome-mines/default.nix+9−6
@@ -1,22 +1,25 @@
11{ stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkgconfig, gnome3, gtk3, wrapGAppsHook
2−, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee }:
2+, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }:
33
44stdenv.mkDerivation rec {
55 name = "gnome-mines-${version}";
6− version = "3.30.1.1";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "08ddk400sg1g3q26gnm5mgv81vdqyix0yl7pd47p50vkc1w6f33z";
10+ sha256 = "13ia8a7bmdnp1281lwp8nvdqqkclvg1n3pw4bbr2dgsrsswfkscj";
1111 };
1212
1313 # gobject-introspection for finding vapi files
14− nativeBuildInputs = [ meson ninja vala gobject-introspection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ];
14+ nativeBuildInputs = [
15+ meson ninja vala gobject-introspection pkgconfig gettext itstool python3
16+ libxml2 wrapGAppsHook desktop-file-utils
17+ ];
1518 buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ];
1619
1720 postPatch = ''
18− chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file
19− patchShebangs data/meson_compile_gschema.py
21+ chmod +x build-aux/meson_post_install.py
22+ patchShebangs build-aux/meson_post_install.py
2023 '';
2124
2225 passthru = {
pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix+2−2
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 name = "gnome-nibbles-${version}";
7− version = "3.24.1";
7+ version = "3.31.3";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "19g44cnrb191v50bdvy2qkrfhvyfsahd0kx9hz95x9gkjfn2nn35";
11+ sha256 = "0wg0l3aghkxcwp74liw115qjzy6w18hn80mhsz4lrjpnbpaivi18";
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
pkgs/desktops/gnome-3/games/gnome-robots/default.nix+15−7
@@ -1,26 +1,34 @@
11{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
2−, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgnome-games-support
3−, libgee}:
2+, librsvg, libcanberra-gtk3, gettext, itstool, libxml2, libgnome-games-support
3+, libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }:
44
55stdenv.mkDerivation rec {
66 name = "gnome-robots-${version}";
7− version = "3.22.3";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk";
11+ sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh";
1212 };
1313
1414 passthru = {
1515 updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; };
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [
19+ pkgconfig meson ninja python3
20+ libxml2 wrapGAppsHook gettext itstool desktop-file-utils
21+ hicolor-icon-theme # For setup-hook
22+ ];
1923 buildInputs = [
20− gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3
21− libxml2 gnome3.adwaita-icon-theme libgnome-games-support libgee
24+ gtk3 librsvg libcanberra-gtk3 libgnome-games-support libgee adwaita-icon-theme
2225 ];
2326
27+ postPatch = ''
28+ chmod +x build-aux/meson_post_install.py
29+ patchShebangs build-aux/meson_post_install.py
30+ '';
31+
2432 meta = with stdenv.lib; {
2533 homepage = https://wiki.gnome.org/Apps/Robots;
2634 description = "Avoid the robots and make them crash into each other";
pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+4−4
@@ -3,19 +3,19 @@
33
44stdenv.mkDerivation rec {
55 name = "gnome-sudoku-${version}";
6− version = "3.30.0";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "1xy986s51jnrcqwan2hy4bjdg6797yr9s7gxx2z2q4j4gkx3qa1f";
10+ sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l";
1111 };
1212
1313 nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
1414 buildInputs = [ gtk3 libgee json-glib qqwing ];
1515
1616 postPatch = ''
17− chmod +x post_install.py # patchShebangs requires executable file
18− patchShebangs post_install.py
17+ chmod +x build-aux/post_install.py
18+ patchShebangs build-aux/post_install.py
1919 '';
2020
2121 passthru = {
pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+11−6
@@ -1,23 +1,28 @@
11{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
2−, librsvg, libcanberra-gtk3, intltool, itstool, libxml2 }:
2+, librsvg, libcanberra-gtk3, gettext, itstool, libxml2
3+, meson, ninja, vala, python3, desktop-file-utils
4+}:
35
46stdenv.mkDerivation rec {
57 name = "gnome-taquin-${version}";
6− version = "3.30.0";
8+ version = "3.32.0";
79
810 src = fetchurl {
911 url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "0qijv7wyrjlj56m79la4k7m00712v2m1m994vfx43x3v4isxidgp";
12+ sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm";
1113 };
1214
1315 passthru = {
1416 updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; };
1517 };
1618
17− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [
20+ pkgconfig wrapGAppsHook meson ninja python3
21+ gettext itstool libxml2 vala desktop-file-utils
22+ ];
1823 buildInputs = [
19− gtk3 wrapGAppsHook librsvg libcanberra-gtk3
20− intltool itstool libxml2 gnome3.adwaita-icon-theme
24+ gtk3 librsvg libcanberra-gtk3
25+ gnome3.adwaita-icon-theme
2126 ];
2227
2328 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix+15−5
@@ -1,24 +1,34 @@
11{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
2−, libxml2, intltool, itstool }:
2+, libxml2, gettext, itstool, meson, ninja, python3
3+, vala, desktop-file-utils
4+}:
35
46stdenv.mkDerivation rec {
57 name = "gnome-tetravex-${version}";
6− version = "3.22.0";
8+ version = "3.32.0";
79
810 src = fetchurl {
911 url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d";
12+ sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl";
1113 };
1214
1315 passthru = {
1416 updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; };
1517 };
1618
17− nativeBuildInputs = [ pkgconfig ];
19+ nativeBuildInputs = [
20+ wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme
21+ pkgconfig gettext meson ninja python3 vala desktop-file-utils
22+ ];
1823 buildInputs = [
19− gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.adwaita-icon-theme
24+ gtk3
2025 ];
2126
27+ postPatch = ''
28+ chmod +x build-aux/meson_post_install.py
29+ patchShebangs build-aux/meson_post_install.py
30+ '';
31+
2232 meta = with stdenv.lib; {
2333 homepage = https://wiki.gnome.org/Apps/Tetravex;
2434 description = "Complete the puzzle by matching numbered tiles";
pkgs/desktops/gnome-3/games/hitori/default.nix+48−12
@@ -1,25 +1,61 @@
1−{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
2−, libxml2, intltool, itstool }:
1+{ stdenv
2+, fetchurl
3+, meson
4+, ninja
5+, pkgconfig
6+, gnome3
7+, glib
8+, gtk3
9+, cairo
10+, wrapGAppsHook
11+, libxml2
12+, python3
13+, gettext
14+, itstool
15+, desktop-file-utils
16+, adwaita-icon-theme
17+}:
318
419stdenv.mkDerivation rec {
5− name = "hitori-${version}";
6− version = "3.22.4";
20+ pname = "hitori";
21+ version = "3.31.92";
722
823 src = fetchurl {
9− url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3";
24+ url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
25+ sha256 = "0m2w3zz6v1bsd1fn78ab79d72ywd9vq60rziazsblxsi4qy9dva5";
1126 };
1227
13− passthru = {
14− updateScript = gnome3.updateScript { packageName = "hitori"; attrPath = "gnome3.hitori"; };
15− };
28+ nativeBuildInputs = [
29+ meson
30+ ninja
31+ pkgconfig
32+ gettext
33+ itstool
34+ desktop-file-utils
35+ libxml2
36+ python3
37+ wrapGAppsHook
38+ ];
1639
17− nativeBuildInputs = [ pkgconfig ];
1840 buildInputs = [
19− gtk3 wrapGAppsHook intltool itstool libxml2
20− gnome3.adwaita-icon-theme
41+ glib
42+ gtk3
43+ cairo
44+ adwaita-icon-theme
2145 ];
2246
47+ postPatch = ''
48+ chmod +x build-aux/meson_post_install.py
49+ patchShebangs build-aux/meson_post_install.py
50+ '';
51+
52+ passthru = {
53+ updateScript = gnome3.updateScript {
54+ packageName = pname;
55+ attrPath = "gnome3.${pname}";
56+ };
57+ };
58+
2359 meta = with stdenv.lib; {
2460 homepage = https://wiki.gnome.org/Apps/Hitori;
2561 description = "GTK+ application to generate and let you play games of Hitori";
pkgs/desktops/gnome-3/games/iagno/default.nix+9−4
@@ -1,16 +1,21 @@
11{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
2−, intltool, itstool, libcanberra-gtk3, libxml2, dconf }:
2+, intltool, itstool, libcanberra-gtk3, libxml2
3+, meson, ninja, python3, vala, desktop-file-utils
4+}:
35
46stdenv.mkDerivation rec {
57 name = "iagno-${version}";
6− version = "3.30.0";
8+ version = "3.32.0";
79
810 src = fetchurl {
911 url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "15skh7186gp0k1lvzpv0l7dsr7mhb57njc3wjbgjwixym67h2d1z";
12+ sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d";
1113 };
1214
13− nativeBuildInputs = [ pkgconfig wrapGAppsHook itstool libxml2 ];
15+ nativeBuildInputs = [
16+ meson ninja python3 vala desktop-file-utils
17+ pkgconfig wrapGAppsHook itstool libxml2
18+ ];
1419 buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ];
1520
1621 enableParallelBuilding = true;
pkgs/desktops/gnome-3/games/lightsoff/default.nix+7−8
@@ -4,25 +4,24 @@
44
55stdenv.mkDerivation rec {
66 name = "lightsoff-${version}";
7− version = "3.30.0";
7+ version = "3.32.0";
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "1cv5pkw0n8k5wb98ihx0z1z615w1wc09y884wk608wy40bgq46wp";
11+ sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f";
1212 };
1313
14− postPatch = ''
15− chmod +x meson_post_install.py # patchShebangs requires executable file
16− patchShebangs meson_post_install.py
17− sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
18− '';
19−
2014 nativeBuildInputs = [
2115 vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2
2216 meson ninja python3
2317 ];
2418 buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ];
2519
20+ postPatch = ''
21+ chmod +x build-aux/meson_post_install.py
22+ patchShebangs build-aux/meson_post_install.py
23+ '';
24+
2625 passthru = {
2726 updateScript = gnome3.updateScript {
2827 packageName = "lightsoff";
pkgs/desktops/gnome-3/games/quadrapassel/default.nix+12−6
@@ -1,21 +1,27 @@
11{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
2−, librsvg, libcanberra-gtk3
3−, intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }:
2+, librsvg, libcanberra-gtk3, libmanette
3+, gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook
4+, meson, ninja, python3, vala, desktop-file-utils
5+}:
46
57let
68 pname = "quadrapassel";
79in stdenv.mkDerivation rec {
810 name = "${pname}-${version}";
9− version = "3.22.0";
11+ version = "3.32.0";
1012
1113 src = fetchurl {
1214 url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55";
15+ sha256 = "1zhi1957knz9dm98drn2dh95mr33sdch590yddh1f8r6bzsfjvpy";
1416 };
1517
16− nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
18+ nativeBuildInputs = [
19+ meson ninja python3 vala desktop-file-utils
20+ pkgconfig gnome3.adwaita-icon-theme
21+ libxml2 itstool gettext wrapGAppsHook
22+ ];
1723 buildInputs = [
18− gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
24+ gtk3 gdk_pixbuf librsvg libmanette
1925 libcanberra-gtk3 clutter libxml2 clutter-gtk
2026 ];
2127
pkgs/desktops/gnome-3/games/swell-foop/default.nix+2−2
@@ -3,13 +3,13 @@
33
44let
55 pname = "swell-foop";
6− version = "3.30.0";
6+ version = "3.32.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 = "00h795clcyzch1sgcxflslv2q03vsz2j5xyy4ghbg6a6dgg8a0ax";
12+ sha256 = "0jpci3c1wyzbvsq86j30rcl166skhi2wf12001amfgh0dmmwipci";
1313 };
1414
1515 passthru = {
pkgs/desktops/gnome-3/games/tali/default.nix+15−7
@@ -1,24 +1,32 @@
11{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
2−, librsvg, intltool, itstool, libxml2, wrapGAppsHook }:
2+, librsvg, gettext, itstool, libxml2, wrapGAppsHook
3+, meson, ninja, python3, desktop-file-utils
4+}:
35
46stdenv.mkDerivation rec {
57 name = "tali-${version}";
6− version = "3.22.0";
8+ version = "3.32.0";
79
810 src = fetchurl {
911 url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b";
12+ sha256 = "0s5clkn0qm298mvphx1xdymg67w1p8vvgvypvs97k6lfjqijkx3v";
1113 };
1214
1315 passthru = {
1416 updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; };
1517 };
1618
17− nativeBuildInputs = [ pkgconfig ];
18− buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg
19− libxml2 itstool intltool wrapGAppsHook ];
19+ nativeBuildInputs = [
20+ meson ninja python3 desktop-file-utils
21+ pkgconfig gnome3.adwaita-icon-theme
22+ libxml2 itstool gettext wrapGAppsHook
23+ ];
24+ buildInputs = [ gtk3 gdk_pixbuf librsvg ];
2025
21− enableParallelBuilding = true;
26+ postPatch = ''
27+ chmod +x build-aux/meson_post_install.py
28+ patchShebangs build-aux/meson_post_install.py
29+ '';
2230
2331 meta = with stdenv.lib; {
2432 homepage = https://wiki.gnome.org/Apps/Tali;
pkgs/desktops/gnome-3/misc/geary/default.nix+11−18
@@ -1,27 +1,18 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
1+{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
22, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
33, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
44, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
5−, xvfb_run, dbus, shared-mime-info, libunwind, glib-networking }:
5+, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking }:
66
77stdenv.mkDerivation rec {
88 pname = "geary";
9− version = "0.13.2";
9+ version = "3.32.0";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "1fp3zzgpkm1l4d0g5194wnriz2spxa9kgrgy98kvvffl7ac860kk";
13+ sha256 = "1mxlzkmwzg1fyf4r1izwnskm5z681c6hiby48n606n89gjcq565j";
1414 };
1515
16− patches = [
17− # gobject-introspection is not needed
18− # https://gitlab.gnome.org/GNOME/geary/merge_requests/138
19− (fetchpatch {
20− url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch;
21− sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk";
22− })
23− ];
24−
2516 nativeBuildInputs = [
2617 desktop-file-utils gettext itstool libxml2 meson ninja
2718 pkgconfig vala wrapGAppsHook python3
@@ -31,7 +22,7 @@ stdenv.mkDerivation rec {
3122 adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
3223 gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
3324 libgee libnotify libsecret sqlite webkitgtk glib-networking
34− libunwind
25+ libunwind folks
3526 ];
3627
3728 checkInputs = [ xvfb_run dbus ];
@@ -43,11 +34,8 @@ stdenv.mkDerivation rec {
4334 postPatch = ''
4435 chmod +x build-aux/post_install.py
4536 patchShebangs build-aux/post_install.py
46− '';
4737
48− preFixup = ''
49− # Add geary to path for geary-attach
50− gappsWrapperArgs+=(--prefix PATH : "$out/bin")
38+ chmod +x desktop/geary-attach
5139 '';
5240
5341 doCheck = true;
@@ -60,6 +48,11 @@ stdenv.mkDerivation rec {
6048 meson test -v --no-stdsplit
6149 '';
6250
51+ preFixup = ''
52+ # Add geary to path for geary-attach
53+ gappsWrapperArgs+=(--prefix PATH : "$out/bin")
54+ '';
55+
6356 passthru = {
6457 updateScript = gnome3.updateScript {
6558 packageName = pname;
pkgs/desktops/gnome-3/misc/gitg/default.nix+53−15
@@ -1,22 +1,42 @@
1−{ stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib
2−, json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection
3−, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme
4−, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret
5−, meson, ninja, python3
6− }:
1+{ stdenv
2+, fetchurl
3+, fetchpatch
4+, vala_0_42
5+, intltool
6+, pkgconfig
7+, gtk3
8+, glib
9+, json-glib
10+, wrapGAppsHook
11+, libpeas
12+, bash
13+, gobject-introspection
14+, libsoup
15+, gtksourceview
16+, gsettings-desktop-schemas
17+, adwaita-icon-theme
18+, gnome3
19+, gtkspell3
20+, shared-mime-info
21+, libgee
22+, libgit2-glib
23+, libsecret
24+, meson
25+, ninja
26+, python3
27+}:
728
8−let
29+stdenv.mkDerivation rec {
930 pname = "gitg";
1031 version = "3.30.1";
11−in stdenv.mkDerivation rec {
12− name = "${pname}-${version}";
1332
1433 src = fetchurl {
15− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
34+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1635 sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss";
1736 };
1837
1938 patches = [
39+ # Fix build with latest libgit2-glib
2040 (fetchpatch {
2141 url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch;
2242 sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw";
@@ -31,17 +51,35 @@ in stdenv.mkDerivation rec {
3151 substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash"
3252 '';
3353
34− doCheck = true;
54+ doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed
3555
3656 enableParallelBuilding = true;
3757
3858 buildInputs = [
39− gtk3 glib json-glib libgee libpeas libsoup
40− libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas
41− libsecret gobject-introspection adwaita-icon-theme
59+ adwaita-icon-theme
60+ glib
61+ gsettings-desktop-schemas
62+ gtk3
63+ gtksourceview
64+ gtkspell3
65+ json-glib
66+ libgee
67+ libgit2-glib
68+ libpeas
69+ libsecret
70+ libsoup
4271 ];
4372
44− nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ];
73+ nativeBuildInputs = [
74+ gobject-introspection
75+ intltool
76+ meson
77+ ninja
78+ pkgconfig
79+ python3
80+ vala_0_42 # fails build with 0.44, drop in >3.30.1
81+ wrapGAppsHook
82+ ];
4583
4684 preFixup = ''
4785 gappsWrapperArgs+=(
pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix+8−4
@@ -1,16 +1,20 @@
11{ stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, packagekit, polkit
2−, gtk3, systemd, wrapGAppsHook, desktop-file-utils }:
2+, gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }:
33
44stdenv.mkDerivation rec {
55 name = "gnome-packagekit-${version}";
6− version = "3.30.0";
6+ version = "3.32.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "1i1hf6833psnq174xm0gjlz5rbrkl8i512y47w7nk8mrrrc31b35";
10+ sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils ];
13+ nativeBuildInputs = [
14+ pkgconfig meson ninja gettext wrapGAppsHook desktop-file-utils
15+ hicolor-icon-theme # for setup-hook
16+ ];
17+
1418 buildInputs = [ gtk3 packagekit systemd polkit ];
1519
1620 postPatch = ''
pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+2−2
@@ -5,13 +5,13 @@
55
66let
77 pname = "gnome-tweaks";
8− version = "3.30.2";
8+ version = "3.32.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 = "0j63siy1i5pl2g6di1r9vjn54m9ahh42wj20j6689pza2lamay1z";
14+ sha256 = "037r35cw34ifcs676fq9n2v4mh1nkqx0qk474bznf18mr6r62h55";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/desktops/gnome-3/misc/gpaste/default.nix+3−3
@@ -1,13 +1,13 @@
1−{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter
1+{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter, fetchpatch
22, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobject-introspection }:
33
44stdenv.mkDerivation rec {
5− version = "3.30.2";
5+ version = "3.32.0";
66 name = "gpaste-${version}";
77
88 src = fetchurl {
99 url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
10− sha256 = "0vlbvv6rjxq7h9cl3ilndjk7d51ac1x7agj8k6a7bwjx8h1fr62x";
10+ sha256 = "1fvpl9vqmrr1w22hm0ybabn9pjfii5qj9ghnc2jzihgrn2h486v6";
1111 };
1212
1313 patches = [
pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch+13−31
@@ -1,6 +1,6 @@
11--- a/src/gnome-shell/extension.js
22+++ b/src/gnome-shell/extension.js
3−@@ -7,6 +7,8 @@
3+@@ -6,6 +6,8 @@
44
55 const Config = imports.misc.config;
66
@@ -11,45 +11,27 @@
1111 imports.gi.versions.GPaste = '1.0';
1212--- a/src/gnome-shell/prefs.js
1313+++ b/src/gnome-shell/prefs.js
14−@@ -7,6 +7,8 @@
14+@@ -6,6 +6,8 @@
1515
1616 const Gettext = imports.gettext;
1717
1818+imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@');
1919+
20− const GPaste = imports.gi.GPaste;
20+ const { GPaste } = imports.gi;
2121
2222 const ExtensionUtils = imports.misc.extensionUtils;
2323--- a/src/libgpaste/settings/gpaste-settings.c
2424+++ b/src/libgpaste/settings/gpaste-settings.c
25−@@ -22,6 +22,8 @@
26−
27− typedef struct
28− {
29−+ GSettingsSchemaSource *schema_source;
30−+ GSettingsSchema *schema;
31− GSettings *settings;
32− GSettings *shell_settings;
33−
34−@@ -919,6 +921,8 @@
25+@@ -1013,7 +1013,11 @@
26+ }
27+ else
3528 {
36− g_signal_handler_disconnect (settings, priv->c_signals[C_CHANGED]);
37− g_clear_object (&priv->settings);
38−+ g_settings_schema_unref (priv->schema);
39−+ g_settings_schema_source_unref (priv->schema_source);
29+- return g_settings_new (G_PASTE_SETTINGS_NAME);
30++ // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library
31++ GSettingsSchemaSource *schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL);
32++ g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE);
33++ g_settings_schema_source_unref (schema_source);
34++ return g_settings_new_full (schema, NULL, NULL);
4035 }
36+ }
4137
42− if (shell_settings)
43−@@ -1000,7 +1004,11 @@
44− g_paste_settings_init (GPasteSettings *self)
45− {
46− GPasteSettingsPrivate *priv = g_paste_settings_get_instance_private (self);
47−- GSettings *settings = priv->settings = g_settings_new (G_PASTE_SETTINGS_NAME);
48−+
49−+ // library used by introspection requires schemas but we cannot set XDG_DATA_DIRS for the library
50−+ GSettingsSchemaSource *schema_source = priv->schema_source = g_settings_schema_source_new_from_directory ("@gschemasCompiled@", NULL, FALSE, NULL);
51−+ priv->schema = g_settings_schema_source_lookup (schema_source, G_PASTE_SETTINGS_NAME, FALSE);
52−+ GSettings *settings = priv->settings = g_settings_new_full (priv->schema, NULL, NULL);
53−
54− priv->history_name = NULL;
55− priv->launch_ui = NULL;
pkgs/desktops/mate/libmatekbd/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, libxklavier }:
1+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk3, mate, libxklavier }:
22
33stdenv.mkDerivation rec {
44 name = "libmatekbd-${version}";
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
99 sha256 = "1l1zbphs4snswf4bkrwkk6gsmb44bdhymcfgaaspzbrcmw3y7hr1";
1010 };
1111
12+ patches = [
13+ # Fix build with glib 2.60 (TODO: remove after 1.22.0 update)
14+ (fetchpatch {
15+ url = https://github.com/mate-desktop/libmatekbd/commit/dc04e969dd61a2b1f82beae2d3c8ad105447812d.patch;
16+ sha256 = "1ps6mbj6hrm9djn4riya049w2cb0dknghysny8pafmvpkaqvckrb";
17+ })
18+ ];
19+
1220 nativeBuildInputs = [ pkgconfig intltool ];
1321
1422 buildInputs = [ gtk3 libxklavier ];
pkgs/desktops/pantheon/apps/elementary-photos/default.nix+9−1
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils
2−, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2
2+, gtk3, glib, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2, fetchpatch
33, granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3
44, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, gobject-introspection, elementary-icon-theme }:
55
@@ -66,6 +66,14 @@ stdenv.mkDerivation rec {
6666 "-Dplugins=false"
6767 ];
6868
69+ patches = [
70+ # Fix build against gexiv2 0.12
71+ (fetchpatch {
72+ url = "https://github.com/elementary/photos/commit/86df00ced674abb2ee430ea24422079cfabb314c.patch";
73+ sha256 = "0836fzja93w36jf7ldqypsmnqn46mwsl93q41m104zn8qm0wrkmy";
74+ })
75+ ];
76+
6977 postPatch = ''
7078 chmod +x meson/post_install.py
7179 patchShebangs meson/post_install.py
pkgs/desktops/pantheon/default.nix+1−3
@@ -133,9 +133,7 @@ lib.makeScope pkgs.newScope (self: with self; {
133133 # We're using ubuntu and elementary's patchset due to reasons
134134 # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614
135135 # Take note of "I am holding off on "fixing" this bug for as long as possible."
136− elementary-settings-daemon = callPackage ./services/elementary-settings-daemon {
137− inherit (gnome3) libgweather;
138− };
136+ elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { };
139137
140138 pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { };
141139
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix+57−19
@@ -1,23 +1,59 @@
1−{ fetchurl, fetchgit, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, perl, gettext, glib, libnotify, lcms2, libXtst
2−, libxkbfile, libpulseaudio, alsaLib, libcanberra-gtk3, upower, colord, libgweather, polkit
3−, geocode-glib, gtk3
4−, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libxml2, networkmanager
5−, docbook_xsl, wrapGAppsHook, python3, ibus, xkeyboard_config, tzdata, nss, pantheon, accountsservice }:
1+{ accountsservice
2+, alsaLib
3+, colord
4+, docbook_xsl
5+, fetchgit
6+, fetchurl
7+, geoclue2
8+, geocode-glib
9+, gettext
10+, glib
11+, gnome3
12+, gsettings-desktop-schemas
13+, gtk3
14+, lcms2
15+, libcanberra-gtk3
16+, libgnomekbd
17+, libgudev
18+, libgweather
19+, libnotify
20+, libpulseaudio
21+, libwacom
22+, libxml2
23+, libxslt
24+, meson
25+, networkmanager
26+, ninja
27+, nss
28+, pantheon
29+, perl
30+, pkgconfig
31+, polkit
32+, python3
33+, substituteAll
34+, systemd
35+, tzdata
36+, upower
37+, wrapGAppsHook
38+, stdenv
39+}:
640
741stdenv.mkDerivation rec {
842 pname = "elementary-settings-daemon";
9− version = "3.30.2";
43+ version = "3.32.0";
44+
45+ projectName = "gnome-settings-daemon";
1046
1147 src = fetchurl {
12− url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/gnome-settings-daemon-${version}.tar.xz";
13− sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12";
48+ url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz";
49+ sha256 = "15w3sn9qf1zqlmk8c93kgrh2a20s62m5yfizkp21m5ylrrd07f63";
1450 };
1551
1652 # Source for ubuntu's patchset
1753 src2 = fetchgit {
18− url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon";
54+ url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}";
1955 rev = "refs/tags/ubuntu/${version}-1ubuntu1";
20− sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c";
56+ sha256 = "0ayd50mr0pv2h4j1r1haf8y2hj8jv59vypa7lx8jis0llrm7s3yn";
2157 };
2258
2359 # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build.
@@ -33,7 +69,6 @@ stdenv.mkDerivation rec {
3369 "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch"
3470 "${patchPath}/correct_logout_action.patch"
3571 "${patchPath}/ubuntu-lid-close-suspend.patch"
36− "${patchPath}/revert-wacom-migration.patch"
3772 "${patchPath}/revert-gsettings-removals.patch"
3873 "${patchPath}/revert-mediakeys-dbus-interface-drop.patch"
3974 "${patchPath}/ubuntu_ibus_configs.patch"
@@ -60,6 +95,7 @@ stdenv.mkDerivation rec {
6095 done
6196
6297 # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8
98+ # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release)
6399 rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy-pantheon.desktop
64100 '';
65101
@@ -84,32 +120,34 @@ stdenv.mkDerivation rec {
84120 geocode-glib
85121 glib
86122 gnome3.gnome-desktop
87− gnome3.gsettings-desktop-schemas
123+ gsettings-desktop-schemas
88124 gtk3
89− ibus
90125 lcms2
91− libXtst
92126 libcanberra-gtk3
127+ libgnomekbd # for org.gnome.libgnomekbd.keyboard schema
93128 libgudev
94129 libgweather
95130 libnotify
96131 libpulseaudio
97− librsvg
98132 libwacom
99− libxkbfile
100133 networkmanager
101134 nss
102135 polkit
103− udev
136+ systemd
104137 upower
105− xf86_input_wacom
106− xkeyboard_config
107138 ];
108139
109140 mesonFlags = [
110141 "-Dudev_dir=${placeholder "out"}/lib/udev"
111142 ];
112143
144+ passthru = {
145+ updateScript = gnome3.updateScript {
146+ packageName = projectName;
147+ attrPath = "pantheon.${pname}";
148+ };
149+ };
150+
113151 meta = with stdenv.lib; {
114152 license = licenses.gpl2Plus;
115153 maintainers = pantheon.maintainers;
pkgs/desktops/plasma-5/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.2/ -A '*.tar.xz' )
1+WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.3/ )
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch+68−69
@@ -15,7 +15,7 @@ index 6a1a212..f03fd34 100644
1515@@ -4,11 +4,6 @@ add_subdirectory(ksyncdbusenv)
1616 add_subdirectory(waitforname)
1717 add_subdirectory(kcheckrunning)
18−
18+
1919-#FIXME: reconsider, looks fishy
2020-if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
2121- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${KDE_INSTALL_FULL_DATAROOTDIR}/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
@@ -45,7 +45,7 @@ index b68f0c6..a0ec214 100644
4545-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
4646+# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
4747 #
48−
48+
4949+if test "x$1" = x--failsafe; then
5050+ KDE_FAILSAFE=1 # General failsafe flag
5151+ KWIN_COMPOSE=N # Disable KWin's compositing
@@ -56,7 +56,7 @@ index b68f0c6..a0ec214 100644
5656 # When the X server dies we get a HUP signal from xinit. We must ignore it
5757 # because we still need to do some cleanup.
5858 trap 'echo GOT SIGHUP' HUP
59−
59+
6060-# Check if a Plasma session already is running and whether it's possible to connect to X
6161-kcheckrunning
6262+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -79,12 +79,12 @@ index b68f0c6..a0ec214 100644
7979+ echo "\$DISPLAY is not set or cannot connect to the X server."
8080+ exit 1
8181 fi
82−
82+
8383 # Boot sequence:
8484@@ -33,62 +42,143 @@ fi
8585 #
8686 # * Then ksmserver is started which takes control of the rest of the startup sequence
87−
87+
8888-if [ ${XDG_CONFIG_HOME} ]; then
8989- configDir=$XDG_CONFIG_HOME;
9090-else
@@ -122,7 +122,7 @@ index b68f0c6..a0ec214 100644
122122+ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
123123 fi
124124 sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg}
125−
125+
126126-# We need to create config folder so we can write startupconfigkeys
127127-mkdir -p $configDir
128128+@NIXPKGS_KBUILDSYCOCA5@
@@ -176,7 +176,7 @@ index b68f0c6..a0ec214 100644
176176+cursorSize=0
177177+EOF
178178+fi
179−
179+
180180 #This is basically setting defaults so we can use them with kstartupconfig5
181181-cat >$configDir/startupconfigkeys <<EOF
182182+cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF
@@ -190,7 +190,7 @@ index b68f0c6..a0ec214 100644
190190 kcmfonts General forceFontDPI 0
191191+kcmfonts General dontChangeAASettings true
192192 EOF
193−
193+
194194 # preload the user's locale on first start
195195-plasmalocalerc=$configDir/plasma-localerc
196196-test -f $plasmalocalerc || {
@@ -203,7 +203,7 @@ index b68f0c6..a0ec214 100644
203203 EOF
204204-}
205205+fi
206−
206+
207207 # export LC_* variables set by kcmshell5 formats into environment
208208 # so it can be picked up by QLocale and friends.
209209-exportformatssettings=$configDir/plasma-locale-settings.sh
@@ -214,7 +214,7 @@ index b68f0c6..a0ec214 100644
214214+if [ -r "$exportformatssettings" ]; then
215215+ . "$exportformatssettings"
216216+fi
217−
217+
218218 # Write a default kdeglobals file to set up the font
219219-kdeglobalsfile=$configDir/kdeglobals
220220-test -f $kdeglobalsfile || {
@@ -237,7 +237,7 @@ index b68f0c6..a0ec214 100644
237237 EOF
238238-}
239239+fi
240−
240+
241241-kstartupconfig5
242242-returncode=$?
243243-if test $returncode -ne 0; then
@@ -251,13 +251,13 @@ index b68f0c6..a0ec214 100644
251251+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
252252+ . "$XDG_CONFIG_HOME/startupconfig"
253253+fi
254−
254+
255255 #Do not sync any of this section with the wayland versions as there scale factors are
256256 #sent properly over wl_output
257257@@ -104,26 +194,33 @@ fi
258258 #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
259259 export QT_AUTO_SCREEN_SCALE_FACTOR=0
260−
260+
261261+#Set the QtQuickControls style to our own: for QtQuickControls1
262262+#it will fall back to Desktop, while it will use our own org.kde.desktop
263263+#for QtQuickControlsStyle and Kirigami
@@ -293,7 +293,7 @@ index b68f0c6..a0ec214 100644
293293+ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
294294 fi
295295 fi
296−
296+
297297-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
298298- xrdb -quiet -merge -nocpp <<EOF
299299+if [ "${kcmfonts_general_forcefontdpi:-0}" -ne 0 ]; then
@@ -303,7 +303,7 @@ index b68f0c6..a0ec214 100644
303303 fi
304304@@ -132,11 +229,11 @@ dl=$DESKTOP_LOCKED
305305 unset DESKTOP_LOCKED # Don't want it in the environment
306−
306+
307307 ksplash_pid=
308308-if test -z "$dl"; then
309309+if [ -z "$dl" ]; then
@@ -318,7 +318,7 @@ index b68f0c6..a0ec214 100644
318318@@ -145,27 +242,6 @@ if test -z "$dl"; then
319319 esac
320320 fi
321−
321+
322322-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
323323-# (where <config locations> correspond to the system and user's configuration
324324-# directory.
@@ -349,19 +349,19 @@ index b68f0c6..a0ec214 100644
349349 export KDE_FULL_SESSION
350350-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
351351+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
352−
352+
353353 KDE_SESSION_VERSION=5
354354 export KDE_SESSION_VERSION
355355-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
356356+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
357−
357+
358358-KDE_SESSION_UID=`id -ru`
359359+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru)
360360 export KDE_SESSION_UID
361−
361+
362362 XDG_CURRENT_DESKTOP=KDE
363363 export XDG_CURRENT_DESKTOP
364−
364+
365365+# Enforce xcb QPA. Helps switching between Wayland and X sessions.
366366+export QT_QPA_PLATFORM=xcb
367367+
@@ -404,7 +404,7 @@ index b68f0c6..a0ec214 100644
404404- xmessage -geometry 500x100 "Could not sync environment to dbus."
405405 exit 1
406406 fi
407−
407+
408408 # We set LD_BIND_NOW to increase the efficiency of kdeinit.
409409 # kdeinit unsets this variable before loading applications.
410410-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
@@ -416,10 +416,10 @@ index b68f0c6..a0ec214 100644
416416- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
417417 exit 1
418418 fi
419−
419+
420420-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
421421+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
422−
422+
423423 # finally, give the session control to the session manager
424424 # see kdebase/ksmserver for the description of the rest of the startup sequence
425425@@ -270,12 +367,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
@@ -445,10 +445,10 @@ index b68f0c6..a0ec214 100644
445445@@ -286,36 +387,36 @@ fi
446446 #Anything after here is logout
447447 #It is not called after shutdown/restart
448−
448+
449449-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
450450+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
451−
451+
452452-if test x"$wait_drkonqi"x = x"true"x ; then
453453+if [ x"$wait_drkonqi"x = x"true"x ]; then
454454 # wait for remaining drkonqi instances with timeout (in seconds)
@@ -471,18 +471,18 @@ index b68f0c6..a0ec214 100644
471471 fi
472472 done
473473 fi
474−
474+
475475 echo 'startkde: Shutting down...' 1>&2
476476 # just in case
477477-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
478478+if [ -n "$ksplash_pid" ]; then
479479+ kill "$ksplash_pid" 2>/dev/null
480480+fi
481−
481+
482482 # Clean up
483483-kdeinit5_shutdown
484484+@NIXPKGS_KDEINIT5_SHUTDOWN@
485−
485+
486486 unset KDE_FULL_SESSION
487487-xprop -root -remove KDE_FULL_SESSION
488488+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
@@ -490,7 +490,7 @@ index b68f0c6..a0ec214 100644
490490-xprop -root -remove KDE_SESSION_VERSION
491491+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
492492 unset KDE_SESSION_UID
493−
493+
494494 echo 'startkde: Done.' 1>&2
495495diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
496496index 1fe41c5..11757df 100644
@@ -502,12 +502,12 @@ index 1fe41c5..11757df 100644
502502-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
503503+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
504504 #
505−
505+
506506 # Boot sequence:
507507@@ -17,28 +17,26 @@
508508 #
509509 # * Then ksmserver is started which takes control of the rest of the startup sequence
510−
510+
511511-# We need to create config folder so we can write startupconfigkeys
512512-if [ ${XDG_CONFIG_HOME} ]; then
513513- configDir=$XDG_CONFIG_HOME;
@@ -517,7 +517,7 @@ index 1fe41c5..11757df 100644
517517+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
518518+ . "$XDG_CONFIG_HOME/startupconfig"
519519 fi
520−
520+
521521-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
522522-
523523-xrdb -quiet -merge -nocpp <<EOF
@@ -526,10 +526,10 @@ index 1fe41c5..11757df 100644
526526 Xft.dpi: $QT_WAYLAND_FORCE_DPI
527527 EOF
528528+fi
529−
529+
530530 dl=$DESKTOP_LOCKED
531531 unset DESKTOP_LOCKED # Don't want it in the environment
532−
532+
533533 ksplash_pid=
534534-if test -z "$dl"; then
535535+if [ -z "$dl" ]; then
@@ -557,19 +557,19 @@ index 1fe41c5..11757df 100644
557557- export GS_LIB
558558-fi
559559+@NIXPKGS_XSETROOT@ -cursor_name left_ptr
560−
560+
561561 echo 'startplasma: Starting up...' 1>&2
562−
562+
563563 # export our session variables to the Xwayland server
564564-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
565565-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
566566+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
567567+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
568−
568+
569569 # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
570570 if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then
571571@@ -90,16 +78,15 @@ fi
572−
572+
573573 # We set LD_BIND_NOW to increase the efficiency of kdeinit.
574574 # kdeinit unsets this variable before loading applications.
575575-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
@@ -581,19 +581,19 @@ index 1fe41c5..11757df 100644
581581- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
582582 exit 1
583583 fi
584−
584+
585585-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
586586+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
587−
587+
588588 # finally, give the session control to the session manager
589589 # see kdebase/ksmserver for the description of the rest of the startup sequence
590590@@ -125,19 +112,19 @@ fi
591591 #Anything after here is logout
592592 #It is not called after shutdown/restart
593−
593+
594594-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
595595+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
596−
596+
597597-if test x"$wait_drkonqi"x = x"true"x ; then
598598+if [ x"$wait_drkonqi"x = x"true"x ]; then
599599 # wait for remaining drkonqi instances with timeout (in seconds)
@@ -615,18 +615,18 @@ index 1fe41c5..11757df 100644
615615 break
616616 fi
617617@@ -146,15 +133,17 @@ fi
618−
618+
619619 echo 'startplasma: Shutting down...' 1>&2
620620 # just in case
621621-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
622622+if [ -n "$ksplash_pid" ]; then
623623+ "$ksplash_pid" 2>/dev/null
624624+fi
625−
625+
626626 # Clean up
627627-kdeinit5_shutdown
628628+@NIXPKGS_KDEINIT5_SHUTDOWN@
629−
629+
630630 unset KDE_FULL_SESSION
631631-xprop -root -remove KDE_FULL_SESSION
632632+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
@@ -634,7 +634,7 @@ index 1fe41c5..11757df 100644
634634-xprop -root -remove KDE_SESSION_VERSION
635635+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
636636 unset KDE_SESSION_UID
637−
637+
638638 echo 'startplasma: Done.' 1>&2
639639diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
640640index dcb473a..0988740 100644
@@ -646,7 +646,7 @@ index dcb473a..0988740 100644
646646-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
647647+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
648648 #
649−
649+
650650-# We need to create config folder so we can write startupconfigkeys
651651-if [ ${XDG_CONFIG_HOME} ]; then
652652- configDir=$XDG_CONFIG_HOME;
@@ -713,7 +713,7 @@ index dcb473a..0988740 100644
713713+EOF
714714 fi
715715 sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xdg}
716−
716+
717717-# We need to create config folder so we can write startupconfigkeys
718718-mkdir -p $configDir
719719+# Set the default GTK 3 theme
@@ -742,7 +742,7 @@ index dcb473a..0988740 100644
742742+cursorSize=0
743743+EOF
744744+fi
745−
745+
746746 #This is basically setting defaults so we can use them with kstartupconfig5
747747-cat >$configDir/startupconfigkeys <<EOF
748748+cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF
@@ -756,7 +756,7 @@ index dcb473a..0988740 100644
756756+kcmfonts General forceFontDPI 0
757757+kcmfonts General dontChangeAASettings true
758758 EOF
759−
759+
760760 # preload the user's locale on first start
761761-plasmalocalerc=$configDir/plasma-localerc
762762-test -f $plasmalocalerc || {
@@ -769,7 +769,7 @@ index dcb473a..0988740 100644
769769 EOF
770770-}
771771+fi
772−
772+
773773 # export LC_* variables set by kcmshell5 formats into environment
774774 # so it can be picked up by QLocale and friends.
775775-exportformatssettings=$configDir/plasma-locale-settings.sh
@@ -780,7 +780,7 @@ index dcb473a..0988740 100644
780780+if [ -r "$exportformatssettings" ]; then
781781+ . "$exportformatssettings"
782782+fi
783−
783+
784784 # Write a default kdeglobals file to set up the font
785785-kdeglobalsfile=$configDir/kdeglobals
786786-test -f $kdeglobalsfile || {
@@ -834,7 +834,7 @@ index dcb473a..0988740 100644
834834- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
835835- }
836836 fi
837−
837+
838838-kstartupconfig5
839839+@CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5
840840 returncode=$?
@@ -845,11 +845,11 @@ index dcb473a..0988740 100644
845845+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
846846+ . "$XDG_CONFIG_HOME/startupconfig"
847847+fi
848−
848+
849849 #Manually disable auto scaling because we are scaling above
850850 #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output
851851 export QT_AUTO_SCREEN_SCALE_FACTOR=0
852−
852+
853853-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
854854-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
855855- @EXPORT_XCURSOR_PATH@
@@ -859,7 +859,7 @@ index dcb473a..0988740 100644
859859+ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
860860+done
861861+export XCURSOR_PATH
862−
862+
863863- # TODO: is kapplymousetheme a core app?
864864+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
865865+if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
@@ -882,20 +882,20 @@ index dcb473a..0988740 100644
882882+ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
883883 fi
884884 fi
885−
885+
886886-if test "$kcmfonts_general_forcefontdpiwayland" -ne 0; then
887887+if [ "${kcmfonts_general_forcefontdpiwayland:-0}" -ne 0 ]; then
888888 export QT_WAYLAND_FORCE_DPI=$kcmfonts_general_forcefontdpiwayland
889889 else
890890 export QT_WAYLAND_FORCE_DPI=96
891891@@ -120,12 +176,12 @@ fi
892−
892+
893893 # Get a property value from org.freedesktop.locale1
894894 queryLocale1() {
895895- qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
896896+ @NIXPKGS_QDBUS@ --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
897897 }
898−
898+
899899 # Query whether org.freedesktop.locale1 is available. If it is, try to
900900 # set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly.
901901-if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
@@ -906,7 +906,7 @@ index dcb473a..0988740 100644
906906@@ -141,41 +197,10 @@ if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
907907 fi
908908 fi
909−
909+
910910-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
911911-# (where <config locations> correspond to the system and user's configuration
912912-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
@@ -930,7 +930,7 @@ index dcb473a..0988740 100644
930930-done
931931-
932932 echo 'startplasmacompositor: Starting up...' 1>&2
933−
933+
934934-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
935935-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
936936-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
@@ -949,16 +949,16 @@ index dcb473a..0988740 100644
949949@@ -212,7 +237,7 @@ export KDE_FULL_SESSION
950950 KDE_SESSION_VERSION=5
951951 export KDE_SESSION_VERSION
952−
952+
953953-KDE_SESSION_UID=`id -ru`
954954+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru)
955955 export KDE_SESSION_UID
956−
956+
957957 XDG_CURRENT_DESKTOP=KDE
958958@@ -221,20 +246,41 @@ export XDG_CURRENT_DESKTOP
959959 XDG_SESSION_TYPE=wayland
960960 export XDG_SESSION_TYPE
961−
961+
962962+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
963963+# (where <config locations> correspond to the system and user's configuration
964964+# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
@@ -1001,12 +1001,11 @@ index dcb473a..0988740 100644
10011001+ echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2
10021002+ exit 1
10031003 fi
1004−
1004+
10051005-@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma
10061006+@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@
1007−
1007+
10081008 echo 'startplasmacompositor: Shutting down...' 1>&2
1009−
1010−--
1011−2.19.2
10121009
1010+--
1011+2.19.2
pkgs/desktops/plasma-5/srcs.nix+180−180
@@ -3,363 +3,363 @@
33
44{
55 bluedevil = {
6− version = "5.15.2";
6+ version = "5.15.3";
77 src = fetchurl {
8− url = "${mirror}/stable/plasma/5.15.2/bluedevil-5.15.2.tar.xz";
9− sha256 = "1d6dq7kgxni7hj5cdfqlb2ff3ddy30a82w80nxfwshzp1xbdljzw";
10− name = "bluedevil-5.15.2.tar.xz";
8+ url = "${mirror}/stable/plasma/5.15.3/bluedevil-5.15.3.tar.xz";
9+ sha256 = "1vdij1ydrwj51nsf3ysmql3wy3y7ayipzrqgxwa52r9n49zckva0";
10+ name = "bluedevil-5.15.3.tar.xz";
1111 };
1212 };
1313 breeze = {
14− version = "5.15.2";
14+ version = "5.15.3";
1515 src = fetchurl {
16− url = "${mirror}/stable/plasma/5.15.2/breeze-5.15.2.tar.xz";
17− sha256 = "0m2fpcbi3fsj9a3j3ry7l7f38whm38mpprap86v40m4zcv3wcav8";
18− name = "breeze-5.15.2.tar.xz";
16+ url = "${mirror}/stable/plasma/5.15.3/breeze-5.15.3.tar.xz";
17+ sha256 = "0l7yngc32af7gdi8p68c8267bbzhfvpynqclq3il4fvaxc6vbq2b";
18+ name = "breeze-5.15.3.tar.xz";
1919 };
2020 };
2121 breeze-grub = {
22− version = "5.15.2";
22+ version = "5.15.3";
2323 src = fetchurl {
24− url = "${mirror}/stable/plasma/5.15.2/breeze-grub-5.15.2.tar.xz";
25− sha256 = "18rm4h395w8x3yrirl53402qiiz7yc4i3iw5ncmd0184jhl6n7z5";
26− name = "breeze-grub-5.15.2.tar.xz";
24+ url = "${mirror}/stable/plasma/5.15.3/breeze-grub-5.15.3.tar.xz";
25+ sha256 = "0ccx8yfxhc5r3kv7snv80wpz7h5a9l762iz1cx5sfjpmmq2jhi64";
26+ name = "breeze-grub-5.15.3.tar.xz";
2727 };
2828 };
2929 breeze-gtk = {
30− version = "5.15.2";
30+ version = "5.15.3";
3131 src = fetchurl {
32− url = "${mirror}/stable/plasma/5.15.2/breeze-gtk-5.15.2.tar.xz";
33− sha256 = "0fbxfsjyxjk9shrjiz5w9x3v5jk3f4csw2rryk7kdk5q1m5ppfjw";
34− name = "breeze-gtk-5.15.2.tar.xz";
32+ url = "${mirror}/stable/plasma/5.15.3/breeze-gtk-5.15.3.tar.xz";
33+ sha256 = "1rg323fyq0q07k00xi63csi0f3bwzi1cbm6srshqih0cnfgq69j4";
34+ name = "breeze-gtk-5.15.3.tar.xz";
3535 };
3636 };
3737 breeze-plymouth = {
38− version = "5.15.2";
38+ version = "5.15.3";
3939 src = fetchurl {
40− url = "${mirror}/stable/plasma/5.15.2/breeze-plymouth-5.15.2.tar.xz";
41− sha256 = "0n6pr4k9jc3ivi0dhrrfv9xhf0p4irxbpghx3m3b860jwmm5d4zh";
42− name = "breeze-plymouth-5.15.2.tar.xz";
40+ url = "${mirror}/stable/plasma/5.15.3/breeze-plymouth-5.15.3.tar.xz";
41+ sha256 = "0f654kys4xw2c84iblz2q2x53z4mb2javgngb1dr3jkafysr0h37";
42+ name = "breeze-plymouth-5.15.3.tar.xz";
4343 };
4444 };
4545 discover = {
46− version = "5.15.2";
46+ version = "5.15.3";
4747 src = fetchurl {
48− url = "${mirror}/stable/plasma/5.15.2/discover-5.15.2.tar.xz";
49− sha256 = "0v9wnsgqxa4vbvgdsgpm54hnw8dsxahapl42vkf0xjfx101f3y62";
50− name = "discover-5.15.2.tar.xz";
48+ url = "${mirror}/stable/plasma/5.15.3/discover-5.15.3.tar.xz";
49+ sha256 = "1b6mc81xr4wl29bjw95jm8k72j3hhn1ps8a5dvzanbslfx31hf1b";
50+ name = "discover-5.15.3.tar.xz";
5151 };
5252 };
5353 drkonqi = {
54− version = "5.15.2";
54+ version = "5.15.3";
5555 src = fetchurl {
56− url = "${mirror}/stable/plasma/5.15.2/drkonqi-5.15.2.tar.xz";
57− sha256 = "085dv4ga7gvycs470v594i5j8s55aygalx52fcbbncji8r1x0zdv";
58− name = "drkonqi-5.15.2.tar.xz";
56+ url = "${mirror}/stable/plasma/5.15.3/drkonqi-5.15.3.tar.xz";
57+ sha256 = "0y4bkrv7bx69hm4kbbd2jfjnccj99686s0k5lm4ldv3wvf66k4sx";
58+ name = "drkonqi-5.15.3.tar.xz";
5959 };
6060 };
6161 kactivitymanagerd = {
62− version = "5.15.2";
62+ version = "5.15.3";
6363 src = fetchurl {
64− url = "${mirror}/stable/plasma/5.15.2/kactivitymanagerd-5.15.2.tar.xz";
65− sha256 = "1bldpay46gww1m0087bdrl64paw2466mnnr10w3qv1c2g3w4aiky";
66− name = "kactivitymanagerd-5.15.2.tar.xz";
64+ url = "${mirror}/stable/plasma/5.15.3/kactivitymanagerd-5.15.3.tar.xz";
65+ sha256 = "1lz3mm0bli2w8xwr3n06ss7qqzm4clvs3d9hfydyf7xq03mszrym";
66+ name = "kactivitymanagerd-5.15.3.tar.xz";
6767 };
6868 };
6969 kde-cli-tools = {
70− version = "5.15.2";
70+ version = "5.15.3";
7171 src = fetchurl {
72− url = "${mirror}/stable/plasma/5.15.2/kde-cli-tools-5.15.2.tar.xz";
73− sha256 = "1b178szx0ansd9srkj1rzqcc1ijfvs92vg870plzqy4ygg94yc32";
74− name = "kde-cli-tools-5.15.2.tar.xz";
72+ url = "${mirror}/stable/plasma/5.15.3/kde-cli-tools-5.15.3.tar.xz";
73+ sha256 = "1praysa894m67kwy4xaqh354c0shwfyyrqf4n9wrfwwrchdw6ypg";
74+ name = "kde-cli-tools-5.15.3.tar.xz";
7575 };
7676 };
7777 kdecoration = {
78− version = "5.15.2";
78+ version = "5.15.3";
7979 src = fetchurl {
80− url = "${mirror}/stable/plasma/5.15.2/kdecoration-5.15.2.tar.xz";
81− sha256 = "1gyy55j0bs1adglqq8wjy284pdp3vm9bj51q7h7q7yz2khk8kc3r";
82− name = "kdecoration-5.15.2.tar.xz";
80+ url = "${mirror}/stable/plasma/5.15.3/kdecoration-5.15.3.tar.xz";
81+ sha256 = "1ymp6szphpnfvdnhg8n1wan76z1s5xw68xsmwm21zrjf8lmrwkdh";
82+ name = "kdecoration-5.15.3.tar.xz";
8383 };
8484 };
8585 kde-gtk-config = {
86− version = "5.15.2";
86+ version = "5.15.3";
8787 src = fetchurl {
88− url = "${mirror}/stable/plasma/5.15.2/kde-gtk-config-5.15.2.tar.xz";
89− sha256 = "07ng7nynmfn23zssbawn4xjnj8sqkqsdv1nv29pkhda82bpji5a4";
90− name = "kde-gtk-config-5.15.2.tar.xz";
88+ url = "${mirror}/stable/plasma/5.15.3/kde-gtk-config-5.15.3.tar.xz";
89+ sha256 = "1ysw26sfx2wyd79bkknvvcmg5s4b154iyds9c6wp8brmcn6ng3s8";
90+ name = "kde-gtk-config-5.15.3.tar.xz";
9191 };
9292 };
9393 kdeplasma-addons = {
94− version = "5.15.2";
94+ version = "5.15.3";
9595 src = fetchurl {
96− url = "${mirror}/stable/plasma/5.15.2/kdeplasma-addons-5.15.2.tar.xz";
97− sha256 = "0c1j9830n5vyqjmyclljkxhgmgyhhzm4ck9zm5cnjf1s5x9hqdly";
98− name = "kdeplasma-addons-5.15.2.tar.xz";
96+ url = "${mirror}/stable/plasma/5.15.3/kdeplasma-addons-5.15.3.tar.xz";
97+ sha256 = "071wnwxgywg6bqqgwmjyswai3k0n4c15lq8mspcy92kym3msqkrn";
98+ name = "kdeplasma-addons-5.15.3.tar.xz";
9999 };
100100 };
101101 kgamma5 = {
102− version = "5.15.2";
102+ version = "5.15.3";
103103 src = fetchurl {
104− url = "${mirror}/stable/plasma/5.15.2/kgamma5-5.15.2.tar.xz";
105− sha256 = "06qp20dnvqg0bcf09iwhwcqbkyz85z27cp811vg72nq6vqpd98sy";
106− name = "kgamma5-5.15.2.tar.xz";
104+ url = "${mirror}/stable/plasma/5.15.3/kgamma5-5.15.3.tar.xz";
105+ sha256 = "12cnrnmr2wp14afg6x438gm502514pk61mfr26cypvcd6azpc2my";
106+ name = "kgamma5-5.15.3.tar.xz";
107107 };
108108 };
109109 khotkeys = {
110− version = "5.15.2";
110+ version = "5.15.3";
111111 src = fetchurl {
112− url = "${mirror}/stable/plasma/5.15.2/khotkeys-5.15.2.tar.xz";
113− sha256 = "18hjlvvbnid6j77pnr515kglllsidx8dgrx5sbvy9myvsd47wlki";
114− name = "khotkeys-5.15.2.tar.xz";
112+ url = "${mirror}/stable/plasma/5.15.3/khotkeys-5.15.3.tar.xz";
113+ sha256 = "0gnkdl6kki8xph3787bacggapm4vbakj39y9kcjqvqrqxifp1ml5";
114+ name = "khotkeys-5.15.3.tar.xz";
115115 };
116116 };
117117 kinfocenter = {
118− version = "5.15.2";
118+ version = "5.15.3";
119119 src = fetchurl {
120− url = "${mirror}/stable/plasma/5.15.2/kinfocenter-5.15.2.tar.xz";
121− sha256 = "0wag0md22dvnz897s535qigsimmcis7i9fsngq1hbqz22rx7x5pw";
122− name = "kinfocenter-5.15.2.tar.xz";
120+ url = "${mirror}/stable/plasma/5.15.3/kinfocenter-5.15.3.tar.xz";
121+ sha256 = "0rhhrsp0fmgfsmrfv468l4xinyfyghf6921s1581sgg5fk9qhrwr";
122+ name = "kinfocenter-5.15.3.tar.xz";
123123 };
124124 };
125125 kmenuedit = {
126− version = "5.15.2";
126+ version = "5.15.3";
127127 src = fetchurl {
128− url = "${mirror}/stable/plasma/5.15.2/kmenuedit-5.15.2.tar.xz";
129− sha256 = "1xjnj40m86sdyna9xm5bj0m4mnmqrpkpg9gnhr1naqwqxaahvvyk";
130− name = "kmenuedit-5.15.2.tar.xz";
128+ url = "${mirror}/stable/plasma/5.15.3/kmenuedit-5.15.3.tar.xz";
129+ sha256 = "1s7bhpxiapmx496f3y3klmc9i2347fs25yhd2brg92jziw73jpab";
130+ name = "kmenuedit-5.15.3.tar.xz";
131131 };
132132 };
133133 kscreen = {
134− version = "5.15.2";
134+ version = "5.15.3";
135135 src = fetchurl {
136− url = "${mirror}/stable/plasma/5.15.2/kscreen-5.15.2.tar.xz";
137− sha256 = "1vzp98cjhpbp565rfa1id1pcyir4hagmrz020jjn0gb2dfk6wrsv";
138− name = "kscreen-5.15.2.tar.xz";
136+ url = "${mirror}/stable/plasma/5.15.3/kscreen-5.15.3.tar.xz";
137+ sha256 = "1izq1anl0r9ysmsdnc2ny7cx73xc190qbad59nrnlqcxrsplb68f";
138+ name = "kscreen-5.15.3.tar.xz";
139139 };
140140 };
141141 kscreenlocker = {
142− version = "5.15.2";
142+ version = "5.15.3";
143143 src = fetchurl {
144− url = "${mirror}/stable/plasma/5.15.2/kscreenlocker-5.15.2.tar.xz";
145− sha256 = "09b3zb95psg3gwg1lcnqsrw6llg7bdlq97zsg373gs4ljlmdgwms";
146− name = "kscreenlocker-5.15.2.tar.xz";
144+ url = "${mirror}/stable/plasma/5.15.3/kscreenlocker-5.15.3.tar.xz";
145+ sha256 = "0bglpgibrc8l6yi24pj4kja33mc02clgi1vbdvw1qpp65ixhpzna";
146+ name = "kscreenlocker-5.15.3.tar.xz";
147147 };
148148 };
149149 ksshaskpass = {
150− version = "5.15.2";
150+ version = "5.15.3";
151151 src = fetchurl {
152− url = "${mirror}/stable/plasma/5.15.2/ksshaskpass-5.15.2.tar.xz";
153− sha256 = "1nf8s8vdgbak8sys9fw53xfcjpy1hnq1jjyxfyw22fhz2qnx4a7p";
154− name = "ksshaskpass-5.15.2.tar.xz";
152+ url = "${mirror}/stable/plasma/5.15.3/ksshaskpass-5.15.3.tar.xz";
153+ sha256 = "1zrjc74srb4jp8sw6pi0ik2i4yxffvgv037d50yk1fif1xyvnf9s";
154+ name = "ksshaskpass-5.15.3.tar.xz";
155155 };
156156 };
157157 ksysguard = {
158− version = "5.15.2";
158+ version = "5.15.3";
159159 src = fetchurl {
160− url = "${mirror}/stable/plasma/5.15.2/ksysguard-5.15.2.tar.xz";
161− sha256 = "1n38kc9m7jkimxrh0lqff9zz82jap0qv69l3490zsl70pgbhgwdn";
162− name = "ksysguard-5.15.2.tar.xz";
160+ url = "${mirror}/stable/plasma/5.15.3/ksysguard-5.15.3.tar.xz";
161+ sha256 = "1nxgadymq45yn92cs08gfmv5krc2ylwgbn5qcc2aq6ryrrhrw89q";
162+ name = "ksysguard-5.15.3.tar.xz";
163163 };
164164 };
165165 kwallet-pam = {
166− version = "5.15.2";
166+ version = "5.15.3";
167167 src = fetchurl {
168− url = "${mirror}/stable/plasma/5.15.2/kwallet-pam-5.15.2.tar.xz";
169− sha256 = "12hjg6cwgh4h85hfyw3mdpci9p6s6h6z7i6s2hhnsvfr2zm6nq6z";
170− name = "kwallet-pam-5.15.2.tar.xz";
168+ url = "${mirror}/stable/plasma/5.15.3/kwallet-pam-5.15.3.tar.xz";
169+ sha256 = "1w3vf92k3k2084cflv4fwav16czc4vqg62gi8x1alri38ziyb793";
170+ name = "kwallet-pam-5.15.3.tar.xz";
171171 };
172172 };
173173 kwayland-integration = {
174− version = "5.15.2";
174+ version = "5.15.3";
175175 src = fetchurl {
176− url = "${mirror}/stable/plasma/5.15.2/kwayland-integration-5.15.2.tar.xz";
177− sha256 = "1j076lmkgm1m1ymrpkmzh7yq4sk8qv12ggrczb9ri2gimklghmav";
178− name = "kwayland-integration-5.15.2.tar.xz";
176+ url = "${mirror}/stable/plasma/5.15.3/kwayland-integration-5.15.3.tar.xz";
177+ sha256 = "0grb9fnk7pfgwzj3c9d11zl1j9jy9k6d4pw2n2fdrs02g3yg603h";
178+ name = "kwayland-integration-5.15.3.tar.xz";
179179 };
180180 };
181181 kwin = {
182− version = "5.15.2";
182+ version = "5.15.3.2";
183183 src = fetchurl {
184− url = "${mirror}/stable/plasma/5.15.2/kwin-5.15.2.tar.xz";
185− sha256 = "112xysqgffw718272praaym86kbbq01rwjf9w1sv3b8i1lbrfjfy";
186− name = "kwin-5.15.2.tar.xz";
184+ url = "${mirror}/stable/plasma/5.15.3/kwin-5.15.3.2.tar.xz";
185+ sha256 = "0iri6993zsxmrm7qnf76py7ihc27x9y741ar7g9fry8c8knmqyrw";
186+ name = "kwin-5.15.3.2.tar.xz";
187187 };
188188 };
189189 kwrited = {
190− version = "5.15.2";
190+ version = "5.15.3";
191191 src = fetchurl {
192− url = "${mirror}/stable/plasma/5.15.2/kwrited-5.15.2.tar.xz";
193− sha256 = "0inm1ry62p23ivad0k3p5cwk8hwirrk7incpx8znd755pr5905hy";
194− name = "kwrited-5.15.2.tar.xz";
192+ url = "${mirror}/stable/plasma/5.15.3/kwrited-5.15.3.tar.xz";
193+ sha256 = "0xhdmnfkpr35sks7k66s5cbq220yrmbn8ixcsdqwsgpji2sx4g7v";
194+ name = "kwrited-5.15.3.tar.xz";
195195 };
196196 };
197197 libkscreen = {
198− version = "5.15.2";
198+ version = "5.15.3";
199199 src = fetchurl {
200− url = "${mirror}/stable/plasma/5.15.2/libkscreen-5.15.2.tar.xz";
201− sha256 = "051carpksbh3n25cvd6i504jjjzmqzh0dj9p5chqmyfcp7m0lvm4";
202− name = "libkscreen-5.15.2.tar.xz";
200+ url = "${mirror}/stable/plasma/5.15.3/libkscreen-5.15.3.tar.xz";
201+ sha256 = "0fzfk8ga5qinsmag61l29cf92r7qm4nlb8hrhddyff7d7c7kr3vj";
202+ name = "libkscreen-5.15.3.tar.xz";
203203 };
204204 };
205205 libksysguard = {
206− version = "5.15.2";
206+ version = "5.15.3";
207207 src = fetchurl {
208− url = "${mirror}/stable/plasma/5.15.2/libksysguard-5.15.2.tar.xz";
209− sha256 = "058yajija7d7zvyv9vfyxbmj2y5amrv96mkbypqcdmzx69x5ig4c";
210− name = "libksysguard-5.15.2.tar.xz";
208+ url = "${mirror}/stable/plasma/5.15.3/libksysguard-5.15.3.tar.xz";
209+ sha256 = "05cfb51xcmxb8k2k14n2i5ysj47aism9yq7lk2rw216bsdp2mqnj";
210+ name = "libksysguard-5.15.3.tar.xz";
211211 };
212212 };
213213 milou = {
214− version = "5.15.2";
214+ version = "5.15.3";
215215 src = fetchurl {
216− url = "${mirror}/stable/plasma/5.15.2/milou-5.15.2.tar.xz";
217− sha256 = "0y7dbjhwbk7gnjpxsn2rddp3i3a02hfwiyx9070lm6am3lvlj8r8";
218− name = "milou-5.15.2.tar.xz";
216+ url = "${mirror}/stable/plasma/5.15.3/milou-5.15.3.tar.xz";
217+ sha256 = "1prq9mdrysz8ckf7n6sjfn3qc87135nj69v2jcayn9irb0k8wz01";
218+ name = "milou-5.15.3.tar.xz";
219219 };
220220 };
221221 oxygen = {
222− version = "5.15.2";
222+ version = "5.15.3";
223223 src = fetchurl {
224− url = "${mirror}/stable/plasma/5.15.2/oxygen-5.15.2.tar.xz";
225− sha256 = "1vrcdj61ii391swqxjbsfccmv854vg8zsbvjxb78a6fp6k11wivj";
226− name = "oxygen-5.15.2.tar.xz";
224+ url = "${mirror}/stable/plasma/5.15.3/oxygen-5.15.3.tar.xz";
225+ sha256 = "0a069imvw0khkbcih8zvx0i0ks99jkwis6p73n4846qz544f3dvb";
226+ name = "oxygen-5.15.3.tar.xz";
227227 };
228228 };
229229 plasma-browser-integration = {
230− version = "5.15.2";
230+ version = "5.15.3";
231231 src = fetchurl {
232− url = "${mirror}/stable/plasma/5.15.2/plasma-browser-integration-5.15.2.tar.xz";
233− sha256 = "00mp7wwk0jz7wrkii5yq58amsw54dyjcprp3w58phvydam2d3n79";
234− name = "plasma-browser-integration-5.15.2.tar.xz";
232+ url = "${mirror}/stable/plasma/5.15.3/plasma-browser-integration-5.15.3.tar.xz";
233+ sha256 = "1mhaa5z63gyd8j7zplmyicnibqsv1xhd9mxip6clhj5bfk8q9jar";
234+ name = "plasma-browser-integration-5.15.3.tar.xz";
235235 };
236236 };
237237 plasma-desktop = {
238− version = "5.15.2";
238+ version = "5.15.3.2";
239239 src = fetchurl {
240− url = "${mirror}/stable/plasma/5.15.2/plasma-desktop-5.15.2.tar.xz";
241− sha256 = "1axlkjmgf3chg9wl13j91vmfik0va8lngq45y0xr15lc88w6qms0";
242− name = "plasma-desktop-5.15.2.tar.xz";
240+ url = "${mirror}/stable/plasma/5.15.3/plasma-desktop-5.15.3.2.tar.xz";
241+ sha256 = "12pz0bin3j2f98k88nwmb271lr6v6w3l28li0iri2x8pk144vr91";
242+ name = "plasma-desktop-5.15.3.2.tar.xz";
243243 };
244244 };
245245 plasma-integration = {
246− version = "5.15.2";
246+ version = "5.15.3";
247247 src = fetchurl {
248− url = "${mirror}/stable/plasma/5.15.2/plasma-integration-5.15.2.tar.xz";
249− sha256 = "0glj6gsah96xbgcdijqjfpn7dj0yh05dvpvjhk6wmrb30z63hykx";
250− name = "plasma-integration-5.15.2.tar.xz";
248+ url = "${mirror}/stable/plasma/5.15.3/plasma-integration-5.15.3.tar.xz";
249+ sha256 = "08qw2ibl0j2nhsplc3b117vdc00bd2gn1q48nx0xy349bf64m735";
250+ name = "plasma-integration-5.15.3.tar.xz";
251251 };
252252 };
253253 plasma-nm = {
254− version = "5.15.2";
254+ version = "5.15.3";
255255 src = fetchurl {
256− url = "${mirror}/stable/plasma/5.15.2/plasma-nm-5.15.2.tar.xz";
257− sha256 = "12fahsqs54k8b5g9ipzisvaq1lmmgmyh3xbdixn1bxqdfdc50jax";
258− name = "plasma-nm-5.15.2.tar.xz";
256+ url = "${mirror}/stable/plasma/5.15.3/plasma-nm-5.15.3.tar.xz";
257+ sha256 = "1l9wh4hs2v0b9hdagcgl67z0w4amffakxczwy0nwymqzv0mxgqvz";
258+ name = "plasma-nm-5.15.3.tar.xz";
259259 };
260260 };
261261 plasma-pa = {
262− version = "5.15.2";
262+ version = "5.15.3";
263263 src = fetchurl {
264− url = "${mirror}/stable/plasma/5.15.2/plasma-pa-5.15.2.tar.xz";
265− sha256 = "1cw3c84spl2y6fzp0mn986xl7j60z28acga95x5zr2xiaig1p1q3";
266− name = "plasma-pa-5.15.2.tar.xz";
264+ url = "${mirror}/stable/plasma/5.15.3/plasma-pa-5.15.3.tar.xz";
265+ sha256 = "1lkhidd5b4mjn23mxcp2vfmxf7dwbk7y14svc4wy6xc1xg1pc125";
266+ name = "plasma-pa-5.15.3.tar.xz";
267267 };
268268 };
269269 plasma-sdk = {
270− version = "5.15.2";
270+ version = "5.15.3";
271271 src = fetchurl {
272− url = "${mirror}/stable/plasma/5.15.2/plasma-sdk-5.15.2.tar.xz";
273− sha256 = "0kq5h2zfg1f11cmfzmsn4vlfvj1jfkz1pnc67zgs7f70bap4k8zr";
274− name = "plasma-sdk-5.15.2.tar.xz";
272+ url = "${mirror}/stable/plasma/5.15.3/plasma-sdk-5.15.3.tar.xz";
273+ sha256 = "1qzh0yy4zql7a50ql9ghhvlfxjnbckflbgbzdyd7i9x3ml7s5saw";
274+ name = "plasma-sdk-5.15.3.tar.xz";
275275 };
276276 };
277277 plasma-tests = {
278− version = "5.15.2";
278+ version = "5.15.3";
279279 src = fetchurl {
280− url = "${mirror}/stable/plasma/5.15.2/plasma-tests-5.15.2.tar.xz";
281− sha256 = "1bsplrmvw73lsdiqwiznbxicyl36vf30mm34bfib8ii0rpx4cn2i";
282− name = "plasma-tests-5.15.2.tar.xz";
280+ url = "${mirror}/stable/plasma/5.15.3/plasma-tests-5.15.3.tar.xz";
281+ sha256 = "1z5vhw1dy1qks6w161yamn2fawrgkggv9mvvgpmljmy07qpafgkg";
282+ name = "plasma-tests-5.15.3.tar.xz";
283283 };
284284 };
285285 plasma-vault = {
286− version = "5.15.2";
286+ version = "5.15.3";
287287 src = fetchurl {
288− url = "${mirror}/stable/plasma/5.15.2/plasma-vault-5.15.2.tar.xz";
289− sha256 = "0gmch0s9vy72qbxk0bshxd2hmx6dwdad0pk29glpq7l3av3nirlp";
290− name = "plasma-vault-5.15.2.tar.xz";
288+ url = "${mirror}/stable/plasma/5.15.3/plasma-vault-5.15.3.tar.xz";
289+ sha256 = "1my9dnqz11frn07fk505pfi2nkf2d642jfgjklh5zfngjxy589jy";
290+ name = "plasma-vault-5.15.3.tar.xz";
291291 };
292292 };
293293 plasma-workspace = {
294− version = "5.15.2";
294+ version = "5.15.3";
295295 src = fetchurl {
296− url = "${mirror}/stable/plasma/5.15.2/plasma-workspace-5.15.2.tar.xz";
297− sha256 = "1ncd0mc3y8j3r8m9hrq3b07lmcccq7xz76b19rilba1a7qyd03az";
298− name = "plasma-workspace-5.15.2.tar.xz";
296+ url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-5.15.3.tar.xz";
297+ sha256 = "08irdg8divr45z53kr6b1mv4s2jakmq3r79g7df6ja9rb6py5f59";
298+ name = "plasma-workspace-5.15.3.tar.xz";
299299 };
300300 };
301301 plasma-workspace-wallpapers = {
302− version = "5.15.2";
302+ version = "5.15.3";
303303 src = fetchurl {
304− url = "${mirror}/stable/plasma/5.15.2/plasma-workspace-wallpapers-5.15.2.tar.xz";
305− sha256 = "00c19b3clgcjcvafmiwb2mdkkzcq8dvwpaqaajr54c3xn9fa5vss";
306− name = "plasma-workspace-wallpapers-5.15.2.tar.xz";
304+ url = "${mirror}/stable/plasma/5.15.3/plasma-workspace-wallpapers-5.15.3.tar.xz";
305+ sha256 = "0xgssv66ksljv8xkj20v2x1bppkyn8z17wa3hynwlcqxh2g4afq4";
306+ name = "plasma-workspace-wallpapers-5.15.3.tar.xz";
307307 };
308308 };
309309 plymouth-kcm = {
310− version = "5.15.2";
310+ version = "5.15.3";
311311 src = fetchurl {
312− url = "${mirror}/stable/plasma/5.15.2/plymouth-kcm-5.15.2.tar.xz";
313− sha256 = "1bkrkym2kjj7knhqzzcd6qhd1nmzvwah45hqvvnaja8kd82vjlzi";
314− name = "plymouth-kcm-5.15.2.tar.xz";
312+ url = "${mirror}/stable/plasma/5.15.3/plymouth-kcm-5.15.3.tar.xz";
313+ sha256 = "0fbr9nf263pc9inakhp901r58mlsm1jgw0xqp9fj08c9lj25z190";
314+ name = "plymouth-kcm-5.15.3.tar.xz";
315315 };
316316 };
317317 polkit-kde-agent = {
318− version = "1-5.15.2";
318+ version = "1-5.15.3";
319319 src = fetchurl {
320− url = "${mirror}/stable/plasma/5.15.2/polkit-kde-agent-1-5.15.2.tar.xz";
321− sha256 = "1i0hf77ms0k3q4r4cmfjcv2jnml5cig15biwfkh3jyafz8q8miha";
322− name = "polkit-kde-agent-1-5.15.2.tar.xz";
320+ url = "${mirror}/stable/plasma/5.15.3/polkit-kde-agent-1-5.15.3.tar.xz";
321+ sha256 = "07gl57h9zmagbw7v2sfksbcbqrfdhr8isfmpcw10rc4k2awlsysy";
322+ name = "polkit-kde-agent-1-5.15.3.tar.xz";
323323 };
324324 };
325325 powerdevil = {
326− version = "5.15.2";
326+ version = "5.15.3";
327327 src = fetchurl {
328− url = "${mirror}/stable/plasma/5.15.2/powerdevil-5.15.2.tar.xz";
329− sha256 = "0gl5wh8s7bmjprbv9gph83qhviv87pmdadrlrnbm5n1nwb1h7kd9";
330− name = "powerdevil-5.15.2.tar.xz";
328+ url = "${mirror}/stable/plasma/5.15.3/powerdevil-5.15.3.tar.xz";
329+ sha256 = "1f7ik3lh30irqzf0pgy59kkrsn4fkl8xwam1bikfm34bwzrsxb14";
330+ name = "powerdevil-5.15.3.tar.xz";
331331 };
332332 };
333333 sddm-kcm = {
334− version = "5.15.2";
334+ version = "5.15.3";
335335 src = fetchurl {
336− url = "${mirror}/stable/plasma/5.15.2/sddm-kcm-5.15.2.tar.xz";
337− sha256 = "1l8ma0kpqq7hcg4addm2c47w33dc12q8inii0aw4yq0syhqgzq9s";
338− name = "sddm-kcm-5.15.2.tar.xz";
336+ url = "${mirror}/stable/plasma/5.15.3/sddm-kcm-5.15.3.tar.xz";
337+ sha256 = "1mvp8p1k9csmn6h6iyk29yj1j4b4dfyd6j4v0v2ha1vdfjwjlsh2";
338+ name = "sddm-kcm-5.15.3.tar.xz";
339339 };
340340 };
341341 systemsettings = {
342− version = "5.15.2";
342+ version = "5.15.3.2";
343343 src = fetchurl {
344− url = "${mirror}/stable/plasma/5.15.2/systemsettings-5.15.2.tar.xz";
345− sha256 = "0rx3av1by04551y88y5f1lm1rvvxkxqjdjw04fjdnpx7qipv0l6l";
346− name = "systemsettings-5.15.2.tar.xz";
344+ url = "${mirror}/stable/plasma/5.15.3/systemsettings-5.15.3.2.tar.xz";
345+ sha256 = "0bqhff2s2qyz1x8nhrphnkyja0mhr7msf58cwdkscsl6lyamn2a2";
346+ name = "systemsettings-5.15.3.2.tar.xz";
347347 };
348348 };
349349 user-manager = {
350− version = "5.15.2";
350+ version = "5.15.3";
351351 src = fetchurl {
352− url = "${mirror}/stable/plasma/5.15.2/user-manager-5.15.2.tar.xz";
353− sha256 = "09xlnzdsk94p95s1zms8li0q0pv8z66hkla8ns27im21rrnrz6l0";
354− name = "user-manager-5.15.2.tar.xz";
352+ url = "${mirror}/stable/plasma/5.15.3/user-manager-5.15.3.tar.xz";
353+ sha256 = "18acg3xjcdhcwk3irsf1hgkwma9mn6msl6qwmf0slz1lydlrljs4";
354+ name = "user-manager-5.15.3.tar.xz";
355355 };
356356 };
357357 xdg-desktop-portal-kde = {
358− version = "5.15.2";
358+ version = "5.15.3";
359359 src = fetchurl {
360− url = "${mirror}/stable/plasma/5.15.2/xdg-desktop-portal-kde-5.15.2.tar.xz";
361− sha256 = "1zzy01lgznc7z3hz9yhbspx3zg8lala7zzcsxsly4jwx4666ixp4";
362− name = "xdg-desktop-portal-kde-5.15.2.tar.xz";
360+ url = "${mirror}/stable/plasma/5.15.3/xdg-desktop-portal-kde-5.15.3.tar.xz";
361+ sha256 = "10cmy4j54nkwrgibxdpx6d30g596ikvb1dqqmp1gvmzr570gmbi7";
362+ name = "xdg-desktop-portal-kde-5.15.3.tar.xz";
363363 };
364364 };
365365}
pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix+2−2
@@ -2,14 +2,14 @@
22 mkDerivation,
33 extra-cmake-modules, gettext, kdoctools, python,
44 kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
5− cups, pcre, pipewire
5+ cups, pcre, pipewire, kio
66}:
77
88mkDerivation {
99 name = "xdg-desktop-portal-kde";
1010 nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
1111 buildInputs = [
12− cups pcre pipewire
12+ cups pcre pipewire kio
1313 kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
1414 ];
1515}
pkgs/development/compilers/go/1.11.nix+6−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
1+{ stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
22, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
33, mailcap, runtimeShell
44, buildPackages, pkgsTargetTarget
@@ -30,13 +30,11 @@ in
3030
3131stdenv.mkDerivation rec {
3232 name = "go-${version}";
33− version = "1.11.5";
33+ version = "1.11.6";
3434
35− src = fetchFromGitHub {
36− owner = "golang";
37− repo = "go";
38− rev = "go${version}";
39− sha256 = "0d45057rc0bngq0nja847cagxji42qmlywr68f0dkg51im8nyr9y";
35+ src = fetchurl {
36+ url = "https://dl.google.com/go/go${version}.src.tar.gz";
37+ sha256 = "0cz1sdhxf9283p1p4jxb020pym0ncd0qlfh36r3hkv6bbm1a2vd9";
4038 };
4139
4240 # perl is used for testing go vet
@@ -126,7 +124,7 @@ stdenv.mkDerivation rec {
126124
127125 patches = [
128126 ./remove-tools-1.11.patch
129− ./ssl-cert-file-1.9.patch
127+ ./ssl-cert-file-1.12.1.patch
130128 ./remove-test-pie.patch
131129 ./creds-test.patch
132130 ./go-1.9-skip-flaky-19608.patch
pkgs/development/compilers/go/1.12.nix+3−2
@@ -30,11 +30,11 @@ in
3030
3131stdenv.mkDerivation rec {
3232 name = "go-${version}";
33− version = "1.12";
33+ version = "1.12.1";
3434
3535 src = fetchurl {
3636 url = "https://dl.google.com/go/go${version}.src.tar.gz";
37− sha256 = "1wl8kq21fbzmv4plnaza5acz8dhbaaq6smjzk3r6cf3l6qrkvi09";
37+ sha256 = "12l12mmgqvy3nbscy7sz83qj4m6iz5a322aq9sk45f7l9ml2gq8b";
3838 };
3939
4040 # perl is used for testing go vet
@@ -128,6 +128,7 @@ stdenv.mkDerivation rec {
128128
129129 patches = [
130130 ./remove-tools-1.11.patch
131+ ./ssl-cert-file-1.12.1.patch
131132 ./remove-test-pie.patch
132133 ./creds-test.patch
133134 ./go-1.9-skip-flaky-19608.patch
pkgs/development/compilers/go/ssl-cert-file-1.12.1.patchnew file+59
@@ -0,0 +1,59 @@
1+diff -Naur a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
2+--- a/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:33:55.920232337 -0700
3++++ b/src/crypto/x509/root_cgo_darwin.go 2019-03-15 11:34:53.323180897 -0700
4+@@ -270,11 +270,20 @@
5+ import "C"
6+ import (
7+ "errors"
8++ "io/ioutil"
9++ "os"
10+ "unsafe"
11+ )
12+
13+ func loadSystemRoots() (*CertPool, error) {
14+ roots := NewCertPool()
15++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
16++ data, err := ioutil.ReadFile(file)
17++ if err == nil {
18++ roots.AppendCertsFromPEM(data)
19++ return roots, nil
20++ }
21++ }
22+
23+ var data C.CFDataRef = 0
24+ var untrustedData C.CFDataRef = 0
25+diff -Naur a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
26+--- a/src/crypto/x509/root_darwin.go 2019-03-15 11:33:55.920232337 -0700
27++++ b/src/crypto/x509/root_darwin.go 2019-03-15 11:36:21.205123541 -0700
28+@@ -92,6 +92,14 @@
29+ verifyCh = make(chan rootCandidate)
30+ )
31+
32++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
33++ data, err := ioutil.ReadFile(file)
34++ if err == nil {
35++ roots.AppendCertsFromPEM(data)
36++ return roots, nil
37++ }
38++ }
39++
40+ // Using 4 goroutines to pipe into verify-cert seems to be
41+ // about the best we can do. The verify-cert binary seems to
42+ // just RPC to another server with coarse locking anyway, so
43+diff -Naur a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
44+--- a/src/crypto/x509/root_unix.go 2019-03-15 11:33:55.920232337 -0700
45++++ b/src/crypto/x509/root_unix.go 2019-03-15 11:37:15.737326340 -0700
46+@@ -38,6 +38,13 @@
47+
48+ func loadSystemRoots() (*CertPool, error) {
49+ roots := NewCertPool()
50++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
51++ data, err := ioutil.ReadFile(file)
52++ if err == nil {
53++ roots.AppendCertsFromPEM(data)
54++ return roots, nil
55++ }
56++ }
57+
58+ files := certFiles
59+ if f := os.Getenv(certFileEnv); f != "" {
pkgs/development/compilers/llvm/5/llvm.nix+1
@@ -131,6 +131,7 @@ in stdenv.mkDerivation (rec {
131131
132132 passthru.src = src;
133133
134+ requiredSystemFeatures = [ "big-parallel" ];
134135 meta = {
135136 description = "Collection of modular and reusable compiler and toolchain technologies";
136137 homepage = http://llvm.org/;
pkgs/development/compilers/rust/cargo.nix+7−9
@@ -1,13 +1,11 @@
11{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
22, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
33, CoreFoundation, Security
4−, version
5−, patches ? []
6−, src }:
4+}:
75
86rustPlatform.buildRustPackage rec {
9− name = "cargo-${version}";
10− inherit version src patches;
7+ name = "cargo-${rustc.version}";
8+ inherit (rustc) version src;
119
1210 # the rust source tarball already has all the dependencies vendored, no need to fetch them again
1311 cargoVendorDir = "vendor";
@@ -19,14 +17,14 @@ rustPlatform.buildRustPackage rec {
1917 # changes hash of vendor directory otherwise
2018 dontUpdateAutotoolsGnuConfigScripts = true;
2119
22− nativeBuildInputs = [ pkgconfig ];
23− buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ]
20+ nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
21+ buildInputs = [ cacert file curl python openssl zlib libgit2 ]
2422 ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
2523
26− LIBGIT2_SYS_USE_PKG_CONFIG=1;
24+ LIBGIT2_SYS_USE_PKG_CONFIG = 1;
2725
2826 # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
29− RUSTC_BOOTSTRAP=1;
27+ RUSTC_BOOTSTRAP = 1;
3028
3129 # FIXME: Use impure version of CoreFoundation because of missing symbols.
3230 # CFURLSetResourcePropertyForKey is defined in the headers but there's no
pkgs/development/compilers/rust/default.nix+57−42
@@ -1,47 +1,62 @@
1−{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
1+{ stdenv, lib, overrideCC
2+, buildPackages
3+, newScope, callPackage
24, CoreFoundation, Security
3−, targets ? []
4−, targetToolchains ? []
5−, targetPatches ? []
6−}:
7−
8−let
9− rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
10− version = "1.33.0";
11− cargoVersion = "1.33.0";
12− src = fetchurl {
13− url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
14− sha256 = "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as";
15− };
16−in rec {
17− rustc = callPackage ./rustc.nix {
18− inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src;
19−
20− patches = [
21− ./patches/net-tcp-disable-tests.patch
22−
23− # Re-evaluate if this we need to disable this one
24− #./patches/stdsimd-disable-doctest.patch
25− ];
26−
27− withBundledLLVM = false;
28−
29− configureFlags = [ "--release-channel=stable" ];
30−
31− # 1. Upstream is not running tests on aarch64:
32− # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567
33− # So we do the same.
34− # 2. Tests run out of memory for i686
35− #doCheck = !stdenv.isAarch64 && !stdenv.isi686;
36−
37− # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598.
38− doCheck = false;
5+}: rec {
6+ makeRustPlatform = { rustc, cargo, ... }: {
7+ rust = {
8+ inherit rustc cargo;
9+ };
10+
11+ buildRustPackage = callPackage ../../../build-support/rust {
12+ inherit rustc cargo;
13+
14+ fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix {
15+ inherit cargo;
16+ };
17+ };
18+
19+ rustcSrc = callPackage ./rust-src.nix {
20+ inherit rustc;
21+ };
3922 };
4023
41− cargo = callPackage ./cargo.nix rec {
42− version = cargoVersion;
43− inherit src stdenv CoreFoundation Security;
44− inherit rustc; # the rustc that will be wrapped by cargo
45− inherit rustPlatform; # used to build cargo
24+ # This just contains tools for now. But it would conceivably contain
25+ # libraries too, say if we picked some default/recommended versions from
26+ # `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for
27+ # all vendored Carnix-generated nix.
28+ #
29+ # In the end game, rustc, the rust standard library (`core`, `std`, etc.),
30+ # and cargo would themselves be built with `buildRustCreate` like
31+ # everything else. Tools and `build.rs` and procedural macro dependencies
32+ # would be taken from `buildRustPackages` (and `bootstrapRustPackages` for
33+ # anything provided prebuilt or their build-time dependencies to break
34+ # cycles / purify builds). In this way, nixpkgs would be in control of all
35+ # bootstrapping.
36+ packages = {
37+ prebuilt = callPackage ./bootstrap.nix {};
38+ stable = lib.makeScope newScope (self: let
39+ # Like `buildRustPackages`, but may also contain prebuilt binaries to
40+ # break cycle. Just like `bootstrapTools` for nixpkgs as a whole,
41+ # nothing in the final package set should refer to this.
42+ bootstrapRustPackages = self.buildRustPackages.overrideScope' (_: _:
43+ lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform)
44+ buildPackages.rust.packages.prebuilt);
45+ bootRustPlatform = makeRustPlatform bootstrapRustPackages;
46+ in {
47+ # Packages suitable for build-time, e.g. `build.rs`-type stuff.
48+ buildRustPackages = buildPackages.rust.packages.stable;
49+ # Analogous to stdenv
50+ rustPlatform = makeRustPlatform self.buildRustPackages;
51+ rustc = self.callPackage ./rustc.nix {
52+ # Use boot package set to break cycle
53+ rustPlatform = bootRustPlatform;
54+ };
55+ cargo = self.callPackage ./cargo.nix {
56+ # Use boot package set to break cycle
57+ rustPlatform = bootRustPlatform;
58+ inherit CoreFoundation Security;
59+ };
60+ });
4661 };
4762}
pkgs/development/compilers/rust/rustc.nix+84−41
@@ -1,33 +1,28 @@
1−{ stdenv, targetPackages, removeReferencesTo
1+{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
22, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
3−, llvm, ncurses, darwin, rustPlatform, git, cmake, curl
3+, llvm_7, ncurses, darwin, git, cmake, curl, rustPlatform
44, which, libffi, gdb
5−, version
65, withBundledLLVM ? false
7−, src
8−, configureFlags ? []
9−, patches
10−, targets
11−, targetPatches
12−, targetToolchains
13−, doCheck ? true
14−, broken ? false
156}:
167
178let
189 inherit (stdenv.lib) optional optionalString;
1910 inherit (darwin.apple_sdk.frameworks) Security;
2011
21− llvmShared = llvm.override { enableSharedLibraries = true; };
12+ llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
13+ llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
14+ llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
2215
23− target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
24−in
16+ # For use at runtime
17+ llvmShared = llvm_7.override { enableSharedLibraries = true; };
18+in stdenv.mkDerivation rec {
19+ pname = "rustc";
20+ version = "1.33.0";
2521
26−stdenv.mkDerivation {
27− name = "rustc-${version}";
28− inherit version;
29−
30− inherit src;
22+ src = fetchurl {
23+ url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
24+ sha256 = "152x91mg7bz4ygligwjb05fgm1blwy2i70s2j03zc9jiwvbsh0as";
25+ };
3126
3227 __darwinAllowLocalNetworking = true;
3328
@@ -38,13 +33,17 @@ stdenv.mkDerivation {
3833 # .rlib files in "lib/".
3934 #
4035 # See https://github.com/NixOS/nixpkgs/pull/34227
41− stripDebugList = if stdenv.isDarwin then [ "bin" ] else null;
36+ #
37+ # Running `strip -S` when cross compiling can harm the cross rlibs.
38+ # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656
39+ stripDebugList = [ "bin" ];
40+
4241
4342 NIX_LDFLAGS =
4443 # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
4544 optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
4645 ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++"
47− ++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib";
46+ ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib";
4847
4948 # Enable nightly features in stable compiles (used for
5049 # bootstrapping, see https://github.com/rust-lang/rust/pull/37265).
@@ -57,27 +56,67 @@ stdenv.mkDerivation {
5756
5857 # We need rust to build rust. If we don't provide it, configure will try to download it.
5958 # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py
60− configureFlags = configureFlags
61− ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath"
62− "--enable-vendor"
63− "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
64− ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ]
65− ++ optional (targets != []) "--target=${target}";
59+ configureFlags = let
60+ setBuild = "--set=target.${stdenv.buildPlatform.config}";
61+ setHost = "--set=target.${stdenv.hostPlatform.config}";
62+ setTarget = "--set=target.${stdenv.targetPlatform.config}";
63+ ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc";
64+ cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++";
65+ ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc";
66+ cxxForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}c++";
67+ ccForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc";
68+ cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++";
69+ in [
70+ "--release-channel=stable"
71+ "--set=build.rustc=${rustPlatform.rust.rustc}/bin/rustc"
72+ "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo"
73+ "--enable-rpath"
74+ "--enable-vendor"
75+ "--build=${stdenv.buildPlatform.config}"
76+ "--host=${stdenv.hostPlatform.config}"
77+ "--target=${stdenv.targetPlatform.config}"
78+
79+ "${setBuild}.cc=${ccForBuild}"
80+ "${setHost}.cc=${ccForHost}"
81+ "${setTarget}.cc=${ccForTarget}"
82+
83+ "${setBuild}.linker=${ccForBuild}"
84+ "${setHost}.linker=${ccForHost}"
85+ "${setTarget}.linker=${ccForTarget}"
86+
87+ "${setBuild}.cxx=${cxxForBuild}"
88+ "${setHost}.cxx=${cxxForHost}"
89+ "${setTarget}.cxx=${cxxForTarget}"
90+ ] ++ optional (!withBundledLLVM) [
91+ "--enable-llvm-link-shared"
92+ "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config"
93+ "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config"
94+ "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config"
95+ ];
6696
6797 # The bootstrap.py will generated a Makefile that then executes the build.
6898 # The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass
6999 # to the bootstrap builder.
70100 postConfigure = ''
71− substituteInPlace Makefile --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)'
101+ substituteInPlace Makefile \
102+ --replace 'BOOTSTRAP_ARGS :=' 'BOOTSTRAP_ARGS := --jobs $(NIX_BUILD_CORES)'
72103 '';
73104
74− patches = patches ++ targetPatches;
105+ patches = [
106+ ./patches/net-tcp-disable-tests.patch
107+
108+ # Re-evaluate if this we need to disable this one
109+ #./patches/stdsimd-disable-doctest.patch
110+
111+ # Fails on hydra - not locally; the exact reason is unknown.
112+ # Comments in the test suggest that some non-reproducible environment
113+ # variables such $RANDOM can make it fail.
114+ # ./patches/disable-test-inherit-env.patch
115+ ];
75116
76117 # the rust build system complains that nix alters the checksums
77118 dontFixLibtool = true;
78119
79− passthru.target = target;
80−
81120 postPatch = ''
82121 patchShebangs src/etc
83122
@@ -115,20 +154,18 @@ stdenv.mkDerivation {
115154 rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ???
116155 '';
117156
118− # rustc unfortunately need cmake for compiling llvm-rt but doesn't
157+ # rustc unfortunately needs cmake to compile llvm-rt but doesn't
119158 # use it for the normal build. This disables cmake in Nix.
120159 dontUseCmakeConfigure = true;
121160
122161 # ps is needed for one of the test cases
123− nativeBuildInputs =
124− [ file python2 ps rustPlatform.rust.rustc git cmake
125− which libffi removeReferencesTo
126− ]
127− # Only needed for the debuginfo tests
162+ nativeBuildInputs = [
163+ file python2 ps rustPlatform.rust.rustc git cmake
164+ which libffi removeReferencesTo
165+ ] # Only needed for the debuginfo tests
128166 ++ optional (!stdenv.isDarwin) gdb;
129167
130− buildInputs = targetToolchains
131− ++ optional stdenv.isDarwin Security
168+ buildInputs = optional stdenv.isDarwin Security
132169 ++ optional (!withBundledLLVM) llvmShared;
133170
134171 outputs = [ "out" "man" "doc" ];
@@ -148,7 +185,14 @@ stdenv.mkDerivation {
148185 sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs
149186 '';
150187
151− inherit doCheck;
188+ # 1. Upstream is not running tests on aarch64:
189+ # see https://github.com/rust-lang/rust/issues/49807#issuecomment-380860567
190+ # So we do the same.
191+ # 2. Tests run out of memory for i686
192+ #doCheck = !stdenv.isAarch64 && !stdenv.isi686;
193+
194+ # Disabled for now; see https://github.com/NixOS/nixpkgs/pull/42348#issuecomment-402115598.
195+ doCheck = false;
152196
153197 # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
154198 # and thus a transitive dependency on ncurses
@@ -170,6 +214,5 @@ stdenv.mkDerivation {
170214 maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ];
171215 license = [ licenses.mit licenses.asl20 ];
172216 platforms = platforms.linux ++ platforms.darwin;
173− broken = broken;
174217 };
175218}
pkgs/development/compilers/vala/default.nix+26−12
@@ -30,12 +30,20 @@ let
3030 };
3131
3232 # NOTE: the openembedded-core project doesn't have a patch for 0.40.12
33− # or 0.42.4 just yet; we've fixed the single merge conflict in the
34− # patches below and checked them in here.
33+ # We've fixed the single merge conflict in the following patch.
3534 # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch
36− # 0.42.4: https://github.com/openembedded/openembedded-core/raw/dfbbff39cfd413510abbd60930232a9c6b35d765/meta/recipes-devtools/vala/vala/disable-graphviz.patch
3735 "0.40" = ./disable-graphviz-0.40.12.patch;
38− "0.42" = ./disable-graphviz-0.42.4.patch;
36+
37+ "0.42" = fp {
38+ commit = "f2b4f9ec6f44dced7f88df849cca68961419eeb8";
39+ sha256 = "112qhdzix0d7lfpfcam1cxprzmfzpwypb1226m5ma1vq9qy0sn7g";
40+ };
41+
42+ # NOTE: the openembedded-core project doesn't have a patch for 0.44.1
43+ # We've reverted the addition of the "--disable-valadoc" option
44+ # and then applied the following patch.
45+ # 0.42.4: https://github.com/openembedded/openembedded-core/raw/f2b4f9ec6f44dced7f88df849cca68961419eeb8/meta/recipes-devtools/vala/vala/disable-graphviz.patch
46+ "0.44" = ./disable-graphviz-0.44.1.patch;
3947
4048 }.${major} or (throw "no graphviz patch for this version of vala");
4149
@@ -88,15 +96,15 @@ let
8896 homepage = https://wiki.gnome.org/Projects/Vala;
8997 license = licenses.lgpl21Plus;
9098 platforms = platforms.unix;
91− maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ];
99+ maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ];
92100 };
93101 });
94102
95103in rec {
96104 vala_0_36 = generic {
97105 major = "0.36";
98− minor = "17";
99− sha256 = "1f6qg40zd6jzhbwr3dy4fb66k4qs1xlk2whdyqh64zxxjw0k9pv7";
106+ minor = "18";
107+ sha256 = "0csb9skgy663y05kl813dsarzjbfcdsmx5fvz13p8gas3hycciq9";
100108 };
101109
102110 vala_0_38 = generic {
@@ -108,15 +116,21 @@ in rec {
108116
109117 vala_0_40 = generic {
110118 major = "0.40";
111− minor = "12";
112− sha256 = "1nhk45w5iwg97q3cfybn0i4qz5w9qvk423ndpg6mq6cnna076snx";
119+ minor = "14";
120+ sha256 = "0llid9b9cgjcrcclc0pw2skkssb7br7b2clq9cql3p14dl94gki0";
113121 };
114122
115123 vala_0_42 = generic {
116124 major = "0.42";
117− minor = "4";
118− sha256 = "07jgkx812y7wq4cswwfsf1f4k3lq9hcjra45682bdi8a11nr0a5m";
125+ minor = "6";
126+ sha256 = "14024gvs23q323fmd62hqd8jiypaxbjjvamyd782ixbhxmpz8x1p";
127+ };
128+
129+ vala_0_44 = generic {
130+ major = "0.44";
131+ minor = "1";
132+ sha256 = "1qiglkgymws6a3m8xz1v8b3na165ywx2dbipp3bdg134bi0w3a4n";
119133 };
120134
121− vala = vala_0_42;
135+ vala = vala_0_44;
122136}
pkgs/development/compilers/vala/disable-graphviz-0.42.4.patchdeleted−208
@@ -1,208 +0,0 @@
1−diff --git i/configure.ac w/configure.ac
2−index 730c72d7b..af8198637 100644
3−--- i/configure.ac
4−+++ w/configure.ac
5−@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
6− AC_SUBST(GMODULE_CFLAGS)
7− AC_SUBST(GMODULE_LIBS)
8−
9−-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
10−-AC_MSG_CHECKING([for CGRAPH])
11−-cgraph_tmp_LIBADD="$LIBADD"
12−-cgraph_tmp_CFLAGS="$CFLAGS"
13−-LIBADD="$LIBADD $LIBGVC_LIBS"
14−-CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
15−-AC_RUN_IFELSE(
16−- [AC_LANG_SOURCE([
17−- #include <gvc.h>
18−-
19−- int main(void) {
20−- #ifdef WITH_CGRAPH
21−- return 0;
22−- #else
23−- return -1;
24−- #endif
25−- }
26−- ])], [
27−- AC_MSG_RESULT([yes])
28−- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
29−- have_cgraph=yes
30−- ], [
31−- AC_MSG_RESULT([no])
32−- have_cgraph=no
33−- ]
34−-)
35−-LIBADD="$cgraph_tmp_LIBADD"
36−-CFLAGS="$cgraph_tmp_CFLAGS"
37−+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
38−+if test x$enable_graphviz = xyes; then
39−+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
40−+ AC_MSG_CHECKING([for CGRAPH])
41−+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
42−+ cgraph_tmp_LIBADD="$LIBADD"
43−+ cgraph_tmp_CFLAGS="$CFLAGS"
44−+ LIBADD="$LIBADD $LIBGVC_LIBS"
45−+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
46−+ AC_RUN_IFELSE(
47−+ [AC_LANG_SOURCE([
48−+ #include <gvc.h>
49−+ int main(void) {
50−+ #ifdef WITH_CGRAPH
51−+ return 0;
52−+ #else
53−+ return -1;
54−+ #endif
55−+ }
56−+ ])], [
57−+ AC_MSG_RESULT([yes])
58−+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
59−+ have_cgraph=yes
60−+ ], [
61−+ AC_MSG_RESULT([no])
62−+ have_cgraph=no
63−+ ]
64−+ )
65−+ LIBADD="$cgraph_tmp_LIBADD"
66−+ CFLAGS="$cgraph_tmp_CFLAGS"
67−+fi
68−+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
69− AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
70−
71− AC_PATH_PROG([XSLTPROC], [xsltproc], :)
72−diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am
73−index f3f790e76..3c5dc4c80 100644
74−--- i/libvaladoc/Makefile.am
75−+++ w/libvaladoc/Makefile.am
76−@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \
77− content/tablerow.vala \
78− content/taglet.vala \
79− content/text.vala \
80−- charts/chart.vala \
81−- charts/chartfactory.vala \
82−- charts/hierarchychart.vala \
83−- charts/simplechartfactory.vala \
84− parser/manyrule.vala \
85− parser/oneofrule.vala \
86− parser/optionalrule.vala \
87−@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \
88− highlighter/codetoken.vala \
89− highlighter/highlighter.vala \
90− html/basicdoclet.vala \
91−- html/htmlchartfactory.vala \
92− html/linkhelper.vala \
93− html/cssclassresolver.vala \
94− html/htmlmarkupwriter.vala \
95− html/htmlrenderer.vala \
96− $(NULL)
97−
98−+if ENABLE_GRAPHVIZ
99−+libvaladoc_la_VALASOURCES += \
100−+ charts/chart.vala \
101−+ charts/chartfactory.vala \
102−+ charts/hierarchychart.vala \
103−+ charts/simplechartfactory.vala \
104−+ html/htmlchartfactory.vala \
105−+ $(NULL)
106−+
107−+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
108−+endif
109−+
110− libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
111− libvaladoc.vala.stamp \
112− $(libvaladoc_la_VALASOURCES:.vala=.c) \
113−@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
114− --library valadoc \
115− --vapi valadoc@PACKAGE_SUFFIX@.vapi \
116− --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
117−- --vapidir $(top_srcdir)/vapi --pkg libgvc \
118− --vapidir $(top_srcdir)/gee --pkg gee \
119− --vapidir $(top_srcdir)/vala --pkg vala \
120− --vapidir $(top_srcdir)/ccode --pkg ccode \
121− --vapidir $(top_srcdir)/codegen --pkg codegen \
122−+ $(LIBGVC_PKG) \
123− --pkg config \
124− $(filter %.vala %.c,$^)
125− touch $@
126−@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
127−
128− valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
129− cp $< $@
130−+if !ENABLE_GRAPHVIZ
131−+ sed -i "s/libgvc //g" $@
132−+endif
133−
134− vapidir = $(datadir)/vala/vapi
135− dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
136−@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
137−
138− valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
139− cp $< $@
140−+if !ENABLE_GRAPHVIZ
141−+ sed -i "s/libgvc//g" $@
142−+endif
143−
144− EXTRA_DIST = \
145− $(libvaladoc_la_VALASOURCES) \
146−diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala
147−index 192e488cd..ec0960222 100644
148−--- i/libvaladoc/html/basicdoclet.vala
149−+++ w/libvaladoc/html/basicdoclet.vala
150−@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
151− protected HtmlRenderer _renderer;
152− protected Html.MarkupWriter writer;
153− protected Html.CssClassResolver cssresolver;
154−+#if HAVE_GRAPHVIZ
155− protected Charts.Factory image_factory;
156−+#else
157−+ protected void* image_factory;
158−+#endif
159− protected ErrorReporter reporter;
160− protected string package_list_link = "../index.html";
161−
162−@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
163− this.linker = new LinkHelper ();
164−
165− _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
166−+#if HAVE_GRAPHVIZ
167− this.image_factory = new SimpleChartFactory (settings, linker);
168−+#endif
169− }
170−
171−
172−@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
173− }
174−
175− protected void write_image_block (Api.Node element) {
176−+#if HAVE_GRAPHVIZ
177− if (element is Class || element is Interface || element is Struct) {
178− unowned string format = (settings.use_svg_images ? "svg" : "png");
179− var chart = new Charts.Hierarchy (image_factory, element);
180−@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
181− this.get_img_path_html (element, format)});
182− writer.add_usemap (chart);
183− }
184−+#endif
185− }
186−
187− public void write_namespace_content (Namespace node, Api.Node? parent) {
188−diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala
189−index 5aa4afdea..e79b0b8f5 100644
190−--- i/libvaladoc/html/htmlmarkupwriter.vala
191−+++ w/libvaladoc/html/htmlmarkupwriter.vala
192−@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
193− }
194− }
195−
196−+#if HAVE_GRAPHVIZ
197− public unowned MarkupWriter add_usemap (Charts.Chart chart) {
198− string? buf = (string?) chart.write_buffer ("cmapx");
199− if (buf != null) {
200− raw_text ("\n");
201− raw_text ((!) buf);
202− }
203−+#else
204−+ public unowned MarkupWriter add_usemap (void* chart) {
205−+#endif
206−
207− return this;
208− }
pkgs/development/compilers/vala/disable-graphviz-0.44.1.patchnew file+261
@@ -0,0 +1,261 @@
1+diff --git a/Makefile.am b/Makefile.am
2+index f70234759..b3d6c3833 100644
3+--- a/Makefile.am
4++++ b/Makefile.am
5+@@ -13,19 +13,9 @@ SUBDIRS = \
6+ doc \
7+ gobject-introspection \
8+ vapigen \
9+- $(NULL)
10+-
11+-if ENABLE_VALADOC
12+-SUBDIRS += \
13+ libvaladoc \
14+ valadoc \
15+ $(NULL)
16+-endif
17+-
18+-DISTCHECK_CONFIGURE_FLAGS = \
19+- --enable-valadoc \
20+- --enable-unversioned \
21+- $(NULL)
22+
23+ if ENABLE_UNVERSIONED
24+ aclocaldir = $(datadir)/aclocal
25+diff --git a/configure.ac b/configure.ac
26+index 16ebd1f81..cf23db4b8 100644
27+--- a/configure.ac
28++++ b/configure.ac
29+@@ -156,10 +156,11 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
30+ AC_SUBST(GMODULE_CFLAGS)
31+ AC_SUBST(GMODULE_LIBS)
32+
33+-AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
34+-if test x$enable_valadoc = xyes; then
35++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
36++if test x$enable_graphviz = xyes; then
37+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
38+ AC_MSG_CHECKING([for CGRAPH])
39++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
40+ cgraph_tmp_LIBADD="$LIBADD"
41+ cgraph_tmp_CFLAGS="$CFLAGS"
42+ LIBADD="$LIBADD $LIBGVC_LIBS"
43+@@ -186,8 +187,8 @@ if test x$enable_valadoc = xyes; then
44+ LIBADD="$cgraph_tmp_LIBADD"
45+ CFLAGS="$cgraph_tmp_CFLAGS"
46+ fi
47++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
48+ AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
49+-AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
50+
51+ AC_PATH_PROG([XSLTPROC], [xsltproc], :)
52+ AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
53+diff --git a/doc/Makefile.am b/doc/Makefile.am
54+index d2684a0e0..b343c7c10 100644
55+--- a/doc/Makefile.am
56++++ b/doc/Makefile.am
57+@@ -6,16 +6,11 @@ SUBDIRS = \
58+
59+ dist_man_MANS = \
60+ valac.1 \
61++ valadoc.1 \
62+ vala-gen-introspect.1 \
63+ vapigen.1 \
64+ $(NULL)
65+
66+-if ENABLE_VALADOC
67+-dist_man_MANS += \
68+- valadoc.1 \
69+- $(NULL)
70+-endif
71+-
72+ EXTRA_DIST = \
73+ valac.h2m \
74+ valadoc.h2m \
75+@@ -24,11 +19,7 @@ EXTRA_DIST = \
76+ $(NULL)
77+
78+ if HAVE_HELP2MAN
79+-if ENABLE_VALADOC
80+ manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
81+-else
82+-manpages: valac.1 vala-gen-introspect.1 vapigen.1
83+-endif
84+ @rm $^
85+ $(MAKE) $(AM_MAKEFLAGS) $^
86+
87+@@ -37,13 +28,11 @@ valac.1:
88+ --include $(srcdir)/valac.h2m \
89+ --libtool --no-info \
90+ --output=$@
91+-if ENABLE_VALADOC
92+ valadoc.1:
93+ $(HELP2MAN) $(top_builddir)/valadoc/valadoc \
94+ --include $(srcdir)/valadoc.h2m \
95+ --libtool --no-info \
96+ --output=$@
97+-endif
98+ vala-gen-introspect.1:
99+ $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \
100+ --include $(srcdir)/vala-gen-introspect.h2m \
101+@@ -60,15 +49,12 @@ endif
102+ if ENABLE_UNVERSIONED
103+ install-data-hook:
104+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1
105+-if ENABLE_VALADOC
106+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1
107+-endif
108+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
109+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
110+ endif
111+
112+
113+-if ENABLE_VALADOC
114+ COMMON_VALADOCFLAGS = \
115+ --force \
116+ --verbose \
117+@@ -150,7 +136,6 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
118+ @touch $@
119+
120+ internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
121+-endif
122+
123+ clean-local:
124+ rm -rf $(builddir)/internal-apis
125+diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
126+index 7456fb836..107338e91 100644
127+--- a/libvaladoc/Makefile.am
128++++ b/libvaladoc/Makefile.am
129+@@ -119,10 +119,6 @@ libvaladoc_la_VALASOURCES = \
130+ content/tablerow.vala \
131+ content/taglet.vala \
132+ content/text.vala \
133+- charts/chart.vala \
134+- charts/chartfactory.vala \
135+- charts/hierarchychart.vala \
136+- charts/simplechartfactory.vala \
137+ parser/manyrule.vala \
138+ parser/oneofrule.vala \
139+ parser/optionalrule.vala \
140+@@ -149,13 +145,24 @@ libvaladoc_la_VALASOURCES = \
141+ highlighter/codetoken.vala \
142+ highlighter/highlighter.vala \
143+ html/basicdoclet.vala \
144+- html/htmlchartfactory.vala \
145+ html/linkhelper.vala \
146+ html/cssclassresolver.vala \
147+ html/htmlmarkupwriter.vala \
148+ html/htmlrenderer.vala \
149+ $(NULL)
150+
151++if ENABLE_GRAPHVIZ
152++libvaladoc_la_VALASOURCES += \
153++ charts/chart.vala \
154++ charts/chartfactory.vala \
155++ charts/hierarchychart.vala \
156++ charts/simplechartfactory.vala \
157++ html/htmlchartfactory.vala \
158++ $(NULL)
159++
160++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
161++endif
162++
163+ libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
164+ libvaladoc.vala.stamp \
165+ $(libvaladoc_la_VALASOURCES:.vala=.c) \
166+@@ -175,11 +182,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
167+ --library valadoc \
168+ --vapi valadoc@PACKAGE_SUFFIX@.vapi \
169+ --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
170+- --vapidir $(top_srcdir)/vapi --pkg libgvc \
171+ --vapidir $(top_srcdir)/gee --pkg gee \
172+ --vapidir $(top_srcdir)/vala --pkg vala \
173+ --vapidir $(top_srcdir)/ccode --pkg ccode \
174+ --vapidir $(top_srcdir)/codegen --pkg codegen \
175++ $(LIBGVC_PKG) \
176+ --pkg config \
177+ $(filter %.vala %.c,$^)
178+ touch $@
179+@@ -207,6 +214,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
180+
181+ valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
182+ cp $< $@
183++if !ENABLE_GRAPHVIZ
184++ sed -i "s/libgvc //g" $@
185++endif
186+
187+ vapidir = $(datadir)/vala/vapi
188+ dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
189+@@ -214,6 +224,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
190+
191+ valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
192+ cp $< $@
193++if !ENABLE_GRAPHVIZ
194++ sed -i "s/libgvc//g" $@
195++endif
196+
197+ EXTRA_DIST = \
198+ $(libvaladoc_la_VALASOURCES) \
199+diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
200+index 46578c28f..f6ce7097c 100644
201+--- a/libvaladoc/html/basicdoclet.vala
202++++ b/libvaladoc/html/basicdoclet.vala
203+@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
204+ protected HtmlRenderer _renderer;
205+ protected Html.MarkupWriter writer;
206+ protected Html.CssClassResolver cssresolver;
207++#if HAVE_GRAPHVIZ
208+ protected Charts.Factory image_factory;
209++#else
210++ protected void* image_factory;
211++#endif
212+ protected ErrorReporter reporter;
213+ protected string package_list_link = "../index.html";
214+
215+@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
216+ this.linker = new LinkHelper ();
217+
218+ _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
219++#if HAVE_GRAPHVIZ
220+ this.image_factory = new SimpleChartFactory (settings, linker);
221++#endif
222+ }
223+
224+
225+@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
226+ }
227+
228+ protected void write_image_block (Api.Node element) {
229++#if HAVE_GRAPHVIZ
230+ if (element is Class || element is Interface || element is Struct) {
231+ unowned string format = (settings.use_svg_images ? "svg" : "png");
232+ var chart = new Charts.Hierarchy (image_factory, element);
233+@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
234+ this.get_img_path_html (element, format)});
235+ writer.add_usemap (chart);
236+ }
237++#endif
238+ }
239+
240+ public void write_namespace_content (Namespace node, Api.Node? parent) {
241+diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
242+index 5aa4afdea..e79b0b8f5 100644
243+--- a/libvaladoc/html/htmlmarkupwriter.vala
244++++ b/libvaladoc/html/htmlmarkupwriter.vala
245+@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
246+ }
247+ }
248+
249++#if HAVE_GRAPHVIZ
250+ public unowned MarkupWriter add_usemap (Charts.Chart chart) {
251+ string? buf = (string?) chart.write_buffer ("cmapx");
252+ if (buf != null) {
253+ raw_text ("\n");
254+ raw_text ((!) buf);
255+ }
256++#else
257++ public unowned MarkupWriter add_usemap (void* chart) {
258++#endif
259+
260+ return this;
261+ }
pkgs/development/interpreters/python/cpython/2.7/default.nix−14
@@ -79,20 +79,6 @@ let
7979 sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
8080 })
8181
82− # "`type_getattro()` calls `tp_descr_get(self, obj, type)` without actually owning a reference to "self".
83− # In very rare cases, this can cause a segmentation fault if "self" is deleted by the descriptor."
84− # https://github.com/python/cpython/pull/6118
85− (fetchpatch {
86− name = "type_getattro.patch";
87− url = "file://${./type_getattro.patch}";
88− sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd";
89− })
90−
91− (fetchpatch {
92− name = "CVE-2018-1000802.patch";
93− url = "https://github.com/python/cpython/pull/8985.patch";
94− sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97";
95− })
9682 ] ++ optionals (x11Support && stdenv.isDarwin) [
9783 ./use-correct-tcl-tk-on-darwin.patch
9884 ] ++ optionals stdenv.isLinux [
pkgs/development/interpreters/python/cpython/2.7/type_getattro.patchdeleted−62
@@ -1,62 +0,0 @@
1−--- a/Objects/typeobject.c
2−+++ b/Objects/typeobject.c
3−@@ -3137,6 +3137,7 @@
4− PyTypeObject *metatype = Py_TYPE(type);
5− PyObject *meta_attribute, *attribute;
6− descrgetfunc meta_get;
7−+ PyObject* res;
8−
9− if (!PyUnicode_Check(name)) {
10− PyErr_Format(PyExc_TypeError,
11−@@ -3158,6 +3159,7 @@
12− meta_attribute = _PyType_Lookup(metatype, name);
13−
14− if (meta_attribute != NULL) {
15−+ Py_INCREF(meta_attribute);
16− meta_get = Py_TYPE(meta_attribute)->tp_descr_get;
17−
18− if (meta_get != NULL && PyDescr_IsData(meta_attribute)) {
19−@@ -3165,10 +3167,11 @@
20− * writes. Assume the attribute is not overridden in
21− * type's tp_dict (and bases): call the descriptor now.
22− */
23−- return meta_get(meta_attribute, (PyObject *)type,
24−- (PyObject *)metatype);
25−+ res = meta_get(meta_attribute, (PyObject *)type,
26−+ (PyObject *)metatype);
27−+ Py_DECREF(meta_attribute);
28−+ return res;
29− }
30−- Py_INCREF(meta_attribute);
31− }
32−
33− /* No data descriptor found on metatype. Look in tp_dict of this
34−@@ -3176,6 +3179,7 @@
35− attribute = _PyType_Lookup(type, name);
36− if (attribute != NULL) {
37− /* Implement descriptor functionality, if any */
38−+ Py_INCREF(attribute);
39− descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get;
40−
41− Py_XDECREF(meta_attribute);
42−@@ -3183,11 +3187,12 @@
43− if (local_get != NULL) {
44− /* NULL 2nd argument indicates the descriptor was
45− * found on the target object itself (or a base) */
46−- return local_get(attribute, (PyObject *)NULL,
47−- (PyObject *)type);
48−+ res = local_get(attribute, (PyObject *)NULL,
49−+ (PyObject *)type);
50−+ Py_DECREF(attribute);
51−+ return res;
52− }
53−
54−- Py_INCREF(attribute);
55− return attribute;
56− }
57−
58−--- /dev/null
59−+++ b/Misc/NEWS.d/next/Core and Builtins/2018-03-14-21-42-17.bpo-25750.lxgkQz.rst
60−@@ -0,0 +1,2 @@
61−+Fix rare Python crash due to bad refcounting in ``type_getattro()`` if a
62−+descriptor deletes itself from the class.
pkgs/development/interpreters/python/default.nix+4−4
@@ -50,10 +50,10 @@ in {
5050 sourceVersion = {
5151 major = "2";
5252 minor = "7";
53− patch = "15";
53+ patch = "16";
5454 suffix = "";
5555 };
56− sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92";
56+ sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj";
5757 inherit (darwin) CF configd;
5858 inherit passthruFun;
5959 };
@@ -89,10 +89,10 @@ in {
8989 sourceVersion = {
9090 major = "3";
9191 minor = "7";
92− patch = "2";
92+ patch = "3";
9393 suffix = "";
9494 };
95− sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq";
95+ sha256 = "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s";
9696 inherit (darwin) CF configd;
9797 inherit passthruFun;
9898 };
pkgs/development/libraries/arguments/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 nativeBuildInputs = [ cmake ];
1717 buildInputs = [ ];
1818
19− #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" "-DBUILD_TESTING=FALSE" ];
19+ #cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ];
2020
2121 doCheck = false;
2222 # internal_volume_io.h: No such file or directory
pkgs/development/libraries/at-spi2-atk/default.nix+2−2
@@ -18,11 +18,11 @@
1818stdenv.mkDerivation rec {
1919 name = "${pname}-${version}";
2020 pname = "at-spi2-atk";
21− version = "2.30.1";
21+ version = "2.32.0";
2222
2323 src = fetchurl {
2424 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
25− sha256 = "1rxqp9kgf8mcyg84b9pq2kpqr1ws81ijn9nfdis2w0ixy9cbjfyr";
25+ sha256 = "0p54wx6f6q7s8w0b1j0sgw87pikllp79q5g3lfiwqazs779ycl8b";
2626 };
2727
2828 nativeBuildInputs = [ meson ninja pkgconfig ]
pkgs/development/libraries/at-spi2-core/default.nix+2−2
@@ -19,11 +19,11 @@
1919stdenv.mkDerivation rec {
2020 name = "${pname}-${version}";
2121 pname = "at-spi2-core";
22− version = "2.30.1";
22+ version = "2.32.0";
2323
2424 src = fetchurl {
2525 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
26− sha256 = "0j6aa071lnhpgv9h8l0pqimk8pc152gqpcbmq8djlj7h3f7iyvw5";
26+ sha256 = "083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923";
2727 };
2828
2929 outputs = [ "out" "dev" ];
pkgs/development/libraries/atk/default.nix+2−2
@@ -4,7 +4,7 @@
44
55let
66 pname = "atk";
7− version = "2.30.0";
7+ version = "2.32.0";
88in
99
1010stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "0yq25iisnf0rmlg2x5ghzqk9vhf2jramb2khxqghqakz47a90kfx";
15+ sha256 = "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb";
1616 };
1717
1818 outputs = [ "out" "dev" ];
pkgs/development/libraries/boehm-gc/default.nix+2−2
@@ -4,14 +4,14 @@
44
55stdenv.mkDerivation rec {
66 name = "boehm-gc-${version}";
7− version = "8.0.2";
7+ version = "8.0.4";
88
99 src = fetchurl {
1010 urls = [
1111 "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
1212 "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
1313 ];
14− sha256 = "1jsixcpdwy5cgq5s9fi3bdlid9zh46vakymf3nbjffianyss932f";
14+ sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3";
1515 };
1616
1717 buildInputs = [ libatomic_ops ];
pkgs/development/libraries/catch2/default.nix+1−3
@@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ cmake ];
1515
16− cmakeFlags = [
17− "-H.."
18− "-DBUILD_TESTING=OFF"];
16+ cmakeFlags = [ "-H.." ];
1917
2018 meta = with stdenv.lib; {
2119 description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
pkgs/development/libraries/cracklib/default.nix+24−4
@@ -1,15 +1,35 @@
1−{ stdenv, fetchurl, zlib, gettext }:
1+let version = "2.9.7"; in
2+{ stdenv, fetchurl, zlib, gettext
3+, wordlists ? [ (fetchurl {
4+ url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz";
5+ sha256 = "12fk8w06q628v754l357cf8kfjna98wj09qybpqr892az3x4a33z";
6+}) ]
7+}:
28
39stdenv.mkDerivation rec {
4− name = "cracklib-2.9.6";
10+ pname = "cracklib";
11+ inherit version;
512
613 src = fetchurl {
7− url = "https://github.com/cracklib/cracklib/releases/download/${name}/${name}.tar.gz";
8− sha256 = "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp";
14+ url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
15+ sha256 = "1rimpjsdnmw8f5b7k558cic41p2qy2n2yrlqp5vh7mp4162hk0py";
916 };
1017
1118 buildInputs = [ zlib gettext ];
1219
20+ postPatch = ''
21+ chmod +x util/cracklib-format
22+ patchShebangs util
23+
24+ ln -vs ${toString wordlists} dicts/
25+ '';
26+
27+ postInstall = ''
28+ make dict
29+ '';
30+ doInstallCheck = true;
31+ installCheckTarget = "test";
32+
1333 meta = with stdenv.lib; {
1434 homepage = https://github.com/cracklib/cracklib;
1535 description = "A library for checking the strength of passwords";
pkgs/development/libraries/db/generic.nix+2
@@ -39,6 +39,8 @@ stdenv.mkDerivation (rec {
3939 rm -rf $out/docs
4040 '';
4141
42+ enableParallelBuilding = true;
43+
4244 doCheck = true;
4345
4446 checkPhase = ''
pkgs/development/libraries/ffmpeg/generic.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
22, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
33, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
4−, x264, x265, xvidcore, zlib, libopus, speex
4+, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers
55, openglSupport ? false, libGLU_combined ? null
66# Build options
77, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
161161
162162 buildInputs = [
163163 bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
164− libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex
164+ libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers
165165 ] ++ optional openglSupport libGLU_combined
166166 ++ optional vpxSupport libvpx
167167 ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
pkgs/development/libraries/folks/default.nix+5−5
@@ -14,18 +14,18 @@ stdenv.mkDerivation rec {
1414 };
1515
1616 propagatedBuildInputs = [ glib libgee sqlite ];
17− # dbus_daemon needed for tests
17+
1818 buildInputs = [
19− dbus-glib telepathy-glib evolution-data-server dbus
19+ dbus-glib telepathy-glib evolution-data-server
2020 libsecret libxml2 libsoup nspr nss db
2121 ];
22+
23+ checkInputs = [ dbus ];
24+
2225 nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ];
2326
2427 configureFlags = [ "--disable-fatal-warnings" ];
2528
26− NIX_CFLAGS_COMPILE = ["-I${nss.dev}/include/nss"
27− "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0"];
28−
2929 enableParallelBuilding = true;
3030
3131 postBuild = "rm -rf $out/share/gtk-doc";
pkgs/development/libraries/fontconfig/make-fonts-conf.nix+2−1
@@ -2,7 +2,8 @@
22
33runCommand "fonts.conf"
44 {
5− buildInputs = [ libxslt fontconfig ];
5+ nativeBuildInputs = [ libxslt ];
6+ buildInputs = [ fontconfig ];
67 # Add a default font for non-nixos systems, <1MB and in nixos defaults.
78 fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ];
89 }
pkgs/development/libraries/freetype/default.nix+4−4
@@ -13,8 +13,8 @@ let
1313 inherit (stdenv.lib) optional optionalString;
1414
1515in stdenv.mkDerivation rec {
16− name = "freetype-${version}";
17− version = "2.9.1";
16+ pname = "freetype";
17+ version = "2.10.0";
1818
1919 meta = with stdenv.lib; {
2020 description = "A font rendering engine";
@@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
3232 };
3333
3434 src = fetchurl {
35− url = "mirror://savannah/freetype/${name}.tar.bz2";
36− sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv";
35+ url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2";
36+ sha256 = "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w";
3737 };
3838
3939 propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
pkgs/development/libraries/freetype/enable-subpixel-rendering.patch+8−9
@@ -1,13 +1,12 @@
1−Index: freetype-2.7.1/include/freetype/config/ftoption.h
2−===================================================================
3−--- freetype-2.7.1.orig/include/freetype/config/ftoption.h
4−+++ freetype-2.7.1/include/freetype/config/ftoption.h
5−@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
6− /* This is done to allow FreeType clients to run unmodified, forcing */
7− /* them to display normal gray-level anti-aliased glyphs. */
8− /* */
1+Index: freetype-2.10.0/include/freetype/config/ftoption.h
2+--- a/include/freetype/config/ftoption.h
3++++ b/include/freetype/config/ftoption.h
4+@@ -126,7 +126,7 @@ FT_BEGIN_HEADER
5+ * macro is not defined, FreeType offers alternative LCD rendering
6+ * technology that produces excellent output without LCD filtering.
7+ */
98-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
109+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
1110
1211
13− /*************************************************************************/
12+ /**************************************************************************
pkgs/development/libraries/freetype/enable-table-validation.patch+5−7
@@ -1,20 +1,18 @@
1−Index: freetype-2.7.1/modules.cfg
1+Index: freetype-2.10.0/modules.cfg
22===================================================================
3−--- freetype-2.7.1.orig/modules.cfg
4−+++ freetype-2.7.1/modules.cfg
5−@@ -120,7 +120,7 @@ AUX_MODULES += cache
3+--- freetype-2.10.0.orig/modules.cfg
4++++ freetype-2.10.0/modules.cfg
5+@@ -120,6 +120,6 @@ AUX_MODULES += cache
66 # TrueType GX/AAT table validation. Needs ftgxval.c below.
77 #
8− # No FT_CONFIG_OPTION_PIC support.
98-# AUX_MODULES += gxvalid
109+AUX_MODULES += gxvalid
1110
1211 # Support for streams compressed with gzip (files with suffix .gz).
1312 #
14−@@ -143,7 +143,7 @@ AUX_MODULES += bzip2
13+@@ -143,6 +143,6 @@ AUX_MODULES += bzip2
1514 # OpenType table validation. Needs ftotval.c below.
1615 #
17− # No FT_CONFIG_OPTION_PIC support.
1816-# AUX_MODULES += otvalid
1917+AUX_MODULES += otvalid
2018
pkgs/development/libraries/gdk-pixbuf/default.nix+3−12
@@ -4,28 +4,18 @@
44
55let
66 pname = "gdk-pixbuf";
7− version = "2.38.0";
7+ version = "2.38.1";
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 = "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x";
13+ sha256 = "0fmbjgjcyym3qg46f64qgl7icdm4ii77flyc1mhk244rp8vgi7zi";
1414 };
1515
1616 patches = [
17− # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
18− # which requires access to shared-mime-info files during runtime.
19− # For now, we are patching the build script to avoid the dependency.
20− ./no-mime-sniffing.patch
21−
2217 # Move installed tests to a separate output
2318 ./installed-tests-path.patch
24−
25− (fetchpatch {
26− url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch;
27− sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92";
28− })
2919 ];
3020
3121 outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
@@ -48,6 +38,7 @@ in stdenv.mkDerivation rec {
4838 "-Djasper=true"
4939 "-Dx11=true"
5040 "-Dgir=${if gobject-introspection != null then "true" else "false"}"
41+ "-Dgio_sniffing=false"
5142 ];
5243
5344 postPatch = ''
pkgs/development/libraries/geocode-glib/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "geocode-glib";
5− version = "3.26.0";
5+ version = "3.26.1";
66
77 outputs = [ "out" "dev" "devdoc" "installedTests" ];
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a";
11+ sha256 = "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv";
1212 };
1313
1414 nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ];
pkgs/development/libraries/gettext/default.nix+10−3
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, libiconv, xz }:
1+{ stdenv, lib, fetchurl, libiconv, xz, bison, automake115x, autoconf }:
22
33stdenv.mkDerivation rec {
44 name = "gettext-${version}";
@@ -8,7 +8,14 @@ stdenv.mkDerivation rec {
88 url = "mirror://gnu/gettext/${name}.tar.gz";
99 sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
1010 };
11− patches = [ ./absolute-paths.diff ];
11+ patches = [
12+ ./absolute-paths.diff
13+ (fetchurl {
14+ name = "CVE-2018-18751.patch";
15+ url = "https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=patch;h=dce3a16e5e9368245735e29bf498dcd5e3e474a4";
16+ sha256 = "1lpjwwcjr1sb879faj0xyzw02kma0ivab6xwn3qciy13qy6fq5xn";
17+ })
18+ ];
1219
1320 outputs = [ "out" "man" "doc" "info" ];
1421
@@ -40,7 +47,7 @@ stdenv.mkDerivation rec {
4047 sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
4148 '';
4249
43− nativeBuildInputs = [ xz xz.bin ];
50+ nativeBuildInputs = [ xz xz.bin bison automake115x autoconf];
4451 # HACK, see #10874 (and 14664)
4552 buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
4653
pkgs/development/libraries/gexiv2/default.nix+3−3
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "gexiv2";
5− version = "0.10.10";
5+ version = "0.12.0";
66
77 outputs = [ "out" "dev" "devdoc" ];
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx";
11+ sha256 = "0slj5yj8c90l9pp5i3z74x5r3r4da0xfmbzkfq5k0dkg72q3kxaq";
1212 };
1313
1414 nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 propagatedBuildInputs = [ exiv2 ];
1717
1818 mesonFlags = [
19− "-Denable-gtk-doc=true" # TODO: change to gtk_doc in a next release
19+ "-Dgtk_doc=true"
2020 ];
2121
2222 doCheck = true;
pkgs/development/libraries/glib-networking/default.nix+7−2
@@ -3,14 +3,14 @@
33
44let
55 pname = "glib-networking";
6− version = "2.58.0";
6+ version = "2.60.1";
77in
88stdenv.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 = "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx";
13+ sha256 = "14jx8ca7plgh196629ghj41gsaha0aza222g64093hjsm8pnn76p";
1414 };
1515
1616 outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
2828 ];
2929 propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ];
3030
31+ mesonFlags = [
32+ # Default auto detection doesn't work
33+ "-Dgnutls=enabled"
34+ ];
35+
3136 doCheck = false; # tests need to access the certificates (among other things)
3237
3338 passthru = {
pkgs/development/libraries/glib/default.nix+5−5
@@ -46,7 +46,7 @@ let
4646 '';
4747
4848 binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
49− version = "2.58.3";
49+ version = "2.60.0";
5050in
5151
5252stdenv.mkDerivation rec {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
5454
5555 src = fetchurl {
5656 url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
57− sha256 = "10blprf5djbwxq8dqmjvcsdc9vqz63rl0ammfbd2b2p8cwbw6hwg";
57+ sha256 = "0ls3njqknb345ni5i8hn9nr1n70kn6s8bi0g6kcqj3c4js5mv1i0";
5858 };
5959
6060 patches = optional stdenv.isDarwin ./darwin-compilation.patch
@@ -96,15 +96,15 @@ stdenv.mkDerivation rec {
9696 # Avoid the need for gobject introspection binaries in PATH in cross-compiling case.
9797 # Instead we just copy them over from the native output.
9898 "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}"
99+ "-Dnls=enabled"
99100 ];
100101
101102 LC_ALL = "en_US.UTF-8";
102103
103− NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP";
104+ NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP")
105+ ++ [ "-Wno-error=nonnull" ];
104106
105107 postPatch = ''
106− substituteInPlace meson.build --replace "install_dir : 'bin'," "install_dir : glib_bindir,"
107−
108108 # substitute fix-gio-launch-desktop-path.patch
109109 substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin"
110110
pkgs/development/libraries/glibc/locales.nix+2
@@ -26,6 +26,8 @@ callPackage ./common.nix { inherit stdenv; } {
2626 ''
2727 mkdir -p $TMPDIR/"${buildPackages.stdenv.cc.libc.out}/lib/locale"
2828
29+ echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED
30+
2931 # Hack to allow building of the locales (needed since glibc-2.12)
3032 sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile
3133 ''
pkgs/development/libraries/gnome-menus/default.nix+4−4
@@ -1,12 +1,12 @@
1−{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection }:
1+{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection }:
22
33stdenv.mkDerivation rec {
44 pname = "gnome-menus";
5− version = "3.31.4";
5+ version = "3.32.0";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "1iihxcibjg22jxsw3s1cxzcq0rhn1rdmx4xg7qjqij981afs8dr7";
9+ sha256 = "0x2blzqrapmbsbfzxjcdcpa3vkw9hq5k96h9kvjmy9kl415wcl68";
1010 };
1111
1212 makeFlags = [
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
1515 ];
1616
17− nativeBuildInputs = [ pkgconfig ];
17+ nativeBuildInputs = [ pkgconfig gettext ];
1818 buildInputs = [ glib gobject-introspection ];
1919
2020 meta = {
pkgs/development/libraries/gobject-introspection/default.nix+3−3
@@ -9,7 +9,7 @@
99
1010let
1111 pname = "gobject-introspection";
12− version = "1.58.3";
12+ version = "1.60.0";
1313in
1414with stdenv.lib;
1515stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 src = fetchurl {
1919 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
20− sha256 = "1j63rll0s608s0v4kqxkjapkpf46l069mlahzh8wykclplmn6nq2";
20+ sha256 = "0pgk9lcvz3i79m6g2ynlp00ghws7g0p0d5qyf0k72warrf841zly";
2121 };
2222
2323 outputs = [ "out" "dev" "man" ];
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
5555 cairoLib = "${getLib cairo}/lib";
5656 });
5757
58− doCheck = true;
58+ doCheck = !stdenv.isAarch64;
5959
6060 passthru = {
6161 updateScript = gnome3.updateScript {
pkgs/development/libraries/google-gflags/default.nix−1
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
1919 cmakeFlags = [
2020 "-DBUILD_SHARED_LIBS=ON"
2121 "-DBUILD_STATIC_LIBS=ON"
22− "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
2322 ];
2423
2524 doCheck = false;
pkgs/development/libraries/gpgme/default.nix+3−13
@@ -1,7 +1,5 @@
11{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
22, file, which, ncurses
3−, autoreconfHook, fetchpatch
4−, git
53, texinfo
64, buildPackages
75, qtbase ? null
@@ -15,11 +13,11 @@ in
1513
1614stdenv.mkDerivation rec {
1715 name = "gpgme-${version}";
18− version = "1.12.0";
16+ version = "1.13.0";
1917
2018 src = fetchurl {
2119 url = "mirror://gnupg/gpgme/${name}.tar.bz2";
22− sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l";
20+ sha256 = "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl";
2321 };
2422
2523 outputs = [ "out" "dev" "info" ];
@@ -29,19 +27,11 @@ stdenv.mkDerivation rec {
2927 [ libgpgerror glib libassuan pth ]
3028 ++ lib.optional (qtbase != null) qtbase;
3129
32− nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
30+ nativeBuildInputs = [ file pkgconfig gnupg texinfo ]
3331 ++ lib.optionals pythonSupport [ python swig2 which ncurses ];
3432
3533 depsBuildBuild = [ buildPackages.stdenv.cc ];
3634
37− patches = [
38− (fetchpatch {
39− name = "fix-key-expiry.patch";
40− url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60";
41− sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02";
42− })
43− ];
44−
4535 postPatch =''
4636 substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
4737 '';
pkgs/development/libraries/gstreamer/core/default.nix+2−1
@@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
4444
4545 postInstall = ''
4646 for prog in "$dev/bin/"*; do
47− wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")"
47+ # We can't use --suffix here due to quoting so we craft the export command by hand
48+ wrapProgram "$prog" --run "export GST_PLUGIN_SYSTEM_PATH=\$GST_PLUGIN_SYSTEM_PATH"$\{GST_PLUGIN_SYSTEM_PATH:+:\}"\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")"
4849 done
4950 '';
5051
pkgs/development/libraries/gtk+/3.x.nix+2−14
@@ -13,14 +13,14 @@ assert cupsSupport -> cups != null;
1313with stdenv.lib;
1414
1515let
16− version = "3.24.5";
16+ version = "3.24.7";
1717in
1818stdenv.mkDerivation rec {
1919 name = "gtk+3-${version}";
2020
2121 src = fetchurl {
2222 url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
23− sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b";
23+ sha256 = "080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj";
2424 };
2525
2626 outputs = [ "out" "dev" ];
@@ -35,18 +35,6 @@ stdenv.mkDerivation rec {
3535 url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
3636 sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
3737 })
38− (fetchpatch {
39− name = "fix-fribidi-linking.patch";
40− url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch;
41− sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr";
42− })
43− (fetchpatch {
44− # https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged
45− # but isn't in 3.24.5
46− name = "export-missing-symbols.patch";
47− url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch;
48− sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl";
49− })
5038 ] ++ optionals stdenv.isDarwin [
5139 # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
5240 # let’s drop that dependency in similar way to how other parts of the library do it
pkgs/development/libraries/gtkmm/3.x.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "gtkmm";
5− version = "3.24.0";
5+ version = "3.24.1";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "0hxaq4x9jqj8vvnv3sb6nwapz83v8lclbm887qqci0g50llcjpyg";
9+ sha256 = "1zfj89spr8ianib5y10wcw63ybdmyjy58a15vqs0m8jq4knl5znx";
1010 };
1111
1212 outputs = [ "out" "dev" ];
pkgs/development/libraries/gtksourceview/3.x.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
1+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala
22, libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
33
44stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 outputs = [ "out" "dev" ];
2121
22− nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala_0_40 ];
22+ nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala ];
2323
2424 checkInputs = [ xvfb_run dbus ];
2525
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333
3434 enableParallelBuilding = true;
3535
36− doCheck = stdenv.isLinux;
36+ doCheck = false; # FAIL: test-language
3737 checkPhase = ''
3838 NO_AT_BRIDGE=1 \
3939 XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
pkgs/development/libraries/gtksourceview/4.x.nix+4−4
@@ -1,13 +1,13 @@
1−{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
1+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala
22, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
33
44stdenv.mkDerivation rec {
55 name = "gtksourceview-${version}";
6− version = "4.0.3";
6+ version = "4.2.0";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10− sha256 = "0wwxgw43dmmaz07lzdzpladir26l2bly3lnf2ks6pna152wafm9x";
10+ sha256 = "0xgnjj7jd56wbl99s76sa1vjq9bkz4mdsxwgwlcphg689liyncf4";
1111 };
1212
1313 propagatedBuildInputs = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 outputs = [ "out" "dev" ];
2121
22− nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala_0_40 ];
22+ nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala ];
2323
2424 checkInputs = [ xvfb_run dbus ];
2525
pkgs/development/libraries/gvfs/default.nix+3−4
@@ -9,20 +9,19 @@
99
1010let
1111 pname = "gvfs";
12− version = "1.38.1";
12+ version = "1.40.0";
1313in stdenv.mkDerivation rec {
1414 name = "${pname}-${version}";
1515
1616 src = fetchurl {
1717 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
18− sha256 = "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd";
18+ sha256 = "1wp266dx3v2nwrf46cb4vpmv5d4qaag5yb5gkw7rynn9g55xcf9p";
1919 };
2020
2121 postPatch = ''
2222 # patchShebangs requires executable file
23− chmod +x codegen.py meson_post_install.py
23+ chmod +x meson_post_install.py
2424 patchShebangs meson_post_install.py
25− patchShebangs codegen.py
2625 patchShebangs test test-driver
2726 '';
2827
pkgs/development/libraries/itk/default.nix−1
@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
99 };
1010
1111 cmakeFlags = [
12− "-DBUILD_TESTING=OFF"
1312 "-DBUILD_EXAMPLES=OFF"
1413 "-DBUILD_SHARED_LIBS=ON"
1514 "-DModule_ITKMINC=ON"
pkgs/development/libraries/jasper/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 name = "jasper-${version}";
5− version = "2.0.14";
5+ version = "2.0.16";
66
77 src = fetchFromGitHub {
88 repo = "jasper";
99 owner = "mdadams";
1010 rev = "version-${version}";
11− sha256 = "0aarg8nbik9wrm7fx0451sbm5ypfdfr6i169pxzi354mpdp8gg7f";
11+ sha256 = "05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6";
1212 };
1313
1414 patches = [
pkgs/development/libraries/jsonrpc-glib/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
22stdenv.mkDerivation rec {
33 pname = "jsonrpc-glib";
4− version = "3.30.1";
4+ version = "3.32.0";
55
66 outputs = [ "out" "dev" "devdoc" ];
77
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "1iqxfdymsspsn1xr5bv7xllw73yhqq6k9bfixsggrf2g85pwwxdn";
13+ sha256 = "1sx6xvzzdm9k0vfmpgg07abz7a9kar20h1a9ml0wgjdxr0valq5w";
1414 };
1515
1616 mesonFlags = [
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch+2−2
@@ -1,5 +1,5 @@
11diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
2−index 52b2eb2..a04596c 100644
2+index 275fd65..a04596c 100644
33--- a/kde-modules/KDEInstallDirs.cmake
44+++ b/kde-modules/KDEInstallDirs.cmake
55@@ -232,34 +232,6 @@
@@ -14,7 +14,7 @@ index 52b2eb2..a04596c 100644
1414-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
1515-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
1616-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
17−-# See http://wiki.debian.org/Multiarch
17+-# See https://wiki.debian.org/Multiarch
1818-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
1919- AND NOT CMAKE_CROSSCOMPILING
2020- AND NOT DEFINED ENV{FLATPAK_ID})
pkgs/development/libraries/kde-frameworks/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ )
1+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.56/ )
pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix+2−2
@@ -1,7 +1,7 @@
11{
22 mkDerivation, lib, copyPathsToStore,
33 extra-cmake-modules,
4− attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, qtmultimedia, taglib
4+ attr, ebook_tools, exiv2, ffmpeg, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib
55}:
66
77mkDerivation {
@@ -9,7 +9,7 @@ mkDerivation {
99 meta = { maintainers = [ lib.maintainers.ttuegel ]; };
1010 nativeBuildInputs = [ extra-cmake-modules ];
1111 buildInputs = [
12− attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase qtmultimedia
12+ attr ebook_tools exiv2 ffmpeg karchive kcoreaddons ki18n poppler qtbase qtmultimedia
1313 taglib
1414 ];
1515 patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
pkgs/development/libraries/kde-frameworks/srcs.nix+316−316
@@ -3,635 +3,635 @@
33
44{
55 attica = {
6− version = "5.54.0";
6+ version = "5.56.0";
77 src = fetchurl {
8− url = "${mirror}/stable/frameworks/5.54/attica-5.54.0.tar.xz";
9− sha256 = "1gr7w0mf3aq5xyl9il3483m9aqgb981vxn02g2khm6dfsr6z2aln";
10− name = "attica-5.54.0.tar.xz";
8+ url = "${mirror}/stable/frameworks/5.56/attica-5.56.0.tar.xz";
9+ sha256 = "1ib68yg7dgfyh2kq72abw5bh8h0m85z3hcada3b3axq2xkcfxfmb";
10+ name = "attica-5.56.0.tar.xz";
1111 };
1212 };
1313 baloo = {
14− version = "5.54.0";
14+ version = "5.56.0";
1515 src = fetchurl {
16− url = "${mirror}/stable/frameworks/5.54/baloo-5.54.0.tar.xz";
17− sha256 = "0wv8zi03plr279v9p923rwkx2kwhbpd6xlzyqi4v14vhcrmapg1c";
18− name = "baloo-5.54.0.tar.xz";
16+ url = "${mirror}/stable/frameworks/5.56/baloo-5.56.0.tar.xz";
17+ sha256 = "04hjlhlgw26l2pl4b5jk76xfs7366my71zp1xgiws5aq620bmmcy";
18+ name = "baloo-5.56.0.tar.xz";
1919 };
2020 };
2121 bluez-qt = {
22− version = "5.54.0";
22+ version = "5.56.0";
2323 src = fetchurl {
24− url = "${mirror}/stable/frameworks/5.54/bluez-qt-5.54.0.tar.xz";
25− sha256 = "1br9496lahzqmzmvdic5835ig18w3g211l1w4qfzpgr50yin9n5v";
26− name = "bluez-qt-5.54.0.tar.xz";
24+ url = "${mirror}/stable/frameworks/5.56/bluez-qt-5.56.0.tar.xz";
25+ sha256 = "1phph0rjms8n2qpkh9bk1n1n1cd75znsqj9r8njs1siasm6vi4nm";
26+ name = "bluez-qt-5.56.0.tar.xz";
2727 };
2828 };
2929 breeze-icons = {
30− version = "5.54.0";
30+ version = "5.56.0";
3131 src = fetchurl {
32− url = "${mirror}/stable/frameworks/5.54/breeze-icons-5.54.0.tar.xz";
33− sha256 = "1g5dppg2iq5bd3r3s8bi8jqnvnh1rm7s3sv51shmaamq5qf0n5jy";
34− name = "breeze-icons-5.54.0.tar.xz";
32+ url = "${mirror}/stable/frameworks/5.56/breeze-icons-5.56.0.tar.xz";
33+ sha256 = "0n6gizmzay98q1vi9ac60p0xq9hpaj9q0gcf8vbmvk4m0yzdd63x";
34+ name = "breeze-icons-5.56.0.tar.xz";
3535 };
3636 };
3737 extra-cmake-modules = {
38− version = "5.54.0";
38+ version = "5.56.0";
3939 src = fetchurl {
40− url = "${mirror}/stable/frameworks/5.54/extra-cmake-modules-5.54.0.tar.xz";
41− sha256 = "0i3iqwvdqf2wpg8lsbna4vgmb18pnbv2772sg9k6zzhvkwsskdwi";
42− name = "extra-cmake-modules-5.54.0.tar.xz";
40+ url = "${mirror}/stable/frameworks/5.56/extra-cmake-modules-5.56.0.tar.xz";
41+ sha256 = "0a5mxk805rlmpgbxwa9qkn515jqpcifsrk8ydxc3anjcsq6ffg4i";
42+ name = "extra-cmake-modules-5.56.0.tar.xz";
4343 };
4444 };
4545 frameworkintegration = {
46− version = "5.54.0";
46+ version = "5.56.0";
4747 src = fetchurl {
48− url = "${mirror}/stable/frameworks/5.54/frameworkintegration-5.54.0.tar.xz";
49− sha256 = "1rzi3ydw7hjhg4vbsfan7zgaa2a2bmp7mph95h2kidf8x816qv2d";
50− name = "frameworkintegration-5.54.0.tar.xz";
48+ url = "${mirror}/stable/frameworks/5.56/frameworkintegration-5.56.0.tar.xz";
49+ sha256 = "1xc0vdvpjzhb6y1pz27c7x36qjjhcf4bll0fm3yljpm956v4d3gf";
50+ name = "frameworkintegration-5.56.0.tar.xz";
5151 };
5252 };
5353 kactivities = {
54− version = "5.54.0";
54+ version = "5.56.0";
5555 src = fetchurl {
56− url = "${mirror}/stable/frameworks/5.54/kactivities-5.54.0.tar.xz";
57− sha256 = "0ipq71g6g7q6yncvbiabwn5kg2280k8ssibbbf6jyh2lg09dmjil";
58− name = "kactivities-5.54.0.tar.xz";
56+ url = "${mirror}/stable/frameworks/5.56/kactivities-5.56.0.tar.xz";
57+ sha256 = "0l0p966b5rs6xjc61mpzmrkj7qqjvlzi6fwc7lky4z3fr924ssp7";
58+ name = "kactivities-5.56.0.tar.xz";
5959 };
6060 };
6161 kactivities-stats = {
62− version = "5.54.0";
62+ version = "5.56.0";
6363 src = fetchurl {
64− url = "${mirror}/stable/frameworks/5.54/kactivities-stats-5.54.0.tar.xz";
65− sha256 = "1ns7f110a5vwabb33b1lnpa85kk5radf87bxm1gw4gzglsv7747d";
66− name = "kactivities-stats-5.54.0.tar.xz";
64+ url = "${mirror}/stable/frameworks/5.56/kactivities-stats-5.56.0.tar.xz";
65+ sha256 = "1v3pf9drb22qv7039grx4k7q3a1jxd2a7sf818mxpqyys4fzkl3f";
66+ name = "kactivities-stats-5.56.0.tar.xz";
6767 };
6868 };
6969 kapidox = {
70− version = "5.54.0";
70+ version = "5.56.0";
7171 src = fetchurl {
72− url = "${mirror}/stable/frameworks/5.54/kapidox-5.54.0.tar.xz";
73− sha256 = "0zwjychzcamsky9l67xnw820b9m8r8pi56gsccg023l1rcigz46c";
74− name = "kapidox-5.54.0.tar.xz";
72+ url = "${mirror}/stable/frameworks/5.56/kapidox-5.56.0.tar.xz";
73+ sha256 = "0rhqqsv4zf13idk426x84jykw6lc74bz7pk606llbmyw4775c7wp";
74+ name = "kapidox-5.56.0.tar.xz";
7575 };
7676 };
7777 karchive = {
78− version = "5.54.0";
78+ version = "5.56.0";
7979 src = fetchurl {
80− url = "${mirror}/stable/frameworks/5.54/karchive-5.54.0.tar.xz";
81− sha256 = "141xqgdk7g3ky0amblrqr4pab1xvvdim5wvckrgawdkjiy5ana4g";
82− name = "karchive-5.54.0.tar.xz";
80+ url = "${mirror}/stable/frameworks/5.56/karchive-5.56.0.tar.xz";
81+ sha256 = "1mnavc5baa4qw90baw5b95760lk61m2rx0vfa3w5d7fid3m6q6i8";
82+ name = "karchive-5.56.0.tar.xz";
8383 };
8484 };
8585 kauth = {
86− version = "5.54.0";
86+ version = "5.56.0";
8787 src = fetchurl {
88− url = "${mirror}/stable/frameworks/5.54/kauth-5.54.0.tar.xz";
89− sha256 = "1ciabazig77rpfksvdlmixj2sa2qnasq13nwvjn3xksnajfm4p2h";
90− name = "kauth-5.54.0.tar.xz";
88+ url = "${mirror}/stable/frameworks/5.56/kauth-5.56.0.tar.xz";
89+ sha256 = "0gb1yh2na2kfphln7arscv5n7llagkkv2y0zdprdy4michqa3k6b";
90+ name = "kauth-5.56.0.tar.xz";
9191 };
9292 };
9393 kbookmarks = {
94− version = "5.54.0";
94+ version = "5.56.0";
9595 src = fetchurl {
96− url = "${mirror}/stable/frameworks/5.54/kbookmarks-5.54.0.tar.xz";
97− sha256 = "1w4rqnzyars1pxam3nym1qily3ihd2j8cpkq8aha70nbj0dj3ckw";
98− name = "kbookmarks-5.54.0.tar.xz";
96+ url = "${mirror}/stable/frameworks/5.56/kbookmarks-5.56.0.tar.xz";
97+ sha256 = "0fwmq70ajyjqcva1n2vnf522gwl44aqsi6s9vf8zxsar14vil082";
98+ name = "kbookmarks-5.56.0.tar.xz";
9999 };
100100 };
101101 kcmutils = {
102− version = "5.54.0";
102+ version = "5.56.0";
103103 src = fetchurl {
104− url = "${mirror}/stable/frameworks/5.54/kcmutils-5.54.0.tar.xz";
105− sha256 = "0a5jz9m27nyl1vchp68170j9v5z4csyv43vpnfs09l6wk9ggdcwh";
106− name = "kcmutils-5.54.0.tar.xz";
104+ url = "${mirror}/stable/frameworks/5.56/kcmutils-5.56.0.tar.xz";
105+ sha256 = "1f1sccwyk6fzqd9ywnhkrsyaklmxi0w0w5jqhp1m4n3l30caixkw";
106+ name = "kcmutils-5.56.0.tar.xz";
107107 };
108108 };
109109 kcodecs = {
110− version = "5.54.0";
110+ version = "5.56.0";
111111 src = fetchurl {
112− url = "${mirror}/stable/frameworks/5.54/kcodecs-5.54.0.tar.xz";
113− sha256 = "1s0ky187fbi34wabpfvdwb1zbblzvk8g83h37ckj9j4rd69mjksc";
114− name = "kcodecs-5.54.0.tar.xz";
112+ url = "${mirror}/stable/frameworks/5.56/kcodecs-5.56.0.tar.xz";
113+ sha256 = "10lw85im4rd3nfdnw2p48cjwq0d47pa2s9v6vmhzmm3hxbflq8z7";
114+ name = "kcodecs-5.56.0.tar.xz";
115115 };
116116 };
117117 kcompletion = {
118− version = "5.54.0";
118+ version = "5.56.0";
119119 src = fetchurl {
120− url = "${mirror}/stable/frameworks/5.54/kcompletion-5.54.0.tar.xz";
121− sha256 = "0sgg09l97amnng0ddxyjpk535097f87bmn60hjqrmpsqb0n3a460";
122− name = "kcompletion-5.54.0.tar.xz";
120+ url = "${mirror}/stable/frameworks/5.56/kcompletion-5.56.0.tar.xz";
121+ sha256 = "1yxsrl0f24ps8xsilh2iqnl88yvw39iw2ch0yk7lwwk47jkgvns9";
122+ name = "kcompletion-5.56.0.tar.xz";
123123 };
124124 };
125125 kconfig = {
126− version = "5.54.0";
126+ version = "5.56.0";
127127 src = fetchurl {
128− url = "${mirror}/stable/frameworks/5.54/kconfig-5.54.0.tar.xz";
129− sha256 = "14p4w0m04c8msdwb3mjfzx6w0lcmln65j3rfvqp58nv5n4yh5dp7";
130− name = "kconfig-5.54.0.tar.xz";
128+ url = "${mirror}/stable/frameworks/5.56/kconfig-5.56.0.tar.xz";
129+ sha256 = "0wii6pn5dq899s1r7p4q5vmm01jk11zwg2ky6760xf8nv8rhg5ra";
130+ name = "kconfig-5.56.0.tar.xz";
131131 };
132132 };
133133 kconfigwidgets = {
134− version = "5.54.0";
134+ version = "5.56.0";
135135 src = fetchurl {
136− url = "${mirror}/stable/frameworks/5.54/kconfigwidgets-5.54.0.tar.xz";
137− sha256 = "1l3hh7qgnz7mnn55abv03pq7zal9dgcw5gnhfr747wknd4h90w31";
138− name = "kconfigwidgets-5.54.0.tar.xz";
136+ url = "${mirror}/stable/frameworks/5.56/kconfigwidgets-5.56.0.tar.xz";
137+ sha256 = "00x5cxgxqza81znzm5rzxzr6scv3s5wbwbhsq61ksmjnlf5wvky5";
138+ name = "kconfigwidgets-5.56.0.tar.xz";
139139 };
140140 };
141141 kcoreaddons = {
142− version = "5.54.0";
142+ version = "5.56.0";
143143 src = fetchurl {
144− url = "${mirror}/stable/frameworks/5.54/kcoreaddons-5.54.0.tar.xz";
145− sha256 = "1n27786js8j8na7kgxirhmswxcz3qkfiqzfabqmmsd0jp4rx1s79";
146− name = "kcoreaddons-5.54.0.tar.xz";
144+ url = "${mirror}/stable/frameworks/5.56/kcoreaddons-5.56.0.tar.xz";
145+ sha256 = "17kvndaab9l6r79rh0pyjgw4yqh99xfyksc4yxzhhlyl3fgh6hcz";
146+ name = "kcoreaddons-5.56.0.tar.xz";
147147 };
148148 };
149149 kcrash = {
150− version = "5.54.0";
150+ version = "5.56.0";
151151 src = fetchurl {
152− url = "${mirror}/stable/frameworks/5.54/kcrash-5.54.0.tar.xz";
153− sha256 = "0wlrlzwdi9dpxkky9sadmbgw0rjisxhym9hr8gzydd2y8q4cr8a7";
154− name = "kcrash-5.54.0.tar.xz";
152+ url = "${mirror}/stable/frameworks/5.56/kcrash-5.56.0.tar.xz";
153+ sha256 = "1q5iyqi1qgk5ngc9fdilrc5mjxy2mb0xbdnlx234hn1a44aq47jq";
154+ name = "kcrash-5.56.0.tar.xz";
155155 };
156156 };
157157 kdbusaddons = {
158− version = "5.54.0";
158+ version = "5.56.0";
159159 src = fetchurl {
160− url = "${mirror}/stable/frameworks/5.54/kdbusaddons-5.54.0.tar.xz";
161− sha256 = "1fvlspqc3w3y4p04gnqz6vrfvl93iwckfk16p608fz7yfgdmlzbf";
162− name = "kdbusaddons-5.54.0.tar.xz";
160+ url = "${mirror}/stable/frameworks/5.56/kdbusaddons-5.56.0.tar.xz";
161+ sha256 = "0wmrcz92k27j0s2iyzd9ldynv4p52x70sxzby2m807ffrs692c5r";
162+ name = "kdbusaddons-5.56.0.tar.xz";
163163 };
164164 };
165165 kdeclarative = {
166− version = "5.54.0";
166+ version = "5.56.0";
167167 src = fetchurl {
168− url = "${mirror}/stable/frameworks/5.54/kdeclarative-5.54.0.tar.xz";
169− sha256 = "0ankjqrlpnj3c9sjnv5p8w279zizkl5ps3i5zw16hg44v6hdmcj0";
170− name = "kdeclarative-5.54.0.tar.xz";
168+ url = "${mirror}/stable/frameworks/5.56/kdeclarative-5.56.0.tar.xz";
169+ sha256 = "0slhxqzbrj23vw7f017cx3brpqkw3933jj7z8kc2bgfzjypj373r";
170+ name = "kdeclarative-5.56.0.tar.xz";
171171 };
172172 };
173173 kded = {
174− version = "5.54.0";
174+ version = "5.56.0";
175175 src = fetchurl {
176− url = "${mirror}/stable/frameworks/5.54/kded-5.54.0.tar.xz";
177− sha256 = "131hvxpqvkyh1sfb1j19jjzy7fyy6xisvpmx12lw1pvks0cnrqgn";
178− name = "kded-5.54.0.tar.xz";
176+ url = "${mirror}/stable/frameworks/5.56/kded-5.56.0.tar.xz";
177+ sha256 = "0fdzpsrigjqssqw25gxz5d1i0j8g3hc8xpv4v74mp0pcv9g10apz";
178+ name = "kded-5.56.0.tar.xz";
179179 };
180180 };
181181 kdelibs4support = {
182− version = "5.54.0";
182+ version = "5.56.0";
183183 src = fetchurl {
184− url = "${mirror}/stable/frameworks/5.54/portingAids/kdelibs4support-5.54.0.tar.xz";
185− sha256 = "02kklfcjsll4pf4rfll7jrr7jpcwd57954ypjjhn3xgr6p0w0hdm";
186− name = "kdelibs4support-5.54.0.tar.xz";
184+ url = "${mirror}/stable/frameworks/5.56/portingAids/kdelibs4support-5.56.0.tar.xz";
185+ sha256 = "1yhfnvzgwmnivm99gkq67gnx0ar02j043mq3fg2lgwlrarqi9k7d";
186+ name = "kdelibs4support-5.56.0.tar.xz";
187187 };
188188 };
189189 kdesignerplugin = {
190− version = "5.54.0";
190+ version = "5.56.0";
191191 src = fetchurl {
192− url = "${mirror}/stable/frameworks/5.54/kdesignerplugin-5.54.0.tar.xz";
193− sha256 = "0hlywnzd3d6bvhib1xqiqx39m7k8g16wsj102f7awd5gw3xrz8ga";
194− name = "kdesignerplugin-5.54.0.tar.xz";
192+ url = "${mirror}/stable/frameworks/5.56/kdesignerplugin-5.56.0.tar.xz";
193+ sha256 = "05nqayzafn2zz74lx8zj7hi7knclcip7zbqmpk1g3nriysc39x4v";
194+ name = "kdesignerplugin-5.56.0.tar.xz";
195195 };
196196 };
197197 kdesu = {
198− version = "5.54.0";
198+ version = "5.56.0";
199199 src = fetchurl {
200− url = "${mirror}/stable/frameworks/5.54/kdesu-5.54.0.tar.xz";
201− sha256 = "1qhw1hmq2b6rkyibidmg532llv31vkhmp0a7j2myzi40ydbx1lar";
202− name = "kdesu-5.54.0.tar.xz";
200+ url = "${mirror}/stable/frameworks/5.56/kdesu-5.56.0.tar.xz";
201+ sha256 = "0fc77rbkd1m7rv4rq56g0fg4vg0siamdm5g788816ig9gn1j76ll";
202+ name = "kdesu-5.56.0.tar.xz";
203203 };
204204 };
205205 kdewebkit = {
206− version = "5.54.0";
206+ version = "5.56.0";
207207 src = fetchurl {
208− url = "${mirror}/stable/frameworks/5.54/kdewebkit-5.54.0.tar.xz";
209− sha256 = "0prl9751a8nv7qhg7fv8qygq0llh71w2p25sldl3zif44340jnhf";
210− name = "kdewebkit-5.54.0.tar.xz";
208+ url = "${mirror}/stable/frameworks/5.56/kdewebkit-5.56.0.tar.xz";
209+ sha256 = "1c1mxs30182ilxybp0xwaljrjg5y9j1ri79169hn8664xs3wcbc2";
210+ name = "kdewebkit-5.56.0.tar.xz";
211211 };
212212 };
213213 kdnssd = {
214− version = "5.54.0";
214+ version = "5.56.0";
215215 src = fetchurl {
216− url = "${mirror}/stable/frameworks/5.54/kdnssd-5.54.0.tar.xz";
217− sha256 = "00sqx2hyqd9yw4nwdl8kmbzm0v0szgqv4nz0q6bchv3hfbax6zk7";
218− name = "kdnssd-5.54.0.tar.xz";
216+ url = "${mirror}/stable/frameworks/5.56/kdnssd-5.56.0.tar.xz";
217+ sha256 = "1gskwc8sbj6cicblmrxh7qnh1gap0qivs8k5zf5qs94p1xc864vy";
218+ name = "kdnssd-5.56.0.tar.xz";
219219 };
220220 };
221221 kdoctools = {
222− version = "5.54.0";
222+ version = "5.56.0";
223223 src = fetchurl {
224− url = "${mirror}/stable/frameworks/5.54/kdoctools-5.54.0.tar.xz";
225− sha256 = "0xbmdqlvyw9s2g8kwn1wmvz09pn4vs386ibm1p92wdnpspp5did6";
226− name = "kdoctools-5.54.0.tar.xz";
224+ url = "${mirror}/stable/frameworks/5.56/kdoctools-5.56.0.tar.xz";
225+ sha256 = "01y06rf1nhw2p8s0j60anr2qvssrqfimddvp2mqqkvx9xkx3py74";
226+ name = "kdoctools-5.56.0.tar.xz";
227227 };
228228 };
229229 kemoticons = {
230− version = "5.54.0";
230+ version = "5.56.0";
231231 src = fetchurl {
232− url = "${mirror}/stable/frameworks/5.54/kemoticons-5.54.0.tar.xz";
233− sha256 = "0ypcffpp0m75qwam386q6pyfbsij16y2vgpkn38li6ypxlxsvx2v";
234− name = "kemoticons-5.54.0.tar.xz";
232+ url = "${mirror}/stable/frameworks/5.56/kemoticons-5.56.0.tar.xz";
233+ sha256 = "00hbd09gnwyfszdwa9yf5m8wpbbapc4kwhs3qxhbvvmll0jv9vl2";
234+ name = "kemoticons-5.56.0.tar.xz";
235235 };
236236 };
237237 kfilemetadata = {
238− version = "5.54.0";
238+ version = "5.56.0";
239239 src = fetchurl {
240− url = "${mirror}/stable/frameworks/5.54/kfilemetadata-5.54.0.tar.xz";
241− sha256 = "1hl61y15nqr5h5k4jqfz9bjj4gw6wdaiacxaslcwzn0sg4xyavab";
242− name = "kfilemetadata-5.54.0.tar.xz";
240+ url = "${mirror}/stable/frameworks/5.56/kfilemetadata-5.56.0.tar.xz";
241+ sha256 = "04pmd2f77zxi14l3rhw4dyrh9dafchxqw1xjyv60j97gmm1b9796";
242+ name = "kfilemetadata-5.56.0.tar.xz";
243243 };
244244 };
245245 kglobalaccel = {
246− version = "5.54.0";
246+ version = "5.56.0";
247247 src = fetchurl {
248− url = "${mirror}/stable/frameworks/5.54/kglobalaccel-5.54.0.tar.xz";
249− sha256 = "10gl8prc1n0si52cmiglkz8dx79dylmxrh5mjpmyy5yy16chs1s1";
250− name = "kglobalaccel-5.54.0.tar.xz";
248+ url = "${mirror}/stable/frameworks/5.56/kglobalaccel-5.56.0.tar.xz";
249+ sha256 = "0pmgvizc2dwrwr7m49125ybcpsc95r9riwxnihf37napyaacd9y3";
250+ name = "kglobalaccel-5.56.0.tar.xz";
251251 };
252252 };
253253 kguiaddons = {
254− version = "5.54.0";
254+ version = "5.56.0";
255255 src = fetchurl {
256− url = "${mirror}/stable/frameworks/5.54/kguiaddons-5.54.0.tar.xz";
257− sha256 = "0lkqxsqdjmc7060pxi5j8gx15kmrb8450cpinzn89nzpdl7rj935";
258− name = "kguiaddons-5.54.0.tar.xz";
256+ url = "${mirror}/stable/frameworks/5.56/kguiaddons-5.56.0.tar.xz";
257+ sha256 = "0gp2i29y1vws8i3q8s1bhyxksa42l6q55m459yczddcvcw0vd45i";
258+ name = "kguiaddons-5.56.0.tar.xz";
259259 };
260260 };
261261 kholidays = {
262− version = "5.54.0";
262+ version = "5.56.0";
263263 src = fetchurl {
264− url = "${mirror}/stable/frameworks/5.54/kholidays-5.54.0.tar.xz";
265− sha256 = "1xp6mpnhlqkfl3pdaj6nq9sqy30z5wm6gms0ycy33n4ly2s8wb1y";
266− name = "kholidays-5.54.0.tar.xz";
264+ url = "${mirror}/stable/frameworks/5.56/kholidays-5.56.0.tar.xz";
265+ sha256 = "0lm2ls3a15qbsfhamh2ldzvr62wi9nrhxd83rhyk3ifsgac4mg18";
266+ name = "kholidays-5.56.0.tar.xz";
267267 };
268268 };
269269 khtml = {
270− version = "5.54.0";
270+ version = "5.56.0";
271271 src = fetchurl {
272− url = "${mirror}/stable/frameworks/5.54/portingAids/khtml-5.54.0.tar.xz";
273− sha256 = "17d8cim4ph7nxc5gkidhxc659yn9a7dqvnrihx9sj1cy01qnc7da";
274− name = "khtml-5.54.0.tar.xz";
272+ url = "${mirror}/stable/frameworks/5.56/portingAids/khtml-5.56.0.tar.xz";
273+ sha256 = "1wmcqc4546mqagqpgb97h3yd7nxaq4si2484li5hnw8mglm1qf3x";
274+ name = "khtml-5.56.0.tar.xz";
275275 };
276276 };
277277 ki18n = {
278− version = "5.54.0";
278+ version = "5.56.0";
279279 src = fetchurl {
280− url = "${mirror}/stable/frameworks/5.54/ki18n-5.54.0.tar.xz";
281− sha256 = "0drbyr2y44h1d88nbgxvp4ix46lin51r8vzhhnjhq2ydqy5za3p3";
282− name = "ki18n-5.54.0.tar.xz";
280+ url = "${mirror}/stable/frameworks/5.56/ki18n-5.56.0.tar.xz";
281+ sha256 = "0hdfad9vmyzfni9ln0dc9p26gpjksk754z28v35hww6z9kgbr1dq";
282+ name = "ki18n-5.56.0.tar.xz";
283283 };
284284 };
285285 kiconthemes = {
286− version = "5.54.0";
286+ version = "5.56.0";
287287 src = fetchurl {
288− url = "${mirror}/stable/frameworks/5.54/kiconthemes-5.54.0.tar.xz";
289− sha256 = "0hc3a6ax3yizpbvklxw3pm0r6j0r5jqx2ffbz1980g21lcgshd7g";
290− name = "kiconthemes-5.54.0.tar.xz";
288+ url = "${mirror}/stable/frameworks/5.56/kiconthemes-5.56.0.tar.xz";
289+ sha256 = "0rdpvbqsb2wqi3glmggilm1mhpy6nc80am5hl4c34269mxd55q8a";
290+ name = "kiconthemes-5.56.0.tar.xz";
291291 };
292292 };
293293 kidletime = {
294− version = "5.54.0";
294+ version = "5.56.0";
295295 src = fetchurl {
296− url = "${mirror}/stable/frameworks/5.54/kidletime-5.54.0.tar.xz";
297− sha256 = "1x0z0ipdizgv6jkklxp6maclx8f6ya2bv1q39hvxxnnmly8q3vjm";
298− name = "kidletime-5.54.0.tar.xz";
296+ url = "${mirror}/stable/frameworks/5.56/kidletime-5.56.0.tar.xz";
297+ sha256 = "09184bi8fvq34hwkldyibji7r79wd2wvhxk1i4kzkjg177dnaa95";
298+ name = "kidletime-5.56.0.tar.xz";
299299 };
300300 };
301301 kimageformats = {
302− version = "5.54.0";
302+ version = "5.56.0";
303303 src = fetchurl {
304− url = "${mirror}/stable/frameworks/5.54/kimageformats-5.54.0.tar.xz";
305− sha256 = "0xfzpzaqgdncwxvg27qb0ryqi78nbsi0xcsg9cjmgspfx5mlgi15";
306− name = "kimageformats-5.54.0.tar.xz";
304+ url = "${mirror}/stable/frameworks/5.56/kimageformats-5.56.0.tar.xz";
305+ sha256 = "1cgh32jkg0ybfp8z6qwn7y6yr9mb0fiqly4pb0qc1lcm6awdx3d5";
306+ name = "kimageformats-5.56.0.tar.xz";
307307 };
308308 };
309309 kinit = {
310− version = "5.54.0";
310+ version = "5.56.0";
311311 src = fetchurl {
312− url = "${mirror}/stable/frameworks/5.54/kinit-5.54.0.tar.xz";
313− sha256 = "0pmr6ckysdqpni49i9jgapsk88jfbrnlfybpcp3v51kl2nkwm0i9";
314− name = "kinit-5.54.0.tar.xz";
312+ url = "${mirror}/stable/frameworks/5.56/kinit-5.56.0.tar.xz";
313+ sha256 = "1ihrannyaj33wsir20qy363vdjafhlsmj45qzl3xkl4rbyl6ngs7";
314+ name = "kinit-5.56.0.tar.xz";
315315 };
316316 };
317317 kio = {
318− version = "5.54.1";
318+ version = "5.56.0";
319319 src = fetchurl {
320− url = "${mirror}/stable/frameworks/5.54/kio-5.54.1.tar.xz";
321− sha256 = "11wdsq87w1ddkrm0mpik2qf0c0k897f1rflszfrrwkplfb0z63xp";
322− name = "kio-5.54.1.tar.xz";
320+ url = "${mirror}/stable/frameworks/5.56/kio-5.56.0.tar.xz";
321+ sha256 = "1m2c3a5isj966snmzs97i9kyhwnbzlwf61lqw5yxck25x7d0pyyn";
322+ name = "kio-5.56.0.tar.xz";
323323 };
324324 };
325325 kirigami2 = {
326− version = "5.54.0";
326+ version = "5.56.1";
327327 src = fetchurl {
328− url = "${mirror}/stable/frameworks/5.54/kirigami2-5.54.0.tar.xz";
329− sha256 = "0iny9br3vpakvv0bmgy0mmw2y10d4kqbahjpfa3726qai4gligp2";
330− name = "kirigami2-5.54.0.tar.xz";
328+ url = "${mirror}/stable/frameworks/5.56/kirigami2-5.56.1.tar.xz";
329+ sha256 = "0npq65kslwkdsylmv5hgcqsa5i9386dmnx8ig79rlf3409awn2f8";
330+ name = "kirigami2-5.56.1.tar.xz";
331331 };
332332 };
333333 kitemmodels = {
334− version = "5.54.0";
334+ version = "5.56.0";
335335 src = fetchurl {
336− url = "${mirror}/stable/frameworks/5.54/kitemmodels-5.54.0.tar.xz";
337− sha256 = "1s3wv75sbb4kpgz02cbm7smp8h6rk1ixv0gafbvz9514i9g4d760";
338− name = "kitemmodels-5.54.0.tar.xz";
336+ url = "${mirror}/stable/frameworks/5.56/kitemmodels-5.56.0.tar.xz";
337+ sha256 = "13m1bvhljyc1jb9hdlz5v009kmkz7q0qf06l5zkck5k0fq41rkrg";
338+ name = "kitemmodels-5.56.0.tar.xz";
339339 };
340340 };
341341 kitemviews = {
342− version = "5.54.0";
342+ version = "5.56.0";
343343 src = fetchurl {
344− url = "${mirror}/stable/frameworks/5.54/kitemviews-5.54.0.tar.xz";
345− sha256 = "1cw9i8xik287rvb12alpqsph902nhfmbn4cfjx5gj7k888n8k3mk";
346− name = "kitemviews-5.54.0.tar.xz";
344+ url = "${mirror}/stable/frameworks/5.56/kitemviews-5.56.0.tar.xz";
345+ sha256 = "1ar492jpyprxvzcgnq0gnbyxlndb3rd0z32drk7xsx19vpk3ch58";
346+ name = "kitemviews-5.56.0.tar.xz";
347347 };
348348 };
349349 kjobwidgets = {
350− version = "5.54.0";
350+ version = "5.56.0";
351351 src = fetchurl {
352− url = "${mirror}/stable/frameworks/5.54/kjobwidgets-5.54.0.tar.xz";
353− sha256 = "0d3jxabjlf2s4p34pzrpfsg4xp9s8qd7dmg50yxl59dijd42xgxq";
354− name = "kjobwidgets-5.54.0.tar.xz";
352+ url = "${mirror}/stable/frameworks/5.56/kjobwidgets-5.56.0.tar.xz";
353+ sha256 = "1dh4ilry575k6z0glqb60ldjfkwpnkvijdzfyrc22bn84hbh19iy";
354+ name = "kjobwidgets-5.56.0.tar.xz";
355355 };
356356 };
357357 kjs = {
358− version = "5.54.0";
358+ version = "5.56.0";
359359 src = fetchurl {
360− url = "${mirror}/stable/frameworks/5.54/portingAids/kjs-5.54.0.tar.xz";
361− sha256 = "0bidbvbwbrbwwm0drw6l43vgmsp50c946jjq7pgnq1gf7mhscwcy";
362− name = "kjs-5.54.0.tar.xz";
360+ url = "${mirror}/stable/frameworks/5.56/portingAids/kjs-5.56.0.tar.xz";
361+ sha256 = "1b3l76ipf0fr8bvp3f4njimmg5yw9ciwzzgvb34ds65aycplagln";
362+ name = "kjs-5.56.0.tar.xz";
363363 };
364364 };
365365 kjsembed = {
366− version = "5.54.0";
366+ version = "5.56.0";
367367 src = fetchurl {
368− url = "${mirror}/stable/frameworks/5.54/portingAids/kjsembed-5.54.0.tar.xz";
369− sha256 = "1pjpk8ysrnh78infq99i0wrf78h8h7hbfnr1m7agzffhbqa671z8";
370− name = "kjsembed-5.54.0.tar.xz";
368+ url = "${mirror}/stable/frameworks/5.56/portingAids/kjsembed-5.56.0.tar.xz";
369+ sha256 = "0lkfq7099yiwvlycrix3s0dbk860rqfnix5fiw5vmi855is7mpkv";
370+ name = "kjsembed-5.56.0.tar.xz";
371371 };
372372 };
373373 kmediaplayer = {
374− version = "5.54.0";
374+ version = "5.56.0";
375375 src = fetchurl {
376− url = "${mirror}/stable/frameworks/5.54/portingAids/kmediaplayer-5.54.0.tar.xz";
377− sha256 = "0qalqqkn2yvxgr45l7zm36bcpxwbgn8ngxsvyb5cxfaalwr0mkyf";
378− name = "kmediaplayer-5.54.0.tar.xz";
376+ url = "${mirror}/stable/frameworks/5.56/portingAids/kmediaplayer-5.56.0.tar.xz";
377+ sha256 = "0blqbi40l1pk8qf9054ha4a8r7cb4pddbqydsqlsscl4gm8530jh";
378+ name = "kmediaplayer-5.56.0.tar.xz";
379379 };
380380 };
381381 knewstuff = {
382− version = "5.54.0";
382+ version = "5.56.0";
383383 src = fetchurl {
384− url = "${mirror}/stable/frameworks/5.54/knewstuff-5.54.0.tar.xz";
385− sha256 = "1l3ibadjvaqqjsb1lhkf6jkzy80dk15fgid125bqk4amwsyygnd3";
386− name = "knewstuff-5.54.0.tar.xz";
384+ url = "${mirror}/stable/frameworks/5.56/knewstuff-5.56.0.tar.xz";
385+ sha256 = "0r0ia0521vfri7mc6wpg3ihryqj48s3krgmliwbh635rfd3lcj9j";
386+ name = "knewstuff-5.56.0.tar.xz";
387387 };
388388 };
389389 knotifications = {
390− version = "5.54.0";
390+ version = "5.56.0";
391391 src = fetchurl {
392− url = "${mirror}/stable/frameworks/5.54/knotifications-5.54.0.tar.xz";
393− sha256 = "1agglvwaf0wh3fcs0ww3jxn900ych4dsvbaylrx4qip6girfmiyn";
394− name = "knotifications-5.54.0.tar.xz";
392+ url = "${mirror}/stable/frameworks/5.56/knotifications-5.56.0.tar.xz";
393+ sha256 = "05nf2870fq9cwacgyy8iky5v37fq4jrsh4hl9xy9928d19qnmb24";
394+ name = "knotifications-5.56.0.tar.xz";
395395 };
396396 };
397397 knotifyconfig = {
398− version = "5.54.0";
398+ version = "5.56.0";
399399 src = fetchurl {
400− url = "${mirror}/stable/frameworks/5.54/knotifyconfig-5.54.0.tar.xz";
401− sha256 = "1ibxqi0y43qgjj4nikxwfppmda9xjmz63c5fml8c4w5d9mdag3if";
402− name = "knotifyconfig-5.54.0.tar.xz";
400+ url = "${mirror}/stable/frameworks/5.56/knotifyconfig-5.56.0.tar.xz";
401+ sha256 = "0zwq0p779482sxxjg62z1rkpiiyn6b3r47l450dm6hm56vkf7vxl";
402+ name = "knotifyconfig-5.56.0.tar.xz";
403403 };
404404 };
405405 kpackage = {
406− version = "5.54.0";
406+ version = "5.56.0";
407407 src = fetchurl {
408− url = "${mirror}/stable/frameworks/5.54/kpackage-5.54.0.tar.xz";
409− sha256 = "1s1n7r3j7l4kvd85dgssaaz70dd2w8vp34kwg49ak58cdai01vzb";
410− name = "kpackage-5.54.0.tar.xz";
408+ url = "${mirror}/stable/frameworks/5.56/kpackage-5.56.0.tar.xz";
409+ sha256 = "037r0ldp70q0yafld1ddff1d4wipb5ras88r72qazjcfqfg9rzjr";
410+ name = "kpackage-5.56.0.tar.xz";
411411 };
412412 };
413413 kparts = {
414− version = "5.54.0";
414+ version = "5.56.0";
415415 src = fetchurl {
416− url = "${mirror}/stable/frameworks/5.54/kparts-5.54.0.tar.xz";
417− sha256 = "0y2dr286hb2w4r7ifq39vd7ajsalqyh9d91dm19b2rpgdmvgxai6";
418− name = "kparts-5.54.0.tar.xz";
416+ url = "${mirror}/stable/frameworks/5.56/kparts-5.56.0.tar.xz";
417+ sha256 = "1vj5ard5ff0wzpjqzrkd2kb31dkjly1cf4ww1ljrrwi7qgzxgw0z";
418+ name = "kparts-5.56.0.tar.xz";
419419 };
420420 };
421421 kpeople = {
422− version = "5.54.0";
422+ version = "5.56.0";
423423 src = fetchurl {
424− url = "${mirror}/stable/frameworks/5.54/kpeople-5.54.0.tar.xz";
425− sha256 = "0sl8wcj7w9vgczcv8mfvjlnghidyadbh1qsiv0pj63ywl7xgr1hx";
426− name = "kpeople-5.54.0.tar.xz";
424+ url = "${mirror}/stable/frameworks/5.56/kpeople-5.56.0.tar.xz";
425+ sha256 = "0h456kjhx4ylbkiv3706g8ccdq55aamrhj5rgiql2gaw3d5dbrkr";
426+ name = "kpeople-5.56.0.tar.xz";
427427 };
428428 };
429429 kplotting = {
430− version = "5.54.0";
430+ version = "5.56.0";
431431 src = fetchurl {
432− url = "${mirror}/stable/frameworks/5.54/kplotting-5.54.0.tar.xz";
433− sha256 = "02mab80jyfgdj8xwbwkm181cc5vpsmbn561242q7ayjgxdiszzw9";
434− name = "kplotting-5.54.0.tar.xz";
432+ url = "${mirror}/stable/frameworks/5.56/kplotting-5.56.0.tar.xz";
433+ sha256 = "1hrk3iv77s46lcs6c5mfiyzr80vpg9261mlixc3qwps0mww43r1r";
434+ name = "kplotting-5.56.0.tar.xz";
435435 };
436436 };
437437 kpty = {
438− version = "5.54.0";
438+ version = "5.56.0";
439439 src = fetchurl {
440− url = "${mirror}/stable/frameworks/5.54/kpty-5.54.0.tar.xz";
441− sha256 = "04sj612x15311yk2jmr3ak430syp5p59w559670sd18ih99mf8m3";
442− name = "kpty-5.54.0.tar.xz";
440+ url = "${mirror}/stable/frameworks/5.56/kpty-5.56.0.tar.xz";
441+ sha256 = "1dzp4a6rz6hsp1y8m5l73i8v2a3bpwkv4rrypkd00051ajcch47k";
442+ name = "kpty-5.56.0.tar.xz";
443443 };
444444 };
445445 kross = {
446− version = "5.54.0";
446+ version = "5.56.0";
447447 src = fetchurl {
448− url = "${mirror}/stable/frameworks/5.54/portingAids/kross-5.54.0.tar.xz";
449− sha256 = "18ij9339khskla4r0afl0n6x4pd157y1l5bk2ldb9anpck3p71kd";
450− name = "kross-5.54.0.tar.xz";
448+ url = "${mirror}/stable/frameworks/5.56/portingAids/kross-5.56.0.tar.xz";
449+ sha256 = "0ry6fpl0rb8z5r08bzh6kj14mp7l94calvdk3vrnc89cpm5gxymv";
450+ name = "kross-5.56.0.tar.xz";
451451 };
452452 };
453453 krunner = {
454− version = "5.54.0";
454+ version = "5.56.0";
455455 src = fetchurl {
456− url = "${mirror}/stable/frameworks/5.54/krunner-5.54.0.tar.xz";
457− sha256 = "06y592v32926wq9iaypryj0173ca05vv0p5rrs4n77kwhkl0zq0v";
458− name = "krunner-5.54.0.tar.xz";
456+ url = "${mirror}/stable/frameworks/5.56/krunner-5.56.0.tar.xz";
457+ sha256 = "1gs0fr78zbhxl8c08zj4s98zshc42zxzwv7p9l7rmq8h21spc8ga";
458+ name = "krunner-5.56.0.tar.xz";
459459 };
460460 };
461461 kservice = {
462− version = "5.54.0";
462+ version = "5.56.0";
463463 src = fetchurl {
464− url = "${mirror}/stable/frameworks/5.54/kservice-5.54.0.tar.xz";
465− sha256 = "10qmrqyfjhf5nzjailgmb86nq62ffrmiddk3880mh49fwxs4l3qx";
466− name = "kservice-5.54.0.tar.xz";
464+ url = "${mirror}/stable/frameworks/5.56/kservice-5.56.0.tar.xz";
465+ sha256 = "1hsc8pagigwspyv9ipl3l2b9mf8amfksk8a2k3iic9nw1hmpxinv";
466+ name = "kservice-5.56.0.tar.xz";
467467 };
468468 };
469469 ktexteditor = {
470− version = "5.54.0";
470+ version = "5.56.0";
471471 src = fetchurl {
472− url = "${mirror}/stable/frameworks/5.54/ktexteditor-5.54.0.tar.xz";
473− sha256 = "12yywvv82lmqmx89j1qxj45an49vx34brifxs9rpy3nxyh9c3vzy";
474− name = "ktexteditor-5.54.0.tar.xz";
472+ url = "${mirror}/stable/frameworks/5.56/ktexteditor-5.56.0.tar.xz";
473+ sha256 = "1a2r97v3xwh61q688jvwkk99bphfd0v0ldqms5d73q3m6w1x122c";
474+ name = "ktexteditor-5.56.0.tar.xz";
475475 };
476476 };
477477 ktextwidgets = {
478− version = "5.54.0";
478+ version = "5.56.0";
479479 src = fetchurl {
480− url = "${mirror}/stable/frameworks/5.54/ktextwidgets-5.54.0.tar.xz";
481− sha256 = "154j3an7x787l44hw1fmksm3h6kziyaw4l61zw9mas24z3d86hl5";
482− name = "ktextwidgets-5.54.0.tar.xz";
480+ url = "${mirror}/stable/frameworks/5.56/ktextwidgets-5.56.0.tar.xz";
481+ sha256 = "1km19z577y29di8zp6amlccqdavxk4f4sg1dblj6gp64zkw9dbqp";
482+ name = "ktextwidgets-5.56.0.tar.xz";
483483 };
484484 };
485485 kunitconversion = {
486− version = "5.54.0";
486+ version = "5.56.0";
487487 src = fetchurl {
488− url = "${mirror}/stable/frameworks/5.54/kunitconversion-5.54.0.tar.xz";
489− sha256 = "0lxrydnjlilfm92aqrpd76dk8yfprgnb7nr66dwmbdmqz7znbl8h";
490− name = "kunitconversion-5.54.0.tar.xz";
488+ url = "${mirror}/stable/frameworks/5.56/kunitconversion-5.56.0.tar.xz";
489+ sha256 = "1kf5dc6p77mkx2i23ppfs0k3laybmx5vqq7aq1bxnkxj1ws75144";
490+ name = "kunitconversion-5.56.0.tar.xz";
491491 };
492492 };
493493 kwallet = {
494− version = "5.54.0";
494+ version = "5.56.0";
495495 src = fetchurl {
496− url = "${mirror}/stable/frameworks/5.54/kwallet-5.54.0.tar.xz";
497− sha256 = "0hyipka97g2djk43x8pqbjvrgswsp8kph6za0s5dl4napfikq8k2";
498− name = "kwallet-5.54.0.tar.xz";
496+ url = "${mirror}/stable/frameworks/5.56/kwallet-5.56.0.tar.xz";
497+ sha256 = "02i6xkq9ki6sybjvcxkznf5v8b34pqxysg9pi5v4z6jkw2jpr5fj";
498+ name = "kwallet-5.56.0.tar.xz";
499499 };
500500 };
501501 kwayland = {
502− version = "5.54.0";
502+ version = "5.56.0";
503503 src = fetchurl {
504− url = "${mirror}/stable/frameworks/5.54/kwayland-5.54.0.tar.xz";
505− sha256 = "0y1710l68qlf37zy26nyn25r50a00mrm5cnwgfs9f40s749amigf";
506− name = "kwayland-5.54.0.tar.xz";
504+ url = "${mirror}/stable/frameworks/5.56/kwayland-5.56.0.tar.xz";
505+ sha256 = "1779in51z63sv6607xd7y30wprs9vs8nnqa28fxg1q4nicwnvrxv";
506+ name = "kwayland-5.56.0.tar.xz";
507507 };
508508 };
509509 kwidgetsaddons = {
510− version = "5.54.0";
510+ version = "5.56.0";
511511 src = fetchurl {
512− url = "${mirror}/stable/frameworks/5.54/kwidgetsaddons-5.54.0.tar.xz";
513− sha256 = "01qxklhigfazhma0f6m1fkcbh9waxpvzpz6y2jlflvgbw2db82gh";
514− name = "kwidgetsaddons-5.54.0.tar.xz";
512+ url = "${mirror}/stable/frameworks/5.56/kwidgetsaddons-5.56.0.tar.xz";
513+ sha256 = "0flmw1wfzs49dmmlbbimizjwj09wp4qwr9znxn3h5yfn0mxfc1lv";
514+ name = "kwidgetsaddons-5.56.0.tar.xz";
515515 };
516516 };
517517 kwindowsystem = {
518− version = "5.54.0";
518+ version = "5.56.0";
519519 src = fetchurl {
520− url = "${mirror}/stable/frameworks/5.54/kwindowsystem-5.54.0.tar.xz";
521− sha256 = "1n9h4gg5ih29avvcpplqfy7nq58xx6jv6a04m1wkjr1rzn4dyfnb";
522− name = "kwindowsystem-5.54.0.tar.xz";
520+ url = "${mirror}/stable/frameworks/5.56/kwindowsystem-5.56.0.tar.xz";
521+ sha256 = "0dk9ymlpdpvra2zm1f2rcx2dwnn9qc49n2y7p6iw094fwk5rzczc";
522+ name = "kwindowsystem-5.56.0.tar.xz";
523523 };
524524 };
525525 kxmlgui = {
526− version = "5.54.0";
526+ version = "5.56.0";
527527 src = fetchurl {
528− url = "${mirror}/stable/frameworks/5.54/kxmlgui-5.54.0.tar.xz";
529− sha256 = "01napbq81mcp9ngyl26an52l6ndsgrhzhy2mfd8jrbil2sbrcxq7";
530− name = "kxmlgui-5.54.0.tar.xz";
528+ url = "${mirror}/stable/frameworks/5.56/kxmlgui-5.56.0.tar.xz";
529+ sha256 = "1ipa0qnkh6gs3f6ygvb7cf0yv1m89m3cdl1z23br4fn14d5mxbrl";
530+ name = "kxmlgui-5.56.0.tar.xz";
531531 };
532532 };
533533 kxmlrpcclient = {
534− version = "5.54.0";
534+ version = "5.56.0";
535535 src = fetchurl {
536− url = "${mirror}/stable/frameworks/5.54/kxmlrpcclient-5.54.0.tar.xz";
537− sha256 = "199syc5wl8myc4vcvbnw4a8mlfkb2gcmgs57p8w7akp7mz6l75y6";
538− name = "kxmlrpcclient-5.54.0.tar.xz";
536+ url = "${mirror}/stable/frameworks/5.56/kxmlrpcclient-5.56.0.tar.xz";
537+ sha256 = "1bjnpl4521gv35zghaanz6v5bap2b9n2kz7b0rif1bf6iak018ql";
538+ name = "kxmlrpcclient-5.56.0.tar.xz";
539539 };
540540 };
541541 modemmanager-qt = {
542− version = "5.54.0";
542+ version = "5.56.0";
543543 src = fetchurl {
544− url = "${mirror}/stable/frameworks/5.54/modemmanager-qt-5.54.0.tar.xz";
545− sha256 = "0n54gh83b6d42azv40km7j223qb2f4f9ng23xvvawzc7l2ksm350";
546− name = "modemmanager-qt-5.54.0.tar.xz";
544+ url = "${mirror}/stable/frameworks/5.56/modemmanager-qt-5.56.0.tar.xz";
545+ sha256 = "1xwx6yybij8nlaqfpz76pindfxshcyg9p21nqm6ddpgyzh74klbc";
546+ name = "modemmanager-qt-5.56.0.tar.xz";
547547 };
548548 };
549549 networkmanager-qt = {
550− version = "5.54.0";
550+ version = "5.56.0";
551551 src = fetchurl {
552− url = "${mirror}/stable/frameworks/5.54/networkmanager-qt-5.54.0.tar.xz";
553− sha256 = "0bh5li6r7r3nws5zj0hp4iy4xhiyh7rszzwpp6ag93vz5g5fsl9y";
554− name = "networkmanager-qt-5.54.0.tar.xz";
552+ url = "${mirror}/stable/frameworks/5.56/networkmanager-qt-5.56.0.tar.xz";
553+ sha256 = "0p0b3rq7s1yzy6zspd6xnzjc0hza9d7fixm8pw369kn5k3pi5lk1";
554+ name = "networkmanager-qt-5.56.0.tar.xz";
555555 };
556556 };
557557 oxygen-icons5 = {
558− version = "5.54.0";
558+ version = "5.56.0";
559559 src = fetchurl {
560− url = "${mirror}/stable/frameworks/5.54/oxygen-icons5-5.54.0.tar.xz";
561− sha256 = "1sdd8ygkyl4d1mwrachcf0ahpikkby3xhdyz212xj9qmhmsgwa46";
562− name = "oxygen-icons5-5.54.0.tar.xz";
560+ url = "${mirror}/stable/frameworks/5.56/oxygen-icons5-5.56.0.tar.xz";
561+ sha256 = "17cjcfmc8vywh8n2ck0s3b0i88ilamdah0gipicn7vj65l4wc1qb";
562+ name = "oxygen-icons5-5.56.0.tar.xz";
563563 };
564564 };
565565 plasma-framework = {
566− version = "5.54.0";
566+ version = "5.56.1";
567567 src = fetchurl {
568− url = "${mirror}/stable/frameworks/5.54/plasma-framework-5.54.0.tar.xz";
569− sha256 = "1933i8irn76ilz3nychbnhy1bsc39iscn3qrab0lwmshfmw8c4zj";
570− name = "plasma-framework-5.54.0.tar.xz";
568+ url = "${mirror}/stable/frameworks/5.56/plasma-framework-5.56.1.tar.xz";
569+ sha256 = "0wn7q2cfrgzcprzgqj1d4calc0mmrrn615698fish7x9s1n7ag6w";
570+ name = "plasma-framework-5.56.1.tar.xz";
571571 };
572572 };
573573 prison = {
574− version = "5.54.0";
574+ version = "5.56.0";
575575 src = fetchurl {
576− url = "${mirror}/stable/frameworks/5.54/prison-5.54.0.tar.xz";
577− sha256 = "1z7gymk4hkwaa0ni1454ndvpm2lwqyyfbih38h0lfb8lrswnv3kb";
578− name = "prison-5.54.0.tar.xz";
576+ url = "${mirror}/stable/frameworks/5.56/prison-5.56.0.tar.xz";
577+ sha256 = "05hy6fz05snpgjz6bnm3qcr7smg65a0m6rdmyv7avrpbs4qpbghx";
578+ name = "prison-5.56.0.tar.xz";
579579 };
580580 };
581581 purpose = {
582− version = "5.54.0";
582+ version = "5.56.0";
583583 src = fetchurl {
584− url = "${mirror}/stable/frameworks/5.54/purpose-5.54.0.tar.xz";
585− sha256 = "07rz8bqwvlz5g914q4vxdcdmrja5hxa29iazxz8nr171xnpg9x0w";
586− name = "purpose-5.54.0.tar.xz";
584+ url = "${mirror}/stable/frameworks/5.56/purpose-5.56.0.tar.xz";
585+ sha256 = "0rvywfkhqbmd39g950mpnn35i3kg7j63ylvdy2px2d71am6acal8";
586+ name = "purpose-5.56.0.tar.xz";
587587 };
588588 };
589589 qqc2-desktop-style = {
590− version = "5.54.0";
590+ version = "5.56.0";
591591 src = fetchurl {
592− url = "${mirror}/stable/frameworks/5.54/qqc2-desktop-style-5.54.0.tar.xz";
593− sha256 = "1shw3c6cr5xanzyl5zv3isyhvzi20zn3xf7m963z1qn8ypaz1by8";
594− name = "qqc2-desktop-style-5.54.0.tar.xz";
592+ url = "${mirror}/stable/frameworks/5.56/qqc2-desktop-style-5.56.0.tar.xz";
593+ sha256 = "08afy1gsy0lvpzqmv5azzfiy5x9lvffsf6qvzxxab4v5ch8fn00b";
594+ name = "qqc2-desktop-style-5.56.0.tar.xz";
595595 };
596596 };
597597 solid = {
598− version = "5.54.0";
598+ version = "5.56.0";
599599 src = fetchurl {
600− url = "${mirror}/stable/frameworks/5.54/solid-5.54.0.tar.xz";
601− sha256 = "0hmh9hndfs1ikaja07ddag7jr8804q4g6p74rhqsrfk2sjz0pmr9";
602− name = "solid-5.54.0.tar.xz";
600+ url = "${mirror}/stable/frameworks/5.56/solid-5.56.0.tar.xz";
601+ sha256 = "17kfwj0y41pkd0kxj2fj9m9qs7bq05vka9ngfr022lfwdhs907c4";
602+ name = "solid-5.56.0.tar.xz";
603603 };
604604 };
605605 sonnet = {
606− version = "5.54.0";
606+ version = "5.56.0";
607607 src = fetchurl {
608− url = "${mirror}/stable/frameworks/5.54/sonnet-5.54.0.tar.xz";
609− sha256 = "0ccz0gbypzdndaxrfkjhry90jjdh5a56pm4j41z835q96w6piclz";
610− name = "sonnet-5.54.0.tar.xz";
608+ url = "${mirror}/stable/frameworks/5.56/sonnet-5.56.0.tar.xz";
609+ sha256 = "0r8bsf7a9rjvv4jirycwf3xvkqa9iax23p93m301x82hdvmkjr9w";
610+ name = "sonnet-5.56.0.tar.xz";
611611 };
612612 };
613613 syndication = {
614− version = "5.54.0";
614+ version = "5.56.0";
615615 src = fetchurl {
616− url = "${mirror}/stable/frameworks/5.54/syndication-5.54.0.tar.xz";
617− sha256 = "0zj8nv0hj5sf79v3clg2bqhs3m8hi1pzjar1cq6hkxprymw0hzx8";
618− name = "syndication-5.54.0.tar.xz";
616+ url = "${mirror}/stable/frameworks/5.56/syndication-5.56.0.tar.xz";
617+ sha256 = "0wnrhfp5b4wgmigqh39c0f2qfblgmc3x6018b4wcayfs8gb4m1q9";
618+ name = "syndication-5.56.0.tar.xz";
619619 };
620620 };
621621 syntax-highlighting = {
622− version = "5.54.0";
622+ version = "5.56.0";
623623 src = fetchurl {
624− url = "${mirror}/stable/frameworks/5.54/syntax-highlighting-5.54.0.tar.xz";
625− sha256 = "022mpkbgc458qcn25pn3a3m2dzy6lq23r7fqbgp22jr6xalfi5hl";
626− name = "syntax-highlighting-5.54.0.tar.xz";
624+ url = "${mirror}/stable/frameworks/5.56/syntax-highlighting-5.56.0.tar.xz";
625+ sha256 = "0gl0v1bscqd6xhl3644wix8ix04lax0h1zzr1v65704c4qp87h8l";
626+ name = "syntax-highlighting-5.56.0.tar.xz";
627627 };
628628 };
629629 threadweaver = {
630− version = "5.54.0";
630+ version = "5.56.0";
631631 src = fetchurl {
632− url = "${mirror}/stable/frameworks/5.54/threadweaver-5.54.0.tar.xz";
633− sha256 = "011k2pm0wr60sxnydicnchnarx4r6qja0w6iih3jfkw733qm6bxp";
634− name = "threadweaver-5.54.0.tar.xz";
632+ url = "${mirror}/stable/frameworks/5.56/threadweaver-5.56.0.tar.xz";
633+ sha256 = "1gyvj0v1zhfk8shi31pivvf5rwxkgv9bjmy2vippk2vxvkh0qc5x";
634+ name = "threadweaver-5.56.0.tar.xz";
635635 };
636636 };
637637}
pkgs/development/libraries/kerberos/krb5.nix+4−4
@@ -14,12 +14,12 @@ in
1414with stdenv.lib;
1515stdenv.mkDerivation rec {
1616 name = "${type}krb5-${version}";
17− majorVersion = "1.15";
18− version = "${majorVersion}.2";
17+ majorVersion = "1.17";
18+ version = "${majorVersion}";
1919
2020 src = fetchurl {
21− url = "${meta.homepage}dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
22− sha256 = "0zn8s7anb10hw3nzwjz7vg10fgmmgvwnibn2zrn3nppjxn9f6f8n";
21+ url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
22+ sha256 = "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs";
2323 };
2424
2525 outputs = [ "out" "dev" ];
pkgs/development/libraries/libassuan/default.nix+4−3
@@ -1,11 +1,12 @@
11{ fetchurl, stdenv, gettext, pth, libgpgerror }:
22
33stdenv.mkDerivation rec {
4− name = "libassuan-2.5.2";
4+ pname = "libassuan";
5+ version = "2.5.3";
56
67 src = fetchurl {
7− url = "mirror://gnupg/libassuan/${name}.tar.bz2";
8− sha256 = "1rw8nw6fx6ppxga6m4cqcp898lnlzf7vn3s5c2lzfxg3fzr1nswq";
8+ url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2";
9+ sha256 = "00p7cpvzf0q3qwcgg51r9d0vbab4qga2xi8wpk2fgd36710b1g4i";
910 };
1011
1112 outputs = [ "out" "dev" "info" ];
pkgs/development/libraries/libatomic_ops/default.nix+2−2
@@ -2,14 +2,14 @@
22
33stdenv.mkDerivation rec {
44 name = "libatomic_ops-${version}";
5− version = "7.6.8";
5+ version = "7.6.10";
66
77 src = fetchurl {
88 urls = [
99 "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
1010 "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
1111 ];
12− sha256 = "0rgni7056gnbn105lln629gwd6s51779yb5ds9s7wxl1vyg2fshx";
12+ sha256 = "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq";
1313 };
1414
1515 outputs = [ "out" "dev" "doc" ];
pkgs/development/libraries/libdazzle/default.nix+2−2
@@ -2,7 +2,7 @@
22, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }:
33
44let
5− version = "3.30.2";
5+ version = "3.32.0";
66 pname = "libdazzle";
77in
88stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313
1414 src = fetchurl {
1515 url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
16− sha256 = "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq";
16+ sha256 = "1mi87c10wa8d9bz2c8lil7gs2m76i51hq7i8ixm839zqrq5xi7ll";
1717 };
1818
1919 nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ];
pkgs/development/libraries/libdbusmenu/default.nix+5−5
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, lib, file
22, pkgconfig, intltool
33, glib, dbus-glib, json-glib
4−, gobject-introspection, vala_0_38, gnome-doc-utils
4+, gobject-introspection, vala, gnome-doc-utils
55, gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
66
77with lib;
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
1818 sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r";
1919 };
2020
21− nativeBuildInputs = [ pkgconfig intltool ];
21+ nativeBuildInputs = [ vala pkgconfig intltool ];
2222
2323 buildInputs = [
2424 glib dbus-glib json-glib
25− gobject-introspection vala_0_38 gnome-doc-utils
25+ gobject-introspection gnome-doc-utils
2626 ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
2727
2828 postPatch = ''
@@ -49,9 +49,9 @@ stdenv.mkDerivation rec {
4949 doCheck = false; # generates shebangs in check phase, too lazy to fix
5050
5151 installFlags = [
52− "sysconfdir=\${out}/etc"
52+ "sysconfdir=${placeholder ''out''}/etc"
5353 "localstatedir=\${TMPDIR}"
54− "typelibdir=\${out}/lib/girepository-1.0"
54+ "typelibdir=${placeholder ''out''}/lib/girepository-1.0"
5555 ];
5656
5757 meta = {
pkgs/development/libraries/libedit/default.nix+4−5
@@ -1,11 +1,12 @@
11{ stdenv, fetchurl, ncurses }:
22
33stdenv.mkDerivation rec {
4− name = "libedit-20180525-3.1";
4+ pname = "libedit";
5+ version = "20190324-3.1";
56
67 src = fetchurl {
7− url = "https://thrysoee.dk/editline/${name}.tar.gz";
8− sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4";
8+ url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz";
9+ sha256 = "1bhvp8xkkgrg89k4ci1k8vjl3nhb6szd4ghy9lp4jrfgq58hz3xc";
910 };
1011
1112 outputs = [ "out" "dev" ];
@@ -17,8 +18,6 @@ stdenv.mkDerivation rec {
1718
1819 propagatedBuildInputs = [ ncurses ];
1920
20− configureFlags = [ "--enable-widec" ];
21−
2221 postInstall = ''
2322 find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \
2423 -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g'
pkgs/development/libraries/libgdata/default.nix−2
@@ -10,8 +10,6 @@ stdenv.mkDerivation rec {
1010 sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45";
1111 };
1212
13− NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gcr}/include/gcr-3 -I${gcr}/include/gck-1";
14−
1513 nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
1614
1715 buildInputs = [ gnome3.libsoup libxml2 glib liboauth gcr gnome3.gnome-online-accounts p11-kit openssl uhttpmock ];
pkgs/development/libraries/libgpg-error/default.nix+4−4
@@ -16,12 +16,12 @@
1616 outputBin = "out";
1717 };
1818in stdenv.mkDerivation (rec {
19− name = "libgpg-error-${version}";
20− version = "1.34";
19+ pname = "libgpg-error";
20+ version = "1.36";
2121
2222 src = fetchurl {
23− url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
24− sha256 = "10cc76y7zi6wsdmpy1abf3i0q17bj59q5ysy8cpnpf3ixsfpk006";
23+ url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2";
24+ sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds";
2525 };
2626
2727 postPatch = ''
pkgs/development/libraries/libgtop/default.nix+24−20
@@ -1,30 +1,34 @@
1−{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobject-introspection, libtool, gnome3, gtk-doc }:
2−let
3− pname = "libgtop";
4− version = "2.38.0";
5−in
1+{ stdenv
2+, fetchurl
3+, glib
4+, pkgconfig
5+, perl
6+, gettext
7+, gobject-introspection
8+, gnome3
9+, gtk-doc
10+}:
11+
612stdenv.mkDerivation rec {
7− name = "${pname}-${version}";
13+ pname = "libgtop";
14+ version = "2.40.0";
815
916 src = fetchurl {
10− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g";
17+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
18+ sha256 = "1m6jbqk8maa52gxrf223442fr5bvvxgb7ham6v039i3r1i62gwvq";
1219 };
1320
14− patches = [
15− # Fix darwin build
16− (fetchpatch {
17− url = https://gitlab.gnome.org/GNOME/libgtop/commit/42b049f338363f92c1e93b4549fc944098eae674.patch;
18− sha256 = "0kf9ihgb0wqji6dcvg36s6igkh7b79k6y1n7w7wzsxya84x3hhyn";
19− })
21+ nativeBuildInputs = [
22+ pkgconfig
23+ gtk-doc
24+ perl
25+ gettext
26+ gobject-introspection
2027 ];
2128
22− propagatedBuildInputs = [ glib ];
23− nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobject-introspection ];
24−
25− preConfigure = ''
26− ./autogen.sh
27− '';
29+ propagatedBuildInputs = [
30+ glib
31+ ];
2832
2933 passthru = {
3034 updateScript = gnome3.updateScript {
pkgs/development/libraries/libgweather/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "libgweather";
6− version = "3.28.2";
6+ version = "3.32.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 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708";
12+ sha256 = "04qxm5jgj5fzjb06ghwqx3c2qsc502arrfw0xl9f09wb58wjp6ny";
1313 };
1414
1515 nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
pkgs/development/libraries/libheif/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }:
22
33stdenv.mkDerivation rec {
4− version = "1.3.2";
4+ version = "1.4.0";
55 name = "libheif-${version}";
66
77 src = fetchFromGitHub {
88 owner = "strukturag";
99 repo = "libheif";
1010 rev = "v${version}";
11− sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w";
11+ sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2";
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/development/libraries/libhttpseverywhere/default.nix+11−4
@@ -1,5 +1,5 @@
1−{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala_0_40
2−, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
1+{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala, fetchpatch
2+, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection, valadoc }:
33
44let
55 pname = "libhttpseverywhere";
@@ -12,10 +12,17 @@ in stdenv.mkDerivation rec {
1212 sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
1313 };
1414
15− # Broken with newest Vala https://gitlab.gnome.org/GNOME/libhttpseverywhere/issues/1
16− nativeBuildInputs = [ vala_0_40 gobject-introspection meson ninja pkgconfig ];
15+ nativeBuildInputs = [ vala gobject-introspection meson ninja pkgconfig ];
1716 buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
1817
18+ # Fixes build with vala >=0.42
19+ patches = [
20+ (fetchpatch {
21+ url = "https://gitlab.gnome.org/GNOME/libhttpseverywhere/commit/6da08ef1ade9ea267cecf14dd5cb2c3e6e5e50cb.patch";
22+ sha256 = "1nwjlh8iqgjayccwdh0fbpq2g1h8bg1k1g9i324f2bhhvyhmpq8f";
23+ })
24+ ];
25+
1926 mesonFlags = [ "-Denable_valadoc=true" ];
2027
2128 doCheck = true;
pkgs/development/libraries/libmanette/default.nix+2−2
@@ -2,7 +2,7 @@
22, glib, libgudev, libevdev, gnome3 }:
33
44let
5− version = "0.2.1";
5+ version = "0.2.2";
66 pname = "libmanette";
77in
88stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
15− sha256 = "14vqz30p4693yy3yxs0gj858x25sl2kawib1g9lj8g5frgl0hd82";
15+ sha256 = "1lpprk2qz1lsqf9xj6kj2ciyc1zmjhj5lwd584qkh7jgz2x9y6wb";
1616 };
1717
1818 nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection ];
pkgs/development/libraries/libmbim/default.nix+21−10
@@ -1,24 +1,35 @@
1−{ stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }:
1+{ stdenv, fetchurl, pkgconfig, glib, python3, systemd, libgudev }:
22
33stdenv.mkDerivation rec {
4− name = "libmbim-1.16.2";
4+ pname = "libmbim";
5+ version = "1.18.0";
56
67 src = fetchurl {
7− url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz";
8− sha256 = "0qmjvjbgs9m8qsaiq5arikzglgaas9hh1968bi7sy3905kp4yjgb";
8+ url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz";
9+ sha256 = "10mjjy860aakfd3h1yaj9l1jw816amrpwmyqlx37j21xv0l03x3c";
910 };
1011
1112 outputs = [ "out" "dev" "man" ];
1213
13− preConfigure = ''
14− patchShebangs .
15− '';
14+ configureFlags = [
15+ "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
16+ ];
1617
17− nativeBuildInputs = [ pkgconfig ];
18− buildInputs = [ glib udev libgudev python ];
18+ nativeBuildInputs = [
19+ pkgconfig
20+ python3
21+ ];
22+
23+ buildInputs = [
24+ glib
25+ libgudev
26+ systemd
27+ ];
28+
29+ doCheck = true;
1930
2031 meta = with stdenv.lib; {
21− homepage = http://www.freedesktop.org/software/libmbim/;
32+ homepage = https://www.freedesktop.org/wiki/Software/libmbim/;
2233 description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
2334 platforms = platforms.linux;
2435 license = licenses.gpl2;
pkgs/development/libraries/libminc/default.nix+1−2
@@ -22,13 +22,12 @@ stdenv.mkDerivation rec {
2222 buildInputs = [ zlib netcdf nifticlib hdf5 ];
2323
2424 cmakeFlags = [
25− "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
2625 "-DLIBMINC_MINC1_SUPPORT=ON"
2726 "-DLIBMINC_BUILD_SHARED_LIBS=ON"
2827 "-DLIBMINC_USE_SYSTEM_NIFTI=ON"
2928 ];
3029
31− doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
30+ doCheck = true;
3231 checkPhase = ''
3332 export LD_LIBRARY_PATH="$(pwd)" # see #22060
3433 ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure
pkgs/development/libraries/libqmi/default.nix+20−11
@@ -1,26 +1,35 @@
1−{ stdenv, fetchurl, pkgconfig, glib, python, libgudev, libmbim }:
1+{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }:
22
33stdenv.mkDerivation rec {
4− name = "libqmi-1.20.2";
4+ pname = "libqmi";
5+ version = "1.22.2";
56
67 src = fetchurl {
7− url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz";
8− sha256 = "0i6aw8jyxv84d5x8lj2g9lb8xxf1dyad8n3q0kw164pyig55jd67";
8+ url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
9+ sha256 = "09w20dsgr16bgbqw5ds7r6j2s6ihwyalh9zpbjhcn7cvm0afbwgi";
910 };
1011
1112 outputs = [ "out" "dev" "devdoc" ];
1213
13− preBuild = ''
14− patchShebangs .
15− '';
14+ configureFlags = [
15+ "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
16+ ];
1617
17− nativeBuildInputs = [ pkgconfig ];
18− buildInputs = [ glib python libgudev libmbim ];
18+ nativeBuildInputs = [
19+ pkgconfig
20+ python3
21+ ];
1922
20− configureFlags = ["--enable-mbim-qmux" ];
23+ buildInputs = [
24+ glib
25+ libgudev
26+ libmbim
27+ ];
28+
29+ doCheck = true;
2130
2231 meta = with stdenv.lib; {
23− homepage = http://www.freedesktop.org/wiki/Software/libqmi/;
32+ homepage = https://www.freedesktop.org/wiki/Software/libqmi/;
2433 description = "Modem protocol helper library";
2534 platforms = platforms.linux;
2635 license = licenses.gpl2;
pkgs/development/libraries/librsvg/default.nix+4−4
@@ -1,18 +1,18 @@
11{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
2−, bzip2, libcroco, libintl, darwin, rust, gnome3
2+, bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3
33, withGTK ? false, gtk3 ? null
44, vala, gobject-introspection }:
55
66let
77 pname = "librsvg";
8− version = "2.44.12";
8+ version = "2.45.5";
99in
1010stdenv.mkDerivation rec {
1111 name = "${pname}-${version}";
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "1h3qnqhr0l7pd2bxg69ki6ckl4srdwgr471dpp4jq9i4784hp0v6";
15+ sha256 = "001phhq3dd9i6mkbjnmw468vjlqvs1330nwdzldy1rcgc3f74230";
1616 };
1717
1818 outputs = [ "out" "dev" "installedTests" ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
2323
24− nativeBuildInputs = [ pkgconfig rust.rustc rust.cargo vala gobject-introspection ]
24+ nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ]
2525 ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
2626 ApplicationServices
2727 ]);
pkgs/development/libraries/libseccomp/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "libseccomp-${version}";
5− version = "2.3.3";
5+ version = "2.4.0";
66
77 src = fetchurl {
88 url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
9− sha256 = "0mdiyfljrkfl50q1m3ws8yfcyfjwf1zgkvcva8ffcwncji18zhkz";
9+ sha256 = "0paj1szszpf8plykrd66jqg1x3kmqs395rbjskahld2bnplcfx1f";
1010 };
1111
1212 outputs = [ "out" "lib" "dev" "man" ];
pkgs/development/libraries/libsoup/default.nix+2−2
@@ -5,11 +5,11 @@
55stdenv.mkDerivation rec {
66 name = "${pname}-${version}";
77 pname = "libsoup";
8− version = "2.64.2";
8+ version = "2.66.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm";
12+ sha256 = "08c9kkdhzy504gv23pfdm4sq3dd3j20sikwz6gv0qrwcdjnw5bai";
1313 };
1414
1515 postPatch = ''
pkgs/development/libraries/nghttp2/default.nix+4−4
@@ -17,12 +17,12 @@ assert enableJemalloc -> jemalloc != null;
1717let inherit (stdenv.lib) optional; in
1818
1919stdenv.mkDerivation rec {
20− name = "nghttp2-${version}";
21− version = "1.36.0";
20+ pname = "nghttp2";
21+ version = "1.37.0";
2222
2323 src = fetchurl {
24− url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
25− sha256 = "1sqwwwhlrbp3wcikf9v07k5j4xvflwy297lq4cg92qj087bk99qn";
24+ url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
25+ sha256 = "1bi3aw096kd51abazvv6ilplz6gjbm84yr3mzxklbhysv38y6xl2";
2626 };
2727
2828 outputs = [ "bin" "out" "dev" "lib" ];
pkgs/development/libraries/nspr/0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patchnew file+84
@@ -0,0 +1,84 @@
1+From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001
2+From: Graham Christensen <graham@grahamc.com>
3+Date: Thu, 7 Mar 2019 08:11:32 -0500
4+Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility
5+
6+---
7+ nspr/lib/ds/Makefile.in | 4 ++--
8+ nspr/lib/libc/src/Makefile.in | 4 ++--
9+ nspr/lib/prstreams/Makefile.in | 4 ++--
10+ nspr/pr/src/Makefile.in | 6 +++---
11+ 4 files changed, 9 insertions(+), 9 deletions(-)
12+
13+diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in
14+index e737791..d56b0a7 100644
15+--- a/nspr/lib/ds/Makefile.in
16++++ b/nspr/lib/ds/Makefile.in
17+@@ -101,8 +101,8 @@ ECHO = echo
18+ TINC = $(OBJDIR)/_pl_bld.h
19+ PROD = $(notdir $(SHARED_LIBRARY))
20+ NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
21+-SH_DATE = $(shell date "+%Y-%m-%d %T")
22+-SH_NOW = $(shell $(NOW))
23++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
24++SH_NOW = $(SOURCE_DATE_EPOCH)000000
25+
26+ ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
27+ SUF = i64
28+diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in
29+index e8a6d9f..0485737 100644
30+--- a/nspr/lib/libc/src/Makefile.in
31++++ b/nspr/lib/libc/src/Makefile.in
32+@@ -103,8 +103,8 @@ ECHO = echo
33+ TINC = $(OBJDIR)/_pl_bld.h
34+ PROD = $(notdir $(SHARED_LIBRARY))
35+ NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
36+-SH_DATE = $(shell date "+%Y-%m-%d %T")
37+-SH_NOW = $(shell $(NOW))
38++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
39++SH_NOW = $(SOURCE_DATE_EPOCH)000000
40+
41+ ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
42+ SUF = i64
43+diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in
44+index aeb2944..83ae423 100644
45+--- a/nspr/lib/prstreams/Makefile.in
46++++ b/nspr/lib/prstreams/Makefile.in
47+@@ -105,8 +105,8 @@ ECHO = echo
48+ TINC = $(OBJDIR)/_pl_bld.h
49+ PROD = $(notdir $(SHARED_LIBRARY))
50+ NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
51+-SH_DATE = $(shell date "+%Y-%m-%d %T")
52+-SH_NOW = $(shell $(NOW))
53++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
54++SH_NOW = $(SOURCE_DATE_EPOCH)000000
55+
56+ ifeq ($(OS_ARCH), WINNT)
57+ SUF = i64
58+diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
59+index 19c5a69..989cc8c 100644
60+--- a/nspr/pr/src/Makefile.in
61++++ b/nspr/pr/src/Makefile.in
62+@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE)
63+ endif
64+ #
65+ # In Solaris 2.6 or earlier, -lrt is called -lposix4.
66+-#
67++#
68+ LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE)))
69+ ifeq (5.7, $(LIBRT_TEST))
70+ LIBRT=-lrt
71+@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY))
72+ endif
73+
74+ NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
75+-SH_DATE = $(shell date "+%Y-%m-%d %T")
76+-SH_NOW = $(shell $(NOW))
77++SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
78++SH_NOW = $(SOURCE_DATE_EPOCH)000000
79+
80+ ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
81+ SUF = i64
82+--
83+2.19.2
84+
pkgs/development/libraries/nspr/default.nix+4
@@ -12,6 +12,10 @@ stdenv.mkDerivation {
1212 sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c";
1313 };
1414
15+ patches = [
16+ ./0001-Makefile-use-SOURCE_DATE_EPOCH-for-reproducibility.patch
17+ ];
18+
1519 outputs = [ "out" "dev" ];
1620 outputBin = "dev";
1721
pkgs/development/libraries/ntrack/default.nix+3
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ pkgconfig python ];
1818
19+ # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic]
20+ NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
21+
1922 configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ];
2023
2124 # Remove this patch after version 016
pkgs/development/libraries/pango/default.nix+26−6
@@ -1,30 +1,50 @@
11{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
22, libintl, gobject-introspection, darwin, fribidi, gnome3
33, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
4+, meson, ninja, glib
45}:
56
67with stdenv.lib;
78
89let
910 pname = "pango";
10− version = "1.42.4";
11+ version = "1.43.0";
1112in stdenv.mkDerivation rec {
1213 name = "${pname}-${version}";
1314
1415 src = fetchurl {
1516 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
16− sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx";
17+ sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j";
1718 };
1819
19− outputs = [ "bin" "dev" "out" "devdoc" ];
20+ # FIXME: docs fail on darwin
21+ outputs = [ "bin" "dev" "out" ] ++ optional (!stdenv.isDarwin) "devdoc";
2022
21− nativeBuildInputs = [ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ];
22− buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
23+ nativeBuildInputs = [
24+ meson ninja
25+ pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
26+ ];
27+ buildInputs = [
28+ harfbuzz fribidi
29+ ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
30+ ApplicationServices
2331 Carbon
2432 CoreGraphics
2533 CoreText
2634 ]);
27− propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ];
35+ propagatedBuildInputs = [ cairo glib libXft libintl ];
36+
37+ patches = [
38+ (fetchurl {
39+ # Add gobject-2 to .pc file
40+ url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch";
41+ sha256 = "034na38cq98vk8gggn3yfr65jmv3jgig8d25zg89wydrandp14yr";
42+ })
43+ ];
44+
45+ mesonFlags = [
46+ "-Denable_docs=${if stdenv.isDarwin then "false" else "true"}"
47+ ];
2848
2949 enableParallelBuilding = true;
3050
pkgs/development/libraries/poppler/default.nix+2−2
@@ -8,7 +8,7 @@
88}:
99
1010let # beware: updates often break cups-filters build
11− version = "0.73.0";
11+ version = "0.74.0";
1212 mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
1313in
1414stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 src = fetchurl {
1818 url = "${meta.homepage}/poppler-${version}.tar.xz";
19− sha256 = "00yv7011y40jc5iw9b7zjyg8ij5wsfbjm32kli5qha1ij11majz4";
19+ sha256 = "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j";
2020 };
2121
2222 outputs = [ "out" "dev" ];
pkgs/development/libraries/qt-5/mkDerivation.nix−1
@@ -19,7 +19,6 @@ let
1919 cmakeFlags =
2020 (args.cmakeFlags or [])
2121 ++ [
22− "-DBUILD_TESTING=OFF"
2322 ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release"))
2423 ];
2524
pkgs/development/libraries/science/biology/bicpl/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 nativeBuildInputs = [ cmake ];
1818 buildInputs = [ libminc netpbm ];
1919
20− cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBUILD_TESTING=FALSE" ];
20+ cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" ];
2121
2222 doCheck = false;
2323 # internal_volume_io.h: No such file or directory
pkgs/development/libraries/science/biology/mirtk/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 fetchSubmodules = true;
1313 };
1414
15− cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON";
15+ cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON";
1616
1717 doCheck = true;
1818
pkgs/development/libraries/srt/default.nix+2−2
@@ -4,13 +4,13 @@
44with stdenv.lib;
55stdenv.mkDerivation rec {
66 pname = "srt";
7− version = "1.3.1";
7+ version = "1.3.2";
88
99 src = fetchFromGitHub {
1010 owner = "Haivision";
1111 repo = "srt";
1212 rev = "v${version}";
13− sha256 = "0cv73j9c8024p6pg16c4hiryiv4jpgrfj2xhfdaprsikmkdnygmz";
13+ sha256 = "1h1kim9vvqnwx95yd9768ds30h731yg27jz63r90kjxm7b5kmja4";
1414 };
1515
1616 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/template-glib/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
22let
3− version = "3.30.0";
3+ version = "3.32.0";
44 pname = "template-glib";
55in
66stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "0j9ndswl3fc0ymbqd6kk7yw3sniij3dgczc665p06wgw3cwhssfg";
13+ sha256 = "1g0zx0sxpw8kqp7p3sgl9kngaqrg9xl6cir24nrahks0vgsk98rr";
1414 };
1515
1616 buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
pkgs/development/libraries/vte/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "vte";
8− version = "0.54.3";
8+ version = "0.56.0";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9";
12+ sha256 = "1w5p26p7gadvh49g28m2yiihpmhhxlsc7ad1qvgvfnwxdgk51asz";
1313 };
1414
1515 passthru = {
pkgs/development/libraries/vte/ng.nix+10−1
@@ -1,4 +1,4 @@
1−{ vte, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }:
1+{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf }:
22
33vte.overrideAttrs (oldAttrs: rec {
44 name = "vte-ng-${version}";
@@ -11,6 +11,15 @@ vte.overrideAttrs (oldAttrs: rec {
1111 sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags";
1212 };
1313
14+ patches = [
15+ # Fix build with vala 0.44
16+ # See: https://github.com/thestinger/vte-ng/issues/32
17+ (fetchpatch {
18+ url = "https://gitlab.gnome.org/GNOME/vte/commit/53690d5cee51bdb7c3f7680d3c22b316b1086f2c.patch";
19+ sha256 = "1jrpqsx5hqa01g7cfqrsns6vz51mwyqwdp43ifcpkhz3wlp5dy66";
20+ })
21+ ];
22+
1423 preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh";
1524
1625 nativeBuildInputs = oldAttrs.nativeBuildInputs or []
pkgs/development/libraries/vtk/default.nix+1−2
@@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
4040 # objects.
4141 cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
4242 ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
43− ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF"
44− "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ];
43+ ++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
4544
4645 postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
4746 sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt
pkgs/development/libraries/vxl/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 # BUILD_OUL wants old linux headers for videodev.h, not available
1515 # in stdenv linux headers
1616 # BUILD_BRL fails to find open()
17− cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF "
17+ cmakeFlags = "-DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF "
1818 + (if stdenv.hostPlatform.system == "x86_64-linux" then
1919 "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
2020 else
pkgs/development/libraries/wayland/default.nix+4−4
@@ -7,12 +7,12 @@
77assert expat != null;
88
99stdenv.mkDerivation rec {
10− name = "wayland-${version}";
11− version = "1.16.0";
10+ pname = "wayland";
11+ version = "1.17.0";
1212
1313 src = fetchurl {
14− url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
15− sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf";
14+ url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
15+ sha256 = "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj";
1616 };
1717
1818 separateDebugInfo = true;
pkgs/development/perl-modules/generic/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, perl }:
1+{ lib, stdenv, perl, buildPackages }:
22
33{ nativeBuildInputs ? [], name, ... } @ attrs:
44
@@ -37,6 +37,6 @@ stdenv.mkDerivation (
3737 name = "perl${perl.version}-${name}";
3838 builder = ./builder.sh;
3939 nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];
40− inherit perl;
40+ perl = buildPackages.perl;
4141 }
4242)
pkgs/development/python-modules/dbus/default.nix+5−1
@@ -6,12 +6,16 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
66 version = "1.2.4";
77 format = "other";
88
9+ outputs = [ "out" "dev" "doc" ];
10+
911 src = fetchurl {
1012 url = "http://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz";
1113 sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2";
1214 };
1315
14− postPatch = "patchShebangs .";
16+ patches = [
17+ ./fix-includedir.patch
18+ ];
1519
1620 nativeBuildInputs = [ pkgconfig ];
1721 buildInputs = [ dbus dbus-glib ]
pkgs/development/python-modules/dbus/fix-includedir.patchnew file+8
@@ -0,0 +1,8 @@
1+--- a/dbus-python.pc.in
2++++ b/dbus-python.pc.in
3+@@ -9,4 +9,4 @@
4+ Description: Python bindings for D-Bus
5+ Requires: dbus-1 >= 1.0
6+ Version: @VERSION@
7+-Cflags: -I${includedir}
8++Cflags: -I${includedir}/dbus-1.0
pkgs/development/python-modules/hoomd-blue/default.nix−2
@@ -10,7 +10,6 @@ let components = {
1010 hpmc = true;
1111 md = true;
1212 metal = true;
13− testing = false;
1413 };
1514 onOffBool = b: if b then "ON" else "OFF";
1615 withMPI = (mpi != null);
@@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
4443 "-DBUILD_HPMC=${onOffBool components.hpmc}"
4544 "-DBUILD_MD=${onOffBool components.md}"
4645 "-DBUILD_METAL=${onOffBool components.metal}"
47− "-DBUILD_TESTING=${onOffBool components.testing}"
4846 ];
4947
5048 preConfigure = ''
pkgs/development/python-modules/hypothesis/default.nix+1−1
@@ -9,7 +9,7 @@ buildPythonPackage rec {
99 # pytz fake_factory django numpy pytest
1010 # If you need these, you can just add them to your environment.
1111
12− version = "3.88.3";
12+ version = "4.7.3";
1313 pname = "hypothesis";
1414
1515 # Use github tarballs that includes tests
pkgs/development/python-modules/pyatspi/default.nix+2−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "pyatspi";
5− version = "2.30.0";
5+ version = "2.32.0";
66 format = "other";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "11g7dx21brfmi5vrq289cw983rydalx0cy91afv5gigyadsmyam2";
10+ sha256 = "0jfmm5684sfb035ihvla75gxz4cls5d2vnf0s02y6dw7s12zbb8a";
1111 };
1212
1313 nativeBuildInputs = [ pkgconfig ];
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.30.4";
6+ version = "3.32.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 = "0hscyvr6hh8l90fyz97b9d03506g3r8s5hl1bgk5aadq8jja3h9d";
12+ sha256 = "0agg8nxgqp96wyw4qnjjpiczf0j8aw454plwsfqccsyykzjxgx43";
1313 };
1414
1515 outputs = [ "out" "dev" ];
pkgs/development/python-modules/pylint/default.nix+3−1
@@ -12,7 +12,9 @@ buildPythonPackage rec {
1212 sha256 = "689de29ae747642ab230c6d37be2b969bf75663176658851f456619aacf27492";
1313 };
1414
15− checkInputs = [ pytest pytestrunner pyenchant ];
15+ nativeBuildInputs = [ pytestrunner ];
16+
17+ checkInputs = [ pytest pyenchant ];
1618
1719 propagatedBuildInputs = [ astroid isort mccabe ];
1820
pkgs/development/python-modules/pyqt/5.x.nix+8−6
@@ -27,24 +27,26 @@ in buildPythonPackage rec {
2727
2828 buildInputs = [ dbus sip ];
2929
30− propagatedBuildInputs = [ qtbase qtsvg qtwebengine ]
30+ propagatedBuildInputs = [ qtbase qtsvg qtwebengine dbus-python ]
3131 ++ lib.optional (!isPy3k) enum34
3232 ++ lib.optional withConnectivity qtconnectivity
3333 ++ lib.optional withWebKit qtwebkit
3434 ++ lib.optional withWebSockets qtwebsockets;
3535
36+ patches = [
37+ # Fix some wrong assumptions by ./configure.py
38+ # TODO: figure out how to send this upstream
39+ ./pyqt5-fix-dbus-mainloop-support.patch
40+ ];
41+
3642 configurePhase = ''
3743 runHook preConfigure
3844
39− mkdir -p $out
40− lndir ${dbus-python} $out
41− rm -rf "$out/nix-support"
42−
4345 export PYTHONPATH=$PYTHONPATH:$out/${python.sitePackages}
4446
4547 ${python.executable} configure.py -w \
4648 --confirm-license \
47− --dbus=${dbus.dev}/include/dbus-1.0 \
49+ --dbus-moduledir=$out/${python.sitePackages}/dbus/mainloop \
4850 --no-qml-plugin \
4951 --bindir=$out/bin \
5052 --destdir=$out/${python.sitePackages} \
pkgs/development/python-modules/pyqt/pyqt5-fix-dbus-mainloop-support.patchnew file+70
@@ -0,0 +1,70 @@
1+From 944d5467e1655aac20a14325631df6daccaf5804 Mon Sep 17 00:00:00 2001
2+From: Jan Tojnar <jtojnar@gmail.com>
3+Date: Sun, 3 Mar 2019 01:13:46 +0100
4+Subject: [PATCH] Fix building on Nix
5+
6+./configure.py tries to find dbus-python header in dbus-1 includedir
7+obtained from pkg-config or from --dbus flag. Unfortunately, when supplied,
8+it also uses the flag for locating dbus-1 headers. This fails on Nix,
9+since every package is installed into its own immutable tree so we cannot
10+use a single directory for both dbus-python and dbus-1. We can fix this by
11+using pkg-config for finding dbus-python headers too.
12+
13+Additionally, the build system also tries to install the dbus support module
14+to dbus-python tree. Often, it is possible to handle this in pkgconfig as well [1]
15+but unfortunately, dbus-python does not export the moduledir in its pc file
16+so I have decided to solve this with an extra configure flag.
17+
18+[1]: https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/
19+---
20+ configure.py | 13 +++++++++++--
21+ 1 file changed, 11 insertions(+), 2 deletions(-)
22+
23+diff --git a/configure.py b/configure.py
24+index a3450ca3..440d90a2 100644
25+--- a/configure.py
26++++ b/configure.py
27+@@ -905,6 +905,9 @@ class TargetConfiguration:
28+ if opts.pydbusincdir is not None:
29+ self.pydbus_inc_dir = opts.pydbusincdir
30+
31++ if opts.pydbusmoduledir is not None:
32++ self.pydbus_module_dir = opts.pydbusmoduledir
33++
34+ if opts.pyuicinterpreter is not None:
35+ self.pyuic_interpreter = opts.pyuicinterpreter
36+
37+@@ -1184,6 +1187,11 @@ def create_optparser(target_config):
38+ metavar="DIR",
39+ help="the directory containing the dbus/dbus-python.h header is "
40+ "DIR [default: supplied by pkg-config]")
41++ g.add_option("--dbus-moduledir", dest='pydbusmoduledir', type='string',
42++ default=None, action='callback', callback=store_abspath,
43++ metavar="DIR",
44++ help="the directory where dbus support module will be installed to"
45++ "DIR [default: obtained from dbus.mainloop python module]")
46+ p.add_option_group(g)
47+
48+ # Installation.
49+@@ -2149,7 +2157,7 @@ def check_dbus(target_config, verbose):
50+
51+ inform("Checking to see if the dbus support module should be built...")
52+
53+- cmd = 'pkg-config --cflags-only-I --libs dbus-1'
54++ cmd = 'pkg-config --cflags-only-I --libs dbus-1 dbus-python'
55+
56+ if verbose:
57+ sys.stdout.write(cmd + "\n")
58+@@ -2178,7 +2186,8 @@ def check_dbus(target_config, verbose):
59+ inform("The Python dbus module doesn't seem to be installed.")
60+ return
61+
62+- target_config.pydbus_module_dir = dbus.mainloop.__path__[0]
63++ if target_config.pydbus_module_dir == '':
64++ target_config.pydbus_module_dir = dbus.mainloop.__path__[0]
65+
66+ # Try and find dbus-python.h. We don't use pkg-config because it is broken
67+ # for dbus-python (at least for versions up to and including v0.81.0).
68+--
69+2.18.0
70+
pkgs/development/python-modules/python-efl/default.nix+2−2
@@ -18,9 +18,9 @@ buildPythonPackage rec {
1818 propagatedBuildInputs = [ python.pkgs.dbus-python ];
1919
2020 preConfigure = ''
21− export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
21+ export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
2222 '';
23−
23+
2424 preBuild = "${python.interpreter} setup.py build_ext";
2525
2626 installPhase= "${python.interpreter} setup.py install --prefix=$out";
pkgs/development/tools/build-managers/cmake/setup-hook.sh+5
@@ -71,6 +71,11 @@ cmakeConfigurePhase() {
7171 cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags"
7272 cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags"
7373
74+ # Don’t build tests when doCheck = false
75+ if [ -z "$doCheck" ]; then
76+ cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags"
77+ fi
78+
7479 # Avoid cmake resetting the rpath of binaries, on make install
7580 # And build always Release, to ensure optimisation flags
7681 cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"
pkgs/development/tools/build-managers/meson/default.nix+2−2
@@ -1,12 +1,12 @@
11{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
22
33python3Packages.buildPythonApplication rec {
4− version = "0.49.1";
4+ version = "0.49.2";
55 pname = "meson";
66
77 src = python3Packages.fetchPypi {
88 inherit pname version;
9− sha256 = "05wr4kn88aqq2cbzqx59zj56410c9d42wracb4cjs70mvq0lp50s";
9+ sha256 = "0ckkzq0kbnnk4rwv20lggm9a4fb5054jbv99i9pwjhid23qy7059";
1010 };
1111
1212 postFixup = ''
pkgs/development/tools/misc/automake/automake-1.15.x.nixnew file+43
@@ -0,0 +1,43 @@
1+{ stdenv, fetchurl, perl, autoconf }:
2+
3+stdenv.mkDerivation rec {
4+ name = "automake-1.15";
5+
6+ src = fetchurl {
7+ url = "mirror://gnu/automake/${name}.tar.xz";
8+ sha256 = "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r";
9+ };
10+
11+ nativeBuildInputs = [ autoconf perl ];
12+ buildInputs = [ autoconf ];
13+
14+ setupHook = ./setup-hook.sh;
15+
16+ # Disable indented log output from Make, otherwise "make.test" will
17+ # fail.
18+ preCheck = "unset NIX_INDENT_MAKE";
19+ doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths
20+ doInstallCheck = false; # runs the same thing, fails the same tests
21+
22+ # The test suite can run in parallel.
23+ enableParallelBuilding = true;
24+
25+ # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
26+ # "fixed" path in generated files!
27+ dontPatchShebangs = true;
28+
29+ meta = {
30+ branch = "1.15";
31+ homepage = https://www.gnu.org/software/automake/;
32+ description = "GNU standard-compliant makefile generator";
33+ license = stdenv.lib.licenses.gpl2Plus;
34+
35+ longDescription = ''
36+ GNU Automake is a tool for automatically generating
37+ `Makefile.in' files compliant with the GNU Coding
38+ Standards. Automake requires the use of Autoconf.
39+ '';
40+
41+ platforms = stdenv.lib.platforms.all;
42+ };
43+}
pkgs/development/tools/misc/help2man/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, perlPackages, gettext }:
22
33stdenv.mkDerivation rec {
4− name = "help2man-1.47.8";
4+ name = "help2man-1.47.9";
55
66 src = fetchurl {
77 url = "mirror://gnu/help2man/${name}.tar.xz";
8− sha256 = "1p5830h88cx0zn0snwaj0vpph81xicpsirfwlxmcgjrlmn0nm3sj";
8+ sha256 = "1li3b6vifhysc2ckx0d7krwrqb8bk0kzn3k18ff1963hjc1qp7nz";
99 };
1010
1111 nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];
pkgs/development/tools/profiling/sysprof/default.nix+2−2
@@ -18,13 +18,13 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "sysprof";
21− version = "3.30.2";
21+ version = "3.32.0";
2222
2323 outputs = [ "out" "lib" "dev" ];
2424
2525 src = fetchurl {
2626 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27− sha256 = "02xsr3cxyws3cnbhvbxgcc9sn22mri3iv9d7f38pkg89lpjph279";
27+ sha256 = "0kamsnnig56lzs4ziwcxm3b1xyis4z361s9nj3nca0c78sgac8pw";
2828 };
2929
3030 nativeBuildInputs = [
pkgs/development/tools/valadoc/default.nix+2−2
@@ -1,11 +1,11 @@
11{stdenv, fetchurl, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobject-introspection, expat}:
22stdenv.mkDerivation rec {
3− version = "0.36.1";
3+ version = "0.36.2";
44 name = "valadoc-${version}";
55
66 src = fetchurl {
77 url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
8− sha256 = "07501k2j9c016bd7rfr6xzaxdplq7j9sd18b5ixbqdbipvn6whnv";
8+ sha256 = "0hfaskbm7y4z4jf6lxm8hg4c0b8621qn1gchxjxcngq0cpx79z9h";
99 };
1010
1111 nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobject-introspection ];
pkgs/misc/themes/arc/default.nix+2
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
3131
3232 postPatch = ''
3333 patchShebangs .
34+ # TODO: remove this after update
35+ ln -s 3.30 common/gnome-shell/3.32
3436 '';
3537
3638 preBuild = ''
pkgs/os-specific/darwin/binutils/default.nix+5
@@ -52,4 +52,9 @@ stdenv.mkDerivation {
5252 passthru = {
5353 inherit targetPrefix;
5454 };
55+
56+ meta = {
57+ maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
58+ priority = 10;
59+ };
5560}
pkgs/os-specific/linux/ffado/default.nix+30−34
@@ -1,61 +1,57 @@
1−{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python
2−, expat, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx
1+{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python3
2+, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx3
33, glibmm
44, alsaLib, dbus, dbus_cplusplus
5−, pyqt4, dbus-python
65}:
76
8−stdenv.mkDerivation rec {
9− name = "ffado-${version}";
10− version = "2.4.0";
7+let
8+ inherit (python3.pkgs) pyqt5 dbus-python;
9+ python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]);
10+in stdenv.mkDerivation rec {
11+ pname = "ffado";
12+ version = "2.4.1";
1113
1214 src = fetchurl {
1315 url = "http://www.ffado.org/files/libffado-${version}.tgz";
14− sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f";
16+ sha256 = "0byr3kv58d1ryy60vr69fd868zlfkvl2gq9hl94dqdn485l9pq9y";
1517 };
1618
19+ patches = [
20+ # fix installing metainfo file
21+ ./fix-build.patch
22+ ];
23+
1724 outputs = [ "out" "bin" "dev" ];
1825
19− nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
26+ nativeBuildInputs = [ scons pkgconfig which makeWrapper python pyqt5 ];
2027
2128 prefixKey = "PREFIX=";
2229 sconsFlags = [
2330 "DEBUG=False"
2431 "ENABLE_ALL=True"
25− "SERIALIZE_USE_EXPAT=True"
2632 "BUILD_TESTS=False"
2733 "WILL_DEAL_WITH_XDG_MYSELF=True"
2834 "BUILD_MIXER=True"
35+ "UDEVDIR=${placeholder "out"}/lib/udev/rules.d"
36+ "PYPKGDIR=${placeholder "out"}/${python3.sitePackages}"
37+ "BINDIR=${placeholder "bin"}/bin"
38+ "INCLUDEDIR=${placeholder "dev"}/include"
39+ "PYTHON_INTERPRETER=${python.interpreter}"
2940 ];
3041
31− configurePhase = ''
32− mkdir -p $out/lib/udev/rules.d $bin/bin $dev/include \
33− $out/lib/${python.libPrefix}/site-packages
34− sconsFlagsArray+=(UDEVDIR=$out/lib/udev/rules.d)
35− sconsFlagsArray+=(PYPKGDIR=$out/lib/${python.libPrefix}/site-packages)
36− sconsFlagsArray+=(BINDIR=$bin/bin)
37− sconsFlagsArray+=(INCLUDEDIR=$dev/include)
38− export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libxml++-2.6)"
39− '';
40−
4142 buildInputs = [
42− expat libraw1394 libconfig libavc1394 libiec61883 dbus dbus_cplusplus
43− libxmlxx pyqt4 dbus-python glibmm
43+ libraw1394
44+ libconfig
45+ libavc1394
46+ libiec61883
47+ dbus
48+ dbus_cplusplus
49+ libxmlxx3
50+ python
51+ glibmm
4452 ];
4553
46− postPatch = ''
47− sed '1iimport sys' -i SConstruct
48− '';
49−
50− postInstall = ''
51− for exe in $bin/bin/ffado-mixer $bin/bin/ffado-diag; do
52− wrapProgram $exe \
53− --prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages \
54− --prefix PYTHONPATH : $out/share/libffado/python \
55− --prefix PYTHONPATH : ${pyqt4}/lib/${python.libPrefix}/site-packages \
56− --prefix PYTHONPATH : ${dbus-python}/lib/${python.libPrefix}/site-packages
57− done
58− '';
54+ enableParallelBuilding = true;
5955
6056 meta = with stdenv.lib; {
6157 homepage = http://www.ffado.org;
pkgs/os-specific/linux/ffado/fix-build.patchnew file+26
@@ -0,0 +1,26 @@
1+From b0f2b20b23780dd2e67a01c15462070dd86c4ac1 Mon Sep 17 00:00:00 2001
2+From: Jan Tojnar <jtojnar@gmail.com>
3+Date: Sun, 3 Mar 2019 11:50:27 +0100
4+Subject: [PATCH] Fix build on Nix
5+
6+We do not have global /usr.
7+---
8+ SConstruct | 2 +-
9+ 1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+diff --git a/SConstruct b/SConstruct
12+index 05755e4b..3fbdc1d8 100644
13+--- a/SConstruct
14++++ b/SConstruct
15+@@ -537,7 +537,7 @@ env['mandir'] = Template( env.destdir + env['MANDIR'] ).safe_substitute( env )
16+ env['pypkgdir'] = Template( env.destdir + env['PYPKGDIR'] ).safe_substitute( env )
17+ env['udevdir'] = Template( env.destdir + env['UDEVDIR'] ).safe_substitute( env )
18+ env['PYPKGDIR'] = Template( env['PYPKGDIR'] ).safe_substitute( env )
19+-env['metainfodir'] = Template( env.destdir + "/usr/share/metainfo" ).safe_substitute( env )
20++env['metainfodir'] = Template( env.destdir + env['SHAREDIR'] + "/metainfo" ).safe_substitute( env )
21+
22+ env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) )
23+
24+--
25+2.19.2
26+
pkgs/os-specific/linux/iproute/default.nix+5−5
@@ -1,12 +1,12 @@
11{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf }:
22
33stdenv.mkDerivation rec {
4− name = "iproute2-${version}";
5− version = "4.20.0";
4+ pname = "iproute2";
5+ version = "5.0.0";
66
77 src = fetchurl {
8− url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
9− sha256 = "1a7xyvqjxfnm7rk21amm0xgxa38clg7q7cmc4dmlg27q81mambf8";
8+ url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
9+ sha256 = "1fi03lb8dqr8hq633gcqsf6228vsvysxms075j1yyl4nlc17616z";
1010 };
1111
1212 preConfigure = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 "SBINDIR=$(out)/sbin"
2525 "MANDIR=$(out)/share/man"
2626 "BASH_COMPDIR=$(out)/share/bash-completion/completions"
27− "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs
27+ "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs
2828 "HDRDIR=$(dev)/include/iproute2"
2929 ];
3030
pkgs/os-specific/linux/kmod/default.nix+4−4
@@ -6,12 +6,12 @@ let
66 modulesDirs = lib.concatMapStringsSep ":" (x: "${x}/lib/modules") systems;
77
88in stdenv.mkDerivation rec {
9− name = "kmod-${version}";
10− version = "25";
9+ pname = "kmod";
10+ version = "26";
1111
1212 src = fetchurl {
13− url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
14− sha256 = "1kgixs4m3jvwk7fb3d18n6j77qhgi9qfv4csj35rs5ancr4ycrbi";
13+ url = "mirror://kernel/linux/utils/kernel/${pname}/${pname}-${version}.tar.xz";
14+ sha256 = "17dvrls70nr3b3x1wm8pwbqy4r8a5c20m0dhys8mjhsnpg425fsp";
1515 };
1616
1717 nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];
pkgs/servers/sql/postgresql/default.nix+8−8
@@ -157,33 +157,33 @@ let
157157in self: {
158158
159159 postgresql_9_4 = self.callPackage generic {
160− version = "9.4.20";
160+ version = "9.4.21";
161161 psqlSchema = "9.4";
162− sha256 = "0zzqjz5jrn624hzh04drpj6axh30a9k6bgawid6rwk45nbfxicgf";
162+ sha256 = "01k0s3a7qy8639zsjp1bjbfnnymyl0rgyylrjbkm81m0779b8j80";
163163 this = self.postgresql_9_4;
164164 inherit self;
165165 };
166166
167167 postgresql_9_5 = self.callPackage generic {
168− version = "9.5.15";
168+ version = "9.5.16";
169169 psqlSchema = "9.5";
170− sha256 = "0i2lylgmsmy2g1ixlvl112fryp7jmrd0i2brk8sxb7vzzpg3znnv";
170+ sha256 = "0cg10ri0475vg1c8k1sb5qi4i64hiv9k7crmg15qvvnwsjanqmx4";
171171 this = self.postgresql_9_5;
172172 inherit self;
173173 };
174174
175175 postgresql_9_6 = self.callPackage generic {
176− version = "9.6.11";
176+ version = "9.6.12";
177177 psqlSchema = "9.6";
178− sha256 = "0c55akrkzqd6p6a8hr0338wk246hl76r9j16p4zn3s51d7f0l99q";
178+ sha256 = "114xay230xia2fagisxahs5fc2mza8hmmkr6ibd7nxllp938931f";
179179 this = self.postgresql_9_6;
180180 inherit self;
181181 };
182182
183183 postgresql_10 = self.callPackage generic {
184− version = "10.6";
184+ version = "10.7";
185185 psqlSchema = "10.0"; # should be 10, but changing it is invasive
186− sha256 = "0jv26y3f10svrjxzsgqxg956c86b664azyk2wppzpa5x11pjga38";
186+ sha256 = "1piyfcrcqscjhnnwn91kdvr764s7d0qz4lgygf9bl6qc71ji1vdz";
187187 this = self.postgresql_10;
188188 inherit self;
189189 };
pkgs/servers/x11/xorg/default.nix+224−211
@@ -70,7 +70,7 @@ lib.makeScope newScope (self: with self; {
7070 meta.platforms = stdenv.lib.platforms.unix;
7171 }) {};
7272
73− fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
73+ fontadobe100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
7474 name = "font-adobe-100dpi-1.0.3";
7575 builder = ./builder.sh;
7676 src = fetchurl {
@@ -78,13 +78,13 @@ lib.makeScope newScope (self: with self; {
7878 sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
7979 };
8080 hardeningDisable = [ "bindnow" "relro" ];
81− nativeBuildInputs = [ pkgconfig ];
82− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
81+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
82+ buildInputs = [ ];
8383 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
8484 meta.platforms = stdenv.lib.platforms.unix;
8585 }) {};
8686
87− fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
87+ fontadobe75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
8888 name = "font-adobe-75dpi-1.0.3";
8989 builder = ./builder.sh;
9090 src = fetchurl {
@@ -92,13 +92,13 @@ lib.makeScope newScope (self: with self; {
9292 sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
9393 };
9494 hardeningDisable = [ "bindnow" "relro" ];
95− nativeBuildInputs = [ pkgconfig ];
96− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
95+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
96+ buildInputs = [ ];
9797 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
9898 meta.platforms = stdenv.lib.platforms.unix;
9999 }) {};
100100
101− fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
101+ fontadobeutopia100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
102102 name = "font-adobe-utopia-100dpi-1.0.4";
103103 builder = ./builder.sh;
104104 src = fetchurl {
@@ -106,13 +106,13 @@ lib.makeScope newScope (self: with self; {
106106 sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
107107 };
108108 hardeningDisable = [ "bindnow" "relro" ];
109− nativeBuildInputs = [ pkgconfig ];
110− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
109+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
110+ buildInputs = [ ];
111111 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
112112 meta.platforms = stdenv.lib.platforms.unix;
113113 }) {};
114114
115− fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
115+ fontadobeutopia75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
116116 name = "font-adobe-utopia-75dpi-1.0.4";
117117 builder = ./builder.sh;
118118 src = fetchurl {
@@ -120,13 +120,13 @@ lib.makeScope newScope (self: with self; {
120120 sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
121121 };
122122 hardeningDisable = [ "bindnow" "relro" ];
123− nativeBuildInputs = [ pkgconfig ];
124− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
123+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
124+ buildInputs = [ ];
125125 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
126126 meta.platforms = stdenv.lib.platforms.unix;
127127 }) {};
128128
129− fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
129+ fontadobeutopiatype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
130130 name = "font-adobe-utopia-type1-1.0.4";
131131 builder = ./builder.sh;
132132 src = fetchurl {
@@ -134,8 +134,8 @@ lib.makeScope newScope (self: with self; {
134134 sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
135135 };
136136 hardeningDisable = [ "bindnow" "relro" ];
137− nativeBuildInputs = [ pkgconfig ];
138− buildInputs = [ mkfontdir mkfontscale ];
137+ nativeBuildInputs = [ pkgconfig mkfontscale ];
138+ buildInputs = [ ];
139139 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
140140 meta.platforms = stdenv.lib.platforms.unix;
141141 }) {};
@@ -153,7 +153,7 @@ lib.makeScope newScope (self: with self; {
153153 meta.platforms = stdenv.lib.platforms.unix;
154154 }) {};
155155
156− fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
156+ fontarabicmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
157157 name = "font-arabic-misc-1.0.3";
158158 builder = ./builder.sh;
159159 src = fetchurl {
@@ -161,13 +161,13 @@ lib.makeScope newScope (self: with self; {
161161 sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
162162 };
163163 hardeningDisable = [ "bindnow" "relro" ];
164− nativeBuildInputs = [ pkgconfig ];
165− buildInputs = [ bdftopcf mkfontdir ];
164+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
165+ buildInputs = [ ];
166166 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
167167 meta.platforms = stdenv.lib.platforms.unix;
168168 }) {};
169169
170− fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
170+ fontbh100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
171171 name = "font-bh-100dpi-1.0.3";
172172 builder = ./builder.sh;
173173 src = fetchurl {
@@ -175,13 +175,13 @@ lib.makeScope newScope (self: with self; {
175175 sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
176176 };
177177 hardeningDisable = [ "bindnow" "relro" ];
178− nativeBuildInputs = [ pkgconfig ];
179− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
178+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
179+ buildInputs = [ ];
180180 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
181181 meta.platforms = stdenv.lib.platforms.unix;
182182 }) {};
183183
184− fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
184+ fontbh75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
185185 name = "font-bh-75dpi-1.0.3";
186186 builder = ./builder.sh;
187187 src = fetchurl {
@@ -189,13 +189,13 @@ lib.makeScope newScope (self: with self; {
189189 sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
190190 };
191191 hardeningDisable = [ "bindnow" "relro" ];
192− nativeBuildInputs = [ pkgconfig ];
193− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
192+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
193+ buildInputs = [ ];
194194 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
195195 meta.platforms = stdenv.lib.platforms.unix;
196196 }) {};
197197
198− fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
198+ fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
199199 name = "font-bh-lucidatypewriter-100dpi-1.0.3";
200200 builder = ./builder.sh;
201201 src = fetchurl {
@@ -203,13 +203,13 @@ lib.makeScope newScope (self: with self; {
203203 sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
204204 };
205205 hardeningDisable = [ "bindnow" "relro" ];
206− nativeBuildInputs = [ pkgconfig ];
207− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
206+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
207+ buildInputs = [ ];
208208 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
209209 meta.platforms = stdenv.lib.platforms.unix;
210210 }) {};
211211
212− fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
212+ fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
213213 name = "font-bh-lucidatypewriter-75dpi-1.0.3";
214214 builder = ./builder.sh;
215215 src = fetchurl {
@@ -217,13 +217,13 @@ lib.makeScope newScope (self: with self; {
217217 sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
218218 };
219219 hardeningDisable = [ "bindnow" "relro" ];
220− nativeBuildInputs = [ pkgconfig ];
221− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
220+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
221+ buildInputs = [ ];
222222 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
223223 meta.platforms = stdenv.lib.platforms.unix;
224224 }) {};
225225
226− fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
226+ fontbhttf = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
227227 name = "font-bh-ttf-1.0.3";
228228 builder = ./builder.sh;
229229 src = fetchurl {
@@ -231,13 +231,13 @@ lib.makeScope newScope (self: with self; {
231231 sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
232232 };
233233 hardeningDisable = [ "bindnow" "relro" ];
234− nativeBuildInputs = [ pkgconfig ];
235− buildInputs = [ mkfontdir mkfontscale ];
234+ nativeBuildInputs = [ pkgconfig mkfontscale ];
235+ buildInputs = [ ];
236236 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
237237 meta.platforms = stdenv.lib.platforms.unix;
238238 }) {};
239239
240− fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
240+ fontbhtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
241241 name = "font-bh-type1-1.0.3";
242242 builder = ./builder.sh;
243243 src = fetchurl {
@@ -245,13 +245,13 @@ lib.makeScope newScope (self: with self; {
245245 sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
246246 };
247247 hardeningDisable = [ "bindnow" "relro" ];
248− nativeBuildInputs = [ pkgconfig ];
249− buildInputs = [ mkfontdir mkfontscale ];
248+ nativeBuildInputs = [ pkgconfig mkfontscale ];
249+ buildInputs = [ ];
250250 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
251251 meta.platforms = stdenv.lib.platforms.unix;
252252 }) {};
253253
254− fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
254+ fontbitstream100dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
255255 name = "font-bitstream-100dpi-1.0.3";
256256 builder = ./builder.sh;
257257 src = fetchurl {
@@ -259,13 +259,13 @@ lib.makeScope newScope (self: with self; {
259259 sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
260260 };
261261 hardeningDisable = [ "bindnow" "relro" ];
262− nativeBuildInputs = [ pkgconfig ];
263− buildInputs = [ bdftopcf mkfontdir ];
262+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
263+ buildInputs = [ ];
264264 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
265265 meta.platforms = stdenv.lib.platforms.unix;
266266 }) {};
267267
268− fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
268+ fontbitstream75dpi = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
269269 name = "font-bitstream-75dpi-1.0.3";
270270 builder = ./builder.sh;
271271 src = fetchurl {
@@ -273,13 +273,13 @@ lib.makeScope newScope (self: with self; {
273273 sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
274274 };
275275 hardeningDisable = [ "bindnow" "relro" ];
276− nativeBuildInputs = [ pkgconfig ];
277− buildInputs = [ bdftopcf mkfontdir ];
276+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
277+ buildInputs = [ ];
278278 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
279279 meta.platforms = stdenv.lib.platforms.unix;
280280 }) {};
281281
282− fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
282+ fontbitstreamtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
283283 name = "font-bitstream-type1-1.0.3";
284284 builder = ./builder.sh;
285285 src = fetchurl {
@@ -287,13 +287,13 @@ lib.makeScope newScope (self: with self; {
287287 sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
288288 };
289289 hardeningDisable = [ "bindnow" "relro" ];
290− nativeBuildInputs = [ pkgconfig ];
291− buildInputs = [ mkfontdir mkfontscale ];
290+ nativeBuildInputs = [ pkgconfig mkfontscale ];
291+ buildInputs = [ ];
292292 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
293293 meta.platforms = stdenv.lib.platforms.unix;
294294 }) {};
295295
296− fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
296+ fontcronyxcyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
297297 name = "font-cronyx-cyrillic-1.0.3";
298298 builder = ./builder.sh;
299299 src = fetchurl {
@@ -301,13 +301,13 @@ lib.makeScope newScope (self: with self; {
301301 sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
302302 };
303303 hardeningDisable = [ "bindnow" "relro" ];
304− nativeBuildInputs = [ pkgconfig ];
305− buildInputs = [ bdftopcf mkfontdir ];
304+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
305+ buildInputs = [ ];
306306 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
307307 meta.platforms = stdenv.lib.platforms.unix;
308308 }) {};
309309
310− fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
310+ fontcursormisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
311311 name = "font-cursor-misc-1.0.3";
312312 builder = ./builder.sh;
313313 src = fetchurl {
@@ -315,13 +315,13 @@ lib.makeScope newScope (self: with self; {
315315 sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
316316 };
317317 hardeningDisable = [ "bindnow" "relro" ];
318− nativeBuildInputs = [ pkgconfig ];
319− buildInputs = [ bdftopcf mkfontdir ];
318+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
319+ buildInputs = [ ];
320320 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
321321 meta.platforms = stdenv.lib.platforms.unix;
322322 }) {};
323323
324− fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
324+ fontdaewoomisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
325325 name = "font-daewoo-misc-1.0.3";
326326 builder = ./builder.sh;
327327 src = fetchurl {
@@ -329,13 +329,13 @@ lib.makeScope newScope (self: with self; {
329329 sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
330330 };
331331 hardeningDisable = [ "bindnow" "relro" ];
332− nativeBuildInputs = [ pkgconfig ];
333− buildInputs = [ bdftopcf mkfontdir ];
332+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
333+ buildInputs = [ ];
334334 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
335335 meta.platforms = stdenv.lib.platforms.unix;
336336 }) {};
337337
338− fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
338+ fontdecmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
339339 name = "font-dec-misc-1.0.3";
340340 builder = ./builder.sh;
341341 src = fetchurl {
@@ -343,13 +343,13 @@ lib.makeScope newScope (self: with self; {
343343 sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
344344 };
345345 hardeningDisable = [ "bindnow" "relro" ];
346− nativeBuildInputs = [ pkgconfig ];
347− buildInputs = [ bdftopcf mkfontdir ];
346+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
347+ buildInputs = [ ];
348348 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
349349 meta.platforms = stdenv.lib.platforms.unix;
350350 }) {};
351351
352− fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
352+ fontibmtype1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
353353 name = "font-ibm-type1-1.0.3";
354354 builder = ./builder.sh;
355355 src = fetchurl {
@@ -357,13 +357,13 @@ lib.makeScope newScope (self: with self; {
357357 sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
358358 };
359359 hardeningDisable = [ "bindnow" "relro" ];
360− nativeBuildInputs = [ pkgconfig ];
361− buildInputs = [ mkfontdir mkfontscale ];
360+ nativeBuildInputs = [ pkgconfig mkfontscale ];
361+ buildInputs = [ ];
362362 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
363363 meta.platforms = stdenv.lib.platforms.unix;
364364 }) {};
365365
366− fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
366+ fontisasmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
367367 name = "font-isas-misc-1.0.3";
368368 builder = ./builder.sh;
369369 src = fetchurl {
@@ -371,13 +371,13 @@ lib.makeScope newScope (self: with self; {
371371 sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
372372 };
373373 hardeningDisable = [ "bindnow" "relro" ];
374− nativeBuildInputs = [ pkgconfig ];
375− buildInputs = [ bdftopcf mkfontdir ];
374+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
375+ buildInputs = [ ];
376376 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
377377 meta.platforms = stdenv.lib.platforms.unix;
378378 }) {};
379379
380− fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
380+ fontjismisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
381381 name = "font-jis-misc-1.0.3";
382382 builder = ./builder.sh;
383383 src = fetchurl {
@@ -385,13 +385,13 @@ lib.makeScope newScope (self: with self; {
385385 sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
386386 };
387387 hardeningDisable = [ "bindnow" "relro" ];
388− nativeBuildInputs = [ pkgconfig ];
389− buildInputs = [ bdftopcf mkfontdir ];
388+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
389+ buildInputs = [ ];
390390 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
391391 meta.platforms = stdenv.lib.platforms.unix;
392392 }) {};
393393
394− fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
394+ fontmicromisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
395395 name = "font-micro-misc-1.0.3";
396396 builder = ./builder.sh;
397397 src = fetchurl {
@@ -399,13 +399,13 @@ lib.makeScope newScope (self: with self; {
399399 sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
400400 };
401401 hardeningDisable = [ "bindnow" "relro" ];
402− nativeBuildInputs = [ pkgconfig ];
403− buildInputs = [ bdftopcf mkfontdir ];
402+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
403+ buildInputs = [ ];
404404 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
405405 meta.platforms = stdenv.lib.platforms.unix;
406406 }) {};
407407
408− fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
408+ fontmisccyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
409409 name = "font-misc-cyrillic-1.0.3";
410410 builder = ./builder.sh;
411411 src = fetchurl {
@@ -413,13 +413,13 @@ lib.makeScope newScope (self: with self; {
413413 sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
414414 };
415415 hardeningDisable = [ "bindnow" "relro" ];
416− nativeBuildInputs = [ pkgconfig ];
417− buildInputs = [ bdftopcf mkfontdir ];
416+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
417+ buildInputs = [ ];
418418 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
419419 meta.platforms = stdenv.lib.platforms.unix;
420420 }) {};
421421
422− fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
422+ fontmiscethiopic = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
423423 name = "font-misc-ethiopic-1.0.3";
424424 builder = ./builder.sh;
425425 src = fetchurl {
@@ -427,13 +427,13 @@ lib.makeScope newScope (self: with self; {
427427 sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
428428 };
429429 hardeningDisable = [ "bindnow" "relro" ];
430− nativeBuildInputs = [ pkgconfig ];
431− buildInputs = [ mkfontdir mkfontscale ];
430+ nativeBuildInputs = [ pkgconfig mkfontscale ];
431+ buildInputs = [ ];
432432 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
433433 meta.platforms = stdenv.lib.platforms.unix;
434434 }) {};
435435
436− fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
436+ fontmiscmeltho = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
437437 name = "font-misc-meltho-1.0.3";
438438 builder = ./builder.sh;
439439 src = fetchurl {
@@ -441,13 +441,13 @@ lib.makeScope newScope (self: with self; {
441441 sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
442442 };
443443 hardeningDisable = [ "bindnow" "relro" ];
444− nativeBuildInputs = [ pkgconfig ];
445− buildInputs = [ mkfontdir mkfontscale ];
444+ nativeBuildInputs = [ pkgconfig mkfontscale ];
445+ buildInputs = [ ];
446446 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
447447 meta.platforms = stdenv.lib.platforms.unix;
448448 }) {};
449449
450− fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
450+ fontmiscmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
451451 name = "font-misc-misc-1.1.2";
452452 builder = ./builder.sh;
453453 src = fetchurl {
@@ -455,13 +455,13 @@ lib.makeScope newScope (self: with self; {
455455 sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
456456 };
457457 hardeningDisable = [ "bindnow" "relro" ];
458− nativeBuildInputs = [ pkgconfig ];
459− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
458+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
459+ buildInputs = [ ];
460460 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
461461 meta.platforms = stdenv.lib.platforms.unix;
462462 }) {};
463463
464− fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
464+ fontmuttmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
465465 name = "font-mutt-misc-1.0.3";
466466 builder = ./builder.sh;
467467 src = fetchurl {
@@ -469,13 +469,13 @@ lib.makeScope newScope (self: with self; {
469469 sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
470470 };
471471 hardeningDisable = [ "bindnow" "relro" ];
472− nativeBuildInputs = [ pkgconfig ];
473− buildInputs = [ bdftopcf mkfontdir ];
472+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
473+ buildInputs = [ ];
474474 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
475475 meta.platforms = stdenv.lib.platforms.unix;
476476 }) {};
477477
478− fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontdir, mkfontscale }: stdenv.mkDerivation {
478+ fontschumachermisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation {
479479 name = "font-schumacher-misc-1.1.2";
480480 builder = ./builder.sh;
481481 src = fetchurl {
@@ -483,13 +483,13 @@ lib.makeScope newScope (self: with self; {
483483 sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
484484 };
485485 hardeningDisable = [ "bindnow" "relro" ];
486− nativeBuildInputs = [ pkgconfig ];
487− buildInputs = [ bdftopcf fontutil mkfontdir mkfontscale ];
486+ nativeBuildInputs = [ pkgconfig bdftopcf fontutil mkfontscale ];
487+ buildInputs = [ ];
488488 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
489489 meta.platforms = stdenv.lib.platforms.unix;
490490 }) {};
491491
492− fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
492+ fontscreencyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
493493 name = "font-screen-cyrillic-1.0.4";
494494 builder = ./builder.sh;
495495 src = fetchurl {
@@ -497,13 +497,13 @@ lib.makeScope newScope (self: with self; {
497497 sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
498498 };
499499 hardeningDisable = [ "bindnow" "relro" ];
500− nativeBuildInputs = [ pkgconfig ];
501− buildInputs = [ bdftopcf mkfontdir ];
500+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
501+ buildInputs = [ ];
502502 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
503503 meta.platforms = stdenv.lib.platforms.unix;
504504 }) {};
505505
506− fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
506+ fontsonymisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
507507 name = "font-sony-misc-1.0.3";
508508 builder = ./builder.sh;
509509 src = fetchurl {
@@ -511,13 +511,13 @@ lib.makeScope newScope (self: with self; {
511511 sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
512512 };
513513 hardeningDisable = [ "bindnow" "relro" ];
514− nativeBuildInputs = [ pkgconfig ];
515− buildInputs = [ bdftopcf mkfontdir ];
514+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
515+ buildInputs = [ ];
516516 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
517517 meta.platforms = stdenv.lib.platforms.unix;
518518 }) {};
519519
520− fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
520+ fontsunmisc = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
521521 name = "font-sun-misc-1.0.3";
522522 builder = ./builder.sh;
523523 src = fetchurl {
@@ -525,8 +525,8 @@ lib.makeScope newScope (self: with self; {
525525 sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
526526 };
527527 hardeningDisable = [ "bindnow" "relro" ];
528− nativeBuildInputs = [ pkgconfig ];
529− buildInputs = [ bdftopcf mkfontdir ];
528+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
529+ buildInputs = [ ];
530530 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
531531 meta.platforms = stdenv.lib.platforms.unix;
532532 }) {};
@@ -557,7 +557,7 @@ lib.makeScope newScope (self: with self; {
557557 meta.platforms = stdenv.lib.platforms.unix;
558558 }) {};
559559
560− fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontdir }: stdenv.mkDerivation {
560+ fontwinitzkicyrillic = callPackage ({ stdenv, pkgconfig, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation {
561561 name = "font-winitzki-cyrillic-1.0.3";
562562 builder = ./builder.sh;
563563 src = fetchurl {
@@ -565,13 +565,13 @@ lib.makeScope newScope (self: with self; {
565565 sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
566566 };
567567 hardeningDisable = [ "bindnow" "relro" ];
568− nativeBuildInputs = [ pkgconfig ];
569− buildInputs = [ bdftopcf mkfontdir ];
568+ nativeBuildInputs = [ pkgconfig bdftopcf mkfontscale ];
569+ buildInputs = [ ];
570570 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
571571 meta.platforms = stdenv.lib.platforms.unix;
572572 }) {};
573573
574− fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation {
574+ fontxfree86type1 = callPackage ({ stdenv, pkgconfig, fetchurl, mkfontscale }: stdenv.mkDerivation {
575575 name = "font-xfree86-type1-1.0.4";
576576 builder = ./builder.sh;
577577 src = fetchurl {
@@ -579,8 +579,8 @@ lib.makeScope newScope (self: with self; {
579579 sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
580580 };
581581 hardeningDisable = [ "bindnow" "relro" ];
582− nativeBuildInputs = [ pkgconfig ];
583− buildInputs = [ mkfontdir mkfontscale ];
582+ nativeBuildInputs = [ pkgconfig mkfontscale ];
583+ buildInputs = [ ];
584584 configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
585585 meta.platforms = stdenv.lib.platforms.unix;
586586 }) {};
@@ -625,11 +625,11 @@ lib.makeScope newScope (self: with self; {
625625 }) {};
626626
627627 imake = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
628− name = "imake-1.0.7";
628+ name = "imake-1.0.8";
629629 builder = ./builder.sh;
630630 src = fetchurl {
631− url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2;
632− sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
631+ url = mirror://xorg/individual/util/imake-1.0.8.tar.bz2;
632+ sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq";
633633 };
634634 hardeningDisable = [ "bindnow" "relro" ];
635635 nativeBuildInputs = [ pkgconfig ];
@@ -651,11 +651,11 @@ lib.makeScope newScope (self: with self; {
651651 }) {};
652652
653653 libFS = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xtrans }: stdenv.mkDerivation {
654− name = "libFS-1.0.7";
654+ name = "libFS-1.0.8";
655655 builder = ./builder.sh;
656656 src = fetchurl {
657− url = mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2;
658− sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f";
657+ url = mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2;
658+ sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8";
659659 };
660660 hardeningDisable = [ "bindnow" "relro" ];
661661 nativeBuildInputs = [ pkgconfig ];
@@ -768,11 +768,11 @@ lib.makeScope newScope (self: with self; {
768768 }) {};
769769
770770 libXcomposite = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation {
771− name = "libXcomposite-0.4.4";
771+ name = "libXcomposite-0.4.5";
772772 builder = ./builder.sh;
773773 src = fetchurl {
774− url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2;
775− sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd";
774+ url = mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2;
775+ sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk";
776776 };
777777 hardeningDisable = [ "bindnow" "relro" ];
778778 nativeBuildInputs = [ pkgconfig ];
@@ -781,11 +781,11 @@ lib.makeScope newScope (self: with self; {
781781 }) {};
782782
783783 libXcursor = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes, libXrender }: stdenv.mkDerivation {
784− name = "libXcursor-1.1.15";
784+ name = "libXcursor-1.2.0";
785785 builder = ./builder.sh;
786786 src = fetchurl {
787− url = mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2;
788− sha256 = "0syzlfvh29037p0vnlc8f3jxz8nl55k65blswsakklkwsc6nfki9";
787+ url = mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2;
788+ sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs";
789789 };
790790 hardeningDisable = [ "bindnow" "relro" ];
791791 nativeBuildInputs = [ pkgconfig ];
@@ -794,11 +794,11 @@ lib.makeScope newScope (self: with self; {
794794 }) {};
795795
796796 libXdamage = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXfixes }: stdenv.mkDerivation {
797− name = "libXdamage-1.1.4";
797+ name = "libXdamage-1.1.5";
798798 builder = ./builder.sh;
799799 src = fetchurl {
800− url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2;
801− sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw";
800+ url = mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2;
801+ sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p";
802802 };
803803 hardeningDisable = [ "bindnow" "relro" ];
804804 nativeBuildInputs = [ pkgconfig ];
@@ -807,11 +807,11 @@ lib.makeScope newScope (self: with self; {
807807 }) {};
808808
809809 libXdmcp = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
810− name = "libXdmcp-1.1.2";
810+ name = "libXdmcp-1.1.3";
811811 builder = ./builder.sh;
812812 src = fetchurl {
813− url = mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2;
814− sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1";
813+ url = mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2;
814+ sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0";
815815 };
816816 hardeningDisable = [ "bindnow" "relro" ];
817817 nativeBuildInputs = [ pkgconfig ];
@@ -820,11 +820,11 @@ lib.makeScope newScope (self: with self; {
820820 }) {};
821821
822822 libXext = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
823− name = "libXext-1.3.3";
823+ name = "libXext-1.3.4";
824824 builder = ./builder.sh;
825825 src = fetchurl {
826− url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2;
827− sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m";
826+ url = mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2;
827+ sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar";
828828 };
829829 hardeningDisable = [ "bindnow" "relro" ];
830830 nativeBuildInputs = [ pkgconfig ];
@@ -872,11 +872,11 @@ lib.makeScope newScope (self: with self; {
872872 }) {};
873873
874874 libXft = callPackage ({ stdenv, pkgconfig, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation {
875− name = "libXft-2.3.2";
875+ name = "libXft-2.3.3";
876876 builder = ./builder.sh;
877877 src = fetchurl {
878− url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2;
879− sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
878+ url = mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2;
879+ sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12";
880880 };
881881 hardeningDisable = [ "bindnow" "relro" ];
882882 nativeBuildInputs = [ pkgconfig ];
@@ -911,11 +911,11 @@ lib.makeScope newScope (self: with self; {
911911 }) {};
912912
913913 libXmu = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation {
914− name = "libXmu-1.1.2";
914+ name = "libXmu-1.1.3";
915915 builder = ./builder.sh;
916916 src = fetchurl {
917− url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2;
918− sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
917+ url = mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2;
918+ sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w";
919919 };
920920 hardeningDisable = [ "bindnow" "relro" ];
921921 nativeBuildInputs = [ pkgconfig ];
@@ -936,7 +936,7 @@ lib.makeScope newScope (self: with self; {
936936 meta.platforms = stdenv.lib.platforms.unix;
937937 }) {};
938938
939− libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt }: stdenv.mkDerivation {
939+ libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation {
940940 name = "libXpm-3.5.12";
941941 builder = ./builder.sh;
942942 src = fetchurl {
@@ -944,7 +944,7 @@ lib.makeScope newScope (self: with self; {
944944 sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
945945 };
946946 hardeningDisable = [ "bindnow" "relro" ];
947− nativeBuildInputs = [ pkgconfig ];
947+ nativeBuildInputs = [ pkgconfig gettext ];
948948 buildInputs = [ libX11 libXext xorgproto libXt ];
949949 meta.platforms = stdenv.lib.platforms.unix;
950950 }) {};
@@ -963,11 +963,11 @@ lib.makeScope newScope (self: with self; {
963963 }) {};
964964
965965 libXrandr = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXrender }: stdenv.mkDerivation {
966− name = "libXrandr-1.5.1";
966+ name = "libXrandr-1.5.2";
967967 builder = ./builder.sh;
968968 src = fetchurl {
969− url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2;
970− sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z";
969+ url = mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2;
970+ sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla";
971971 };
972972 hardeningDisable = [ "bindnow" "relro" ];
973973 nativeBuildInputs = [ pkgconfig ];
@@ -1041,11 +1041,11 @@ lib.makeScope newScope (self: with self; {
10411041 }) {};
10421042
10431043 libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation {
1044− name = "libXvMC-1.0.10";
1044+ name = "libXvMC-1.0.11";
10451045 builder = ./builder.sh;
10461046 src = fetchurl {
1047− url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2;
1048− sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5";
1047+ url = mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2;
1048+ sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja";
10491049 };
10501050 hardeningDisable = [ "bindnow" "relro" ];
10511051 nativeBuildInputs = [ pkgconfig ];
@@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; {
10541054 }) {};
10551055
10561056 libXxf86dga = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto }: stdenv.mkDerivation {
1057− name = "libXxf86dga-1.1.4";
1057+ name = "libXxf86dga-1.1.5";
10581058 builder = ./builder.sh;
10591059 src = fetchurl {
1060− url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2;
1061− sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f";
1060+ url = mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2;
1061+ sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b";
10621062 };
10631063 hardeningDisable = [ "bindnow" "relro" ];
10641064 nativeBuildInputs = [ pkgconfig ];
@@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; {
11581158 }) {};
11591159
11601160 libxkbfile = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation {
1161− name = "libxkbfile-1.0.9";
1161+ name = "libxkbfile-1.1.0";
11621162 builder = ./builder.sh;
11631163 src = fetchurl {
1164− url = mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2;
1165− sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai";
1164+ url = mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2;
1165+ sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm";
11661166 };
11671167 hardeningDisable = [ "bindnow" "relro" ];
11681168 nativeBuildInputs = [ pkgconfig ];
@@ -1210,11 +1210,11 @@ lib.makeScope newScope (self: with self; {
12101210 }) {};
12111211
12121212 luit = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
1213− name = "luit-20181211";
1213+ name = "luit-20190106";
12141214 builder = ./builder.sh;
12151215 src = fetchurl {
1216− url = ftp://ftp.invisible-island.net/luit/luit-20181211.tgz;
1217− sha256 = "18mf3savxjs29hf4xhhc5h278qy0bbj9ddssx44w0bnlg107jhp1";
1216+ url = https://invisible-mirror.net/archives/luit/luit-20190106.tgz;
1217+ sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b";
12181218 };
12191219 hardeningDisable = [ "bindnow" "relro" ];
12201220 nativeBuildInputs = [ pkgconfig ];
@@ -1223,11 +1223,11 @@ lib.makeScope newScope (self: with self; {
12231223 }) {};
12241224
12251225 makedepend = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto }: stdenv.mkDerivation {
1226− name = "makedepend-1.0.5";
1226+ name = "makedepend-1.0.6";
12271227 builder = ./builder.sh;
12281228 src = fetchurl {
1229− url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2;
1230− sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
1229+ url = mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2;
1230+ sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m";
12311231 };
12321232 hardeningDisable = [ "bindnow" "relro" ];
12331233 nativeBuildInputs = [ pkgconfig ];
@@ -1235,25 +1235,12 @@ lib.makeScope newScope (self: with self; {
12351235 meta.platforms = stdenv.lib.platforms.unix;
12361236 }) {};
12371237
1238− mkfontdir = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
1239− name = "mkfontdir-1.0.7";
1240− builder = ./builder.sh;
1241− src = fetchurl {
1242− url = mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2;
1243− sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
1244− };
1245− hardeningDisable = [ "bindnow" "relro" ];
1246− nativeBuildInputs = [ pkgconfig ];
1247− buildInputs = [ ];
1248− meta.platforms = stdenv.lib.platforms.unix;
1249− }) {};
1250−
12511238 mkfontscale = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation {
1252− name = "mkfontscale-1.1.3";
1239+ name = "mkfontscale-1.2.1";
12531240 builder = ./builder.sh;
12541241 src = fetchurl {
1255− url = mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2;
1256− sha256 = "0siag28jpm8hj62bgjvw81sjfgrc7vcy2h7127bl4iazxrlxz60y";
1242+ url = mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2;
1243+ sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a";
12571244 };
12581245 hardeningDisable = [ "bindnow" "relro" ];
12591246 nativeBuildInputs = [ pkgconfig ];
@@ -1261,7 +1248,7 @@ lib.makeScope newScope (self: with self; {
12611248 meta.platforms = stdenv.lib.platforms.unix;
12621249 }) {};
12631250
1264− oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation {
1251+ oclock = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, libXext, libXmu, libXt }: stdenv.mkDerivation {
12651252 name = "oclock-1.0.4";
12661253 builder = ./builder.sh;
12671254 src = fetchurl {
@@ -1270,7 +1257,7 @@ lib.makeScope newScope (self: with self; {
12701257 };
12711258 hardeningDisable = [ "bindnow" "relro" ];
12721259 nativeBuildInputs = [ pkgconfig ];
1273− buildInputs = [ libX11 libXext libXmu libXt ];
1260+ buildInputs = [ libxkbfile libX11 libXext libXmu libXt ];
12741261 meta.platforms = stdenv.lib.platforms.unix;
12751262 }) {};
12761263
@@ -1366,11 +1353,11 @@ lib.makeScope newScope (self: with self; {
13661353 }) {};
13671354
13681355 x11perf = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, libXft, libXmu, xorgproto, libXrender }: stdenv.mkDerivation {
1369− name = "x11perf-1.6.0";
1356+ name = "x11perf-1.6.1";
13701357 builder = ./builder.sh;
13711358 src = fetchurl {
1372− url = mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2;
1373− sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78";
1359+ url = mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2;
1360+ sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw";
13741361 };
13751362 hardeningDisable = [ "bindnow" "relro" ];
13761363 nativeBuildInputs = [ pkgconfig ];
@@ -1443,7 +1430,7 @@ lib.makeScope newScope (self: with self; {
14431430 meta.platforms = stdenv.lib.platforms.unix;
14441431 }) {};
14451432
1446− xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation {
1433+ xcbutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
14471434 name = "xcb-util-0.4.0";
14481435 builder = ./builder.sh;
14491436 src = fetchurl {
@@ -1452,11 +1439,11 @@ lib.makeScope newScope (self: with self; {
14521439 };
14531440 hardeningDisable = [ "bindnow" "relro" ];
14541441 nativeBuildInputs = [ pkgconfig ];
1455− buildInputs = [ gperf m4 libxcb ];
1442+ buildInputs = [ gperf m4 libxcb xorgproto ];
14561443 meta.platforms = stdenv.lib.platforms.unix;
14571444 }) {};
14581445
1459− xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil }: stdenv.mkDerivation {
1446+ xcbutilcursor = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto }: stdenv.mkDerivation {
14601447 name = "xcb-util-cursor-0.1.3";
14611448 builder = ./builder.sh;
14621449 src = fetchurl {
@@ -1465,11 +1452,11 @@ lib.makeScope newScope (self: with self; {
14651452 };
14661453 hardeningDisable = [ "bindnow" "relro" ];
14671454 nativeBuildInputs = [ pkgconfig ];
1468− buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil ];
1455+ buildInputs = [ gperf m4 libxcb xcbutilimage xcbutilrenderutil xorgproto ];
14691456 meta.platforms = stdenv.lib.platforms.unix;
14701457 }) {};
14711458
1472− xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto }: stdenv.mkDerivation {
1459+ xcbutilerrors = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xcbproto, xorgproto }: stdenv.mkDerivation {
14731460 name = "xcb-util-errors-1.0";
14741461 builder = ./builder.sh;
14751462 src = fetchurl {
@@ -1478,7 +1465,7 @@ lib.makeScope newScope (self: with self; {
14781465 };
14791466 hardeningDisable = [ "bindnow" "relro" ];
14801467 nativeBuildInputs = [ pkgconfig ];
1481− buildInputs = [ gperf m4 libxcb xcbproto ];
1468+ buildInputs = [ gperf m4 libxcb xcbproto xorgproto ];
14821469 meta.platforms = stdenv.lib.platforms.unix;
14831470 }) {};
14841471
@@ -1508,7 +1495,7 @@ lib.makeScope newScope (self: with self; {
15081495 meta.platforms = stdenv.lib.platforms.unix;
15091496 }) {};
15101497
1511− xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation {
1498+ xcbutilrenderutil = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
15121499 name = "xcb-util-renderutil-0.3.9";
15131500 builder = ./builder.sh;
15141501 src = fetchurl {
@@ -1517,11 +1504,11 @@ lib.makeScope newScope (self: with self; {
15171504 };
15181505 hardeningDisable = [ "bindnow" "relro" ];
15191506 nativeBuildInputs = [ pkgconfig ];
1520− buildInputs = [ gperf m4 libxcb ];
1507+ buildInputs = [ gperf m4 libxcb xorgproto ];
15211508 meta.platforms = stdenv.lib.platforms.unix;
15221509 }) {};
15231510
1524− xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb }: stdenv.mkDerivation {
1511+ xcbutilwm = callPackage ({ stdenv, pkgconfig, fetchurl, gperf, m4, libxcb, xorgproto }: stdenv.mkDerivation {
15251512 name = "xcb-util-wm-0.4.1";
15261513 builder = ./builder.sh;
15271514 src = fetchurl {
@@ -1530,7 +1517,7 @@ lib.makeScope newScope (self: with self; {
15301517 };
15311518 hardeningDisable = [ "bindnow" "relro" ];
15321519 nativeBuildInputs = [ pkgconfig ];
1533− buildInputs = [ gperf m4 libxcb ];
1520+ buildInputs = [ gperf m4 libxcb xorgproto ];
15341521 meta.platforms = stdenv.lib.platforms.unix;
15351522 }) {};
15361523
@@ -1561,11 +1548,11 @@ lib.makeScope newScope (self: with self; {
15611548 }) {};
15621549
15631550 xcompmgr = callPackage ({ stdenv, pkgconfig, fetchurl, libXcomposite, libXdamage, libXext, libXfixes, libXrender }: stdenv.mkDerivation {
1564− name = "xcompmgr-1.1.7";
1551+ name = "xcompmgr-1.1.8";
15651552 builder = ./builder.sh;
15661553 src = fetchurl {
1567− url = mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2;
1568− sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168";
1554+ url = mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2;
1555+ sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b";
15691556 };
15701557 hardeningDisable = [ "bindnow" "relro" ];
15711558 nativeBuildInputs = [ pkgconfig ];
@@ -1638,7 +1625,7 @@ lib.makeScope newScope (self: with self; {
16381625 meta.platforms = stdenv.lib.platforms.unix;
16391626 }) {};
16401627
1641− xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation {
1628+ xdriinfo = callPackage ({ stdenv, pkgconfig, fetchurl, libGL, xorgproto, libX11 }: stdenv.mkDerivation {
16421629 name = "xdriinfo-1.0.6";
16431630 builder = ./builder.sh;
16441631 src = fetchurl {
@@ -1647,7 +1634,7 @@ lib.makeScope newScope (self: with self; {
16471634 };
16481635 hardeningDisable = [ "bindnow" "relro" ];
16491636 nativeBuildInputs = [ pkgconfig ];
1650− buildInputs = [ xorgproto libX11 ];
1637+ buildInputs = [ libGL xorgproto libX11 ];
16511638 meta.platforms = stdenv.lib.platforms.unix;
16521639 }) {};
16531640
@@ -1677,7 +1664,7 @@ lib.makeScope newScope (self: with self; {
16771664 meta.platforms = stdenv.lib.platforms.unix;
16781665 }) {};
16791666
1680− xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, udev, xorgserver }: stdenv.mkDerivation {
1667+ xf86inputevdev = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver }: stdenv.mkDerivation {
16811668 name = "xf86-input-evdev-2.10.6";
16821669 builder = ./builder.sh;
16831670 src = fetchurl {
@@ -1686,7 +1673,7 @@ lib.makeScope newScope (self: with self; {
16861673 };
16871674 hardeningDisable = [ "bindnow" "relro" ];
16881675 nativeBuildInputs = [ pkgconfig ];
1689− buildInputs = [ xorgproto udev xorgserver ];
1676+ buildInputs = [ xorgproto libevdev udev mtdev xorgserver ];
16901677 meta.platforms = stdenv.lib.platforms.unix;
16911678 }) {};
16921679
@@ -1716,7 +1703,7 @@ lib.makeScope newScope (self: with self; {
17161703 meta.platforms = stdenv.lib.platforms.unix;
17171704 }) {};
17181705
1719− xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, xorgserver }: stdenv.mkDerivation {
1706+ xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation {
17201707 name = "xf86-input-libinput-0.28.2";
17211708 builder = ./builder.sh;
17221709 src = fetchurl {
@@ -1725,7 +1712,7 @@ lib.makeScope newScope (self: with self; {
17251712 };
17261713 hardeningDisable = [ "bindnow" "relro" ];
17271714 nativeBuildInputs = [ pkgconfig ];
1728− buildInputs = [ xorgproto xorgserver ];
1715+ buildInputs = [ xorgproto libinput xorgserver ];
17291716 meta.platforms = stdenv.lib.platforms.unix;
17301717 }) {};
17311718
@@ -1742,7 +1729,7 @@ lib.makeScope newScope (self: with self; {
17421729 meta.platforms = stdenv.lib.platforms.unix;
17431730 }) {};
17441731
1745− xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation {
1732+ xf86inputsynaptics = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libevdev, libX11, libXi, xorgserver, libXtst }: stdenv.mkDerivation {
17461733 name = "xf86-input-synaptics-1.9.1";
17471734 builder = ./builder.sh;
17481735 src = fetchurl {
@@ -1751,7 +1738,7 @@ lib.makeScope newScope (self: with self; {
17511738 };
17521739 hardeningDisable = [ "bindnow" "relro" ];
17531740 nativeBuildInputs = [ pkgconfig ];
1754− buildInputs = [ xorgproto libX11 libXi xorgserver libXtst ];
1741+ buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ];
17551742 meta.platforms = stdenv.lib.platforms.unix;
17561743 }) {};
17571744
@@ -1782,11 +1769,11 @@ lib.makeScope newScope (self: with self; {
17821769 }) {};
17831770
17841771 xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation {
1785− name = "xf86-video-amdgpu-18.1.0";
1772+ name = "xf86-video-amdgpu-19.0.1";
17861773 builder = ./builder.sh;
17871774 src = fetchurl {
1788− url = mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2;
1789− sha256 = "0wlnb929l3yqj4hdkzyxyhbaph13ac4villajgmbh66pa6xja7z1";
1775+ url = mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2;
1776+ sha256 = "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da";
17901777 };
17911778 hardeningDisable = [ "bindnow" "relro" ];
17921779 nativeBuildInputs = [ pkgconfig ];
@@ -1833,16 +1820,16 @@ lib.makeScope newScope (self: with self; {
18331820 meta.platforms = stdenv.lib.platforms.unix;
18341821 }) {};
18351822
1836− xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation {
1837− name = "xf86-video-ati-18.0.1";
1823+ xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation {
1824+ name = "xf86-video-ati-19.0.1";
18381825 builder = ./builder.sh;
18391826 src = fetchurl {
1840− url = mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2;
1841− sha256 = "180l2yw8c63cbcs3zk729vx439aig1d7yicpyxj0nmfl4y0kpskj";
1827+ url = mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2;
1828+ sha256 = "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw";
18421829 };
18431830 hardeningDisable = [ "bindnow" "relro" ];
18441831 nativeBuildInputs = [ pkgconfig ];
1845− buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ];
1832+ buildInputs = [ xorgproto mesa_noglu libGL libdrm udev libpciaccess xorgserver ];
18461833 meta.platforms = stdenv.lib.platforms.unix;
18471834 }) {};
18481835
@@ -1963,7 +1950,7 @@ lib.makeScope newScope (self: with self; {
19631950 meta.platforms = stdenv.lib.platforms.unix;
19641951 }) {};
19651952
1966− xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
1953+ xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation {
19671954 name = "xf86-video-intel-2.99.917";
19681955 builder = ./builder.sh;
19691956 src = fetchurl {
@@ -1972,7 +1959,7 @@ lib.makeScope newScope (self: with self; {
19721959 };
19731960 hardeningDisable = [ "bindnow" "relro" ];
19741961 nativeBuildInputs = [ pkgconfig ];
1975− buildInputs = [ xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ];
1962+ buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ];
19761963 meta.platforms = stdenv.lib.platforms.unix;
19771964 }) {};
19781965
@@ -2353,6 +2340,19 @@ lib.makeScope newScope (self: with self; {
23532340 meta.platforms = stdenv.lib.platforms.unix;
23542341 }) {};
23552342
2343+ xfd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, fontconfig, libXaw, libXft, libXmu, xorgproto, libXrender, libXt, gettext }: stdenv.mkDerivation {
2344+ name = "xfd-1.1.3";
2345+ builder = ./builder.sh;
2346+ src = fetchurl {
2347+ url = mirror://xorg/individual/app/xfd-1.1.3.tar.bz2;
2348+ sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr";
2349+ };
2350+ hardeningDisable = [ "bindnow" "relro" ];
2351+ nativeBuildInputs = [ pkgconfig gettext ];
2352+ buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ];
2353+ meta.platforms = stdenv.lib.platforms.unix;
2354+ }) {};
2355+
23562356 xfontsel = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, libXt }: stdenv.mkDerivation {
23572357 name = "xfontsel-1.0.6";
23582358 builder = ./builder.sh;
@@ -2535,7 +2535,7 @@ lib.makeScope newScope (self: with self; {
25352535 meta.platforms = stdenv.lib.platforms.unix;
25362536 }) {};
25372537
2538− xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt }: stdenv.mkDerivation {
2538+ xload = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, gettext }: stdenv.mkDerivation {
25392539 name = "xload-1.1.3";
25402540 builder = ./builder.sh;
25412541 src = fetchurl {
@@ -2543,7 +2543,7 @@ lib.makeScope newScope (self: with self; {
25432543 sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk";
25442544 };
25452545 hardeningDisable = [ "bindnow" "relro" ];
2546− nativeBuildInputs = [ pkgconfig ];
2546+ nativeBuildInputs = [ pkgconfig gettext ];
25472547 buildInputs = [ libX11 libXaw libXmu xorgproto libXt ];
25482548 meta.platforms = stdenv.lib.platforms.unix;
25492549 }) {};
@@ -2626,6 +2626,19 @@ lib.makeScope newScope (self: with self; {
26262626 meta.platforms = stdenv.lib.platforms.unix;
26272627 }) {};
26282628
2629+ xmore = callPackage ({ stdenv, pkgconfig, fetchurl, libXaw, libXt }: stdenv.mkDerivation {
2630+ name = "xmore-1.0.3";
2631+ builder = ./builder.sh;
2632+ src = fetchurl {
2633+ url = mirror://xorg/individual/app/xmore-1.0.3.tar.bz2;
2634+ sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4";
2635+ };
2636+ hardeningDisable = [ "bindnow" "relro" ];
2637+ nativeBuildInputs = [ pkgconfig ];
2638+ buildInputs = [ libXaw libXt ];
2639+ meta.platforms = stdenv.lib.platforms.unix;
2640+ }) {};
2641+
26292642 xorgcffiles = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
26302643 name = "xorg-cf-files-1.0.6";
26312644 builder = ./builder.sh;
@@ -2705,11 +2718,11 @@ lib.makeScope newScope (self: with self; {
27052718 }) {};
27062719
27072720 xprop = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
2708− name = "xprop-1.2.3";
2721+ name = "xprop-1.2.4";
27092722 builder = ./builder.sh;
27102723 src = fetchurl {
2711− url = mirror://xorg/individual/app/xprop-1.2.3.tar.bz2;
2712− sha256 = "06sjgahjiz85v0k0pmv5x05chc591xynl5ah1bqzz1bdr0lgnanj";
2724+ url = mirror://xorg/individual/app/xprop-1.2.4.tar.bz2;
2725+ sha256 = "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc";
27132726 };
27142727 hardeningDisable = [ "bindnow" "relro" ];
27152728 nativeBuildInputs = [ pkgconfig ];
@@ -2809,11 +2822,11 @@ lib.makeScope newScope (self: with self; {
28092822 }) {};
28102823
28112824 xtrans = callPackage ({ stdenv, pkgconfig, fetchurl }: stdenv.mkDerivation {
2812− name = "xtrans-1.3.5";
2825+ name = "xtrans-1.4.0";
28132826 builder = ./builder.sh;
28142827 src = fetchurl {
2815− url = mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2;
2816− sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd";
2828+ url = mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2;
2829+ sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p";
28172830 };
28182831 hardeningDisable = [ "bindnow" "relro" ];
28192832 nativeBuildInputs = [ pkgconfig ];
@@ -2847,7 +2860,7 @@ lib.makeScope newScope (self: with self; {
28472860 meta.platforms = stdenv.lib.platforms.unix;
28482861 }) {};
28492862
2850− xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, xorgproto }: stdenv.mkDerivation {
2863+ xwd = callPackage ({ stdenv, pkgconfig, fetchurl, libxkbfile, libX11, xorgproto }: stdenv.mkDerivation {
28512864 name = "xwd-1.0.7";
28522865 builder = ./builder.sh;
28532866 src = fetchurl {
@@ -2856,7 +2869,7 @@ lib.makeScope newScope (self: with self; {
28562869 };
28572870 hardeningDisable = [ "bindnow" "relro" ];
28582871 nativeBuildInputs = [ pkgconfig ];
2859− buildInputs = [ libX11 xorgproto ];
2872+ buildInputs = [ libxkbfile libX11 xorgproto ];
28602873 meta.platforms = stdenv.lib.platforms.unix;
28612874 }) {};
28622875
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl+11−7
@@ -26,7 +26,7 @@ my %pcMap;
2626my %extraAttrs;
2727
2828
29−my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4");
29+my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" );
3030$pcMap{$_} = $_ foreach @missingPCs;
3131$pcMap{"freetype2"} = "freetype";
3232$pcMap{"libpng12"} = "libpng";
@@ -35,11 +35,13 @@ $pcMap{"dbus-1"} = "dbus";
3535$pcMap{"uuid"} = "libuuid";
3636$pcMap{"libudev"} = "udev";
3737$pcMap{"gl"} = "libGL";
38+$pcMap{"GL"} = "libGL";
3839$pcMap{"gbm"} = "mesa_noglu";
3940$pcMap{"\$PIXMAN"} = "pixman";
4041$pcMap{"\$RENDERPROTO"} = "xorgproto";
4142$pcMap{"\$DRI3PROTO"} = "xorgproto";
4243$pcMap{"\$DRI2PROTO"} = "xorgproto";
44+$pcMap{"\${XKBMODULE}"} = "libxkbfile";
4345
4446
4547my $downloadCache = "./download-cache";
@@ -149,15 +151,15 @@ while (<>) {
149151 }
150152
151153 if ($file =~ /AC_PATH_PROG\(BDFTOPCF/) {
152− push @requires, "bdftopcf";
154+ push @nativeRequires, "bdftopcf";
153155 }
154156
155157 if ($file =~ /AC_PATH_PROG\(MKFONTSCALE/) {
156− push @requires, "mkfontscale";
158+ push @nativeRequires, "mkfontscale";
157159 }
158160
159161 if ($file =~ /AC_PATH_PROG\(MKFONTDIR/) {
160− push @requires, "mkfontdir";
162+ push @nativeRequires, "mkfontscale";
161163 }
162164
163165 if ($file =~ /AM_PATH_PYTHON/) {
@@ -173,17 +175,17 @@ while (<>) {
173175 my $isFont;
174176
175177 if ($file =~ /XORG_FONT_BDF_UTILS/) {
176− push @requires, "bdftopcf", "mkfontdir";
178+ push @nativeRequires, "bdftopcf", "mkfontscale";
177179 $isFont = 1;
178180 }
179181
180182 if ($file =~ /XORG_FONT_SCALED_UTILS/) {
181− push @requires, "mkfontscale", "mkfontdir";
183+ push @nativeRequires, "mkfontscale";
182184 $isFont = 1;
183185 }
184186
185187 if ($file =~ /XORG_FONT_UCS2ANY/) {
186− push @requires, "fontutil", "mkfontscale";
188+ push @nativeRequires, "fontutil", "mkfontscale";
187189 $isFont = 1;
188190 }
189191
@@ -213,6 +215,7 @@ while (<>) {
213215
214216 #process \@requires, $1 while $file =~ /PKG_CHECK_MODULES\([^,]*,\s*[\[]?([^\)\[]*)/g;
215217 process \@requires, $1 while $file =~ /PKG_CHECK_MODULES\([^,]*,([^\)\,]*)/g;
218+ process \@requires, $1 while $file =~ /AC_SEARCH_LIBS\([^,]*,([^\)\,]*)/g;
216219 process \@requires, $1 while $file =~ /MODULES=\"(.*)\"/g;
217220 process \@requires, $1 while $file =~ /REQUIRED_LIBS=\"(.*)\"/g;
218221 process \@requires, $1 while $file =~ /REQUIRED_MODULES=\"(.*)\"/g;
@@ -224,6 +227,7 @@ while (<>) {
224227 process \@requires, $1 while $file =~ /ivo_requires=\"(.*)\"/g;
225228 process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g;
226229
230+ push @nativeRequires, "gettext" if $file =~ /USE_GETTEXT/;
227231 push @requires, "libxslt" if $pkg =~ /libxcb/;
228232 push @requires, "gperf", "m4", "xorgproto" if $pkg =~ /xcbutil/;
229233
pkgs/servers/x11/xorg/overrides.nix+3−16
@@ -49,10 +49,6 @@ self: super:
4949 meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
5050 });
5151
52− fontcursormisc = super.fontcursormisc.overrideAttrs (attrs: {
53− buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
54− });
55−
5652 fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: {
5753 postInstall =
5854 ''
@@ -74,9 +70,7 @@ self: super:
7470 inherit tradcpp;
7571 });
7672
77− mkfontdir = super.mkfontdir.overrideAttrs (attrs: {
78− preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${self.mkfontscale}/bin";
79− });
73+ mkfontdir = self.mkfontscale;
8074
8175 libxcb = super.libxcb.overrideAttrs (attrs: {
8276 configureFlags = [ "--enable-xkb" "--enable-xinput" ];
@@ -288,10 +282,6 @@ self: super:
288282 meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; };
289283 });
290284
291− oclock = super.oclock.overrideAttrs (attrs: {
292− buildInputs = attrs.buildInputs ++ [ self.libxkbfile ];
293− });
294−
295285 setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
296286 postInstall =
297287 ''
@@ -337,7 +327,6 @@ self: super:
337327 outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny
338328 preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
339329 installFlags = "sdkdir=\${out}/include/xorg";
340− buildInputs = attrs.buildInputs ++ [ mtdev libevdev ];
341330 });
342331
343332 xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: {
@@ -350,13 +339,11 @@ self: super:
350339
351340 xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: rec {
352341 outputs = [ "out" "dev" ];
353− buildInputs = attrs.buildInputs ++ [ libinput ];
354342 installFlags = "sdkdir=\${dev}/include/xorg";
355343 });
356344
357345 xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: {
358346 outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev
359− buildInputs = attrs.buildInputs ++ [mtdev libevdev];
360347 installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d";
361348 });
362349
@@ -421,7 +408,7 @@ self: super:
421408 });
422409
423410 xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {
424− buildInputs = attrs.buildInputs ++ [intltool];
411+ nativeBuildInputs = attrs.nativeBuildInputs ++ [intltool];
425412
426413 #TODO: resurrect patches for US_intl?
427414 patches = [ ./xkeyboard-config-eo.patch ];
@@ -693,7 +680,7 @@ self: super:
693680 });
694681
695682 xwd = super.xwd.overrideAttrs (attrs: {
696− buildInputs = with self; attrs.buildInputs ++ [libXt libxkbfile];
683+ buildInputs = with self; attrs.buildInputs ++ [libXt];
697684 });
698685
699686 xrdb = super.xrdb.overrideAttrs (attrs: {
pkgs/servers/x11/xorg/tarballs.list+24−23
@@ -1,4 +1,4 @@
1−ftp://ftp.invisible-island.net/luit/luit-20181211.tgz
1+https://invisible-mirror.net/archives/luit/luit-20190106.tgz
22https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
33https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2
44https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
@@ -17,8 +17,7 @@ mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2
1717mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2
1818mirror://xorg/individual/app/ico-1.0.5.tar.bz2
1919mirror://xorg/individual/app/listres-1.0.4.tar.bz2
20−mirror://xorg/individual/app/mkfontdir-1.0.7.tar.bz2
21−mirror://xorg/individual/app/mkfontscale-1.1.3.tar.bz2
20+mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2
2221mirror://xorg/individual/app/oclock-1.0.4.tar.bz2
2322mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
2423mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
@@ -26,13 +25,13 @@ mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
2625mirror://xorg/individual/app/transset-1.0.2.tar.bz2
2726mirror://xorg/individual/app/twm-1.0.10.tar.bz2
2827mirror://xorg/individual/app/viewres-1.0.5.tar.bz2
29−mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
28+mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
3029mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
3130mirror://xorg/individual/app/xbacklight-1.2.2.tar.bz2
3231mirror://xorg/individual/app/xcalc-1.0.7.tar.bz2
3332mirror://xorg/individual/app/xclock-1.0.8.tar.bz2
3433mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
35−mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2
34+mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2
3635mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2
3736mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2
3837mirror://xorg/individual/app/xdm-1.1.12.tar.bz2
@@ -40,6 +39,7 @@ mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2
4039mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2
4140mirror://xorg/individual/app/xev-1.2.3.tar.bz2
4241mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2
42+mirror://xorg/individual/app/xfd-1.1.3.tar.bz2
4343mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2
4444mirror://xorg/individual/app/xfs-1.2.0.tar.bz2
4545mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2
@@ -60,8 +60,9 @@ mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2
6060mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
6161mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2
6262mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2
63+mirror://xorg/individual/app/xmore-1.0.3.tar.bz2
6364mirror://xorg/individual/app/xpr-1.0.5.tar.bz2
64−mirror://xorg/individual/app/xprop-1.2.3.tar.bz2
65+mirror://xorg/individual/app/xprop-1.2.4.tar.bz2
6566mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2
6667mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2
6768mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2
@@ -87,11 +88,11 @@ mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2
8788mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2
8889mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
8990mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
90−mirror://xorg/individual/driver/xf86-video-amdgpu-18.1.0.tar.bz2
91+mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2
9192mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2
9293mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
9394mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
94−mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2
95+mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2
9596mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2
9697mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
9798mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2
@@ -171,7 +172,7 @@ mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2
171172mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2
172173mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2
173174mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2
174−mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2
175+mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2
175176mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
176177mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
177178mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2
@@ -180,23 +181,23 @@ mirror://xorg/individual/lib/libX11-1.6.7.tar.bz2
180181mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2
181182mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
182183mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2
183−mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
184−mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2
185−mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
186−mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
187−mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
184+mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2
185+mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2
186+mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2
187+mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2
188+mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2
188189mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2
189190mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
190191mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
191−mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
192+mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2
192193mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2
193194mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
194−mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
195−mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
195+mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2
196+mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2
196197mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2
197198mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2
198199mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2
199−mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2
200+mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2
200201mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2
201202mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2
202203mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2
@@ -204,16 +205,16 @@ mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2
204205mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2
205206mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
206207mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
207−mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2
208−mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2
208+mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2
209+mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2
209210mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
210211mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2
211−mirror://xorg/individual/lib/xtrans-1.3.5.tar.bz2
212+mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2
212213mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2
213214mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
214−mirror://xorg/individual/util/imake-1.0.7.tar.bz2
215+mirror://xorg/individual/util/imake-1.0.8.tar.bz2
215216mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
216−mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2
217+mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
217218mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
218219mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
219220mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2
pkgs/tools/archivers/gnutar/default.nix+2
@@ -62,5 +62,7 @@ stdenv.mkDerivation rec {
6262
6363 maintainers = [ ];
6464 platforms = stdenv.lib.platforms.all;
65+
66+ priority = 10;
6567 };
6668}
pkgs/tools/filesystems/cryfs/default.nix−1
@@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
4848 cmakeFlags = [
4949 "-DCRYFS_UPDATE_CHECKS=OFF"
5050 "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive
51− "-DBUILD_TESTING=ON"
5251 ];
5352
5453 doCheck = true;
pkgs/tools/filesystems/e2fsprogs/default.nix+9−9
@@ -1,11 +1,12 @@
1−{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }:
1+{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo }:
22
33stdenv.mkDerivation rec {
4− name = "e2fsprogs-1.44.5";
4+ pname = "e2fsprogs";
5+ version = "1.45.0";
56
67 src = fetchurl {
7− url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
8− sha256 = "1k6iwv2bz2a8mcd1gg9kb5jpry7pil5v2h2f9apxax7g4yp1y89f";
8+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
9+ sha256 = "1sgcjarfksa8bkx81q5cd6rzqvhzgs28a0ljwyr4ggqpfx7d18vk";
910 };
1011
1112 outputs = [ "bin" "dev" "out" "man" "info" ];
@@ -33,13 +34,12 @@ stdenv.mkDerivation rec {
3334 "--enable-libuuid --disable-e2initrd-helper"
3435 ];
3536
36− checkInputs = [ perl ];
37− doCheck = false; # fails
37+ checkInputs = [ buildPackages.perl ];
38+ doCheck = true;
3839
39− # hacky way to make it install *.pc
4040 postInstall = ''
41− make install-libs
42− rm "$out"/lib/*.a
41+ # avoid cycle between outputs
42+ mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
4343 '';
4444
4545 enableParallelBuilding = true;
pkgs/tools/inputmethods/ibus/default.nix+23−14
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
1+{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig
22, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2
33, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true
44, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null
@@ -50,6 +50,24 @@ let
5050 };
5151 nativeBuildInputs = [ autoreconfHook ];
5252 };
53+ ucdSrcs = {
54+ NamesList = fetchurl {
55+ url = "https://www.unicode.org/Public/UNIDATA/NamesList.txt";
56+ sha256 = "c17c7726f562bd9ef869096807f0297e1edef9a58fdae1fbae487378fa43586f";
57+ };
58+ Blocks = fetchurl {
59+ url = "https://www.unicode.org/Public/UNIDATA/Blocks.txt";
60+ sha256 = "a1a3ca4381eb91f7b65afe7cb7df615cdcf67993fef4b486585f66b349993a10";
61+ };
62+ };
63+ ucd = stdenv.mkDerivation rec {
64+ name = "ucd-12.0.0";
65+ unpackPhase = ":";
66+ installPhase = ''
67+ mkdir $out
68+ ${builtins.toString (flip mapAttrsToList ucdSrcs (k: v: "cp ${v} $out/${k}.txt;"))}
69+ '';
70+ };
5371 python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]);
5472 python3BuildEnv = python3.buildEnv.override {
5573 # ImportError: No module named site
@@ -59,24 +77,17 @@ let
5977 makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH
6078 '';
6179 };
62−
63− # stop gconf from leaking into environment
64− # can be removed in ibus 1.6 which will not use gconf anymore
65− gsettings-schema-convert = runCommand "name" {} ''
66− mkdir -p $out/bin
67− ln -s ${gconf}/bin/gsettings-schema-convert $out/bin
68− '';
6980in
7081
7182stdenv.mkDerivation rec {
7283 name = "ibus-${version}";
73− version = "1.5.17";
84+ version = "1.5.20";
7485
7586 src = fetchFromGitHub {
7687 owner = "ibus";
7788 repo = "ibus";
7889 rev = version;
79− sha256 = "09mrj9d8qpl9cbylg1zx8c3ymc5gdy4jrf6zs125wjz0b574g5av";
90+ sha256 = "1npavb896qrp6qbqayb0va4mpsi68wybcnlbjknzgssqyw2ylh9r";
8091 };
8192
8293 postPatch = ''
@@ -88,10 +99,8 @@ stdenv.mkDerivation rec {
8899 '';
89100
90101 preAutoreconf = "touch ChangeLog";
91− preConfigure = "intltoolize";
92102
93103 configureFlags = [
94− "--disable-gconf"
95104 "--disable-memconf"
96105 (enableFeature (dconf != null) "dconf")
97106 (enableFeature (libnotify != null) "libnotify")
@@ -100,13 +109,13 @@ stdenv.mkDerivation rec {
100109 (enableFeature enableUI "ui")
101110 "--with-unicode-emoji-dir=${emojiData}"
102111 "--with-emoji-annotation-dir=${cldrEmojiAnnotation}/share/unicode/cldr/common/annotations"
112+ "--with-ucd-dir=${ucd}"
103113 ];
104114
105115 nativeBuildInputs = [
106116 autoreconfHook
107− gsettings-schema-convert
108117 gtk-doc
109− intltool
118+ gettext
110119 makeWrapper
111120 pkgconfig
112121 python3BuildEnv
pkgs/tools/inputmethods/uim/default.nix+7−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub
1+{ stdenv, fetchFromGitHub, shared-mime-info
22, autoconf, automake, intltool, libtool, pkgconfig, cmake
33, ruby, librsvg
44, ncurses, m17n_lib, m17n_db, expat
@@ -127,6 +127,12 @@ stdenv.mkDerivation rec {
127127 #--with-sj3 Use SJ3 [default=no]
128128 #--with-osx-dcs Build with OS X Dictionary Services [default=no]
129129
130+ # TODO: fix this in librsvg/glib later
131+ # https://github.com/NixOS/nixpkgs/pull/57027#issuecomment-475461733
132+ preBuild = ''
133+ export XDG_DATA_DIRS="${shared-mime-info}/share"
134+ '';
135+
130136 dontUseCmakeConfigure = true;
131137
132138 meta = with stdenv.lib; {
pkgs/tools/misc/coreutils/default.nix+19−13
@@ -16,37 +16,41 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
1616with lib;
1717
1818stdenv.mkDerivation rec {
19− name = "coreutils-8.30";
19+ pname = "coreutils";
20+ version = "8.31";
2021
2122 src = fetchurl {
22− url = "mirror://gnu/coreutils/${name}.tar.xz";
23− sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8";
23+ url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
24+ sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz";
2425 };
2526
2627 patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
2728
2829 postPatch = ''
2930 # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems.
30− sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
31− sed '2i echo Skipping du threshold test && exit 0' -i ./tests/du/threshold.sh
32− sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
33− sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
34− sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
31+ sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh
32+ sed '2i echo Skipping du threshold test && exit 77' -i ./tests/du/threshold.sh
33+ sed '2i echo Skipping cp sparse test && exit 77' -i ./tests/cp/sparse.sh
34+ sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh
35+ sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh
3536
3637 # sandbox does not allow setgid
37− sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh
38+ sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh
3839 substituteInPlace ./tests/install/install-C.sh \
3940 --replace 'mode3=2755' 'mode3=1755'
4041
41− sed '2i print "Skipping env -S test"; exit 0;' -i ./tests/misc/env-S.pl
42+ sed '2i print "Skipping env -S test"; exit 77;' -i ./tests/misc/env-S.pl
4243
4344 # these tests fail in the unprivileged nix sandbox (without nix-daemon) as we break posix assumptions
4445 for f in ./tests/chgrp/{basic.sh,recurse.sh,default-no-deref.sh,no-x.sh,posix-H.sh}; do
45− sed '2i echo Skipping chgrp && exit 0' -i "$f"
46+ sed '2i echo Skipping chgrp && exit 77' -i "$f"
4647 done
4748 for f in gnulib-tests/{test-chown.c,test-fchownat.c,test-lchown.c}; do
48− echo "int main() { return 0; }" > "$f"
49+ echo "int main() { return 77; }" > "$f"
4950 done
51+ '' + optionalString (stdenv.hostPlatform.libc == "musl") ''
52+ echo "int main() { return 77; }" > gnulib-tests/test-parse-datetime.c
53+ echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c
5054 '';
5155
5256 outputs = [ "out" "info" ];
@@ -80,7 +84,7 @@ stdenv.mkDerivation rec {
8084 # and {Open,Free}BSD.
8185 # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
8286 doCheck = stdenv.hostPlatform == stdenv.buildPlatform
83− && stdenv.hostPlatform.libc == "glibc"
87+ && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl)
8488 && builtins.storeDir == "/nix/store";
8589
8690 # Prevents attempts of running 'help2man' on cross-built binaries.
@@ -123,6 +127,8 @@ stdenv.mkDerivation rec {
123127
124128 platforms = platforms.unix ++ platforms.windows;
125129
130+ priority = 10;
131+
126132 maintainers = [ maintainers.eelco ];
127133 };
128134
pkgs/tools/misc/hdf4/default.nix−1
@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
4242
4343 cmakeFlags = [
4444 "-DBUILD_SHARED_LIBS=ON"
45− "-DBUILD_TESTING=ON"
4645 "-DHDF4_BUILD_TOOLS=ON"
4746 "-DHDF4_BUILD_UTILS=ON"
4847 "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF"
pkgs/tools/networking/modem-manager/default.nix+15−30
@@ -1,56 +1,41 @@
11{ stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkgconfig
2−, libmbim, libqmi, systemd, fetchpatch }:
2+, libmbim, libqmi, systemd, vala, gobject-introspection, dbus }:
33
44stdenv.mkDerivation rec {
5− name = "modem-manager-${version}";
6− version = "1.7.990";
5+ pname = "modem-manager";
6+ version = "1.10.0";
77
88 package = "ModemManager";
99 src = fetchurl {
1010 url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz";
11− sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl";
11+ sha256 = "1qkfnxqvaraz1npahqvm5xc73mbxxic8msnsjmlwkni5c2ckj3zx";
1212 };
1313
14− nativeBuildInputs = [ gettext pkgconfig ];
14+ nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ];
1515
1616 buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ];
1717
18− patches = [
19− # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt)
20− (fetchpatch {
21− url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609";
22− sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j";
23− })
24− ];
25−
2618 configureFlags = [
2719 "--with-polkit"
28− "--with-udev-base-dir=$(out)/lib/udev"
29− "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
20+ "--with-udev-base-dir=${placeholder ''out''}/lib/udev"
21+ "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d"
22+ "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system"
3023 "--sysconfdir=/etc"
3124 "--localstatedir=/var"
32− "--with-suspend-resume=systemd"
25+ "--with-systemd-suspend-resume"
26+ "--with-systemd-journal"
3327 ];
3428
35− installFlags = [ "DESTDIR=\${out}" ];
36−
37− preInstall = ''
38− mkdir -p $out/etc/systemd/system
29+ preCheck = ''
30+ export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
3931 '';
4032
41− postInstall = ''
42− # rename to modem-manager to be in style
43− mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service
44− rm -rf $out/$out/etc
45− mv $out/$out/* $out
46− DIR=$out/$out
47− while rmdir $DIR 2>/dev/null; do
48− DIR="$(dirname "$DIR")"
49− done
33+ doCheck = true;
5034
35+ postInstall = ''
5136 # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
5237 # aliases ourselves.
53− ln -s $out/etc/systemd/system/modem-manager.service \
38+ ln -s $out/etc/systemd/system/ModemManager.service \
5439 $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service
5540 '';
5641
pkgs/tools/networking/network-manager/default.nix+8−6
@@ -9,11 +9,11 @@ let
99 pname = "NetworkManager";
1010in stdenv.mkDerivation rec {
1111 name = "network-manager-${version}";
12− version = "1.14.6";
12+ version = "1.16.0";
1313
1414 src = fetchurl {
1515 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
16− sha256 = "0p9s6b1z9bdmzdjw2gnjsar1671vvcyy9inb0rxg1izf2nnwsfv9";
16+ sha256 = "0b2x9hrg41cd17psqi0vacwj733v99hxczn53gdfs0yanqrji5lf";
1717 };
1818
1919 outputs = [ "out" "dev" ];
@@ -88,13 +88,15 @@ in stdenv.mkDerivation rec {
8888 # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
8989 substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
9090
91− # rename to network-manager to be in style
92− mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
93−
9491 # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
9592 # aliases ourselves.
9693 ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
97− ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
94+ ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
95+
96+ # Add the legacy service name from before #51382 to prevent NetworkManager
97+ # from not starting back up:
98+ # TODO: remove this once 19.10 is released
99+ ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service
98100 '';
99101
100102 passthru = {
pkgs/tools/networking/network-manager/fix-paths.patch+3−2
@@ -43,7 +43,7 @@
4343+ ping_binary = "@inetutils@/bin/ping";
4444 log_domain = LOGD_IP4;
4545 }
46− } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) {
46+ } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
4747 gw = nm_ip6_config_best_default_route_get (priv->ip_config_6);
4848 if (gw) {
4949 nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
@@ -54,12 +54,13 @@
5454 }
5555--- a/src/nm-core-utils.c
5656+++ b/src/nm-core-utils.c
57−@@ -421,7 +421,7 @@
57+@@ -421,8 +421,8 @@
5858
5959 /* construct the argument list */
6060 argv = g_ptr_array_sized_new (4);
6161- g_ptr_array_add (argv, "/sbin/modprobe");
6262+ g_ptr_array_add (argv, "@kmod@/bin/modprobe");
63+ g_ptr_array_add (argv, "--use-blacklist");
6364 g_ptr_array_add (argv, (char *) arg1);
6465
6566 va_start (ap, arg1);
pkgs/tools/networking/network-manager/fortisslvpn/default.nix+4−4
@@ -1,15 +1,15 @@
1−{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, gtk3,
1+{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3,
22networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:
33
44let
55 pname = "NetworkManager-fortisslvpn";
6− version = "1.2.8";
6+ version = "1.2.10";
77in stdenv.mkDerivation rec {
88 name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "01gvdv9dknvzx05plq863jh1xz1v8vgj5w7v9fmw5v601ggybf4w";
12+ sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s";
1313 };
1414
1515 patches = [
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
2222 buildInputs = [ openfortivpn networkmanager ppp ]
2323 ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];
2424
25− nativeBuildInputs = [ intltool pkgconfig ];
25+ nativeBuildInputs = [ intltool pkgconfig file ];
2626
2727 configureFlags = [
2828 "--without-libnm-glib"
pkgs/tools/package-management/appimagekit/default.nix−1
@@ -91,7 +91,6 @@ in stdenv.mkDerivation rec {
9191 "-DUSE_SYSTEM_LIBARCHIVE=ON"
9292 "-DUSE_SYSTEM_GTEST=ON"
9393 "-DUSE_SYSTEM_MKSQUASHFS=ON"
94− "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
9594 ];
9695
9796 postInstall = ''
pkgs/tools/package-management/packagekit/default.nix+3−3
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, lib
22, intltool, glib, pkgconfig, polkit, python, sqlite
3−, gobject-introspection, vala_0_38, gtk-doc, autoreconfHook, autoconf-archive
3+, gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive
44# TODO: set enableNixBackend to true, as soon as it builds
55, nix, enableNixBackend ? false, boost
66, enableCommandNotFound ? false
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
2020 sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x";
2121 };
2222
23− buildInputs = [ glib polkit python gobject-introspection vala_0_38 ]
23+ buildInputs = [ glib polkit python gobject-introspection ]
2424 ++ lib.optional enableSystemd systemd
2525 ++ lib.optional enableBashCompletion bash-completion;
2626 propagatedBuildInputs = [ sqlite nix boost ];
27− nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ];
27+ nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ];
2828
2929 preAutoreconf = ''
3030 gtkdocize
pkgs/top-level/all-packages.nix+50−27
@@ -948,7 +948,11 @@ in
948948
949949 bchunk = callPackage ../tools/cd-dvd/bchunk { };
950950
951− inherit (callPackages ../misc/logging/beats/6.x.nix { })
951+ inherit (callPackages ../misc/logging/beats/6.x.nix {
952+ # XXX: this is failing with Go 1.12. Error is related to cgo, an
953+ # update to this package might fix it.
954+ buildGoPackage = buildGo111Package;
955+ })
952956 filebeat6
953957 heartbeat6
954958 metricbeat6
@@ -960,7 +964,11 @@ in
960964 metricbeat = metricbeat6;
961965 packetbeat = packetbeat6;
962966
963− inherit (callPackages ../misc/logging/beats/5.x.nix { })
967+ inherit (callPackages ../misc/logging/beats/5.x.nix {
968+ # XXX: this is failing with Go 1.12. Error is related to cgo, an
969+ # update to this package might fix it.
970+ buildGoPackage = buildGo111Package;
971+ })
964972 filebeat5
965973 heartbeat5
966974 metricbeat5
@@ -1757,7 +1765,11 @@ in
17571765
17581766 mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
17591767
1760− mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
1768+ mongodb-tools = callPackage ../tools/misc/mongodb-tools {
1769+ # XXX: this is failing with Go 1.12. Error is related to cgo, an
1770+ # update to this package might fix it.
1771+ buildGoPackage = buildGo111Package;
1772+ };
17611773
17621774 moosefs = callPackage ../tools/filesystems/moosefs { };
17631775
@@ -1840,7 +1852,11 @@ in
18401852
18411853 bepasty = callPackage ../tools/misc/bepasty { };
18421854
1843− bettercap = callPackage ../tools/security/bettercap { };
1855+ bettercap = callPackage ../tools/security/bettercap {
1856+ # XXX: this is failing with Go 1.12. Error is related to cgo, an
1857+ # update to this package might fix it.
1858+ buildGoPackage = buildGo111Package;
1859+ };
18441860
18451861 bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner;
18461862
@@ -2076,7 +2092,6 @@ in
20762092 libkkc = callPackage ../tools/inputmethods/libkkc { };
20772093
20782094 ibus = callPackage ../tools/inputmethods/ibus {
2079− gconf = gnome2.GConf;
20802095 inherit (gnome3) dconf;
20812096 };
20822097
@@ -4349,7 +4364,11 @@ in
43494364
43504365 miredo = callPackage ../tools/networking/miredo { };
43514366
4352− mirrorbits = callPackage ../servers/mirrorbits { };
4367+ mirrorbits = callPackage ../servers/mirrorbits {
4368+ # XXX: this is failing with Go 1.12. Error is related to cgo, an
4369+ # update to this package might fix it.
4370+ buildGoPackage = buildGo111Package;
4371+ };
43534372
43544373 mitmproxy = callPackage ../tools/networking/mitmproxy { };
43554374
@@ -7662,14 +7681,12 @@ in
76627681 inherit (darwin) apple_sdk;
76637682 };
76647683
7665− # For beta and nightly releases use the nixpkgs-mozilla overlay
7666− rust = callPackage ../development/compilers/rust ({
7684+ rust = callPackage ../development/compilers/rust {
76677685 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
7668− llvm = llvm_7;
7669− } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
7670− stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
7671− });
7672− inherit (rust) cargo rustc;
7686+ };
7687+ rustPackages = rust.packages.stable;
7688+ inherit (rustPackages) cargo rustc rustPlatform;
7689+ inherit (rust) makeRustPlatform;
76737690
76747691 buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
76757692 buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
@@ -7685,9 +7702,6 @@ in
76857702
76867703 defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };
76877704
7688− makeRustPlatform = callPackage ../build-support/rust/make-rust-platform.nix {};
7689− rustPlatform = recurseIntoAttrs (makeRustPlatform rust);
7690−
76917705 cargo-download = callPackage ../tools/package-management/cargo-download { };
76927706 cargo-edit = callPackage ../tools/package-management/cargo-edit { };
76937707 cargo-release = callPackage ../tools/package-management/cargo-release {
@@ -7803,6 +7817,7 @@ in
78037817 vala_0_38
78047818 vala_0_40
78057819 vala_0_42
7820+ vala_0_44
78067821 vala;
78077822
78087823 valadoc = callPackage ../development/tools/valadoc { };
@@ -8525,6 +8540,8 @@ in
85258540
85268541 automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
85278542
8543+ automake115x = callPackage ../development/tools/misc/automake/automake-1.15.x.nix { };
8544+
85288545 automake116x = callPackage ../development/tools/misc/automake/automake-1.16.x.nix { };
85298546
85308547 automoc4 = callPackage ../development/tools/misc/automoc4 { };
@@ -12771,7 +12788,11 @@ in
1277112788 sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { };
1277212789 };
1277312790
12774− skydive = callPackage ../tools/networking/skydive { };
12791+ skydive = callPackage ../tools/networking/skydive {
12792+ # XXX: this is failing with Go 1.12. Error is related to cgo, an
12793+ # update to this package might fix it.
12794+ buildGoPackage = buildGo111Package;
12795+ };
1277512796
1277612797 slang = callPackage ../development/libraries/slang { };
1277712798
@@ -13535,8 +13556,11 @@ in
1353513556 buildGo111Package = callPackage ../development/go-packages/generic {
1353613557 go = buildPackages.go_1_11;
1353713558 };
13559+ buildGo112Package = callPackage ../development/go-packages/generic {
13560+ go = buildPackages.go_1_12;
13561+ };
1353813562
13539− buildGoPackage = buildGo111Package;
13563+ buildGoPackage = buildGo112Package;
1354013564
1354113565 buildGo111Module = callPackage ../development/go-modules/generic {
1354213566 go = buildPackages.go_1_11;
@@ -14589,7 +14613,11 @@ in
1458914613
1459014614 cifs-utils = callPackage ../os-specific/linux/cifs-utils { };
1459114615
14592− cockroachdb = callPackage ../servers/sql/cockroachdb { };
14616+ cockroachdb = callPackage ../servers/sql/cockroachdb {
14617+ # XXX: this is failing with Go 1.12. Error is related to cgo, an
14618+ # update to this package might fix it.
14619+ buildGoPackage = buildGo111Package;
14620+ };
1459314621
1459414622 conky = callPackage ../os-specific/linux/conky ({
1459514623 lua = lua5_3_compat;
@@ -14669,9 +14697,7 @@ in
1466914697
1467014698 fatrace = callPackage ../os-specific/linux/fatrace { };
1467114699
14672− ffado = callPackage ../os-specific/linux/ffado {
14673− inherit (python2Packages) python pyqt4 dbus-python;
14674− };
14700+ ffado = callPackage ../os-specific/linux/ffado { };
1467514701 libffado = ffado;
1467614702
1467714703 fbterm = callPackage ../os-specific/linux/fbterm { };
@@ -17920,10 +17946,7 @@ in
1792017946
1792117947 slack-term = callPackage ../applications/networking/instant-messengers/slack-term { };
1792217948
17923− singularity = callPackage ../applications/virtualization/singularity {
17924− # XXX: the build is finding references to Go when compiled with go v1.12
17925− go = go_1_11;
17926− };
17949+ singularity = callPackage ../applications/virtualization/singularity { };
1792717950
1792817951 spectmorph = callPackage ../applications/audio/spectmorph { };
1792917952
@@ -21586,7 +21609,7 @@ in
2158621609 clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { };
2158721610
2158821611 deepin = recurseIntoAttrs (import ../desktops/deepin {
21589− inherit pkgs libsForQt5 go_1_11;
21612+ inherit pkgs libsForQt5;
2159021613 inherit (lib) makeScope;
2159121614 });
2159221615
pkgs/top-level/perl-packages.nix+276−225
@@ -5,7 +5,8 @@
55 for each package in a separate file: the call to the function would
66 be almost as much code as the function itself. */
77
8−{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}:
8+{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides,
9+ buildPackages}:
910
1011# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.1 or above
1112assert stdenv.lib.versionAtLeast perl.version "5.28.1";
@@ -109,10 +110,10 @@ let
109110 };
110111
111112 AlienBuild = buildPerlPackage {
112− name = "Alien-Build-1.49";
113+ name = "Alien-Build-1.60";
113114 src = fetchurl {
114− url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.49.tar.gz;
115− sha256 = "1wsg794pbqgywyfqdrwrsjcj5qgas3h72j4w2iph9ir6b93rb11p";
115+ url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.60.tar.gz;
116+ sha256 = "0wzwi5l71sn0wrbjsikjlh2y7yn68m3hal8s9v43rc6w20q3z877";
116117 };
117118 propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny ];
118119 buildInputs = [ DevelHide PkgConfig Test2Suite ];
@@ -181,10 +182,10 @@ let
181182 };
182183
183184 AnyEvent = buildPerlPackage rec {
184− name = "AnyEvent-7.14";
185+ name = "AnyEvent-7.15";
185186 src = fetchurl {
186187 url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
187− sha256 = "539358d225bad34b4a64f5217f8c2a707b15e3a28c74120c9dd2270c7cca7d2a";
188+ sha256 = "111db2335c71f789edaec271126b3810356691eb1214dd3f67b527a88ec9e354";
188189 };
189190 buildInputs = [ CanaryStability ];
190191 meta = {
@@ -353,10 +354,10 @@ let
353354 };
354355
355356 AppFatPacker = buildPerlPackage rec {
356− name = "App-FatPacker-0.010007";
357+ name = "App-FatPacker-0.010008";
357358 src = fetchurl {
358− url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010007.tar.gz;
359− sha256 = "1g9nff9fdg7dvja0ix2yv32w5xcj963ybcf7x22j61g6r81845fi";
359+ url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz;
360+ sha256 = "1kzcbpsf1p7ww45d9fl2w0nfn5jj5pz0r0c649c1lrj5r1nv778j";
360361 };
361362 meta = {
362363 description = "pack your dependencies onto your script file";
@@ -378,10 +379,10 @@ let
378379 };
379380
380381 Appperlbrew = buildPerlModule rec {
381− name = "App-perlbrew-0.85";
382+ name = "App-perlbrew-0.86";
382383 src = fetchurl {
383384 url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz";
384− sha256 = "0i3d2csihn5x27lfykwgjpq60ij21s19fzbjsacqq93x46qyim9y";
385+ sha256 = "11qh94am7fghizmjaf5c7w868svjbv9g4ffirykj8qa6q40zdspp";
385386 };
386387 buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ];
387388 propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ];
@@ -413,14 +414,14 @@ let
413414 };
414415
415416 AppSqitch = buildPerlModule rec {
416− version = "0.9998";
417+ version = "0.9999";
417418 name = "App-Sqitch-${version}";
418419 src = fetchurl {
419420 url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz";
420− sha256 = "5539f15c0e26ad3595e658e2c21481b0748cc89f6dca0a6ded1fdc62f88c8a5a";
421+ sha256 = "f5bfa80206738ab8a70358a3b0557661c7459e11ec07dece23ecafa1f34372b3";
421422 };
422− buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings ];
423− propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ];
423+ buildInputs = [ CaptureTiny IOPager TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ];
424+ propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ];
424425 doCheck = false; # Can't find home directory.
425426 meta = {
426427 homepage = https://sqitch.org/;
@@ -487,10 +488,10 @@ let
487488 };
488489
489490 ArrayFIFO = buildPerlPackage rec {
490− name = "Array-FIFO-0.12";
491+ name = "Array-FIFO-0.13";
491492 src = fetchurl {
492493 url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz";
493− sha256 = "806a931d5a953255a0416978c39987a75e5cbe592a88d44a7b909f4f86888d5d";
494+ sha256 = "be2aeb5f5a9af1a96f0033508a569ca93ad19ad15dc7c6b998e6d7bc740c66f7";
494495 };
495496 buildInputs = [ TestDeep TestSpec TestTrap ];
496497 propagatedBuildInputs = [ Moose namespaceautoclean ];
@@ -819,10 +820,10 @@ let
819820 };
820821
821822 BKeywords = buildPerlPackage rec {
822− name = "B-Keywords-1.19";
823+ name = "B-Keywords-1.20";
823824 src = fetchurl {
824825 url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
825− sha256 = "1kdzhdksnqrmij98bnifv2p2125zvpf0rmzxjiav65ipydi4rsw9";
826+ sha256 = "12jvx5gnypqxal4valkf9lidba9nz7kjk2wvm07q3hkmdqxw1zk0";
826827 };
827828 meta = {
828829 description = "Lists of reserved barewords and symbol names";
@@ -885,10 +886,10 @@ let
885886 };
886887
887888 BusinessHours = buildPerlPackage rec {
888− name = "Business-Hours-0.12";
889+ name = "Business-Hours-0.13";
889890 src = fetchurl {
890− url = mirror://cpan/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz;
891− sha256 = "15c5g278m1x121blspf4bymxp89vysizr3z6s1g3sbpfdkrn4gyv";
891+ url = mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz;
892+ sha256 = "1hiybixagj3i1hsnfr134jgs9wv4azkwq6kijr9zlkxqzczzw1x8";
892893 };
893894 propagatedBuildInputs = [ SetIntSpan ];
894895 meta = {
@@ -1029,11 +1030,12 @@ let
10291030 url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
10301031 sha256 = "1m896j0xdfhldsx8abf10cc16ll1fm9wbav42dpzal9fh07d9f9v";
10311032 };
1032− buildInputs = [ pkgs.cairo Cairo Glib ExtUtilsDepends ExtUtilsPkgConfig ];
1033+ buildInputs = [ pkgs.cairo ];
10331034 meta = {
10341035 description = "Integrate Cairo into the Glib type system";
10351036 license = stdenv.lib.licenses.lgpl21Plus;
10361037 };
1038+ propagatedBuildInputs = [ Cairo Glib ];
10371039 };
10381040
10391041 cam_pdf = buildPerlModule rec {
@@ -1299,10 +1301,10 @@ let
12991301 };
13001302
13011303 CatalystRuntime = buildPerlPackage rec {
1302− name = "Catalyst-Runtime-5.90123";
1304+ name = "Catalyst-Runtime-5.90124";
13031305 src = fetchurl {
1304− url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90123.tar.gz;
1305− sha256 = "f4484409ee2f7e9dddf148e7509e7a3eaf4df0c22b97a94dddc2171909485f3b";
1306+ url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90124.tar.gz;
1307+ sha256 = "2a60cbe7c1f6fec25f0e7fd3f66273386d73edb625748cc0d8c4f20e62983e00";
13061308 };
13071309 buildInputs = [ TestFatal TypeTiny ];
13081310 propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ];
@@ -2248,17 +2250,17 @@ let
22482250 };
22492251 };
22502252
2251− Clipboard = buildPerlPackage {
2252− name = "Clipboard-0.13";
2253+ Clipboard = buildPerlModule {
2254+ name = "Clipboard-0.19";
22532255 src = fetchurl {
2254− url = mirror://cpan/authors/id/K/KI/KING/Clipboard-0.13.tar.gz;
2255− sha256 = "eebf1c9cb2484be850abdae017147967cf47f8ccd99293771517674b0046ec8a";
2256+ url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.19.tar.gz;
2257+ sha256 = "34b9dccac5d559b2b2769e5e315205c8292be2ff9f6e5333112a2377c69abbb3";
22562258 };
22572259 meta = {
22582260 description = "Clipboard - Copy and Paste with any OS";
22592261 license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
22602262 };
2261− propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin MacPasteboard;
2263+ propagatedBuildInputs = [ CGI URI ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard;
22622264 # Disable test on darwin because MacPasteboard fails when not logged in interactively.
22632265 # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3.
22642266 # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively.
@@ -2304,10 +2306,10 @@ let
23042306 };
23052307
23062308 CodeTidyAll = buildPerlPackage rec {
2307− name = "Code-TidyAll-0.72";
2309+ name = "Code-TidyAll-0.73";
23082310 src = fetchurl {
2309− url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.72.tar.gz;
2310− sha256 = "0py9z3f7ld93a7qibrc917qkwjh7pcl0r9khzg7dlr4rra0xq9fn";
2311+ url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.73.tar.gz;
2312+ sha256 = "1fvw73q5vj5b12y9jj9mmwl0dipdjlvpsw5rzvldr4csicrpiz6q";
23112313 };
23122314 propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ];
23132315 buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ];
@@ -2355,10 +2357,10 @@ let
23552357 };
23562358
23572359 CompressRawBzip2 = buildPerlPackage rec {
2358− name = "Compress-Raw-Bzip2-2.081";
2360+ name = "Compress-Raw-Bzip2-2.084";
23592361 src = fetchurl {
23602362 url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
2361− sha256 = "081mpkjy688lg48997fqh3d7ja12vazmz02fw84495civg4vb4l6";
2363+ sha256 = "0kwjrsl519bv48b7698a9anj6l0n3z1vrd1a7im2r1pbffxxw5kx";
23622364 };
23632365
23642366 # Don't build a private copy of bzip2.
@@ -2476,10 +2478,10 @@ let
24762478 };
24772479
24782480 ConfigIniFiles = buildPerlModule rec {
2479− name = "Config-IniFiles-3.000000";
2481+ name = "Config-IniFiles-3.000001";
24802482 src = fetchurl {
24812483 url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
2482− sha256 = "cd92f6b7f1aa3e03abf6251f1e6129dab8a2b835e8b17c7c4cc3e8305c1c9b29";
2484+ sha256 = "48ada0a6c6a5b6cbe1bfb261fe56e3bf8492ff9420f7321b6a972924416659ea";
24832485 };
24842486 propagatedBuildInputs = [ IOStringy ];
24852487 meta = {
@@ -2710,12 +2712,12 @@ let
27102712 };
27112713
27122714 CPAN = buildPerlPackage rec {
2713− name = "CPAN-2.22";
2715+ name = "CPAN-2.25";
27142716 src = fetchurl {
27152717 url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz";
2716− sha256 = "c6f2a44cd95ef5989ef0abc83dca38ae645bd5ea09de67461251f2d782989990";
2718+ sha256 = "b4cbef12b872f34e29c3cdcd511c5ed004c4486939001b60e493dc25956552a9";
27172719 };
2718− propagatedBuildInputs = [ ArchiveZip CPANChecksums Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ];
2720+ propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ];
27192721 meta = {
27202722 description = "Query, download and build perl modules from CPAN sites";
27212723 license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -2723,10 +2725,10 @@ let
27232725 };
27242726
27252727 CpanelJSONXS = buildPerlPackage rec {
2726− name = "Cpanel-JSON-XS-4.08";
2728+ name = "Cpanel-JSON-XS-4.09";
27272729 src = fetchurl {
27282730 url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
2729− sha256 = "2bc1475b698b5a419bb55127b07732794b495e2a6e0f4ed39bdcbd39a64e7c2d";
2731+ sha256 = "99c0155e554222b0cb24b032ced9a4f7bdfd2b3c98d07657ac020fbe5c3495a3";
27302732 };
27312733 meta = {
27322734 description = "CPanel fork of JSON::XS, fast and correct serializing";
@@ -2784,10 +2786,10 @@ let
27842786 };
27852787
27862788 CPANPerlReleases = buildPerlPackage rec {
2787− name = "CPAN-Perl-Releases-3.86";
2789+ name = "CPAN-Perl-Releases-3.90";
27882790 src = fetchurl {
27892791 url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
2790− sha256 = "0g90xm43pydfjq794ay4dvgvhjdr4xrjgmravj8wb2kqc65pm2za";
2792+ sha256 = "19pjq3x9nb76m4a5g37miw1js5mmfqhv1z2gyya3kjc8wbjb1qjc";
27912793 };
27922794 meta = {
27932795 homepage = https://github.com/bingos/cpan-perl-releases;
@@ -3508,10 +3510,10 @@ let
35083510 };
35093511
35103512 DataUUID = buildPerlPackage rec {
3511− name = "Data-UUID-1.221";
3513+ name = "Data-UUID-1.224";
35123514 src = fetchurl {
3513− url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.221.tar.gz;
3514− sha256 = "0rw60wib0mj5z0v909mplh750y40hzyzf4z0b6h4ajxplyiv5irw";
3515+ url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz;
3516+ sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69";
35153517 };
35163518 };
35173519
@@ -3601,10 +3603,10 @@ let
36013603 };
36023604
36033605 DateManip = buildPerlPackage rec {
3604− name = "Date-Manip-6.75";
3606+ name = "Date-Manip-6.76";
36053607 src = fetchurl {
36063608 url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz";
3607− sha256 = "0zdnrdm7bj4qwnmd2r3gj80dm1brr63px04iy5blxa5i5azczyy1";
3609+ sha256 = "1a33mpkx7qqb9nqxyh2kkb596d8xq6jw0ljrd4xrwiz30f6cg1qw";
36083610 };
36093611 # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work
36103612 patchPhase = ''
@@ -3678,12 +3680,12 @@ let
36783680 };
36793681
36803682 DateTimeFormatBuilder = buildPerlPackage {
3681− name = "DateTime-Format-Builder-0.81";
3683+ name = "DateTime-Format-Builder-0.82";
36823684 src = fetchurl {
3683− url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.81.tar.gz;
3684− sha256 = "7cd58a8cb53bf698407cc992f89e4d49bf3dc55baf4f3f00f1def63a0fff33ef";
3685+ url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz;
3686+ sha256 = "383faeb22b992c77ca65a5257992dd2f6db91a7db73ea4601c512e1c6c2e1ca3";
36853687 };
3686− propagatedBuildInputs = [ ClassFactoryUtil DateTimeFormatStrptime ParamsValidate ];
3688+ propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ];
36873689 meta = {
36883690 description = "Create DateTime parser classes and objects";
36893691 license = stdenv.lib.licenses.artistic2;
@@ -3811,13 +3813,13 @@ let
38113813 };
38123814
38133815 DateTimeFormatStrptime = buildPerlPackage rec {
3814− name = "DateTime-Format-Strptime-1.75";
3816+ name = "DateTime-Format-Strptime-1.76";
38153817 src = fetchurl {
38163818 url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
3817− sha256 = "4fcfb2ac4f79d7ff2855a405f39050d2ea691ee098ce54ede8af79c8d6ab3c19";
3819+ sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d";
38183820 };
38193821 buildInputs = [ TestFatal TestWarnings ];
3820− propagatedBuildInputs = [ DateTime PackageDeprecationManager ];
3822+ propagatedBuildInputs = [ DateTime ];
38213823 meta = {
38223824 description = "Parse and format strp and strf time patterns";
38233825 license = stdenv.lib.licenses.artistic2;
@@ -3878,10 +3880,10 @@ let
38783880 };
38793881
38803882 DateTimeTimeZone = buildPerlPackage rec {
3881− name = "DateTime-TimeZone-2.21";
3883+ name = "DateTime-TimeZone-2.23";
38823884 src = fetchurl {
38833885 url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
3884− sha256 = "54d685f79df1033c259502cd9c22b1a9d37b627bf815faecebaa27f8e1079e1e";
3886+ sha256 = "6ae40286031853a4319c5b34516f1c09e429d5caa5f782165cc27175c89fe54f";
38853887 };
38863888 buildInputs = [ TestFatal TestRequires ];
38873889 propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ];
@@ -3978,10 +3980,10 @@ let
39783980 };
39793981
39803982 DevelPatchPerl = buildPerlPackage rec {
3981− name = "Devel-PatchPerl-1.52";
3983+ name = "Devel-PatchPerl-1.56";
39823984 src = fetchurl {
39833985 url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
3984− sha256 = "0iynq3sgxyidr8d6x0gb1yk5nvzr7xmyslk2bs8hkp9sbxpznsaf";
3986+ sha256 = "1b97a6b82qh1dsv13rgxyiv4lffp360crgc9wiq3pyj0zr13nfc2";
39853987 };
39863988 propagatedBuildInputs = [ Filepushd ModulePluggable ];
39873989 meta = {
@@ -4005,10 +4007,10 @@ let
40054007 };
40064008
40074009 DevelPPPort = buildPerlPackage rec {
4008− name = "Devel-PPPort-3.43";
4010+ name = "Devel-PPPort-3.44";
40094011 src = fetchurl {
4010− url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.43.tar.gz;
4011− sha256 = "90fd98fb24e1d7252011ff181244e04c8c8135933e67eab93c57ed6a61ed86f4";
4012+ url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.44.tar.gz;
4013+ sha256 = "06561decc76f0aaba8e77f72b74624e19e2ad448a654c489c61bc786660832c5";
40124014 };
40134015 meta = {
40144016 description = "Perl/Pollution/Portability";
@@ -4255,6 +4257,18 @@ let
42554257 };
42564258 };
42574259
4260+ DataBinary = buildPerlPackage {
4261+ name = "Data-Binary-0.01";
4262+ src = fetchurl {
4263+ url = mirror://cpan/authors/id/S/SN/SNKWATT/Data-Binary-0.01.tar.gz;
4264+ sha256 = "0wwdrgkz4yqpzdmfvid63v5v10b9hwdsg15jvks0hwdc23ga48a8";
4265+ };
4266+ meta = {
4267+ description = "Simple detection of binary versus text in strings";
4268+ license = with stdenv.lib.licenses; [ artistic2 ];
4269+ };
4270+ };
4271+
42584272 DBIxIntrospector = buildPerlPackage rec {
42594273 name = "DBIx-Introspector-0.001005";
42604274 src = fetchurl {
@@ -4853,10 +4867,10 @@ let
48534867 };
48544868
48554869 EmailAddress = buildPerlPackage {
4856− name = "Email-Address-1.911";
4870+ name = "Email-Address-1.912";
48574871 src = fetchurl {
4858− url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.911.tar.gz;
4859− sha256 = "10qfc2va6dhshjgw6xvxk88cd88s44kbxp47xmixx297wv3l69zl";
4872+ url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz;
4873+ sha256 = "1vzr0vx4zsw4zbc9xdffc31wnkc1raqmyfiyws06fbyck197i8qg";
48604874 };
48614875 meta = {
48624876 description = "RFC 2822 Address Parsing";
@@ -4865,10 +4879,10 @@ let
48654879 };
48664880
48674881 EmailAddressList = buildPerlPackage {
4868− name = "Email-Address-List-0.05";
4882+ name = "Email-Address-List-0.06";
48694883 src = fetchurl {
4870− url = mirror://cpan/authors/id/A/AL/ALEXMV/Email-Address-List-0.05.tar.gz;
4871− sha256 = "705c23fc2163c2347ba0aea998450259f7b10577a368c6d310bd4e98b427a033";
4884+ url = mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz;
4885+ sha256 = "305b94c778011cee70d9f21514d92e985fa9dccbb84c64798f0c1f0b24eb870e";
48724886 };
48734887 buildInputs = [ JSON ];
48744888 propagatedBuildInputs = [ EmailAddress ];
@@ -5067,10 +5081,10 @@ let
50675081 };
50685082
50695083 Encode = buildPerlPackage rec {
5070− name = "Encode-2.98";
5084+ name = "Encode-3.00";
50715085 src = fetchurl {
50725086 url = "mirror://cpan/authors/id/D/DA/DANKOGAI/${name}.tar.gz";
5073− sha256 = "303d396477c94c43c2f83da1a8025d68de76bd7e52c2cc35fbdf5c59b4c2cffa";
5087+ sha256 = "4b538b47459cf5747b7395ccc8c8c9b3b661cc016c50b8a67e10fe19590fea5e";
50745088 };
50755089 meta = {
50765090 description = "Character encodings in Perl";
@@ -5434,10 +5448,10 @@ let
54345448 };
54355449
54365450 ExtUtilsMakeMakerCPANfile = buildPerlPackage rec {
5437− name = "ExtUtils-MakeMaker-CPANfile-0.08";
5451+ name = "ExtUtils-MakeMaker-CPANfile-0.09";
54385452 src = fetchurl {
5439− url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.08.tar.gz;
5440− sha256 = "0yg2z4six807lraqh8ncsq6l62vj7zi0a38ha9nvmhd6lbipmsql";
5453+ url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz;
5454+ sha256 = "0xg2z100vjhcndwaz9m3mmi90rb8h5pggpvlj1b0i8dhsh3pc1rc";
54415455 };
54425456 propagatedBuildInputs = [ ModuleCPANfile ];
54435457 meta = {
@@ -5583,12 +5597,12 @@ let
55835597 };
55845598
55855599 FileChangeNotify = buildPerlPackage {
5586− name = "File-ChangeNotify-0.29";
5600+ name = "File-ChangeNotify-0.31";
55875601 src = fetchurl {
5588− url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.29.tar.gz;
5589− sha256 = "438d4295ef5f854ace61037a11726ef65dc0bf73e296bd12fc7e2108602a444b";
5602+ url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.31.tar.gz;
5603+ sha256 = "192bdb1ce76266c6a694a8e962d039e3adeeb829b6ac1e23f5057f2b506392bd";
55905604 };
5591− buildInputs = [ TestException TestRequires TestWithoutModule ];
5605+ buildInputs = [ Test2Suite TestRequires TestWithoutModule ];
55925606 propagatedBuildInputs = [ ModulePluggable Moo TypeTiny namespaceautoclean ];
55935607 meta = with stdenv.lib; {
55945608 description = "Watch for changes to files, cross-platform style";
@@ -5620,10 +5634,10 @@ let
56205634 };
56215635
56225636 FileBOM = buildPerlModule rec {
5623− name = "File-BOM-0.15";
5637+ name = "File-BOM-0.16";
56245638 src = fetchurl {
56255639 url = "mirror://cpan/authors/id/M/MA/MATTLAW/${name}.tar.gz";
5626− sha256 = "431c8b39397fd5ad5b1a1100d3647a06e9f94304d46db44ffc0a0e5c5c06a1c1";
5640+ sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf";
56275641 };
56285642 buildInputs = [ TestException ];
56295643 propagatedBuildInputs = [ Readonly ];
@@ -6030,12 +6044,10 @@ let
60306044 };
60316045
60326046 FileSlurp = buildPerlPackage {
6033− name = "File-Slurp-9999.25";
6034− # WARNING: check on next update if deprecation warning is gone
6035− patches = [ ../development/perl-modules/File-Slurp/silence-deprecation.patch ];
6047+ name = "File-Slurp-9999.26";
60366048 src = fetchurl {
6037− url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.25.tar.gz;
6038− sha256 = "1hg3bhf5m78d77p4174cnldd75ppyrvr5rkc8w289ihvwsx9gsn7";
6049+ url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.26.tar.gz;
6050+ sha256 = "0c09ivl50sg9j75si6cahfp1wgvhqawakb6h5j6hlca6vwjqs9qy";
60396051 };
60406052 meta = {
60416053 description = "Simple and Efficient Reading/Writing/Modifying of Complete Files";
@@ -6082,10 +6094,10 @@ let
60826094 };
60836095
60846096 FileTemp = buildPerlPackage {
6085− name = "File-Temp-0.2308";
6097+ name = "File-Temp-0.2309";
60866098 src = fetchurl {
6087− url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2308.tar.gz;
6088− sha256 = "1m6iz26znn85r7pnnwlqsda0x5mm2c8qcz5ickl945dbw8icp88w";
6099+ url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz;
6100+ sha256 = "0pr3wrxrk93wy7dz9gsb1sgl77icrs8rh2mah6wms5cdi2ll5ch1";
60896101 };
60906102 meta = {
60916103 description = "return name and handle of a temporary file safely";
@@ -6135,10 +6147,10 @@ let
61356147 };
61366148
61376149 FileWhich = buildPerlPackage rec {
6138− name = "File-Which-1.22";
6150+ name = "File-Which-1.23";
61396151 src = fetchurl {
61406152 url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz";
6141− sha256 = "e8a8ffcf96868c6879e82645db4ff9ef00c2d8a286fed21971e7280f52cf0dd4";
6153+ sha256 = "b79dc2244b2d97b6f27167fc3b7799ef61a179040f3abd76ce1e0a3b0bc4e078";
61426154 };
61436155 meta = {
61446156 homepage = http://perl.wdlabs.com/File-Which;
@@ -6258,10 +6270,10 @@ let
62586270 };
62596271
62606272 GD = buildPerlPackage rec {
6261− name = "GD-2.69";
6273+ name = "GD-2.71";
62626274 src = fetchurl {
6263− url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.69.tar.gz;
6264− sha256 = "0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x";
6275+ url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz;
6276+ sha256 = "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5";
62656277 };
62666278
62676279 buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ];
@@ -6408,12 +6420,13 @@ let
64086420 };
64096421
64106422 Glib = buildPerlPackage rec {
6411− name = "Glib-1.328";
6423+ name = "Glib-1.329";
64126424 src = fetchurl {
64136425 url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
6414− sha256 = "1mb40h76kk1wfcl0dqd1r8wfsn4ik29jln3mcsjhmadasynw5725";
6426+ sha256 = "0d9ak0zknz81lv3cqkzr2mxdic6g5rrbb87skqc4jj48rz4f2k3v";
64156427 };
64166428 buildInputs = [ pkgs.glib ];
6429+ doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165
64176430 meta = {
64186431 homepage = http://gtk2-perl.sourceforge.net/;
64196432 description = "Perl wrappers for the GLib utility and Object libraries";
@@ -6423,13 +6436,12 @@ let
64236436 };
64246437
64256438 GlibObjectIntrospection = buildPerlPackage rec {
6426− name = "Glib-Object-Introspection-0.046";
6439+ name = "Glib-Object-Introspection-0.047";
64276440 src = fetchurl {
64286441 url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
6429− sha256 = "1d3gl943p27gd42kxc1i9sp5z55gpgcslz1jvx7cxd6mflhdlck6";
6442+ sha256 = "1sk32pcv4ik3sniqbjrz8nlw7f2a76l87wx1rwdjypv6h9pjnrnk";
64306443 };
6431− buildInputs = [ Glib ExtUtilsDepends ExtUtilsPkgConfig ];
6432− propagatedBuildInputs = [ pkgs.gobject-introspection ];
6444+ propagatedBuildInputs = [ pkgs.gobject-introspection Glib ];
64336445 meta = {
64346446 description = "Dynamically create Perl language bindings";
64356447 license = stdenv.lib.licenses.lgpl2Plus;
@@ -6547,8 +6559,8 @@ let
65476559 url = "mirror://cpan/authors/id/P/PE/PERLMAX/${name}.tar.gz";
65486560 sha256 = "0l1vsvyv9hjxhsxrahq4h64axh7qmk50kiz2spa3s1hr7s3qfk72";
65496561 };
6550− buildInputs = [ pkgs.gtk3 GlibObjectIntrospection Glib ];
6551− propagatedBuildInputs = [ pkgs.goocanvas2 ];
6562+ buildInputs = [ pkgs.gtk3 ];
6563+ propagatedBuildInputs = [ pkgs.goocanvas2 Gtk3 ];
65526564 meta = {
65536565 description = "Perl binding for GooCanvas2 widget using Glib::Object::Introspection";
65546566 license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -6729,8 +6741,7 @@ let
67296741 url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz";
67306742 sha256 = "0baxyhlzdf7avka40h1niiir8vz4nilqkiwh876i0hv0f8xj3nqa";
67316743 };
6732− buildInputs = [ Cairo CairoGObject Glib GlibObjectIntrospection ];
6733− propagatedBuildInputs = [ pkgs.gtk3 ];
6744+ propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ];
67346745 meta = {
67356746 description = "Perl interface to the 3.x series of the gtk+ toolkit";
67366747 license = stdenv.lib.licenses.lgpl21Plus;
@@ -6743,11 +6754,11 @@ let
67436754 url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/${name}.tar.gz";
67446755 sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp";
67456756 };
6746− buildInputs = [ Gtk3 Glib GlibObjectIntrospection Cairo CairoGObject ];
67476757 meta = {
67486758 description = "A simple interface to Gtk3's complex MVC list widget";
67496759 license = stdenv.lib.licenses.lgpl21Plus;
67506760 };
6761+ propagatedBuildInputs = [ Gtk3 ];
67516762 };
67526763
67536764 Guard = buildPerlPackage rec {
@@ -7467,10 +7478,10 @@ let
74677478 };
74687479
74697480 Imager = buildPerlPackage rec {
7470− name = "Imager-1.007";
7481+ name = "Imager-1.010";
74717482 src = fetchurl {
74727483 url = "mirror://cpan/authors/id/T/TO/TONYC/${name}.tar.gz";
7473− sha256 = "adc12651e53e9226eb05482bf5f6faf77703af036fb922bc8c3f077f25b98d63";
7484+ sha256 = "fc22e3e302f139d74a98d8068ccddfd92166141ddd4ca5c40f102070bcd7a3c7";
74747485 };
74757486 buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ];
74767487 makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib";
@@ -7621,10 +7632,10 @@ let
76217632 };
76227633
76237634 IOCompress = buildPerlPackage rec {
7624− name = "IO-Compress-2.081";
7635+ name = "IO-Compress-2.084";
76257636 src = fetchurl {
76267637 url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
7627− sha256 = "5211c775544dc8c511af08edfb1c0c22734daa2789149c2a88d68e17b43546d9";
7638+ sha256 = "1dbd503eda643aa58d1ef9b4d44c57889243d0ce6c54d5b45babceb860d76db5";
76287639 };
76297640 propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ];
76307641 meta = {
@@ -7742,12 +7753,12 @@ let
77427753 };
77437754
77447755 IOSocketSSL = buildPerlPackage rec {
7745− name = "IO-Socket-SSL-2.060";
7756+ name = "IO-Socket-SSL-2.064";
77467757 src = fetchurl {
77477758 url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz";
7748− sha256 = "fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c";
7759+ sha256 = "5827c6459ed2dce1da0ba6f442d198fa2c81554e045930e32b92c6d39e3ac3f5";
77497760 };
7750− propagatedBuildInputs = [ MozillaCA NetSSLeay ];
7761+ propagatedBuildInputs = [ NetSSLeay ];
77517762 # Fix path to default certificate store.
77527763 postPatch = ''
77537764 substituteInPlace lib/IO/Socket/SSL.pm \
@@ -7934,10 +7945,10 @@ let
79347945 };
79357946
79367947 Inline = buildPerlPackage rec {
7937− name = "Inline-0.80";
7948+ name = "Inline-0.81";
79387949 src = fetchurl {
7939− url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
7940− sha256 = "7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6";
7950+ url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.81.tar.gz;
7951+ sha256 = "1f973868dcca56a3a99b25d253fa18bf2d53670f8bbfa498261267647707b1e3";
79417952 };
79427953 buildInputs = [ TestWarn ];
79437954 meta = {
@@ -8037,10 +8048,10 @@ let
80378048 };
80388049
80398050 JSON = buildPerlPackage {
8040− name = "JSON-4.00";
8051+ name = "JSON-4.02";
80418052 src = fetchurl {
8042− url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.00.tar.gz;
8043− sha256 = "0s0h3a1y74851fgvrhq3qv8kw1z1ccwzz1ghn6vh91l7fl81znn4";
8053+ url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz;
8054+ sha256 = "0z32x2lijij28c9fhmzgxc41i9nw24fyvd2a8ajs5zw9b9sqhjj4";
80448055 };
80458056 # Do not abort cross-compilation on failure to load native JSON module into host perl
80468057 preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
@@ -8079,10 +8090,10 @@ let
80798090 };
80808091
80818092 JSONPP = buildPerlPackage rec {
8082− name = "JSON-PP-4.00";
8093+ name = "JSON-PP-4.02";
80838094 src = fetchurl {
8084− url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.00.tar.gz;
8085− sha256 = "0g0g6qxcic5p34n51dlpq2s9f23qzlxxqsgprv7x962k894qxx5y";
8095+ url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.02.tar.gz;
8096+ sha256 = "11wlh4clq0cddiamh1ipps3fh9ly01j4pcdh8f4nw7912bw7pimc";
80868097 };
80878098 meta = {
80888099 description = "JSON::XS compatible pure-Perl module";
@@ -8118,10 +8129,10 @@ let
81188129 };
81198130
81208131 JSONXS = buildPerlPackage {
8121− name = "JSON-XS-4.0";
8132+ name = "JSON-XS-4.01";
81228133 src = fetchurl {
8123− url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.0.tar.gz;
8124− sha256 = "0118yrzagwlcfj5yldn3h23zzqs2rx282jlm068nf7fjlvy4m7s7";
8134+ url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.01.tar.gz;
8135+ sha256 = "0p1yjwwrq3x1f831jhwxlb76h92px01a316zv65zzmhzkbin446c";
81258136 };
81268137 propagatedBuildInputs = [ TypesSerialiser ];
81278138 buildInputs = [ CanaryStability ];
@@ -8526,10 +8537,10 @@ let
85268537 };
85278538
85288539 LocaleCodes = buildPerlPackage {
8529− name = "Locale-Codes-3.59";
8540+ name = "Locale-Codes-3.60";
85308541 src = fetchurl {
8531− url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.59.tar.gz;
8532− sha256 = "388dea3d088aa0513f21091e0fe4a9c61ab2c173c83052b3120a52b103592c03";
8542+ url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.60.tar.gz;
8543+ sha256 = "32829bc49d927335de6994f3cfd55c5e693881602564c2aa966fe86740371194";
85338544 };
85348545 meta = {
85358546 description = "A distribution of modules to handle locale codes";
@@ -8791,10 +8802,10 @@ let
87918802 };
87928803
87938804 MCE = buildPerlPackage rec {
8794− name = "MCE-1.837";
8805+ name = "MCE-1.838";
87958806 src = fetchurl {
8796− url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.837.tar.gz;
8797− sha256 = "0si12wv02i8cn2xw6lk0m2apqrd88awcli1yadmvikq5rnfhcypa";
8807+ url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.838.tar.gz;
8808+ sha256 = "1xg63kd2la5zh7cvapv1l1wsxjallj4xv5l15bdp8jl3vvffwdhi";
87988809 };
87998810 meta = {
88008811 description = "Many-Core Engine for Perl providing parallel processing capabilities";
@@ -8923,7 +8934,7 @@ let
89238934 sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j";
89248935 };
89258936 patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ];
8926− propagatedBuildInputs = [ IOSocketSSL LWP ];
8937+ propagatedBuildInputs = [ IOSocketSSL LWP MozillaCA ];
89278938 doCheck = false; # tries to connect to https://www.apache.org/.
89288939 meta = {
89298940 description = "Provide https support for LWP::UserAgent";
@@ -9007,11 +9018,11 @@ let
90079018 };
90089019
90099020 MailBox = buildPerlPackage rec {
9010− version = "3.005";
9021+ version = "3.006";
90119022 name = "Mail-Box-${version}";
90129023 src = fetchurl {
90139024 url = "mirror://cpan/authors/id/M/MA/MARKOV/${name}.tar.gz";
9014− sha256 = "103v5jiv5mlckss1yardjvil506sx60f3g2ph2kgx9x6sy1sd93m";
9025+ sha256 = "1fm17z13jq7ff2f4ynnajdzzdqa4sb0kx5nfy9fvb0nzw49qd502";
90159026 };
90169027
90179028 doCheck = false;
@@ -9036,10 +9047,10 @@ let
90369047 };
90379048
90389049 MailMessage = buildPerlPackage rec {
9039− name = "Mail-Message-3.007";
9050+ name = "Mail-Message-3.008";
90409051 src = fetchurl {
9041− url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.007.tar.gz;
9042− sha256 = "1hpf68i5w20dxcibqj5w5h8mx9qa6vjhr34bicrvdh7d3dfxq0bn";
9052+ url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz;
9053+ sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f";
90439054 };
90449055 propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ];
90459056 meta = {
@@ -9060,10 +9071,10 @@ let
90609071 };
90619072
90629073 MailIMAPClient = buildPerlPackage {
9063− name = "Mail-IMAPClient-3.40";
9074+ name = "Mail-IMAPClient-3.42";
90649075 src = fetchurl {
9065− url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.40.tar.gz;
9066− sha256 = "1n8fq6j8nxs85v5qwmrr3ain900rvj9i8n7in4r5bw7kiihdv3xz";
9076+ url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz;
9077+ sha256 = "0znf035ikaxyfishv507qq6g691xvbnziqlcwfikkj2l1kan88hw";
90679078 };
90689079 propagatedBuildInputs = [ ParseRecDescent ];
90699080 };
@@ -9404,7 +9415,7 @@ let
94049415 url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000007.tar.gz;
94059416 sha256 = "1wg1x1pqamapfhn6rbffqipncgs15k99q34agdamv76i6782ny8r";
94069417 };
9407− propagatedBuildInputs = [ MathInt128 MaxMindDBReader pkgs.libmaxminddb ];
9418+ propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ];
94089419 buildInputs = [ NetWorks PathClass TestFatal TestNumberDelta TestRequires ];
94099420 meta = {
94109421 description = "Fast XS implementation of MaxMind DB reader";
@@ -9714,12 +9725,12 @@ let
97149725 };
97159726
97169727 ModuleCPANTSAnalyse = buildPerlPackage rec {
9717− name = "Module-CPANTS-Analyse-0.96";
9728+ name = "Module-CPANTS-Analyse-1.00";
97189729 src = fetchurl {
9719− url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-0.96.tar.gz;
9720− sha256 = "1c38fnbx9w1s841am1i5h33lcqr9bwc9bni21n907nmyp41wr297";
9730+ url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.00.tar.gz;
9731+ sha256 = "0r77g2h0d3p81scf294x5qkvi76hzwvbfji0m86abidjav5jk6a2";
97219732 };
9722− propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo FileFindObject IOCapture JSONMaybeXS ModuleExtractUse ModulePluggable SetScalar SoftwareLicenseCCpack ];
9733+ propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ];
97239734 buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ];
97249735 meta = {
97259736 description = "Generate Kwalitee ratings for a distribution";
@@ -9743,10 +9754,10 @@ let
97439754 };
97449755
97459756 ModuleCoreList = buildPerlPackage {
9746− name = "Module-CoreList-5.20181218";
9757+ name = "Module-CoreList-5.20190220";
97479758 src = fetchurl {
9748− url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20181218.tar.gz;
9749− sha256 = "1rq8i4wsd9k38djv18j6rpyiya7d6z67ac8gwvsp2yqs1hqqvpfi";
9759+ url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20190220.tar.gz;
9760+ sha256 = "0v5yavg3ggal8aj00426wkjw38yrji449lkaaxs0ynwjqhnq01i7";
97509761 };
97519762 meta = {
97529763 homepage = http://dev.perl.org/;
@@ -9942,11 +9953,11 @@ let
99429953 };
99439954 };
99449955
9945− ModuleScanDeps = let version = "1.26"; in buildPerlPackage {
9956+ ModuleScanDeps = let version = "1.27"; in buildPerlPackage {
99469957 name = "Module-ScanDeps-${version}";
99479958 src = fetchurl {
99489959 url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz";
9949− sha256 = "1awin0lfliskrw86mhks6qszxrwbwhr66fc79cv00598mrjzn223";
9960+ sha256 = "0j6r9r99x5p0i6fv06i44wpsvjxj32amjkiqf6pmqpj80jff2k7f";
99509961 };
99519962 buildInputs = [ TestRequires ];
99529963 meta = {
@@ -10018,10 +10029,10 @@ let
1001810029 };
1001910030
1002010031 Mojolicious = buildPerlPackage rec {
10021− name = "Mojolicious-8.10";
10032+ name = "Mojolicious-8.12";
1002210033 src = fetchurl {
1002310034 url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
10024− sha256 = "0rfzfc2iy42qnxlzv6rndc3vwfm2nlqdipqfmbpjr42wrf4x3g4v";
10035+ sha256 = "1sc9bdac4p9ha6xfmi3xj2dzip4bhxxzn5zvzyxqgbyvvr52k2dw";
1002510036 };
1002610037 meta = {
1002710038 homepage = https://mojolicious.org;
@@ -10389,10 +10400,10 @@ let
1038910400 };
1039010401
1039110402 MouseXGetopt = buildPerlModule rec {
10392− name = "MouseX-Getopt-0.37";
10403+ name = "MouseX-Getopt-0.38";
1039310404 src = fetchurl {
1039410405 url = "mirror://cpan/authors/id/G/GF/GFUJI/${name}.tar.gz";
10395− sha256 = "a6221043e7be3217ce56d2a6425a413d9cd28e2f52053995a6ceb118e8e963bc";
10406+ sha256 = "de3ea8ef452dd9501ea8c4eda8744b7224602602b04692607edd7d62b79f038f";
1039610407 };
1039710408 buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ];
1039810409 propagatedBuildInputs = [ GetoptLongDescriptive Mouse ];
@@ -10482,10 +10493,10 @@ let
1048210493 };
1048310494
1048410495 MooseXGetopt = buildPerlModule rec {
10485− name = "MooseX-Getopt-0.72";
10496+ name = "MooseX-Getopt-0.74";
1048610497 src = fetchurl {
1048710498 url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
10488− sha256 = "a378411a061ed239554d2b7f86b2b82bf55f600901243a6ec3fd29557d171b2e";
10499+ sha256 = "1de0df3b431ebe9f3563bdf4569eacd7e07e865a8397f2a990d0cb57d4cb2c24";
1048910500 };
1049010501 buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ];
1049110502 propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ];
@@ -11356,10 +11367,10 @@ let
1135611367 };
1135711368
1135811369 NetSFTPForeign = buildPerlPackage rec {
11359− name = "Net-SFTP-Foreign-1.89";
11370+ name = "Net-SFTP-Foreign-1.90";
1136011371 src = fetchurl {
1136111372 url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz";
11362− sha256 = "9bd33e130581c1fc3eb6108eaf9056c1507428cace04a572f7afe816d83b08a7";
11373+ sha256 = "d1eafb34f669ab6de675058292778ba2e0e42ecafd59abb1128ba31d62a0419d";
1136311374 };
1136411375 propagatedBuildInputs = [ pkgs.openssl ];
1136511376 patchPhase = ''
@@ -11765,10 +11776,10 @@ let
1176511776 };
1176611777
1176711778 PackageStash = buildPerlPackage {
11768− name = "Package-Stash-0.37";
11779+ name = "Package-Stash-0.38";
1176911780 src = fetchurl {
11770− url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz;
11771− sha256 = "06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c";
11781+ url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz;
11782+ sha256 = "c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f";
1177211783 };
1177311784 buildInputs = [ TestFatal TestRequires ];
1177411785 propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ];
@@ -11779,10 +11790,10 @@ let
1177911790 };
1178011791
1178111792 PackageStashXS = buildPerlPackage {
11782− name = "Package-Stash-XS-0.28";
11793+ name = "Package-Stash-XS-0.29";
1178311794 src = fetchurl {
11784− url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-XS-0.28.tar.gz;
11785− sha256 = "11nl69n8i56p91pd0ia44ip0vpv2cxwpbfakrv01vvv8az1cbn13";
11795+ url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz;
11796+ sha256 = "1akqk10qxwk798qppajqbczwmhy4cs9g0lg961m3vq218slnnryk";
1178611797 };
1178711798 buildInputs = [ TestFatal TestRequires ];
1178811799 meta = {
@@ -12420,10 +12431,10 @@ let
1242012431 };
1242112432
1242212433 PlackMiddlewareReverseProxy = buildPerlPackage {
12423− name = "Plack-Middleware-ReverseProxy-0.15";
12434+ name = "Plack-Middleware-ReverseProxy-0.16";
1242412435 src = fetchurl {
12425− url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.15.tar.gz;
12426− sha256 = "1zmsccdy6wr5hxzj07r1nsmaymyibk87p95z0wzknjw10lwmqs9f";
12436+ url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.16.tar.gz;
12437+ sha256 = "0a512n62pnk5ayj3zdzyj50iy1qi8nwh6ygks2h7nrh7gp9k2jc7";
1242712438 };
1242812439 propagatedBuildInputs = [ Plack ];
1242912440 meta = {
@@ -12433,10 +12444,10 @@ let
1243312444 };
1243412445
1243512446 PlackMiddlewareSession = buildPerlModule rec {
12436− name = "Plack-Middleware-Session-0.30";
12447+ name = "Plack-Middleware-Session-0.32";
1243712448 src = fetchurl {
12438− url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.30.tar.gz;
12439− sha256 = "0cwlhfj1644jq8axv4cghsqqjsx2y7hj7g0y5l179fcgmbp2ndzf";
12449+ url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.32.tar.gz;
12450+ sha256 = "00jnyclvggb4g7q6489x4x1sxfpxy9xyxrqkg2aqpn05fcqwfznp";
1244012451 };
1244112452 propagatedBuildInputs = [ DigestHMAC DigestSHA1 Plack ];
1244212453 buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ];
@@ -12613,10 +12624,10 @@ let
1261312624 };
1261412625
1261512626 ProcProcessTable = buildPerlPackage {
12616− name = "Proc-ProcessTable-0.55";
12627+ name = "Proc-ProcessTable-0.56";
1261712628 src = fetchurl {
12618− url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.55.tar.gz;
12619− sha256 = "3b9660d940a0c016c5e48108fa9dbf9f30492b505aa0a26d22b09554f05714f5";
12629+ url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.56.tar.gz;
12630+ sha256 = "99fb8fd11e4e438399dd362d95b5b2073f1f340e9b3a7f04e76b6c7428170660";
1262012631 };
1262112632 meta = {
1262212633 description = "Perl extension to access the unix process table";
@@ -12750,6 +12761,20 @@ let
1275012761 };
1275112762 };
1275212763
12764+ PerlPrereqScannerNotQuiteLite = buildPerlPackage {
12765+ name = "Perl-PrereqScanner-NotQuiteLite-0.9904";
12766+ src = fetchurl {
12767+ url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9904.tar.gz;
12768+ sha256 = "1qf6x49sjswazh7bicpm7wnwpdnx245ws02s53dvbxcbw2c66hsn";
12769+ };
12770+ propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ];
12771+ buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ];
12772+ meta = {
12773+ description = "a tool to scan your Perl code for its prerequisites";
12774+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
12775+ };
12776+ };
12777+
1275312778 PerlVersion = buildPerlPackage rec {
1275412779 name = "Perl-Version-1.013";
1275512780 src = fetchurl {
@@ -12967,10 +12992,10 @@ let
1296712992 };
1296812993
1296912994 PodMarkdownGithub = buildPerlPackage rec {
12970− name = "Pod-Markdown-Github-0.03";
12995+ name = "Pod-Markdown-Github-0.04";
1297112996 src = fetchurl {
12972− url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.03.tar.gz;
12973− sha256 = "0y555pb78j0lz24kdgiwkmk1vcv4lg3a3mvnw9vm2qqnkp7p0nag";
12997+ url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz;
12998+ sha256 = "04y67c50hpf1vb9cwsza3fbj4rshdqa47vi3zcj4kkjckh02yzmk";
1297412999 };
1297513000 propagatedBuildInputs = [ PodMarkdown ];
1297613001 buildInputs = [ TestDifferences ];
@@ -13203,6 +13228,16 @@ let
1320313228 };
1320413229 };
1320513230
13231+ RegexpTrie = buildPerlPackage {
13232+ name = "Regexp-Trie-0.02";
13233+ src = fetchurl {
13234+ url = mirror://cpan/authors/id/D/DA/DANKOGAI/Regexp-Trie-0.02.tar.gz;
13235+ sha256 = "1yn5l6x3xyic9jxw9jggqsbggcv7rc8ggj4zbnlz9hfvv17gjazv";
13236+ };
13237+ meta = {
13238+ };
13239+ };
13240+
1320613241 RESTClient = buildPerlPackage rec {
1320713242 name = "REST-Client-273";
1320813243 src = fetchurl {
@@ -14390,10 +14425,10 @@ let
1439014425 };
1439114426
1439214427 TAPParserSourceHandlerpgTAP = buildPerlModule rec {
14393− name = "TAP-Parser-SourceHandler-pgTAP-3.34";
14428+ name = "TAP-Parser-SourceHandler-pgTAP-3.35";
1439414429 src = fetchurl {
1439514430 url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz";
14396− sha256 = "1q9h5h3m31vfch17djjacnjqvfkyw0b8ndwv1kk8a09bp8sbsh8v";
14431+ sha256 = "1655337l1cyd7q62007wrk87q2gbbwfq9xjy1wgx3hyflxpkkvl4";
1439714432 };
1439814433 meta = {
1439914434 description = "Stream TAP from pgTAP test scripts";
@@ -14624,18 +14659,34 @@ let
1462414659
1462514660 TermReadKey = buildPerlPackage rec {
1462614661 name = "TermReadKey-${version}";
14627− version = "2.37";
14662+ version = "2.38";
1462814663 src = fetchurl {
1462914664 url = "mirror://cpan/authors/id/J/JS/JSTOWE/${name}.tar.gz";
14630− sha256 = "0hdj5mldpj3pyprd4hbbalfx9yjgi5p59gg2ixk9808f5v7q74sa";
14631− };
14665+ sha256 = "143jlibah1g14bym7sj3gphvqkpj1w4vn7sqc4vc62jpviw5hr2s";
14666+ };
14667+ cross = stdenv.hostPlatform != stdenv.buildPlatform;
14668+
14669+ # use native libraries from the host when running build commands
14670+ postConfigure = if cross then let
14671+ host_perl = buildPackages.perl;
14672+ host_self = buildPackages.perlPackages.TermReadKey;
14673+ perl_lib = "${host_perl}/lib/perl5/${host_perl.version}";
14674+ self_lib = "${host_self}/lib/perl5/site_perl/${host_perl.version}";
14675+ in ''
14676+ sed -ie 's|"-I$(INST_ARCHLIB)"|"-I${perl_lib}" "-I${self_lib}"|g' Makefile
14677+ '' else null;
14678+
14679+ # TermReadKey uses itself in the build process
14680+ nativeBuildInputs = if cross then [
14681+ buildPackages.perlPackages.TermReadKey
14682+ ] else [];
1463214683 };
1463314684
1463414685 TermReadLineGnu = buildPerlPackage rec {
14635− name = "Term-ReadLine-Gnu-1.35";
14686+ name = "Term-ReadLine-Gnu-1.36";
1463614687 src = fetchurl {
1463714688 url = "mirror://cpan/authors/id/H/HA/HAYASHI/${name}.tar.gz";
14638− sha256 = "575d32d4ab67cd656f314e8d0ee3d45d2491078f3b2421e520c4273e92eb9125";
14689+ sha256 = "9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925";
1463914690 };
1464014691 buildInputs = [ pkgs.readline pkgs.ncurses ];
1464114692 NIX_CFLAGS_LINK = "-lreadline -lncursesw";
@@ -14781,10 +14832,10 @@ let
1478114832 };
1478214833
1478314834 Test2Suite = buildPerlPackage rec {
14784− name = "Test2-Suite-0.000117";
14835+ name = "Test2-Suite-0.000118";
1478514836 src = fetchurl {
1478614837 url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
14787− sha256 = "e8877a90655ace2e8302104e0de27faf777397194738b085b209749c091ef154";
14838+ sha256 = "e9225132b585d6730d3de6b0caa2648b9c67995732c0a081efcfcad37b8af227";
1478814839 };
1478914840 propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ];
1479014841 meta = {
@@ -15022,11 +15073,11 @@ let
1502215073 };
1502315074 };
1502415075
15025− TestDifferences = buildPerlModule {
15026− name = "Test-Differences-0.64";
15076+ TestDifferences = buildPerlPackage {
15077+ name = "Test-Differences-0.66";
1502715078 src = fetchurl {
15028− url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz;
15029− sha256 = "9f459dd9c2302a0a73e2f5528a0ce7d09d6766f073187ae2c69e603adf2eb276";
15079+ url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.66.tar.gz;
15080+ sha256 = "83633a171e83ff03a0eb1f5a699f05b506a34190bcf8726979bbfd9dc16c223a";
1503015081 };
1503115082 propagatedBuildInputs = [ CaptureTiny TextDiff ];
1503215083 meta = {
@@ -15209,10 +15260,10 @@ let
1520915260 };
1521015261
1521115262 TestKwalitee = buildPerlPackage rec {
15212− name = "Test-Kwalitee-1.27";
15263+ name = "Test-Kwalitee-1.28";
1521315264 src = fetchurl {
15214− url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.27.tar.gz;
15215− sha256 = "095kpj2011jk1mpnb07fs7yi190hmqh85mj662gx0dkpl9ic7a5w";
15265+ url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz;
15266+ sha256 = "18s3c8qfr3kmmyxmsn5la2zgbdsgpnkmscnl68i7fnavfpfnqlxl";
1521615267 };
1521715268 propagatedBuildInputs = [ ModuleCPANTSAnalyse ];
1521815269 buildInputs = [ CPANMetaCheck TestDeep TestWarnings ];
@@ -15545,10 +15596,10 @@ let
1554515596 };
1554615597
1554715598 TestPortabilityFiles = buildPerlPackage {
15548− name = "Test-Portability-Files-0.09";
15599+ name = "Test-Portability-Files-0.10";
1554915600 src = fetchurl {
15550− url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.09.tar.gz;
15551− sha256 = "16d31fa941af1a79faec0192e09880cb19225cde649c03d2e3ceda9b455a621c";
15601+ url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.10.tar.gz;
15602+ sha256 = "08e4b432492dc1b44b55d5db57952eb76379c7f434ee8f16aca64d491f401a16";
1555215603 };
1555315604 meta = {
1555415605 description = "Check file names portability";
@@ -15756,10 +15807,10 @@ let
1575615807 };
1575715808
1575815809 TestSimple13 = buildPerlPackage rec {
15759− name = "Test-Simple-1.302141";
15810+ name = "Test-Simple-1.302162";
1576015811 src = fetchurl {
15761− url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302141.tar.gz;
15762− sha256 = "d7045bc814cba0426684a32c44d90ced5b83075659f0fcefed88c32f8fd395b7";
15812+ url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302162.tar.gz;
15813+ sha256 = "73a0197c3d735e060881da509f4c5fa76c4cbf7dbabd4297d3cf5f5feed31fc4";
1576315814 };
1576415815 meta = {
1576515816 description = "Basic utilities for writing tests";
@@ -15945,10 +15996,10 @@ let
1594515996 };
1594615997
1594715998 TestWWWMechanizeCatalyst = buildPerlPackage rec {
15948− name = "Test-WWW-Mechanize-Catalyst-0.60";
15999+ name = "Test-WWW-Mechanize-Catalyst-0.62";
1594916000 src = fetchurl {
15950− url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz";
15951− sha256 = "0nhhfrrai3ndziz873vpa1j0vljjnib4wqafd6yyvkf58ad7v0lv";
16001+ url = mirror://cpan/authors/id/M/MS/MSTROUT/Test-WWW-Mechanize-Catalyst-0.62.tar.gz;
16002+ sha256 = "1cdc2q16vs6fb335pzaislz2rx1ph9acaxyp7v5hv9xbwwddwfqq";
1595216003 };
1595316004 doCheck = false; # listens on an external port
1595416005 propagatedBuildInputs = [ CatalystRuntime WWWMechanize ];
@@ -16091,10 +16142,10 @@ let
1609116142 };
1609216143
1609316144 TextCSV = buildPerlPackage rec {
16094− name = "Text-CSV-1.97";
16145+ name = "Text-CSV-1.99";
1609516146 src = fetchurl {
16096− url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.97.tar.gz;
16097− sha256 = "cc350462efa8d39d5c8a1da5f205bc31620cd52d9865a769c8e3ed1b41640fd5";
16147+ url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.99.tar.gz;
16148+ sha256 = "e74ec039b12cc51d346bf1d814af7db8a05cb0a98340e7547a21646da8668cd2";
1609816149 };
1609916150 meta = {
1610016151 description = "Comma-separated values manipulator (using XS or PurePerl)";
@@ -16116,10 +16167,10 @@ let
1611616167 };
1611716168
1611816169 TextCSV_XS = buildPerlPackage rec {
16119− name = "Text-CSV_XS-1.37";
16170+ name = "Text-CSV_XS-1.38";
1612016171 src = fetchurl {
1612116172 url = "mirror://cpan/authors/id/H/HM/HMBRAND/${name}.tgz";
16122− sha256 = "20e16da9c38b0938f308c01d954f49d2c6922bac0d2d979bf2ad483fe7476ba2";
16173+ sha256 = "d6317ae0ed0658e00037ecedaa3da2ff8565c86b0516ef8a93322b959de313dd";
1612316174 };
1612416175 meta = {
1612516176 description = "Comma-Separated Values manipulation routines";
@@ -16380,10 +16431,10 @@ let
1638016431 };
1638116432
1638216433 TextTemplate = buildPerlPackage {
16383− name = "Text-Template-1.53";
16434+ name = "Text-Template-1.55";
1638416435 src = fetchurl {
16385− url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.53.tar.gz;
16386− sha256 = "ae221cbba2b27967a12bda3f531547e897eb38ae0a92c084607fd5a6a8085bc4";
16436+ url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.55.tar.gz;
16437+ sha256 = "a4948be945250c17f9f0aaee56cc79b3195dcebcb75215b55d6ed1ca2b02f18b";
1638716438 };
1638816439 buildInputs = [ TestMoreUTF8 TestWarnings ];
1638916440 };
@@ -16829,10 +16880,10 @@ let
1682916880 };
1683016881
1683116882 TypeTiny = buildPerlPackage {
16832− name = "Type-Tiny-1.004002";
16883+ name = "Type-Tiny-1.004004";
1683316884 src = fetchurl {
16834− url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004002.tar.gz;
16835− sha256 = "e52c7e9593052aed157a15d473b5c25a1dbb3454bf3cd6913df94cc9bb2be707";
16885+ url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.004004.tar.gz;
16886+ sha256 = "081281ea004cdd89003d938aa52c1398e24411dd8f7163b14d0977a13f7062be";
1683616887 };
1683716888 propagatedBuildInputs = [ ExporterTiny ];
1683816889 meta = {
@@ -16911,10 +16962,10 @@ let
1691116962 };
1691216963
1691316964 UnicodeLineBreak = buildPerlPackage rec {
16914− name = "Unicode-LineBreak-2018.003";
16965+ name = "Unicode-LineBreak-2019.001";
1691516966 src = fetchurl {
1691616967 url = "mirror://cpan/authors/id/N/NE/NEZUMI/${name}.tar.gz";
16917− sha256 = "1cbilpy7ypr26rjr6cmrbkxhsm1l6yx7s1p7lcf0l3vi7vzr4346";
16968+ sha256 = "12iinva5gqc9g7qzxrvmh45n714z0ad9g7wq2dxwgp6drbj64rs8";
1691816969 };
1691916970 propagatedBuildInputs = [ MIMECharset ];
1692016971 meta = {
@@ -16940,10 +16991,10 @@ let
1694016991 };
1694116992
1694216993 URI = buildPerlPackage rec {
16943− name = "URI-1.74";
16994+ name = "URI-1.76";
1694416995 src = fetchurl {
16945− url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
16946− sha256 = "a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d";
16996+ url = mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz;
16997+ sha256 = "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e";
1694716998 };
1694816999 buildInputs = [ TestNeeds ];
1694917000 meta = {
@@ -17176,10 +17227,10 @@ let
1717617227 };
1717717228
1717817229 WWWMechanize = buildPerlPackage {
17179− name = "WWW-Mechanize-1.90";
17230+ name = "WWW-Mechanize-1.91";
1718017231 src = fetchurl {
17181− url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.90.tar.gz;
17182− sha256 = "038i9nh643cmi4y4r8fsp0xvzz4zfh5srh8sw3w5kzxjq126pr44";
17232+ url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.91.tar.gz;
17233+ sha256 = "0cb14m1vhaf0mgn2fqwi5hm72xhfi77hpq2g57swgy0w83x7m27b";
1718317234 };
1718417235 propagatedBuildInputs = [ HTMLForm HTMLTree LWP ];
1718517236 doCheck = false;
@@ -17188,7 +17239,7 @@ let
1718817239 description = "Handy web browsing in a Perl object";
1718917240 license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
1719017241 };
17191− buildInputs = [ CGI HTTPServerSimple PerlCritic PerlTidy TestDeep TestFatal TestOutput TestWarnings ];
17242+ buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ];
1719217243 };
1719317244
1719417245 WWWMechanizeCGI = buildPerlPackage {
@@ -17425,10 +17476,10 @@ let
1742517476 };
1742617477
1742717478 XMLLibXML = buildPerlPackage rec {
17428− name = "XML-LibXML-2.0132";
17479+ name = "XML-LibXML-2.0134";
1742917480 src = fetchurl {
1743017481 url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
17431− sha256 = "0xnl281hb590i287fxpl947f1s4zl9dnvc4ajvsqi89w23im453j";
17482+ sha256 = "1ks69xymv6zkj7hvaymjvb78ch81abri7kg4zrwxhdfsqb8a9g7h";
1743217483 };
1743317484 SKIP_SAX_INSTALL = 1;
1743417485 buildInputs = [ pkgs.libxml2 ];
@@ -17722,10 +17773,10 @@ let
1772217773 };
1772317774
1772417775 YAMLLibYAML = buildPerlPackage rec {
17725− name = "YAML-LibYAML-0.75";
17776+ name = "YAML-LibYAML-0.76";
1772617777 src = fetchurl {
17727− url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.75.tar.gz;
17728− sha256 = "1jlj6yrh3kv6f6q2x253lds664916fgps0praih5gwxagnld9k32";
17778+ url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.76.tar.gz;
17779+ sha256 = "1m94g36sl9rasjlvlsf65xcal5hvkc3gbzd7l68h17az75269kyy";
1772917780 };
1773017781 };
1773117782
pkgs/top-level/unix-tools.nix+4−1
@@ -20,7 +20,10 @@ let
2020 bin = "${getBin provider}/bin/${cmd}";
2121 manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz";
2222 in runCommand "${cmd}-${version}" {
23− meta.platforms = map (n: { kernel.name = n; }) (attrNames providers);
23+ meta = {
24+ priority = 10;
25+ platforms = map (n: { kernel.name = n; }) (attrNames providers);
26+ };
2427 passthru = { inherit provider; };
2528 preferLocalBuild = true;
2629 } ''