diff options
Diffstat (limited to 'pkgs')
94 files changed, 342 insertions, 232 deletions
diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/applications/audio/ChowKick/default.nix index 135ed3a11a1c9..b3ad00bf63a8a 100644 --- a/pkgs/applications/audio/ChowKick/default.nix +++ b/pkgs/applications/audio/ChowKick/default.nix @@ -4,7 +4,7 @@ , cmake , curl , dbus -, epoxy +, libepoxy , fetchFromGitHub , freeglut , freetype @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { brotli curl dbus - epoxy + libepoxy freeglut freetype gtk2-x11 diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 566024881b4a6..0832bb1dd9644 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -32,7 +32,7 @@ , linuxHeaders , at-spi2-core , dbus -, epoxy +, libepoxy , libXdmcp , libXtst , libpthreadstubs @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ at-spi2-core dbus - epoxy + libepoxy libXdmcp libXtst libpthreadstubs diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index c539a316422a5..3254a94ef1079 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsa-lib, libjack2, freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, - epoxy, at-spi2-core, dbus, curl, fftwFloat }: + libepoxy, at-spi2-core, dbus, curl, fftwFloat }: let pname = "HybridReverb2"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ lv2 alsa-lib libjack2 freetype libX11 gtk3 pcre - libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ]; + libpthreadstubs libXdmcp libxkbcommon libepoxy at-spi2-core dbus curl fftwFloat ]; cmakeFlags = [ "-DHybridReverb2_AdvancedJackStandalone=ON" diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 160243cdf34f8..fbf13c1748ff4 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -35,7 +35,7 @@ , linuxHeaders , at-spi2-core , dbus -, epoxy +, libepoxy , libXdmcp , libXtst , libpthreadstubs @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ at-spi2-core dbus - epoxy + libepoxy libXdmcp libXtst libpthreadstubs diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index ee6eef5527f9d..480684525b110 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -12,7 +12,7 @@ , cmake , curl , dconf -, epoxy +, libepoxy , ffmpeg , fftw , fftwFloat @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { chromaprint curl dconf - epoxy + libepoxy ffmpeg fftw fftwFloat diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index f595e211dc2b1..ea7fc13757472 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter -, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs +, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { dbus gtk3 pcre - epoxy + libepoxy libgee libX11 lightdm diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 140bf04c9f365..7a57e21710950 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, - boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre, + boost, libepoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gtksourceview3 at-spi2-core pcre - epoxy + libepoxy boost libXdmcp cmake diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 5f13136d0c8c5..5cd574bf9b79c 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -16,7 +16,7 @@ , curl , sane-backends , libXpm -, epoxy +, libepoxy , poppler , mesa , lirc @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { sane-backends libdrm libXpm - epoxy + libepoxy poppler lirc mesa diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index c949b8e6b4d01..ef2f20850d239 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -6,7 +6,7 @@ , pkg-config , glib , wrapGAppsHook -, epoxy +, libepoxy , gtk4 , zbar , tiffSupport ? true @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - epoxy + libepoxy gtk4 zbar ]; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 140d6eb7d086d..d7dde2a77ff51 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, libepoxy , gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - poppler pcre libxkbcommon epoxy + poppler pcre libxkbcommon libepoxy freetype gtk3 libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation ]; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index bd35d44b7cccd..7722574720ffa 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -77,7 +77,7 @@ in buildFHSUserEnv { nasm sndio # Snes9x - epoxy minizip + libepoxy minizip # Vice bison flex diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 63dde76fabcc9..9ba9f360402bf 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -33,7 +33,7 @@ , proj , cairo , libxkbcommon -, epoxy +, libepoxy , wrapGAppsHook , at-spi2-core , dbus @@ -126,7 +126,7 @@ in stdenv.mkDerivation rec { libpthreadstubs libXdmcp libxkbcommon - epoxy + libepoxy at-spi2-core dbus ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e88c1fa1b94a1..193543ea54abd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,7 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl -, epoxy +, libepoxy # postPatch: , glibc # gconv + locale @@ -151,7 +151,7 @@ let libdrm wayland mesa.drivers libxkbcommon curl ] ++ optionals (chromiumVersionAtLeast "96") [ - epoxy + libepoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 18f73de2fd5b0..5e362784c811b 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -5,7 +5,7 @@ , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c , libgcrypt -, epoxy +, libepoxy , at-spi2-core , sqlite , dbus @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libgcrypt libsoup pcre - epoxy + libepoxy at-spi2-core dbus icu diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index d9f9cd91a52da..cb4f3e5e5d156 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -4,7 +4,7 @@ , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk # Transitive dependencies: -, pcre, xorg, util-linux, libselinux, libsepol, epoxy +, pcre, xorg, util-linux, libselinux, libsepol, libepoxy , at-spi2-core, libXtst, libthai, libdatrie }: @@ -41,7 +41,7 @@ in mkDerivation rec { tl-expected hunspell glibmm webkitgtk tg_owt # Transitive dependencies: - pcre xorg.libXdmcp util-linux libselinux libsepol epoxy + pcre xorg.libXdmcp util-linux libselinux libsepol libepoxy at-spi2-core libXtst libthai libdatrie ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0764c484ec9a7..1611185ca7246 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -37,7 +37,7 @@ , libXdmcp , libselinux , libsepol -, epoxy +, libepoxy , at-spi2-core , libXtst , libthai @@ -135,7 +135,7 @@ mkDerivation rec { libXdmcp libselinux libsepol - epoxy + libepoxy at-spi2-core libXtst libthai diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 3344174cb2a01..82debe6f8a1a1 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -4,7 +4,7 @@ , libX11 , gst_all_1 , sqlite -, epoxy +, libepoxy , pango , cairo , gdk-pixbuf @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pcsclite gtk3 cairo - epoxy + libepoxy pango gdk-pixbuf gst_all_1.gstreamer diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index f61a00f89ada0..11fcde29b8826 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -3,7 +3,7 @@ , freerdp, libssh, libgcrypt, gnutls , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core +, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core + libsecret libsoup spice-protocol spice-gtk libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index f94beabd1f90d..b8cdf218e7838 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, gnome, glib, ncurses, epoxy, gpgme +, gnome, glib, ncurses, libepoxy, gpgme , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null @@ -394,7 +394,7 @@ in (mkDrv rec { python3 sane-backends unzip which zip zlib mdds bluez5 libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux - librevenge libe-book libmwaw glm ncurses epoxy + librevenge libe-book libmwaw glm ncurses libepoxy libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index eec7830b2a157..30ef1f5d109df 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -3,7 +3,7 @@ , coreutils , cppzmq , curl -, epoxy +, libepoxy , fetchFromGitHub , glm , gtkmm3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ cppzmq curl - epoxy + libepoxy glm gtkmm3 libgit2 diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 0b024d5c947ed..61fcff77e1c79 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -27,7 +27,7 @@ , libthai , libdatrie , libxkbcommon -, epoxy +, libepoxy , dbus , at-spi2-core , libXtst @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { libthai libdatrie libxkbcommon - epoxy + libepoxy dbus.daemon at-spi2-core libXtst diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index fff534aaff1ae..c33e3fee704de 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,4 +1,4 @@ -{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub +{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchpatch, fetchFromGitHub , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 , pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp util-linuxMinimal glib docbook_xsl xmlto libselinux - libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit + libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit ]; meta = with lib; { diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index f6bc0561b0c6c..e6dcff6717583 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , appstream-glib , desktop-file-utils -, epoxy +, libepoxy , gettext , glib , gtk3 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; buildInputs = [ - epoxy + libepoxy glib gtk3 mpv diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index 6d8905d2c0038..2c75633808950 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -12,7 +12,7 @@ , at-spi2-core , dbus , elfutils -, epoxy +, libepoxy , gexiv2 , glib , gobject-introspection @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ at-spi2-core dbus - epoxy + libepoxy elfutils gexiv2 glib diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 48b83140e42cd..fba8ecf9d9ad3 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,7 +18,7 @@ , xenSupport ? false, xen , cephSupport ? false, ceph , glusterfsSupport ? false, glusterfs, libuuid -, openGLSupport ? sdlSupport, mesa, epoxy, libdrm +, openGLSupport ? sdlSupport, mesa, libepoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , libiscsiSupport ? true, libiscsi , smbdSupport ? false, samba @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ++ lib.optionals xenSupport [ xen ] ++ lib.optionals cephSupport [ ceph ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] - ++ lib.optionals openGLSupport [ mesa epoxy libdrm ] + ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ] ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] ++ lib.optionals smbdSupport [ samba ]; diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/desktops/arcan/xarcan/default.nix index 9bfd7e290733b..6245471a7efd8 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/pkgs/desktops/arcan/xarcan/default.nix @@ -4,7 +4,7 @@ , arcan , audit , dbus -, epoxy +, libepoxy , fontutil , libGL , libX11 @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { arcan audit dbus - epoxy + libepoxy fontutil libGL libX11 diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index d60b64b78aabd..9ea727969b3e6 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -60,7 +60,7 @@ , tzdata , udisks2 , upower -, epoxy +, libepoxy , gnome-user-share , gnome-remote-desktop , wrapGAppsHook @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { clutter-gtk colord colord-gtk - epoxy + libepoxy fontconfig gdk-pixbuf glib diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index c1ebc43620715..3ba6958fad0e3 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 -, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: +, libxslt, gettext, makeWrapper, systemd, xorg, libepoxy, gnugrep, bash, gnome-session-ctl }: stdenv.mkDerivation rec { pname = "gnome-session"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme - gnome.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy + gnome.gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy ]; postPatch = '' diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index f08f51512c473..49aa1a021cf87 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -17,7 +17,7 @@ , gtk3 , harfbuzz , ninja -, epoxy +, libepoxy }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gdk-pixbuf librsvg webkitgtk_4_1 - epoxy + libepoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 1c51e2f6ae89e..dba5c374f94ae 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, - libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, + libSM, libXtst, gtk3, libepoxy, polkit, hicolor-icon-theme, mate, wrapGAppsHook, fetchpatch, mateUpdateScript }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gtk3 mate.mate-desktop hicolor-icon-theme - epoxy + libepoxy polkit ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index c5ccba962e445..7b0ea248ed616 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -58,20 +58,12 @@ stdenv.mkDerivation rec { # Our launchers that use paths at /run/current-system/sw/bin mkdir -p $out/etc/skel/.config/plank/dock1 cp -avr ${./launchers} $out/etc/skel/.config/plank/dock1/launchers - - # Whitelist wingpanel indicators to be used in the greeter - # https://github.com/elementary/greeter/blob/fc19752f147c62767cd2097c0c0c0fcce41e5873/debian/io.elementary.greeter.whitelist - # wingpanel 2.3.2 renamed this to .allowed to .forbidden - # https://github.com/elementary/wingpanel/pull/326 - install -D ${./io.elementary.greeter.allowed} $out/etc/wingpanel.d/io.elementary.greeter.allowed ''; postFixup = '' # https://github.com/elementary/default-settings/issues/55 - rm -rf $out/share/plymouth - rm -rf $out/share/cups - - rm -rf $out/share/applications + rm -r $out/share/cups + rm -r $out/share/applications ''; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed b/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed deleted file mode 100644 index 0cff31f4f7777..0000000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/io.elementary.greeter.allowed +++ /dev/null @@ -1,6 +0,0 @@ -liba11y.so -libbluetooth.so -libkeyboard.so -libnetwork.so -libpower.so -libsession.so diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 4e5ba348cd86f..36f0da9e96114 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, fetchpatch, - epoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa, + libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa, pipewire, udev, wayland, xcb-util-cursor, xwayland, qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors, @@ -21,7 +21,7 @@ mkDerivation { name = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - epoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire + libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire udev wayland xcb-util-cursor xwayland qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index f754bc5a46d4b..60d4867cb47f2 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, gettext, kdoctools, - cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols, + cups, libepoxy, mesa, pcre, pipewire, wayland, wayland-protocols, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio, qtbase @@ -11,7 +11,7 @@ mkDerivation { name = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ - cups epoxy mesa pcre pipewire wayland wayland-protocols + cups libepoxy mesa pcre pipewire wayland wayland-protocols kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem kirigami2 kdeclarative plasma-framework plasma-wayland-protocols diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 0a937f68fd062..b70ef2788ac64 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -1,5 +1,5 @@ { lib, mkXfceDerivation, gobject-introspection, vala, gtk3, libICE, libSM -, libstartup_notification, libgtop, epoxy, libxfce4util, xfconf }: +, libstartup_notification, libgtop, libepoxy, libxfce4util, xfconf }: mkXfceDerivation { category = "xfce"; @@ -9,7 +9,7 @@ mkXfceDerivation { sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw="; nativeBuildInputs = [ gobject-introspection vala ]; - buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ]; + buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; configureFlags = [ diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index cc998487f1650..61e46d3047dec 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage +{ mkXfceDerivation, exo, librsvg, dbus-glib, libepoxy, gtk3, libXdamage , libstartup_notification, libxfce4ui, libxfce4util, libwnck , libXpresent, xfconf }: @@ -13,7 +13,7 @@ mkXfceDerivation { buildInputs = [ dbus-glib - epoxy + libepoxy gtk3 libXdamage libstartup_notification diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index e4cec4cf52ed0..1b6a3b56e6226 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (!lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - '' + optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + optionalString (stdenv.isDarwin && !lib.versionAtLeast version "4.13") '' # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 990e151efe444..a59541edb2570 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , graphene -, epoxy +, libepoxy , json-glib }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - epoxy + libepoxy json-glib ]; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 6fce8ca78e815..82bcad0b98564 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -24,7 +24,7 @@ , gobject-introspection , fribidi , xorg -, epoxy +, libepoxy , libxkbcommon , libxml2 , gmp @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon - epoxy + libepoxy isocodes ] ++ lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 78d9174d0953c..363d9b80a7f0f 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -21,7 +21,7 @@ , fribidi , harfbuzz , xorg -, epoxy +, libepoxy , libxkbcommon , libxml2 , gnome @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon - epoxy + libepoxy isocodes ] ++ lib.optionals vulkanSupport [ vulkan-headers diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 734cf833fd846..2d0921cf097fb 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, libepoxy, gnome }: stdenv.mkDerivation rec { pname = "gtkmm"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config meson ninja python3 ]; - buildInputs = [ epoxy ]; + buildInputs = [ libepoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 67afc4026d1ac..c1bac87a6c08d 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -9,7 +9,7 @@ , glibmm_2_68 , cairomm_1_16 , pangomm_2_48 -, epoxy +, libepoxy , gnome , makeFontsConf , xvfb-run @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - epoxy + libepoxy ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index cc4e269982121..1389df5eb1528 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,6 +1,6 @@ { mkDerivation, extra-cmake-modules, - epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, + libepoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, kwidgetsaddons, kwindowsystem, qtdeclarative }: @@ -8,7 +8,7 @@ mkDerivation { name = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons + libepoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem ]; propagatedBuildInputs = [ kconfig kpackage qtdeclarative ]; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 7ae0e73953f44..83b8ba8960d59 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -5,12 +5,12 @@ with lib; stdenv.mkDerivation rec { - pname = "epoxy"; + pname = "libepoxy"; version = "1.5.4"; src = fetchFromGitHub { owner = "anholt"; - repo = "libepoxy"; + repo = pname; rev = version; sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "A library for handling OpenGL function pointer management"; homepage = "https://github.com/anholt/libepoxy"; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu erictapen ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/libepoxy/libgl-path.patch index 8f38ee27174b6..8f38ee27174b6 100644 --- a/pkgs/development/libraries/epoxy/libgl-path.patch +++ b/pkgs/development/libraries/libepoxy/libgl-path.patch diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 099bac9274b26..5ce953be07011 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -9,7 +9,7 @@ , shaderc , glslang , lcms2 -, epoxy +, libepoxy , libGL , xorg }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { shaderc glslang lcms2 - epoxy + libepoxy libGL xorg.libX11 ]; diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index e9c0e3c7f44f0..e68c60ebbdbf8 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -5,7 +5,7 @@ , pkg-config , ninja , wayland -, epoxy +, libepoxy , glib , libwpe , libxkbcommon @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland - epoxy + libepoxy glib libwpe libxkbcommon diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 9c03a9f6c4913..de69bd730d25f 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }: +{ lib, stdenv, fetchurl, SDL2, eigen, libepoxy, fftw, gtest, pkg-config }: stdenv.mkDerivation rec { pname = "movit"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { GTEST_DIR = "${gtest.src}/googletest"; - propagatedBuildInputs = [ eigen epoxy ]; + propagatedBuildInputs = [ eigen libepoxy ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 fftw gtest ]; diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index 3ab3ffcda0d3c..e1385f7a3ef02 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, epoxy +, libepoxy , glib , gtk3 , libpulseaudio @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - epoxy + libepoxy glib gtk3 libpulseaudio diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 3d76e67f67ad1..13bfae944e02e 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -3,7 +3,7 @@ , acl , cyrus_sasl , docbook_xsl -, epoxy +, libepoxy , gettext , gobject-introspection , gst_all_1 @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl - epoxy + libepoxy gtk3 json-glib libcacard diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 4c4af6b2c1f8c..1fbf94452f769 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3 -, libGLU, epoxy, libX11, libdrm, mesa +, libGLU, libepoxy, libX11, libdrm, mesa }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346"; }; - buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; + buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; nativeBuildInputs = [ cmake meson ninja pkg-config python3 ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 304dfbc2e7849..d3b0ef67d86ef 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -21,7 +21,7 @@ , enchant2 , xorg , libxkbcommon -, epoxy +, libepoxy , at-spi2-core , libxml2 , libsoup @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { buildInputs = [ at-spi2-core enchant2 - epoxy + libepoxy gnutls gst-plugins-bad gst-plugins-base diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 6d68cfb0f1e62..cdbb1738b9b45 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -9,12 +9,14 @@ , requirements-parser , setuptools , toml +, types-setuptools +, types-toml , tox }: buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "0.10.2"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +25,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - sha256 = "11sbnlbxighmmygrlgg4d31y70067pxzjsirwicaslfq95wgdlav"; + sha256 = "sha256-FNEtVTcmVyhAri55GjlzQbg21YByAJjmKQvWaYh3xRw="; }; nativeBuildInputs = [ @@ -36,6 +38,8 @@ buildPythonPackage rec { requirements-parser setuptools toml + types-setuptools + types-toml ]; checkInputs = [ diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index c03acde331186..2820ff7dd6c1d 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "deactivated"; repo = "python-iso3166"; rev = version; - sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx"; + sha256 = "sha256-/y7c2qSA6+WKUP9YTSaMBjBxtqAuF4nB3MKvL5P6vL0="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index 24d7d4c282664..1deb464ea633e 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -17,14 +17,16 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.21.0"; + version = "0.22.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "theolind"; repo = pname; rev = version; - sha256 = "1k75gwvyzslyjr3cdx8b74fb302k2i7bda4q92rb75rhgp4gch55"; + sha256 = "sha256-tDetHSpA5ZRvJoThI1zY6NPiDJHfWZbiMM5AF+xCNgk="; }; propagatedBuildInputs = [ @@ -44,7 +46,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "mysensors" ]; + pythonImportsCheck = [ + "mysensors" + ]; meta = with lib; { description = "Python API for talking to a MySensors gateway"; diff --git a/pkgs/development/python-modules/PyRMVtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix index aee4789f93bfe..b8104ef237079 100644 --- a/pkgs/development/python-modules/PyRMVtransport/default.nix +++ b/pkgs/development/python-modules/pyrmvtransport/default.nix @@ -12,9 +12,10 @@ }: buildPythonPackage rec { - pname = "PyRMVtransport"; + pname = "pyrmvtransport"; version = "0.3.2"; format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -34,14 +35,16 @@ buildPythonPackage rec { lxml ]; - pythonImportsCheck = [ "RMVtransport" ]; - checkInputs = [ pytestCheckHook pytest-asyncio pytest-httpx ]; + pythonImportsCheck = [ + "RMVtransport" + ]; + meta = with lib; { homepage = "https://github.com/cgtobi/PyRMVtransport"; description = "Get transport information from opendata.rmv.de"; diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix index 0c980034fecdd..e43cd8b062311 100644 --- a/pkgs/development/python-modules/pytmx/default.nix +++ b/pkgs/development/python-modules/pytmx/default.nix @@ -1,23 +1,32 @@ -{ lib, fetchFromGitHub -, python, buildPythonPackage, isPy27 -, pygame, pyglet, pysdl2, six +{ lib +, buildPythonPackage +, fetchFromGitHub +, pygame +, pyglet +, pysdl2 +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pytmx"; - version = "3.27"; + version = "3.30"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bitcraft"; repo = "PyTMX"; - # Release was not tagged. - rev = "5bb094c45e648d1de6c9ba8d8c8f31f7b83478e1"; - sha256 = "0kpd39sr2ggwzh7nd3f5801mgwm57rzrrkqcgbcypdm8l2ayga3b"; + rev = version; + sha256 = "sha256-d6VPmRdqUO6YhkOYYeXOEcrli/35IFkxK73AcZYHixw="; }; - propagatedBuildInputs = [ pygame pyglet pysdl2 six ]; + propagatedBuildInputs = [ + pygame + pyglet + pysdl2 + ]; pythonImportsCheck = [ "pytmx.pytmx" @@ -26,11 +35,14 @@ buildPythonPackage rec { "pytmx.util_pysdl2" ]; - checkPhase = '' - # Change into the test directory due to a relative resource path. - cd tests/pytmx - ${python.interpreter} -m unittest test_pytmx - ''; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError on the property name + "test_contains_reserved_property_name" + ]; meta = with lib; { homepage = "https://github.com/bitcraft/PyTMX"; diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 4463b9fcc9f34..fea974adfdeed 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -1,19 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, zeep , pytestCheckHook +, pythonOlder +, zeep }: buildPythonPackage rec { pname = "total-connect-client"; - version = "2021.8.3"; + version = "2021.11.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - sha256 = "sha256-2iTH/Him4iMZadkmBR8Rwlt3RCqDXzR6ZqNHciNiHIk="; + sha256 = "sha256-JXau+NmulnZ0gg2XsXD9EFv3j2FBMqVqzpT1XGvMZuA="; }; propagatedBuildInputs = [ @@ -33,7 +37,9 @@ buildPythonPackage rec { "tests_request" ]; - pythonImportsCheck = [ "total_connect_client" ]; + pythonImportsCheck = [ + "total_connect_client" + ]; meta = with lib; { description = "Interact with Total Connect 2 alarm systems"; diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix new file mode 100644 index 0000000000000..512b5386625bd --- /dev/null +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-setuptools"; + version = "57.4.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1y0vx949wx5w4ra854ykwvgmdcwsb6v7jk29m4x1l79857sa16al"; + }; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ "setuptools-stubs" ]; + + meta = with lib; { + description = "Typing stubs for setuptools"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix new file mode 100644 index 0000000000000..d87528c20324a --- /dev/null +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-toml"; + version = "0.10.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jqh0vki1hccj391gnxpblim429sj56npgq2z749f8v9ay6qy7sw"; + }; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ "toml-stubs" ]; + + meta = with lib; { + description = "Typing stubs for toml"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 157ee78d53ccf..7f189e83e195b 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts -, git, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: +{ lib +, stdenv +, fetchurl +, jre +, writeScript +, common-updater-scripts +, git +, nixfmt +, nix +, coreutils +, gnused +, disableRemoteLogging ? true +}: with lib; @@ -61,7 +72,7 @@ let installCheckPhase = '' runHook preInstallCheck - $out/bin/amm -c 'val foo = 21; println(foo * 2)' | grep 42 + $out/bin/amm -h "$PWD" -c 'val foo = 21; println(foo * 2)' | grep 42 runHook postInstallCheck ''; @@ -80,7 +91,8 @@ let maintainers = [ maintainers.nequissimus ]; }; }; -in { +in +{ ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "K8JII6SAmnBjMWQ9a3NqSLLuP1OLcbwobj3G+OCiLdA="; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 6b14197399d1a..f230e6c19f30b 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.556"; + version = "2.0.563"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-hEh7uqIvqkG1X9pxJFoI4dQngJ6nZXIAUR1TmXa2kZE="; + sha256 = "sha256-f1rD1Xal/86q7hRR+6XneiVEYGH1TFHVXzFLOQDO17Y="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 6195c5f376139..ac4173c514abe 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.15"; + version = "0.59.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "102f984x6hpfjcshqd6s26c0lxjyr8rq6q4bwh9ymvrsxsylj3ng"; + sha256 = "sha256-j/JHHkS4mIuDv76HtIFbrf2VRqGINyB9OODaM+fJsJc="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix index 63c3c10ca36dd..e9ff420eea29c 100644 --- a/pkgs/development/tools/pactorio/default.nix +++ b/pkgs/development/tools/pactorio/default.nix @@ -1,28 +1,36 @@ -{ fetchFromGitHub, installShellFiles, lib, stdenv, rustPlatform, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, pkg-config +, bzip2 +, stdenv +, Security +}: rustPlatform.buildRustPackage rec { pname = "pactorio"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "07h9hywz0pc29411myhxjq6pks4p6q6czbqjv7fxf3xkb1mg9grq"; + sha256 = "sha256-tRmchXDg8flvByjg6GLwwdwQgp/5NdZIgnjYgPLcLP8="; }; - cargoSha256 = "1rac2s36j88vm231aji8d0ndfbaa2gzxwsrxrvsi0zp9cqisc6rh"; + cargoSha256 = "sha256-FIn+6wflDAjshP2Vz/rXRTrrjPQFW63XtXo8hBHMdkg="; - nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ installShellFiles pkg-config ]; - preFixup = '' + buildInputs = [ bzip2 ] ++ lib.optional stdenv.isDarwin Security; + + postInstall = '' completions=($releaseDir/build/pactorio-*/out/completions) - installShellCompletion ''${completions[0]}/pactorio.{bash,fish} - installShellCompletion --zsh ''${completions[0]}/_pactorio + installShellCompletion $completions/pactorio.{bash,fish} --zsh $completions/_pactorio ''; - GEN_COMPLETIONS = "1"; + GEN_COMPLETIONS = 1; meta = with lib; { description = "Mod packager for factorio"; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 945ebf7b785e1..edeacdec2a1cf 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, zlib, boost -, openal, glm, freetype, libGLU, SDL2, epoxy +, openal, glm, freetype, libGLU, SDL2, libepoxy , dejavu_fonts, inkscape, optipng, imagemagick , withCrashReporter ? !stdenv.isDarwin , qtbase ? null @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ zlib boost openal glm - freetype libGLU SDL2 epoxy + freetype libGLU SDL2 libepoxy ] ++ optionals withCrashReporter [ qtbase curl ] ++ optionals stdenv.isLinux [ gdb ]; diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix index 8e2fa41f4200e..c78bc69c26fd9 100644 --- a/pkgs/games/gnome-hexgl/default.nix +++ b/pkgs/games/gnome-hexgl/default.nix @@ -5,7 +5,7 @@ , pkg-config , gthree , gsound -, epoxy +, libepoxy , gtk3 }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ gthree gsound - epoxy + libepoxy gtk3 ]; diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index dce771faec17b..c4af373cdcddb 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext , glibmm, libxmlxx, pango, librsvg -, SDL2, glew, boost, ffmpeg, portaudio, epoxy +, SDL2, glew, boost, ffmpeg, portaudio, libepoxy }: stdenv.mkDerivation rec { @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { buildInputs = [ glibmm libxmlxx pango librsvg - SDL2 glew boost ffmpeg portaudio epoxy + SDL2 glew boost ffmpeg portaudio libepoxy ]; } diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index 7123f496fad6f..3e30be8c2a3ff 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , mkDerivation , cmake -, epoxy +, libepoxy , libarchive , libpcap , libslirp @@ -24,7 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - epoxy + libepoxy libarchive libslirp qtbase diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index c15c8a0ad76a9..48ec288c40507 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , SDL2 , cmake -, epoxy +, libepoxy , ffmpeg , imagemagick , libedit @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 - epoxy + libepoxy ffmpeg imagemagick libedit diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index e19b97a477ef4..fa55c2e9635df 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsa-lib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils -, epoxy, gdk-pixbuf, gnome, wrapGAppsHook +, libepoxy, gdk-pixbuf, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsa-lib - epoxy + libepoxy gtk3 gdk-pixbuf libGLU libGL diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 8cebc664bca2f..27f3400cc0b1c 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook -, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: +, SDL2, zlib, gtk3, libxml2, libXv, libepoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { pname = "snes9x-gtk"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; + buildInputs = [ SDL2 zlib gtk3 libxml2 libXv libepoxy minizip pulseaudio portaudio ]; preConfigure = "cd gtk"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 50ea99b15592c..6bb4eba7fb4f4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2385,6 +2385,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/gv.vim/"; }; + harpoon = buildVimPluginFrom2Nix { + pname = "harpoon"; + version = "2021-11-09"; + src = fetchFromGitHub { + owner = "ThePrimeagen"; + repo = "harpoon"; + rev = "57819752e62251f9488a95fea1690bb62547bd2a"; + sha256 = "0x5x6jmz31aclai0l2dplr0y16f97jb40cgvnrx8mr5gb0s5i7sc"; + }; + meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; + }; + haskell-vim = buildVimPluginFrom2Nix { pname = "haskell-vim"; version = "2021-01-19"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3c00bc328f38b..0438506633f76 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -744,6 +744,7 @@ tex/vimpreviewpandoc Th3Whit3Wolf/one-nvim@main theHamsta/nvim-dap-virtual-text ThePrimeagen/git-worktree.nvim +ThePrimeagen/harpoon theprimeagen/refactoring.nvim ThePrimeagen/vim-apm thinca/vim-ft-diff_fold diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 13dd8302b18d2..736f5ca6bc9de 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, elfutils , xorg, patchelf, openssl, libdrm, udev -, libxcb, libxshmfence, epoxy, perl, zlib +, libxcb, libxshmfence, libepoxy, perl, zlib , ncurses , libsOnly ? false, kernel ? null }: @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { depLibPath = makeLibraryPath [ stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib - xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils udev ncurses5 + xorg.libXxf86vm libxcb libxshmfence libepoxy openssl libdrm elfutils udev ncurses5 ]; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index adb46db59af98..73bc0bbbb8a97 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.14.15-zen1"; + modDirVersion = "5.15.1-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-2nShtZodkPBCbGdK0dI+RGTRS5/JOUP/7//L//MJI4c="; + sha256 = "sha256-mDAwsqLR55WFaPKO1SXZuxeuaFzprMY4ryeEUdCqKGU="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c248e29fc7174..3fcf1a54a252e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.11.0"; + version = "2021.11.2"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -713,7 +713,7 @@ "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ pyrisco ]; "rituals_perfume_genie" = ps: with ps; [ pyrituals ]; - "rmvtransport" = ps: with ps; [ PyRMVtransport ]; + "rmvtransport" = ps: with ps; [ pyrmvtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ rokuecp ]; "roomba" = ps: with ps; [ roombapy ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5f3ac1a2d6f56..b834f5ea07f6c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -127,7 +127,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.11.0"; + hassVersion = "2021.11.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -144,7 +144,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1bhm2ahc9fvh3czhfim3la0vdwdis2r86fa0qldqpnh11v25hb2s"; + sha256 = "13212h67ijvir8rlr4gpd2945xx5f5c2lj3bwg7ncw55r23h6hma"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 5c2e18b6715c9..e073cf2fe1deb 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20211103.0"; + version = "20211108.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gny97mYHNwQ8KderebfLALCbIyddbwRoD5Ux6ahDdVk="; + sha256 = "sha256-cMCjBhtPi73AB9bplUH8ZNQMt5WJ/NZFW4qLuHHo3+g="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3a6ec31ad750f..87a42c4b85266 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -4,7 +4,7 @@ freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkg-config, llvm, libxslt, + mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, ApplicationServices, Carbon, Cocoa, Xplugin }: @@ -650,7 +650,7 @@ self: super: ./dont-create-logdir-during-build.patch ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; prePatch = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 7db47f4bf7643..98f2f3c973004 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,5 +1,5 @@ { egl-wayland -, epoxy +, libepoxy , fetchurl , fontutil , lib @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ egl-wayland - epoxy + libepoxy fontutil libGL libGLU diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 4d3038079a802..c34dd472f948f 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -7,9 +7,10 @@ let archString = if stdenv.isAarch64 then "arm64" platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "0w44ws8b6zfixf7xz93hmplqsx18279n9x8j77y4rbzs13fldvsn" - else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-SOZn7CGLu9x+xhQwjgm0SL7sKDODLwHRpzi7tMdRBAM=" - else if (stdenv.isLinux && stdenv.isAarch64) then "1axbi4kmb1ydys7c45jhp729w1srid3c8jgivb4bdmdp56rf6h32" + platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-h5zjn8wtgHmsJFiGq1rja6kZTZj3Q72W2kH3AexRDQs=" + else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-NHM9ZUpBJb59Oq0Ke7DcvaN+bZ9MjSpXBRu5Ng9OVZ0=" + else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-gRebkDY0WOKabuLd/WNMoRPL7oGQJtHELFNe+sQ0TwA=" + else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-bUacA4DwjDNlIG7yooXxUGL9AysAogNWuQDvcTqo1sE=" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -19,7 +20,7 @@ let archString = if stdenv.isAarch64 then "arm64" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.1.4"; + version = "7.2.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz"; @@ -50,8 +51,6 @@ stdenv.mkDerivation rec { patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so '' + lib.optionalString (!stdenv.isDarwin) '' - # Remove liblttng-ust from dependencies once - # https://github.com/PowerShell/PowerShell/pull/14688 is in a release patchelf --replace-needed liblttng-ust${ext}.0 liblttng-ust${ext}.1 $pslibs/libcoreclrtraceptprovider.so '' + '' @@ -74,7 +73,7 @@ stdenv.mkDerivation rec { description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; maintainers = with maintainers; [ yrashk srgom p3psi ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux"]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; license = with licenses; [ mit ]; }; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 710ed04006c4e..9af99a58098b2 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp -, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu +, libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu , wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ gtk glib pcre libappindicator libpthreadstubs - libXdmcp libxkbcommon epoxy at-spi2-core + libXdmcp libxkbcommon libepoxy at-spi2-core dbus libdbusmenu ]; diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index 073a3b1b6d476..49832c5d6d863 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, libepoxy, wayland, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wdisplays"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 epoxy wayland ]; + buildInputs = [ gtk3 libepoxy wayland ]; src = fetchFromGitHub { owner = "luispabon"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 7b27184cde325..723624e96abcc 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -17,7 +17,7 @@ , libdatrie , libXdmcp , libxkbcommon -, epoxy +, libepoxy , dbus , at-spi2-core , libXtst @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libdatrie libXdmcp libxkbcommon - epoxy + libepoxy dbus at-spi2-core libXtst diff --git a/pkgs/tools/misc/beats/default.nix b/pkgs/tools/misc/beats/default.nix index 3e471c76fdfe7..9b387a3939d5a 100644 --- a/pkgs/tools/misc/beats/default.nix +++ b/pkgs/tools/misc/beats/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rdvsqrjpily74y8vwch711401585xckb4p41cfwrmj6vf44jhif"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; meta = with lib; { homepage = "https://github.com/j0hax/beats"; diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix index 8dd811e3d2f7e..e0cf9d98d651d 100644 --- a/pkgs/tools/misc/octofetch/default.nix +++ b/pkgs/tools/misc/octofetch/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { @@ -19,7 +21,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256:1ddyzbpsiy54r13nb9yrm64cbbifixnhkskwg5fvhhzj4ri4ks4a"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Github user information on terminal"; diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index b05df0ae611cc..6a6a019dcbee7 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.10.22"; + version = "2021.11.10.1"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-okuWZr0iNBSeTajE8Wu45fdGwpQo0S7gT8HBG1JHowc="; + sha256 = "f0ad6ae2e2838b608df2fd125f2a777a7ad832d3e757ee6d4583b84b21e44388"; }; propagatedBuildInputs = [ websockets mutagen ] diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index dc1596facdff4..5e7b2dbd04f16 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "theharvester"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "laramies"; repo = pname; rev = version; - sha256 = "02jhk34znpvq522pqr3x4c0rljw37x62znwycijf1zx81dpbn4rm"; + sha256 = "sha256-jG0uVfeAfbX809XTUhoSpYdh2i42NoGzortv96dWEAs="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { fastapi lxml netaddr + orjson plotly pyppeteer pyyaml diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index 23e4a17ea8af2..9fd5266743655 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -26,16 +26,16 @@ GEM ffi (1.15.4) get_process_mem (0.2.7) ffi (~> 1.0) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) minitest (5.14.4) - nokogiri (1.12.4-x86_64-linux) + nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) opt_parse_validator (1.9.5) activesupport (>= 5.2, < 6.2.0) addressable (>= 2.5, < 2.9) public_suffix (4.0.6) - racc (1.5.2) + racc (1.6.0) ruby-progressbar (1.11.0) sys-proctable (1.2.6) ffi @@ -44,12 +44,12 @@ GEM tzinfo (2.0.4) concurrent-ruby (~> 1.0) webrick (1.7.0) - wpscan (3.8.19) + wpscan (3.8.20) cms_scanner (~> 0.13.6) xmlrpc (0.3.2) webrick yajl-ruby (1.4.1) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS x86_64-linux diff --git a/pkgs/tools/security/wpscan/gemset.nix b/pkgs/tools/security/wpscan/gemset.nix index d62c17bc94d2c..0c882a313312f 100644 --- a/pkgs/tools/security/wpscan/gemset.nix +++ b/pkgs/tools/security/wpscan/gemset.nix @@ -80,30 +80,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; type = "gem"; }; - version = "1.8.10"; + version = "1.8.11"; }; - minitest = { + mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; type = "gem"; }; - version = "5.14.4"; + version = "2.6.1"; }; - mini_portile2 = { + minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "2.6.1"; + version = "5.14.4"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -111,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sad16idsxayhaaswc3bksii1ydiqyzikl7y0ng35cn7w4g1dv3z"; + sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; type = "gem"; }; - version = "1.12.4"; + version = "1.12.5"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -142,10 +142,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; ruby-progressbar = { groups = ["default"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gv5ym8sxr9901z55d0dakc7af954rp2asnd1a68arjvfyj96sq3"; + sha256 = "07mzbds1j0a1y6jw4swgc4d7kcflkycdk3ivdw3lxaqaqvbfs35p"; type = "gem"; }; - version = "3.8.19"; + version = "3.8.20"; }; xmlrpc = { dependencies = ["webrick"]; @@ -237,9 +237,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.1"; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 48d1c21445fd2..8af257e34d467 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -224,6 +224,7 @@ mapAliases ({ emacsPackages = emacs.pkgs; # added 2020-12-18 enblendenfuse = enblend-enfuse; # 2015-09-30 envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 + epoxy = libepoxy; # 2021-11-11 esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86ec2fbc457d3..4b62fb4e916ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8049,7 +8049,9 @@ with pkgs; ocserv = callPackage ../tools/networking/ocserv { }; - octofetch = callPackage ../tools/misc/octofetch { }; + octofetch = callPackage ../tools/misc/octofetch { + inherit (darwin.apple_sdk.frameworks) Security; + }; oha = callPackage ../tools/networking/oha { inherit (darwin.apple_sdk.frameworks) Security; @@ -16009,7 +16011,7 @@ with pkgs; entt = callPackage ../development/libraries/entt { }; - epoxy = callPackage ../development/libraries/epoxy {}; + libepoxy = callPackage ../development/libraries/libepoxy {}; libesmtp = callPackage ../development/libraries/libesmtp { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1648f83aa0009..8a4408260042a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1058,9 +1058,7 @@ let ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; - ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { - ppxlib = ppxlib.override { version = "0.22.0"; }; - }; + ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a5f208b3ef00..75bb41c30af5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6949,7 +6949,7 @@ in { pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; - PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; + pyrmvtransport = callPackage ../development/python-modules/pyrmvtransport { }; Pyro4 = callPackage ../development/python-modules/pyro4 { }; @@ -9474,6 +9474,10 @@ in { types-requests = callPackage ../development/python-modules/types-requests { }; + types-setuptools = callPackage ../development/python-modules/types-setuptools { }; + + types-toml = callPackage ../development/python-modules/types-toml { }; + typesentry = callPackage ../development/python-modules/typesentry { }; typesystem = callPackage ../development/python-modules/typesystem { }; |