git.iko.soy/typeable/nixpkgs
on master help sign in
Merge staging-next into master, closes #65497
commit53328909da75752522c55f8d94c6553d740f9729 authorFrederik Rietdijk <fridh@fridh.nl> dateSat 3 Aug 2019, 07:42 (7 years ago) parent49f281dcd98462
296 files changed+1427−1019
nixos/modules/services/x11/gdk-pixbuf.nix+4−4 nixos/tests/gdk-pixbuf.nix+2−2 nixos/tests/ostree.nix+1−1 pkgs/applications/altcoins/exodus/default.nix+2−2 pkgs/applications/altcoins/parity-ui/env.nix+2−2 pkgs/applications/audio/amarok/default.nix+2−2 pkgs/applications/audio/audacious/qt-5.nix+2−2 pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix+2−2 pkgs/applications/audio/cmusfm/default.nix+2−2 pkgs/applications/audio/faust/faust2alsa.nix+2−2 pkgs/applications/audio/google-play-music-desktop-player/default.nix+2−2 pkgs/applications/audio/gtkpod/default.nix+2−2 pkgs/applications/audio/mpg123/default.nix+2−2 pkgs/applications/audio/quodlibet/default.nix+2−2 pkgs/applications/audio/reaper/default.nix+2−2 pkgs/applications/audio/spotify/default.nix+2−2 pkgs/applications/audio/transcribe/default.nix+2−2 pkgs/applications/backup/crashplan/crashplan-small-business.nix+2−2 pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix+2−2 pkgs/applications/editors/atom/env.nix+2−2 pkgs/applications/editors/brackets/default.nix+2−2 pkgs/applications/editors/lighttable/default.nix+2−2 pkgs/applications/editors/rednotebook/default.nix+2−2 pkgs/applications/editors/vim/common.nix+2−2 pkgs/applications/graphics/avocode/default.nix+2−2 pkgs/applications/graphics/drawio/default.nix+2−2 pkgs/applications/graphics/gimp/default.nix+3−3 pkgs/applications/graphics/giv/default.nix+2−2 pkgs/applications/graphics/mypaint/default.nix+2−2 pkgs/applications/graphics/pencil/default.nix+2−2 pkgs/applications/graphics/rapid-photo-downloader/default.nix+2−2 pkgs/applications/graphics/shotwell/default.nix+2−2 pkgs/applications/graphics/shutter/default.nix+2−2 pkgs/applications/graphics/viewnior/default.nix+2−2 pkgs/applications/misc/adobe-reader/default.nix+2−2 pkgs/applications/misc/airtame/default.nix+2−2 pkgs/applications/misc/batti/default.nix+2−2 pkgs/applications/misc/dunst/default.nix+2−2 pkgs/applications/misc/et/default.nix+2−2 pkgs/applications/misc/evilvte/default.nix+2−2 pkgs/applications/misc/green-pdfviewer/default.nix+2−2 pkgs/applications/misc/hyper/default.nix+2−2 pkgs/applications/misc/kiwix/default.nix+2−2 pkgs/applications/misc/lutris/default.nix+2−2 pkgs/applications/misc/mako/default.nix+2−2 pkgs/applications/misc/mlterm/default.nix+2−2 pkgs/applications/misc/navit/default.nix+2−2 pkgs/applications/misc/plank/default.nix+2−2 pkgs/applications/misc/polar-bookshelf/default.nix+5−5 pkgs/applications/misc/roxterm/default.nix+2−2 pkgs/applications/misc/rxvt_unicode/default.nix+2−2 pkgs/applications/misc/safeeyes/default.nix+2−2 pkgs/applications/misc/simplenote/default.nix+2−2 pkgs/applications/misc/stretchly/default.nix+2−2 pkgs/applications/misc/terminus/default.nix+2−2 pkgs/applications/misc/volnoti/default.nix+2−2 pkgs/applications/misc/xneur/default.nix+2−2 pkgs/applications/misc/xxkb/default.nix+3−3 pkgs/applications/networking/browsers/brave/default.nix+2−2 pkgs/applications/networking/browsers/firefox-bin/default.nix+2−2 pkgs/applications/networking/browsers/google-chrome/default.nix+2−2 pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix+2−2 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+2−2 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+2−2 pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix+2−2 pkgs/applications/networking/browsers/opera/default.nix+2−2 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+2−2 pkgs/applications/networking/browsers/vivaldi/default.nix+2−2 pkgs/applications/networking/dropbox/cli.nix+2−2 pkgs/applications/networking/instant-messengers/bluejeans/default.nix+2−2 pkgs/applications/networking/instant-messengers/coyim/default.nix+2−2 pkgs/applications/networking/instant-messengers/dino/default.nix+2−2 pkgs/applications/networking/instant-messengers/discord/base.nix+2−2 pkgs/applications/networking/instant-messengers/fractal/default.nix+2−2 pkgs/applications/networking/instant-messengers/franz/default.nix+2−2 pkgs/applications/networking/instant-messengers/gitter/default.nix+2−2 pkgs/applications/networking/instant-messengers/linphone/default.nix+2−2 pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix+2−2 pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix+2−2 pkgs/applications/networking/instant-messengers/profanity/default.nix+3−3 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix+2−2 pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix+2−2 pkgs/applications/networking/instant-messengers/slack/default.nix+2−2 pkgs/applications/networking/instant-messengers/stride/default.nix+2−2 pkgs/applications/networking/instant-messengers/toxic/default.nix+2−2 pkgs/applications/networking/instant-messengers/wire-desktop/default.nix+4−4 pkgs/applications/networking/mailreaders/inboxer/default.nix+2−2 pkgs/applications/networking/mailreaders/mailnag/default.nix+2−2 pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix+2−2 pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+2−2 pkgs/applications/networking/mullvad-vpn/default.nix+2−2 pkgs/applications/networking/p2p/tixati/default.nix+2−2 pkgs/applications/networking/p2p/transgui/default.nix+5−5 pkgs/applications/networking/remote/anydesk/default.nix+2−2 pkgs/applications/networking/remote/citrix-receiver/default.nix+3−3 pkgs/applications/networking/remote/citrix-workspace/default.nix+3−3 pkgs/applications/networking/ssb/patchwork-classic/default.nix+3−3 pkgs/applications/networking/super-productivity/default.nix+2−2 pkgs/applications/office/moneyplex/default.nix+2−2 pkgs/applications/office/pinpoint/default.nix+2−2 pkgs/applications/office/spice-up/default.nix+2−2 pkgs/applications/office/zotero/default.nix+4−4 pkgs/applications/science/electronics/bitscope/common.nix+2−2 pkgs/applications/science/logic/verifast/default.nix+2−2 pkgs/applications/version-management/gitkraken/default.nix+2−2 pkgs/applications/video/devede/default.nix+2−2 pkgs/applications/video/lightworks/default.nix+3−3 pkgs/applications/video/webtorrent_desktop/default.nix+2−2 pkgs/applications/window-managers/awesome/default.nix+2−2 pkgs/applications/window-managers/dwm/dwm-status.nix+2−2 pkgs/applications/window-managers/icewm/default.nix+2−2 pkgs/applications/window-managers/sawfish/default.nix+2−2 pkgs/applications/window-managers/sway/bg.nix+2−2 pkgs/applications/window-managers/sway/default.nix+2−2 pkgs/applications/window-managers/sway/lock.nix+2−2 pkgs/applications/window-managers/trayer/default.nix+2−2 pkgs/applications/window-managers/way-cooler/crates-io.nix+371−283 pkgs/applications/window-managers/way-cooler/default.nix+2−2 pkgs/applications/window-managers/yabar/build.nix+2−2 pkgs/build-support/appimage/default.nix+1−1 pkgs/build-support/rust/default-crate-overrides.nix+2−2 pkgs/data/icons/elementary-xfce-icon-theme/default.nix+2−2 pkgs/data/themes/greybird/default.nix+2−2 pkgs/data/themes/matcha/default.nix+2−2 pkgs/data/themes/materia-theme/default.nix+2−2 pkgs/data/themes/plano/default.nix+2−2 pkgs/data/themes/plata/default.nix+2−2 pkgs/data/themes/qogir/default.nix+2−2 pkgs/data/themes/sierra/default.nix+2−2 pkgs/data/themes/stilo/default.nix+2−2 pkgs/data/themes/zuki/default.nix+2−2 pkgs/desktops/deepin/go-lib/default.nix+2−2 pkgs/desktops/deepin/qcef/default.nix+2−2 pkgs/desktops/gnome-3/apps/cheese/default.nix+3−3 pkgs/desktops/gnome-3/apps/evolution/default.nix+2−2 pkgs/desktops/gnome-3/apps/glade/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-books/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-documents/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-photos/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix+2−2 pkgs/desktops/gnome-3/apps/polari/default.nix+2−2 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2 pkgs/desktops/gnome-3/core/empathy/default.nix+2−2 pkgs/desktops/gnome-3/core/eog/default.nix+3−3 pkgs/desktops/gnome-3/core/epiphany/default.nix+2−2 pkgs/desktops/gnome-3/core/evince/default.nix+2−2 pkgs/desktops/gnome-3/core/gjs/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+3−3 pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-shell/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix+2−2 pkgs/desktops/gnome-3/core/nautilus/default.nix+2−2 pkgs/desktops/gnome-3/core/simple-scan/default.nix+2−2 pkgs/desktops/gnome-3/core/sushi/default.nix+2−2 pkgs/desktops/gnome-3/core/totem/default.nix+2−2 pkgs/desktops/gnome-3/games/atomix/default.nix+2−2 pkgs/desktops/gnome-3/games/iagno/default.nix+2−2 pkgs/desktops/gnome-3/games/lightsoff/default.nix+2−2 pkgs/desktops/gnome-3/games/quadrapassel/default.nix+2−2 pkgs/desktops/gnome-3/games/tali/default.nix+2−2 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+2−2 pkgs/desktops/lxde/core/lxpanel/default.nix+2−2 pkgs/desktops/mate/caja-dropbox/default.nix+2−2 pkgs/desktops/mate/mate-themes/default.nix+2−2 pkgs/desktops/maxx/default.nix+3−3 pkgs/desktops/xfce/core/tumbler.nix+2−2 pkgs/desktops/xfce4-14/thunar/default.nix+2−2 pkgs/desktops/xfce4-14/tumbler/default.nix+2−2 pkgs/development/arduino/arduino-core/default.nix+3−3 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+2−2 pkgs/development/compilers/cudatoolkit/default.nix+2−2 pkgs/development/compilers/factor-lang/default.nix+4−4 pkgs/development/compilers/fpc/lazarus.nix+2−2 pkgs/development/compilers/jetbrains-jdk/default.nix+2−2 pkgs/development/compilers/oraclejdk/jdk-linux-base.nix+2−2 pkgs/development/compilers/zulu/8.nix+2−2 pkgs/development/compilers/zulu/default.nix+2−2 pkgs/development/haskell-modules/hackage-packages.nix+9−9 pkgs/development/libraries/appstream-glib/default.nix+2−2 pkgs/development/libraries/clutter-gst/default.nix+2−2 pkgs/development/libraries/cogl/default.nix+2−2 pkgs/development/libraries/freetype/default.nix+4−3 pkgs/development/libraries/gcr/default.nix+2−2 pkgs/development/libraries/gdk-pixbuf/default.nix−1 pkgs/development/libraries/geis/default.nix+2−2 pkgs/development/libraries/geoclue/default.nix+2−2 pkgs/development/libraries/gflags/default.nix+1−1 pkgs/development/libraries/gom/default.nix+2−2 pkgs/development/libraries/gstreamer/good/default.nix+2−2 pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix+2−2 pkgs/development/libraries/gtk+/2.x.nix+2−2 pkgs/development/libraries/gtk+/3.x.nix+2−2 pkgs/development/libraries/gtkd/default.nix+4−4 pkgs/development/libraries/harfbuzz/default.nix+2−2 pkgs/development/libraries/java/swt/default.nix+2−2 pkgs/development/libraries/lasem/default.nix+2−2 pkgs/development/libraries/libarchive/default.nix+8−21 pkgs/development/libraries/libcef/default.nix+2−2 pkgs/development/libraries/libgpod/default.nix+2−2 pkgs/development/libraries/libgsf/default.nix+2−2 pkgs/development/libraries/libmediaart/default.nix+2−2 pkgs/development/libraries/libnotify/default.nix+2−2 pkgs/development/libraries/librsvg/default.nix+4−4 pkgs/development/libraries/libuv/default.nix+2−2 pkgs/development/libraries/libva/default.nix+2−2 pkgs/development/libraries/mesa/default.nix+2−2 pkgs/development/libraries/qt-4.x/4.8/default.nix+2−2 pkgs/development/libraries/qt-5/modules/qtbase.nix+1−13 pkgs/development/libraries/vaapi-vdpau/default.nix+25−22 pkgs/development/libraries/vaapi-vdpau/glext85.patch−20 pkgs/development/ocaml-modules/ocaml-cairo/default.nix+2−2 pkgs/development/python-modules/Cython/default.nix+2−2 pkgs/development/python-modules/bcrypt/default.nix+2−2 pkgs/development/python-modules/cairocffi/0_9.nix+2−2 pkgs/development/python-modules/cairocffi/default.nix+2−2 pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch+6−6 pkgs/development/python-modules/cairocffi/dlopen-paths.patch+6−6 pkgs/development/python-modules/cairocffi/generic.nix+2−2 pkgs/development/python-modules/certifi/default.nix+2−2 pkgs/development/python-modules/cytoolz/default.nix+2−11 pkgs/development/python-modules/glob2/default.nix+26 pkgs/development/python-modules/ipython/default.nix+2−9 pkgs/development/python-modules/ipywidgets/default.nix+2−2 pkgs/development/python-modules/jupyter_client/default.nix+2−2 pkgs/development/python-modules/jupyter_core/default.nix+2−2 pkgs/development/python-modules/nbval/default.nix+16−4 pkgs/development/python-modules/numba/default.nix+2−2 pkgs/development/python-modules/numpy/default.nix+4−5 pkgs/development/python-modules/pandas/2.nix+122 pkgs/development/python-modules/pandas/default.nix+2−2 pkgs/development/python-modules/pycurl/default.nix+19−12 pkgs/development/python-modules/pyglet/default.nix+2−2 pkgs/development/python-modules/pyopenssl/default.nix+2 pkgs/development/python-modules/pytest-annotate/default.nix+13−2 pkgs/development/python-modules/pytest-mock/default.nix+20−3 pkgs/development/python-modules/pyyaml/default.nix+2−2 pkgs/development/python-modules/readme/default.nix+12−9 pkgs/development/python-modules/requests/default.nix+2−2 pkgs/development/python-modules/statsmodels/default.nix+2−2 pkgs/development/python-modules/toolz/default.nix+2−2 pkgs/development/python-modules/tqdm/default.nix+2−2 pkgs/development/python-modules/widgetsnbextension/default.nix+2−2 pkgs/development/python-modules/xarray/default.nix+2−2 pkgs/development/ruby-modules/gem-config/default.nix+3−3 pkgs/development/tools/build-managers/cmake/setup-hook.sh+13−1 pkgs/development/tools/node-webkit/nw12.nix+2−2 pkgs/development/tools/nwjs/default.nix+2−2 pkgs/development/tools/react-native-debugger/default.nix+2−2 pkgs/development/tools/selenium/chromedriver/default.nix+2−2 pkgs/development/tools/thrust/default.nix+2−2 pkgs/development/tools/unity3d/default.nix+5−5 pkgs/development/web/insomnia/default.nix+4−4 pkgs/development/web/postman/default.nix+1−1 pkgs/games/arena/default.nix+2−2 pkgs/games/planetaryannihilation/default.nix+3−3 pkgs/games/steam/chrootenv.nix+1−1 pkgs/misc/emulators/cdemu/analyzer.nix+2−2 pkgs/misc/emulators/cdemu/gui.nix+2−2 pkgs/misc/emulators/epsxe/default.nix+2−2 pkgs/misc/emulators/kega-fusion/default.nix+2−2 pkgs/misc/emulators/nestopia/default.nix+2−2 pkgs/misc/solfege/default.nix+2−2 pkgs/misc/themes/adapta/default.nix+2−2 pkgs/misc/themes/equilux-theme/default.nix+2−2 pkgs/misc/themes/numix-solarized/default.nix+2−2 pkgs/misc/themes/numix/default.nix+2−2 pkgs/os-specific/linux/usermount/default.nix+2−2 pkgs/stdenv/darwin/default.nix+1−1 pkgs/tools/X11/caffeine-ng/default.nix+2−2 pkgs/tools/X11/xpra/default.nix+2−2 pkgs/tools/audio/gvolicon/default.nix+2−2 pkgs/tools/compression/zstd/default.nix+6−5 pkgs/tools/filesystems/e2fsprogs/default.nix+2−2 pkgs/tools/graphics/blur-effect/default.nix+2−2 pkgs/tools/inputmethods/ibus/default.nix+2−2 pkgs/tools/misc/birdfont/default.nix+2−2 pkgs/tools/misc/staruml/default.nix+2−2 pkgs/tools/misc/sweep-visualizer/default.nix+4−4 pkgs/tools/misc/system-config-printer/default.nix+2−2 pkgs/tools/networking/curl/default.nix+2−2 pkgs/tools/networking/driftnet/default.nix+2−2 pkgs/tools/networking/openresolv/default.nix+2−2 pkgs/tools/security/encryptr/default.nix+2−2 pkgs/tools/security/keybase/gui.nix+2−2 pkgs/tools/system/collectd/default.nix+2−2 pkgs/tools/system/ddrescueview/default.nix+2−2 pkgs/tools/text/gnupatch/CVE-2019-13636.patch+108 pkgs/tools/text/gnupatch/CVE-2019-13638.patch+38 pkgs/tools/text/gnupatch/default.nix+6 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−1 pkgs/top-level/python-packages.nix+19−6
nixos/modules/services/x11/gdk-pixbuf.nix+4−4
@@ -5,21 +5,21 @@ with lib;
55let
66 cfg = config.services.xserver.gdk-pixbuf;
77
8− # Get packages to generate the cache for. We always include gdk_pixbuf.
9− effectivePackages = unique ([pkgs.gdk_pixbuf] ++ cfg.modulePackages);
8+ # Get packages to generate the cache for. We always include gdk-pixbuf.
9+ effectivePackages = unique ([pkgs.gdk-pixbuf] ++ cfg.modulePackages);
1010
1111 # Generate the cache file by running gdk-pixbuf-query-loaders for each
1212 # package and concatenating the results.
1313 loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" { preferLocalBuild = true; } ''
1414 (
1515 for package in ${concatStringsSep " " effectivePackages}; do
16− module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}"
16+ module_dir="$package/${pkgs.gdk-pixbuf.moduleDir}"
1717 if [[ ! -d $module_dir ]]; then
1818 echo "Warning (services.xserver.gdk-pixbuf): missing module directory $module_dir" 1>&2
1919 continue
2020 fi
2121 GDK_PIXBUF_MODULEDIR="$module_dir" \
22− ${pkgs.gdk_pixbuf.dev}/bin/gdk-pixbuf-query-loaders
22+ ${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders
2323 done
2424 ) > "$out"
2525 '';
nixos/tests/gdk-pixbuf.nix+2−2
@@ -3,12 +3,12 @@ import ./make-test.nix ({ pkgs, ... }: {
33 name = "gdk-pixbuf";
44
55 meta = {
6− maintainers = pkgs.gdk_pixbuf.meta.maintainers;
6+ maintainers = pkgs.gdk-pixbuf.meta.maintainers;
77 };
88
99 machine = { pkgs, ... }: {
1010 environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
11− environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];
11+ environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk-pixbuf.installedTests}/share" ];
1212
1313 # Tests allocate a lot of memory trying to exploit a CVE
1414 # but qemu-system-i386 has a 2047M memory limit
nixos/tests/ostree.nix+1−1
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
1212 gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ]))
1313 ];
1414
15− environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests
15+ environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk-pixbuf atk ]); # for GJS tests
1616 };
1717
1818 testScript = ''
pkgs/applications/altcoins/exodus/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2,
2−atk, cairo, gdk_pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
2+atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
33cups, vivaldi-ffmpeg-codecs, libpulseaudio }:
44
55stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 gnome2.pango
3939 atk
4040 cairo
41− gdk_pixbuf
41+ gdk-pixbuf
4242 xorg.libX11
4343 xorg.libxcb
4444 xorg.libXcomposite
pkgs/applications/altcoins/parity-ui/env.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
2−, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
2+, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
33, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }:
44
55let
66 packages = [
77 stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
8− fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
8+ fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss
99 xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
1010 xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
1111 xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
pkgs/applications/audio/amarok/default.nix+2−2
@@ -3,7 +3,7 @@
33, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
44, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
55, fftw, phonon, plasma-framework, threadweaver
6−, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
6+, curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
77}:
88
99let
@@ -29,7 +29,7 @@ in mkDerivation {
2929 qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
3030 karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
3131 phonon plasma-framework threadweaver
32− curl fftw ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
32+ curl fftw ffmpeg gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
3333 pcre snappy taglib taglib_extras
3434 ];
3535
pkgs/applications/audio/audacious/qt-5.nix+2−2
@@ -2,7 +2,7 @@
22 mkDerivation, lib, fetchurl, fetchpatch,
33 gettext, pkgconfig,
44 qtbase,
5− alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
5+ alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
66 libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug,
77 libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
88 libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
@@ -45,7 +45,7 @@ mkDerivation {
4545 qtbase
4646
4747 # Plugin dependencies
48− alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
48+ alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
4949 libcdio libcue libjack2 libmad libmms libmodplug libmowgli
5050 libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
5151 libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf
1+{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf
22, wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg
33, libbsd, libjack2, libpng, ffmpeg
44, libxkbcommon
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 dontWrapGApps = true; # we only want $gappsWrapperArgs here
2323
2424 buildInputs = with xorg; [
25− alsaLib bzip2.out cairo freetype gdk_pixbuf gtk2 gtk3 harfbuzz libX11 libXau
25+ alsaLib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau
2626 libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb
2727 libxkbfile pixman xcbutil xcbutilwm zlib
2828 ];
pkgs/applications/audio/cmusfm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk_pixbuf }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }:
22
33stdenv.mkDerivation rec {
44 version = "2018-10-11";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 # building
1313 configureFlags = [ "--enable-libnotify" ];
1414 nativeBuildInputs = [ autoreconfHook pkgconfig ];
15− buildInputs = [ curl libnotify gdk_pixbuf ];
15+ buildInputs = [ curl libnotify gdk-pixbuf ];
1616
1717 meta = with stdenv.lib; {
1818 description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player";
pkgs/applications/audio/faust/faust2alsa.nix+2−2
@@ -4,7 +4,7 @@
44, cairo
55, fontconfig
66, freetype
7−, gdk_pixbuf
7+, gdk-pixbuf
88, glib
99, gtk2
1010, pango
@@ -20,7 +20,7 @@ faust.wrapWithBuildEnv {
2020 cairo
2121 fontconfig
2222 freetype
23− gdk_pixbuf
23+ gdk-pixbuf
2424 glib
2525 gtk2
2626 pango
pkgs/applications/audio/google-play-music-desktop-player/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
2−, fetchurl, GConf, gdk_pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
2+, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
33, nss, pango, udev, xorg
44}:
55
@@ -16,7 +16,7 @@ let
1616 fontconfig
1717 freetype
1818 GConf
19− gdk_pixbuf
19+ gdk-pixbuf
2020 glib
2121 gtk2
2222 gtk3
pkgs/applications/audio/gtkpod/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
22 gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl,
3− libvorbis, gdk_pixbuf }:
3+ libvorbis, gdk-pixbuf }:
44
55stdenv.mkDerivation rec {
66 version = "2.1.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
1515 buildInputs = [
1616 curl gettext
17− flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
17+ flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf
1818 gdl gnome3.adwaita-icon-theme gnome3.anjuta
1919 ] ++ (with perlPackages; [ perl XMLParser ]);
2020
pkgs/applications/audio/mpg123/default.nix+2−2
@@ -3,11 +3,11 @@
33}:
44
55stdenv.mkDerivation rec {
6− name = "mpg123-1.25.10";
6+ name = "mpg123-1.25.11";
77
88 src = fetchurl {
99 url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
10− sha256 = "08vhp8lz7d9ybhxcmkq3adwfryhivfvp0745k4r9kgz4wap3f4vc";
10+ sha256 = "1cpal2zsm3zgi6f48vvwpg6wgkv42ndi7lk3zsg7sz52z83k61nz";
1111 };
1212
1313 buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
pkgs/applications/audio/quodlibet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk_pixbuf,
1+{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf,
22 tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection,
33 gst_all_1, withGstPlugins ? true,
44 xineBackend ? false, xineLib,
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
2020
2121 checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
2222
23− buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
23+ buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
2424 ++ (if xineBackend then [ xineLib ] else with gst_all_1;
2525 [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
2626
pkgs/applications/audio/reaper/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, autoPatchelfHook, makeWrapper
22, alsaLib, xorg
3−, gtk3, pango, gdk_pixbuf, cairo, glib, freetype
3+, gtk3, pango, gdk-pixbuf, cairo, glib, freetype
44, libpulseaudio, xdg_utils
55}:
66
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 xorg.libX11
2222 xorg.libXi
2323
24− gdk_pixbuf
24+ gdk-pixbuf
2525 pango
2626 cairo
2727 glib
pkgs/applications/audio/spotify/default.nix+2−2
@@ -1,5 +1,5 @@
11{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
2−, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
2+, glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
33, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
44, at-spi2-atk, at-spi2-core, apulse
55}:
@@ -34,7 +34,7 @@ let
3434 ffmpeg_3
3535 fontconfig
3636 freetype
37− gdk_pixbuf
37+ gdk-pixbuf
3838 glib
3939 gtk2
4040 libgcrypt
pkgs/applications/audio/transcribe/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk_pixbuf
1+{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf
22, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }:
33
44stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 dontPatchELF = true;
2626
2727 libPath = with gst_all_1; stdenv.lib.makeLibraryPath [
28− stdenv.cc.cc glib gtk3 atk pango cairo gdk_pixbuf alsaLib
28+ stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib
2929 libX11 libSM libpng12 gstreamer gst-plugins-base zlib
3030 ];
3131
pkgs/applications/backup/crashplan/crashplan-small-business.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
2− procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype,
2+ procps, which, gtk2, atk, glib, pango, gdk-pixbuf, cairo, freetype,
33 fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
44 libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
55 libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
8686 postFixup = ''
8787 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
8888 wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
89− stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype
89+ stdenv.cc.cc.lib gtk2 atk glib pango gdk-pixbuf cairo freetype
9090 fontconfig dbus gconf nss nspr alsaLib cups expat udev
9191 libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
9292 libXext libXfixes libXrender libXtst libXScrnSaver]}"
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchgit, pkgconfig
22, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
3−, gtk3, vala, cmake, libgee, libX11, lightdm, gdk_pixbuf, clutter-gtk }:
3+, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }:
44
55stdenv.mkDerivation rec {
66 version = "0.2.1";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 libX11
2424 lightdm
2525 libXdmcp
26− gdk_pixbuf
26+ gdk-pixbuf
2727 clutter-gtk
2828 libxklavier
2929 at-spi2-core
pkgs/applications/editors/atom/env.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
2−, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
2+, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
33, gconf, nss, xorg, libcap, systemd, libnotify, libsecret
44}:
55
66let
77 packages = [
88 stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3
9− fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
9+ fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
1010 xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
1111 xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
1212 xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
pkgs/applications/editors/brackets/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
1+{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
22, cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }:
33with stdenv.lib;
44
55let
66 bracketsLibs = makeLibraryPath [
7− gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat
7+ gtk2 glib gdk-pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat
88 ];
99in
1010stdenv.mkDerivation rec {
pkgs/applications/editors/lighttable/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
2−, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf
2+, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
33, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
44}:
55
66let
77 libPath = stdenv.lib.makeLibraryPath [
88 stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
9− fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf
9+ fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf
1010 xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
1111 xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
1212 xorg.libXcursor
pkgs/applications/editors/rednotebook/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, buildPythonApplication, fetchFromGitHub
2−, gdk_pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
2+, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
33, pygobject3, pyyaml
44}:
55
@@ -20,7 +20,7 @@ buildPythonApplication rec {
2020 nativeBuildInputs = [ gobject-introspection ];
2121
2222 propagatedBuildInputs = [
23− gdk_pixbuf glib gtk3 gtksourceview pango webkitgtk
23+ gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk
2424 pygobject3 pyyaml
2525 ];
2626
pkgs/applications/editors/vim/common.nix+2−2
@@ -1,12 +1,12 @@
11{ lib, fetchFromGitHub }:
22rec {
3− version = "8.1.1432";
3+ version = "8.1.1547";
44
55 src = fetchFromGitHub {
66 owner = "vim";
77 repo = "vim";
88 rev = "v${version}";
9− sha256 = "0f8isi84dcmsfvvjzayys57zf4j56wngnpn9hfj0jn1z7x3vdbww";
9+ sha256 = "01v35wq8wjrbzmdf5r02gp0sfa9yyfswsi3fqzn94cd68qhskkpr";
1010 };
1111
1212 enableParallelBuilding = true;
pkgs/applications/graphics/avocode/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, makeDesktopItem, fetchurl, unzip
2−, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
2+, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
33, xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid
44}:
55
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 libPath = stdenv.lib.makeLibraryPath (with xorg; [
1616 stdenv.cc.cc.lib
17− gdk_pixbuf
17+ gdk-pixbuf
1818 glib
1919 gtk3
2020 atk
pkgs/applications/graphics/drawio/default.nix+2−2
@@ -2,7 +2,7 @@
22
33# Dynamic libraries
44, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat
5−, gdk_pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
5+, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
66, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst
77, libxcb, libuuid, nspr, nss, pango
88
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 cups
3434 dbus
3535 expat
36− gdk_pixbuf
36+ gdk-pixbuf
3737 glib
3838 gtk3
3939 libX11
pkgs/applications/graphics/gimp/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, substituteAll, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
1+{ stdenv, fetchurl, substituteAll, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk-pixbuf, isocodes
22, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff
33, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
44, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919 nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];
2020 propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
2121 buildInputs = [
22− babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes
22+ babl gegl gtk2 glib gdk-pixbuf pango cairo gexiv2 harfbuzz isocodes
2323 freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
2424 libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif
2525 python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
3030 pythonPath = [ pygtk ];
3131
3232 # Check if librsvg was built with --disable-pixbuf-loader.
33− PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk_pixbuf.moduleDir}";
33+ PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
3434
3535 preConfigure = ''
3636 # The check runs before glib-networking is registered
pkgs/applications/graphics/giv/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib
1+{ stdenv, fetchFromGitHub, gdk-pixbuf, scons, pkgconfig, gtk2, glib
22, pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
33
44stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 patches = [ ./build.patch ];
2323
2424 nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
25− buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
25+ buildInputs = [ gdk-pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
2626
2727 meta = with stdenv.lib; {
2828 description = "Cross platform image and hierarchical vector viewer based";
pkgs/applications/graphics/mypaint/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobject-introspection, hicolor-icon-theme
2−, gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
2+, gdk-pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
33
44let
55 inherit (python2Packages) python pycairo pygobject3 numpy;
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121 ];
2222
2323 buildInputs = [
24− gtk3 gdk_pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme
24+ gtk3 gdk-pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme
2525 ];
2626
2727 propagatedBuildInputs = [ numpy ];
pkgs/applications/graphics/pencil/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, lib, makeWrapper,
22 # build dependencies
33 alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
4− freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
4+ freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg,
55 glibc, systemd
66}:
77
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
4848 expat
4949 fontconfig
5050 freetype
51− gdk_pixbuf
51+ gdk-pixbuf
5252 glib
5353 gnome2.GConf
5454 gnome2.gtk
pkgs/applications/graphics/rapid-photo-downloader/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, python3Packages
22, file, intltool, gobject-introspection, libgudev
33, udisks, gexiv2, gst_all_1, libnotify
4−, exiftool, gdk_pixbuf, libmediainfo, vmtouch
4+, exiftool, gdk-pixbuf, libmediainfo, vmtouch
55}:
66
77python3Packages.buildPythonApplication rec {
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
3333 # NOTE: Without gobject-introspection in buildInputs, launching fails with
3434 # "Namespace [Notify / GExiv2 / GUdev] not available"
3535 buildInputs = [
36− gdk_pixbuf
36+ gdk-pixbuf
3737 gexiv2
3838 gobject-introspection
3939 gst_all_1.gst-libav
pkgs/applications/graphics/shotwell/default.nix+2−2
@@ -24,7 +24,7 @@
2424, librest
2525, gettext
2626, desktop-file-utils
27−, gdk_pixbuf
27+, gdk-pixbuf
2828, librsvg
2929, wrapGAppsHook
3030, gobject-introspection
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
7777 libraw
7878 json-glib
7979 glib
80− gdk_pixbuf
80+ gdk-pixbuf
8181 librsvg
8282 librest
8383 gcr
pkgs/applications/graphics/shutter/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
1+{ stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk-pixbuf, librsvg
22, hicolor-icon-theme, procps
33}:
44
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 };
2323
2424 nativeBuildInputs = [ makeWrapper ];
25− buildInputs = [ perlPackages.perl procps gdk_pixbuf librsvg ] ++ perlModules;
25+ buildInputs = [ perlPackages.perl procps gdk-pixbuf librsvg ] ++ perlModules;
2626
2727 installPhase = ''
2828 mkdir -p "$out"
pkgs/applications/graphics/viewnior/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms
2−, intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}:
2+, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
33
44stdenv.mkDerivation rec {
55 name = "viewnior-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ autoreconfHook ];
1616 buildInputs =
1717 [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
18− shared-mime-info glib gdk_pixbuf perl
18+ shared-mime-info glib gdk-pixbuf perl
1919 ];
2020
2121 preFixup = ''
pkgs/applications/misc/adobe-reader/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
2−, gdk_pixbuf }:
2+, gdk-pixbuf }:
33
44assert stdenv.hostPlatform.system == "i686-linux";
55
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020 # versions.
2121
2222 libPath = stdenv.lib.makeLibraryPath
23− [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk_pixbuf ];
23+ [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf ];
2424
2525 passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
2626
pkgs/applications/misc/airtame/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
22, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype
3−, gdk_pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
3+, gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
44, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
55, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264
66}:
77
88let libPath = lib.makeLibraryPath [
9− alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk_pixbuf
9+ alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk-pixbuf
1010 glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264
1111 libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
1212 libXi libXrandr libXrender libXtst libpulseaudio libxcb
pkgs/applications/misc/batti/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl
22, pkgconfig, gettext, pythonPackages
3−, gtk2, gdk_pixbuf, upower
3+, gtk2, gdk-pixbuf, upower
44, makeWrapper }:
55
66let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
1616 };
1717
1818 buildInputs = with stdenv.lib;
19− [ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ];
19+ [ pkgconfig gettext python gtk2 pygtk dbus-python gdk-pixbuf upower makeWrapper ];
2020
2121 dontConfigure = true;
2222
pkgs/applications/misc/dunst/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchFromGitHub, makeWrapper
22, pkgconfig, which, perl, libXrandr
3−, cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
3+, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
44, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
55}:
66
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ];
1919
2020 buildInputs = [
21− cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
21+ cairo dbus gdk-pixbuf glib libX11 libXScrnSaver
2222 libXinerama libnotify pango xorgproto librsvg libXrandr
2323 ];
2424
pkgs/applications/misc/et/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk_pixbuf }:
1+{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }:
22
33stdenv.mkDerivation rec {
44 name = "et-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc";
1212 };
1313
14− buildInputs = [ libnotify gdk_pixbuf ];
14+ buildInputs = [ libnotify gdk-pixbuf ];
1515 nativeBuildInputs = [ pkgconfig ];
1616
1717 installPhase = ''
pkgs/applications/misc/evilvte/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchgit, makeWrapper, pkgconfig,
2− gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
2+ gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
33 configH ? ""
44}:
55
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 };
1515
1616 buildInputs = [
17− gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11
17+ gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11
1818 xorg.xorgproto xorg.libXext makeWrapper pkgconfig
1919 ];
2020
pkgs/applications/misc/green-pdfviewer/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk2 }:
1+{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }:
22
33stdenv.mkDerivation rec {
44 name = "green-pdfviewer-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig ];
15− buildInputs = [ poppler gdk_pixbuf SDL gtk2 ];
15+ buildInputs = [ poppler gdk-pixbuf SDL gtk2 ];
1616
1717 patches = [
1818 ./gdk-libs.patch
pkgs/applications/misc/hyper/default.nix+2−2
@@ -1,11 +1,11 @@
1−{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, gtk2, cairo
1+{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk2, cairo
22, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
33, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
44, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
55
66let
77 libPath = stdenv.lib.makeLibraryPath [
8− stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
8+ stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
99 libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
1010 libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
1111 ];
pkgs/applications/misc/kiwix/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, makeWrapper, pkgconfig
22, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
33, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
4−, gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
4+, gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
55, xapian, ctpp2, zimlib
66}:
77
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
9393
9494 rm $out/bin/kiwix
9595 makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
96− --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
96+ --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk-pixbuf pango cairo freetype fontconfig alsaLib atk]} \
9797 --suffix PATH : ${aria2}/bin
9898 '';
9999
pkgs/applications/misc/lutris/default.nix+2−2
@@ -1,6 +1,6 @@
11{ buildPythonApplication, lib, fetchFromGitHub
22, wrapGAppsHook, gobject-introspection, gnome-desktop, libnotify, libgnome-keyring, pango
3−, gdk_pixbuf, atk, webkitgtk, gst_all_1
3+, gdk-pixbuf, atk, webkitgtk, gst_all_1
44, evdev, pyyaml, pygobject3, requests, pillow
55, xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma
66, libstrangle, wine, fluidsynth, xorgserver
@@ -42,7 +42,7 @@ in buildPythonApplication rec {
4242
4343 buildInputs = [
4444 wrapGAppsHook gobject-introspection gnome-desktop libnotify libgnome-keyring pango
45− gdk_pixbuf atk webkitgtk
45+ gdk-pixbuf atk webkitgtk
4646 ] ++ gstDeps;
4747
4848 makeWrapperArgs = [
pkgs/applications/misc/mako/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc
2−, systemd, pango, cairo, gdk_pixbuf
2+, systemd, pango, cairo, gdk-pixbuf
33, wayland, wayland-protocols }:
44
55stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 };
1515
1616 nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ];
17− buildInputs = [ systemd pango cairo gdk_pixbuf wayland ];
17+ buildInputs = [ systemd pango cairo gdk-pixbuf wayland ];
1818
1919 mesonFlags = [ "-Dzsh-completions=true" ];
2020
pkgs/applications/misc/mlterm/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem
2−, libX11, gdk_pixbuf, cairo, libXft, gtk3, vte
2+, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
33, harfbuzz #substituting glyphs with opentype fonts
44, fribidi, m17n_lib #bidi and encoding
55, openssl, libssh2 #build-in ssh
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ pkgconfig autoconf ];
1818 buildInputs = [
19− libX11 gdk_pixbuf.dev cairo libXft gtk3 vte
19+ libX11 gdk-pixbuf.dev cairo libXft gtk3 vte
2020 harfbuzz fribidi m17n_lib openssl libssh2
2121 ];
2222
pkgs/applications/misc/navit/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2
22, SDL_image, libGLU_combined, libXmu, freeglut, pcre, dbus, dbus-glib, glib
3−, librsvg, freeimage, libxslt, cairo, gdk_pixbuf, pango
3+, librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango
44, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc
55, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper
66, qtquickcontrols, qtmultimedia, qtspeech, qtsensors
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 gtk2 fontconfig freetype imlib2 libGLU_combined freeimage
5050 libxslt libXmu freeglut python gettext quesoglc gd
5151 fribidi pcre dbus dbus-glib librsvg shapelib glib
52− cairo gdk_pixbuf pango atk
52+ cairo gdk-pixbuf pango atk
5353 ] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ]
5454 ++ optional postgresqlSupport postgresql
5555 ++ optional speechdSupport speechd
pkgs/applications/misc/plank/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
22, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
3−, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
3+, bamf, gdk-pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
44, wrapGAppsHook, autoreconfHook, pantheon }:
55
66stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 atk
2727 bamf
2828 cairo
29− gdk_pixbuf
29+ gdk-pixbuf
3030 glib
3131 gnome-menus
3232 gnome3.dconf
pkgs/applications/misc/polar-bookshelf/default.nix+5−5
@@ -1,6 +1,6 @@
11{ stdenv, lib, makeWrapper, fetchurl
22, dpkg, wrapGAppsHook, autoPatchelfHook
3−, gtk3, cairo, gnome2, atk, gdk_pixbuf, glib
3+, gtk3, cairo, gnome2, atk, gdk-pixbuf, glib
44, at-spi2-atk, dbus, libX11, libxcb, libXi
55, libXcursor, libXdamage, libXrandr, libXcomposite
66, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 cairo
2626 gnome2.pango
2727 atk
28− gdk_pixbuf
28+ gdk-pixbuf
2929 at-spi2-atk
3030 dbus
3131 libX11
@@ -48,10 +48,10 @@ stdenv.mkDerivation rec {
4848 expat
4949 ];
5050
51− nativeBuildInputs = [
51+ nativeBuildInputs = [
5252 wrapGAppsHook
5353 autoPatchelfHook
54− makeWrapper
54+ makeWrapper
5555 dpkg
5656 ];
5757
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
7070 mv usr/share/* $out/share/
7171
7272 ln -s $out/share/polar-bookshelf/polar-bookshelf $out/bin/polar-bookshelf
73−
73+
7474 # Correct desktop file `Exec`
7575 substituteInPlace $out/share/applications/polar-bookshelf.desktop \
7676 --replace "/opt/Polar Bookshelf/polar-bookshelf" "$out/bin/polar-bookshelf"
pkgs/applications/misc/roxterm/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat
2−, gsettings-desktop-schemas, gdk_pixbuf, gtk3, hicolor-icon-theme
2+, gsettings-desktop-schemas, gdk-pixbuf, gtk3, hicolor-icon-theme
33, imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper
44, pkgconfig, python, pythonPackages, vte
55, wrapGAppsHook}:
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323 buildInputs =
2424 [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
2525 makeWrapper python pythonPackages.lockfile dbus dbus-glib
26− gdk_pixbuf gsettings-desktop-schemas gtk3
26+ gdk-pixbuf gsettings-desktop-schemas gtk3
2727 hicolor-icon-theme vte ];
2828
2929 NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
pkgs/applications/misc/rxvt_unicode/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, makeDesktopItem, perlSupport ? true, libX11, libXt, libXft,
22 ncurses, perl, fontconfig, freetype, pkgconfig, libXrender,
3− gdkPixbufSupport ? true, gdk_pixbuf, unicode3Support ? true }:
3+ gdkPixbufSupport ? true, gdk-pixbuf, unicode3Support ? true }:
44
55let
66 pname = "rxvt-unicode";
@@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
3131 [ libX11 libXt libXft ncurses /* required to build the terminfo file */
3232 fontconfig freetype pkgconfig libXrender ]
3333 ++ stdenv.lib.optional perlSupport perl
34− ++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf;
34+ ++ stdenv.lib.optional gdkPixbufSupport gdk-pixbuf;
3535
3636 outputs = [ "out" "terminfo" ];
3737
pkgs/applications/misc/safeeyes/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg
1+{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
22}:
33
44let inherit (python3Packages) python buildPythonApplication fetchPypi;
@@ -50,7 +50,7 @@ in buildPythonApplication rec {
5050
5151 preFixup = ''
5252 gappsWrapperArgs+=(
53− --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
53+ --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
5454 --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
5555 --prefix XDG_DATA_DIRS : "${librsvg}/share"
5656
pkgs/applications/misc/simplenote/default.nix+2−2
@@ -1,5 +1,5 @@
11{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
2−, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
2+, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
33, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }:
44
55stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 packages = [
1818 stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
19− fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
19+ fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss
2020 xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
2121 xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
2222 xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf
pkgs/applications/misc/stretchly/default.nix+2−2
@@ -8,7 +8,7 @@
88, expat
99, fetchurl
1010, fontconfig
11−, gdk_pixbuf
11+, gdk-pixbuf
1212, glib
1313, gtk2
1414, gtk3
@@ -51,7 +51,7 @@ let
5151 dbus
5252 expat
5353 fontconfig
54− gdk_pixbuf
54+ gdk-pixbuf
5555 glib
5656 gtk2
5757 gtk3
pkgs/applications/misc/terminus/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo
1+{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk-pixbuf, cairo
22, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
33, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
44, libxcb, makeWrapper, nodejs
@@ -6,7 +6,7 @@
66
77let
88 libPath = stdenv.lib.makeLibraryPath [
9− stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
9+ stdenv.cc.cc gtk2 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
1010 libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
1111 libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio
1212 ];
pkgs/applications/misc/volnoti/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, fetchpatch
2−, pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg
2+, pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg
33, dbus-glib, autoreconfHook, wrapGAppsHook }:
44
55stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
2626
2727 buildInputs = [
28− dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg
28+ dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg
2929 ];
3030
3131 meta = with stdenv.lib; {
pkgs/applications/misc/xneur/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib
2−, xosd, libnotify, enchant, wrapGAppsHook, gdk_pixbuf }:
2+, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
33
44stdenv.mkDerivation rec {
55 name = "xneur-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 buildInputs = [
1818 xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib
1919 xosd xorg.libXext xorg.libXi libnotify
20− enchant gdk_pixbuf
20+ enchant gdk-pixbuf
2121 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
2222 ];
2323
pkgs/applications/misc/xxkb/default.nix+3−3
@@ -1,9 +1,9 @@
11{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep
2−, svgSupport ? false, librsvg, glib, gdk_pixbuf, pkgconfig
2+, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkgconfig
33}:
44
55assert svgSupport ->
6− librsvg != null && glib != null && gdk_pixbuf != null && pkgconfig != null;
6+ librsvg != null && glib != null && gdk-pixbuf != null && pkgconfig != null;
77
88stdenv.mkDerivation rec {
99 name = "xxkb-1.11.1";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 nativeBuildInputs = [ imake gccmakedep ];
1717 buildInputs = [
1818 libX11 libXt libXext libXpm
19− ] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk_pixbuf pkgconfig ];
19+ ] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkgconfig ];
2020
2121 outputs = [ "out" "man" ];
2222
pkgs/applications/networking/browsers/brave/default.nix+2−2
@@ -10,7 +10,7 @@
1010, expat
1111, fontconfig
1212, freetype
13−, gdk_pixbuf
13+, gdk-pixbuf
1414, glib
1515, gnome2
1616, gnome3
@@ -52,7 +52,7 @@ rpath = lib.makeLibraryPath [
5252 expat
5353 fontconfig
5454 freetype
55− gdk_pixbuf
55+ gdk-pixbuf
5656 glib
5757 gnome2.GConf
5858 gtk3
pkgs/applications/networking/browsers/firefox-bin/default.nix+2−2
@@ -9,7 +9,7 @@
99, fontconfig
1010, freetype
1111, gconf
12−, gdk_pixbuf
12+, gdk-pixbuf
1313, glib
1414, glibc
1515, gtk2
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
104104 fontconfig
105105 freetype
106106 gconf
107− gdk_pixbuf
107+ gdk-pixbuf
108108 glib
109109 glibc
110110 gtk2
pkgs/applications/networking/browsers/google-chrome/default.nix+2−2
@@ -4,7 +4,7 @@
44, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
55, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
66, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
7−, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
7+, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
88, kerberos
99
1010# command line arguments which are always set e.g "--disable-gpu"
@@ -52,7 +52,7 @@ let
5252 glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
5353 libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
5454 alsaLib libXdamage libXtst libXrandr expat cups
55− dbus gdk_pixbuf gcc-unwrapped.lib
55+ dbus gdk-pixbuf gcc-unwrapped.lib
5656 systemd
5757 libexif
5858 liberation_ttf curl utillinux xdg_utils wget
pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, xorg, gtk2, glib, gdk_pixbuf, dpkg, libXext, libXfixes
1+{ stdenv, fetchurl, xorg, gtk2, glib, gdk-pixbuf, dpkg, libXext, libXfixes
22, libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio
33}:
44
@@ -10,7 +10,7 @@ let
1010 [gtk2 glib stdenv.cc.cc];
1111
1212 rpathPlugin = makeLibraryPath
13− ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid);
13+ ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk-pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid);
1414
1515in
1616
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+2−2
@@ -9,7 +9,7 @@
99, expat
1010, fontconfig
1111, freetype
12−, gdk_pixbuf
12+, gdk-pixbuf
1313, glib
1414, glibc
1515, graphite2
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
130130
131131 rpath = lib.makeLibraryPath
132132 [ stdenv.cc.cc
133− alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib
133+ alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
134134 glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
135135 libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
136136 libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+2−2
@@ -9,7 +9,7 @@
99, expat
1010, fontconfig
1111, freetype
12−, gdk_pixbuf
12+, gdk-pixbuf
1313, glib
1414, glibc
1515, graphite2
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
8686
8787 rpath = lib.makeLibraryPath
8888 [ stdenv.cc.cc
89− alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib
89+ alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
9090 glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
9191 libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
9292 libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, libGL, xorg, cairo
2−, libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl
2+, libpng, gtk2, glib, gdk-pixbuf, fontconfig, freetype, curl
33, dbus-glib, alsaLib, libpulseaudio, systemd, pango
44}:
55
@@ -24,7 +24,7 @@ let
2424 ];
2525
2626 rpathProgram = makeLibraryPath
27− [ gdk_pixbuf
27+ [ gdk-pixbuf
2828 glib
2929 gtk2
3030 xorg.libX11
pkgs/applications/networking/browsers/opera/default.nix+2−2
@@ -9,7 +9,7 @@
99, fetchurl
1010, fontconfig
1111, freetype
12−, gdk_pixbuf
12+, gdk-pixbuf
1313, glib
1414, gnome2
1515, gtk3
@@ -55,7 +55,7 @@ let
5555 expat.out
5656 fontconfig.lib
5757 freetype.out
58− gdk_pixbuf.out
58+ gdk-pixbuf.out
5959 glib.out
6060 gnome2.GConf
6161 gtk3.out
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+2−2
@@ -12,7 +12,7 @@
1212, dbus-glib
1313, fontconfig
1414, freetype
15−, gdk_pixbuf
15+, gdk-pixbuf
1616, glib
1717, gtk3
1818, libxcb
@@ -67,7 +67,7 @@ let
6767 dbus-glib
6868 fontconfig
6969 freetype
70− gdk_pixbuf
70+ gdk-pixbuf
7171 glib
7272 gtk3
7373 libxcb
pkgs/applications/networking/browsers/vivaldi/default.nix+2−2
@@ -4,7 +4,7 @@
44, freetype, fontconfig, libXft, libXrender, libxcb, expat
55, libuuid
66, gstreamer, gst-plugins-base, libxml2
7−, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
7+, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
88, nss, nspr
99, patchelf, makeWrapper
1010, isSnapshot ? false
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
3434 buildInputs = [
3535 stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
3636 libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
37− atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
37+ atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd
3838 freetype fontconfig libXrender libuuid expat glib nss nspr
3939 gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
4040 ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
pkgs/applications/networking/dropbox/cli.nix+2−2
@@ -6,7 +6,7 @@
66, dropbox
77, gtk3
88, gnome3
9−, gdk_pixbuf
9+, gdk-pixbuf
1010, gobject-introspection
1111}:
1212
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
3636 nativeBuildInputs = [
3737 pkgconfig
3838 gobject-introspection
39− gdk_pixbuf
39+ gdk-pixbuf
4040 # only for build, the install command also wants to use GTK through introspection
4141 # but we are using Nix for installation so we will not need that.
4242 (python3.withPackages (ps: with ps; [
pkgs/applications/networking/instant-messengers/bluejeans/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, rpmextract, patchelf, libnotify, libcap, cairo, pango, fontconfig, udev, dbus
2−, gtk2, atk, expat, gdk_pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage
2+, gtk2, atk, expat, gdk-pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage
33, libXi, libXext, libXfixes, libXcomposite, alsaLib, bash
44}:
55
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 libPath =
1919 stdenv.lib.makeLibraryPath
20− [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk_pixbuf dbus udev.lib
20+ [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk-pixbuf dbus udev.lib
2121 freetype nspr glib stdenv.cc stdenv.cc.cc.lib nss gconf libX11 libXrender libXtst libXdamage
2222 libXi libXext libXfixes libXcomposite alsaLib
2323 ];
pkgs/applications/networking/instant-messengers/coyim/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
2− cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
2+ cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
33
44buildGoPackage rec {
55 name = "coyim-${version}";
@@ -14,7 +14,7 @@ buildGoPackage rec {
1414 sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3";
1515 };
1616
17− nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ];
17+ nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ];
1818
1919 meta = with stdenv.lib; {
2020 description = "a safe and secure chat client";
pkgs/applications/networking/instant-messengers/dino/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub
22, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
3−, gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
3+, gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking
44, xorg, libXdmcp, libxkbcommon
55, libnotify, libsoup, libgee
66, libgcrypt
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242 libgee
4343 gnome3.adwaita-icon-theme
4444 sqlite
45− gdk_pixbuf
45+ gdk-pixbuf
4646 gtk3
4747 libnotify
4848 gpgme
pkgs/applications/networking/instant-messengers/discord/base.nix+2−2
@@ -1,7 +1,7 @@
11{ pname, version, src, binaryName, desktopName
22, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
33, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
4−, gdk_pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
4+, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
55, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
66, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
77
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
1717 libPath = stdenv.lib.makeLibraryPath [
1818 libcxx systemd libpulseaudio
1919 stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
20− gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
20+ gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
2121 libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
2222 libXtst nspr nss libxcb pango systemd libXScrnSaver
2323 ];
pkgs/applications/networking/instant-messengers/fractal/default.nix+2−2
@@ -19,7 +19,7 @@
1919, sqlite
2020, gst_all_1
2121, cairo
22−, gdk_pixbuf
22+, gdk-pixbuf
2323, gspell
2424, wrapGAppsHook
2525}:
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
5252 buildInputs = [
5353 cairo
5454 dbus
55− gdk_pixbuf
55+ gdk-pixbuf
5656 glib
5757 gspell
5858 gst_all_1.gst-editing-services
pkgs/applications/networking/instant-messengers/franz/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeWrapper, wrapGAppsHook, autoPatchelfHook, dpkg
2−, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3
2+, xorg, atk, glib, pango, gdk-pixbuf, cairo, freetype, fontconfig, gtk3
33, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
44
55let
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919 libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
2020 libXrender libX11 libXtst libXScrnSaver
2121 ]) ++ [
22− gtk3 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
22+ gtk3 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
2323 gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
2424 ];
2525 runtimeDependencies = [ udev.lib libnotify ];
pkgs/applications/networking/instant-messengers/gitter/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl
2−, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk3, libX11
2+, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libX11
33, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
44, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
55, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss
@@ -12,7 +12,7 @@ let gitterDirectorySuffix = "opt/gitter";
1212 $out/${gitterDirectorySuffix}/${target}
1313 '';
1414 libPath = stdenv.lib.makeLibraryPath [
15− alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib
15+ alsaLib atk cairo cups dbus expat fontconfig freetype gdk-pixbuf glib
1616 gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage
1717 libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3
1818 libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd
pkgs/applications/networking/instant-messengers/linphone/default.nix+2−2
@@ -2,7 +2,7 @@
22, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
33, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp
44, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
5−, libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl
5+, libmatroska, bcunit, doxygen, gdk-pixbuf, glib, cairo, pango, polarssl
66, python, graphviz, belcard
77, withGui ? true
88}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 buildInputs = [
2929 readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
3030 polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
31− bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard
31+ bctoolbox libmatroska bcunit gdk-pixbuf glib cairo pango bzrtp belcard
3232 ];
3333
3434 nativeBuildInputs = [
pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib,
1+{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib,
22freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
33libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
44libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
@@ -12,7 +12,7 @@ let
1212 expat
1313 fontconfig
1414 freetype
15− gdk_pixbuf
15+ gdk-pixbuf
1616 glib
1717 gnome2.GConf
1818 gtk3
pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus
1+{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk-pixbuf, glib, dbus
22, dbus-glib }:
33
44stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
3131
3232 nativeBuildInputs = [ pkgconfig ];
33− buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus-glib ];
33+ buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ];
3434
3535 meta = {
3636 homepage = https://github.com/novas0x2a/skype4pidgin;
pkgs/applications/networking/instant-messengers/profanity/default.nix+3−3
@@ -4,14 +4,14 @@
44, autoconf-archive
55
66, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
7−, notifySupport ? true, libnotify ? null, gdk_pixbuf ? null
7+, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
88, traySupport ? true, gnome2 ? null
99, pgpSupport ? true, gpgme ? null
1010, pythonPluginSupport ? true, python ? null
1111}:
1212
1313assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
14−assert notifySupport -> libnotify != null && gdk_pixbuf != null;
14+assert notifySupport -> libnotify != null && gdk-pixbuf != null;
1515assert traySupport -> gnome2 != null;
1616assert pgpSupport -> gpgme != null;
1717assert pythonPluginSupport -> python != null;
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 expect readline libuuid glib openssl expat ncurses libotr
4242 curl libmesode cmocka libmicrohttpd stabber
4343 ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
44− ++ optionals notifySupport [ libnotify gdk_pixbuf ]
44+ ++ optionals notifySupport [ libnotify gdk-pixbuf ]
4545 ++ optionals traySupport [ gnome2.gtk ]
4646 ++ optionals pgpSupport [ gpgme ]
4747 ++ optionals pythonPluginSupport [ python ];
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook
2−, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
2+, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
33, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
44, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
55, cups, expat, udev, libnotify, libuuid
@@ -31,7 +31,7 @@ let
3131 expat
3232 fontconfig
3333 freetype
34− gdk_pixbuf
34+ gdk-pixbuf
3535 glib
3636 gnome2.GConf
3737 gtk3
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, dpkg
2−, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3
2+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3
33, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg
44, at-spi2-atk }:
55
@@ -25,7 +25,7 @@ let
2525 libsecret
2626
2727 gnome2.GConf
28− gdk_pixbuf
28+ gdk-pixbuf
2929 gtk3
3030
3131 gnome3.gnome-keyring
pkgs/applications/networking/instant-messengers/slack/default.nix+2−2
@@ -1,5 +1,5 @@
11{ theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
2−cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf,
2+cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk-pixbuf,
33libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg,
44at-spi2-atk, libuuid, nodePackages
55}:
@@ -21,7 +21,7 @@ let
2121 freetype
2222 glib
2323 gnome2.GConf
24− gdk_pixbuf
24+ gdk-pixbuf
2525 gtk3
2626 pango
2727 libnotify
pkgs/applications/networking/instant-messengers/stride/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
2−, freetype, gdk_pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
2+, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
33let
44 fullPath = stdenv.lib.makeLibraryPath [
55 alsaLib
@@ -10,7 +10,7 @@ let
1010 expat
1111 fontconfig
1212 freetype
13− gdk_pixbuf
13+ gdk-pixbuf
1414 glib
1515 gnome2.GConf
1616 gnome2.gtk
pkgs/applications/networking/instant-messengers/toxic/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, libsodium, ncurses, curl
22, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus
3−, qrencode, gdk_pixbuf, libnotify }:
3+, qrencode, gdk-pixbuf, libnotify }:
44
55stdenv.mkDerivation rec {
66 name = "toxic-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 installFlags = [ "PREFIX=$(out)"];
1818
1919 buildInputs = [
20− libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
20+ libtoxcore libsodium ncurses curl gdk-pixbuf libnotify
2121 ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
2222 openal libopus libvpx freealut qrencode
2323 ];
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix+4−4
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, makeDesktopItem
22
33, alsaLib, at-spi2-atk, atk, cairo, cups, dbus, dpkg, expat, fontconfig
4−, freetype, gdk_pixbuf, glib, gtk3, hunspell, libX11, libXScrnSaver
4+, freetype, gdk-pixbuf, glib, gtk3, hunspell, libX11, libXScrnSaver
55, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr
66, libXrender, libXtst, libnotify, libuuid, nspr, nss, pango, pciutils
77, pulseaudio, udev, xdg_utils, xorg
@@ -18,12 +18,12 @@ let
1818 version = {
1919 "x86_64-linux" = "3.9.2895";
2020 "x86_64-darwin" = "3.9.2943";
21− }.${system} or "";
21+ }.${system};
2222
2323 sha256 = {
2424 "x86_64-linux" = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5";
2525 "x86_64-darwin" = "1y1bzsjmjrj518q29xfx6gg1nhdbaz7y5hzaqrp241az6plp090k";
26− }.${system} or "";
26+ }.${system};
2727
2828 meta = with stdenv.lib; {
2929 description = "A modern, secure messenger for everyone";
@@ -71,7 +71,7 @@ let
7171 nativeBuildInputs = [ dpkg ];
7272 rpath = stdenv.lib.makeLibraryPath [
7373 alsaLib at-spi2-atk atk cairo cups dbus expat fontconfig freetype
74− gdk_pixbuf glib gtk3 hunspell libX11 libXScrnSaver libXcomposite
74+ gdk-pixbuf glib gtk3 hunspell libX11 libXScrnSaver libXcomposite
7575 libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
7676 libXtst libnotify libuuid nspr nss pango pciutils pulseaudio
7777 stdenv.cc.cc udev xdg_utils xorg.libxcb
pkgs/applications/networking/mailreaders/inboxer/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, binutils, patchelf, makeWrapper
2−, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype
2+, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype
33, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
44
55stdenv.mkDerivation rec {
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
4949 xorg.libXtst
5050 xorg.libXScrnSaver
5151 xorg.libxcb
52− gdk_pixbuf
52+ gdk-pixbuf
5353 glib
5454 gnome2.pango
5555 gnome2.GConf
pkgs/applications/networking/mailreaders/mailnag/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, gettext, gtk3, pythonPackages
2−, gdk_pixbuf, libnotify, gst_all_1
2+, gdk-pixbuf, libnotify, gst_all_1
33, libgnome-keyring3
44, wrapGAppsHook, gnome3
55# otherwise passwords are stored unencrypted
@@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec {
1818 };
1919
2020 buildInputs = [
21− gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
21+ gtk3 gdk-pixbuf libnotify gst_all_1.gstreamer
2222 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
2323 gst_all_1.gst-plugins-bad
2424 gnome3.adwaita-icon-theme
pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix+2−2
@@ -10,7 +10,7 @@
1010, fontconfig
1111, freetype
1212, gcc-unwrapped
13−, gdk_pixbuf
13+, gdk-pixbuf
1414, glib
1515, gnome2
1616, libgnome-keyring
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
5353 fontconfig
5454 freetype
5555 gcc-unwrapped
56− gdk_pixbuf
56+ gdk-pixbuf
5757 glib
5858 gnome2.GConf
5959 gnome2.gtk
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+2−2
@@ -10,7 +10,7 @@
1010, dbus
1111, fontconfig
1212, freetype
13−, gdk_pixbuf
13+, gdk-pixbuf
1414, glib
1515, glibc
1616, gst-plugins-base
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
9090 dbus
9191 fontconfig
9292 freetype
93− gdk_pixbuf
93+ gdk-pixbuf
9494 glib
9595 glibc
9696 gst-plugins-base
pkgs/applications/networking/mullvad-vpn/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, makeWrapper, fetchurl, dpkg
22, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
3−, gdk_pixbuf, glib, gnome2, pango, nspr, nss, gtk3
3+, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
44, xorg, autoPatchelfHook, systemd, libnotify
55}:
66
@@ -13,7 +13,7 @@ let deps = [
1313 expat
1414 fontconfig
1515 freetype
16− gdk_pixbuf
16+ gdk-pixbuf
1717 glib
1818 gnome2.GConf
1919 pango
pkgs/applications/networking/p2p/tixati/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk_pixbuf, cairo, pango }:
1+{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }:
22
33stdenv.mkDerivation rec {
44 name = "tixati-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 installPhase = ''
1313 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
14− --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk_pixbuf cairo pango ]} \
14+ --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk-pixbuf cairo pango ]} \
1515 tixati
1616 install -D tixati $out/bin/tixati
1717 install -D tixati.desktop $out/share/applications/tixati.desktop
pkgs/applications/networking/p2p/transgui/default.nix+5−5
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
2−libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:
2+libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }:
33
44stdenv.mkDerivation rec {
55 pname = "transgui";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ pkgconfig ];
1616 buildInputs = [
1717 unzip fpc lazarus stdenv.cc
18− libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl
18+ libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl
1919 ];
2020
2121 NIX_LDFLAGS = "
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 "INSTALL_PREFIX=$(out)"
3939 ];
4040
41− LCL_PLATFORM = "gtk2";
41+ LCL_PLATFORM = "gtk2";
4242
4343 desktopItem = makeDesktopItem rec {
4444 name = "transgui";
@@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
6363 mkdir -p "$out/share/icons/hicolor/48x48/apps"
6464 cp transgui.png "$out/share/icons/hicolor/48x48/apps"
6565 mkdir -p "$out/share/transgui"
66− cp -r "./lang" "$out/share/transgui"
66+ cp -r "./lang" "$out/share/transgui"
6767 '';
6868
69− meta = {
69+ meta = {
7070 description = "A cross platform front-end for the Transmission Bit-Torrent client";
7171 homepage = https://sourceforge.net/p/transgui;
7272 license = stdenv.lib.licenses.gpl2Plus;
pkgs/applications/networking/remote/anydesk/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeWrapper, makeDesktopItem
2−, atk, cairo, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
2+, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
33, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome }:
44
55let
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
3535 };
3636
3737 buildInputs = [
38− atk cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango
38+ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
3939 gnome2.gtkglext libGLU_combined freetype fontconfig
4040 pangox_compat polkit polkit_gnome
4141 ] ++ (with xorg; [
pkgs/applications/networking/remote/citrix-receiver/default.nix+3−3
@@ -12,7 +12,7 @@
1212, glib
1313, gtk2
1414, atk
15−, gdk_pixbuf
15+, gdk-pixbuf
1616, cairo
1717, pango
1818, gnome3
@@ -100,14 +100,14 @@ let
100100 busybox
101101 file
102102 gtk2
103− gdk_pixbuf
103+ gdk-pixbuf
104104 ];
105105
106106 libPath = stdenv.lib.makeLibraryPath [
107107 glib
108108 gtk2
109109 atk
110− gdk_pixbuf
110+ gdk-pixbuf
111111 cairo
112112 pango
113113 gnome3.dconf
pkgs/applications/networking/remote/citrix-workspace/default.nix+3−3
@@ -12,7 +12,7 @@
1212, glib
1313, gtk2
1414, atk
15−, gdk_pixbuf
15+, gdk-pixbuf
1616, cairo
1717, pango
1818, gnome3
@@ -103,14 +103,14 @@ let
103103 busybox
104104 file
105105 gtk2
106− gdk_pixbuf
106+ gdk-pixbuf
107107 ];
108108
109109 libPath = stdenv.lib.makeLibraryPath [
110110 glib
111111 gtk2
112112 atk
113− gdk_pixbuf
113+ gdk-pixbuf
114114 cairo
115115 pango
116116 gnome3.dconf
pkgs/applications/networking/ssb/patchwork-classic/default.nix+3−3
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, lib, makeWrapper,
22 # build dependencies
33 alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
4− freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
4+ freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg,
55 glibc, systemd
66}:
77
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 expat
5151 fontconfig
5252 freetype
53− gdk_pixbuf
53+ gdk-pixbuf
5454 glib
5555 gnome2.GConf
5656 gnome2.gtk
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
9999 meta = with stdenv.lib; {
100100 description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser";
101101 homepage = "https://github.com/ssbc/patchwork-classic-electron";
102− license = licenses.gpl3;
102+ license = licenses.gpl3;
103103 maintainers = with maintainers; [ mrVanDalo ];
104104 platforms = platforms.linux;
105105 };
pkgs/applications/networking/super-productivity/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, dpkg, makeWrapper
22, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
3−, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
3+, gnome2, gtk3, gdk-pixbuf, libnotify, libxcb, nspr, nss, pango
44, systemd, xorg, xprintidle-ng }:
55
66let
@@ -19,7 +19,7 @@ let
1919 freetype
2020 glib
2121 gnome2.GConf
22− gdk_pixbuf
22+ gdk-pixbuf
2323 gtk3
2424 pango
2525 libnotify
pkgs/applications/office/moneyplex/default.nix+2−2
@@ -1,10 +1,10 @@
11{ stdenv, fetchurl, patchelf, coreutils, pcsclite
2−, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl
2+, zlib, glib, gdk-pixbuf, gtk2, cairo, pango, libX11, atk, openssl
33, runtimeShell }:
44
55let
66 libPath = stdenv.lib.makeLibraryPath [
7− stdenv.cc.cc zlib glib gdk_pixbuf gtk2 cairo pango libX11 atk openssl
7+ stdenv.cc.cc zlib glib gdk-pixbuf gtk2 cairo pango libX11 atk openssl
88 ];
99
1010 src_i686 = {
pkgs/applications/office/pinpoint/default.nix+2−2
@@ -1,5 +1,5 @@
11{ fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst
2−, gdk_pixbuf, cairo, clutter-gtk }:
2+, gdk-pixbuf, cairo, clutter-gtk }:
33
44stdenv.mkDerivation rec {
55 name = "pinpoint-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s";
1010 };
1111 nativeBuildInputs = [ pkgconfig ];
12− buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf
12+ buildInputs = [ autoconf automake clutter clutter-gst gdk-pixbuf
1313 cairo clutter-gtk ];
1414
1515 meta = with stdenv.lib; {
pkgs/applications/office/spice-up/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, cmake
4−, gdk_pixbuf
4+, gdk-pixbuf
55, gtk3
66, gettext
77, ninja
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 buildInputs = [
3939 pantheon.elementary-icon-theme
4040 pantheon.granite
41− gdk_pixbuf
41+ gdk-pixbuf
4242 gtk3
4343 json-glib
4444 libevdev
pkgs/applications/office/zotero/default.nix+4−4
@@ -7,7 +7,7 @@
77, dbus
88, fontconfig
99, freetype
10−, gdk_pixbuf
10+, gdk-pixbuf
1111, glib
1212, glibc
1313, gtk3
@@ -35,12 +35,12 @@
3535stdenv.mkDerivation rec {
3636 name = "zotero-${version}";
3737 version = "5.0.71";
38−
38+
3939 src = fetchurl {
4040 url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
4141 sha256 = "070b1ak870jv8h702a9g930p01jsmly93c44igw48ylbgqjyhlwq";
4242 };
43−
43+
4444 buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
4545
4646 phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
5858 dbus
5959 fontconfig
6060 freetype
61− gdk_pixbuf
61+ gdk-pixbuf
6262 glib
6363 glibc
6464 gtk3
pkgs/applications/science/electronics/bitscope/common.nix+2−2
@@ -2,7 +2,7 @@
22, buildFHSUserEnv
33, cairo
44, dpkg
5−, gdk_pixbuf
5+, gdk-pixbuf
66, glib
77, gtk2-x11
88, makeWrapper
@@ -39,7 +39,7 @@ let
3939 libs = attrs.libs or [
4040 atk
4141 cairo
42− gdk_pixbuf
42+ gdk-pixbuf
4343 glib
4444 gtk2-x11
4545 pango
pkgs/applications/science/logic/verifast/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype
1+{ stdenv, fetchurl, gtk2, gdk-pixbuf, atk, pango, glib, cairo, freetype
22, fontconfig, libxml2, gnome2 }:
33
44let
55
66 libPath = stdenv.lib.makeLibraryPath
7− [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo
7+ [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo
88 freetype fontconfig libxml2 gnome2.gtksourceview
99 ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec";
1010
pkgs/applications/version-management/gitkraken/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
22, libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig
33, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
4−, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
4+, nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
55, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid
66}:
77
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 cups
3838 alsaLib
3939 expat
40− gdk_pixbuf
40+ gdk-pixbuf
4141 dbus
4242 libXdamage
4343 libXrandr
pkgs/applications/video/devede/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
2−, gtk3, gettext, wrapGAppsHook, gdk_pixbuf, gobject-introspection }:
2+, gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }:
33
44let
55 inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
@@ -34,7 +34,7 @@ in buildPythonApplication rec {
3434 ];
3535
3636 propagatedBuildInputs = [
37− gtk3 pygobject3 gdk_pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
37+ gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
3838 ];
3939
4040 postPatch = ''
pkgs/applications/video/lightworks/default.nix+3−3
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
2−, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
2+, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
33, nvidia_cg_toolkit, zlib, openssl, portaudio
44}:
55let
66 fullPath = stdenv.lib.makeLibraryPath [
77 stdenv.cc.cc
88 gtk3
9− gdk_pixbuf
9+ gdk-pixbuf
1010 cairo
1111 libjpeg_original
1212 glib
@@ -60,7 +60,7 @@ let
6060 wrapProgram $out/lib/lightworks/ntcardvt \
6161 --prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib/lightworks \
6262 --set FONTCONFIG_FILE $out/lib/lightworks/fonts.conf
63−
63+
6464 cp -r usr/share $out/share
6565 '';
6666
pkgs/applications/video/webtorrent_desktop/default.nix+2−2
@@ -1,6 +1,6 @@
11{
22 alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype,
3− gdk_pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor,
3+ gdk-pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor,
44 libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
55 libxcb, nspr, nss, stdenv, udev
66}:
@@ -15,7 +15,7 @@
1515 expat
1616 fontconfig
1717 freetype
18− gdk_pixbuf
18+ gdk-pixbuf
1919 glib
2020 gnome2.GConf
2121 gnome2.gtk
pkgs/applications/window-managers/awesome/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
1+{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf
22, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
33, xcb-util-cursor, makeWrapper, pango, gobject-introspection
44, which, dbus, nettools, git, doxygen
@@ -40,7 +40,7 @@ with luaPackages; stdenv.mkDerivation rec {
4040 FONTCONFIG_FILE = toString fontsConf;
4141
4242 propagatedUserEnvPkgs = [ hicolor-icon-theme ];
43− buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection
43+ buildInputs = [ cairo librsvg dbus gdk-pixbuf gobject-introspection
4444 git lgi libpthreadstubs libstartup_notification
4545 libxdg_basedir lua nettools pango xcb-util-cursor
4646 xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
pkgs/applications/window-managers/dwm/dwm-status.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg
1+{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkgconfig, xorg
22, enableAlsaUtils ? true, alsaUtils, coreutils
33, enableNetwork ? true, dnsutils, iproute, wirelesstools }:
44
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
1919 };
2020
2121 nativeBuildInputs = [ makeWrapper pkgconfig ];
22− buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
22+ buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
2323
2424 cargoSha256 = "0pprf8509d321azg2l51lpxylgpk7290y38z9p5hxgkcwhrhrcss";
2525
pkgs/applications/window-managers/icewm/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, cmake, gettext
22, libjpeg, libtiff, libungif, libpng, imlib, expat
3−, freetype, fontconfig, pkgconfig, gdk_pixbuf
3+, freetype, fontconfig, pkgconfig, gdk-pixbuf
44, mkfontdir, libX11, libXft, libXext, libXinerama
55, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb
66, libpthreadstubs, pcre }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 buildInputs =
1414 [ cmake gettext libjpeg libtiff libungif libpng imlib expat
15− freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11
15+ freetype fontconfig pkgconfig gdk-pixbuf mkfontdir libX11
1616 libXft libXext libXinerama libXrandr libICE libSM libXpm
1717 libXdmcp libxcb libpthreadstubs pcre ];
1818
pkgs/applications/window-managers/sawfish/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl
22, pkgconfig, which, autoreconfHook
3−, rep-gtk, pango, gdk_pixbuf
3+, rep-gtk, pango, gdk-pixbuf
44, imlib, gettext, texinfo
55, libXinerama, libXrandr, libXtst, libICE, libSM
66, makeWrapper
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 nativeBuildInputs = [ autoreconfHook pkgconfig ];
2323 buildInputs = [ which
24− rep-gtk pango gdk_pixbuf imlib gettext texinfo
24+ rep-gtk pango gdk-pixbuf imlib gettext texinfo
2525 libXinerama libXrandr libXtst libICE libSM
2626 makeWrapper ];
2727
pkgs/applications/window-managers/sway/bg.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub
22, meson, ninja, pkgconfig, scdoc
3−, wayland, wayland-protocols, cairo, gdk_pixbuf
3+, wayland, wayland-protocols, cairo, gdk-pixbuf
44}:
55
66stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 };
1616
1717 nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
18− buildInputs = [ wayland wayland-protocols cairo gdk_pixbuf ];
18+ buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ];
1919
2020 mesonFlags = [
2121 "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
pkgs/applications/window-managers/sway/default.nix+2−2
@@ -2,7 +2,7 @@
22, meson, ninja
33, pkgconfig, scdoc
44, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
5−, pango, cairo, libinput, libcap, pam, gdk_pixbuf
5+, pango, cairo, libinput, libcap, pam, gdk-pixbuf
66, wlroots, wayland-protocols, swaybg
77}:
88
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626
2727 buildInputs = [
2828 wayland libxkbcommon pcre json_c dbus libevdev
29− pango cairo libinput libcap pam gdk_pixbuf
29+ pango cairo libinput libcap pam gdk-pixbuf
3030 wlroots wayland-protocols
3131 ];
3232
pkgs/applications/window-managers/sway/lock.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub
22, meson, ninja, pkgconfig, scdoc
3−, wayland, wayland-protocols, libxkbcommon, cairo, gdk_pixbuf, pam
3+, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
44}:
55
66stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 '';
2020
2121 nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
22− buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk_pixbuf pam ];
22+ buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
2323
2424 mesonFlags = [
2525 "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
pkgs/applications/window-managers/trayer/default.nix+2−2
@@ -1,10 +1,10 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
1+{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }:
22
33stdenv.mkDerivation rec {
44 name = "trayer-1.1.8";
55
66 nativeBuildInputs = [ pkgconfig ];
7− buildInputs = [ gdk_pixbuf gtk2 ];
7+ buildInputs = [ gdk-pixbuf gtk2 ];
88
99 src = fetchFromGitHub {
1010 owner = "sargon";
pkgs/applications/window-managers/way-cooler/crates-io.nix+371−283
@@ -10,6 +10,7 @@ rec {
1010 crates.aho_corasick."0.5.3" = deps: { features?(features_.aho_corasick."0.5.3" deps {}) }: buildRustCrate {
1111 crateName = "aho-corasick";
1212 version = "0.5.3";
13+ description = "Fast multiple substring searching with finite state machines.";
1314 authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
1415 sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn";
1516 libName = "aho_corasick";
@@ -33,6 +34,7 @@ rec {
3334 crates.bitflags."0.4.0" = deps: { features?(features_.bitflags."0.4.0" deps {}) }: buildRustCrate {
3435 crateName = "bitflags";
3536 version = "0.4.0";
37+ description = "A macro to generate structures which behave like bitflags.\n";
3638 authors = [ "The Rust Project Developers" ];
3739 sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c";
3840 features = mkFeatures (features."bitflags"."0.4.0" or {});
@@ -48,6 +50,7 @@ rec {
4850 crates.bitflags."0.6.0" = deps: { features?(features_.bitflags."0.6.0" deps {}) }: buildRustCrate {
4951 crateName = "bitflags";
5052 version = "0.6.0";
53+ description = "A macro to generate structures which behave like bitflags.\n";
5154 authors = [ "The Rust Project Developers" ];
5255 sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6";
5356 };
@@ -62,6 +65,7 @@ rec {
6265 crates.bitflags."0.7.0" = deps: { features?(features_.bitflags."0.7.0" deps {}) }: buildRustCrate {
6366 crateName = "bitflags";
6467 version = "0.7.0";
68+ description = "A macro to generate structures which behave like bitflags.\n";
6569 authors = [ "The Rust Project Developers" ];
6670 sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
6771 };
@@ -76,17 +80,18 @@ rec {
7680 crates.bitflags."0.9.1" = deps: { features?(features_.bitflags."0.9.1" deps {}) }: buildRustCrate {
7781 crateName = "bitflags";
7882 version = "0.9.1";
83+ description = "A macro to generate structures which behave like bitflags.\n";
7984 authors = [ "The Rust Project Developers" ];
8085 sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
8186 features = mkFeatures (features."bitflags"."0.9.1" or {});
8287 };
8388 features_.bitflags."0.9.1" = deps: f: updateFeatures f (rec {
8489 bitflags = fold recursiveUpdate {} [
85− { "0.9.1".default = (f.bitflags."0.9.1".default or true); }
86− { "0.9.1".example_generated =
87− (f.bitflags."0.9.1".example_generated or false) ||
90+ { "0.9.1"."example_generated" =
91+ (f.bitflags."0.9.1"."example_generated" or false) ||
8892 (f.bitflags."0.9.1".default or false) ||
8993 (bitflags."0.9.1"."default" or false); }
94+ { "0.9.1".default = (f.bitflags."0.9.1".default or true); }
9095 ];
9196 }) [];
9297
@@ -97,6 +102,7 @@ rec {
97102 crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate {
98103 crateName = "bitflags";
99104 version = "1.0.4";
105+ description = "A macro to generate structures which behave like bitflags.\n";
100106 authors = [ "The Rust Project Developers" ];
101107 sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
102108 features = mkFeatures (features."bitflags"."1.0.4" or {});
@@ -112,6 +118,7 @@ rec {
112118 crates.c_vec."1.2.1" = deps: { features?(features_.c_vec."1.2.1" deps {}) }: buildRustCrate {
113119 crateName = "c_vec";
114120 version = "1.2.1";
121+ description = "Structures to wrap C arrays";
115122 authors = [ "Guillaume Gomez <guillaume1.gomez@gmail.com>" ];
116123 sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd";
117124 };
@@ -126,6 +133,7 @@ rec {
126133 crates.cairo_rs."0.2.0" = deps: { features?(features_.cairo_rs."0.2.0" deps {}) }: buildRustCrate {
127134 crateName = "cairo-rs";
128135 version = "0.2.0";
136+ description = "Rust bindings for the Cairo library";
129137 authors = [ "The Gtk-rs Project Developers" ];
130138 sha256 = "0bcbhbyips15b7la4r43p4x57jv1w2ll8iwg9lxwvzz5k6c7iwvd";
131139 libName = "cairo";
@@ -148,25 +156,25 @@ rec {
148156 features_.cairo_rs."0.2.0" = deps: f: updateFeatures f (rec {
149157 c_vec."${deps.cairo_rs."0.2.0".c_vec}".default = true;
150158 cairo_rs = fold recursiveUpdate {} [
151− { "0.2.0".default = (f.cairo_rs."0.2.0".default or true); }
152− { "0.2.0".glib =
153− (f.cairo_rs."0.2.0".glib or false) ||
159+ { "0.2.0"."glib" =
160+ (f.cairo_rs."0.2.0"."glib" or false) ||
154161 (f.cairo_rs."0.2.0".use_glib or false) ||
155162 (cairo_rs."0.2.0"."use_glib" or false); }
156− { "0.2.0".glib-sys =
157− (f.cairo_rs."0.2.0".glib-sys or false) ||
163+ { "0.2.0"."glib-sys" =
164+ (f.cairo_rs."0.2.0"."glib-sys" or false) ||
158165 (f.cairo_rs."0.2.0".use_glib or false) ||
159166 (cairo_rs."0.2.0"."use_glib" or false); }
160− { "0.2.0".gtk-rs-lgpl-docs =
161− (f.cairo_rs."0.2.0".gtk-rs-lgpl-docs or false) ||
167+ { "0.2.0"."gtk-rs-lgpl-docs" =
168+ (f.cairo_rs."0.2.0"."gtk-rs-lgpl-docs" or false) ||
162169 (f.cairo_rs."0.2.0".embed-lgpl-docs or false) ||
163170 (cairo_rs."0.2.0"."embed-lgpl-docs" or false) ||
164171 (f.cairo_rs."0.2.0".purge-lgpl-docs or false) ||
165172 (cairo_rs."0.2.0"."purge-lgpl-docs" or false); }
166− { "0.2.0".use_glib =
167− (f.cairo_rs."0.2.0".use_glib or false) ||
173+ { "0.2.0"."use_glib" =
174+ (f.cairo_rs."0.2.0"."use_glib" or false) ||
168175 (f.cairo_rs."0.2.0".default or false) ||
169176 (cairo_rs."0.2.0"."default" or false); }
177+ { "0.2.0".default = (f.cairo_rs."0.2.0".default or true); }
170178 ];
171179 cairo_sys_rs = fold recursiveUpdate {} [
172180 { "${deps.cairo_rs."0.2.0".cairo_sys_rs}"."png" =
@@ -203,6 +211,7 @@ rec {
203211 crates.cairo_sys_rs."0.4.0" = deps: { features?(features_.cairo_sys_rs."0.4.0" deps {}) }: buildRustCrate {
204212 crateName = "cairo-sys-rs";
205213 version = "0.4.0";
214+ description = "FFI bindings to libcairo";
206215 authors = [ "The Gtk-rs Project Developers" ];
207216 sha256 = "062nxihlydci65pyy2ldn7djkc9sm7a5xvkl8pxrsxfxvfapm5br";
208217 libName = "cairo_sys";
@@ -221,15 +230,15 @@ rec {
221230 };
222231 features_.cairo_sys_rs."0.4.0" = deps: f: updateFeatures f (rec {
223232 cairo_sys_rs = fold recursiveUpdate {} [
224− { "0.4.0".default = (f.cairo_sys_rs."0.4.0".default or true); }
225− { "0.4.0".v1_12 =
226− (f.cairo_sys_rs."0.4.0".v1_12 or false) ||
233+ { "0.4.0"."v1_12" =
234+ (f.cairo_sys_rs."0.4.0"."v1_12" or false) ||
227235 (f.cairo_sys_rs."0.4.0".v1_14 or false) ||
228236 (cairo_sys_rs."0.4.0"."v1_14" or false); }
229− { "0.4.0".x11 =
230− (f.cairo_sys_rs."0.4.0".x11 or false) ||
237+ { "0.4.0"."x11" =
238+ (f.cairo_sys_rs."0.4.0"."x11" or false) ||
231239 (f.cairo_sys_rs."0.4.0".xlib or false) ||
232240 (cairo_sys_rs."0.4.0"."xlib" or false); }
241+ { "0.4.0".default = (f.cairo_sys_rs."0.4.0".default or true); }
233242 ];
234243 libc."${deps.cairo_sys_rs."0.4.0".libc}".default = true;
235244 pkg_config."${deps.cairo_sys_rs."0.4.0".pkg_config}".default = true;
@@ -247,6 +256,7 @@ rec {
247256 crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate {
248257 crateName = "cc";
249258 version = "1.0.25";
259+ description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n";
250260 authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
251261 sha256 = "0pd8fhjlpr5qan984frkf1c8nxrqp6827wmmfzhm2840229z2hq0";
252262 dependencies = mapFeatures features ([
@@ -255,11 +265,11 @@ rec {
255265 };
256266 features_.cc."1.0.25" = deps: f: updateFeatures f (rec {
257267 cc = fold recursiveUpdate {} [
258− { "1.0.25".default = (f.cc."1.0.25".default or true); }
259− { "1.0.25".rayon =
260− (f.cc."1.0.25".rayon or false) ||
268+ { "1.0.25"."rayon" =
269+ (f.cc."1.0.25"."rayon" or false) ||
261270 (f.cc."1.0.25".parallel or false) ||
262271 (cc."1.0.25"."parallel" or false); }
272+ { "1.0.25".default = (f.cc."1.0.25".default or true); }
263273 ];
264274 }) [];
265275
@@ -270,6 +280,7 @@ rec {
270280 crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate {
271281 crateName = "cfg-if";
272282 version = "0.1.6";
283+ description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n";
273284 authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
274285 sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
275286 };
@@ -284,6 +295,7 @@ rec {
284295 crates.cloudabi."0.0.3" = deps: { features?(features_.cloudabi."0.0.3" deps {}) }: buildRustCrate {
285296 crateName = "cloudabi";
286297 version = "0.0.3";
298+ description = "Low level interface to CloudABI. Contains all syscalls and related types.";
287299 authors = [ "Nuxi (https://nuxi.nl/) and contributors" ];
288300 sha256 = "1z9lby5sr6vslfd14d6igk03s7awf91mxpsfmsp3prxbxlk0x7h5";
289301 libPath = "cloudabi.rs";
@@ -295,8 +307,8 @@ rec {
295307 features_.cloudabi."0.0.3" = deps: f: updateFeatures f (rec {
296308 bitflags."${deps.cloudabi."0.0.3".bitflags}".default = true;
297309 cloudabi = fold recursiveUpdate {} [
298− { "0.0.3".bitflags =
299− (f.cloudabi."0.0.3".bitflags or false) ||
310+ { "0.0.3"."bitflags" =
311+ (f.cloudabi."0.0.3"."bitflags" or false) ||
300312 (f.cloudabi."0.0.3".default or false) ||
301313 (cloudabi."0.0.3"."default" or false); }
302314 { "0.0.3".default = (f.cloudabi."0.0.3".default or true); }
@@ -312,6 +324,7 @@ rec {
312324 crates.dbus."0.4.1" = deps: { features?(features_.dbus."0.4.1" deps {}) }: buildRustCrate {
313325 crateName = "dbus";
314326 version = "0.4.1";
327+ description = "Bindings to D-Bus, which is a bus commonly used on Linux for inter-process communication.";
315328 authors = [ "David Henningsson <diwic@ubuntu.com>" ];
316329 sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9";
317330 build = "build.rs";
@@ -339,6 +352,7 @@ rec {
339352 crates.dbus_macros."0.0.6" = deps: { features?(features_.dbus_macros."0.0.6" deps {}) }: buildRustCrate {
340353 crateName = "dbus-macros";
341354 version = "0.0.6";
355+ description = "Convenient macros to use the dbus crate";
342356 authors = [ "Antoni Boucher <bouanto@zoho.com>" ];
343357 sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd";
344358 dependencies = mapFeatures features ([
@@ -359,6 +373,7 @@ rec {
359373 crates.dlib."0.3.1" = deps: { features?(features_.dlib."0.3.1" deps {}) }: buildRustCrate {
360374 crateName = "dlib";
361375 version = "0.3.1";
376+ description = "Helper macros for handling manually loading optionnal system libraries.";
362377 authors = [ "Victor Berger <victor.berger@m4x.org>" ];
363378 sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
364379 dependencies = mapFeatures features ([
@@ -380,6 +395,7 @@ rec {
380395 crates.dlib."0.4.1" = deps: { features?(features_.dlib."0.4.1" deps {}) }: buildRustCrate {
381396 crateName = "dlib";
382397 version = "0.4.1";
398+ description = "Helper macros for handling manually loading optional system libraries.";
383399 authors = [ "Victor Berger <victor.berger@m4x.org>" ];
384400 sha256 = "0h5xm6lanbl6v9y16g592bia33g7xb0n0fg98pvz6nsvg0layxlk";
385401 dependencies = mapFeatures features ([
@@ -401,6 +417,7 @@ rec {
401417 crates.dtoa."0.4.3" = deps: { features?(features_.dtoa."0.4.3" deps {}) }: buildRustCrate {
402418 crateName = "dtoa";
403419 version = "0.4.3";
420+ description = "Fast functions for printing floating-point primitives to an io::Write";
404421 authors = [ "David Tolnay <dtolnay@gmail.com>" ];
405422 sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8";
406423 };
@@ -415,6 +432,7 @@ rec {
415432 crates.dummy_rustwlc."0.7.1" = deps: { features?(features_.dummy_rustwlc."0.7.1" deps {}) }: buildRustCrate {
416433 crateName = "dummy-rustwlc";
417434 version = "0.7.1";
435+ description = "A dummy version of the functions defined in rust-wlc, to be used in testing and for travis builds";
418436 authors = [ "Snirk Immington <snirk.immington@gmail.com>" "Preston Carpenter <APragmaticPlace@gmail.com>" ];
419437 sha256 = "13priwnxpjvmym6yh9v9x1230ca04cba7bzbnn21pbvqngis1y88";
420438 dependencies = mapFeatures features ([
@@ -445,6 +463,7 @@ rec {
445463 crates.env_logger."0.3.5" = deps: { features?(features_.env_logger."0.3.5" deps {}) }: buildRustCrate {
446464 crateName = "env_logger";
447465 version = "0.3.5";
466+ description = "An logging implementation for `log` which is configured via an environment\nvariable.\n";
448467 authors = [ "The Rust Project Developers" ];
449468 sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw";
450469 dependencies = mapFeatures features ([
@@ -455,11 +474,11 @@ rec {
455474 };
456475 features_.env_logger."0.3.5" = deps: f: updateFeatures f (rec {
457476 env_logger = fold recursiveUpdate {} [
458− { "0.3.5".default = (f.env_logger."0.3.5".default or true); }
459− { "0.3.5".regex =
460− (f.env_logger."0.3.5".regex or false) ||
477+ { "0.3.5"."regex" =
478+ (f.env_logger."0.3.5"."regex" or false) ||
461479 (f.env_logger."0.3.5".default or false) ||
462480 (env_logger."0.3.5"."default" or false); }
481+ { "0.3.5".default = (f.env_logger."0.3.5".default or true); }
463482 ];
464483 log."${deps.env_logger."0.3.5".log}".default = true;
465484 regex."${deps.env_logger."0.3.5".regex}".default = true;
@@ -475,6 +494,7 @@ rec {
475494 crates.fixedbitset."0.1.9" = deps: { features?(features_.fixedbitset."0.1.9" deps {}) }: buildRustCrate {
476495 crateName = "fixedbitset";
477496 version = "0.1.9";
497+ description = "FixedBitSet is a simple bitset collection";
478498 authors = [ "bluss" ];
479499 sha256 = "1bkb5aq7h9p4rzlgxagnda1f0dd11q0qz41bmdy11z18q1p8igy1";
480500 };
@@ -489,6 +509,7 @@ rec {
489509 crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate {
490510 crateName = "fuchsia-zircon";
491511 version = "0.3.3";
512+ description = "Rust bindings for the Zircon kernel";
492513 authors = [ "Raph Levien <raph@google.com>" ];
493514 sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
494515 dependencies = mapFeatures features ([
@@ -512,6 +533,7 @@ rec {
512533 crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate {
513534 crateName = "fuchsia-zircon-sys";
514535 version = "0.3.3";
536+ description = "Low-level Rust bindings for the Zircon kernel";
515537 authors = [ "Raph Levien <raph@google.com>" ];
516538 sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
517539 };
@@ -526,6 +548,7 @@ rec {
526548 crates.gcc."0.3.55" = deps: { features?(features_.gcc."0.3.55" deps {}) }: buildRustCrate {
527549 crateName = "gcc";
528550 version = "0.3.55";
551+ description = "**Deprecated** crate, renamed to `cc`\n\nA build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n";
529552 authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
530553 sha256 = "18qxv3hjdhp7pfcvbm2hvyicpgmk7xw8aii1l7fla8cxxbcrg2nz";
531554 dependencies = mapFeatures features ([
@@ -534,11 +557,11 @@ rec {
534557 };
535558 features_.gcc."0.3.55" = deps: f: updateFeatures f (rec {
536559 gcc = fold recursiveUpdate {} [
537− { "0.3.55".default = (f.gcc."0.3.55".default or true); }
538− { "0.3.55".rayon =
539− (f.gcc."0.3.55".rayon or false) ||
560+ { "0.3.55"."rayon" =
561+ (f.gcc."0.3.55"."rayon" or false) ||
540562 (f.gcc."0.3.55".parallel or false) ||
541563 (gcc."0.3.55"."parallel" or false); }
564+ { "0.3.55".default = (f.gcc."0.3.55".default or true); }
542565 ];
543566 }) [];
544567
@@ -549,6 +572,7 @@ rec {
549572 crates.gdk_pixbuf."0.2.0" = deps: { features?(features_.gdk_pixbuf."0.2.0" deps {}) }: buildRustCrate {
550573 crateName = "gdk-pixbuf";
551574 version = "0.2.0";
575+ description = "Rust bindings for the GdkPixbuf library";
552576 authors = [ "The Gtk-rs Project Developers" ];
553577 sha256 = "082z1s30haa59ax35wsv06mj8z8bhhq0fac36g01qa77kpiphj5y";
554578 libName = "gdk_pixbuf";
@@ -567,25 +591,25 @@ rec {
567591 };
568592 features_.gdk_pixbuf."0.2.0" = deps: f: updateFeatures f (rec {
569593 gdk_pixbuf = fold recursiveUpdate {} [
570− { "0.2.0".default = (f.gdk_pixbuf."0.2.0".default or true); }
571− { "0.2.0".gtk-rs-lgpl-docs =
572− (f.gdk_pixbuf."0.2.0".gtk-rs-lgpl-docs or false) ||
594+ { "0.2.0"."gtk-rs-lgpl-docs" =
595+ (f.gdk_pixbuf."0.2.0"."gtk-rs-lgpl-docs" or false) ||
573596 (f.gdk_pixbuf."0.2.0".embed-lgpl-docs or false) ||
574597 (gdk_pixbuf."0.2.0"."embed-lgpl-docs" or false) ||
575598 (f.gdk_pixbuf."0.2.0".purge-lgpl-docs or false) ||
576599 (gdk_pixbuf."0.2.0"."purge-lgpl-docs" or false); }
577− { "0.2.0".v2_28 =
578− (f.gdk_pixbuf."0.2.0".v2_28 or false) ||
600+ { "0.2.0"."v2_28" =
601+ (f.gdk_pixbuf."0.2.0"."v2_28" or false) ||
579602 (f.gdk_pixbuf."0.2.0".v2_30 or false) ||
580603 (gdk_pixbuf."0.2.0"."v2_30" or false); }
581− { "0.2.0".v2_30 =
582− (f.gdk_pixbuf."0.2.0".v2_30 or false) ||
604+ { "0.2.0"."v2_30" =
605+ (f.gdk_pixbuf."0.2.0"."v2_30" or false) ||
583606 (f.gdk_pixbuf."0.2.0".v2_32 or false) ||
584607 (gdk_pixbuf."0.2.0"."v2_32" or false); }
585− { "0.2.0".v2_32 =
586− (f.gdk_pixbuf."0.2.0".v2_32 or false) ||
608+ { "0.2.0"."v2_32" =
609+ (f.gdk_pixbuf."0.2.0"."v2_32" or false) ||
587610 (f.gdk_pixbuf."0.2.0".v2_36 or false) ||
588611 (gdk_pixbuf."0.2.0"."v2_36" or false); }
612+ { "0.2.0".default = (f.gdk_pixbuf."0.2.0".default or true); }
589613 ];
590614 gdk_pixbuf_sys = fold recursiveUpdate {} [
591615 { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" =
@@ -625,6 +649,7 @@ rec {
625649 crates.gdk_pixbuf_sys."0.4.0" = deps: { features?(features_.gdk_pixbuf_sys."0.4.0" deps {}) }: buildRustCrate {
626650 crateName = "gdk-pixbuf-sys";
627651 version = "0.4.0";
652+ description = "FFI bindings to libgdk_pixbuf-2.0";
628653 authors = [ "The Gtk-rs Project Developers" ];
629654 sha256 = "1r98zdqqik3hh1l10jmhhcjx59yk4m0bs9pc7hnkwp2p6gm968vp";
630655 libName = "gdk_pixbuf_sys";
@@ -645,19 +670,19 @@ rec {
645670 features_.gdk_pixbuf_sys."0.4.0" = deps: f: updateFeatures f (rec {
646671 bitflags."${deps.gdk_pixbuf_sys."0.4.0".bitflags}".default = true;
647672 gdk_pixbuf_sys = fold recursiveUpdate {} [
648− { "0.4.0".default = (f.gdk_pixbuf_sys."0.4.0".default or true); }
649− { "0.4.0".v2_28 =
650− (f.gdk_pixbuf_sys."0.4.0".v2_28 or false) ||
673+ { "0.4.0"."v2_28" =
674+ (f.gdk_pixbuf_sys."0.4.0"."v2_28" or false) ||
651675 (f.gdk_pixbuf_sys."0.4.0".v2_30 or false) ||
652676 (gdk_pixbuf_sys."0.4.0"."v2_30" or false); }
653− { "0.4.0".v2_30 =
654− (f.gdk_pixbuf_sys."0.4.0".v2_30 or false) ||
677+ { "0.4.0"."v2_30" =
678+ (f.gdk_pixbuf_sys."0.4.0"."v2_30" or false) ||
655679 (f.gdk_pixbuf_sys."0.4.0".v2_32 or false) ||
656680 (gdk_pixbuf_sys."0.4.0"."v2_32" or false); }
657− { "0.4.0".v2_32 =
658− (f.gdk_pixbuf_sys."0.4.0".v2_32 or false) ||
681+ { "0.4.0"."v2_32" =
682+ (f.gdk_pixbuf_sys."0.4.0"."v2_32" or false) ||
659683 (f.gdk_pixbuf_sys."0.4.0".v2_36 or false) ||
660684 (gdk_pixbuf_sys."0.4.0"."v2_36" or false); }
685+ { "0.4.0".default = (f.gdk_pixbuf_sys."0.4.0".default or true); }
661686 ];
662687 gio_sys."${deps.gdk_pixbuf_sys."0.4.0".gio_sys}".default = true;
663688 glib_sys."${deps.gdk_pixbuf_sys."0.4.0".glib_sys}".default = true;
@@ -680,6 +705,7 @@ rec {
680705 crates.getopts."0.2.18" = deps: { features?(features_.getopts."0.2.18" deps {}) }: buildRustCrate {
681706 crateName = "getopts";
682707 version = "0.2.18";
708+ description = "getopts-like option parsing.\n";
683709 authors = [ "The Rust Project Developers" ];
684710 sha256 = "0c1m95wg8pkvdq4mwcd2v78r1lb6a5s3ljm7158dsl56mvzcwd5y";
685711 dependencies = mapFeatures features ([
@@ -700,6 +726,7 @@ rec {
700726 crates.gio_sys."0.4.0" = deps: { features?(features_.gio_sys."0.4.0" deps {}) }: buildRustCrate {
701727 crateName = "gio-sys";
702728 version = "0.4.0";
729+ description = "FFI bindings to libgio-2.0";
703730 authors = [ "The Gtk-rs Project Developers" ];
704731 sha256 = "064lv6h3qfgjzc6pbbxgln24b2fq9gxzh78z6d7fwfa97azllv2l";
705732 libName = "gio_sys";
@@ -719,39 +746,39 @@ rec {
719746 features_.gio_sys."0.4.0" = deps: f: updateFeatures f (rec {
720747 bitflags."${deps.gio_sys."0.4.0".bitflags}".default = true;
721748 gio_sys = fold recursiveUpdate {} [
722− { "0.4.0".default = (f.gio_sys."0.4.0".default or true); }
723− { "0.4.0".v2_34 =
724− (f.gio_sys."0.4.0".v2_34 or false) ||
749+ { "0.4.0"."v2_34" =
750+ (f.gio_sys."0.4.0"."v2_34" or false) ||
725751 (f.gio_sys."0.4.0".v2_36 or false) ||
726752 (gio_sys."0.4.0"."v2_36" or false); }
727− { "0.4.0".v2_36 =
728− (f.gio_sys."0.4.0".v2_36 or false) ||
753+ { "0.4.0"."v2_36" =
754+ (f.gio_sys."0.4.0"."v2_36" or false) ||
729755 (f.gio_sys."0.4.0".v2_38 or false) ||
730756 (gio_sys."0.4.0"."v2_38" or false); }
731− { "0.4.0".v2_38 =
732− (f.gio_sys."0.4.0".v2_38 or false) ||
757+ { "0.4.0"."v2_38" =
758+ (f.gio_sys."0.4.0"."v2_38" or false) ||
733759 (f.gio_sys."0.4.0".v2_40 or false) ||
734760 (gio_sys."0.4.0"."v2_40" or false); }
735− { "0.4.0".v2_40 =
736− (f.gio_sys."0.4.0".v2_40 or false) ||
761+ { "0.4.0"."v2_40" =
762+ (f.gio_sys."0.4.0"."v2_40" or false) ||
737763 (f.gio_sys."0.4.0".v2_42 or false) ||
738764 (gio_sys."0.4.0"."v2_42" or false); }
739− { "0.4.0".v2_42 =
740− (f.gio_sys."0.4.0".v2_42 or false) ||
765+ { "0.4.0"."v2_42" =
766+ (f.gio_sys."0.4.0"."v2_42" or false) ||
741767 (f.gio_sys."0.4.0".v2_44 or false) ||
742768 (gio_sys."0.4.0"."v2_44" or false); }
743− { "0.4.0".v2_44 =
744− (f.gio_sys."0.4.0".v2_44 or false) ||
769+ { "0.4.0"."v2_44" =
770+ (f.gio_sys."0.4.0"."v2_44" or false) ||
745771 (f.gio_sys."0.4.0".v2_46 or false) ||
746772 (gio_sys."0.4.0"."v2_46" or false); }
747− { "0.4.0".v2_46 =
748− (f.gio_sys."0.4.0".v2_46 or false) ||
773+ { "0.4.0"."v2_46" =
774+ (f.gio_sys."0.4.0"."v2_46" or false) ||
749775 (f.gio_sys."0.4.0".v2_48 or false) ||
750776 (gio_sys."0.4.0"."v2_48" or false); }
751− { "0.4.0".v2_48 =
752− (f.gio_sys."0.4.0".v2_48 or false) ||
777+ { "0.4.0"."v2_48" =
778+ (f.gio_sys."0.4.0"."v2_48" or false) ||
753779 (f.gio_sys."0.4.0".v2_50 or false) ||
754780 (gio_sys."0.4.0"."v2_50" or false); }
781+ { "0.4.0".default = (f.gio_sys."0.4.0".default or true); }
755782 ];
756783 glib_sys."${deps.gio_sys."0.4.0".glib_sys}".default = true;
757784 gobject_sys."${deps.gio_sys."0.4.0".gobject_sys}".default = true;
@@ -772,6 +799,7 @@ rec {
772799 crates.glib."0.3.1" = deps: { features?(features_.glib."0.3.1" deps {}) }: buildRustCrate {
773800 crateName = "glib";
774801 version = "0.3.1";
802+ description = "Rust bindings for the GLib library";
775803 authors = [ "The Gtk-rs Project Developers" ];
776804 sha256 = "00s3n0pd8by1fk2l01mxmbnqq4ff6wadnkcf9jbjvr1l9bzgyqbl";
777805 dependencies = mapFeatures features ([
@@ -786,31 +814,31 @@ rec {
786814 features_.glib."0.3.1" = deps: f: updateFeatures f (rec {
787815 bitflags."${deps.glib."0.3.1".bitflags}".default = true;
788816 glib = fold recursiveUpdate {} [
789− { "0.3.1".default = (f.glib."0.3.1".default or true); }
790− { "0.3.1".v2_34 =
791− (f.glib."0.3.1".v2_34 or false) ||
817+ { "0.3.1"."v2_34" =
818+ (f.glib."0.3.1"."v2_34" or false) ||
792819 (f.glib."0.3.1".v2_38 or false) ||
793820 (glib."0.3.1"."v2_38" or false); }
794− { "0.3.1".v2_38 =
795− (f.glib."0.3.1".v2_38 or false) ||
821+ { "0.3.1"."v2_38" =
822+ (f.glib."0.3.1"."v2_38" or false) ||
796823 (f.glib."0.3.1".v2_40 or false) ||
797824 (glib."0.3.1"."v2_40" or false); }
798− { "0.3.1".v2_40 =
799− (f.glib."0.3.1".v2_40 or false) ||
825+ { "0.3.1"."v2_40" =
826+ (f.glib."0.3.1"."v2_40" or false) ||
800827 (f.glib."0.3.1".v2_44 or false) ||
801828 (glib."0.3.1"."v2_44" or false); }
802− { "0.3.1".v2_44 =
803− (f.glib."0.3.1".v2_44 or false) ||
829+ { "0.3.1"."v2_44" =
830+ (f.glib."0.3.1"."v2_44" or false) ||
804831 (f.glib."0.3.1".v2_46 or false) ||
805832 (glib."0.3.1"."v2_46" or false); }
806− { "0.3.1".v2_46 =
807− (f.glib."0.3.1".v2_46 or false) ||
833+ { "0.3.1"."v2_46" =
834+ (f.glib."0.3.1"."v2_46" or false) ||
808835 (f.glib."0.3.1".v2_48 or false) ||
809836 (glib."0.3.1"."v2_48" or false); }
810− { "0.3.1".v2_48 =
811− (f.glib."0.3.1".v2_48 or false) ||
837+ { "0.3.1"."v2_48" =
838+ (f.glib."0.3.1"."v2_48" or false) ||
812839 (f.glib."0.3.1".v2_50 or false) ||
813840 (glib."0.3.1"."v2_50" or false); }
841+ { "0.3.1".default = (f.glib."0.3.1".default or true); }
814842 ];
815843 glib_sys = fold recursiveUpdate {} [
816844 { "${deps.glib."0.3.1".glib_sys}"."v2_34" =
@@ -879,6 +907,7 @@ rec {
879907 crates.glib_sys."0.4.0" = deps: { features?(features_.glib_sys."0.4.0" deps {}) }: buildRustCrate {
880908 crateName = "glib-sys";
881909 version = "0.4.0";
910+ description = "FFI bindings to libglib-2.0";
882911 authors = [ "The Gtk-rs Project Developers" ];
883912 sha256 = "153i1zmk824hdf8agkaqcgddlwpvgng71n7bdpaav5f4zzlfyp2w";
884913 libName = "glib_sys";
@@ -896,35 +925,35 @@ rec {
896925 features_.glib_sys."0.4.0" = deps: f: updateFeatures f (rec {
897926 bitflags."${deps.glib_sys."0.4.0".bitflags}".default = true;
898927 glib_sys = fold recursiveUpdate {} [
899− { "0.4.0".default = (f.glib_sys."0.4.0".default or true); }
900− { "0.4.0".v2_34 =
901− (f.glib_sys."0.4.0".v2_34 or false) ||
928+ { "0.4.0"."v2_34" =
929+ (f.glib_sys."0.4.0"."v2_34" or false) ||
902930 (f.glib_sys."0.4.0".v2_36 or false) ||
903931 (glib_sys."0.4.0"."v2_36" or false); }
904− { "0.4.0".v2_36 =
905− (f.glib_sys."0.4.0".v2_36 or false) ||
932+ { "0.4.0"."v2_36" =
933+ (f.glib_sys."0.4.0"."v2_36" or false) ||
906934 (f.glib_sys."0.4.0".v2_38 or false) ||
907935 (glib_sys."0.4.0"."v2_38" or false); }
908− { "0.4.0".v2_38 =
909− (f.glib_sys."0.4.0".v2_38 or false) ||
936+ { "0.4.0"."v2_38" =
937+ (f.glib_sys."0.4.0"."v2_38" or false) ||
910938 (f.glib_sys."0.4.0".v2_40 or false) ||
911939 (glib_sys."0.4.0"."v2_40" or false); }
912− { "0.4.0".v2_40 =
913− (f.glib_sys."0.4.0".v2_40 or false) ||
940+ { "0.4.0"."v2_40" =
941+ (f.glib_sys."0.4.0"."v2_40" or false) ||
914942 (f.glib_sys."0.4.0".v2_44 or false) ||
915943 (glib_sys."0.4.0"."v2_44" or false); }
916− { "0.4.0".v2_44 =
917− (f.glib_sys."0.4.0".v2_44 or false) ||
944+ { "0.4.0"."v2_44" =
945+ (f.glib_sys."0.4.0"."v2_44" or false) ||
918946 (f.glib_sys."0.4.0".v2_46 or false) ||
919947 (glib_sys."0.4.0"."v2_46" or false); }
920− { "0.4.0".v2_46 =
921− (f.glib_sys."0.4.0".v2_46 or false) ||
948+ { "0.4.0"."v2_46" =
949+ (f.glib_sys."0.4.0"."v2_46" or false) ||
922950 (f.glib_sys."0.4.0".v2_48 or false) ||
923951 (glib_sys."0.4.0"."v2_48" or false); }
924− { "0.4.0".v2_48 =
925− (f.glib_sys."0.4.0".v2_48 or false) ||
952+ { "0.4.0"."v2_48" =
953+ (f.glib_sys."0.4.0"."v2_48" or false) ||
926954 (f.glib_sys."0.4.0".v2_50 or false) ||
927955 (glib_sys."0.4.0"."v2_50" or false); }
956+ { "0.4.0".default = (f.glib_sys."0.4.0".default or true); }
928957 ];
929958 libc."${deps.glib_sys."0.4.0".libc}".default = true;
930959 pkg_config."${deps.glib_sys."0.4.0".pkg_config}".default = true;
@@ -941,6 +970,7 @@ rec {
941970 crates.gobject_sys."0.4.0" = deps: { features?(features_.gobject_sys."0.4.0" deps {}) }: buildRustCrate {
942971 crateName = "gobject-sys";
943972 version = "0.4.0";
973+ description = "FFI bindings to libgobject-2.0";
944974 authors = [ "The Gtk-rs Project Developers" ];
945975 sha256 = "00zmcbzqfhn9w01cphhf3hbq8ldd9ajba7x07z59vv1gdq6wjzli";
946976 libName = "gobject_sys";
@@ -960,27 +990,27 @@ rec {
960990 bitflags."${deps.gobject_sys."0.4.0".bitflags}".default = true;
961991 glib_sys."${deps.gobject_sys."0.4.0".glib_sys}".default = true;
962992 gobject_sys = fold recursiveUpdate {} [
963− { "0.4.0".default = (f.gobject_sys."0.4.0".default or true); }
964− { "0.4.0".v2_34 =
965− (f.gobject_sys."0.4.0".v2_34 or false) ||
993+ { "0.4.0"."v2_34" =
994+ (f.gobject_sys."0.4.0"."v2_34" or false) ||
966995 (f.gobject_sys."0.4.0".v2_36 or false) ||
967996 (gobject_sys."0.4.0"."v2_36" or false); }
968− { "0.4.0".v2_36 =
969− (f.gobject_sys."0.4.0".v2_36 or false) ||
997+ { "0.4.0"."v2_36" =
998+ (f.gobject_sys."0.4.0"."v2_36" or false) ||
970999 (f.gobject_sys."0.4.0".v2_38 or false) ||
9711000 (gobject_sys."0.4.0"."v2_38" or false); }
972− { "0.4.0".v2_38 =
973− (f.gobject_sys."0.4.0".v2_38 or false) ||
1001+ { "0.4.0"."v2_38" =
1002+ (f.gobject_sys."0.4.0"."v2_38" or false) ||
9741003 (f.gobject_sys."0.4.0".v2_42 or false) ||
9751004 (gobject_sys."0.4.0"."v2_42" or false); }
976− { "0.4.0".v2_42 =
977− (f.gobject_sys."0.4.0".v2_42 or false) ||
1005+ { "0.4.0"."v2_42" =
1006+ (f.gobject_sys."0.4.0"."v2_42" or false) ||
9781007 (f.gobject_sys."0.4.0".v2_44 or false) ||
9791008 (gobject_sys."0.4.0"."v2_44" or false); }
980− { "0.4.0".v2_44 =
981− (f.gobject_sys."0.4.0".v2_44 or false) ||
1009+ { "0.4.0"."v2_44" =
1010+ (f.gobject_sys."0.4.0"."v2_44" or false) ||
9821011 (f.gobject_sys."0.4.0".v2_46 or false) ||
9831012 (gobject_sys."0.4.0"."v2_46" or false); }
1013+ { "0.4.0".default = (f.gobject_sys."0.4.0".default or true); }
9841014 ];
9851015 libc."${deps.gobject_sys."0.4.0".libc}".default = true;
9861016 pkg_config."${deps.gobject_sys."0.4.0".pkg_config}".default = true;
@@ -998,6 +1028,7 @@ rec {
9981028 crates.itoa."0.3.4" = deps: { features?(features_.itoa."0.3.4" deps {}) }: buildRustCrate {
9991029 crateName = "itoa";
10001030 version = "0.3.4";
1031+ description = "Fast functions for printing integer primitives to an io::Write";
10011032 authors = [ "David Tolnay <dtolnay@gmail.com>" ];
10021033 sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
10031034 features = mkFeatures (features."itoa"."0.3.4" or {});
@@ -1013,6 +1044,7 @@ rec {
10131044 crates.json_macro."0.1.1" = deps: { features?(features_.json_macro."0.1.1" deps {}) }: buildRustCrate {
10141045 crateName = "json_macro";
10151046 version = "0.1.1";
1047+ description = "Pure json macro for rust_serialize. No need compiler features.";
10161048 authors = [ "Denis Kolodin <deniskolodin@gmail.com>" ];
10171049 sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy";
10181050 dependencies = mapFeatures features ([
@@ -1033,6 +1065,7 @@ rec {
10331065 crates.kernel32_sys."0.2.2" = deps: { features?(features_.kernel32_sys."0.2.2" deps {}) }: buildRustCrate {
10341066 crateName = "kernel32-sys";
10351067 version = "0.2.2";
1068+ description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants.";
10361069 authors = [ "Peter Atashian <retep998@gmail.com>" ];
10371070 sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
10381071 libName = "kernel32";
@@ -1061,6 +1094,7 @@ rec {
10611094 crates.lazy_static."0.2.11" = deps: { features?(features_.lazy_static."0.2.11" deps {}) }: buildRustCrate {
10621095 crateName = "lazy_static";
10631096 version = "0.2.11";
1097+ description = "A macro for declaring lazily evaluated statics in Rust.";
10641098 authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
10651099 sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm";
10661100 dependencies = mapFeatures features ([
@@ -1069,19 +1103,19 @@ rec {
10691103 };
10701104 features_.lazy_static."0.2.11" = deps: f: updateFeatures f (rec {
10711105 lazy_static = fold recursiveUpdate {} [
1072− { "0.2.11".compiletest_rs =
1073− (f.lazy_static."0.2.11".compiletest_rs or false) ||
1106+ { "0.2.11"."compiletest_rs" =
1107+ (f.lazy_static."0.2.11"."compiletest_rs" or false) ||
10741108 (f.lazy_static."0.2.11".compiletest or false) ||
10751109 (lazy_static."0.2.11"."compiletest" or false); }
1076− { "0.2.11".default = (f.lazy_static."0.2.11".default or true); }
1077− { "0.2.11".nightly =
1078− (f.lazy_static."0.2.11".nightly or false) ||
1110+ { "0.2.11"."nightly" =
1111+ (f.lazy_static."0.2.11"."nightly" or false) ||
10791112 (f.lazy_static."0.2.11".spin_no_std or false) ||
10801113 (lazy_static."0.2.11"."spin_no_std" or false); }
1081− { "0.2.11".spin =
1082− (f.lazy_static."0.2.11".spin or false) ||
1114+ { "0.2.11"."spin" =
1115+ (f.lazy_static."0.2.11"."spin" or false) ||
10831116 (f.lazy_static."0.2.11".spin_no_std or false) ||
10841117 (lazy_static."0.2.11"."spin_no_std" or false); }
1118+ { "0.2.11".default = (f.lazy_static."0.2.11".default or true); }
10851119 ];
10861120 }) [];
10871121
@@ -1092,6 +1126,7 @@ rec {
10921126 crates.lazy_static."1.2.0" = deps: { features?(features_.lazy_static."1.2.0" deps {}) }: buildRustCrate {
10931127 crateName = "lazy_static";
10941128 version = "1.2.0";
1129+ description = "A macro for declaring lazily evaluated statics in Rust.";
10951130 authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
10961131 sha256 = "07p3b30k2akyr6xw08ggd5qiz5nw3vd3agggj360fcc1njz7d0ss";
10971132 dependencies = mapFeatures features ([
@@ -1100,11 +1135,11 @@ rec {
11001135 };
11011136 features_.lazy_static."1.2.0" = deps: f: updateFeatures f (rec {
11021137 lazy_static = fold recursiveUpdate {} [
1103− { "1.2.0".default = (f.lazy_static."1.2.0".default or true); }
1104− { "1.2.0".spin =
1105− (f.lazy_static."1.2.0".spin or false) ||
1138+ { "1.2.0"."spin" =
1139+ (f.lazy_static."1.2.0"."spin" or false) ||
11061140 (f.lazy_static."1.2.0".spin_no_std or false) ||
11071141 (lazy_static."1.2.0"."spin_no_std" or false); }
1142+ { "1.2.0".default = (f.lazy_static."1.2.0".default or true); }
11081143 ];
11091144 }) [];
11101145
@@ -1115,6 +1150,7 @@ rec {
11151150 crates.libc."0.2.44" = deps: { features?(features_.libc."0.2.44" deps {}) }: buildRustCrate {
11161151 crateName = "libc";
11171152 version = "0.2.44";
1153+ description = "A library for types and bindings to native C functions often found in libc or\nother common platform libraries.\n";
11181154 authors = [ "The Rust Project Developers" ];
11191155 sha256 = "17a7p0lcf3qwl1pcxffdflgnx8zr2659mgzzg4zi5fnv1mlj3q6z";
11201156 build = "build.rs";
@@ -1124,19 +1160,19 @@ rec {
11241160 };
11251161 features_.libc."0.2.44" = deps: f: updateFeatures f (rec {
11261162 libc = fold recursiveUpdate {} [
1127− { "0.2.44".align =
1128− (f.libc."0.2.44".align or false) ||
1163+ { "0.2.44"."align" =
1164+ (f.libc."0.2.44"."align" or false) ||
11291165 (f.libc."0.2.44".rustc-dep-of-std or false) ||
11301166 (libc."0.2.44"."rustc-dep-of-std" or false); }
1131− { "0.2.44".default = (f.libc."0.2.44".default or true); }
1132− { "0.2.44".rustc-std-workspace-core =
1133− (f.libc."0.2.44".rustc-std-workspace-core or false) ||
1167+ { "0.2.44"."rustc-std-workspace-core" =
1168+ (f.libc."0.2.44"."rustc-std-workspace-core" or false) ||
11341169 (f.libc."0.2.44".rustc-dep-of-std or false) ||
11351170 (libc."0.2.44"."rustc-dep-of-std" or false); }
1136− { "0.2.44".use_std =
1137− (f.libc."0.2.44".use_std or false) ||
1171+ { "0.2.44"."use_std" =
1172+ (f.libc."0.2.44"."use_std" or false) ||
11381173 (f.libc."0.2.44".default or false) ||
11391174 (libc."0.2.44"."default" or false); }
1175+ { "0.2.44".default = (f.libc."0.2.44".default or true); }
11401176 ];
11411177 }) [];
11421178
@@ -1147,6 +1183,7 @@ rec {
11471183 crates.libloading."0.3.4" = deps: { features?(features_.libloading."0.3.4" deps {}) }: buildRustCrate {
11481184 crateName = "libloading";
11491185 version = "0.3.4";
1186+ description = "A safer binding to platform’s dynamic library loading utilities";
11501187 authors = [ "Simonas Kazlauskas <libloading@kazlauskas.me>" ];
11511188 sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
11521189 build = "build.rs";
@@ -1182,6 +1219,7 @@ rec {
11821219 crates.libloading."0.5.0" = deps: { features?(features_.libloading."0.5.0" deps {}) }: buildRustCrate {
11831220 crateName = "libloading";
11841221 version = "0.5.0";
1222+ description = "A safer binding to platform’s dynamic library loading utilities";
11851223 authors = [ "Simonas Kazlauskas <libloading@kazlauskas.me>" ];
11861224 sha256 = "11vzjaka1y979aril4ggwp33p35yz2isvx9m5w88r5sdcmq6iscn";
11871225 build = "build.rs";
@@ -1214,6 +1252,7 @@ rec {
12141252 crates.log."0.3.9" = deps: { features?(features_.log."0.3.9" deps {}) }: buildRustCrate {
12151253 crateName = "log";
12161254 version = "0.3.9";
1255+ description = "A lightweight logging facade for Rust\n";
12171256 authors = [ "The Rust Project Developers" ];
12181257 sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2";
12191258 dependencies = mapFeatures features ([
@@ -1276,11 +1315,11 @@ rec {
12761315 (log."0.3.9"."use_std" or false) ||
12771316 (f."log"."0.3.9"."use_std" or false); }
12781317 { "${deps.log."0.3.9".log}".default = true; }
1279− { "0.3.9".default = (f.log."0.3.9".default or true); }
1280− { "0.3.9".use_std =
1281− (f.log."0.3.9".use_std or false) ||
1318+ { "0.3.9"."use_std" =
1319+ (f.log."0.3.9"."use_std" or false) ||
12821320 (f.log."0.3.9".default or false) ||
12831321 (log."0.3.9"."default" or false); }
1322+ { "0.3.9".default = (f.log."0.3.9".default or true); }
12841323 ];
12851324 }) [
12861325 (features_.log."${deps."log"."0.3.9"."log"}" deps)
@@ -1293,6 +1332,7 @@ rec {
12931332 crates.log."0.4.6" = deps: { features?(features_.log."0.4.6" deps {}) }: buildRustCrate {
12941333 crateName = "log";
12951334 version = "0.4.6";
1335+ description = "A lightweight logging facade for Rust\n";
12961336 authors = [ "The Rust Project Developers" ];
12971337 sha256 = "1nd8dl9mvc9vd6fks5d4gsxaz990xi6rzlb8ymllshmwi153vngr";
12981338 dependencies = mapFeatures features ([
@@ -1314,6 +1354,7 @@ rec {
13141354 crates.memchr."0.1.11" = deps: { features?(features_.memchr."0.1.11" deps {}) }: buildRustCrate {
13151355 crateName = "memchr";
13161356 version = "0.1.11";
1357+ description = "Safe interface to memchr.";
13171358 authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
13181359 sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8";
13191360 dependencies = mapFeatures features ([
@@ -1334,6 +1375,7 @@ rec {
13341375 crates.nix."0.6.0" = deps: { features?(features_.nix."0.6.0" deps {}) }: buildRustCrate {
13351376 crateName = "nix";
13361377 version = "0.6.0";
1378+ description = "Rust friendly bindings to *nix APIs";
13371379 authors = [ "Carl Lerche <me@carllerche.com>" ];
13381380 sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf";
13391381 build = "build.rs";
@@ -1374,6 +1416,7 @@ rec {
13741416 crates.nix."0.9.0" = deps: { features?(features_.nix."0.9.0" deps {}) }: buildRustCrate {
13751417 crateName = "nix";
13761418 version = "0.9.0";
1419+ description = "Rust friendly bindings to *nix APIs";
13771420 authors = [ "The nix-rust Project Developers" ];
13781421 sha256 = "00p63bphzwwn460rja5l2wcpgmv7ljf7illf6n95cppx63d180q0";
13791422 dependencies = mapFeatures features ([
@@ -1403,6 +1446,7 @@ rec {
14031446 crates.num_traits."0.1.43" = deps: { features?(features_.num_traits."0.1.43" deps {}) }: buildRustCrate {
14041447 crateName = "num-traits";
14051448 version = "0.1.43";
1449+ description = "Numeric traits for generic mathematics";
14061450 authors = [ "The Rust Project Developers" ];
14071451 sha256 = "1zdzx78vrcg3f39w94pqjs1mwxl1phyv7843hwgwkzggwcxhhf6s";
14081452 dependencies = mapFeatures features ([
@@ -1425,6 +1469,7 @@ rec {
14251469 crates.num_traits."0.2.6" = deps: { features?(features_.num_traits."0.2.6" deps {}) }: buildRustCrate {
14261470 crateName = "num-traits";
14271471 version = "0.2.6";
1472+ description = "Numeric traits for generic mathematics";
14281473 authors = [ "The Rust Project Developers" ];
14291474 sha256 = "1d20sil9n0wgznd1nycm3yjfj1mzyl41ambb7by1apxlyiil1azk";
14301475 build = "build.rs";
@@ -1432,11 +1477,11 @@ rec {
14321477 };
14331478 features_.num_traits."0.2.6" = deps: f: updateFeatures f (rec {
14341479 num_traits = fold recursiveUpdate {} [
1435− { "0.2.6".default = (f.num_traits."0.2.6".default or true); }
1436− { "0.2.6".std =
1437− (f.num_traits."0.2.6".std or false) ||
1480+ { "0.2.6"."std" =
1481+ (f.num_traits."0.2.6"."std" or false) ||
14381482 (f.num_traits."0.2.6".default or false) ||
14391483 (num_traits."0.2.6"."default" or false); }
1484+ { "0.2.6".default = (f.num_traits."0.2.6".default or true); }
14401485 ];
14411486 }) [];
14421487
@@ -1447,6 +1492,7 @@ rec {
14471492 crates.ordermap."0.3.5" = deps: { features?(features_.ordermap."0.3.5" deps {}) }: buildRustCrate {
14481493 crateName = "ordermap";
14491494 version = "0.3.5";
1495+ description = "A hash table with consistent order and fast iteration.";
14501496 authors = [ "bluss" ];
14511497 sha256 = "0b6vxfyh627yqm6war3392g1hhi4dbn49ibx2qv6mv490jdhv7d3";
14521498 dependencies = mapFeatures features ([
@@ -1455,11 +1501,11 @@ rec {
14551501 };
14561502 features_.ordermap."0.3.5" = deps: f: updateFeatures f (rec {
14571503 ordermap = fold recursiveUpdate {} [
1458− { "0.3.5".default = (f.ordermap."0.3.5".default or true); }
1459− { "0.3.5".serde =
1460− (f.ordermap."0.3.5".serde or false) ||
1504+ { "0.3.5"."serde" =
1505+ (f.ordermap."0.3.5"."serde" or false) ||
14611506 (f.ordermap."0.3.5".serde-1 or false) ||
14621507 (ordermap."0.3.5"."serde-1" or false); }
1508+ { "0.3.5".default = (f.ordermap."0.3.5".default or true); }
14631509 ];
14641510 }) [];
14651511
@@ -1470,6 +1516,7 @@ rec {
14701516 crates.petgraph."0.4.13" = deps: { features?(features_.petgraph."0.4.13" deps {}) }: buildRustCrate {
14711517 crateName = "petgraph";
14721518 version = "0.4.13";
1519+ description = "Graph data structure library. Provides graph types and graph algorithms.";
14731520 authors = [ "bluss" "mitchmindtree" ];
14741521 sha256 = "0a8k12b9vd0bndwqhafa853w186axdw05bv4kqjimyaz67428g1i";
14751522 dependencies = mapFeatures features ([
@@ -1482,43 +1529,43 @@ rec {
14821529 fixedbitset."${deps.petgraph."0.4.13".fixedbitset}".default = true;
14831530 ordermap."${deps.petgraph."0.4.13".ordermap}".default = true;
14841531 petgraph = fold recursiveUpdate {} [
1485− { "0.4.13".default = (f.petgraph."0.4.13".default or true); }
1486− { "0.4.13".generate =
1487− (f.petgraph."0.4.13".generate or false) ||
1532+ { "0.4.13"."generate" =
1533+ (f.petgraph."0.4.13"."generate" or false) ||
14881534 (f.petgraph."0.4.13".unstable or false) ||
14891535 (petgraph."0.4.13"."unstable" or false); }
1490− { "0.4.13".graphmap =
1491− (f.petgraph."0.4.13".graphmap or false) ||
1536+ { "0.4.13"."graphmap" =
1537+ (f.petgraph."0.4.13"."graphmap" or false) ||
14921538 (f.petgraph."0.4.13".all or false) ||
14931539 (petgraph."0.4.13"."all" or false) ||
14941540 (f.petgraph."0.4.13".default or false) ||
14951541 (petgraph."0.4.13"."default" or false); }
1496− { "0.4.13".ordermap =
1497− (f.petgraph."0.4.13".ordermap or false) ||
1542+ { "0.4.13"."ordermap" =
1543+ (f.petgraph."0.4.13"."ordermap" or false) ||
14981544 (f.petgraph."0.4.13".graphmap or false) ||
14991545 (petgraph."0.4.13"."graphmap" or false); }
1500− { "0.4.13".quickcheck =
1501− (f.petgraph."0.4.13".quickcheck or false) ||
1546+ { "0.4.13"."quickcheck" =
1547+ (f.petgraph."0.4.13"."quickcheck" or false) ||
15021548 (f.petgraph."0.4.13".all or false) ||
15031549 (petgraph."0.4.13"."all" or false); }
1504− { "0.4.13".serde =
1505− (f.petgraph."0.4.13".serde or false) ||
1550+ { "0.4.13"."serde" =
1551+ (f.petgraph."0.4.13"."serde" or false) ||
15061552 (f.petgraph."0.4.13".serde-1 or false) ||
15071553 (petgraph."0.4.13"."serde-1" or false); }
1508− { "0.4.13".serde_derive =
1509− (f.petgraph."0.4.13".serde_derive or false) ||
1554+ { "0.4.13"."serde_derive" =
1555+ (f.petgraph."0.4.13"."serde_derive" or false) ||
15101556 (f.petgraph."0.4.13".serde-1 or false) ||
15111557 (petgraph."0.4.13"."serde-1" or false); }
1512− { "0.4.13".stable_graph =
1513− (f.petgraph."0.4.13".stable_graph or false) ||
1558+ { "0.4.13"."stable_graph" =
1559+ (f.petgraph."0.4.13"."stable_graph" or false) ||
15141560 (f.petgraph."0.4.13".all or false) ||
15151561 (petgraph."0.4.13"."all" or false) ||
15161562 (f.petgraph."0.4.13".default or false) ||
15171563 (petgraph."0.4.13"."default" or false); }
1518− { "0.4.13".unstable =
1519− (f.petgraph."0.4.13".unstable or false) ||
1564+ { "0.4.13"."unstable" =
1565+ (f.petgraph."0.4.13"."unstable" or false) ||
15201566 (f.petgraph."0.4.13".all or false) ||
15211567 (petgraph."0.4.13"."all" or false); }
1568+ { "0.4.13".default = (f.petgraph."0.4.13".default or true); }
15221569 ];
15231570 }) [
15241571 (features_.fixedbitset."${deps."petgraph"."0.4.13"."fixedbitset"}" deps)
@@ -1532,6 +1579,7 @@ rec {
15321579 crates.phf."0.7.23" = deps: { features?(features_.phf."0.7.23" deps {}) }: buildRustCrate {
15331580 crateName = "phf";
15341581 version = "0.7.23";
1582+ description = "Runtime support for perfect hash function data structures";
15351583 authors = [ "Steven Fackler <sfackler@gmail.com>" ];
15361584 sha256 = "0annmaf9mmm12g2cdwpip32p674pmsf6xpiwa27mz3glmz73y8aq";
15371585 libPath = "src/lib.rs";
@@ -1564,6 +1612,7 @@ rec {
15641612 crates.phf_codegen."0.7.23" = deps: { features?(features_.phf_codegen."0.7.23" deps {}) }: buildRustCrate {
15651613 crateName = "phf_codegen";
15661614 version = "0.7.23";
1615+ description = "Codegen library for PHF types";
15671616 authors = [ "Steven Fackler <sfackler@gmail.com>" ];
15681617 sha256 = "0k5ly0qykw56fxd19iy236wzghqdxq9zxnzcg8nm22cfzw4a35n0";
15691618 dependencies = mapFeatures features ([
@@ -1587,6 +1636,7 @@ rec {
15871636 crates.phf_generator."0.7.23" = deps: { features?(features_.phf_generator."0.7.23" deps {}) }: buildRustCrate {
15881637 crateName = "phf_generator";
15891638 version = "0.7.23";
1639+ description = "PHF generation logic";
15901640 authors = [ "Steven Fackler <sfackler@gmail.com>" ];
15911641 sha256 = "106cd0bx3jf7mf2gaa8nx62c1las1w95c5gwsd4yqm5lj2rj4mza";
15921642 dependencies = mapFeatures features ([
@@ -1610,6 +1660,7 @@ rec {
16101660 crates.phf_shared."0.7.23" = deps: { features?(features_.phf_shared."0.7.23" deps {}) }: buildRustCrate {
16111661 crateName = "phf_shared";
16121662 version = "0.7.23";
1663+ description = "Support code shared by PHF libraries";
16131664 authors = [ "Steven Fackler <sfackler@gmail.com>" ];
16141665 sha256 = "04gzsq9vg9j8cr39hpkddxb0yqjdknvcpnylw112rqamy7ml4fy1";
16151666 libPath = "src/lib.rs";
@@ -1632,6 +1683,7 @@ rec {
16321683 crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate {
16331684 crateName = "pkg-config";
16341685 version = "0.3.14";
1686+ description = "A library to run the pkg-config system tool at build time in order to be used in\nCargo build scripts.\n";
16351687 authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
16361688 sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
16371689 };
@@ -1646,6 +1698,7 @@ rec {
16461698 crates.rand."0.3.22" = deps: { features?(features_.rand."0.3.22" deps {}) }: buildRustCrate {
16471699 crateName = "rand";
16481700 version = "0.3.22";
1701+ description = "Random number generators and other randomness functionality.\n";
16491702 authors = [ "The Rust Project Developers" ];
16501703 sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0";
16511704 dependencies = mapFeatures features ([
@@ -1662,11 +1715,11 @@ rec {
16621715 libc."${deps.rand."0.3.22".libc}".default = true;
16631716 rand = fold recursiveUpdate {} [
16641717 { "${deps.rand."0.3.22".rand}".default = true; }
1665− { "0.3.22".default = (f.rand."0.3.22".default or true); }
1666− { "0.3.22".i128_support =
1667− (f.rand."0.3.22".i128_support or false) ||
1718+ { "0.3.22"."i128_support" =
1719+ (f.rand."0.3.22"."i128_support" or false) ||
16681720 (f.rand."0.3.22".nightly or false) ||
16691721 (rand."0.3.22"."nightly" or false); }
1722+ { "0.3.22".default = (f.rand."0.3.22".default or true); }
16701723 ];
16711724 }) [
16721725 (features_.libc."${deps."rand"."0.3.22"."libc"}" deps)
@@ -1681,6 +1734,7 @@ rec {
16811734 crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate {
16821735 crateName = "rand";
16831736 version = "0.4.3";
1737+ description = "Random number generators and other randomness functionality.\n";
16841738 authors = [ "The Rust Project Developers" ];
16851739 sha256 = "1644wri45l147822xy7dgdm4k7myxzs66cb795ga0x7dan11ci4f";
16861740 dependencies = (if kernel == "fuchsia" then mapFeatures features ([
@@ -1698,19 +1752,19 @@ rec {
16981752 fuchsia_zircon."${deps.rand."0.4.3".fuchsia_zircon}".default = true;
16991753 libc."${deps.rand."0.4.3".libc}".default = true;
17001754 rand = fold recursiveUpdate {} [
1701− { "0.4.3".default = (f.rand."0.4.3".default or true); }
1702− { "0.4.3".i128_support =
1703− (f.rand."0.4.3".i128_support or false) ||
1755+ { "0.4.3"."i128_support" =
1756+ (f.rand."0.4.3"."i128_support" or false) ||
17041757 (f.rand."0.4.3".nightly or false) ||
17051758 (rand."0.4.3"."nightly" or false); }
1706− { "0.4.3".libc =
1707− (f.rand."0.4.3".libc or false) ||
1759+ { "0.4.3"."libc" =
1760+ (f.rand."0.4.3"."libc" or false) ||
17081761 (f.rand."0.4.3".std or false) ||
17091762 (rand."0.4.3"."std" or false); }
1710− { "0.4.3".std =
1711− (f.rand."0.4.3".std or false) ||
1763+ { "0.4.3"."std" =
1764+ (f.rand."0.4.3"."std" or false) ||
17121765 (f.rand."0.4.3".default or false) ||
17131766 (rand."0.4.3"."default" or false); }
1767+ { "0.4.3".default = (f.rand."0.4.3".default or true); }
17141768 ];
17151769 winapi = fold recursiveUpdate {} [
17161770 { "${deps.rand."0.4.3".winapi}"."minwindef" = true; }
@@ -1732,6 +1786,7 @@ rec {
17321786 crates.rand."0.5.5" = deps: { features?(features_.rand."0.5.5" deps {}) }: buildRustCrate {
17331787 crateName = "rand";
17341788 version = "0.5.5";
1789+ description = "Random number generators and other randomness functionality.\n";
17351790 authors = [ "The Rust Project Developers" ];
17361791 sha256 = "0d7pnsh57qxhz1ghrzk113ddkn13kf2g758ffnbxq4nhwjfzhlc9";
17371792 dependencies = mapFeatures features ([
@@ -1758,43 +1813,43 @@ rec {
17581813 fuchsia_zircon."${deps.rand."0.5.5".fuchsia_zircon}".default = true;
17591814 libc."${deps.rand."0.5.5".libc}".default = true;
17601815 rand = fold recursiveUpdate {} [
1761− { "0.5.5".alloc =
1762− (f.rand."0.5.5".alloc or false) ||
1816+ { "0.5.5"."alloc" =
1817+ (f.rand."0.5.5"."alloc" or false) ||
17631818 (f.rand."0.5.5".std or false) ||
17641819 (rand."0.5.5"."std" or false); }
1765− { "0.5.5".cloudabi =
1766− (f.rand."0.5.5".cloudabi or false) ||
1820+ { "0.5.5"."cloudabi" =
1821+ (f.rand."0.5.5"."cloudabi" or false) ||
17671822 (f.rand."0.5.5".std or false) ||
17681823 (rand."0.5.5"."std" or false); }
1769− { "0.5.5".default = (f.rand."0.5.5".default or true); }
1770− { "0.5.5".fuchsia-zircon =
1771− (f.rand."0.5.5".fuchsia-zircon or false) ||
1824+ { "0.5.5"."fuchsia-zircon" =
1825+ (f.rand."0.5.5"."fuchsia-zircon" or false) ||
17721826 (f.rand."0.5.5".std or false) ||
17731827 (rand."0.5.5"."std" or false); }
1774− { "0.5.5".i128_support =
1775− (f.rand."0.5.5".i128_support or false) ||
1828+ { "0.5.5"."i128_support" =
1829+ (f.rand."0.5.5"."i128_support" or false) ||
17761830 (f.rand."0.5.5".nightly or false) ||
17771831 (rand."0.5.5"."nightly" or false); }
1778− { "0.5.5".libc =
1779− (f.rand."0.5.5".libc or false) ||
1832+ { "0.5.5"."libc" =
1833+ (f.rand."0.5.5"."libc" or false) ||
17801834 (f.rand."0.5.5".std or false) ||
17811835 (rand."0.5.5"."std" or false); }
1782− { "0.5.5".serde =
1783− (f.rand."0.5.5".serde or false) ||
1836+ { "0.5.5"."serde" =
1837+ (f.rand."0.5.5"."serde" or false) ||
17841838 (f.rand."0.5.5".serde1 or false) ||
17851839 (rand."0.5.5"."serde1" or false); }
1786− { "0.5.5".serde_derive =
1787− (f.rand."0.5.5".serde_derive or false) ||
1840+ { "0.5.5"."serde_derive" =
1841+ (f.rand."0.5.5"."serde_derive" or false) ||
17881842 (f.rand."0.5.5".serde1 or false) ||
17891843 (rand."0.5.5"."serde1" or false); }
1790− { "0.5.5".std =
1791− (f.rand."0.5.5".std or false) ||
1844+ { "0.5.5"."std" =
1845+ (f.rand."0.5.5"."std" or false) ||
17921846 (f.rand."0.5.5".default or false) ||
17931847 (rand."0.5.5"."default" or false); }
1794− { "0.5.5".winapi =
1795− (f.rand."0.5.5".winapi or false) ||
1848+ { "0.5.5"."winapi" =
1849+ (f.rand."0.5.5"."winapi" or false) ||
17961850 (f.rand."0.5.5".std or false) ||
17971851 (rand."0.5.5"."std" or false); }
1852+ { "0.5.5".default = (f.rand."0.5.5".default or true); }
17981853 ];
17991854 rand_core = fold recursiveUpdate {} [
18001855 { "${deps.rand."0.5.5".rand_core}"."alloc" =
@@ -1833,6 +1888,7 @@ rec {
18331888 crates.rand_core."0.2.2" = deps: { features?(features_.rand_core."0.2.2" deps {}) }: buildRustCrate {
18341889 crateName = "rand_core";
18351890 version = "0.2.2";
1891+ description = "Core random number generator traits and tools for implementation.\n";
18361892 authors = [ "The Rust Project Developers" ];
18371893 sha256 = "1cxnaxmsirz2wxsajsjkd1wk6lqfqbcprqkha4bq3didznrl22sc";
18381894 dependencies = mapFeatures features ([
@@ -1868,6 +1924,7 @@ rec {
18681924 crates.rand_core."0.3.0" = deps: { features?(features_.rand_core."0.3.0" deps {}) }: buildRustCrate {
18691925 crateName = "rand_core";
18701926 version = "0.3.0";
1927+ description = "Core random number generator traits and tools for implementation.\n";
18711928 authors = [ "The Rust Project Developers" ];
18721929 sha256 = "1vafw316apjys9va3j987s02djhqp7y21v671v3ix0p5j9bjq339";
18731930 dependencies = mapFeatures features ([
@@ -1876,23 +1933,23 @@ rec {
18761933 };
18771934 features_.rand_core."0.3.0" = deps: f: updateFeatures f (rec {
18781935 rand_core = fold recursiveUpdate {} [
1879− { "0.3.0".alloc =
1880− (f.rand_core."0.3.0".alloc or false) ||
1936+ { "0.3.0"."alloc" =
1937+ (f.rand_core."0.3.0"."alloc" or false) ||
18811938 (f.rand_core."0.3.0".std or false) ||
18821939 (rand_core."0.3.0"."std" or false); }
1883− { "0.3.0".default = (f.rand_core."0.3.0".default or true); }
1884− { "0.3.0".serde =
1885− (f.rand_core."0.3.0".serde or false) ||
1940+ { "0.3.0"."serde" =
1941+ (f.rand_core."0.3.0"."serde" or false) ||
18861942 (f.rand_core."0.3.0".serde1 or false) ||
18871943 (rand_core."0.3.0"."serde1" or false); }
1888− { "0.3.0".serde_derive =
1889− (f.rand_core."0.3.0".serde_derive or false) ||
1944+ { "0.3.0"."serde_derive" =
1945+ (f.rand_core."0.3.0"."serde_derive" or false) ||
18901946 (f.rand_core."0.3.0".serde1 or false) ||
18911947 (rand_core."0.3.0"."serde1" or false); }
1892− { "0.3.0".std =
1893− (f.rand_core."0.3.0".std or false) ||
1948+ { "0.3.0"."std" =
1949+ (f.rand_core."0.3.0"."std" or false) ||
18941950 (f.rand_core."0.3.0".default or false) ||
18951951 (rand_core."0.3.0"."default" or false); }
1952+ { "0.3.0".default = (f.rand_core."0.3.0".default or true); }
18961953 ];
18971954 }) [];
18981955
@@ -1903,6 +1960,7 @@ rec {
19031960 crates.regex."0.1.80" = deps: { features?(features_.regex."0.1.80" deps {}) }: buildRustCrate {
19041961 crateName = "regex";
19051962 version = "0.1.80";
1963+ description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n";
19061964 authors = [ "The Rust Project Developers" ];
19071965 sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6";
19081966 dependencies = mapFeatures features ([
@@ -1918,11 +1976,11 @@ rec {
19181976 aho_corasick."${deps.regex."0.1.80".aho_corasick}".default = true;
19191977 memchr."${deps.regex."0.1.80".memchr}".default = true;
19201978 regex = fold recursiveUpdate {} [
1921− { "0.1.80".default = (f.regex."0.1.80".default or true); }
1922− { "0.1.80".simd =
1923− (f.regex."0.1.80".simd or false) ||
1979+ { "0.1.80"."simd" =
1980+ (f.regex."0.1.80"."simd" or false) ||
19241981 (f.regex."0.1.80".simd-accel or false) ||
19251982 (regex."0.1.80"."simd-accel" or false); }
1983+ { "0.1.80".default = (f.regex."0.1.80".default or true); }
19261984 ];
19271985 regex_syntax."${deps.regex."0.1.80".regex_syntax}".default = true;
19281986 thread_local."${deps.regex."0.1.80".thread_local}".default = true;
@@ -1942,6 +2000,7 @@ rec {
19422000 crates.regex_syntax."0.3.9" = deps: { features?(features_.regex_syntax."0.3.9" deps {}) }: buildRustCrate {
19432001 crateName = "regex-syntax";
19442002 version = "0.3.9";
2003+ description = "A regular expression parser.";
19452004 authors = [ "The Rust Project Developers" ];
19462005 sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
19472006 };
@@ -1956,6 +2015,7 @@ rec {
19562015 crates.rlua."0.9.7" = deps: { features?(features_.rlua."0.9.7" deps {}) }: buildRustCrate {
19572016 crateName = "rlua";
19582017 version = "0.9.7";
2018+ description = "High level bindings to Lua 5.3";
19592019 authors = [ "kyren <catherine@chucklefish.org>" ];
19602020 sha256 = "1671b5ga54aq49sqx69hvnjr732hf9jpqwswwxgpcqq8q05mfzgp";
19612021 dependencies = mapFeatures features ([
@@ -1971,15 +2031,15 @@ rec {
19712031 gcc."${deps.rlua."0.9.7".gcc}".default = true;
19722032 libc."${deps.rlua."0.9.7".libc}".default = true;
19732033 rlua = fold recursiveUpdate {} [
1974− { "0.9.7".builtin-lua =
1975− (f.rlua."0.9.7".builtin-lua or false) ||
2034+ { "0.9.7"."builtin-lua" =
2035+ (f.rlua."0.9.7"."builtin-lua" or false) ||
19762036 (f.rlua."0.9.7".default or false) ||
19772037 (rlua."0.9.7"."default" or false); }
1978− { "0.9.7".default = (f.rlua."0.9.7".default or true); }
1979− { "0.9.7".gcc =
1980− (f.rlua."0.9.7".gcc or false) ||
2038+ { "0.9.7"."gcc" =
2039+ (f.rlua."0.9.7"."gcc" or false) ||
19812040 (f.rlua."0.9.7".builtin-lua or false) ||
19822041 (rlua."0.9.7"."builtin-lua" or false); }
2042+ { "0.9.7".default = (f.rlua."0.9.7".default or true); }
19832043 ];
19842044 }) [
19852045 (features_.libc."${deps."rlua"."0.9.7"."libc"}" deps)
@@ -1993,6 +2053,7 @@ rec {
19932053 crates.rustc_serialize."0.3.24" = deps: { features?(features_.rustc_serialize."0.3.24" deps {}) }: buildRustCrate {
19942054 crateName = "rustc-serialize";
19952055 version = "0.3.24";
2056+ description = "Generic serialization/deserialization support corresponding to the\n`derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes\nsupport for hex, base64, and json encoding and decoding.\n";
19962057 authors = [ "The Rust Project Developers" ];
19972058 sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
19982059 };
@@ -2007,6 +2068,7 @@ rec {
20072068 crates.rustc_version."0.1.7" = deps: { features?(features_.rustc_version."0.1.7" deps {}) }: buildRustCrate {
20082069 crateName = "rustc_version";
20092070 version = "0.1.7";
2071+ description = "A library for querying the version of a installed rustc compiler";
20102072 authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
20112073 sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
20122074 dependencies = mapFeatures features ([
@@ -2027,6 +2089,7 @@ rec {
20272089 crates.rustwlc."0.7.0" = deps: { features?(features_.rustwlc."0.7.0" deps {}) }: buildRustCrate {
20282090 crateName = "rustwlc";
20292091 version = "0.7.0";
2092+ description = "wlc Wayland library bindings for Rust";
20302093 authors = [ "Snirk Immington <snirk.immington@gmail.com>" "Timidger <apragmaticplace@gmail.com>" ];
20312094 sha256 = "0gqi9pdw74al33ja25h33q68vnfklj3gpjgkiqqbr3gflgli5h1i";
20322095 build = "build.rs";
@@ -2041,11 +2104,11 @@ rec {
20412104 bitflags."${deps.rustwlc."0.7.0".bitflags}".default = true;
20422105 libc."${deps.rustwlc."0.7.0".libc}".default = true;
20432106 rustwlc = fold recursiveUpdate {} [
2044− { "0.7.0".default = (f.rustwlc."0.7.0".default or true); }
2045− { "0.7.0".wayland-sys =
2046− (f.rustwlc."0.7.0".wayland-sys or false) ||
2107+ { "0.7.0"."wayland-sys" =
2108+ (f.rustwlc."0.7.0"."wayland-sys" or false) ||
20472109 (f.rustwlc."0.7.0".wlc-wayland or false) ||
20482110 (rustwlc."0.7.0"."wlc-wayland" or false); }
2111+ { "0.7.0".default = (f.rustwlc."0.7.0".default or true); }
20492112 ];
20502113 wayland_sys = fold recursiveUpdate {} [
20512114 { "${deps.rustwlc."0.7.0".wayland_sys}"."server" = true; }
@@ -2064,6 +2127,7 @@ rec {
20642127 crates.semver."0.1.20" = deps: { features?(features_.semver."0.1.20" deps {}) }: buildRustCrate {
20652128 crateName = "semver";
20662129 version = "0.1.20";
2130+ description = "Semantic version parsing and comparison.\n";
20672131 authors = [ "The Rust Project Developers" ];
20682132 sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
20692133 };
@@ -2078,6 +2142,7 @@ rec {
20782142 crates.serde."0.9.15" = deps: { features?(features_.serde."0.9.15" deps {}) }: buildRustCrate {
20792143 crateName = "serde";
20802144 version = "0.9.15";
2145+ description = "A generic serialization/deserialization framework";
20812146 authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
20822147 sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b";
20832148 dependencies = mapFeatures features ([
@@ -2086,29 +2151,29 @@ rec {
20862151 };
20872152 features_.serde."0.9.15" = deps: f: updateFeatures f (rec {
20882153 serde = fold recursiveUpdate {} [
2089− { "0.9.15".alloc =
2090− (f.serde."0.9.15".alloc or false) ||
2154+ { "0.9.15"."alloc" =
2155+ (f.serde."0.9.15"."alloc" or false) ||
20912156 (f.serde."0.9.15".collections or false) ||
20922157 (serde."0.9.15"."collections" or false); }
2093− { "0.9.15".default = (f.serde."0.9.15".default or true); }
2094− { "0.9.15".serde_derive =
2095− (f.serde."0.9.15".serde_derive or false) ||
2158+ { "0.9.15"."serde_derive" =
2159+ (f.serde."0.9.15"."serde_derive" or false) ||
20962160 (f.serde."0.9.15".derive or false) ||
20972161 (serde."0.9.15"."derive" or false) ||
20982162 (f.serde."0.9.15".playground or false) ||
20992163 (serde."0.9.15"."playground" or false); }
2100− { "0.9.15".std =
2101− (f.serde."0.9.15".std or false) ||
2164+ { "0.9.15"."std" =
2165+ (f.serde."0.9.15"."std" or false) ||
21022166 (f.serde."0.9.15".default or false) ||
21032167 (serde."0.9.15"."default" or false) ||
21042168 (f.serde."0.9.15".unstable-testing or false) ||
21052169 (serde."0.9.15"."unstable-testing" or false); }
2106− { "0.9.15".unstable =
2107− (f.serde."0.9.15".unstable or false) ||
2170+ { "0.9.15"."unstable" =
2171+ (f.serde."0.9.15"."unstable" or false) ||
21082172 (f.serde."0.9.15".alloc or false) ||
21092173 (serde."0.9.15"."alloc" or false) ||
21102174 (f.serde."0.9.15".unstable-testing or false) ||
21112175 (serde."0.9.15"."unstable-testing" or false); }
2176+ { "0.9.15".default = (f.serde."0.9.15".default or true); }
21122177 ];
21132178 }) [];
21142179
@@ -2119,6 +2184,7 @@ rec {
21192184 crates.serde_json."0.9.10" = deps: { features?(features_.serde_json."0.9.10" deps {}) }: buildRustCrate {
21202185 crateName = "serde_json";
21212186 version = "0.9.10";
2187+ description = "A JSON serialization file format";
21222188 authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
21232189 sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
21242190 dependencies = mapFeatures features ([
@@ -2135,11 +2201,11 @@ rec {
21352201 num_traits."${deps.serde_json."0.9.10".num_traits}".default = true;
21362202 serde."${deps.serde_json."0.9.10".serde}".default = true;
21372203 serde_json = fold recursiveUpdate {} [
2138− { "0.9.10".default = (f.serde_json."0.9.10".default or true); }
2139− { "0.9.10".linked-hash-map =
2140− (f.serde_json."0.9.10".linked-hash-map or false) ||
2204+ { "0.9.10"."linked-hash-map" =
2205+ (f.serde_json."0.9.10"."linked-hash-map" or false) ||
21412206 (f.serde_json."0.9.10".preserve_order or false) ||
21422207 (serde_json."0.9.10"."preserve_order" or false); }
2208+ { "0.9.10".default = (f.serde_json."0.9.10".default or true); }
21432209 ];
21442210 }) [
21452211 (features_.dtoa."${deps."serde_json"."0.9.10"."dtoa"}" deps)
@@ -2155,6 +2221,7 @@ rec {
21552221 crates.siphasher."0.2.3" = deps: { features?(features_.siphasher."0.2.3" deps {}) }: buildRustCrate {
21562222 crateName = "siphasher";
21572223 version = "0.2.3";
2224+ description = "SipHash functions from rust-core < 1.13";
21582225 authors = [ "Frank Denis <github@pureftpd.org>" ];
21592226 sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw";
21602227 };
@@ -2169,6 +2236,7 @@ rec {
21692236 crates.target_build_utils."0.3.1" = deps: { features?(features_.target_build_utils."0.3.1" deps {}) }: buildRustCrate {
21702237 crateName = "target_build_utils";
21712238 version = "0.3.1";
2239+ description = "DEPRECATED: Use Cargo environment variables `CARGO_CFG_TARGET_*`";
21722240 authors = [ "Simonas Kazlauskas <target_build_utils@kazlauskas.me>" ];
21732241 sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj";
21742242 build = "build.rs";
@@ -2187,11 +2255,11 @@ rec {
21872255 phf_codegen."${deps.target_build_utils."0.3.1".phf_codegen}".default = true;
21882256 serde_json."${deps.target_build_utils."0.3.1".serde_json}".default = true;
21892257 target_build_utils = fold recursiveUpdate {} [
2190− { "0.3.1".default = (f.target_build_utils."0.3.1".default or true); }
2191− { "0.3.1".serde_json =
2192− (f.target_build_utils."0.3.1".serde_json or false) ||
2258+ { "0.3.1"."serde_json" =
2259+ (f.target_build_utils."0.3.1"."serde_json" or false) ||
21932260 (f.target_build_utils."0.3.1".default or false) ||
21942261 (target_build_utils."0.3.1"."default" or false); }
2262+ { "0.3.1".default = (f.target_build_utils."0.3.1".default or true); }
21952263 ];
21962264 }) [
21972265 (features_.phf."${deps."target_build_utils"."0.3.1"."phf"}" deps)
@@ -2206,6 +2274,7 @@ rec {
22062274 crates.thread_id."2.0.0" = deps: { features?(features_.thread_id."2.0.0" deps {}) }: buildRustCrate {
22072275 crateName = "thread-id";
22082276 version = "2.0.0";
2277+ description = "Get a unique thread ID";
22092278 authors = [ "Ruud van Asseldonk <dev@veniogames.com>" ];
22102279 sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3";
22112280 dependencies = mapFeatures features ([
@@ -2229,6 +2298,7 @@ rec {
22292298 crates.thread_local."0.2.7" = deps: { features?(features_.thread_local."0.2.7" deps {}) }: buildRustCrate {
22302299 crateName = "thread_local";
22312300 version = "0.2.7";
2301+ description = "Per-object thread-local storage";
22322302 authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
22332303 sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7";
22342304 dependencies = mapFeatures features ([
@@ -2249,6 +2319,7 @@ rec {
22492319 crates.token_store."0.1.2" = deps: { features?(features_.token_store."0.1.2" deps {}) }: buildRustCrate {
22502320 crateName = "token_store";
22512321 version = "0.1.2";
2322+ description = "A token-based store for arbitrary values";
22522323 authors = [ "Victor Berger <victor.berger@m4x.org>" ];
22532324 sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq";
22542325 };
@@ -2263,6 +2334,7 @@ rec {
22632334 crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate {
22642335 crateName = "unicode-width";
22652336 version = "0.1.5";
2337+ description = "Determine displayed width of `char` and `str` types\naccording to Unicode Standard Annex #11 rules.\n";
22662338 authors = [ "kwantam <kwantam@gmail.com>" ];
22672339 sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
22682340 features = mkFeatures (features."unicode_width"."0.1.5" or {});
@@ -2278,6 +2350,7 @@ rec {
22782350 crates.utf8_ranges."0.1.3" = deps: { features?(features_.utf8_ranges."0.1.3" deps {}) }: buildRustCrate {
22792351 crateName = "utf8-ranges";
22802352 version = "0.1.3";
2353+ description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges.";
22812354 authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
22822355 sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
22832356 };
@@ -2292,6 +2365,7 @@ rec {
22922365 crates.uuid."0.3.1" = deps: { features?(features_.uuid."0.3.1" deps {}) }: buildRustCrate {
22932366 crateName = "uuid";
22942367 version = "0.3.1";
2368+ description = "A library to generate and parse UUIDs.\n";
22952369 authors = [ "The Rust Project Developers" ];
22962370 sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip";
22972371 dependencies = mapFeatures features ([
@@ -2304,15 +2378,15 @@ rec {
23042378 rand."${deps.uuid."0.3.1".rand}".default = true;
23052379 rustc_serialize."${deps.uuid."0.3.1".rustc_serialize}".default = true;
23062380 uuid = fold recursiveUpdate {} [
2307− { "0.3.1".default = (f.uuid."0.3.1".default or true); }
2308− { "0.3.1".rand =
2309− (f.uuid."0.3.1".rand or false) ||
2381+ { "0.3.1"."rand" =
2382+ (f.uuid."0.3.1"."rand" or false) ||
23102383 (f.uuid."0.3.1".v4 or false) ||
23112384 (uuid."0.3.1"."v4" or false); }
2312− { "0.3.1".sha1 =
2313− (f.uuid."0.3.1".sha1 or false) ||
2385+ { "0.3.1"."sha1" =
2386+ (f.uuid."0.3.1"."sha1" or false) ||
23142387 (f.uuid."0.3.1".v5 or false) ||
23152388 (uuid."0.3.1"."v5" or false); }
2389+ { "0.3.1".default = (f.uuid."0.3.1".default or true); }
23162390 ];
23172391 }) [
23182392 (features_.rand."${deps."uuid"."0.3.1"."rand"}" deps)
@@ -2326,17 +2400,18 @@ rec {
23262400 crates.void."1.0.2" = deps: { features?(features_.void."1.0.2" deps {}) }: buildRustCrate {
23272401 crateName = "void";
23282402 version = "1.0.2";
2403+ description = "The uninhabited void type for use in statically impossible cases.";
23292404 authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
23302405 sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
23312406 features = mkFeatures (features."void"."1.0.2" or {});
23322407 };
23332408 features_.void."1.0.2" = deps: f: updateFeatures f (rec {
23342409 void = fold recursiveUpdate {} [
2335− { "1.0.2".default = (f.void."1.0.2".default or true); }
2336− { "1.0.2".std =
2337− (f.void."1.0.2".std or false) ||
2410+ { "1.0.2"."std" =
2411+ (f.void."1.0.2"."std" or false) ||
23382412 (f.void."1.0.2".default or false) ||
23392413 (void."1.0.2"."default" or false); }
2414+ { "1.0.2".default = (f.void."1.0.2".default or true); }
23402415 ];
23412416 }) [];
23422417
@@ -2347,6 +2422,7 @@ rec {
23472422 crates.way_cooler."0.8.1" = deps: { features?(features_.way_cooler."0.8.1" deps {}) }: buildRustCrate {
23482423 crateName = "way-cooler";
23492424 version = "0.8.1";
2425+ description = "Customizeable Wayland compositor written in Rust";
23502426 authors = [ "Snirk Immington <snirk.immington@gmail.com>" "Timidger <apragmaticplace@gmail.com>" ];
23512427 sha256 = "01cp5z0qf522d7cvsr9gfp7f4hkphmp38hv70dsf9lvcnp6p1qkc";
23522428 build = "build.rs";
@@ -2459,6 +2535,7 @@ rec {
24592535 crates.wayland_scanner."0.12.5" = deps: { features?(features_.wayland_scanner."0.12.5" deps {}) }: buildRustCrate {
24602536 crateName = "wayland-scanner";
24612537 version = "0.12.5";
2538+ description = "Wayland Scanner for generating rust APIs from XML wayland protocol files. Intented for use with wayland-sys. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
24622539 authors = [ "Victor Berger <victor.berger@m4x.org>" ];
24632540 sha256 = "1s0fsc3pff0fxvzqsy8n018smwacih9ix8ww0yf969aa0vak15dz";
24642541 dependencies = mapFeatures features ([
@@ -2479,6 +2556,7 @@ rec {
24792556 crates.wayland_server."0.12.5" = deps: { features?(features_.wayland_server."0.12.5" deps {}) }: buildRustCrate {
24802557 crateName = "wayland-server";
24812558 version = "0.12.5";
2559+ description = "Bindings to the standard C implementation of the wayland protocol, server side.";
24822560 authors = [ "Victor Berger <victor.berger@m4x.org>" ];
24832561 sha256 = "17g0m9afcmi24ylirw4l8i70s5849x7m4b5nxk9k13s5pkza68ag";
24842562 build = "build.rs";
@@ -2526,6 +2604,7 @@ rec {
25262604 crates.wayland_sys."0.6.0" = deps: { features?(features_.wayland_sys."0.6.0" deps {}) }: buildRustCrate {
25272605 crateName = "wayland-sys";
25282606 version = "0.6.0";
2607+ description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
25292608 authors = [ "Victor Berger <victor.berger@m4x.org>" ];
25302609 sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl";
25312610 dependencies = mapFeatures features ([
@@ -2544,15 +2623,15 @@ rec {
25442623 ];
25452624 libc."${deps.wayland_sys."0.6.0".libc}".default = true;
25462625 wayland_sys = fold recursiveUpdate {} [
2547− { "0.6.0".default = (f.wayland_sys."0.6.0".default or true); }
2548− { "0.6.0".lazy_static =
2549− (f.wayland_sys."0.6.0".lazy_static or false) ||
2626+ { "0.6.0"."lazy_static" =
2627+ (f.wayland_sys."0.6.0"."lazy_static" or false) ||
25502628 (f.wayland_sys."0.6.0".dlopen or false) ||
25512629 (wayland_sys."0.6.0"."dlopen" or false); }
2552− { "0.6.0".libc =
2553− (f.wayland_sys."0.6.0".libc or false) ||
2630+ { "0.6.0"."libc" =
2631+ (f.wayland_sys."0.6.0"."libc" or false) ||
25542632 (f.wayland_sys."0.6.0".server or false) ||
25552633 (wayland_sys."0.6.0"."server" or false); }
2634+ { "0.6.0".default = (f.wayland_sys."0.6.0".default or true); }
25562635 ];
25572636 }) [
25582637 (features_.dlib."${deps."wayland_sys"."0.6.0"."dlib"}" deps)
@@ -2566,6 +2645,7 @@ rec {
25662645 crates.wayland_sys."0.9.10" = deps: { features?(features_.wayland_sys."0.9.10" deps {}) }: buildRustCrate {
25672646 crateName = "wayland-sys";
25682647 version = "0.9.10";
2648+ description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
25692649 authors = [ "Victor Berger <victor.berger@m4x.org>" ];
25702650 sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8";
25712651 dependencies = mapFeatures features ([
@@ -2586,15 +2666,15 @@ rec {
25862666 lazy_static."${deps.wayland_sys."0.9.10".lazy_static}".default = true;
25872667 libc."${deps.wayland_sys."0.9.10".libc}".default = true;
25882668 wayland_sys = fold recursiveUpdate {} [
2589− { "0.9.10".default = (f.wayland_sys."0.9.10".default or true); }
2590− { "0.9.10".lazy_static =
2591− (f.wayland_sys."0.9.10".lazy_static or false) ||
2669+ { "0.9.10"."lazy_static" =
2670+ (f.wayland_sys."0.9.10"."lazy_static" or false) ||
25922671 (f.wayland_sys."0.9.10".dlopen or false) ||
25932672 (wayland_sys."0.9.10"."dlopen" or false); }
2594− { "0.9.10".libc =
2595− (f.wayland_sys."0.9.10".libc or false) ||
2673+ { "0.9.10"."libc" =
2674+ (f.wayland_sys."0.9.10"."libc" or false) ||
25962675 (f.wayland_sys."0.9.10".server or false) ||
25972676 (wayland_sys."0.9.10"."server" or false); }
2677+ { "0.9.10".default = (f.wayland_sys."0.9.10".default or true); }
25982678 ];
25992679 }) [
26002680 (features_.dlib."${deps."wayland_sys"."0.9.10"."dlib"}" deps)
@@ -2609,6 +2689,7 @@ rec {
26092689 crates.wayland_sys."0.12.5" = deps: { features?(features_.wayland_sys."0.12.5" deps {}) }: buildRustCrate {
26102690 crateName = "wayland-sys";
26112691 version = "0.12.5";
2692+ description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
26122693 authors = [ "Victor Berger <victor.berger@m4x.org>" ];
26132694 sha256 = "0mwk5vc7mibxka5w66vy2qj32b72d1srqvp36nr15xfl9lwf3dc4";
26142695 dependencies = mapFeatures features ([
@@ -2629,15 +2710,15 @@ rec {
26292710 lazy_static."${deps.wayland_sys."0.12.5".lazy_static}".default = true;
26302711 libc."${deps.wayland_sys."0.12.5".libc}".default = true;
26312712 wayland_sys = fold recursiveUpdate {} [
2632− { "0.12.5".default = (f.wayland_sys."0.12.5".default or true); }
2633− { "0.12.5".lazy_static =
2634− (f.wayland_sys."0.12.5".lazy_static or false) ||
2713+ { "0.12.5"."lazy_static" =
2714+ (f.wayland_sys."0.12.5"."lazy_static" or false) ||
26352715 (f.wayland_sys."0.12.5".dlopen or false) ||
26362716 (wayland_sys."0.12.5"."dlopen" or false); }
2637− { "0.12.5".libc =
2638− (f.wayland_sys."0.12.5".libc or false) ||
2717+ { "0.12.5"."libc" =
2718+ (f.wayland_sys."0.12.5"."libc" or false) ||
26392719 (f.wayland_sys."0.12.5".server or false) ||
26402720 (wayland_sys."0.12.5"."server" or false); }
2721+ { "0.12.5".default = (f.wayland_sys."0.12.5".default or true); }
26412722 ];
26422723 }) [
26432724 (features_.dlib."${deps."wayland_sys"."0.12.5"."dlib"}" deps)
@@ -2652,6 +2733,7 @@ rec {
26522733 crates.winapi."0.2.8" = deps: { features?(features_.winapi."0.2.8" deps {}) }: buildRustCrate {
26532734 crateName = "winapi";
26542735 version = "0.2.8";
2736+ description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings.";
26552737 authors = [ "Peter Atashian <retep998@gmail.com>" ];
26562738 sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
26572739 };
@@ -2666,6 +2748,7 @@ rec {
26662748 crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate {
26672749 crateName = "winapi";
26682750 version = "0.3.6";
2751+ description = "Raw FFI bindings for all of Windows API.";
26692752 authors = [ "Peter Atashian <retep998@gmail.com>" ];
26702753 sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4";
26712754 build = "build.rs";
@@ -2693,6 +2776,7 @@ rec {
26932776 crates.winapi_build."0.1.1" = deps: { features?(features_.winapi_build."0.1.1" deps {}) }: buildRustCrate {
26942777 crateName = "winapi-build";
26952778 version = "0.1.1";
2779+ description = "Common code for build.rs in WinAPI -sys crates.";
26962780 authors = [ "Peter Atashian <retep998@gmail.com>" ];
26972781 sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
26982782 libName = "build";
@@ -2708,6 +2792,7 @@ rec {
27082792 crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
27092793 crateName = "winapi-i686-pc-windows-gnu";
27102794 version = "0.4.0";
2795+ description = "Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead.";
27112796 authors = [ "Peter Atashian <retep998@gmail.com>" ];
27122797 sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
27132798 build = "build.rs";
@@ -2723,6 +2808,7 @@ rec {
27232808 crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
27242809 crateName = "winapi-x86_64-pc-windows-gnu";
27252810 version = "0.4.0";
2811+ description = "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead.";
27262812 authors = [ "Peter Atashian <retep998@gmail.com>" ];
27272813 sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
27282814 build = "build.rs";
@@ -2738,6 +2824,7 @@ rec {
27382824 crates.xcb."0.8.2" = deps: { features?(features_.xcb."0.8.2" deps {}) }: buildRustCrate {
27392825 crateName = "xcb";
27402826 version = "0.8.2";
2827+ description = "Rust bindings and wrappers for XCB";
27412828 authors = [ "Remi Thebault <remi.thebault@gmail.com>" ];
27422829 sha256 = "06l8jms57wvz01vx82a3cwak9b9qwdkadvpmkk1zimy2qg7i7dkl";
27432830 build = "build.rs";
@@ -2755,41 +2842,40 @@ rec {
27552842 libc."${deps.xcb."0.8.2".libc}".default = true;
27562843 log."${deps.xcb."0.8.2".log}".default = true;
27572844 xcb = fold recursiveUpdate {} [
2758− { "0.8.2".composite =
2759− (f.xcb."0.8.2".composite or false) ||
2845+ { "0.8.2"."composite" =
2846+ (f.xcb."0.8.2"."composite" or false) ||
27602847 (f.xcb."0.8.2".debug_all or false) ||
27612848 (xcb."0.8.2"."debug_all" or false); }
2762− { "0.8.2".damage =
2763− (f.xcb."0.8.2".damage or false) ||
2849+ { "0.8.2"."damage" =
2850+ (f.xcb."0.8.2"."damage" or false) ||
27642851 (f.xcb."0.8.2".debug_all or false) ||
27652852 (xcb."0.8.2"."debug_all" or false); }
2766− { "0.8.2".default = (f.xcb."0.8.2".default or true); }
2767− { "0.8.2".dpms =
2768− (f.xcb."0.8.2".dpms or false) ||
2853+ { "0.8.2"."dpms" =
2854+ (f.xcb."0.8.2"."dpms" or false) ||
27692855 (f.xcb."0.8.2".debug_all or false) ||
27702856 (xcb."0.8.2"."debug_all" or false); }
2771− { "0.8.2".dri2 =
2772− (f.xcb."0.8.2".dri2 or false) ||
2857+ { "0.8.2"."dri2" =
2858+ (f.xcb."0.8.2"."dri2" or false) ||
27732859 (f.xcb."0.8.2".debug_all or false) ||
27742860 (xcb."0.8.2"."debug_all" or false); }
2775− { "0.8.2".dri3 =
2776− (f.xcb."0.8.2".dri3 or false) ||
2861+ { "0.8.2"."dri3" =
2862+ (f.xcb."0.8.2"."dri3" or false) ||
27772863 (f.xcb."0.8.2".debug_all or false) ||
27782864 (xcb."0.8.2"."debug_all" or false); }
2779− { "0.8.2".glx =
2780− (f.xcb."0.8.2".glx or false) ||
2865+ { "0.8.2"."glx" =
2866+ (f.xcb."0.8.2"."glx" or false) ||
27812867 (f.xcb."0.8.2".debug_all or false) ||
27822868 (xcb."0.8.2"."debug_all" or false); }
2783− { "0.8.2".randr =
2784− (f.xcb."0.8.2".randr or false) ||
2869+ { "0.8.2"."randr" =
2870+ (f.xcb."0.8.2"."randr" or false) ||
27852871 (f.xcb."0.8.2".debug_all or false) ||
27862872 (xcb."0.8.2"."debug_all" or false); }
2787− { "0.8.2".record =
2788− (f.xcb."0.8.2".record or false) ||
2873+ { "0.8.2"."record" =
2874+ (f.xcb."0.8.2"."record" or false) ||
27892875 (f.xcb."0.8.2".debug_all or false) ||
27902876 (xcb."0.8.2"."debug_all" or false); }
2791− { "0.8.2".render =
2792− (f.xcb."0.8.2".render or false) ||
2877+ { "0.8.2"."render" =
2878+ (f.xcb."0.8.2"."render" or false) ||
27932879 (f.xcb."0.8.2".debug_all or false) ||
27942880 (xcb."0.8.2"."debug_all" or false) ||
27952881 (f.xcb."0.8.2".present or false) ||
@@ -2798,44 +2884,44 @@ rec {
27982884 (xcb."0.8.2"."randr" or false) ||
27992885 (f.xcb."0.8.2".xfixes or false) ||
28002886 (xcb."0.8.2"."xfixes" or false); }
2801− { "0.8.2".res =
2802− (f.xcb."0.8.2".res or false) ||
2887+ { "0.8.2"."res" =
2888+ (f.xcb."0.8.2"."res" or false) ||
28032889 (f.xcb."0.8.2".debug_all or false) ||
28042890 (xcb."0.8.2"."debug_all" or false); }
2805− { "0.8.2".screensaver =
2806− (f.xcb."0.8.2".screensaver or false) ||
2891+ { "0.8.2"."screensaver" =
2892+ (f.xcb."0.8.2"."screensaver" or false) ||
28072893 (f.xcb."0.8.2".debug_all or false) ||
28082894 (xcb."0.8.2"."debug_all" or false); }
2809− { "0.8.2".shape =
2810− (f.xcb."0.8.2".shape or false) ||
2895+ { "0.8.2"."shape" =
2896+ (f.xcb."0.8.2"."shape" or false) ||
28112897 (f.xcb."0.8.2".debug_all or false) ||
28122898 (xcb."0.8.2"."debug_all" or false) ||
28132899 (f.xcb."0.8.2".xfixes or false) ||
28142900 (xcb."0.8.2"."xfixes" or false); }
2815− { "0.8.2".shm =
2816− (f.xcb."0.8.2".shm or false) ||
2901+ { "0.8.2"."shm" =
2902+ (f.xcb."0.8.2"."shm" or false) ||
28172903 (f.xcb."0.8.2".debug_all or false) ||
28182904 (xcb."0.8.2"."debug_all" or false) ||
28192905 (f.xcb."0.8.2".xv or false) ||
28202906 (xcb."0.8.2"."xv" or false); }
2821− { "0.8.2".sync =
2822− (f.xcb."0.8.2".sync or false) ||
2907+ { "0.8.2"."sync" =
2908+ (f.xcb."0.8.2"."sync" or false) ||
28232909 (f.xcb."0.8.2".present or false) ||
28242910 (xcb."0.8.2"."present" or false); }
2825− { "0.8.2".thread =
2826− (f.xcb."0.8.2".thread or false) ||
2911+ { "0.8.2"."thread" =
2912+ (f.xcb."0.8.2"."thread" or false) ||
28272913 (f.xcb."0.8.2".debug_all or false) ||
28282914 (xcb."0.8.2"."debug_all" or false); }
2829− { "0.8.2".xevie =
2830− (f.xcb."0.8.2".xevie or false) ||
2915+ { "0.8.2"."xevie" =
2916+ (f.xcb."0.8.2"."xevie" or false) ||
28312917 (f.xcb."0.8.2".debug_all or false) ||
28322918 (xcb."0.8.2"."debug_all" or false); }
2833− { "0.8.2".xf86dri =
2834− (f.xcb."0.8.2".xf86dri or false) ||
2919+ { "0.8.2"."xf86dri" =
2920+ (f.xcb."0.8.2"."xf86dri" or false) ||
28352921 (f.xcb."0.8.2".debug_all or false) ||
28362922 (xcb."0.8.2"."debug_all" or false); }
2837− { "0.8.2".xfixes =
2838− (f.xcb."0.8.2".xfixes or false) ||
2923+ { "0.8.2"."xfixes" =
2924+ (f.xcb."0.8.2"."xfixes" or false) ||
28392925 (f.xcb."0.8.2".composite or false) ||
28402926 (xcb."0.8.2"."composite" or false) ||
28412927 (f.xcb."0.8.2".damage or false) ||
@@ -2846,40 +2932,41 @@ rec {
28462932 (xcb."0.8.2"."present" or false) ||
28472933 (f.xcb."0.8.2".xinput or false) ||
28482934 (xcb."0.8.2"."xinput" or false); }
2849− { "0.8.2".xinerama =
2850− (f.xcb."0.8.2".xinerama or false) ||
2935+ { "0.8.2"."xinerama" =
2936+ (f.xcb."0.8.2"."xinerama" or false) ||
28512937 (f.xcb."0.8.2".debug_all or false) ||
28522938 (xcb."0.8.2"."debug_all" or false); }
2853− { "0.8.2".xkb =
2854− (f.xcb."0.8.2".xkb or false) ||
2939+ { "0.8.2"."xkb" =
2940+ (f.xcb."0.8.2"."xkb" or false) ||
28552941 (f.xcb."0.8.2".debug_all or false) ||
28562942 (xcb."0.8.2"."debug_all" or false); }
2857− { "0.8.2".xlib_xcb =
2858− (f.xcb."0.8.2".xlib_xcb or false) ||
2943+ { "0.8.2"."xlib_xcb" =
2944+ (f.xcb."0.8.2"."xlib_xcb" or false) ||
28592945 (f.xcb."0.8.2".debug_all or false) ||
28602946 (xcb."0.8.2"."debug_all" or false); }
2861− { "0.8.2".xprint =
2862− (f.xcb."0.8.2".xprint or false) ||
2947+ { "0.8.2"."xprint" =
2948+ (f.xcb."0.8.2"."xprint" or false) ||
28632949 (f.xcb."0.8.2".debug_all or false) ||
28642950 (xcb."0.8.2"."debug_all" or false); }
2865− { "0.8.2".xselinux =
2866− (f.xcb."0.8.2".xselinux or false) ||
2951+ { "0.8.2"."xselinux" =
2952+ (f.xcb."0.8.2"."xselinux" or false) ||
28672953 (f.xcb."0.8.2".debug_all or false) ||
28682954 (xcb."0.8.2"."debug_all" or false); }
2869− { "0.8.2".xtest =
2870− (f.xcb."0.8.2".xtest or false) ||
2955+ { "0.8.2"."xtest" =
2956+ (f.xcb."0.8.2"."xtest" or false) ||
28712957 (f.xcb."0.8.2".debug_all or false) ||
28722958 (xcb."0.8.2"."debug_all" or false); }
2873− { "0.8.2".xv =
2874− (f.xcb."0.8.2".xv or false) ||
2959+ { "0.8.2"."xv" =
2960+ (f.xcb."0.8.2"."xv" or false) ||
28752961 (f.xcb."0.8.2".debug_all or false) ||
28762962 (xcb."0.8.2"."debug_all" or false) ||
28772963 (f.xcb."0.8.2".xvmc or false) ||
28782964 (xcb."0.8.2"."xvmc" or false); }
2879− { "0.8.2".xvmc =
2880− (f.xcb."0.8.2".xvmc or false) ||
2965+ { "0.8.2"."xvmc" =
2966+ (f.xcb."0.8.2"."xvmc" or false) ||
28812967 (f.xcb."0.8.2".debug_all or false) ||
28822968 (xcb."0.8.2"."debug_all" or false); }
2969+ { "0.8.2".default = (f.xcb."0.8.2".default or true); }
28832970 ];
28842971 }) [
28852972 (features_.libc."${deps."xcb"."0.8.2"."libc"}" deps)
@@ -2894,6 +2981,7 @@ rec {
28942981 crates.xml_rs."0.7.0" = deps: { features?(features_.xml_rs."0.7.0" deps {}) }: buildRustCrate {
28952982 crateName = "xml-rs";
28962983 version = "0.7.0";
2984+ description = "An XML library in pure Rust";
28972985 authors = [ "Vladimir Matveev <vladimir.matweev@gmail.com>" ];
28982986 sha256 = "12rynhqjgkg2hzy9x1d1232p9d9jm40bc3by5yzjv8gx089mflyb";
28992987 libPath = "src/lib.rs";
pkgs/applications/window-managers/way-cooler/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
2−, wayland, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf
2+, wayland, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk-pixbuf
33}:
44
55let
@@ -24,7 +24,7 @@ let
2424 way-cooler = ((way_cooler_ { builtin-lua = true; }).override {
2525 crateOverrides = defaultCrateOverrides // {
2626
27− way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; };
27+ way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk-pixbuf wayland ]; };
2828 };}).overrideAttrs (oldAttrs: rec {
2929 postBuild = ''
3030 mkdir -p $out/etc
pkgs/applications/window-managers/yabar/build.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig
1+{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkgconfig
22, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
33, configFile ? null, lib
44, rev, sha256, version, patches ? []
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020
2121 nativeBuildInputs = [ pkgconfig ];
2222 buildInputs = [
23− cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl
23+ cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl
2424 alsaLib wirelesstools asciidoc libxslt makeWrapper
2525 ];
2626
pkgs/build-support/appimage/default.nix+1−1
@@ -97,7 +97,7 @@ rec {
9797 gtk2
9898 bzip2
9999 zlib
100− gdk_pixbuf
100+ gdk-pixbuf
101101
102102 xorg.libXinerama
103103 xorg.libXdamage
pkgs/build-support/rust/default-crate-overrides.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,
2− openssl, sqlite, zlib, dbus, dbus-glib, gdk_pixbuf, cairo, python3,
2+ openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3,
33 libsodium, postgresql, gmp, foundationdb, ... }:
44
55let
@@ -62,7 +62,7 @@ in
6262 };
6363
6464 gdk-pixbuf = attrs: {
65− buildInputs = [ gdk_pixbuf ];
65+ buildInputs = [ gdk-pixbuf ];
6666 };
6767
6868 libgit2-sys = attrs: {
pkgs/data/icons/elementary-xfce-icon-theme/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:
1+{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:
22
33stdenv.mkDerivation rec {
44 name = "elementary-xfce-icon-theme-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "16msdrazhbv80cvh5ffvgj13xmkpf87r7mq6xz071fza6nv7g0jn";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig gdk_pixbuf librsvg optipng gtk3 hicolor-icon-theme ];
14+ nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 hicolor-icon-theme ];
1515
1616 postPatch = ''
1717 substituteInPlace svgtopng/Makefile --replace "-O0" "-O"
pkgs/data/themes/greybird/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }:
22
33stdenv.mkDerivation rec {
44 pname = "greybird";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 ];
2121
2222 buildInputs = [
23− gdk_pixbuf
23+ gdk-pixbuf
2424 librsvg
2525 ];
2626
pkgs/data/themes/matcha/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
1+{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
22
33stdenv.mkDerivation rec {
44 name = "matcha-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "1x954rmxv14xndn4ybhbr4pmzccnwqp462bpvzd2hak5wsqs4wxc";
1212 };
1313
14− buildInputs = [ gdk_pixbuf librsvg ];
14+ buildInputs = [ gdk-pixbuf librsvg ];
1515
1616 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1717
pkgs/data/themes/materia-theme/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
1+{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
22
33stdenv.mkDerivation rec {
44 pname = "materia-theme";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ glib libxml2 bc ];
1515
16− buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];
16+ buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ];
1717
1818 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1919
pkgs/data/themes/plano/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }:
1+{ stdenv, fetchFromGitHub, gdk-pixbuf, gtk_engines, gtk-engine-murrine }:
22
33stdenv.mkDerivation rec {
44 pname = "plano-theme";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "0p9j4p32489jb6d67jhf9x26my0mddcc6a174x713drch8zvb96l";
1212 };
1313
14− buildInputs = [ gdk_pixbuf gtk_engines ];
14+ buildInputs = [ gdk-pixbuf gtk_engines ];
1515
1616 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1717
pkgs/data/themes/plata/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel
2−, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine
2+, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine
33, cinnamonSupport ? true
44, gnomeFlashbackSupport ? true
55, gnomeShellSupport ? true
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343 ++ stdenv.lib.optional telegramSupport zip;
4444
4545 buildInputs = [
46− gdk_pixbuf
46+ gdk-pixbuf
4747 librsvg
4848 ];
4949
pkgs/data/themes/qogir/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
1+{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
22
33stdenv.mkDerivation rec {
44 pname = "qogir-theme";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 sha256 = "031nqr47b3x8ahcym7cfc75y8sy53dcmrrrlywi7m1a10ckfp0pd";
1212 };
1313
14− buildInputs = [ gdk_pixbuf librsvg ];
14+ buildInputs = [ gdk-pixbuf librsvg ];
1515
1616 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1717
pkgs/data/themes/sierra/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
1+{ stdenv, fetchFromGitHub, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }:
22
33stdenv.mkDerivation rec {
44 pname = "sierra-gtk-theme";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ libxml2 ];
1515
16− buildInputs = [ gdk_pixbuf librsvg ];
16+ buildInputs = [ gdk-pixbuf librsvg ];
1717
1818 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1919
pkgs/data/themes/stilo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
1+{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
22
33stdenv.mkDerivation rec {
44 pname = "stilo-themes";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ meson ninja sassc ];
1515
16− buildInputs = [ gdk_pixbuf librsvg gtk_engines ];
16+ buildInputs = [ gdk-pixbuf librsvg gtk_engines ];
1717
1818 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1919
pkgs/data/themes/zuki/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
1+{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
22
33stdenv.mkDerivation rec {
44 pname = "zuki-themes";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ meson ninja sassc ];
1515
16− buildInputs = [ gdk_pixbuf librsvg gtk_engines ];
16+ buildInputs = [ gdk-pixbuf librsvg gtk_engines ];
1717
1818 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1919
pkgs/desktops/deepin/go-lib/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio,
1+{ stdenv, fetchFromGitHub, glib, xorg, gdk-pixbuf, pulseaudio,
22 mobile-broadband-provider-info, deepin }:
33
44stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 buildInputs = [
1717 glib
1818 xorg.libX11
19− gdk_pixbuf
19+ gdk-pixbuf
2020 pulseaudio
2121 mobile-broadband-provider-info
2222 ];
pkgs/desktops/deepin/qcef/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools,
22 qtwebchannel, qtx11extras,
33 gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus,
4− expat, fontconfig, gdk_pixbuf, glib, gtk2,
4+ expat, fontconfig, gdk-pixbuf, glib, gtk2,
55 libxcb, pango, pulseaudio, xorg, deepin }:
66
77let
@@ -14,7 +14,7 @@ let
1414 dbus
1515 expat
1616 fontconfig
17− gdk_pixbuf
17+ gdk-pixbuf
1818 glib
1919 gnome2.GConf
2020 gtk2
pkgs/desktops/gnome-3/apps/cheese/default.nix+3−3
@@ -2,7 +2,7 @@
22, pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool
33, libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
44, libxslt, yelp-tools, gnome-common, gtk-doc
5−, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome-desktop, libxml2 }:
5+, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }:
66
77stdenv.mkDerivation rec {
88 name = "cheese-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 autoreconfHook gtk-doc yelp-tools gnome-common
2424 ];
2525 buildInputs = [ gtk3 glib gnome-video-effects
26− gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer
26+ gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer
2727 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop
2828 gst_all_1.gst-plugins-bad clutter-gtk clutter-gst
2929 libcanberra-gtk3 libgudev ];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 # vp8enc preset
4242 --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
4343 # Thumbnailers
44− --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
44+ --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
4545 --prefix XDG_DATA_DIRS : "${totem}/share"
4646 )
4747 '';
pkgs/desktops/gnome-3/apps/evolution/default.nix+2−2
@@ -27,7 +27,7 @@
2727, sqlite
2828, gnome3
2929, librsvg
30−, gdk_pixbuf
30+, gdk-pixbuf
3131, libsecret
3232, nss
3333, nspr
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
6565 db
6666 evolution-data-server
6767 gcr
68− gdk_pixbuf
68+ gdk-pixbuf
6969 glib
7070 glib-networking
7171 gnome-desktop
pkgs/desktops/gnome-3/apps/glade/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, intltool, fetchurl, python3
22, pkgconfig, gtk3, glib, gobject-introspection
33, wrapGAppsHook, itstool, libxml2, docbook_xsl
4−, gnome3, gdk_pixbuf, libxslt, gsettings-desktop-schemas }:
4+, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }:
55
66stdenv.mkDerivation rec {
77 name = "glade-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 buildInputs = [
2323 gtk3 glib libxml2 python3 python3.pkgs.pygobject3
2424 gsettings-desktop-schemas
25− gdk_pixbuf gnome3.adwaita-icon-theme
25+ gdk-pixbuf gnome3.adwaita-icon-theme
2626 ];
2727
2828 enableParallelBuilding = true;
pkgs/desktops/gnome-3/apps/gnome-books/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs
22, pkgconfig, gtk3, glib, tracker, tracker-miners, libxslt
3−, webkitgtk, gnome-desktop, libgepub, gnome3, gdk_pixbuf
3+, webkitgtk, gnome-desktop, libgepub, gnome3, gdk-pixbuf
44, gsettings-desktop-schemas, adwaita-icon-theme, docbook_xsl
55, docbook_xml_dtd_42, desktop-file-utils, python3
66, gobject-introspection, wrapGAppsHook }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 buildInputs = [
2323 gtk3 glib gsettings-desktop-schemas
24− gdk_pixbuf adwaita-icon-theme evince
24+ gdk-pixbuf adwaita-icon-theme evince
2525 webkitgtk gjs gobject-introspection tracker
2626 tracker-miners gnome-desktop libgepub
2727 ];
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+2−2
@@ -2,7 +2,7 @@
22, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
33, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
44, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib
5−, gnome3, gdk_pixbuf, geoclue2, libgweather }:
5+, gnome3, gdk-pixbuf, geoclue2, libgweather }:
66
77stdenv.mkDerivation rec {
88 name = "gnome-clocks-${version}";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 gobject-introspection # for finding vapi files
2828 ];
2929 buildInputs = [
30− gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme
30+ gtk3 glib gsettings-desktop-schemas gdk-pixbuf adwaita-icon-theme
3131 gnome-desktop geocode-glib geoclue2 libgweather gsound
3232 ];
3333
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix+2−2
@@ -2,7 +2,7 @@
22, pkgconfig, gtk3, glib, tracker, tracker-miners
33, itstool, libxslt, webkitgtk, libgdata
44, gnome-desktop, libzapojit, libgepub
5−, gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
5+, gnome3, gdk-pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
66, gobject-introspection, inkscape, poppler_utils
77, desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }:
88
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 ];
2828 buildInputs = [
2929 gtk3 glib gsettings-desktop-schemas
30− gdk_pixbuf gnome3.adwaita-icon-theme evince
30+ gdk-pixbuf gnome3.adwaita-icon-theme evince
3131 libsoup webkitgtk gjs gobject-introspection
3232 tracker tracker-miners libgdata
3333 gnome-desktop libzapojit libgepub
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3
2−, gobject-introspection, gdk_pixbuf, librsvg, libgweather
2+, gobject-introspection, gdk-pixbuf, librsvg, libgweather
33, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup, gsettings-desktop-schemas
44, webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
55
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121 gobject-introspection
2222 gtk3 geoclue2 gjs libgee folks gfbgraph
2323 geocode-glib libchamplain libsoup
24− gdk_pixbuf librsvg libgweather
24+ gdk-pixbuf librsvg libgweather
2525 gsettings-desktop-schemas evolution-data-server
2626 gnome-online-accounts gnome3.adwaita-icon-theme
2727 webkitgtk
pkgs/desktops/gnome-3/apps/gnome-music/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker
1+{ stdenv, meson, ninja, gettext, fetchurl, gdk-pixbuf, tracker
22, libxml2, python3, libnotify, wrapGAppsHook, libmediaart
33, gobject-introspection, gnome-online-accounts, grilo, grilo-plugins
44, pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
1818 nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
1919 buildInputs = with gst_all_1; [
2020 gtk3 glib libmediaart gnome-online-accounts gobject-introspection
21− gdk_pixbuf gnome3.adwaita-icon-theme python3
21+ gdk-pixbuf gnome3.adwaita-icon-theme python3
2222 grilo grilo-plugins libnotify libdazzle libsoup
2323 gsettings-desktop-schemas tracker
2424 gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix+2−2
@@ -3,7 +3,7 @@
33, itstool, gegl, babl, libdazzle, gfbgraph, grilo-plugins
44, grilo, gnome-online-accounts
55, desktop-file-utils, wrapGAppsHook
6−, gnome3, gdk_pixbuf, gexiv2, geocode-glib
6+, gnome3, gdk-pixbuf, gexiv2, geocode-glib
77, dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }:
88
99let
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
2626 buildInputs = [
2727 gtk3 glib gegl babl libgdata libdazzle
2828 gsettings-desktop-schemas
29− gdk_pixbuf gnome3.adwaita-icon-theme
29+ gdk-pixbuf gnome3.adwaita-icon-theme
3030 gfbgraph grilo-plugins grilo
3131 gnome-online-accounts tracker
3232 gexiv2 geocode-glib dleyna-renderer
pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3
1+{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk-pixbuf, gst_all_1, gnome3
22, meson, ninja, python3, hicolor-icon-theme, desktop-file-utils }:
33
44stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 pkgconfig gettext meson ninja gobject-introspection
1515 wrapGAppsHook python3 hicolor-icon-theme desktop-file-utils
1616 ];
17− buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);
17+ buildInputs = [ gjs glib gtk3 gdk-pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);
1818
1919 postPatch = ''
2020 chmod +x build-aux/meson_post_install.py
pkgs/desktops/gnome-3/apps/polari/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme
1+{ stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme
22, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
33, pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib
44, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }:
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323
2424 buildInputs = [
2525 gtk3 glib adwaita-icon-theme gsettings-desktop-schemas
26− telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup
26+ telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup
2727 ];
2828
2929 passthru = {
pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, intltool, gnome3
2−, iconnamingutils, gtk3, gdk_pixbuf, librsvg, hicolor-icon-theme }:
2+, iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }:
33
44stdenv.mkDerivation rec {
55 name = "adwaita-icon-theme-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 # For convenience, we can specify adwaita-icon-theme only in packages
1414 propagatedBuildInputs = [ hicolor-icon-theme ];
1515
16− buildInputs = [ gdk_pixbuf librsvg ];
16+ buildInputs = [ gdk-pixbuf librsvg ];
1717
1818 nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ];
1919
pkgs/desktops/gnome-3/core/empathy/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
2−, file, librsvg, gnome3, gdk_pixbuf, python3
2+, file, librsvg, gnome3, gdk-pixbuf, python3
33, telepathy-glib, telepathy-farstream, glibcLocales
44, clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts
55, gcr, libsecret, folks, libpulseaudio, telepathy-mission-control
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 gtk3 glib webkitgtk icu gnome-online-accounts
3333 telepathy-glib clutter-gtk clutter-gst cogl
3434 gst_all_1.gstreamer gst_all_1.gst-plugins-base
35− gcr libsecret libpulseaudio gdk_pixbuf
35+ gcr libsecret libpulseaudio gdk-pixbuf
3636 libnotify clutter libsoup gnutls libgee p11-kit
3737 libcanberra-gtk3 telepathy-farstream farstream
3838 gnome3.adwaita-icon-theme gsettings-desktop-schemas
pkgs/desktops/gnome-3/core/eog/default.nix+3−3
@@ -1,5 +1,5 @@
11{ fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3
2−, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk_pixbuf, exempi
2+, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk-pixbuf, exempi
33, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobject-introspection, python3 }:
44
55let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
1616 nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
1717
1818 buildInputs = [
19− libjpeg gtk3 gdk_pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi
19+ libjpeg gtk3 gdk-pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi
2020 gsettings-desktop-schemas shared-mime-info adwaita-icon-theme
2121 ];
2222
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
2828 preFixup = ''
2929 gappsWrapperArgs+=(
3030 # Thumbnailers
31− --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
31+ --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
3232 --prefix XDG_DATA_DIRS : "${librsvg}/share"
3333 --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
3434 )
pkgs/desktops/gnome-3/core/epiphany/default.nix+2−2
@@ -2,7 +2,7 @@
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, libhandy }:
5+, gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
66
77stdenv.mkDerivation rec {
88 name = "epiphany-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 buildInputs = [
2424 gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
2525 sqlite isocodes p11-kit icu libhandy
26− gdk_pixbuf gnome3.adwaita-icon-theme gcr
26+ 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
2929 gst_all_1.gst-libav json-glib libdazzle
pkgs/desktops/gnome-3/core/evince/default.nix+2−2
@@ -11,7 +11,7 @@
1111, gtk3
1212, pango
1313, atk
14−, gdk_pixbuf
14+, gdk-pixbuf
1515, shared-mime-info
1616, itstool
1717, gnome3
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
8383 gtk3
8484 pango
8585 atk
86− gdk_pixbuf
86+ gdk-pixbuf
8787 libxml2
8888 gsettings-desktop-schemas
8989 poppler
pkgs/desktops/gnome-3/core/gjs/default.nix+2−2
@@ -1,5 +1,5 @@
11{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobject-introspection
2−, spidermonkey_60, pango, readline, glib, libxml2, dbus, gdk_pixbuf
2+, spidermonkey_60, pango, readline, glib, libxml2, dbus, gdk-pixbuf
33, makeWrapper }:
44
55stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
3939 moveToOutput "libexec/gjs/installed-tests" "$installedTests"
4040
4141 wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \
42− --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk_pixbuf ]}:$installedTests/libexec/gjs/installed-tests"
42+ --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk-pixbuf ]}:$installedTests/libexec/gjs/installed-tests"
4343 '';
4444
4545 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+3−3
@@ -1,6 +1,6 @@
11{ fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook
22, libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
3−, gdk_pixbuf, librsvg, libgudev, libsecret, gnome-color-manager
3+, gdk-pixbuf, librsvg, libgudev, libsecret, gnome-color-manager
44, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
55, libkrb5, networkmanagerapplet, networkmanager, glibc
66, libwacom, samba, shared-mime-info, tzdata, libgnomekbd
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
3232 accountsservice libkrb5 networkmanagerapplet libwacom samba
3333 grilo libpwquality vino libcanberra-gtk3 libgudev libsecret
34− gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
34+ gdk-pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
3535 networkmanager modemmanager gnome-bluetooth tracker
3636 udisks2 gsound libhandy
3737 mutter # schemas for the keybindings
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
6060 gappsWrapperArgs+=(
6161 --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
6262 # Thumbnailers (for setting user profile pictures)
63− --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
63+ --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
6464 --prefix XDG_DATA_DIRS : "${librsvg}/share"
6565 # WM keyboard shortcuts
6666 --prefix XDG_DATA_DIRS : "${mutter}/share"
pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook
2−, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk_pixbuf, gnome3 }:
2+, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf, gnome3 }:
33
44stdenv.mkDerivation rec {
55 pname = "gnome-remote-desktop";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 buildInputs = [
1919 glib pipewire systemd libvncserver libsecret libnotify
20− gdk_pixbuf # For libnotify
20+ gdk-pixbuf # For libnotify
2121 ];
2222
2323 postPatch = ''
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+2−2
@@ -3,7 +3,7 @@
33, libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
44, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
55, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
6−, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
6+, accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
77, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
88, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }:
99
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
3030 buildInputs = [
3131 systemd caribou
3232 gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
33− libcroco libsecret libsoup polkit gdk_pixbuf librsvg
33+ libcroco libsecret libsoup polkit gdk-pixbuf librsvg
3434 clutter networkmanager libstartup_notification telepathy-glib
3535 libXtst gjs mutter libpulseaudio evolution-data-server
3636 libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit
22, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3
3−, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
3+, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }:
44
55stdenv.mkDerivation rec {
66 name = "gnome-system-monitor-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 polkit # for ITS file
1919 ];
2020 buildInputs = [
21− bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg
21+ bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg
2222 gsettings-desktop-schemas systemd
2323 ];
2424
pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
2−, gdk_pixbuf }:
2+, gdk-pixbuf }:
33
44let
55 pname = "gnome-themes-extra";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919 };
2020
2121 nativeBuildInputs = [ pkgconfig intltool ];
22− buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.adwaita-icon-theme ];
22+ buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf gnome3.adwaita-icon-theme ];
2323
2424 postFixup = ''
2525 gtk-update-icon-cache "$out"/share/icons/HighContrast
pkgs/desktops/gnome-3/core/nautilus/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
22, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
33, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
4−, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
4+, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk-pixbuf
55, substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas
66}:
77
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
3232 preFixup = ''
3333 gappsWrapperArgs+=(
3434 # Thumbnailers
35− --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
35+ --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
3636 --prefix XDG_DATA_DIRS : "${librsvg}/share"
3737 --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
3838 )
pkgs/desktops/gnome-3/core/simple-scan/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
2−, cairo, gdk_pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp
2+, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp
33, libxml2, sane-backends, vala, gnome3, gobject-introspection }:
44
55stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 buildInputs = [
15− cairo gdk_pixbuf colord glib gnome3.adwaita-icon-theme gusb
15+ cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb
1616 gtk3 libwebp packagekit sane-backends vala
1717 ];
1818 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/sushi/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib
22, clutter-gtk, clutter-gst, gnome3, gtksourceview, gjs
33, webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1
4−, gdk_pixbuf, librsvg, gtk3, harfbuzz, ninja }:
4+, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }:
55
66stdenv.mkDerivation rec {
77 name = "sushi-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 ];
1818 buildInputs = [
1919 glib gtk3 gnome3.evince icu harfbuzz
20− clutter-gtk clutter-gst gjs gtksourceview gdk_pixbuf
20+ clutter-gtk clutter-gst gjs gtksourceview gdk-pixbuf
2121 librsvg libmusicbrainz5 webkitgtk
2222 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
2323 ];
pkgs/desktops/gnome-3/core/totem/default.nix+2−2
@@ -3,7 +3,7 @@
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, xvfb_run }:
6+, gdk-pixbuf, tracker, nautilus, xvfb_run }:
77
88stdenv.mkDerivation rec {
99 name = "totem-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins
2222 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
2323 gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info
24− gdk_pixbuf libxml2 adwaita-icon-theme gnome-desktop
24+ gdk-pixbuf libxml2 adwaita-icon-theme gnome-desktop
2525 gsettings-desktop-schemas tracker nautilus
2626 python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
2727 ];
pkgs/desktops/gnome-3/games/atomix/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, python3
2−, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk_pixbuf }:
2+, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }:
33
44let
55 pname = "atomix";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
1313 };
1414
1515 nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
16− buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.adwaita-icon-theme ];
16+ buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome3.adwaita-icon-theme ];
1717
1818 postPatch = ''
1919 chmod +x meson_post_install.py
pkgs/desktops/gnome-3/games/iagno/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
1+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook
22, itstool, libcanberra-gtk3, libxml2
33, meson, ninja, python3, vala, desktop-file-utils
44}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 meson ninja python3 vala desktop-file-utils
1717 pkgconfig wrapGAppsHook itstool libxml2
1818 ];
19− buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ];
19+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg libcanberra-gtk3 ];
2020
2121 enableParallelBuilding = true;
2222
pkgs/desktops/gnome-3/games/lightsoff/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
1+{ stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook
22, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib
33, meson, ninja, python3 }:
44
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2
1616 meson ninja python3
1717 ];
18− buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ];
18+ buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ];
1919
2020 postPatch = ''
2121 chmod +x build-aux/meson_post_install.py
pkgs/desktops/gnome-3/games/quadrapassel/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
1+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf
22, librsvg, libcanberra-gtk3, libmanette
33, gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook
44, meson, ninja, python3, vala, desktop-file-utils
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121 libxml2 itstool gettext wrapGAppsHook
2222 ];
2323 buildInputs = [
24− gtk3 gdk_pixbuf librsvg libmanette
24+ gtk3 gdk-pixbuf librsvg libmanette
2525 libcanberra-gtk3 clutter libxml2 clutter-gtk
2626 ];
2727
pkgs/desktops/gnome-3/games/tali/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
1+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf
22, librsvg, gettext, itstool, libxml2, wrapGAppsHook
33, meson, ninja, python3, desktop-file-utils
44}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 pkgconfig gnome3.adwaita-icon-theme
2222 libxml2 itstool gettext wrapGAppsHook
2323 ];
24− buildInputs = [ gtk3 gdk_pixbuf librsvg ];
24+ buildInputs = [ gtk3 gdk-pixbuf librsvg ];
2525
2626 postPatch = ''
2727 chmod +x build-aux/meson_post_install.py
pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, meson, ninja, gettext, fetchurl
22, pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas
33, itstool, libxml2, python3Packages
4−, gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
4+, gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
55
66let
77 pname = "gnome-tweaks";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
1919 ];
2020 buildInputs = [
2121 gtk3 glib gsettings-desktop-schemas
22− gdk_pixbuf gnome3.adwaita-icon-theme
22+ gdk-pixbuf gnome3.adwaita-icon-theme
2323 libnotify gnome3.gnome-shell python3Packages.pygobject3
2424 libsoup gnome3.gnome-settings-daemon gnome3.nautilus
2525 gnome3.mutter gnome3.gnome-desktop gobject-introspection
pkgs/desktops/lxde/core/lxpanel/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder
2−, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk_pixbuf
2+, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf
33, menu-cache, lxmenu-data, wirelesstools
44, supportAlsa ? false, alsaLib
55}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
1515 nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ];
1616 buildInputs = [
17− keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk_pixbuf
17+ keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf
1818 menu-cache lxmenu-data m4 wirelesstools
1919 ] ++ stdenv.lib.optional supportAlsa alsaLib;
2020
pkgs/desktops/mate/caja-dropbox/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, substituteAll
2−, pkgconfig, gobject-introspection, gdk_pixbuf
2+, pkgconfig, gobject-introspection, gdk-pixbuf
33, gtk3, mate, python3, dropbox }:
44
55let
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 nativeBuildInputs = [
2727 pkgconfig
2828 gobject-introspection
29− gdk_pixbuf
29+ gdk-pixbuf
3030 (python3.withPackages (ps: with ps; [
3131 docutils
3232 pygobject3
pkgs/desktops/mate/mate-themes/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk3,
2− gtk_engines, gtk-engine-murrine, gdk_pixbuf, librsvg }:
2+ gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
33
44stdenv.mkDerivation rec {
55 name = "mate-themes-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 nativeBuildInputs = [ pkgconfig intltool gtk3 ];
1414
15− buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk_pixbuf librsvg ];
15+ buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ];
1616
1717 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1818
pkgs/desktops/maxx/default.nix+3−3
@@ -3,7 +3,7 @@
33
44, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
55, libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2
6−, gdk_pixbuf, libGL, ncurses5
6+, gdk-pixbuf, libGL, ncurses5
77
88, dmidecode, pciutils, usbutils
99}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 buildInputs = [
2525 stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
2626 libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
27− gdk_pixbuf libGL ncurses5
27+ gdk-pixbuf libGL ncurses5
2828 ];
2929
3030 buildPhase = ''
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
7070 maintainers = [ maintainers.gnidorah ];
7171 platforms = ["x86_64-linux"];
7272 longDescription = ''
73− A clone of IRIX Interactive Desktop made in agreement with SGI.
73+ A clone of IRIX Interactive Desktop made in agreement with SGI.
7474 Provides simple and fast retro desktop environment.
7575 '';
7676 };
pkgs/desktops/xfce/core/tumbler.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk_pixbuf, curl, freetype
1+{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk-pixbuf, curl, freetype
22, libgsf, poppler, bzip2 }:
33let
44 p_name = "tumbler";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 nativeBuildInputs = [ pkgconfig ];
1919 buildInputs = [
20− intltool dbus-glib gdk_pixbuf curl freetype
20+ intltool dbus-glib gdk-pixbuf curl freetype
2121 poppler libgsf bzip2
2222 ];
2323
pkgs/desktops/xfce4-14/thunar/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkXfceDerivation, docbook_xsl, exo, gdk_pixbuf, gtk3, libgudev ? null
1+{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev ? null
22, libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }:
33
44mkXfceDerivation rec {
@@ -19,7 +19,7 @@ mkXfceDerivation rec {
1919
2020 buildInputs = [
2121 exo
22− gdk_pixbuf
22+ gdk-pixbuf
2323 gtk3
2424 libgudev
2525 libnotify
pkgs/desktops/xfce4-14/tumbler/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ mkXfceDerivation, gdk_pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null
1+{ mkXfceDerivation, gdk-pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null
22, poppler ? null }:
33
44# TODO: add libopenraw
@@ -11,5 +11,5 @@ mkXfceDerivation rec {
1111
1212 sha256 = "1k579g8dmcfpw1vakspv6k2qkr1y1axyr8cbd0fqjhqdj4pis81i";
1313
14− buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];
14+ buildInputs = [ gdk-pixbuf ffmpegthumbnailer libgsf poppler ];
1515}
pkgs/development/arduino/arduino-core/default.nix+3−3
@@ -3,7 +3,7 @@
33, withGui ? false, gtk2 ? null, withTeensyduino ? false
44 /* Packages needed for Teensyduino */
55, upx, fontconfig, xorg, gcc
6−, atk, glib, pango, gdk_pixbuf, libpng12, expat, freetype,
6+, atk, glib, pango, gdk-pixbuf, libpng12, expat, freetype,
77}:
88
99assert withGui -> gtk2 != null;
@@ -36,7 +36,7 @@ let
3636 fontconfig
3737 freetype
3838 gcc.cc.lib
39− gdk_pixbuf
39+ gdk-pixbuf
4040 glib
4141 gtk2
4242 libpng12
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
115115 substituteInPlace build/build.xml --replace "get src" "get error"
116116
117117 cd ./arduino-core && ant
118− cd ../build && ant
118+ cd ../build && ant
119119 cd ..
120120 '';
121121
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+2−2
@@ -17,7 +17,7 @@ sourcePerArch:
1717, cairo
1818, alsaLib
1919, atk
20−, gdk_pixbuf
20+, gdk-pixbuf
2121, zlib
2222, elfutils
2323}:
@@ -35,7 +35,7 @@ let
3535
3636 libraries = [
3737 stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL
38− xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf
38+ xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf
3939 atk zlib elfutils
4040 ] ++ (stdenv.lib.optionals swingSupport [
4141 xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt
pkgs/development/compilers/cudatoolkit/default.nix+2−2
@@ -1,6 +1,6 @@
11{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses5, expat, python27, zlib
22, gcc48, gcc49, gcc5, gcc6, gcc7
3−, xorg, gtk2, gdk_pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
3+, xorg, gtk2, gdk-pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
44, addOpenGLRunpath
55}:
66
@@ -41,7 +41,7 @@ let
4141 outputs = [ "out" "lib" "doc" ];
4242
4343 nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
44− buildInputs = [ gdk_pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
44+ buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
4545 runtimeDependencies = [
4646 ncurses5 expat python zlib glibc
4747 xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
pkgs/development/compilers/factor-lang/default.nix+4−4
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, glib, git,
22 rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
3− pango, cairo, gtk2, gdk_pixbuf, gtkglext,
3+ pango, cairo, gtk2, gdk-pixbuf, gtkglext,
44 mesa, xorg, openssl, unzip }:
55
66stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 ];
2121
2222 buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper
23− libX11 pango cairo gtk2 gdk_pixbuf gtkglext
23+ libX11 pango cairo gtk2 gdk-pixbuf gtkglext
2424 mesa libXmu libXt libICE libSM openssl unzip ];
2525
2626 buildPhase = ''
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
4848 # will work only on the known libraries. There does not seem
4949 # to be a generic solution here.
5050 find $(echo ${stdenv.lib.makeLibraryPath (with xorg; [
51− glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext
51+ glib libX11 pango cairo gtk2 gdk-pixbuf gtkglext
5252 mesa libXmu libXt libICE libSM ])} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
5353
5454 (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
6969 cp ./factor $out/bin
7070 wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
7171 "${stdenv.lib.makeLibraryPath (with xorg; [ glib
72− libX11 pango cairo gtk2 gdk_pixbuf gtkglext
72+ libX11 pango cairo gtk2 gdk-pixbuf gtkglext
7373 mesa libXmu libXt libICE libSM openssl])}"
7474
7575 sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor
pkgs/development/compilers/fpc/lazarus.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeWrapper
2−, fpc, gtk2, glib, pango, atk, gdk_pixbuf
2+, fpc, gtk2, glib, pango, atk, gdk-pixbuf
33, libXi, xorgproto, libX11, libXext
44}:
55stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 buildInputs = [
1515 fpc gtk2 glib libXi xorgproto
1616 libX11 libXext pango atk
17− stdenv.cc makeWrapper gdk_pixbuf
17+ stdenv.cc makeWrapper gdk-pixbuf
1818 ];
1919
2020 makeFlags = [
pkgs/development/compilers/jetbrains-jdk/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt
22, libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
3−, gdk_pixbuf, atk, zlib }:
3+, gdk-pixbuf, atk, zlib }:
44
55# TODO: Investigate building from source instead of patching binaries.
66# TODO: Binary patching for not just x86_64-linux but also x86_64-darwin i686-linux
@@ -38,7 +38,7 @@ let drv = stdenv.mkDerivation rec {
3838
3939 rpath = lib.makeLibraryPath ([
4040 stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
41− alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib
41+ alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib
4242 (placeholder "out")
4343 ] ++ (with xorg; [
4444 libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix+2−2
@@ -32,7 +32,7 @@
3232, cairo
3333, alsaLib
3434, atk
35−, gdk_pixbuf
35+, gdk-pixbuf
3636, setJavaClassPath
3737}:
3838
@@ -183,7 +183,7 @@ let result = stdenv.mkDerivation rec {
183183 * libXt is only needed on amd64
184184 */
185185 libraries =
186− [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++
186+ [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
187187 (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
188188
189189 rpath = stdenv.lib.strings.makeLibraryPath libraries;
pkgs/development/compilers/zulu/8.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
22, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
3−, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg
3+, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg
44, swingSupport ? true }:
55
66let
@@ -17,7 +17,7 @@ let
1717 libraries = [
1818 stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
1919 xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
20− gnome2.gtk cairo gdk_pixbuf atk
20+ gnome2.gtk cairo gdk-pixbuf atk
2121 ] ++ (lib.optionals swingSupport (with xorg; [
2222 xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
2323 xorg.libXt xorg.libXrender stdenv.cc.cc
pkgs/development/compilers/zulu/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
22, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
3−, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib
3+, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib
44, swingSupport ? true }:
55
66let
@@ -17,7 +17,7 @@ let
1717 libraries = [
1818 stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
1919 xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
20− gnome2.gtk cairo gdk_pixbuf atk zlib
20+ gnome2.gtk cairo gdk-pixbuf atk zlib
2121 ] ++ (lib.optionals swingSupport (with xorg; [
2222 xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
2323 xorg.libXt xorg.libXrender stdenv.cc.cc
pkgs/development/haskell-modules/hackage-packages.nix+9−9
@@ -92339,7 +92339,7 @@ self: {
9233992339 }) {inherit (pkgs) gtk3;};
9234092340
9234192341 "gi-gdkpixbuf" = callPackage
92342− ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
92342+ ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
9234392343 , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
9234492344 , haskell-gi-overloading, text, transformers
9234592345 }:
@@ -92352,13 +92352,13 @@ self: {
9235292352 base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
9235392353 haskell-gi-base haskell-gi-overloading text transformers
9235492354 ];
92355− libraryPkgconfigDepends = [ gdk_pixbuf ];
92355+ libraryPkgconfigDepends = [ gdk-pixbuf ];
9235692356 description = "GdkPixbuf bindings";
9235792357 license = stdenv.lib.licenses.lgpl21;
92358− }) {inherit (pkgs) gdk_pixbuf;};
92358+ }) {inherit (pkgs) gdk-pixbuf;};
9235992359
9236092360 "gi-gdkpixbuf_2_0_22" = callPackage
92361− ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
92361+ ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
9236292362 , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
9236392363 , haskell-gi-overloading, text, transformers
9236492364 }:
@@ -92373,11 +92373,11 @@ self: {
9237392373 base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
9237492374 haskell-gi-base haskell-gi-overloading text transformers
9237592375 ];
92376− libraryPkgconfigDepends = [ gdk_pixbuf ];
92376+ libraryPkgconfigDepends = [ gdk-pixbuf ];
9237792377 description = "GdkPixbuf bindings";
9237892378 license = stdenv.lib.licenses.lgpl21;
9237992379 hydraPlatforms = stdenv.lib.platforms.none;
92380− }) {inherit (pkgs) gdk_pixbuf;};
92380+ }) {inherit (pkgs) gdk-pixbuf;};
9238192381
9238292382 "gi-gdkx11" = callPackage
9238392383 ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -182921,7 +182921,7 @@ self: {
182921182921
182922182922 "poppler" = callPackage
182923182923 ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
182924− , gdk_pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango
182924+ , gdk-pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango
182925182925 , poppler
182926182926 }:
182927182927 mkDerivation {
@@ -182933,13 +182933,13 @@ self: {
182933182933 libraryHaskellDepends = [
182934182934 array base bytestring cairo containers glib gtk mtl
182935182935 ];
182936− libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ];
182936+ libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler ];
182937182937 libraryToolDepends = [ gtk2hs-buildtools ];
182938182938 description = "Binding to the Poppler";
182939182939 license = stdenv.lib.licenses.gpl2;
182940182940 hydraPlatforms = stdenv.lib.platforms.none;
182941182941 broken = true;
182942− }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2;
182942+ }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2;
182943182943 inherit (pkgs) pango; inherit (pkgs) poppler;};
182944182944
182945182945 "populate-setup-exe-cache" = callPackage
pkgs/development/libraries/appstream-glib/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
22, gtk-doc, libarchive, gobject-introspection, libxslt, pngquant
33, sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42
4−, libuuid, json-glib, meson, gperf, ninja, gdk_pixbuf
4+, libuuid, json-glib, meson, gperf, ninja, gdk-pixbuf
55}:
66stdenv.mkDerivation rec {
77 name = "appstream-glib-0.7.15";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 buildInputs = [
2323 glib gettext sqlite libsoup
2424 attr acl libuuid json-glib
25− libarchive gperf gdk_pixbuf
25+ libarchive gperf gdk-pixbuf
2626 ];
2727 propagatedBuildInputs = [ gtk3 ];
2828
pkgs/development/libraries/clutter-gst/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk_pixbuf }:
1+{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }:
22
33let
44 pname = "clutter-gst";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
1111 sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy";
1212 };
1313
14− propagatedBuildInputs = [ clutter gtk3 glib cogl gdk_pixbuf ];
14+ propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ];
1515 nativeBuildInputs = [ pkgconfig ];
1616
1717 postBuild = "rm -rf $out/share/gtk-doc";
pkgs/development/libraries/cogl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
1+{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl
22, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
33, mesa
44, gstreamerSupport ? true, gst_all_1 }:
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
4444 ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
4545
4646 propagatedBuildInputs = with xorg; [
47− glib gdk_pixbuf gobject-introspection wayland mesa
47+ glib gdk-pixbuf gobject-introspection wayland mesa
4848 libGL libXrandr libXfixes libXcomposite libXdamage
4949 ]
5050 ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
pkgs/development/libraries/freetype/default.nix+4−3
@@ -14,7 +14,7 @@ let
1414
1515in stdenv.mkDerivation rec {
1616 pname = "freetype";
17− version = "2.10.0";
17+ version = "2.10.1";
1818
1919 meta = with stdenv.lib; {
2020 description = "A font rendering engine";
@@ -32,11 +32,12 @@ in stdenv.mkDerivation rec {
3232 };
3333
3434 src = fetchurl {
35− url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2";
36− sha256 = "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w";
35+ url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz";
36+ sha256 = "0vx2dg1jh5kq34dd6ifpjywkpapp8a7p1bvyq9yq5zi1i94gmnqn";
3737 };
3838
3939 propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
40+
4041 # dependence on harfbuzz is looser than the reverse dependence
4142 nativeBuildInputs = [ pkgconfig which makeWrapper ]
4243 # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
pkgs/development/libraries/gcr/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib
2−, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk_pixbuf, atk
2+, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk-pixbuf, atk
33, gobject-introspection, makeWrapper, libxslt, vala, gnome3
44, python2 }:
55
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 buildInputs = let
2828 gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome
2929 in [
30− gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk
30+ gpg libgcrypt libtasn1 dbus-glib pango gdk-pixbuf atk
3131 ];
3232
3333 propagatedBuildInputs = [ glib gtk3 p11-kit ];
pkgs/development/libraries/gdk-pixbuf/default.nix−1
@@ -83,7 +83,6 @@ in stdenv.mkDerivation rec {
8383 passthru = {
8484 updateScript = gnome3.updateScript {
8585 packageName = pname;
86− attrPath = "gdk_pixbuf";
8786 };
8887
8988 # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc
pkgs/development/libraries/geis/default.nix+2−2
@@ -6,7 +6,7 @@
66, dbus
77, evemu
88, frame
9−, gdk_pixbuf
9+, gdk-pixbuf
1010, gobject-introspection
1111, grail
1212, gtk3
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 [ pygobject3 ];
3838
3939 nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython];
40− buildInputs = [ atk dbus evemu frame gdk_pixbuf gobject-introspection grail
40+ buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail
4141 gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
4242 ];
4343
pkgs/development/libraries/geoclue/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
1+{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf
22, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala
33, withDemoAgent ? false
44}:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 buildInputs = [
3333 glib json-glib libsoup avahi
3434 ] ++ optionals withDemoAgent [
35− libnotify gdk_pixbuf
35+ libnotify gdk-pixbuf
3636 ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
3737
3838 propagatedBuildInputs = [ glib glib-networking ];
pkgs/development/libraries/gflags/default.nix+1−1
@@ -1,7 +1,7 @@
11{ stdenv, fetchFromGitHub, cmake }:
22
33stdenv.mkDerivation rec {
4− name = "google-gflags-${version}";
4+ pname = "gflags";
55 version = "2.2.2";
66
77 src = fetchFromGitHub {
pkgs/development/libraries/gom/default.nix+2−2
@@ -7,7 +7,7 @@
77, glib
88, python3
99, sqlite
10−, gdk_pixbuf
10+, gdk-pixbuf
1111, gnome3
1212, gobject-introspection
1313}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545 ];
4646
4747 buildInputs = [
48− gdk_pixbuf
48+ gdk-pixbuf
4949 glib
5050 sqlite
5151 python3.pkgs.pygobject3
pkgs/development/libraries/gstreamer/good/default.nix+2−2
@@ -2,7 +2,7 @@
22, gst-plugins-base, orc, bzip2, gettext
33, libv4l, libdv, libavc1394, libiec61883
44, libvpx, speex, flac, taglib, libshout
5−, cairo, gdk_pixbuf, aalib, libcaca
5+, cairo, gdk-pixbuf, aalib, libcaca
66, libsoup, libpulseaudio, libintl
77, darwin, lame, mpg123, twolame
88, gtkSupport ? false, gtk3 ? null
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757 buildInputs = [
5858 gst-plugins-base orc bzip2
5959 libdv libvpx speex flac taglib
60− cairo gdk_pixbuf aalib libcaca
60+ cairo gdk-pixbuf aalib libcaca
6161 libsoup libshout lame mpg123 twolame libintl
6262 libXdamage
6363 libXext
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix+2−2
@@ -1,6 +1,6 @@
11{ fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo
22, flac, libjpeg, speex, libpng, libdv, libcaca, libvpx
3−, taglib, libpulseaudio, gdk_pixbuf, orc
3+, taglib, libpulseaudio, gdk-pixbuf, orc
44, glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl
55, # Whether to build no plugins that have external dependencies
66 # (except the PulseAudio plugin).
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 ++ lib.optional stdenv.isLinux libpulseaudio
2828 ++ lib.optionals (!minimalDeps)
2929 [ aalib libcaca cairo libdv flac libjpeg libpng speex
30− taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ];
30+ taglib bzip2 libvpx gdk-pixbuf orc libsoup libshout ];
3131
3232 enableParallelBuilding = true;
3333
pkgs/development/libraries/gtk+/2.x.nix+2−2
@@ -1,5 +1,5 @@
11{ config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg
2−, gdk_pixbuf, xlibsWrapper, gobject-introspection
2+, gdk-pixbuf, xlibsWrapper, gobject-introspection
33, xineramaSupport ? stdenv.isLinux
44, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
55, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 ];
4242
4343 propagatedBuildInputs = with xorg;
44− [ glib cairo pango gdk_pixbuf atk ]
44+ [ glib cairo pango gdk-pixbuf atk ]
4545 ++ optionals (stdenv.isLinux || stdenv.isDarwin) [
4646 libXrandr libXrender libXcomposite libXi libXcursor
4747 ]
pkgs/development/libraries/gtk+/3.x.nix+2−2
@@ -13,7 +13,7 @@
1313, glib
1414, cairo
1515, pango
16−, gdk_pixbuf
16+, gdk-pixbuf
1717, atk
1818, at-spi2-atk
1919, gobject-introspection
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
121121 cairo
122122 expat
123123 fribidi
124− gdk_pixbuf
124+ gdk-pixbuf
125125 glib
126126 gsettings-desktop-schemas
127127 libICE
pkgs/development/libraries/gtkd/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
1+{ stdenv, fetchzip, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
22, glib, gtk3, gtksourceview, libgda, libpeas, pango, pkgconfig, which, vte }:
33
44let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
1515
1616 nativeBuildInputs = [ dmd pkgconfig which ];
1717 propagatedBuildInputs = [
18− atk cairo gdk_pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview
18+ atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview
1919 libgda libpeas librsvg pango vte
2020 ];
2121
@@ -28,8 +28,8 @@ in stdenv.mkDerivation rec {
2828 --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
2929 --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
3030 substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \
31− --replace libgdk_pixbuf-2.0.so.0 ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
32− --replace libgdk_pixbuf-2.0.0.dylib ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
31+ --replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
32+ --replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
3333 substituteInPlace generated/gtkd/atk/c/functions.d \
3434 --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \
3535 --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib
pkgs/development/libraries/harfbuzz/default.nix+2−2
@@ -8,7 +8,7 @@
88}:
99
1010let
11− version = "2.5.1";
11+ version = "2.5.3";
1212 inherit (stdenv.lib) optional optionals optionalString;
1313in
1414
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
1717
1818 src = fetchurl {
1919 url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz";
20− sha256 = "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d";
20+ sha256 = "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y";
2121 };
2222
2323 postPatch = ''
pkgs/development/libraries/java/swt/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2
22, libXt, libXtst, libXi, libGLU_combined, webkitgtk, libsoup, xorg
3−, pango, gdk_pixbuf, glib
3+, pango, gdk-pixbuf, glib
44}:
55
66let
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
3838 nativeBuildInputs = [ unzip pkgconfig ];
3939 buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkitgtk libsoup ];
4040
41− NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++
41+ NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++
4242 [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ];
4343
4444 buildPhase = ''
pkgs/development/libraries/lasem/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk_pixbuf
1+{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk-pixbuf
22, libxml2, cairo, pango, gnome3 }:
33
44stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
1616
1717 propagatedBuildInputs = [
18− glib gdk_pixbuf libxml2 cairo pango
18+ glib gdk-pixbuf libxml2 cairo pango
1919 ];
2020
2121 enableParallelBuilding = true;
pkgs/development/libraries/libarchive/default.nix+8−21
@@ -1,5 +1,5 @@
11{
2− fetchurl, fetchpatch, stdenv, pkgconfig,
2+ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
33 acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib,
44
55 # Optional but increases closure only negligibly.
@@ -10,31 +10,18 @@ assert xarSupport -> libxml2 != null;
1010
1111stdenv.mkDerivation rec {
1212 name = "libarchive-${version}";
13− version = "3.3.3";
13+ version = "3.4.0";
1414
15− src = fetchurl {
16− url = "${meta.homepage}/downloads/${name}.tar.gz";
17− sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms";
15+ src = fetchFromGitHub {
16+ owner = "libarchive";
17+ repo = "libarchive";
18+ rev = "v${version}";
19+ sha256 = "063f5bw9qmksj3iy6094qxwawx174cx00q1fg6l698wqw7xn8ihq";
1820 };
1921
20− patches = [
21− (fetchpatch {
22− # details: https://github.com/libarchive/libarchive/pull/1105
23− name = "cve-2018-1000877.diff"; # CVE-2018-1000877..80
24− url = "https://github.com/libarchive/libarchive/pull/1105.diff";
25− sha256 = "0mxcawfdy9m40mykzwhkl39a6vnh4ypgy0ipcz74qm4bi72x0gyf";
26− })
27− (fetchpatch {
28− # details: https://github.com/libarchive/libarchive/pull/1120
29− name = "cve-2019-1000019_cve-2019-1000020.diff";
30− url = "https://github.com/libarchive/libarchive/pull/1120.diff";
31− sha256 = "1mgx92v8hm7hw9j34nbfriqfkxshh3cy25rhavr7kl7lz4x5a6g4";
32− })
33− ];
34−
3522 outputs = [ "out" "lib" "dev" ];
3623
37− nativeBuildInputs = [ pkgconfig ];
24+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
3825 buildInputs = [ sharutils zlib bzip2 openssl xz lzo ]
3926 ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
4027 ++ stdenv.lib.optional xarSupport libxml2;
pkgs/development/libraries/libcef/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
2−, GConf, gdk_pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
2+, GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
33, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
44, libXtst, nspr, nss, pango, libpulseaudio, systemd }:
55
66let
77 libPath =
88 stdenv.lib.makeLibraryPath [
9− alsaLib atk cairo cups dbus expat fontconfig GConf gdk_pixbuf glib gtk2
9+ alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
1010 libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
1111 libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
1212 systemd
pkgs/development/libraries/libgpod/default.nix+2−2
@@ -1,5 +1,5 @@
11{stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
2− libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib,
2+ libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib,
33 libimobiledevice, pythonPackages, mutagen,
44 monoSupport ? false, mono, gtk-sharp-2_0
55}:
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
2323 dontStrip = true;
2424
2525 propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
26− gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ];
26+ gdk-pixbuf taglib libimobiledevice python pygobject2 mutagen ];
2727
2828 nativeBuildInputs = [ gettext intltool pkgconfig ]
2929 ++ (with perlPackages; [ perl XMLParser ])
pkgs/development/libraries/libgsf/default.nix+2−2
@@ -1,5 +1,5 @@
11{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
2−, python, perl, gdk_pixbuf, libiconv, libintl, gnome3 }:
2+, python, perl, gdk-pixbuf, libiconv, libintl, gnome3 }:
33
44stdenv.mkDerivation rec {
55 pname = "libgsf";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 buildInputs = [ gettext bzip2 zlib python ];
1616 checkInputs = [ perl ];
1717
18− propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ];
18+ propagatedBuildInputs = [ libxml2 glib gdk-pixbuf libiconv ];
1919
2020 outputs = [ "out" "dev" ];
2121
pkgs/development/libraries/libmediaart/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk_pixbuf, gobject-introspection, gnome3 }:
1+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "libmediaart";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
15− buildInputs = [ glib gdk_pixbuf ];
15+ buildInputs = [ glib gdk-pixbuf ];
1616
1717 # FIXME: Turn on again when https://github.com/NixOS/nixpkgs/issues/53701
1818 # is fixed on master.
pkgs/development/libraries/libnotify/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, meson, ninja, pkgconfig, fetchpatch
2−, glib, gdk_pixbuf, gobject-introspection, gnome3 }:
2+, glib, gdk-pixbuf, gobject-introspection, gnome3 }:
33
44stdenv.mkDerivation rec {
55 pname = "libnotify";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 ];
2828
2929 nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
30− buildInputs = [ glib gdk_pixbuf ];
30+ buildInputs = [ glib gdk-pixbuf ];
3131
3232 passthru = {
3333 updateScript = gnome3.updateScript {
pkgs/development/libraries/librsvg/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
1+{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2, libgsf
22, bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3
33, withGTK ? false, gtk3 ? null
44, vala, gobject-introspection }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ];
2121
22− propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
22+ propagatedBuildInputs = [ glib gdk-pixbuf cairo ] ++ lib.optional withGTK gtk3;
2323
2424 nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ]
2525 ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
5757 -i gdk-pixbuf-loader/Makefile
5858
5959 # Fix thumbnailer path
60− sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk_pixbuf}/bin\1#g" \
60+ sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk-pixbuf}/bin\1#g" \
6161 -i gdk-pixbuf-loader/librsvg.thumbnailer.in
6262 '';
6363
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
6666 # Merge gdkpixbuf and librsvg loaders
6767 postInstall = ''
6868 mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp
69− cat ${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache
69+ cat ${gdk-pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache
7070 rm $GDK_PIXBUF/loaders.cache.tmp
7171 '';
7272
pkgs/development/libraries/libuv/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
22
33stdenv.mkDerivation rec {
4− version = "1.30.0";
4+ version = "1.30.1";
55 pname = "libuv";
66
77 src = fetchFromGitHub {
88 owner = pname;
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0j26nh799962l1gn3v3sw1x6fnia2dx5irhl33nc77gy2gzayv07";
11+ sha256 = "16l207g9qwckxn0vnbnwiybhw6083imdwyfd6ipfsl44b1m8jmf7";
1212 };
1313
1414 postPatch = let
pkgs/development/libraries/libva/default.nix+2−2
@@ -6,14 +6,14 @@
66
77stdenv.mkDerivation rec {
88 name = "libva-${lib.optionalString minimal "minimal-"}${version}";
9− version = "2.4.1";
9+ version = "2.5.0";
1010
1111 # update libva-utils and vaapiIntel as well
1212 src = fetchFromGitHub {
1313 owner = "01org";
1414 repo = "libva";
1515 rev = version;
16− sha256 = "06kqff05jhd87yi53gyc2qivgg4sbf19qyznm9s4dyz92k04cl5c";
16+ sha256 = "0pys6blkh8ayxmxgfh7qrjzzcrzzn14z5d8q4a34ffqk90b6r93z";
1717 };
1818
1919 outputs = [ "dev" "out" ];
pkgs/development/libraries/mesa/default.nix+2−2
@@ -27,7 +27,7 @@
2727with stdenv.lib;
2828
2929let
30− version = "19.1.1";
30+ version = "19.1.3";
3131 branch = head (splitString "." version);
3232in
3333
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
4343 "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
4444 ];
45− sha256 = "10amy5sdmpjbskr3xazgk0jyli8xpgi0y1nsmjr76hx8nhb4n4bj";
45+ sha256 = "1q5p4mw7zrklwx1is09knnb762zzk33xwhwp99fw25ax4ar60m44";
4646 };
4747
4848 prePatch = "patchShebangs .";
pkgs/development/libraries/qt-4.x/4.8/default.nix+2−2
@@ -6,7 +6,7 @@
66, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
77, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
88, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
9−, flashplayerFix ? false, gdk_pixbuf
9+, flashplayerFix ? false, gdk-pixbuf
1010, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
1111, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
1212, developerBuild ? false
@@ -188,7 +188,7 @@ stdenv.mkDerivation rec {
188188 [ cups # Qt dlopen's libcups instead of linking to it
189189 postgresql sqlite libjpeg libmng libtiff icu ]
190190 ++ lib.optionals (mysql != null) [ mysql.connector-c ]
191− ++ lib.optionals gtkStyle [ gtk2 gdk_pixbuf ]
191+ ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
192192 ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
193193
194194 nativeBuildInputs = [ perl pkgconfig which ];
pkgs/development/libraries/qt-5/modules/qtbase.nix+1−13
@@ -171,7 +171,7 @@ stdenv.mkDerivation {
171171 NIX_OUTPUT_BIN = $bin
172172 NIX_OUTPUT_DEV = $dev
173173 NIX_OUTPUT_OUT = $out
174− NIX_OUTPUT_DOC = $out/$qtDocPrefix
174+ NIX_OUTPUT_DOC = $dev/$qtDocPrefix
175175 NIX_OUTPUT_QML = $bin/$qtQmlPrefix
176176 NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix
177177 EOF
@@ -360,18 +360,6 @@ stdenv.mkDerivation {
360360 moveToOutput bin "$dev"
361361 ''
362362
363− # Fix paths returned by qmake -query
364− + ''
365− cat > $dev/bin/qt.conf <<EOF
366− [Paths]
367− Prefix = $out
368− Headers = $dev/include
369− Plugins = $bin/$qtPluginPrefix
370− Documentation = $out/$qtDocPrefix
371− HostBinaries = $dev/bin
372− EOF
373− ''
374−
375363 + (
376364 # fixup .pc file (where to find 'moc' etc.)
377365 ''
pkgs/development/libraries/vaapi-vdpau/default.nix+25−22
@@ -1,37 +1,40 @@
1−{ stdenv, fetchurl, libvdpau, libGLU_combined, libva, pkgconfig }:
2−let
3− libvdpau08patch = (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?revision=1.1";
4− name = "libva-vdpau-driver-0.7.4-libvdpau-0.8.patch";
5− sha256 = "1n2cys59wyv8ylx9i5m3s6856mgx24hzcp45w1ahdfbzdv9wrfbl";
6− });
7−in
1+{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU_combined, libva, pkgconfig }:
2+
83stdenv.mkDerivation rec {
9− name = "libva-vdpau-driver-0.7.4";
10−
4+ pname = "libva-vdpau-driver";
5+ version = "0.7.4";
6+
117 src = fetchurl {
12− url = "https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2";
8+ url = "https://www.freedesktop.org/software/vaapi/releases/${pname}/${pname}-${version}.tar.bz2";
139 sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m";
1410 };
1511
16− patches = [ ./glext85.patch
17− (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch?revision=1.1";
18− name = "libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch";
19− sha256 = "166svcav6axkrlb3i4rbf6dkwjnqdf69xw339az1f5yabj72pqqs";
20− }) ];
12+ patches = [
13+ (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-glext-85.patch";
14+ sha256 = "0f0v7cl7kna3jcfnxw48b9mfl0hpacw72df9vym96sa2206vqlb0"; })
15+ (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-drop-h264-api.patch";
16+ sha256 = "0q5w83jbf4qqmhwf54h906pzxgvhqv7g2vrkw7jzgnrxhhj9sj60"; })
17+ (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-fix_type.patch";
18+ sha256 = "0s5dk6aa4sm0iyicnf2fwfsrqbvr58nbp77mhjg5bvwlar7znqv7"; })
19+ (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/sigfpe-crash.patch";
20+ sha256 = "15snqf60ib0xb3cnav5b2r55qv8lv2fa4p6jwxajh8wbvqpw0ibz"; })
21+ (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/implement-vaquerysurfaceattributes.patch";
22+ sha256 = "1dapx3bqqblw6l2iqqw1yff6qifam8q4m2rq343kwb3dqhy2ymy5"; })
23+ (fetchpatch { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch";
24+ sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; })
25+ ];
2126
2227 nativeBuildInputs = [ pkgconfig ];
2328 buildInputs = [ libvdpau libGLU_combined libva ];
2429
25− preConfigure = ''
26− patch -p0 < ${libvdpau08patch} # use -p0 instead of -p1
30+ postPatch = ''
2731 sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
2832 '';
2933
30−
31− meta = {
32− homepage = https://cgit.freedesktop.org/vaapi/vdpau-driver/;
33− license = stdenv.lib.licenses.gpl2Plus;
34+ meta = with stdenv.lib; {
35+ homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver";
36+ license = licenses.gpl2Plus;
3437 description = "VDPAU driver for the VAAPI library";
35− platforms = stdenv.lib.platforms.linux;
38+ platforms = platforms.linux;
3639 };
3740}
pkgs/development/libraries/vaapi-vdpau/glext85.patchdeleted−20
@@ -1,20 +0,0 @@
1−http://www.mail-archive.com/libva@lists.freedesktop.org/msg01457.html
2−
3−diff --git a/src/utils_glx.h b/src/utils_glx.h
4−index 19d03e4..f270fba 100644
5−--- a/src/utils_glx.h
6−+++ b/src/utils_glx.h
7−@@ -42,6 +42,13 @@ typedef void (*PFNGLVDPAUMAPSURFACESNVPROC)(GLsizei numSurfaces, const GLvdpauSu
8− typedef void (*PFNGLVDPAUUNMAPSURFACESNVPROC)(GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
9− #endif
10−
11−+#if GL_GLEXT_VERSION >= 85
12−+/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
13−+ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
14−+ Redefine the type here as an interim solution */
15−+typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
16−+#endif
17−+
18− /* GLX_EXT_texture_from_pixmap */
19− #if GLX_GLXEXT_VERSION < 18
20− typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, GLXDrawable, int, const int *);
pkgs/development/ocaml-modules/ocaml-cairo/default.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, gtk2, pango }:
1+{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
22
33let
44 pname = "ocaml-cairo";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 nativeBuildInputs = [ pkgconfig ];
2323 buildInputs = [ ocaml automake gnum4 autoconf unzip
24− findlib freetype lablgtk cairo gdk_pixbuf gtk2 pango ];
24+ findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
2525
2626 createFindlibDestdir = true;
2727
pkgs/development/python-modules/Cython/default.nix+2−2
@@ -25,11 +25,11 @@ let
2525
2626in buildPythonPackage rec {
2727 pname = "Cython";
28− version = "0.29.10";
28+ version = "0.29.13";
2929
3030 src = fetchPypi {
3131 inherit pname version;
32− sha256 = "26229570d6787ff3caa932fe9d802960f51a89239b990d275ae845405ce43857";
32+ sha256 = "c29d069a4a30f472482343c866f7486731ad638ef9af92bfe5fca9c7323d638e";
3333 };
3434
3535 nativeBuildInputs = [
pkgs/development/python-modules/bcrypt/default.nix+2−2
@@ -4,12 +4,12 @@
44with stdenv.lib;
55
66buildPythonPackage rec {
7− version = "3.1.6";
7+ version = "3.1.7";
88 pname = "bcrypt";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea";
12+ sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42";
1313 };
1414 buildInputs = [ pycparser mock pytest py ];
1515 propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;
pkgs/development/python-modules/cairocffi/0_9.nix+2−2
@@ -1,4 +1,4 @@
1−# FIXME: make gdk_pixbuf dependency optional
1+# FIXME: make gdk-pixbuf dependency optional
22{ stdenv
33, buildPythonPackage
44, pythonOlder
@@ -15,7 +15,7 @@
1515, withXcffib ? false, xcffib
1616, python
1717, glib
18−, gdk_pixbuf
18+, gdk-pixbuf
1919}@args:
2020
2121import ./generic.nix ({
pkgs/development/python-modules/cairocffi/default.nix+2−2
@@ -1,4 +1,4 @@
1−# FIXME: make gdk_pixbuf dependency optional
1+# FIXME: make gdk-pixbuf dependency optional
22{ stdenv
33, buildPythonPackage
44, pythonOlder
@@ -15,7 +15,7 @@
1515, withXcffib ? false, xcffib
1616, python
1717, glib
18−, gdk_pixbuf
18+, gdk-pixbuf
1919}@args:
2020
2121import ./generic.nix ({
pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch+6−6
@@ -3,7 +3,7 @@ Author: Alexander V. Nikolaev <avn@avnik.info>
33Date: Sat Feb 6 08:09:06 2016 +0200
44
55 Patch dlopen() to allow direct paths to all required libs
6−
6+
77 This patch is NixOS specific
88
99diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
@@ -13,15 +13,15 @@ index 718aa7f..1a1dcff 100644
1313@@ -27,20 +27,22 @@ VERSION = '0.7.2'
1414 version = '1.10.0'
1515 version_info = (1, 10, 0)
16−
16+
1717+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
1818+_LIBS = {
1919+ 'cairo': '@cairo@/lib/libcairo@ext@',
2020+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
2121+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
22−+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
22++ 'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
2323+}
24−
24+
2525-def dlopen(ffi, *names):
2626+def dlopen(ffi, name, *names):
2727 """Try various names for the same library, for different platforms."""
@@ -42,6 +42,6 @@ index 718aa7f..1a1dcff 100644
4242+ if lib:
4343+ return lib
4444+ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
45−
46−
45+
46+
4747 cairo = dlopen(ffi, 'cairo', 'cairo-2')
pkgs/development/python-modules/cairocffi/dlopen-paths.patch+6−6
@@ -3,7 +3,7 @@ Author: Alexander V. Nikolaev <avn@avnik.info>
33Date: Sat Feb 6 08:09:06 2016 +0200
44
55 Patch dlopen() to allow direct paths to all required libs
6−
6+
77 This patch is NixOS specific
88
99diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
@@ -13,15 +13,15 @@ index 6061973..3538a58 100644
1313@@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
1414 version = '1.16.0'
1515 version_info = (1, 16, 0)
16−
16+
1717+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
1818+_LIBS = {
1919+ 'cairo': '@cairo@/lib/libcairo@ext@',
2020+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
2121+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
22−+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
22++ 'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
2323+}
24−
24+
2525-def dlopen(ffi, *names):
2626+def dlopen(ffi, name, *names):
2727 """Try various names for the same library, for different platforms."""
@@ -41,6 +41,6 @@ index 6061973..3538a58 100644
4141+ if lib:
4242+ return lib
4343+ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
44−
45−
44+
45+
4646 cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2')
pkgs/development/python-modules/cairocffi/generic.nix+2−2
@@ -31,13 +31,13 @@ buildPythonPackage rec {
3131 '';
3232
3333 patches = [
34− # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0
34+ # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
3535 (substituteAll {
3636 src = dlopen_patch;
3737 ext = stdenv.hostPlatform.extensions.sharedLibrary;
3838 cairo = cairo.out;
3939 glib = glib.out;
40− gdk_pixbuf = gdk_pixbuf.out;
40+ gdk_pixbuf = gdk-pixbuf.out;
4141 })
4242 ./fix_test_scaled_font.patch
4343 ];
pkgs/development/python-modules/certifi/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "certifi";
8− version = "2019.3.9";
8+ version = "2019.6.16";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "1bnpw7hrf9i1l9gfxjnzi45hkrvzz0pyn9ia8m4mw7sxhgb08qdj";
12+ sha256 = "945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695";
1313 };
1414
1515 meta = {
pkgs/development/python-modules/cytoolz/default.nix+2−11
@@ -10,22 +10,13 @@
1010
1111buildPythonPackage rec {
1212 pname = "cytoolz";
13− version = "0.9.0.1";
13+ version = "0.10.0";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "84cc06fa40aa310f2df79dd440fc5f84c3e20f01f9f7783fc9c38d0a11ba00e5";
17+ sha256 = "ed9f6a07c2bac70d6c597df360d0666d11d2adc90141d54c5c2db08b380a4fac";
1818 };
1919
20− patches = [
21− # temporal fix for a test failure: https://github.com/pytoolz/cytoolz/issues/122
22− (fetchpatch {
23− name = "py37.patch";
24− url = https://salsa.debian.org/python-team/modules/python-cytoolz/raw/5ce4158deefc47475d1e76813f900e6c72ddcc6e/debian/patches/py37.patch;
25− sha256 = "1z29y7s5n751q3f74r3bz0f48yg6izvi68hc4pkwcalxmkq5r1n9";
26− })
27− ];
28−
2920 # Extension types
3021 disabled = isPyPy;
3122
pkgs/development/python-modules/glob2/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, python
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "glob2";
9+ version = "0.7";
10+
11+ src = fetchPypi {
12+ inherit pname version;
13+ sha256 = "135bj8gm6vn45vv0phrvhyir36kfm17y7kmasxinv8lagk8dphw5";
14+ };
15+
16+ checkPhase = ''
17+ ${python.interpreter} test.py
18+ '';
19+
20+ meta = with lib; {
21+ description = "Version of the glob module that can capture patterns and supports recursive wildcards";
22+ homepage = https://github.com/miracle2k/python-glob2/;
23+ license = licenses.bsd3;
24+ maintainers = [ maintainers.costrouc ];
25+ };
26+}
pkgs/development/python-modules/ipython/default.nix+2−9
@@ -22,25 +22,18 @@
2222
2323buildPythonPackage rec {
2424 pname = "ipython";
25− version = "7.5.0";
25+ version = "7.6.1";
2626 disabled = pythonOlder "3.5";
2727
2828 src = fetchPypi {
2929 inherit pname version;
30− sha256 = "e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26";
30+ sha256 = "11067ab11d98b1e6c7f0993506f7a5f8a91af420f7e82be6575fcb7a6ca372a0";
3131 };
3232
3333 prePatch = lib.optionalString stdenv.isDarwin ''
3434 substituteInPlace setup.py --replace "'gnureadline'" " "
3535 '';
3636
37− patches = [
38− (fetchpatch {
39− url = "https://github.com/ipython/ipython/commit/e1b53e9ef91a43b9e275bb9e48b4253218375d87.patch";
40− sha256 = "sha256:0q7zsgalwxss6aikhakbdkvvz0g4ac4sa3ncrklm74ksqh56rsgb";
41− })
42− ];
43−
4437 buildInputs = [ glibcLocales ];
4538
4639 checkInputs = [ nose pygments ];
pkgs/development/python-modules/ipywidgets/default.nix+2−2
@@ -14,11 +14,11 @@
1414
1515buildPythonPackage rec {
1616 pname = "ipywidgets";
17− version = "7.4.2";
17+ version = "7.5.0";
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "a3e224f430163f767047ab9a042fc55adbcab0c24bbe6cf9f306c4f89fdf0ba3";
21+ sha256 = "cb263c6974aca902d00a435711823bb4aaf6614a5f997f517e15fa84151e8fa2";
2222 };
2323
2424 # Tests are not distributed
pkgs/development/python-modules/jupyter_client/default.nix+2−2
@@ -16,11 +16,11 @@
1616
1717buildPythonPackage rec {
1818 pname = "jupyter_client";
19− version = "5.2.4";
19+ version = "5.3.1";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "b5f9cb06105c1d2d30719db5ffb3ea67da60919fb68deaefa583deccd8813551";
23+ sha256 = "98e8af5edff5d24e4d31e73bc21043130ae9d955a91aa93fc0bc3b1d0f7b5880";
2424 };
2525
2626 checkInputs = [ ipykernel ipython mock pytest ];
pkgs/development/python-modules/jupyter_core/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "jupyter_core";
13− version = "4.4.0";
13+ version = "4.5.0";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7";
17+ sha256 = "2c6e7c1e9f2ac45b5c2ceea5730bc9008d92fe59d0725eac57b04c0edfba24f7";
1818 };
1919
2020 checkInputs = [ pytest mock glibcLocales ];
pkgs/development/python-modules/nbval/default.nix+16−4
@@ -22,15 +22,27 @@ buildPythonPackage rec {
2222 sha256 = "0g8xl4158ngyhiynrkk72jpawnk4isznbijz0w085g269fps0vp2";
2323 };
2424
25− LC_ALL = "en_US.UTF-8";
25+ checkInputs = [
26+ pytest
27+ matplotlib
28+ sympy
29+ pytestcov
30+ ];
2631
2732 buildInputs = [ glibcLocales ];
28− checkInputs = [ matplotlib sympy pytestcov pytest ];
29− propagatedBuildInputs = [ coverage ipykernel jupyter_client nbformat pytest six ];
33+
34+ propagatedBuildInputs = [
35+ coverage
36+ ipykernel
37+ jupyter_client
38+ nbformat
39+ pytest
40+ six
41+ ];
3042
3143 # ignore impure tests
3244 checkPhase = ''
33− pytest tests --current-env --ignore tests/test_timeouts.py
45+ pytest tests --ignore tests/test_timeouts.py
3446 '';
3547
3648 meta = with lib; {
pkgs/development/python-modules/numba/default.nix+2−2
@@ -13,12 +13,12 @@
1313}:
1414
1515buildPythonPackage rec {
16− version = "0.44.0";
16+ version = "0.45.0";
1717 pname = "numba";
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "56421bfc62f3c7c996ff11d5db7fc410909564e41b55379a82b9188fa4aa22f9";
21+ sha256 = "fcea8dc6f9e0f1ddf7bd52a207858539bc14e893c5ee66d8730c3e5b9344c4b3";
2222 };
2323
2424 NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
pkgs/development/python-modules/numpy/default.nix+4−5
@@ -16,12 +16,12 @@ let
1616 };
1717in buildPythonPackage rec {
1818 pname = "numpy";
19− version = "1.16.4";
19+ version = "1.17.0";
2020
2121 src = fetchPypi {
2222 inherit pname version;
2323 extension = "zip";
24− sha256 = "7242be12a58fec245ee9734e625964b97cf7e3f2f7d016603f9e56660ce479c7";
24+ sha256 = "951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a";
2525 };
2626
2727 nativeBuildInputs = [ gfortran pytest ];
@@ -60,10 +60,9 @@ in buildPythonPackage rec {
6060 inherit blasImplementation cfg;
6161 };
6262
63− # Disable two tests
64− # - test_f2py: f2py isn't yet on path.
63+ # Disable test
6564 # - test_large_file_support: takes a long time and can cause the machine to run out of disk space
66− NOSE_EXCLUDE="test_f2py,test_large_file_support";
65+ NOSE_EXCLUDE="test_large_file_support";
6766
6867 meta = {
6968 description = "Scientific tools for Python";
pkgs/development/python-modules/pandas/2.nixnew file+122
@@ -0,0 +1,122 @@
1+# Python 2 expression
2+
3+{ buildPythonPackage
4+, fetchPypi
5+, python
6+, stdenv
7+, pytest
8+, glibcLocales
9+, cython
10+, dateutil
11+, scipy
12+, moto
13+, numexpr
14+, pytz
15+, xlrd
16+, bottleneck
17+, sqlalchemy
18+, lxml
19+, html5lib
20+, beautifulsoup4
21+, hypothesis
22+, openpyxl
23+, tables
24+, xlwt
25+, runtimeShell
26+, libcxx ? null
27+}:
28+
29+let
30+ inherit (stdenv.lib) optional optionals optionalString;
31+ inherit (stdenv) isDarwin;
32+
33+in buildPythonPackage rec {
34+ pname = "pandas";
35+ version = "0.24.2";
36+
37+ src = fetchPypi {
38+ inherit pname version;
39+ sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag";
40+ };
41+
42+ checkInputs = [ pytest glibcLocales moto hypothesis ];
43+
44+ nativeBuildInputs = [ cython ];
45+ buildInputs = optional isDarwin libcxx;
46+ propagatedBuildInputs = [
47+ dateutil
48+ scipy
49+ numexpr
50+ pytz
51+ xlrd
52+ bottleneck
53+ sqlalchemy
54+ lxml
55+ html5lib
56+ beautifulsoup4
57+ openpyxl
58+ tables
59+ xlwt
60+ ];
61+
62+ # For OSX, we need to add a dependency on libcxx, which provides
63+ # `complex.h` and other libraries that pandas depends on to build.
64+ postPatch = optionalString isDarwin ''
65+ cpp_sdk="${libcxx}/include/c++/v1";
66+ echo "Adding $cpp_sdk to the setup.py common_include variable"
67+ substituteInPlace setup.py \
68+ --replace "['pandas/src/klib', 'pandas/src']" \
69+ "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
70+ '';
71+
72+
73+ disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
74+ # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
75+ # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
76+ "test_fallback_plural"
77+ "test_ambiguous_flags"
78+ "test_ambiguous_compat"
79+ # Locale-related
80+ "test_names"
81+ "test_dt_accessor_datetime_name_accessors"
82+ "test_datetime_name_accessors"
83+ # Can't import from test folder
84+ "test_oo_optimizable"
85+ # Disable IO related tests because IO data is no longer distributed
86+ "io"
87+ # KeyError Timestamp
88+ "test_to_excel"
89+ ] ++ optionals isDarwin [
90+ "test_locale"
91+ "test_clipboard"
92+ ]);
93+
94+ doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
95+
96+ checkPhase = ''
97+ runHook preCheck
98+ ''
99+ # TODO: Get locale and clipboard support working on darwin.
100+ # Until then we disable the tests.
101+ + optionalString isDarwin ''
102+ # Fake the impure dependencies pbpaste and pbcopy
103+ echo "#!${runtimeShell}" > pbcopy
104+ echo "#!${runtimeShell}" > pbpaste
105+ chmod a+x pbcopy pbpaste
106+ export PATH=$(pwd):$PATH
107+ '' + ''
108+ LC_ALL="en_US.UTF-8" py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests"
109+ runHook postCheck
110+ '';
111+
112+ meta = {
113+ # https://github.com/pandas-dev/pandas/issues/14866
114+ # pandas devs are no longer testing i686 so safer to assume it's broken
115+ broken = stdenv.isi686;
116+ homepage = http://pandas.pydata.org/;
117+ description = "Python Data Analysis Library";
118+ license = stdenv.lib.licenses.bsd3;
119+ maintainers = with stdenv.lib.maintainers; [ raskin knedlsepp ];
120+ platforms = stdenv.lib.platforms.unix;
121+ };
122+}
pkgs/development/python-modules/pandas/default.nix+2−2
@@ -30,11 +30,11 @@ let
3030
3131in buildPythonPackage rec {
3232 pname = "pandas";
33− version = "0.24.2";
33+ version = "0.25.0";
3434
3535 src = fetchPypi {
3636 inherit pname version;
37− sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag";
37+ sha256 = "914341ad2d5b1ea522798efa4016430b66107d05781dbfe7cf05eba8f37df995";
3838 };
3939
4040 checkInputs = [ pytest glibcLocales moto hypothesis ];
pkgs/development/python-modules/pycurl/default.nix+19−12
@@ -11,27 +11,34 @@
1111
1212buildPythonPackage rec {
1313 pname = "pycurl";
14− version = "7.43.0.2";
14+ version = "7.43.0.3";
1515 disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4";
19+ sha256 = "13nsvqhvnmnvfk75s8iynqsgszyv06cjp4drd3psi7zpbh63623g";
2020 };
2121
22− buildInputs = [ curl openssl.out ];
23− nativeBuildInputs = [ curl ];
22+ buildInputs = [
23+ curl
24+ openssl.out
25+ ];
2426
25− checkInputs = [ bottle pytest nose flaky ];
27+ nativeBuildInputs = [
28+ curl
29+ ];
30+
31+ checkInputs = [
32+ bottle
33+ pytest
34+ nose
35+ flaky
36+ ];
2637
2738 checkPhase = ''
28− py.test -k "not ssh_key_cb_test \
29− and not test_libcurl_ssl_gnutls \
30− and not test_libcurl_ssl_nss \
31− and not test_libcurl_ssl_openssl \
32− and not test_libcurl_ssl_unrecognized \
33− and not test_request_with_verifypeer \
34− and not test_ssl_in_static_libs" tests
39+ pytest tests -k "not test_ssl_in_static_libs \
40+ and not test_keyfunction \
41+ and not test_keyfunction_bogus_return"
3542 '';
3643
3744 preConfigure = ''
pkgs/development/python-modules/pyglet/default.nix+2−2
@@ -7,7 +7,7 @@
77, pytest
88, glibc
99, gtk2-x11
10−, gdk_pixbuf
10+, gdk-pixbuf
1111}:
1212
1313buildPythonPackage rec {
@@ -42,7 +42,7 @@ buildPythonPackage rec {
4242 elif name == 'gdk-x11-2.0':
4343 path = '${gtk2-x11}/lib/libgdk-x11-2.0${ext}'
4444 elif name == 'gdk_pixbuf-2.0':
45− path = '${gdk_pixbuf}/lib/libgdk_pixbuf-2.0${ext}'
45+ path = '${gdk-pixbuf}/lib/libgdk_pixbuf-2.0${ext}'
4646 if path is not None:
4747 return ctypes.cdll.LoadLibrary(path)
4848 raise Exception("Could not load library {}".format(names))
pkgs/development/python-modules/pyopenssl/default.nix+2
@@ -46,6 +46,8 @@ let
4646 # These tests, we disable always.
4747 "test_set_default_verify_paths"
4848 "test_fallback_default_verify_paths"
49+ # https://github.com/pyca/pyopenssl/issues/768
50+ "test_wantWriteError"
4951 ] ++ (
5052 optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests
5153 ) ++ (
pkgs/development/python-modules/pytest-annotate/default.nix+13−2
@@ -14,9 +14,20 @@ buildPythonPackage rec {
1414 sha256 = "03e4dece2d1aa91666034f1b2e8bb7a7b8c6be11baf3cf2929b26eea5c6e86f3";
1515 };
1616
17− propagatedBuildInputs = [ pyannotate pytest ];
17+ buildInputs = [
18+ pytest
19+ ];
1820
19− # not testing for a testing module...
21+ propagatedBuildInputs = [
22+ pyannotate
23+ ];
24+
25+ postPatch = ''
26+ substituteInPlace setup.py \
27+ --replace "pytest>=3.2.0,<4.0.0" "pytest"
28+ '';
29+
30+ # no testing in a testing module...
2031 doCheck = false;
2132
2233 meta = with stdenv.lib; {
pkgs/development/python-modules/pytest-mock/default.nix+20−3
@@ -1,4 +1,12 @@
1−{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }:
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, fetchpatch
5+, isPy3k
6+, pytest
7+, mock
8+, setuptools_scm
9+}:
210
311buildPythonPackage rec {
412 pname = "pytest-mock";
@@ -10,7 +18,14 @@ buildPythonPackage rec {
1018 };
1119
1220 propagatedBuildInputs = lib.optional (!isPy3k) mock;
13− nativeBuildInputs = [ setuptools_scm pytest ];
21+
22+ nativeBuildInputs = [
23+ setuptools_scm
24+ ];
25+
26+ checkInputs = [
27+ pytest
28+ ];
1429
1530 patches = [
1631 # Fix tests for pytest 4.6. Remove with the next release
@@ -21,7 +36,9 @@ buildPythonPackage rec {
2136 ];
2237
2338 checkPhase = ''
24− py.test
39+ # remove disabled test on next release
40+ # https://github.com/pytest-dev/pytest-mock/pull/151
41+ pytest -k "not test_detailed_introspection"
2542 '';
2643
2744 meta = with lib; {
pkgs/development/python-modules/pyyaml/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "PyYAML";
5− version = "5.1";
5+ version = "5.1.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95";
9+ sha256 = "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955";
1010 };
1111
1212 # force regeneration using Cython
pkgs/development/python-modules/readme/default.nix+12−9
@@ -2,11 +2,7 @@
22, buildPythonPackage
33, fetchPypi
44, pytest
5−, six
6−, docutils
7−, pygments
8−, bleach
9−, html5lib
5+, readme_renderer
106}:
117
128buildPythonPackage rec {
@@ -18,20 +14,27 @@ buildPythonPackage rec {
1814 sha256 = "32fbe1538a437da160fa4e4477270bfdcd8876e2e364d0d12898302644496231";
1915 };
2016
21− buildInputs = [ pytest ];
22− propagatedBuildInputs = [ six docutils pygments bleach html5lib ];
17+ checkInputs = [
18+ pytest
19+ ];
20+
21+ propagatedBuildInputs = [
22+ readme_renderer
23+ ];
2324
2425 checkPhase = ''
25− py.test
26+ pytest
2627 '';
2728
28− # Tests fail, possibly broken.
29+ # tests are not included with pypi release
30+ # package is not readme_renderer
2931 doCheck = false;
3032
3133 meta = with stdenv.lib; {
3234 description = "Readme is a library for rendering readme descriptions for Warehouse";
3335 homepage = "https://github.com/pypa/readme";
3436 license = licenses.asl20;
37+ maintainers = [ maintainers.costrouc ];
3538 };
3639
3740}
pkgs/development/python-modules/requests/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "requests";
7− version = "2.21.0";
7+ version = "2.22.0";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e";
11+ sha256 = "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4";
1212 };
1313
1414 nativeBuildInputs = [ pytest ];
pkgs/development/python-modules/statsmodels/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "statsmodels";
16− version = "0.10.0";
16+ version = "0.10.1";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "1fhsq3bz5ya54ipa0cb8qgfj7gfgxprv4briig0ly4r11rj23wv5";
20+ sha256 = "320659a80f916c2edf9dfbe83512d9004bb562b72eedb7d9374562038697fa10";
2121 };
2222
2323 checkInputs = with self; [ nose ];
pkgs/development/python-modules/toolz/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec{
88 pname = "toolz";
9− version = "0.9.0";
9+ version = "0.10.0";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9";
13+ sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
1414 };
1515
1616 checkInputs = [ nose ];
pkgs/development/python-modules/tqdm/default.nix+2−2
@@ -9,11 +9,11 @@
99
1010buildPythonPackage rec {
1111 pname = "tqdm";
12− version = "4.32.1";
12+ version = "4.32.2";
1313
1414 src = fetchPypi {
1515 inherit pname version;
16− sha256 = "0a860bf2683fdbb4812fe539a6c22ea3f1777843ea985cb8c3807db448a0f7ab";
16+ sha256 = "25d4c0ea02a305a688e7e9c2cdc8f862f989ef2a4701ab28ee963295f5b109ab";
1717 };
1818
1919 buildInputs = [ nose coverage glibcLocales flake8 ];
pkgs/development/python-modules/widgetsnbextension/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "widgetsnbextension";
10− version = "3.4.2";
10+ version = "3.5.0";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "fa618be8435447a017fd1bf2c7ae922d0428056cfc7449f7a8641edf76b48265";
14+ sha256 = "8c9b4d73e388f2484296be18432d3cc0b8d59de243079a0db16a56c5571e1f86";
1515 };
1616
1717 propagatedBuildInputs = [ notebook ];
pkgs/development/python-modules/xarray/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "xarray";
13− version = "0.12.2";
13+ version = "0.12.3";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "0wlpyzxdhcc043g9sjbrflky7xwdyq487v64i532zb2fpjskd59s";
17+ sha256 = "9310e610af988acb57a2627b10025a250bcbe172e66d3750a6dd3b3c5357da56";
1818 };
1919
2020 checkInputs = [ pytest ];
pkgs/development/ruby-modules/gem-config/default.nix+3−3
@@ -22,7 +22,7 @@
2222, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
2323, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
2424, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
25−, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx
25+, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
2626, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
2727, bison, flex, pango, python3, patchelf
2828, libselinux ? null, libsepol ? null
@@ -159,7 +159,7 @@ in
159159
160160 gdk_pixbuf2 = attrs: {
161161 nativeBuildInputs = [ pkgconfig ];
162− buildInputs = [ rake gdk_pixbuf ];
162+ buildInputs = [ rake gdk-pixbuf ];
163163 };
164164
165165 gpgme = attrs: {
@@ -255,7 +255,7 @@ in
255255 pkgconfig
256256 cairo
257257 pango
258− gdk_pixbuf
258+ gdk-pixbuf
259259 libxml2
260260 python3
261261 ];
pkgs/development/tools/build-managers/cmake/setup-hook.sh+13−1
@@ -68,8 +68,20 @@ cmakeConfigurePhase() {
6868 # executable. This flag makes the shared library accessible from its
6969 # nix/store directory.
7070 cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags"
71+
72+ # This ensures correct paths with multiple output derivations
73+ # It requires the project to use variables from GNUInstallDirs module
74+ # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
75+ cmakeFlags="-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin $cmakeFlags"
76+ cmakeFlags="-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin $cmakeFlags"
77+ cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include $cmakeFlags"
78+ cmakeFlags="-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include $cmakeFlags"
79+ cmakeFlags="-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man $cmakeFlags"
80+ cmakeFlags="-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info $cmakeFlags"
81+ cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags"
7182 cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags"
72− cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags"
83+ cmakeFlags="-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec $cmakeFlags"
84+ cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags"
7385
7486 # Don’t build tests when doCheck = false
7587 if [ -z "$doCheck" ]; then
pkgs/development/tools/node-webkit/nw12.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, buildEnv, makeWrapper
22, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
3−, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
3+, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
44, libnotify}:
55let
66 bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
@@ -9,7 +9,7 @@ let
99 nwEnv = buildEnv {
1010 name = "nwjs-env";
1111 paths = [
12− xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf
12+ xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk-pixbuf
1313 freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
1414 xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
1515 xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
pkgs/development/tools/nwjs/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, buildEnv, makeWrapper
22
33, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig
4−, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
4+, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
55, libnotify
66, ffmpeg, libxcb, cups
77, sqlite, udev
@@ -15,7 +15,7 @@ let
1515 nwEnv = buildEnv {
1616 name = "nwjs-env";
1717 paths = [
18− xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk_pixbuf
18+ xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk-pixbuf
1919 freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
2020 xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
2121 xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
pkgs/development/tools/react-native-debugger/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib
1+{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib
22, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
33}:
44
@@ -6,7 +6,7 @@ let
66 rpath = stdenv.lib.makeLibraryPath [
77 cairo
88 stdenv.cc.cc
9− gdk_pixbuf
9+ gdk-pixbuf
1010 fontconfig
1111 pango
1212 atk
pkgs/development/tools/selenium/chromedriver/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib
1+{ stdenv, fetchurl, cairo, fontconfig, freetype, gdk-pixbuf, glib
22, glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf
33, libXi, libXrender, libXext
44}:
@@ -21,7 +21,7 @@ let
2121 libs = stdenv.lib.makeLibraryPath [
2222 stdenv.cc.cc.lib
2323 cairo fontconfig freetype
24− gdk_pixbuf glib gtk2 gconf
24+ gdk-pixbuf glib gtk2 gconf
2525 libX11 nspr nss pango libXrender
2626 gconf libXext libXi
2727 ];
pkgs/development/tools/thrust/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk
2−, pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss
2+, pango, freetype, fontconfig, gdk-pixbuf , cairo, cups, expat, nspr, gconf, nss
33, xorg, libcap, unzip
44}:
55
@@ -7,7 +7,7 @@ let
77 thrustEnv = buildEnv {
88 name = "env-thrust";
99 paths = [
10− stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk_pixbuf
10+ stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk-pixbuf
1111 cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11
1212 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite
1313 xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap
pkgs/development/tools/unity3d/default.nix+5−5
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, makeWrapper, file, getopt
2−, gtk2, gtk3, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb
2+, gtk2, gtk3, gdk-pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb
33, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
44, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
55, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
@@ -9,12 +9,12 @@
99
1010let
1111 libPath64 = lib.makeLibraryPath [
12− gcc.cc gtk2 gdk_pixbuf glib libGL libGLU nss nspr
12+ gcc.cc gtk2 gdk-pixbuf glib libGL libGLU nss nspr
1313 alsaLib GConf cups libcap fontconfig freetype pango
1414 cairo dbus expat zlib libpng12 udev tbb
1515 libX11 libXcursor libXdamage libXfixes libXrender libXi
1616 libXcomposite libXext libXrandr libXtst libSM libICE libxcb
17− libpqxx gtk3
17+ libpqxx gtk3
1818 ];
1919 libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ];
2020 binPath = lib.makeBinPath [ nodejs gnutar ];
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
8282 }
8383
8484 upm_linux=$unitydir/Data/Resources/PackageManager/Server/UnityPackageManager
85−
85+
8686
8787 orig_size=$(stat --printf=%s $upm_linux)
8888
@@ -102,7 +102,7 @@ in stdenv.mkDerivation rec {
102102 # ^-- grep points here
103103 #
104104 # var_* are as described above
105− # shift_by seems to be safe so long as all patchelf adjustments occur
105+ # shift_by seems to be safe so long as all patchelf adjustments occur
106106 # before any locations pointed to by hardcoded offsets
107107
108108 var_skip=20
pkgs/development/web/insomnia/default.nix+4−4
@@ -1,6 +1,6 @@
11{ stdenv, makeWrapper, fetchurl, dpkg
22, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
3−, gdk_pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk
3+, gdk-pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk
44, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
55, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
66, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
@@ -25,13 +25,13 @@ in stdenv.mkDerivation rec {
2525 sha256 = "0km7anw5xpcfr6j7pwqhv26pk7nxv1jywqlz0lpvgj6w85aafcm3";
2626 };
2727
28− nativeBuildInputs = [
28+ nativeBuildInputs = [
2929 autoPatchelfHook
3030 dpkg
3131 makeWrapper
3232 gobject-introspection wrapGAppsHook
3333 ];
34−
34+
3535 buildInputs = [
3636 alsaLib
3737 at-spi2-atk
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
4242 expat
4343 fontconfig
4444 freetype
45− gdk_pixbuf
45+ gdk-pixbuf
4646 glib
4747 gnome2.GConf
4848 gnome2.pango
pkgs/development/web/postman/default.nix+1−1
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
5454 pkgs.cups
5555 pkgs.dbus.daemon.lib
5656 pkgs.expat
57− pkgs.gdk_pixbuf
57+ pkgs.gdk-pixbuf
5858 pkgs.glib
5959 pkgs.gtk2-x11
6060 pkgs.freetype
pkgs/games/arena/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk_pixbuf, libX11 }:
1+{ stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk-pixbuf, libX11 }:
22
33# Arena is free software in the sense of "free beer" but not as in "free
44# speech". We can install it as we please, but we cannot re-distribute it in
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 };
2121
2222 # stdenv.cc.cc.lib is in that list to pick up libstdc++.so. Is there a better way?
23− buildInputs = [gtk2-x11 glib pango cairo atk gdk_pixbuf libX11 stdenv.cc.cc.lib];
23+ buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 stdenv.cc.cc.lib];
2424
2525 unpackPhase = ''
2626 # This is is a tar bomb, i.e. it extract a dozen files and directories to
pkgs/games/planetaryannihilation/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk
2−, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk_pixbuf, curl, systemd, xorg }:
2+, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }:
33
44# TODO: use dynamic attributes once Nix 1.7 is out
55assert ((config.planetary_annihilation or null).url or null) != null;
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
2323 };
2424
2525 nativeBuildInputs = [ patchelf makeWrapper ];
26−
26+
2727 installPhase = ''
2828 mkdir -p $out/{bin,lib}
2929
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
3434 ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
3535
3636 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
37− patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
37+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
3838
3939 wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
4040
pkgs/games/steam/chrootenv.nix+1−1
@@ -90,7 +90,7 @@ in buildFHSUserEnv rec {
9090 gtk2
9191 bzip2
9292 zlib
93− gdk_pixbuf
93+ gdk-pixbuf
9494
9595 # Without these it silently fails
9696 xorg.libXinerama
pkgs/misc/emulators/cdemu/analyzer.nix+2−2
@@ -1,5 +1,5 @@
11{ callPackage, makeWrapper, gobject-introspection, cmake
2−, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk_pixbuf, librsvg, intltool, libmirage }:
2+, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }:
33let pkg = import ./base.nix {
44 version = "3.2.2";
55 pkgName = "image-analyzer";
@@ -7,7 +7,7 @@ let pkg = import ./base.nix {
77};
88in callPackage pkg {
99 buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper
10− gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool
10+ gnome3.adwaita-icon-theme gdk-pixbuf librsvg intltool
1111 python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ];
1212 drvParams = {
1313 nativeBuildInputs = [ gobject-introspection cmake ];
pkgs/misc/emulators/cdemu/gui.nix+2−2
@@ -1,5 +1,5 @@
11{ callPackage, makeWrapper, gobject-introspection, cmake
2−, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk_pixbuf, librsvg }:
2+, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }:
33let
44 pkg = import ./base.nix {
55 version = "3.2.1";
@@ -9,7 +9,7 @@ let
99 inherit (python3Packages) python pygobject3;
1010in callPackage pkg {
1111 buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
12− gnome3.adwaita-icon-theme gdk_pixbuf librsvg ];
12+ gnome3.adwaita-icon-theme gdk-pixbuf librsvg ];
1313 drvParams = {
1414 nativeBuildInputs = [ gobject-introspection cmake ];
1515 postFixup = ''
pkgs/misc/emulators/epsxe/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, glib, gtk3, libGLU_combined,
1+{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU_combined,
22 libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }:
33
44with stdenv.lib;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 buildInputs = [
2424 alsaLib
2525 curl
26− gdk_pixbuf
26+ gdk-pixbuf
2727 glib
2828 gtk3
2929 libX11
pkgs/misc/emulators/kega-fusion/default.nix+2−2
@@ -1,7 +1,7 @@
1−{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123, runtimeShell }:
1+{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }:
22
33let
4− libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk_pixbuf pango libXinerama ];
4+ libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ];
55
66in stdenv.mkDerivation rec {
77 name = "kega-fusion-${version}";
pkgs/misc/emulators/nestopia/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3
22, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils
3−, epoxy, gdk_pixbuf, gnome3, wrapGAppsHook
3+, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook
44}:
55
66stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 alsaLib
2525 epoxy
2626 gtk3
27− gdk_pixbuf
27+ gdk-pixbuf
2828 libGLU_combined
2929 libarchive
3030 libao
pkgs/misc/solfege/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo
2−, ghostscript, librsvg, gdk_pixbuf, txt2man, timidity, mpg123
2+, ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123
33, alsaUtils, vorbis-tools, csound, lilypond
44, makeWrapper
55}:
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
1616
1717 nativeBuildInputs = [ pkgconfig ];
1818 buildInputs = [ python pygtk gettext texinfo
19− ghostscript librsvg gdk_pixbuf txt2man makeWrapper
19+ ghostscript librsvg gdk-pixbuf txt2man makeWrapper
2020 ];
2121
2222 preBuild = ''
pkgs/misc/themes/adapta/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
1+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
22
33stdenv.mkDerivation rec {
44 name = "adapta-gtk-theme-${version}";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 ];
2626
2727 buildInputs = [
28− gdk_pixbuf
28+ gdk-pixbuf
2929 librsvg
3030 ];
3131
pkgs/misc/themes/equilux-theme/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
1+{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
22
33stdenv.mkDerivation rec {
44 name = "equilux-theme-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ glib libxml2 bc ];
1515
16− buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];
16+ buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ];
1717
1818 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1919
pkgs/misc/themes/numix-solarized/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python3, sass, glib, gdk_pixbuf, libxml2,
1+{ stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2,
22 inkscape, optipng, gtk-engine-murrine
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl";
1414 };
1515
16− nativeBuildInputs = [ python3 sass glib gdk_pixbuf libxml2 inkscape optipng ];
16+ nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ];
1717
1818 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1919
pkgs/misc/themes/numix/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk_pixbuf
1+{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf
22, gtk-engine-murrine
33}:
44
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7";
1414 };
1515
16− nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];
16+ nativeBuildInputs = [ sass glib libxml2 gdk-pixbuf ];
1717
1818 propagatedUserEnvPkgs = [ gtk-engine-murrine ];
1919
pkgs/os-specific/linux/usermount/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk_pixbuf }:
1+{ stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk-pixbuf }:
22
33stdenv.mkDerivation {
44 name = "usermount-0.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
13− buildInputs = [ dbus libnotify udisks2 gdk_pixbuf ];
13+ buildInputs = [ dbus libnotify udisks2 gdk-pixbuf ];
1414
1515 NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ];
1616
pkgs/stdenv/darwin/default.nix+1−1
@@ -32,7 +32,7 @@ in rec {
3232 export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
3333 export NIX_IGNORE_LD_THROUGH_GCC=1
3434 stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
35− export MACOSX_DEPLOYMENT_TARGET=10.10
35+ export MACOSX_DEPLOYMENT_TARGET=10.12
3636 export SDKROOT=
3737 export CMAKE_OSX_ARCHITECTURES=x86_64
3838 # Workaround for https://openradar.appspot.com/22671534 on 10.11.
pkgs/tools/X11/caffeine-ng/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ gdk_pixbuf, glib, gobject-introspection, gtk3, lib, libnotify,
1+{ gdk-pixbuf, glib, gobject-introspection, gtk3, lib, libnotify,
22 pythonPackages, wrapGAppsHook
33}:
44
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
1212 };
1313
1414 nativeBuildInputs = [ wrapGAppsHook glib ];
15− buildInputs = [ gdk_pixbuf gobject-introspection libnotify gtk3 ];
15+ buildInputs = [ gdk-pixbuf gobject-introspection libnotify gtk3 ];
1616 pythonPath = with pythonPackages; [
1717 dbus-python docopt ewmh pygobject3 pyxdg
1818 setproctitle setuptools setuptools_scm wheel
pkgs/tools/X11/xpra/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig
2−, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk
2+, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
33, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
44, ffmpeg_4, x264, libvpx, libwebp, x265
55, libfakeXinerama
@@ -40,7 +40,7 @@ in buildPythonApplication rec {
4040 ] ++ [
4141 cython
4242
43− pango cairo gdk_pixbuf atk.out gtk3 glib
43+ pango cairo gdk-pixbuf atk.out gtk3 glib
4444
4545 ffmpeg_4 libvpx x264 libwebp x265
4646
pkgs/tools/audio/gvolicon/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
1+{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
22
33stdenv.mkDerivation {
44 name = "gvolicon-2014-04-28";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
1010
1111 nativeBuildInputs = [ pkgconfig ];
1212 buildInputs = [
13− makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme
13+ makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme
1414 librsvg wrapGAppsHook
1515 ];
1616
pkgs/tools/compression/zstd/default.nix+6−5
@@ -4,11 +4,11 @@
44, legacySupport ? false }:
55
66stdenv.mkDerivation rec {
7− name = "zstd-${version}";
8− version = "1.4.0";
7+ pname = "zstd";
8+ version = "1.4.1";
99
1010 src = fetchFromGitHub {
11− sha256 = "1gfxi3ymgavjfxh84rhfjan7l4pymwfrn051nwc7n0s3mxp09m6v";
11+ sha256 = "1f2nvhsx1fsd6zbnwvc6bbrm9ghkcvamqqg79fxgk5284rc6nynv";
1212 rev = "v${version}";
1313 repo = "zstd";
1414 owner = "facebook";
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
4040 --replace "zstdcat" "$out/bin/zstdcat"
4141 '';
4242
43+ enableParallelBuilding = true;
44+
4345 meta = with stdenv.lib; {
4446 description = "Zstandard real-time compression algorithm";
4547 longDescription = ''
@@ -52,8 +54,7 @@ stdenv.mkDerivation rec {
5254 property shared by most LZ compression algorithms, such as zlib.
5355 '';
5456 homepage = https://facebook.github.io/zstd/;
55− # The licence of the CLI programme is GPLv2+, that of the library BSD-2.
56− license = with licenses; [ gpl2Plus bsd2 ];
57+ license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only.
5758
5859 platforms = platforms.unix;
5960 maintainers = with maintainers; [ orivej ];
pkgs/tools/filesystems/e2fsprogs/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "e2fsprogs";
5− version = "1.45.2";
5+ version = "1.45.3";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
9− sha256 = "1bhqljgcngys1diaxh7rnxc85d1jsril8xd7bach9imdjwr1wlm8";
9+ sha256 = "0gcqfnp9h7wgz1vq402kxd2w398vqaim26aq9i722v3lrgh5cm9s";
1010 };
1111
1212 outputs = [ "bin" "dev" "out" "man" "info" ];
pkgs/tools/graphics/blur-effect/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk_pixbuf, libGL, mesa }:
1+{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk-pixbuf, libGL, mesa }:
22
33stdenv.mkDerivation rec {
44 pname = "blur-effect";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 ];
1818
1919 buildInputs = [
20− gdk_pixbuf
20+ gdk-pixbuf
2121 libGL
2222 mesa
2323 ];
pkgs/tools/inputmethods/ibus/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, substituteAll, fetchurl, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig
2−, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2
2+, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk-pixbuf, gobject-introspection, gtk2
33, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePython2Library ? false
44, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null
55, buildPackages, runtimeShell }:
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
134134 buildInputs = [
135135 dbus
136136 dconf
137− gdk_pixbuf
137+ gdk-pixbuf
138138 gobject-introspection
139139 python3.pkgs.pygobject3 # for pygobject overrides
140140 gtk2
pkgs/tools/misc/birdfont/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, pkgconfig, python3, xmlbird,
2−cairo, gdk_pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala,
2+cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala,
33gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
44
55stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ];
15− buildInputs = [ xmlbird libgee cairo gdk_pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ];
15+ buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ];
1616
1717 postPatch = "patchShebangs .";
1818
pkgs/tools/misc/staruml/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchurl, makeWrapper
22, dpkg, patchelf
3−, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
3+, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
44, libXdamage, expat }:
55
66let
77 inherit (stdenv) lib;
88 LD_LIBRARY_PATH = lib.makeLibraryPath
9− [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
9+ [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
1010in
1111stdenv.mkDerivation rec {
1212 version = "2.8.1";
pkgs/tools/misc/sweep-visualizer/default.nix+4−4
@@ -1,5 +1,5 @@
11{ stdenv, lib, makeWrapper, fetchurl,
2− alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib,
2+ alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib,
33 gnome2, gtk2-x11, nspr, nss,
44 libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes,
55 libXi, libXrandr, libXrender, libXScrnSaver, libXtst,
@@ -13,7 +13,7 @@
1313 url = "https://s3.amazonaws.com/scanse/Visualizer/v${version}/sweepvisualizer_${version}_amd64.deb";
1414 sha256 = "1k6rdjw2340qrzafv6hjxvbvyh3s1wad6d3629nchdcrpyx9xy1c";
1515 };
16−
16+
1717 nativeBuildInputs = [ makeWrapper ];
1818
1919 sourceRoot = ".";
@@ -32,8 +32,8 @@
3232
3333 preFixup = let
3434 libPath = lib.makeLibraryPath [
35− alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype
36− gdk_pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib
35+ alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype
36+ gdk-pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib
3737 libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
3838 libXi libXrandr libXrender libXScrnSaver libXtst
3939 ];
pkgs/tools/misc/system-config-printer/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
22, docbook_xml_dtd_412, docbook_xsl
3−, libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify
3+, libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify
44, gobject-introspection, libsecret
55, cups-filters
66, pythonPackages
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020 buildInputs = [
2121 glib udev libusb1 cups
2222 pythonPackages.python
23− libnotify gobject-introspection gdk_pixbuf pango atk
23+ libnotify gobject-introspection gdk-pixbuf pango atk
2424 libsecret
2525 ];
2626
pkgs/tools/networking/curl/default.nix+2−2
@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
2424assert gssSupport -> libkrb5 != null;
2525
2626stdenv.mkDerivation rec {
27− name = "curl-7.65.0";
27+ name = "curl-7.65.3";
2828
2929 src = fetchurl {
3030 urls = [
3131 "https://curl.haxx.se/download/${name}.tar.bz2"
3232 "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
3333 ];
34− sha256 = "0p6z77iv6wlxq7skbnxn61rn8rangrp4g4spr09y920fcf7w0iza";
34+ sha256 = "02g5zj4rq5sr15jzjqk70xk4k92i2pdmpq00xb4pnba8ps1mx18a";
3535 };
3636
3737 outputs = [ "bin" "dev" "out" "man" "devdoc" ];
pkgs/tools/networking/driftnet/default.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub, libpcap, libjpeg , libungif, libpng
2−, giflib, glib, gtk2, cairo, pango, gdk_pixbuf, atk
2+, giflib, glib, gtk2, cairo, pango, gdk-pixbuf, atk
33, pkgconfig, autoreconfHook }:
44
55with lib;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 nativeBuildInputs = [ pkgconfig ];
1212 buildInputs = [
1313 libpcap libjpeg libungif libpng giflib
14− glib gtk2 glib cairo pango gdk_pixbuf atk autoreconfHook
14+ glib gtk2 glib cairo pango gdk-pixbuf atk autoreconfHook
1515 ];
1616
1717 src = fetchFromGitHub {
pkgs/tools/networking/openresolv/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "openresolv-${version}";
5− version = "3.9.0";
5+ version = "3.9.1";
66
77 src = fetchurl {
88 url = "mirror://roy/openresolv/${name}.tar.xz";
9− sha256 = "1f2dccc52iykbpma26fbxzga2l6g4njm3bgaxz4rgdrb4cwlv82i";
9+ sha256 = "1wlzi88837rf4ygswmzpbcmgkbbjhn5n322n9q6ir6x367hygf1q";
1010 };
1111
1212 buildInputs = [ makeWrapper ];
pkgs/tools/security/encryptr/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype
22, pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes
33, libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr
4−, expat, libcap, systemd , dbus, gtk2 , gdk_pixbuf, libnotify
4+, expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify
55}:
66
77let
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
2727 rpath = stdenv.lib.makeLibraryPath [
2828 glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi
2929 libXcursor libXext libXfixes libXrender libXcomposite alsaLib
30− libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk_pixbuf
30+ libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf
3131 libnotify stdenv.cc.cc
3232 ];
3333
pkgs/tools/security/keybase/gui.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev
2−, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3
2+, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3
33, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook
44, runtimeShell, gsettings-desktop-schemas }:
55
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 expat
3131 fontconfig
3232 freetype
33− gdk_pixbuf
33+ gdk-pixbuf
3434 glib
3535 gsettings-desktop-schemas
3636 gtk3
pkgs/tools/system/collectd/default.nix+2−2
@@ -13,7 +13,7 @@
1313, libmemcached, cyrus_sasl
1414, libmicrohttpd
1515, libmodbus
16−, libnotify, gdk_pixbuf
16+, libnotify, gdk-pixbuf
1717, liboping
1818, libpcap
1919, libsigrok
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
5959 nativeBuildInputs = [ pkgconfig autoreconfHook ];
6060 buildInputs = [
6161 curl libdbi libgcrypt libmemcached
62− cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
62+ cyrus_sasl libnotify gdk-pixbuf liboping libpcap libvirt
6363 libxml2 postgresql protobufc rrdtool
6464 varnish yajl jdk libtool python hiredis libmicrohttpd
6565 riemann_c_client mosquitto rdkafka mongoc
pkgs/tools/system/ddrescueview/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk_pixbuf, glib, gtk2, libX11, pango }:
1+{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk-pixbuf, glib, gtk2, libX11, pango }:
22
33stdenv.mkDerivation rec {
44 name = "ddrescueview-0.4alpha3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 nativeBuildInputs = [ fpc lazarus ];
1313
14− buildInputs = [ atk cairo gdk_pixbuf glib gtk2 libX11 pango ];
14+ buildInputs = [ atk cairo gdk-pixbuf glib gtk2 libX11 pango ];
1515
1616 sourceRoot = "source";
1717
pkgs/tools/text/gnupatch/CVE-2019-13636.patchnew file+108
@@ -0,0 +1,108 @@
1+From dce4683cbbe107a95f1f0d45fabc304acfb5d71a Mon Sep 17 00:00:00 2001
2+From: Andreas Gruenbacher <agruen@gnu.org>
3+Date: Mon, 15 Jul 2019 16:21:48 +0200
4+Subject: Don't follow symlinks unless --follow-symlinks is given
5+
6+* src/inp.c (plan_a, plan_b), src/util.c (copy_to_fd, copy_file,
7+append_to_file): Unless the --follow-symlinks option is given, open files with
8+the O_NOFOLLOW flag to avoid following symlinks. So far, we were only doing
9+that consistently for input files.
10+* src/util.c (create_backup): When creating empty backup files, (re)create them
11+with O_CREAT | O_EXCL to avoid following symlinks in that case as well.
12+---
13+ src/inp.c | 12 ++++++++++--
14+ src/util.c | 14 +++++++++++---
15+ 2 files changed, 21 insertions(+), 5 deletions(-)
16+
17+diff --git a/src/inp.c b/src/inp.c
18+index 32d0919..22d7473 100644
19+--- a/src/inp.c
20++++ b/src/inp.c
21+@@ -238,8 +238,13 @@ plan_a (char const *filename)
22+ {
23+ if (S_ISREG (instat.st_mode))
24+ {
25+- int ifd = safe_open (filename, O_RDONLY|binary_transput, 0);
26++ int flags = O_RDONLY | binary_transput;
27+ size_t buffered = 0, n;
28++ int ifd;
29++
30++ if (! follow_symlinks)
31++ flags |= O_NOFOLLOW;
32++ ifd = safe_open (filename, flags, 0);
33+ if (ifd < 0)
34+ pfatal ("can't open file %s", quotearg (filename));
35+
36+@@ -340,6 +345,7 @@ plan_a (char const *filename)
37+ static void
38+ plan_b (char const *filename)
39+ {
40++ int flags = O_RDONLY | binary_transput;
41+ int ifd;
42+ FILE *ifp;
43+ int c;
44+@@ -353,7 +359,9 @@ plan_b (char const *filename)
45+
46+ if (instat.st_size == 0)
47+ filename = NULL_DEVICE;
48+- if ((ifd = safe_open (filename, O_RDONLY | binary_transput, 0)) < 0
49++ if (! follow_symlinks)
50++ flags |= O_NOFOLLOW;
51++ if ((ifd = safe_open (filename, flags, 0)) < 0
52+ || ! (ifp = fdopen (ifd, binary_transput ? "rb" : "r")))
53+ pfatal ("Can't open file %s", quotearg (filename));
54+ if (TMPINNAME_needs_removal)
55+diff --git a/src/util.c b/src/util.c
56+index 1cc08ba..fb38307 100644
57+--- a/src/util.c
58++++ b/src/util.c
59+@@ -388,7 +388,7 @@ create_backup (char const *to, const struct stat *to_st, bool leave_original)
60+
61+ try_makedirs_errno = ENOENT;
62+ safe_unlink (bakname);
63+- while ((fd = safe_open (bakname, O_CREAT | O_WRONLY | O_TRUNC, 0666)) < 0)
64++ while ((fd = safe_open (bakname, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, 0666)) < 0)
65+ {
66+ if (errno != try_makedirs_errno)
67+ pfatal ("Can't create file %s", quotearg (bakname));
68+@@ -579,10 +579,13 @@ create_file (char const *file, int open_flags, mode_t mode,
69+ static void
70+ copy_to_fd (const char *from, int tofd)
71+ {
72++ int from_flags = O_RDONLY | O_BINARY;
73+ int fromfd;
74+ ssize_t i;
75+
76+- if ((fromfd = safe_open (from, O_RDONLY | O_BINARY, 0)) < 0)
77++ if (! follow_symlinks)
78++ from_flags |= O_NOFOLLOW;
79++ if ((fromfd = safe_open (from, from_flags, 0)) < 0)
80+ pfatal ("Can't reopen file %s", quotearg (from));
81+ while ((i = read (fromfd, buf, bufsize)) != 0)
82+ {
83+@@ -625,6 +628,8 @@ copy_file (char const *from, char const *to, struct stat *tost,
84+ else
85+ {
86+ assert (S_ISREG (mode));
87++ if (! follow_symlinks)
88++ to_flags |= O_NOFOLLOW;
89+ tofd = create_file (to, O_WRONLY | O_BINARY | to_flags, mode,
90+ to_dir_known_to_exist);
91+ copy_to_fd (from, tofd);
92+@@ -640,9 +645,12 @@ copy_file (char const *from, char const *to, struct stat *tost,
93+ void
94+ append_to_file (char const *from, char const *to)
95+ {
96++ int to_flags = O_WRONLY | O_APPEND | O_BINARY;
97+ int tofd;
98+
99+- if ((tofd = safe_open (to, O_WRONLY | O_BINARY | O_APPEND, 0)) < 0)
100++ if (! follow_symlinks)
101++ to_flags |= O_NOFOLLOW;
102++ if ((tofd = safe_open (to, to_flags, 0)) < 0)
103+ pfatal ("Can't reopen file %s", quotearg (to));
104+ copy_to_fd (from, tofd);
105+ if (close (tofd) != 0)
106+--
107+cgit v1.0-41-gc330
108+
pkgs/tools/text/gnupatch/CVE-2019-13638.patchnew file+38
@@ -0,0 +1,38 @@
1+From 3fcd042d26d70856e826a42b5f93dc4854d80bf0 Mon Sep 17 00:00:00 2001
2+From: Andreas Gruenbacher <agruen@gnu.org>
3+Date: Fri, 6 Apr 2018 19:36:15 +0200
4+Subject: Invoke ed directly instead of using the shell
5+
6+* src/pch.c (do_ed_script): Invoke ed directly instead of using a shell
7+command to avoid quoting vulnerabilities.
8+---
9+ src/pch.c | 6 ++----
10+ 1 file changed, 2 insertions(+), 4 deletions(-)
11+
12+diff --git a/src/pch.c b/src/pch.c
13+index 4fd5a05..16e001a 100644
14+--- a/src/pch.c
15++++ b/src/pch.c
16+@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname,
17+ *outname_needs_removal = true;
18+ copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
19+ }
20+- sprintf (buf, "%s %s%s", editor_program,
21+- verbosity == VERBOSE ? "" : "- ",
22+- outname);
23+ fflush (stdout);
24+
25+ pid = fork();
26+@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname,
27+ else if (pid == 0)
28+ {
29+ dup2 (tmpfd, 0);
30+- execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
31++ assert (outname[0] != '!' && outname[0] != '-');
32++ execlp (editor_program, editor_program, "-", outname, (char *) NULL);
33+ _exit (2);
34+ }
35+ else
36+--
37+cgit v1.0-41-gc330
38+
pkgs/tools/text/gnupatch/default.nix+6
@@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
2525 })
2626 # https://git.savannah.gnu.org/cgit/patch.git/commit/?id=9c986353e420ead6e706262bf204d6e03322c300
2727 ./CVE-2018-6952.patch
28+
29+ # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=dce4683cbbe107a95f1f0d45fabc304acfb5d71a
30+ ./CVE-2019-13636.patch
31+
32+ # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=3fcd042d26d70856e826a42b5f93dc4854d80bf0
33+ ./CVE-2019-13638.patch
2834 ];
2935
3036 nativeBuildInputs = [ autoreconfHook ];
pkgs/top-level/aliases.nix+1
@@ -107,6 +107,7 @@ mapAliases ({
107107 fuseki = apache-jena-fuseki; # added 2018-04-25
108108 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
109109 gdb-multitarget = gdb; # added 2017-11-13
110+ gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
110111 gettextWithExpat = gettext; # 2016-02-19
111112 git-hub = gitAndTools.git-hub; # added 2016-04-29
112113 glib_networking = glib-networking; # added 2018-02-25
pkgs/top-level/all-packages.nix+1−1
@@ -10952,7 +10952,7 @@ in
1095210952
1095310953 gdata-sharp = callPackage ../development/libraries/gdata-sharp { };
1095410954
10955− gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
10955+ gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
1095610956
1095710957 gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; };
1095810958
pkgs/top-level/python-packages.nix+19−6
@@ -592,6 +592,8 @@ in {
592592
593593 glymur = callPackage ../development/python-modules/glymur { };
594594
595+ glob2 = callPackage ../development/python-modules/glob2 { };
596+
595597 glom = callPackage ../development/python-modules/glom { };
596598
597599 goocalendar = callPackage ../development/python-modules/goocalendar { };
@@ -3852,9 +3854,18 @@ in {
38523854
38533855 Nuitka = callPackage ../development/python-modules/nuitka { };
38543856
3855− numpy = callPackage ../development/python-modules/numpy {
3856− blas = pkgs.openblasCompat;
3857− };
3857+ numpy = let
3858+ numpy_ = callPackage ../development/python-modules/numpy {
3859+ blas = pkgs.openblasCompat;
3860+ };
3861+ numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec {
3862+ version = "1.16.4";
3863+ src = oldAttrs.src.override {
3864+ inherit version;
3865+ sha256 = "1ivrwh66cmly7xh1dl7pybizfz5rcicn4kkkx5g29v4gll9bwhkj";
3866+ };
3867+ });
3868+ in if pythonOlder "3.5" then numpy_2 else numpy_;
38583869
38593870 numpydoc = callPackage ../development/python-modules/numpydoc { };
38603871
@@ -3916,8 +3927,7 @@ in {
39163927
39173928 cachetools = callPackage ../development/python-modules/cachetools {};
39183929
3919− cmd2_9 = callPackage ../development/python-modules/cmd2 {};
3920− cmd2 = self.cmd2_9;
3930+ cmd2 = callPackage ../development/python-modules/cmd2 {};
39213931
39223932 warlock = callPackage ../development/python-modules/warlock { };
39233933
@@ -3965,7 +3975,10 @@ in {
39653975
39663976 pagerduty = callPackage ../development/python-modules/pagerduty { };
39673977
3968− pandas = callPackage ../development/python-modules/pandas { };
3978+ pandas = if isPy3k then
3979+ callPackage ../development/python-modules/pandas { }
3980+ else
3981+ callPackage ../development/python-modules/pandas/2.nix { };
39693982
39703983 panel = callPackage ../development/python-modules/panel { };
39713984