diff options
Diffstat (limited to 'pkgs')
1107 files changed, 18316 insertions, 11698 deletions
diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index 2ff36bb683339..9e18904ff6596 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook +, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook , libX11, libXtst, libXfixes, libXcursor }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 08042a7701b9a..ec99666b6f42d 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , wayland @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome3.gnome-desktop + gnome.gnome-desktop wayland wayland-protocols libxml2 diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 1bbed0613c8e3..1a47451ad76b1 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -15,6 +15,7 @@ , lilv , serd , sord +, sqlite , sratom , suil , alsaLib @@ -130,6 +131,7 @@ stdenv.mkDerivation rec { sord soundtouch soxr + sqlite sratom suil twolame diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index fca3eaf223e9f..b1625868933b8 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf , wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg -, libbsd, libjack2, libpng, ffmpeg_3 +, libbsd, libjack2, libpng, ffmpeg , libxkbcommon , makeWrapper, pixman, autoPatchelfHook , xdg-utils, zenity, zlib }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg-utils zenity ffmpeg_3 + xdg-utils zenity ffmpeg ]; installPhase = '' diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 28b5ef438e22e..93fa00b827ba6 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cairo, dpkg, freetype , gdk-pixbuf, glib, gtk3, lib, xorg -, libglvnd, libjack2, ffmpeg_3 +, libglvnd, libjack2, ffmpeg , libxkbcommon, xdg-utils, zlib, pulseaudio , wrapGAppsHook, makeWrapper }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg-utils ffmpeg_3 + xdg-utils ffmpeg ]; ldLibraryPath = lib.strings.makeLibraryPath buildInputs; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 2d3ac0c314ea9..62bf32eb71d0c 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -98,7 +98,7 @@ mkDerivation rec { homepage = "https://github.com/falkTX/Cadence/"; description = "Collection of tools useful for audio production"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ worldofpeace ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index bcad36e2da98b..5eb71cbe04f3a 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -12,7 +12,7 @@ , file , cairo , gettext -, gnome3 +, gnome }: python3Packages.buildPythonApplication rec { @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { gtk3 cairo gettext - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-good diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 4f3d2a6a4dcdc..a07dca699d793 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.2.1"; + version = "3.2.5"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa"; + sha256 = "14kia9wjs0nqfx4psnr3vf4x6hihkf80gb0mjzmdnnnk4cnrdydm"; fetchSubmodules = true; }; - patchPhase = '' + postPatch = '' patchShebangs dpf/utils/generate-ttl.sh ''; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/lib/lv2/ mkdir -p $out/lib/vst/ @@ -31,13 +32,14 @@ stdenv.mkDerivation rec { cp -a $bin-vst.so $out/lib/vst/ cp -a $bin.lv2/ $out/lib/lv2/ ; done + runHook postInstall ''; meta = with lib; { homepage = "https://github.com/michaelwillis/dragonfly-reverb"; description = "A hall-style reverb based on freeverb3 algorithms"; maintainers = [ maintainers.magnetophon ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = ["x86_64-linux"]; }; } diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 65c871640ef5a..d55fd7ff0cb6b 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas -, gnome3, wrapGAppsHook +, gnome, wrapGAppsHook }: let @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac - gsettings-desktop-schemas gnome3.adwaita-icon-theme + gsettings-desktop-schemas gnome.adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 229050654cd54..681c6ffe28100 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages, intltool -, glibcLocales, gnome3, gtk3, wrapGAppsHook +, glibcLocales, gnome, gtk3, wrapGAppsHook , gobject-introspection }: @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index f39558c1571d8..61484bc2fbb15 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl, + gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl, libvorbis, gdk-pixbuf }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf - gdl gnome3.adwaita-icon-theme gnome3.anjuta + gdl gnome.adwaita-icon-theme gnome.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 7f41fa6c5f954..f90cae115b4e9 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , avahi , bluez , boost @@ -10,7 +11,7 @@ , glib , glib-networking , glibmm -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , gtkmm3 @@ -41,13 +42,22 @@ in stdenv.mkDerivation rec { pname = "guitarix"; - version = "0.41.0"; + version = "0.42.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "0qsfbyrrpb3bbdyq68k28mjql7kglxh8nqcw9jvja28x6x9ik5a0"; + sha256 = "101c2hdpipj3s6rmva5wf3q9hfjv7bkyzi7s8sgaiys8f7h4czkr"; }; + patches = [ + (fetchpatch { + name = "guitarix-gcc11.patch"; + url = "https://github.com/brummer10/guitarix/commit/d8f003484c57d808682025dfb07a7a1fb848afdc.patch"; + stripLen = 1; + sha256 = "1qhlbf18cn6m9jdz3741nrdfqvznjna3daqmn9l10k5nd3asy4il"; + }) + ]; + nativeBuildInputs = [ gettext hicolor-icon-theme @@ -68,7 +78,7 @@ stdenv.mkDerivation rec { glib glib-networking.out glibmm - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gtk3 gtkmm3 diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index bb92682b141fc..4bcda6c4d3275 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 +, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome , pkg-config, makeWrapper }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr - xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity ]; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -Dm755 build/Helio $out/bin - wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome3.zenity}/bin + wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome.zenity}/bin mkdir -p $out/share cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 4409437ebf206..6e5cc0d519164 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config -, boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm +, boost, cairo, fftw, gnome, ladspa-sdk, libxcb, lv2, xcbutilwm , zita-convolver, zita-resampler }: diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 9ae05fb571b09..860a621847dab 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -106,7 +106,7 @@ python3.pkgs.buildPythonApplication rec { description = "A modern music player for GNOME"; homepage = "https://wiki.gnome.org/Apps/Lollypop"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace lovesegfault ]; + maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index 022b41007c145..04d5bb0a6dd93 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , pkg-config +, xxd , cairo , fluidsynth , libX11 @@ -13,17 +14,17 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.8"; + version = "2.2"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "049gvdvvv3hkh1b47h0bia02g1p71agwh6g7q0n4yxz4d81b8kha"; + sha256 = "1885qxyfkpslzk0aaaaws0x73b10h9nbr04jkk7xhkya25gf280m"; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config xxd ]; buildInputs = [ cairo fluidsynth libX11 libjack2 alsaLib liblo libsigcxx libsmf ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix new file mode 100644 index 0000000000000..9c49f26bb4ac9 --- /dev/null +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, bison +, flex +, which +, alsaLib +, libsndfile +, qt4 +, qscintilla +, libpulseaudio +, libjack2 +, audioBackend ? "pulse" # "pulse", "alsa", or "jack" +}: + +stdenv.mkDerivation rec { + pname = "miniaudicle"; + version = "1.3.5.2"; + + src = fetchurl { + url = "https://audicle.cs.princeton.edu/mini/release/files/miniAudicle-${version}.tgz"; + hash = "sha256-dakDz69uHbKZFj8z67CubmRXEQ5X6GuYqlCXXvLzqSI="; + }; + + sourceRoot = "miniAudicle-${version}/src"; + + postPatch = '' + substituteInPlace miniAudicle.pro \ + --replace "/usr/local" $out + ''; + + nativeBuildInputs = [ + bison + flex + which + ]; + + buildInputs = [ + alsaLib + libsndfile + qt4 + qscintilla + ] ++ lib.optional (audioBackend == "pulse") libpulseaudio + ++ lib.optional (audioBackend == "jack") libjack2; + + buildFlags = [ "linux-${audioBackend}" ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A light-weight integrated development environment for the ChucK digital audio programming language"; + homepage = "https://audicle.cs.princeton.edu/mini/"; + downloadPage = "https://audicle.cs.princeton.edu/mini/linux/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + broken = stdenv.isDarwin; # not attempted + }; +} diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 502842c7aa734..e705c3590adca 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mousai"; - version = "0.3.1"; + version = "0.3.2"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - sha256 = "0x57dci0prhlj79h74yh79cazn48rn0bckz5j3z4njk4fwc3fvfx"; + sha256 = "sha256-sBB2kqlC+2qPgQinhGxY8lq9unxgQoOOhDP5o1pUWMo="; }; postPatch = '' diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 31d9292675e59..c7f12a8df6cce 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio, -gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: +gtkmm3 , libcanberra-gtk3, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pavucontrol"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { })]; buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 - gnome3.adwaita-icon-theme ]; + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 939b53c44fb18..01c969c3d8e0c 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib -, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection +, wrapGAppsHook, pythonPackages, gtk3, gnome, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ + [ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 738bf161cd596..52e8b4f8183da 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg, - tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, +{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, + tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, gst_all_1, withGstPlugins ? true, xineBackend ? false, xine-lib, withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, @@ -20,9 +20,9 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext ]; - checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]); + checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]); - buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] + buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xine-lib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 173741484fd49..65499f58630e7 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -6,7 +6,7 @@ , intltool , libpeas , libsoup -, gnome3 +, gnome , totem-pl-parser , tdb , json-glib @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { gtk3 libpeas totem-pl-parser - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 153e52c82e170..702f5c3982a26 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , libjack2, libsndfile, xorg, freetype, libxkbcommon -, cairo, glib, gnome3, flac, libogg, libvorbis, libopus +, cairo, glib, gnome, flac, libogg, libvorbis, libopus , cmake, pkg-config }: @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { libxkbcommon cairo glib - gnome3.zenity + gnome.zenity freetype ]; nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' substituteInPlace editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ - --replace '"/usr/bin/zenity' '"${gnome3.zenity}/bin/zenity' + --replace '"/usr/bin/zenity' '"${gnome.zenity}/bin/zenity' ''; cmakeFlags = [ diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 83af7985dbe2d..9eae394488e28 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, wrapGAppsHook, gettext -, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: +, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -24,7 +24,7 @@ in buildPythonApplication rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gtk3 gdk-pixbuf diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 740757a639e31..c03b48c436bf6 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,31 +1,61 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk3, intltool, itstool, libxml2, brasero -, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes -, gsettings-desktop-schemas, wrapGAppsHook }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, glib +, gtk3 +, itstool +, libxml2 +, brasero +, libcanberra-gtk3 +, gnome +, gst_all_1 +, libmusicbrainz5 +, libdiscid +, isocodes +, gsettings-desktop-schemas +, wrapGAppsHook +}: -let +stdenv.mkDerivation rec { pname = "sound-juicer"; - version = "3.24.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "3.38.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf"; }; - nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + itstool + libxml2 + wrapGAppsHook + ]; + buildInputs = [ - glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme - gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + glib + gtk3 + brasero + libcanberra-gtk3 + gnome.adwaita-icon-theme + gsettings-desktop-schemas + libmusicbrainz5 + libdiscid + isocodes + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad gst_all_1.gst-libav ]; - NIX_CFLAGS_COMPILE="-Wno-error=format-nonliteral"; - passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -34,7 +64,7 @@ in stdenv.mkDerivation rec { description = "A Gnome CD Ripper"; homepage = "https://wiki.gnome.org/Apps/SoundJuicer"; maintainers = [ maintainers.bdimcheff ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 4014468eafe86..8656deb2f6aa2 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3 +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon }: @@ -139,7 +139,7 @@ stdenv.mkDerivation { librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome3.zenity}/bin" + --prefix PATH : "${gnome.zenity}/bin" # fix Icon line in the desktop file (#48062) sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 6bb3bef8a50c8..600ba95947ab1 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -2,7 +2,7 @@ , alsaLib, flac, libmad, libvorbis, mpg123 , dsdSupport ? true , faad2Support ? true, faad2 -, ffmpegSupport ? true, ffmpeg_3 +, ffmpegSupport ? true, ffmpeg , opusSupport ? true, opusfile , resampleSupport ? true, soxr , sslSupport ? true, openssl @@ -35,7 +35,7 @@ in stdenv.mkDerivation { buildInputs = [ alsaLib flac libmad libvorbis mpg123 ] ++ optional faad2Support faad2 - ++ optional ffmpegSupport ffmpeg_3 + ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile ++ optional resampleSupport soxr ++ optional sslSupport openssl; diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 15963faf06b4c..3d25ec3cdbb03 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -1,12 +1,11 @@ { fetchFromGitLab -, fetchpatch , lib , python3Packages , gobject-introspection , gtk3 , pango , wrapGAppsHook -, xvfb_run +, xvfb-run , chromecastSupport ? false , serverSupport ? false , keyringSupport ? true @@ -16,26 +15,16 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.11"; + version = "0.11.12"; format = "pyproject"; src = fetchFromGitLab { owner = "sublime-music"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r4Tn/7CGDny8Aa4kF4PM5ZKMYthMJ7801X3zPdvXh4Q="; + sha256 = "sha256-fcEdpht+xKJRTaD3gKoRdf6O2SAPlZHZ61Jy8bdTKjs="; }; - patches = [ - # Switch to poetry-core: - # https://gitlab.com/sublime-music/sublime-music/-/merge_requests/60 - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://gitlab.com/sublime-music/sublime-music/-/commit/9b0af19dbdfdcc5a0fa23e73bb34c7135a8c2855.patch"; - sha256 = "sha256-cXG0RvrnBpme6yKWM0nfqMqoK0qPT6spflJ9AaaslVg="; - }) - ]; - nativeBuildInputs = [ gobject-introspection python3Packages.poetry-core @@ -77,7 +66,7 @@ python3Packages.buildPythonApplication rec { pytest pytest-cov ]; - checkPhase = "${xvfb_run}/bin/xvfb-run pytest"; + checkPhase = "${xvfb-run}/bin/xvfb-run pytest"; # Also run the python import check for sanity pythonImportsCheck = [ "sublime_music" ]; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ef7133630b5ef..577175fcff2a7 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih"; + sha256 = "10lqbm1grw0sqasx7i6528cishv5ksdf9zbb3ygxd8c1iwaxzhb9"; }; nativeBuildInputs = [ unzip ]; @@ -44,7 +44,5 @@ stdenv.mkDerivation rec { homepage = "http://www.warmplace.ru/soft/sunvox/"; maintainers = with maintainers; [ puffnfresh ]; platforms = [ "i686-linux" "x86_64-linux" ]; - # hash mismatch - broken = true; }; } diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 8c44931667492..b91a8e6d50c55 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/needle-and-thread/vocal"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 4ab491cb9a9d4..ccd121f5da700 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -12,7 +12,7 @@ , coreutils , libsoup , libsecret -, libhandy_0 +, libhandy , wrapGAppsHook , libgpgerror , json-glib @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "42.6"; + version = "42.7"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "0grwlfakrnr9ij7h8lsfazlws6qix8pl50dr94cpxnnbjga9xn9z"; + sha256 = "1q66wccnph78cp1r5mln2iq4bcqdrrchxq3c1pjrzkmzwc6l93gz"; }; patches = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { glib gtk3 libsecret - libhandy_0 + libhandy libgpgerror json-glib ]; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index c37bf0f20f79c..fc56d6c54001e 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -2,6 +2,7 @@ , python3 , fetchFromGitHub , wrapQtAppsHook +, borgbackup }: python3.pkgs.buildPythonApplication rec { @@ -30,7 +31,10 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=( + "''${qtWrapperArgs[@]}" + --prefix PATH : ${lib.makeBinPath [ borgbackup ]} + ) ''; meta = with lib; { diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix index 7ff2804ba799a..5d6775f729aad 100644 --- a/pkgs/applications/blockchains/bitcoin-gold.nix +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , openssl , boost +, libb2 , libevent , autoreconfHook , db4 @@ -21,13 +22,13 @@ with lib; stdenv.mkDerivation rec { pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; - version = "0.15.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "BTCGPU"; repo = "BTCGPU"; rev = "v${version}"; - sha256 = "0grd1cd8d2nsrxl27la85kcan09z73fn70ncr9km4iccaj5pg12h"; + sha256 = "sha256-1tFoUNsCPJkHSmNRl5gE3n2EQD6RZSry1zIM5hiTzEI="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { db4 zeromq libsodium + libb2 ] ++ optionals withGui [ qtbase qttools diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 1f222477ab24a..162a5ddee1a3e 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -16,6 +16,7 @@ , python3 , qrencode , libevent +, nixosTests , withGui , withWallet ? true }: @@ -81,6 +82,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + smoke-test = nixosTests.bitcoind; + }; + meta = { description = "Peer-to-peer electronic cash system"; longDescription = '' diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 597db2ae8ffb0..d4210c83bb27b 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-swU4CnX2BxL3ILH/sXux8ZHMo5nAPLQOIiWmr4C8BOQ="; + sha256 = "sha256-FstAKUZVKW9U6QTqqCEDybvbBl+0H9qVHqFMPubdDpk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch b/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch new file mode 100644 index 0000000000000..57725d28288a3 --- /dev/null +++ b/pkgs/applications/blockchains/ethabi/add-Cargo-lock.patch @@ -0,0 +1,683 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..05e3f0f +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,677 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "bitvec" ++version = "0.17.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" ++dependencies = [ ++ "either", ++ "radium", ++] ++ ++[[package]] ++name = "block-buffer" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" ++dependencies = [ ++ "block-padding", ++ "generic-array", ++] ++ ++[[package]] ++name = "block-padding" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" ++ ++[[package]] ++name = "byte-slice-cast" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++ ++[[package]] ++name = "bytes" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "clap" ++version = "2.33.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "crunchy" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" ++ ++[[package]] ++name = "digest" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "ethabi" ++version = "13.0.0" ++dependencies = [ ++ "anyhow", ++ "ethereum-types", ++ "hex", ++ "hex-literal", ++ "paste", ++ "serde", ++ "serde_json", ++ "sha3", ++ "thiserror", ++ "uint", ++] ++ ++[[package]] ++name = "ethabi-cli" ++version = "13.0.0" ++dependencies = [ ++ "anyhow", ++ "ethabi", ++ "hex", ++ "itertools", ++ "sha3", ++ "structopt", ++] ++ ++[[package]] ++name = "ethabi-contract" ++version = "11.0.0" ++ ++[[package]] ++name = "ethabi-derive" ++version = "13.0.0" ++dependencies = [ ++ "anyhow", ++ "ethabi", ++ "heck", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "ethabi-tests" ++version = "0.1.1" ++dependencies = [ ++ "ethabi", ++ "ethabi-contract", ++ "ethabi-derive", ++ "hex", ++ "hex-literal", ++] ++ ++[[package]] ++name = "ethbloom" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4" ++dependencies = [ ++ "crunchy", ++ "fixed-hash", ++ "impl-rlp", ++ "impl-serde", ++ "tiny-keccak", ++] ++ ++[[package]] ++name = "ethereum-types" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" ++dependencies = [ ++ "ethbloom", ++ "fixed-hash", ++ "impl-rlp", ++ "impl-serde", ++ "primitive-types", ++ "uint", ++] ++ ++[[package]] ++name = "fixed-hash" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" ++dependencies = [ ++ "byteorder", ++ "rand", ++ "rustc-hex", ++ "static_assertions", ++] ++ ++[[package]] ++name = "generic-array" ++version = "0.14.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" ++dependencies = [ ++ "typenum", ++ "version_check", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++ ++[[package]] ++name = "hex-literal" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8" ++ ++[[package]] ++name = "impl-codec" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" ++dependencies = [ ++ "parity-scale-codec", ++] ++ ++[[package]] ++name = "impl-rlp" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" ++dependencies = [ ++ "rlp", ++] ++ ++[[package]] ++name = "impl-serde" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++ ++[[package]] ++name = "keccak" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.94" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" ++ ++[[package]] ++name = "parity-scale-codec" ++version = "1.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" ++dependencies = [ ++ "arrayvec", ++ "bitvec", ++ "byte-slice-cast", ++ "serde", ++] ++ ++[[package]] ++name = "paste" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "primitive-types" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" ++dependencies = [ ++ "fixed-hash", ++ "impl-codec", ++ "impl-rlp", ++ "impl-serde", ++ "uint", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "radium" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" ++ ++[[package]] ++name = "rand" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" ++dependencies = [ ++ "libc", ++ "rand_chacha", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rlp" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" ++dependencies = [ ++ "bytes", ++ "rustc-hex", ++] ++ ++[[package]] ++name = "rustc-hex" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "serde" ++version = "1.0.125" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.125" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.64" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "sha3" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" ++dependencies = [ ++ "block-buffer", ++ "digest", ++ "keccak", ++ "opaque-debug", ++] ++ ++[[package]] ++name = "static_assertions" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "structopt" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" ++dependencies = [ ++ "clap", ++ "lazy_static", ++ "structopt-derive", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.72" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tiny-keccak" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" ++dependencies = [ ++ "crunchy", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" ++ ++[[package]] ++name = "uint" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" ++dependencies = [ ++ "byteorder", ++ "crunchy", ++ "hex", ++ "static_assertions", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "version_check" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi/default.nix index 8cf3295ccab30..14f83539d7045 100644 --- a/pkgs/applications/blockchains/ethabi.nix +++ b/pkgs/applications/blockchains/ethabi/default.nix @@ -2,22 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "ethabi"; - version = "11.0.0"; + version = "13.0.0"; src = fetchFromGitHub { - owner = "paritytech"; + owner = "rust-ethereum"; repo = "ethabi"; rev = "v${version}"; - sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4"; + sha256 = "sha256-bl46CSVP1MMYI3tkVAHFrjMFwTt8QoleZCV9pMIMZyc="; }; - cargoSha256 = "1hx8qw51rl7sn9jmnclw0hc4rx619hf78hpaih5mvny3k0zgiwpm"; + cargoSha256 = "sha256-Jz0uEP2/ZjLS+GbCp7lNyJQdFDjTSFthjBdC/Z4tkTs="; + + cargoPatches = [ ./add-Cargo-lock.patch ]; meta = with lib; { description = "Ethereum function call encoding (ABI) utility"; - homepage = "https://github.com/ethcore/ethabi/"; + homepage = "https://github.com/rust-ethereum/ethabi"; maintainers = [ maintainers.dbrock ]; - license = licenses.gpl3; + license = licenses.asl20; inherit version; }; } diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index a43feff97a3ad..1c3b816750e58 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2021.04.05"; + version = "2021.05.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RTPNJASNFyZ6tDJj0WOqALyxRsOLJzPy0qA1c2sSxys="; + sha256 = "sha256-zvxtBK0/6fShxAZfU4gTV0XiP6TzhKFNsADSZA9gv0Y="; }; - vendorSha256 = "01c7lb6n00ws60dfybir0z5dbn6h68p5s4hbq0ga2g7drf3l3y0p"; + vendorSha256 = "0c8p6djs0zcci8sh4zgzky89155mr4cfqlax025618x8vngrsxf2"; runVend = true; subPackages = [ diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index be9ba0f75616d..7ca4da69d077d 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -20,7 +20,7 @@ , polkit , accountsservice , gtk-doc -, gnome3 +, gnome , gobject-introspection , vala , fetchpatch @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { autoconf automake yelp-tools - gnome3.yelp-xsl + gnome.yelp-xsl gobject-introspection gtk-doc intltool @@ -142,6 +142,6 @@ stdenv.mkDerivation rec { description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 9dafc055bcb0a..851c3ea1c2f01 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, cmake , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection -, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive +, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive , shared-mime-info, libhandy }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { appstream-glib wrapGAppsHook ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 - gnome3.adwaita-icon-theme webkitgtk gspell texlive + gnome.adwaita-icon-theme webkitgtk gspell texlive glib-networking libhandy ]; postPatch = '' diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 59d1f11312dcd..3a5436d4f32df 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 -, enchant, gucharmap, python3, gnome3 +, enchant, gucharmap, python3, gnome }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; - buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 + buildInputs = [ gnome.adwaita-icon-theme gtk libxml2 enchant gucharmap python3 ]; meta = with lib; { diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index ca76e43e413d6..76ca43aac8d3e 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -114,10 +114,10 @@ elpaBuild { pname = "aggressive-completion"; ename = "aggressive-completion"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/aggressive-completion-1.5.tar"; - sha256 = "1gy0q5yc1a0w31qpyb92f672zcfgxbp5s104ycgk11jxk4y17nw9"; + url = "https://elpa.gnu.org/packages/aggressive-completion-1.6.tar"; + sha256 = "0i7kcxd7pbdw57gczbxddr2n4j778x2ccfpkgjhdlpdsyidfh2bq"; }; packageRequires = [ emacs ]; meta = { @@ -219,16 +219,16 @@ license = lib.licenses.free; }; }) {}; - async = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: + async = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "async"; ename = "async"; - version = "1.9.3"; + version = "1.9.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.3.tar"; - sha256 = "1pmfjrlapvhkjqcal8x95w190hm9wsgxb3byc22rc1gf5z0p52c8"; + url = "https://elpa.gnu.org/packages/async-1.9.5.tar"; + sha256 = "02f43vqlggy4qkqdggkl9mcg3rvagjysj45xgrx41jjx6cnjnm19"; }; - packageRequires = [ cl-lib nadvice ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/async.html"; license = lib.licenses.free; @@ -238,10 +238,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.6"; + version = "13.0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.6.tar"; - sha256 = "00wp388rh2nnk8fam53kilykg90jylps31qxv9ijy1lsp1hqdjys"; + url = "https://elpa.gnu.org/packages/auctex-13.0.11.tar"; + sha256 = "0sy4f1n38q58vyzw5l0f80ci3j99rb25gbwj0frl0pglfmgzl44k"; }; packageRequires = [ emacs ]; meta = { @@ -482,10 +482,10 @@ elpaBuild { pname = "cl-lib"; ename = "cl-lib"; - version = "0.6.1"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-lib-0.6.1.el"; - sha256 = "00w7bw6wkig13pngijh7ns45s1jn5kkbbjaqznsdh6jk5x089j9y"; + url = "https://elpa.gnu.org/packages/cl-lib-0.7.tar"; + sha256 = "0s1vkkj1yc5zn6bvc84sr726cm4v3jh2ymm7hc3rr00swwbz35lv"; }; packageRequires = []; meta = { @@ -651,6 +651,21 @@ license = lib.licenses.free; }; }) {}; + corfu = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "corfu"; + ename = "corfu"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/corfu-0.4.tar"; + sha256 = "0yaspx58w02n3liqy5i4lm6lk5f1fm6v5lfrzp7xaqnngq1f4gbj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/corfu.html"; + license = lib.licenses.free; + }; + }) {}; counsel = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib, swiper }: elpaBuild { pname = "counsel"; @@ -775,10 +790,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.27"; + version = "0.28"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.27.tar"; - sha256 = "1zn9p9vmfv5ihrp8d06b6abs48q225v42cgwa01s39hld6zg6wbv"; + url = "https://elpa.gnu.org/packages/debbugs-0.28.tar"; + sha256 = "1qks38hpg3drhxzw66n5yxfq0v6fj9ya7d9dc6x0xwfp6r2x0li0"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1209,7 +1224,8 @@ license = lib.licenses.free; }; }) {}; - excorporate = callPackage ({ elpaBuild + excorporate = callPackage ({ cl-lib ? null + , elpaBuild , emacs , fetchurl , fsm @@ -1220,12 +1236,19 @@ elpaBuild { pname = "excorporate"; ename = "excorporate"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.9.5.tar"; - sha256 = "0z5x8lqvxh8zra23nmh36cdnr2yk855i4fc3mlbwaj5sdy9sqpf5"; + url = "https://elpa.gnu.org/packages/excorporate-0.9.6.tar"; + sha256 = "0ljav8g1npg0a36x1xxpfs2gvk622fh3si95s3w2vmwa27ynirzj"; }; - packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ]; + packageRequires = [ + cl-lib + emacs + fsm + nadvice + soap-client + url-http-ntlm + ]; meta = { homepage = "https://elpa.gnu.org/packages/excorporate.html"; license = lib.licenses.free; @@ -2233,10 +2256,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "1.2.4"; + version = "1.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-1.2.4.tar"; - sha256 = "0wz6dgkrq4ryvj0kxnzqxwh4i8b9lw15d5dsazjpqa7gfwffpzp0"; + url = "https://elpa.gnu.org/packages/modus-themes-1.3.2.tar"; + sha256 = "085zi3ckf4s1kjskqb04b78rgrhbdhrrp74yksb5w0hl58bd8rsc"; }; packageRequires = [ emacs ]; meta = { @@ -2696,10 +2719,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.2.tar"; - sha256 = "0ngh54jdh56563crgvf0r4gd6zfvhbkxs9prp12930gav8mdm3sh"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.3.tar"; + sha256 = "0yvwfaj7l4z3zgycvnf1j0r5jx4lryaapljbw2sqvwqpbgyiw0y0"; }; packageRequires = [ emacs ]; meta = { @@ -2741,10 +2764,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.0.0.tar"; - sha256 = "1k06dbh9xqn2vix5qkcapl57v0c21b344r8dx6j5qr4jxirsn2x5"; + url = "https://elpa.gnu.org/packages/posframe-1.0.2.tar"; + sha256 = "19a1dkjyw9m74aamyqrsvzrdwshngqpmjzdngx6v5nifvcilrlnk"; }; packageRequires = [ emacs ]; meta = { @@ -2756,10 +2779,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.5.4"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.5.4.tar"; - sha256 = "0arjvhzzcf8b80w94yvpgfdlhsjwf5jk1r7vcai5a4dg3bi9cxyb"; + url = "https://elpa.gnu.org/packages/project-0.6.0.tar"; + sha256 = "0m0r1xgz1ffx6mi2gjz1dkgrn89sh4y5ysi0gj6p1w05bf8p0lc0"; }; packageRequires = [ emacs xref ]; meta = { @@ -2801,10 +2824,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.6"; + version = "3.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.6.tar"; - sha256 = "1fmbzh33s9xdvrfjhkqr9ydcqbiv8lr04k5idvbpc9vwjjjan5y0"; + url = "https://elpa.gnu.org/packages/pyim-3.7.1.tar"; + sha256 = "0k73f1qdl51qshnvycjassdh70id5gp5qi5wz7k4zyl8pbampiyd"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3081,10 +3104,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.6"; + version = "1.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.6.tar"; - sha256 = "1dhv3n2x0bpdisi9bj3qa0bhpjzhs57fga72s4fxh44gp92yl18q"; + url = "https://elpa.gnu.org/packages/rec-mode-1.8.1.tar"; + sha256 = "0injk27l38d0sl9nzjz2bkd0qgccxyf31i42mwmivv86kv0kyxyb"; }; packageRequires = [ emacs ]; meta = { @@ -3267,10 +3290,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-0.1.2.tar"; - sha256 = "1q29phch4fvmvc255kgvzsnzdqp6kaip7ybpxprd0kkdjs3jrsqv"; + url = "https://elpa.gnu.org/packages/setup-0.2.0.tar"; + sha256 = "1xhjkyksilw1vbx12a4yz4bpj0dhl3m02yi8d9nyd19z098cfa9y"; }; packageRequires = [ emacs ]; meta = { @@ -3297,10 +3320,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar"; - sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6"; + url = "https://elpa.gnu.org/packages/shell-command+-2.1.0.tar"; + sha256 = "1jyrnv89989bi03m5h8dj0cllsw3rvyxkiyfrh9v6gpxjwfy8lmq"; }; packageRequires = [ emacs ]; meta = { @@ -3691,10 +3714,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.0.3"; + version = "2.5.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.0.3.tar"; - sha256 = "0c77d1ihn17lzk9jb7ss346ryprnbii1zmijl6zj0kk4lm8fpfl3"; + url = "https://elpa.gnu.org/packages/tramp-2.5.0.4.tar"; + sha256 = "0yk4ckk45gkjp24nfywz49j8pazq33m6pga3lirb5h6zc8an5z24"; }; packageRequires = [ emacs ]; meta = { @@ -3736,10 +3759,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.3.0"; + version = "0.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.3.0.tar"; - sha256 = "1a457apfl762nn5xf1h3hbvrgs9hybkxh0jwb2y713zkhhck66cp"; + url = "https://elpa.gnu.org/packages/transient-0.3.2.tar"; + sha256 = "10zqa245dn6z689z7ap6nx6q9s95whzgybpwl2slpmnawxix2q6i"; }; packageRequires = [ emacs ]; meta = { @@ -3927,10 +3950,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.4"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.4.tar"; - sha256 = "1af9ri51i7pn1pcsmbavnwqafrn46vbxrbqjzfi6a7q6n5yv77im"; + url = "https://elpa.gnu.org/packages/vertico-0.6.tar"; + sha256 = "19f6ffljraikz83nc2y9q83zjc4cfyzn9rnwm18lwh6sjsydz6kk"; }; packageRequires = [ emacs ]; meta = { @@ -4235,10 +4258,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.0.4.el"; - sha256 = "0hkm59qqlsfw3w9ws9xhpmmz30ylifmh05a00ba58zvv1kz04x1g"; + url = "https://elpa.gnu.org/packages/xref-1.1.0.tar"; + sha256 = "1s7pwk09bry4nqr4bc78a3mbwyrxagai2gpsd49x47czy2x7m3ax"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 0114f4dc18018..40ff42e9fae7d 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210412"; + version = "20210503"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210412.tar"; - sha256 = "17hj4y0c9hjqqa7inzjadz9z64vh621lm4cb0asm13r7d1v186yf"; + url = "https://orgmode.org/elpa/org-20210503.tar"; + sha256 = "0j9p834c67qzxbxz8s1n8l5blylrpb3jh9wywphlb6jgbgl0mw09"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210412"; + version = "20210503"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210412.tar"; - sha256 = "162nl1a62l9d4nazply93sx4lih11845z87hxmpfd0n7i7s290mh"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210503.tar"; + sha256 = "0k0wmnx2g919h3s9ynv1cvdlyxvydglslamlwph4xng4kzcr5lrk"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index b24f79ed26082..974b4aa1a4194 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -34,8 +34,8 @@ 20201121, 1210 ], - "commit": "996f822a7c6a7ff7caf49ee537e92c0d01be1f9c", - "sha256": "0fij6gz4188g7dr3gip1w5bc1947j45gf2xc2xl8gyg6hb9c7ycq" + "commit": "eb4d1ec4b667040429aa496838f758823dc55788", + "sha256": "0llngx5ccy2v2ppbydg8nmkz4fpv5vz8knj5i7bq2mvf6rsid8jx" }, "stable": { "version": [ @@ -198,19 +198,19 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20210316, - 2027 + 20210417, + 1134 ], - "commit": "e2b3edafd7aafa8c47833a70984d7404c607626c", - "sha256": "0xg651vfjnq5dywg855wf7ld34gnfspql4b0b0413kydhh15fmxi" + "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec", + "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf" }, "stable": { "version": [ - 0, - 2 + 1, + 0 ], - "commit": "ffafc54e02475b9e7f7bcbe1d8ed3f11bcb4b542", - "sha256": "054sfzvm1ihaxy4hnhl424y5py8k7wi73rb0lqvbi4v8iphihzhr" + "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec", + "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf" } }, { @@ -310,8 +310,8 @@ "flymake", "maude-mode" ], - "commit": "c9b7a2af3232aad8a51138194544c9a427cf46ca", - "sha256": "0h8assjgwwcgnqhlndsc86z9lc1nzlglhvhzxdnkz2ksk90n85q1" + "commit": "3b332ec1e941874f220897e5c0e0a6df762ca28d", + "sha256": "0m7v87w2akdpgr360gyjiw0p5sc6ms3y9bccwi9j4jz4gnlix6l5" }, "stable": { "version": [ @@ -510,15 +510,15 @@ "repo": "atilaneves/ac-dcd", "unstable": { "version": [ - 20210329, - 1928 + 20210428, + 1556 ], "deps": [ "auto-complete", "flycheck-dmd-dub" ], - "commit": "56cdead8c9d2ca64db1f24c59d005ba8b3780bd5", - "sha256": "1z38mg76376xac3rnamzhhmx4h4yzn89xycx7kk51vkcjffjzvg6" + "commit": "56d9817159acdebdbb3d5499c7e9379d29af0cd4", + "sha256": "0p5cjs156ac1x3fsxnb4kc6bd4z09kdkwkyav9ryw5nkrdzv0bd6" }, "stable": { "version": [ @@ -1603,11 +1603,11 @@ "repo": "ianpan870102/acme-emacs-theme", "unstable": { "version": [ - 20200724, - 1833 + 20210430, + 302 ], - "commit": "e416ec678be72eb1aed3de3d88a8a9e3ee7315ca", - "sha256": "0y98il3gsnhm586hr1qdmif4r6v1987fzl82wgx75g8kiy5shbrj" + "commit": "7c408d111c5e451ecb8fdd5f76cf7d8074aec793", + "sha256": "16qxspzlf0bvw36ff4qnrn5p7mc5sf923ba0ar04cr87bfqgyak4" }, "stable": { "version": [ @@ -1918,8 +1918,8 @@ "annotation", "eri" ], - "commit": "3e079614f2b4810ff5920ae69a389da91c855217", - "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0" + "commit": "26d473648853255a6a46d9dedff66df7f644c42f", + "sha256": "18yz278724ydvkdpcwiszfx4lg40bqbwq78268pr5mg0wif0y4q6" }, "stable": { "version": [ @@ -2015,11 +2015,11 @@ "url": "https://bitbucket.org/agriggio/ahg", "unstable": { "version": [ - 20200304, - 741 + 20210412, + 847 ], - "commit": "0ece48646ef7a8c813005934cc13f984b9998707", - "sha256": "0ypck79bmv4pa8l555kgij69jbpkv4fz9w91qs30lacjmrj0nha5" + "commit": "77bc2a628df006dcd2dc359ac12acdf8091a1356", + "sha256": "1wmvz9d40aznqh2y078v8k7n3l66m48vnf873vifi8rwg6158kqh" } }, { @@ -2378,11 +2378,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210411, - 1650 + 20210425, + 1035 ], - "commit": "07a4f7315bf5dd609f95e18390a9707b5a29fe9c", - "sha256": "0z0bqs2cqwndkjaiv301l1n4i1g7h6v89cl95inilfxxkyxhbzig" + "commit": "7a1225826798622d5dbe416b1d5e0a6fba8c19d7", + "sha256": "1h85cbr4bnianwk77f6g5k7phcrq5cw8fqxxd6b7x396ffn2pmgm" }, "stable": { "version": [ @@ -2405,14 +2405,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20210411, - 1226 + 20210422, + 921 ], "deps": [ "all-the-icons" ], - "commit": "07f035d2f6df4f1e840572784a96f5b407a74680", - "sha256": "134p5wz5jgbwfri6ihwf4p8xxbdmwwzpkklxn195gl46r2zqnnwx" + "commit": "a294f45ec2c338e1255ae2dd98b19f3f143204e6", + "sha256": "1m3gqsgybx57qhdlswbn92cnsz9w10sqfzs2lnja63hzwzwxjg92" } }, { @@ -2517,15 +2517,15 @@ "stable": { "version": [ 1, - 4, - 1 + 5, + 0 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "e918b23d55313a7464d8cb5d45eb917249638e32", - "sha256": "1wz3dgn8cggdkijzm7qf13g3s9gmz6v895bjck7sdhmr5mbr28a4" + "commit": "7f8249ac92321a81d3db11e56888e569988b51d5", + "sha256": "1fwih9qidv0wkqrcsngcainw8b5bxcbk15g5a0p5dpl6hqcxj3rz" } }, { @@ -3104,11 +3104,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210322, - 1739 + 20210429, + 1258 ], - "commit": "54ac759facadacbfea5c1e7c2975e2da6434cdda", - "sha256": "18pr4bympwl6c2a1bsk4s8ixg4l7ykcxfh1bk42vvbcqnbmvd7dw" + "commit": "ff3a0089e0a2d64803a152bdb126fd7d3de5dbc9", + "sha256": "0c54yjrf33fx9v0m2gh67gjnwzjb5s7b5s3f4g6aic7s052ywmix" }, "stable": { "version": [ @@ -3146,8 +3146,8 @@ 20200914, 644 ], - "commit": "3e079614f2b4810ff5920ae69a389da91c855217", - "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0" + "commit": "26d473648853255a6a46d9dedff66df7f644c42f", + "sha256": "18yz278724ydvkdpcwiszfx4lg40bqbwq78268pr5mg0wif0y4q6" }, "stable": { "version": [ @@ -3468,11 +3468,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20201024, - 1900 + 20210423, + 1115 ], - "commit": "178af26baac72890fca1904aa9e9c90bc1668a4c", - "sha256": "1mkhjp9i4zhbxj72915g6b976dz7jmzyn2ma9x6n85psi3v7ldk1" + "commit": "5e9de43494cc307a3b43b0eebf774c03670a4582", + "sha256": "00lz9mcxcmlgnnbc05b49arxa2fcckjhsxdcqi66v66zn9h8kr13" }, "stable": { "version": [ @@ -4031,11 +4031,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20210117, - 718 + 20210501, + 1527 ], - "commit": "d7e7f79ee42311a0187aa2ab4f4e2f8843fa28da", - "sha256": "11r6jzqyywgzxmpq2z97j3ni5b1sv6z5lrjmkqip396bxmw9zxm1" + "commit": "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19", + "sha256": "1s2gdilaf38m2dg6nm4kcz5n4n455a9127pl4cbz9lg7mp3l2pg5" }, "stable": { "version": [ @@ -4237,8 +4237,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20210407, - 1826 + 20210426, + 1348 ], "deps": [ "dash", @@ -4246,8 +4246,8 @@ "flycheck", "s" ], - "commit": "4b088698ec81f7cd0f715b30e280b37e3881b91d", - "sha256": "1jil04a69fx946vh6f81x3ki84jmmdfz7g3c9v4phddz58clb1sb" + "commit": "a5bc695af27349ae6fe4541a581e6fd449d2a026", + "sha256": "06j1cpqmplh1xy5aal8fk7r8s42jf3zlk92mh3lll9knx81xix9q" }, "stable": { "version": [ @@ -4414,6 +4414,21 @@ } }, { + "ename": "auth-source-kwallet", + "commit": "047cc780e55a0f574afaf7fa0d94c31ed86cb57f", + "sha256": "1fz63fdfw3cm8k59nxnbsaiylbs0nn5f250fwwfh51bknrqj3vin", + "fetcher": "github", + "repo": "vaartis/auth-source-kwallet", + "unstable": { + "version": [ + 20210421, + 1504 + ], + "commit": "c2abee6ada13d7332725bd700ad76da8aebea530", + "sha256": "1w43mlfslvmqabnm76j0bhkdsb4a2iwwidhm83qqrjpj08cq3ldj" + } + }, + { "ename": "auth-source-pass", "commit": "6e63342b442794ead4d8bed803b0924d9cd26dc4", "sha256": "10l3kbffy08fh0krwvh4gn75k37criv2ma5hgkadvq1s2p5ps8r6", @@ -4424,8 +4439,8 @@ 20210210, 1908 ], - "commit": "468bba286fc20d739ed7724ec884357907ac8bda", - "sha256": "1pazl19rd4fvnfi9i2ssaygby5pw2a821aysy8jswsij57lw40dy" + "commit": "fa8b964494c1ef42035fad340ff5f29fcdbed21c", + "sha256": "0fn30iy1jy0kh09652a0fn7zg93cf3xvs2bz28lml7knj2hbqi2r" }, "stable": { "version": [ @@ -5008,11 +5023,11 @@ "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ - 20201012, - 630 + 20210418, + 1758 ], - "commit": "88c5236280ff8212ff5c74f3e2e654c1a288dbf2", - "sha256": "0q584zrqyz8cc8ib5rll44qvf30xsrjnmdz7yipzqjbvciv6kh7g" + "commit": "8dbf13b344f6d5eba5c4876b18905d30b3118bb9", + "sha256": "1nlwg78d60w6xjpqhrc49nxxvjaxj07wb036rb5jsng9yb6r94m9" }, "stable": { "version": [ @@ -5079,26 +5094,26 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20200427, - 635 + 20210502, + 1103 ], "deps": [ "f" ], - "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b", - "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f" + "commit": "54a7f295e6b1eecbcc86741aaf5d72e404b43bce", + "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "f" ], - "commit": "0ad8247fdd0f1d747cd1ff73adb6b5efcecc7f3b", - "sha256": "10p0hc95j382km8655pqld9wxg10j1f36czzppkdd6a55cxarv9f" + "commit": "738fd22452f00fa05daf200f997cb5db2531a211", + "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q" } }, { @@ -5216,14 +5231,14 @@ "url": "https://git.sr.ht/~zge/autocrypt", "unstable": { "version": [ - 20210411, - 1759 + 20210412, + 1127 ], "deps": [ "cl-generic" ], - "commit": "39c06eb4020c38de8f282340449691210cc23bb8", - "sha256": "0gvdjgfnisx1acy5jmzs82yngmnmiimq1ralbvw9a28knlsdbnig" + "commit": "5b55f8d37545e9c441788627c17e350d7edf4055", + "sha256": "0b06xnjkgwjpxl96mdi674pmvdaiwncifi1a30wxhl1dwr7kr084" } }, { @@ -5273,36 +5288,6 @@ } }, { - "ename": "autopair", - "commit": "4150455d424326667390f72f6edd22b274d9fa01", - "sha256": "0l2ypsj3dkasm0lj9jmnaqjs3rv97ldfw8cmayv77mzfd6lhjmh3", - "fetcher": "github", - "repo": "joaotavora/autopair", - "unstable": { - "version": [ - 20160304, - 1237 - ], - "deps": [ - "cl-lib" - ], - "commit": "2b6d72bccb0ebba6e7e711528872b898b0c65b0a", - "sha256": "09p56vi5zgm2djglimwyhv4n4gyydjndzn46vg9qzzlxvvmw66i1" - }, - "stable": { - "version": [ - 0, - 6, - 1 - ], - "deps": [ - "cl-lib" - ], - "commit": "2d1eb81d12f71248ad305e70cceddf08d4fe2b39", - "sha256": "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq" - } - }, - { "ename": "autotest", "commit": "5fc2c4a590cbeccfb43003972a78f5d76ec4a9e7", "sha256": "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy", @@ -5313,8 +5298,8 @@ 20190331, 2230 ], - "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c", - "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3" + "commit": "2d76365d2aa13543121d5c623df465adb68b76f7", + "sha256": "1n247g5dq73rkxf0wys5lsbvma44y5qlh577s3rcx7l0yrylwdry" } }, { @@ -5457,8 +5442,8 @@ "avy", "embark" ], - "commit": "a005eef82a63950927a68a5ef79b33d25245687b", - "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg" + "commit": "05aa11bca37db1751c86fe78f784741be5b1a066", + "sha256": "1nnrn6dd248l6ngvgjjniqkahlwz45y3n50nw555a67pmi88grh9" }, "stable": { "version": [ @@ -6830,14 +6815,14 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20200416, - 1407 + 20210418, + 406 ], "deps": [ "biblio-core" ], - "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345", - "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00" + "commit": "517ec18f00f91b61481214b178f7ae0b8fbc499b", + "sha256": "0m5vpyj6312rc3xq8lrr1g2hyl26adzwvjxb3jqrm7bvqvs4i5zp" }, "stable": { "version": [ @@ -6877,16 +6862,16 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20210311, - 2310 + 20210418, + 406 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "242c3f3ac1198b1e969e2a34d6348354a9d83345", - "sha256": "0m1ih8p7s3335wah1wzaiipqphvjd88nyig582ja3ra6xkvazf00" + "commit": "517ec18f00f91b61481214b178f7ae0b8fbc499b", + "sha256": "0m5vpyj6312rc3xq8lrr1g2hyl26adzwvjxb3jqrm7bvqvs4i5zp" }, "stable": { "version": [ @@ -6917,8 +6902,8 @@ "a", "pdf-tools" ], - "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", - "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" + "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", + "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" } }, { @@ -6966,14 +6951,25 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210411, - 1846 + 20210503, + 1214 ], "deps": [ "bibtex-completion" ], - "commit": "516cbdb63810bcb571e41436e2c568c328fc8980", - "sha256": "0n3byfv1khn2lr9c1r619gc52993hf01nwl5c7ih7nmrr5q3rckk" + "commit": "149f9aefd2fc90e32f25a0b290e975da55ab8fe6", + "sha256": "16264is954pdh0jvnjw057sdccl297w1v8r9wg39raljl44vzr44" + }, + "stable": { + "version": [ + 0, + 4 + ], + "deps": [ + "bibtex-completion" + ], + "commit": "c18b1ad05168597a3cbaee67775d15d2ebb737f4", + "sha256": "0x45wq2nw753dz6694li3f0zmjm0rljmrr5rvj2qrhgqldlwn6zn" } }, { @@ -6995,8 +6991,8 @@ "parsebib", "s" ], - "commit": "9870333cdd4a54b309e2709af647cda6f4070a42", - "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86" + "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e", + "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik" }, "stable": { "version": [ @@ -7201,8 +7197,8 @@ "deps": [ "seq" ], - "commit": "9cec78c685dbca51ab9d1014eb535a541083effc", - "sha256": "065cqvdjdb5w60b7ga7q51920ib5vpz63zq9s68q0fjwb55q3k8z" + "commit": "52f1c11b01a5f7e7a470a73dec4c3335dea4124b", + "sha256": "00kjjr28bvimbdhg016n0g6ws1lix87c1bic1xb3nk0bvnbkpwfp" }, "stable": { "version": [ @@ -7609,11 +7605,11 @@ "repo": "joodland/bm", "unstable": { "version": [ - 20201116, - 2341 + 20210421, + 1351 ], - "commit": "dc69eb6e431151d3942cb812b7161e6f23c28c07", - "sha256": "0gxj8m8q4md1kaay5ymsyynw5990apnqxa6lw73y8w1py785drmn" + "commit": "9a31c61f44e6f1033ca43bd7f3eb33ffdb2ca595", + "sha256": "0iizqcbxm8yjv1fz2lhn23vbyzmmc8g6xazk0glv9mrldmmppgn5" }, "stable": { "version": [ @@ -7658,8 +7654,8 @@ "deps": [ "cl-lib" ], - "commit": "d88eef69ae66ea1ffa21a65317afe84c9ddb0814", - "sha256": "1bci2w8drwgcli9hqg55izaxpwq4fvqdigvlrfc0524s7021ij24" + "commit": "2d1ee12f3ba6e75841066bf429d7bf836d4b89d7", + "sha256": "1hls8463fl8ndbfry1x4pimx2fz1b9zl3b6wfgcrb3jw3p4ys86x" }, "stable": { "version": [ @@ -7840,8 +7836,8 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20210323, - 1341 + 20210413, + 1322 ], "deps": [ "dash", @@ -7849,8 +7845,8 @@ "multiple-cursors", "pcre2el" ], - "commit": "17a7a9219a5a9b7156f58f7f30227fc2b79b6020", - "sha256": "1jcvz9vy5sz9bysrlg2b9d3732zab8hmg8hg5ghwjx5kgxl2yfzh" + "commit": "a4f2d2caaf2d7a0adf36c19ea20a79dcfa129cad", + "sha256": "1m3yw1i6c5j3fswbcyrk95qa7azq26bgzc7zcmjncx23idijhfpf" }, "stable": { "version": [ @@ -8068,25 +8064,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20210325, - 2154 + 20210501, + 1723 ], "deps": [ "fringe-helper" ], - "commit": "733a44bc491d9d28f9eefc2550616e97b1419cee", - "sha256": "0dfd3w3g31fjzqvzn57xw3whr60fy8yj8hnga8b4n9698dihw0bn" + "commit": "9d6b6797c465589ca39a1020d7af5775f5ddc801", + "sha256": "1jpsrsc4qi2yiwxccdagxz1gj9fgzaxnd5fszgdmwvsgzqwfasvh" }, "stable": { "version": [ 1, - 19 + 20 ], "deps": [ "fringe-helper" ], - "commit": "0024b1a276c43fde0d85011b51b5aaf1f201da64", - "sha256": "1nnhb0vyx5f3f7h2fsg2p7656kcsk7ahrndxrhs7a77svnr426lb" + "commit": "9d6b6797c465589ca39a1020d7af5775f5ddc801", + "sha256": "1jpsrsc4qi2yiwxccdagxz1gj9fgzaxnd5fszgdmwvsgzqwfasvh" } }, { @@ -9634,15 +9630,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20210327, - 1821 + 20210422, + 657 ], "deps": [ - "markdown-mode", - "rust-mode" + "markdown-mode" ], - "commit": "4846373bf1ed6268f1a1d9f9c489f8740351d8bb", - "sha256": "0y4wxddjp055kisv7yx6zs9bzggw65b08aa1g3y0vlaafrps8bga" + "commit": "0174599fd1c1b429042c7ca67c3d45f07441a43d", + "sha256": "0qm6cgzsr86s1rcvqpv8x5b3r1v7nq7z8il8ci4vlw9hk0wg65a2" }, "stable": { "version": [ @@ -9729,8 +9724,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210410, - 2057 + 20210424, + 125 ], "deps": [ "ansi", @@ -9741,27 +9736,26 @@ "s", "shut-up" ], - "commit": "dce91052dc8fae386a1898fd88d554b5cb527fdc", - "sha256": "1j853gbdc50s1csvsi2a0f6i2vakgnd8afb97qkkj5alpwq8883p" + "commit": "81edfa78428fd2d9689507fd4d3b13c24cd99323", + "sha256": "071biqz1fv3rzjbn9xprpazk65xfl78hzhf2gdvz944pks3rhdfi" }, "stable": { "version": [ 0, 8, - 6 + 7 ], "deps": [ "ansi", "cl-lib", - "dash", "epl", "f", "package-build", "s", "shut-up" ], - "commit": "610894d57f467a55fb146ade4d6f8173e4e9579b", - "sha256": "1y12m5sjgws4a4bikr8d1ccysy55j7xx3cp1qii4pw62bkf9y2bq" + "commit": "9600dd9a341c61ac006c0a44912e13f3810f3c54", + "sha256": "0aqc3p7i00rbdgj2cjil71c8wqq9ard637fnpdq1ny6wnb8kblm7" } }, { @@ -9937,11 +9931,11 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20210403, - 1958 + 20210501, + 820 ], - "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed", - "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk" + "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", + "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" } }, { @@ -9989,8 +9983,8 @@ 20200904, 1431 ], - "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed", - "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk" + "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", + "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" } }, { @@ -10124,15 +10118,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20210309, - 1822 + 20210420, + 1415 ], "deps": [ "cl-lib", "powerline" ], - "commit": "df972095135de90b47413190f61ec4f5af33f9f1", - "sha256": "0is51bc9zd9lr0y59md2ci4ddlfylp5jb9hwyll9r6j8gn3lrzza" + "commit": "51f28d03936aef5237f14bc08b2ae26949ecef0f", + "sha256": "13cg8ds0dkrw26ln4qi7yfb4gdbcavky6ykyhx49ph0gzinjhd3b" }, "stable": { "version": [ @@ -10259,8 +10253,8 @@ 20171115, 2108 ], - "commit": "02478862ea707ed51223c1d5d2d8cd8d61d2915d", - "sha256": "0vf94pkd2slwkrgv93yqh2qb2y72bzya9nq5gmqd0g08nb6kdmjx" + "commit": "0c75766aa79f1f744011a1bddd8659e3631177dc", + "sha256": "1crww8asa1cxknmbdf46xjm7rlxzss5wqzn5bza5f2wwj5mw9gpj" }, "stable": { "version": [ @@ -10994,8 +10988,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210408, - 1212 + 20210422, + 802 ], "deps": [ "clojure-mode", @@ -11006,14 +11000,15 @@ "sesman", "spinner" ], - "commit": "fd2bb0c64eb3590cffa91188644d1e40fbbc634b", - "sha256": "0mhscf5cpcqs68c863ns6rbjwr1p71wb7kp80ds5qzar8x2k2qwn" + "commit": "68bc5e393929561a00e2d20e83fd01df37214af2", + "sha256": "0kyliz2vz240g381qkgkyjxh3i9f016a7x4plf2jcw2y5rmqspxl" }, "stable": { "version": [ 1, + 1, 0, - 0 + 1 ], "deps": [ "clojure-mode", @@ -11024,8 +11019,8 @@ "sesman", "spinner" ], - "commit": "140b062e62165e536dcdb878a00f492a1d5b3518", - "sha256": "143kh9k34yk0g6kdlkma6g432kmb2r9r1lhyq4irsw6d3vaql7dj" + "commit": "45f6125301fbbe69333dc450804ce8ecdd611539", + "sha256": "1kf4056bga3cr40mm812m21r9mi0r30gn9v3jil3q6yhb5bm1gcl" } }, { @@ -11198,14 +11193,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20210323, - 1704 + 20210423, + 746 ], "deps": [ "cl-lib" ], - "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da", - "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw" + "commit": "2f70aa236878d9c3726c31d6ba922e2d7076951d", + "sha256": "1fi0qc8qbcgkjjvi5iysifammqcc6nwcrwjhwi713zykd5cir180" }, "stable": { "version": [ @@ -11600,14 +11595,14 @@ "repo": "redguardtoo/cliphist", "unstable": { "version": [ - 20210301, - 748 + 20210426, + 245 ], "deps": [ "ivy" ], - "commit": "1ef50459fa6044c4d571cec0009368948bcf5fc5", - "sha256": "0xba2gxwy1y8zl9nvga186873icvwfi0yan3qbw2vdkpzry5ifhk" + "commit": "0d02d72fb63453ff5623b26234a63f66090da7ac", + "sha256": "033z367nmfh6mc1k8kv2m3xsxjw44hnvgiai2n7fp4h9jdv5j8h8" }, "stable": { "version": [ @@ -11705,8 +11700,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20210407, - 724 + 20210413, + 733 ], "deps": [ "cider", @@ -11719,8 +11714,8 @@ "seq", "yasnippet" ], - "commit": "9f88174878d62e3906be5b04b8ba7788e6ca4570", - "sha256": "155lhb3myzxpxnnp257p3rxhgw9xmr3l2h39gj23q5sr0hhsnm5s" + "commit": "f50fb242ba0ff8526746ae0ffeb19b9a535c00b2", + "sha256": "0ajnc3x7fy9mlgdrfq1p1hvafcisvdnilh9vv0h5s091qkvv3hp9" }, "stable": { "version": [ @@ -11967,11 +11962,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210322, - 704 + 20210502, + 824 ], - "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245", - "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3" + "commit": "8280e4479c89b0f7958d34febafd6932e5a2b3d3", + "sha256": "0w84cc0s8mgh7zx2qdi6csvxzq436p0cnmkbg8zfcwwpp4x6ncb8" }, "stable": { "version": [ @@ -11997,8 +11992,8 @@ "deps": [ "clojure-mode" ], - "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245", - "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3" + "commit": "8280e4479c89b0f7958d34febafd6932e5a2b3d3", + "sha256": "0w84cc0s8mgh7zx2qdi6csvxzq436p0cnmkbg8zfcwwpp4x6ncb8" }, "stable": { "version": [ @@ -12300,19 +12295,17 @@ 20210104, 1831 ], - "commit": "b1c739ad8bcacae6d66d88514102dcd4423c2dcb", - "sha256": "1jwkscld38b6b6f4w3hw1m9dgdvcvbbwwfx2dd5v7548mp3wpxrj" + "commit": "4e5893b658b1c360c1b2d9413dbd66b2b02dbacc", + "sha256": "0ywi74q3csqvn9pb53gcvz5bg9xc94nnq1nbmzsmhf8yj7lrlkcm" }, "stable": { "version": [ 3, 20, - 0, - -1, - 5 + 2 ], - "commit": "fab7fe7ef5a5462952297611c1dd668a603e3a36", - "sha256": "12v6v1hpw0ykkikj4qid3m4m7sb164rgpx6fxin4hvsm20pjcrd4" + "commit": "1ad4501ae97fb6c6deab096ff0ac7e03d554e26d", + "sha256": "0zr4zbbd1zng0v3mj8kql0ci2w18p4izjfq7hh6g5adq6l7ckfhm" } }, { @@ -13271,11 +13264,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210411, - 2221 + 20210503, + 1211 ], - "commit": "4037e82cf82b459b6a1d8529f2a3bb3e310fbdf7", - "sha256": "0hqm4529cng2zwj5nlm9b5k1yngf0viywmrq7k052g3fpx21b4l2" + "commit": "dbb5d8cac2d7b854e883b381c7504e227a7185eb", + "sha256": "0f31pjgnagq1jv557i0pifsjgp12zm7j2k2qjgf3j64j470ffr99" }, "stable": { "version": [ @@ -13516,8 +13509,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20210324, - 1603 + 20210420, + 215 ], "deps": [ "cl-lib", @@ -13526,7 +13519,7 @@ "dash", "yasnippet" ], - "commit": "7423ee253951a439b2491e1cd2ea8bb876d25cb7", + "commit": "6a23da61e4008f54cf1b713f8b8bffd37887e172", "sha256": "15rd9ga4ydhl6ljzdg26a3kcaqlhaygp67507wrrf8j3801ivks4" }, "stable": { @@ -13690,15 +13683,15 @@ "repo": "dunn/company-emoji", "unstable": { "version": [ - 20201212, - 2325 + 20210427, + 2151 ], "deps": [ "cl-lib", "company" ], - "commit": "4ba7dc60ba67f736e698a5fa0b754b866f36a646", - "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk" + "commit": "90594eb58b20fb937cfd4e946efcc446ee630e6f", + "sha256": "08dx812vg92bkwp0ham40rv3x9648x7y5bmbvphcc71s9knfgxcz" }, "stable": { "version": [ @@ -14041,8 +14034,8 @@ "lean-mode", "s" ], - "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90", - "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg" + "commit": "bf32bb97930ed67c5cbe0fe3d4a69dedcf68be44", + "sha256": "1bkv5zs38ijawvavbba0fdf2flb6fiwici3qi99ws8wvwhnbkws2" } }, { @@ -14455,15 +14448,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20210331, - 325 + 20210419, + 607 ], "deps": [ "company", "posframe" ], - "commit": "a28f38213a2a30ce68fdb0b124cadc68ebbcb24f", - "sha256": "1ys40y62c0aqs8nlyhnkahb67slh0i4dpvxvj8mcvcmp68aiih3f" + "commit": "c7a820a35ff132aaec53c81e05afc829de39eb68", + "sha256": "0fyc7c4r4jfa5y0x9lfcqlx0qazg1d4il5p0bdw4hdcpjd2h26ys" }, "stable": { "version": [ @@ -14494,8 +14487,8 @@ "company", "prescient" ], - "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", - "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" + "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", + "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" }, "stable": { "version": [ @@ -14621,15 +14614,15 @@ "repo": "TheBB/company-reftex", "unstable": { "version": [ - 20201116, - 1605 + 20210418, + 1316 ], "deps": [ "company", "s" ], - "commit": "291c283c8a015fd7cbaa99f836e1a721f1e2c832", - "sha256": "0qwmjqcpi10lwsrppifjyr041hmgqb86nxpb970rb1m3n9p5rnk0" + "commit": "42eb98c6504e65989635d95ab81b65b9d5798e76", + "sha256": "0x5zhhy70cdhbark2vm364bazg2mbwlhy7123qyq02knsjdwwqrl" } }, { @@ -14775,17 +14768,16 @@ "repo": "nathankot/company-sourcekit", "unstable": { "version": [ - 20170126, - 1153 + 20210430, + 2155 ], "deps": [ "company", "dash", - "dash-functional", "sourcekit" ], - "commit": "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781", - "sha256": "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n" + "commit": "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c", + "sha256": "18pv1hcilj7kndr7a29jjskp21khh1sd0wy01h8y8y9mf70kikg6" }, "stable": { "version": [ @@ -15162,11 +15154,11 @@ "repo": "muffinmad/emacs-completions-frame", "unstable": { "version": [ - 20201123, - 1213 + 20210430, + 640 ], - "commit": "95e0845fdac5412a511ca15b12189ed9487a64a7", - "sha256": "1mz7dxa4bhay4h2kh1f4g4dwsfswidlhiy11s4a6l3zjqjj8hklb" + "commit": "860e5b97730df7ef5c34584ad164bc69c561db84", + "sha256": "026qzq1ddk1acqsgbsd2nk2g5gm9ml2sq31rnsdapzaj4rxa192w" } }, { @@ -15467,19 +15459,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210411, - 2120 + 20210503, + 1638 ], - "commit": "812204b647b1f45cc9d04d7d2f565061940f5e70", - "sha256": "11jpmswhx5x69wsrl5mg9wmxm49hqkdn2r9swz9z7hikk7485mx8" + "commit": "665a3105d5cbe6c44a270c1009e74d4fcad9d6d4", + "sha256": "163kfs042gq9kisra23g27zwval6jyl8yanr7y2s1rx185m2z6yb" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe", - "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd" + "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b", + "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj" } }, { @@ -15490,27 +15482,60 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210410, - 1355 + 20210429, + 1158 ], "deps": [ "consult", "flycheck" ], - "commit": "812204b647b1f45cc9d04d7d2f565061940f5e70", - "sha256": "11jpmswhx5x69wsrl5mg9wmxm49hqkdn2r9swz9z7hikk7485mx8" + "commit": "665a3105d5cbe6c44a270c1009e74d4fcad9d6d4", + "sha256": "163kfs042gq9kisra23g27zwval6jyl8yanr7y2s1rx185m2z6yb" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "consult", "flycheck" ], - "commit": "3184edd6ccf9cfb300511feb297b9012ce902bbe", - "sha256": "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd" + "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b", + "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj" + } + }, + { + "ename": "consult-lsp", + "commit": "c2d4a871be8f52fcfd24c3823382a983d9dcce46", + "sha256": "0qrillb8yg8lzilbf40y8c9jpf8jyhfdry2xp6d9mlfnkrdc1qr0", + "fetcher": "github", + "repo": "gagbo/consult-lsp", + "unstable": { + "version": [ + 20210428, + 1515 + ], + "deps": [ + "consult", + "f", + "lsp-mode" + ], + "commit": "12989949cc21a1173206f688d56a1e798073a4c3", + "sha256": "0g3bpi53x6gr9631kzidbv4596bvdbxlr8y84ln40iwx5j8w6s7p" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "consult", + "f", + "lsp-mode" + ], + "commit": "c4c0426b58946578ac1806a60258d2b275d5b524", + "sha256": "11lrnv5ssiwwdvdib05nz070yc3w9lfcqikgnl3bq8gbcrm9zjf4" } }, { @@ -15895,15 +15920,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210404, - 1716 + 20210423, + 1127 ], "deps": [ "ivy", "swiper" ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", + "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" }, "stable": { "version": [ @@ -16207,14 +16232,32 @@ "stable": { "version": [ 1, - 0, - 0 + 1 ], "deps": [ + "ivy", "swiper" ], - "commit": "33d709f5b73a68093ec9414c774844d5f4983aee", - "sha256": "120i4j4bw3v1ybcwrfpn0v7jphhk7hhlp738m60fck97p9lwfyy0" + "commit": "8cadd2e96470402ede4881b4e955872976443689", + "sha256": "1chfrzkqfsw1rlwkb3k7v827fwipg0cish22rr3sxxydxr7kysx5" + } + }, + { + "ename": "counsel-mairix", + "commit": "2ca80edc78250911b84e806f750d5474e7d93e86", + "sha256": "1i535x0xw9sj602l70sabg6y5mxzff5wlr0gpfqw9by5g7q79w95", + "fetcher": "git", + "url": "https://git.sr.ht/~ane/counsel-mairix", + "unstable": { + "version": [ + 20210422, + 649 + ], + "deps": [ + "ivy" + ], + "commit": "39fa2ad10a5f899cb3f3275f9a6ebd166c51216a", + "sha256": "1z5qn9k68413jr946dy53l02zk2b1qx6wl5w3gp0jh34i3b6yk2y" } }, { @@ -16547,6 +16590,21 @@ } }, { + "ename": "cowsay", + "commit": "1731327f28b2b47285a526b3ddd322d5b4a862e8", + "sha256": "0f2iq8jd2w5bcsv4yksyj7l50g9yvi28dhjx29dyxlywbj0nqz98", + "fetcher": "github", + "repo": "lassik/emacs-cowsay", + "unstable": { + "version": [ + 20210430, + 1625 + ], + "commit": "690b4d2c18bbe1a19169b03260b13c663f4f3d96", + "sha256": "0yhxmk07jnj0v40dxpywr1yhlj9srid0n6ds13y4zvih5prrmlms" + } + }, + { "ename": "cp5022x", "commit": "761fcb0ff07d9746d68e9946c8b46e50c67cd1d8", "sha256": "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl", @@ -17258,11 +17316,11 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20210404, - 1704 + 20210418, + 2044 ], - "commit": "45026a8655fb170004959f83b984589224cc156e", - "sha256": "0ij830jpkrp29rrpapmr9cglnjsdiycp3j620sd10s069wavbmcr" + "commit": "dbe83710d06bc39315f1455f6f21479f3747c0aa", + "sha256": "0nl7mh1i9pw039gd0ma6xrv499aw2vs3a1fm1bxz71hh13jmbd4c" }, "stable": { "version": [ @@ -17463,11 +17521,11 @@ "repo": "lassik/emacs-currency-convert", "unstable": { "version": [ - 20201017, - 1817 + 20210427, + 2032 ], - "commit": "0b12614956085444d73c47bc308c02cef0f64f97", - "sha256": "0abpkcn2mcg0c4nycannwz9skvl6w7zgvbh1rx30qw0wl0i5svdm" + "commit": "12805ea66aa8421de5eedda39d23f709de634460", + "sha256": "1p304k3s0iawsrlpndc9vrjxm1vv4nlkv0fb51x8pmcqw5ivy1dg" } }, { @@ -17488,10 +17546,10 @@ "version": [ 1, 0, - 3 + 4 ], - "commit": "2d7c5547e4b0da361b1533d2ff30e3f62f4b682c", - "sha256": "1d1mz0j51i09g2fn25iik7wk0cc9i6ps8qviik73fy7ivvxjn0vp" + "commit": "d82441c85773bec2bc41eb3c5778659f0be31a61", + "sha256": "0qi40qgya3k028sgmqhqslgdfkxq9iv3wpzhz6x87j0xqv32jd55" } }, { @@ -17690,17 +17748,17 @@ 20190111, 2150 ], - "commit": "8cef4203124241911f63dc171f5536665f324507", - "sha256": "0qm605xkr294yrmrkzsqq9bhdqyg9nxiwxwg1br6hzcj01wvgjqf" + "commit": "2f493526d09ac8fa3d195bee14a3c9df5e649041", + "sha256": "03qrqppfv3hjabq3ycinkq8ngx5cdx0kixwygk2z9n6pc9n3gsfa" }, "stable": { "version": [ 0, 29, - 22 + 23 ], - "commit": "3e470fcc3a4e9a33b66d5db6ab761c773888a1ea", - "sha256": "1fbi0ladg9c37hw3js72i72nza8hfjzm5c8w95c6bmzsl22lszwi" + "commit": "17670781083e3ccfedb1af4adcec614d4599eef9", + "sha256": "1yri0ay0p3p80h9ypq692470y1b99y4hk468zqlmfzb87yv8vv7j" } }, { @@ -17842,11 +17900,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20210407, - 1942 + 20210429, + 657 ], - "commit": "cd45635155aa6bae941156043217ce11531deca9", - "sha256": "1j2fr8gcy5pxzvaf3xh9z2k6bsdbw5z0a2ciys1zy8629sfx6w83" + "commit": "e4d1f2c76245fe9d0d07133a841e789d139df28d", + "sha256": "1ii3cgf4hlclwaraisxksv98mmhajx517i60p1cgd7vapznn2b6v" } }, { @@ -17898,8 +17956,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210405, - 1739 + 20210425, + 1933 ], "deps": [ "bui", @@ -17911,8 +17969,8 @@ "posframe", "s" ], - "commit": "2cb49bb2ec22a7d6d4fd403bd4e2cc468f512501", - "sha256": "0zymjabd6xpsdy3jr72rag8dmd7c1hsr1d973yjmvwj1awh9d0dd" + "commit": "e8fe25768c44ba005e0ff51a0d781ba1693e60a0", + "sha256": "1xjv8fdm7byrwfzw45zhq33s8nbkh6ad1fj04506x2dyiklpp0n1" }, "stable": { "version": [ @@ -18268,14 +18326,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210325, - 757 + 20210427, + 705 ], "deps": [ "page-break-lines" ], - "commit": "00f1dc84d3fbaf439d23645aa531eee59e28f688", - "sha256": "0afn7p79na8351gimmjrj2z4y3slyvsrinm8gx7qphflz2a13m2z" + "commit": "9983aa0838ce5a2219ef4b674e6b37de41b5b585", + "sha256": "1mi1jn5gknvs7xjgj2v4dcq7z1a7xknksgfqi66bby7cl6cr3hqd" }, "stable": { "version": [ @@ -18614,8 +18672,8 @@ "ccc", "cdb" ], - "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed", - "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk" + "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", + "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" } }, { @@ -18839,11 +18897,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20201227, - 2319 + 20210418, + 924 ], - "commit": "e5aad0510139cca42b37614d3599951ac0a28ccc", - "sha256": "0kp3ngmdwip7c4c9mvw1l04p13gjjfaigwdiaycbzd5jzlgdh6rq" + "commit": "81ef9d54000617ce98c40b4627eca64e076ff11d", + "sha256": "14l1m8jaqranj01fr040l2g560gbpbnd4sha4x4rcs2gc99sjqxx" } }, { @@ -19498,8 +19556,8 @@ "deps": [ "cl-lib" ], - "commit": "8f4c2358ac00e32d261f7e77b29af60adfdf0e41", - "sha256": "1grd6pzbirdq42qcwxis3q97cxlx6r3m20lqg0lb77vk6k75y619" + "commit": "b39c08c8d08d5c58b5b2a76214e0872984e1ae7d", + "sha256": "1hw6c7v6n229p8bz829b3nfzdg7afrxdn4rblgk39q1wl04v4cd5" }, "stable": { "version": [ @@ -20233,11 +20291,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20200430, - 1625 + 20210416, + 1954 ], - "commit": "95a411f6d4bb5eec4ef8fdbba9f038ddf60da81f", - "sha256": "0rz8d9lj2zbipz6cwrlw2a3z9y4rybbmz73h73l1i7fjg9q1kqm4" + "commit": "2a946c72473b3d2e4a7c3827298f54c2b9f3edc2", + "sha256": "1l63il1a0x7clb44wgir8zig0g7acanq830721ss7c2qwzg69rl2" } }, { @@ -20491,14 +20549,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20210301, - 2158 + 20210411, + 2315 ], "deps": [ "dired-subtree" ], - "commit": "92e7f77ec65c2089d75edb63ca312f55e3033be0", - "sha256": "0ad9r63jp257z95jb5537nbw64q6shdg4m5cmlx8asb7fp2wgsf8" + "commit": "79d8187da373b573a2d5385ca868553bb73e0005", + "sha256": "0b1f6ddhn8z4q790d370zhyqrn4mlqk7i6901sld52m14zigd72j" }, "stable": { "version": [ @@ -20604,6 +20662,25 @@ } }, { + "ename": "dired-view-data", + "commit": "4a3f94025604a6efc529891d4bc78293f0a11a98", + "sha256": "00gc7qa278nfyxhpx9h765m62i1g6z5ambcg0kgksl8k0571xqj3", + "fetcher": "github", + "repo": "ShuguangSun/dired-view-data", + "unstable": { + "version": [ + 20210430, + 156 + ], + "deps": [ + "ess", + "ess-view-data" + ], + "commit": "3bb4e135486b2166b81fd4f5684bea27fd13081f", + "sha256": "08xsnsqjqxkx53j207hhxps3d9m9cq7d441yi7rpiq9qq7qkpy87" + } + }, + { "ename": "diredc", "commit": "abaea37c792e6593665dc536e8803e0f591f7359", "sha256": "09wfizmqp2njb2xi532qixs5syccmadpc5bbm55i7xfqrr52d7zy", @@ -20611,11 +20688,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20210316, - 1841 + 20210428, + 247 ], - "commit": "dd945de3e0c66a164f003a96d473376b58fc6dc7", - "sha256": "1d4rdrc827nnb9p56la1sd9nzwjbxbnr8fgmcgardlz3qw97j3q1" + "deps": [ + "key-assist" + ], + "commit": "7651b1dcc98cbc37f5e4d0992a27d1f96279900c", + "sha256": "0y59z1651g0jsvrzjq4nx5i7r1rqrhgas6bplwlw60sb6ygqijpy" }, "stable": { "version": [ @@ -20680,14 +20760,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20210117, - 1213 + 20210419, + 1851 ], "deps": [ "dash" ], - "commit": "381176f301dea8414a5a395c0d6546507838f6ce", - "sha256": "0hmj5m3wiqwdmjzxbzkf4sg8gaswdv5rv6jqgqvz3h9sm17fnps7" + "commit": "4b94393a9adf677c7c037215e233eef5fbca553d", + "sha256": "14whrhi6hgzadrw9z9k2sh2800483xs1h611avz4x68c8d2jfj5k" }, "stable": { "version": [ @@ -21661,14 +21741,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20210410, - 1249 + 20210417, + 1315 ], "deps": [ "s" ], - "commit": "67a219425d1fe9a29ad3beae0677d5ca0047bd53", - "sha256": "0irqfn5cxb8gkxvdmikmjz2j9km6k7057r7yw5aypgaxm89a404x" + "commit": "c14485468439056bcfc6a0862fe35fa8d787d34a", + "sha256": "198vqmhyasilxgz2lwn7y3a0g885ws3pyhvvj80wy7n4ml8mfdr4" }, "stable": { "version": [ @@ -21810,21 +21890,21 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210330, - 1522 + 20210501, + 1628 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "669cac3839271f84ccfed06eddaad206224ca831", - "sha256": "1p5w5qbz6dgsk1dcy4fspdqwh03h4cxs175ng6zm6590dk0xs5bb" + "commit": "12f1ab19b9d1ad8bfea2986b60c527be0425c9f1", + "sha256": "01xh5jdy7csa09i0lz76xqh6x21dklhmmavvvwba9mzq387nijp3" }, "stable": { "version": [ 3, - 0, + 1, 0 ], "deps": [ @@ -21832,8 +21912,8 @@ "dash", "shrink-path" ], - "commit": "b44955841a301f4930b054e912fa4c1a700d426d", - "sha256": "08m75rl5i812pa87zcsjvb4mm3jjhpwzgx9mf2m7sxj807airz5d" + "commit": "92f141f91a87664104ffb17177b01b9fcc706744", + "sha256": "0flxjyzccqv8yyk6iaxmcb3m47khy6ck3vffnfdkqs5lckm9c31s" } }, { @@ -21863,14 +21943,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210322, - 1750 + 20210503, + 1730 ], "deps": [ "cl-lib" ], - "commit": "4199e74db170200995ee8dfbb55ffae004d6e219", - "sha256": "0vfhnywww560rf0b7h2gc9w4x4738xwq12c8qi9y267110zg62mz" + "commit": "cdfbf878bae788b8d4a983c19e3ab3b1d39cfdea", + "sha256": "1swlfbsrmjjzfybl17jvnyqwcxdabqp33zda1cdsdy6hgrmrm9x3" }, "stable": { "version": [ @@ -22114,11 +22194,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20210220, - 1358 + 20210502, + 1743 ], - "commit": "b5e50ed1e30ee054fb6a0827e78382b038e83c46", - "sha256": "0bdlcvx95r0hwxpvdfac6xjcs59jn4mi29yny7bjz3x463czidcy" + "commit": "0a76928fdb49d1cf65b10c706ae0e1bbc779effb", + "sha256": "0a1jvcgzrp38xwa3rx7h7c5j5gcdgncfjgsjz8vcfnhckcj5zmzn" }, "stable": { "version": [ @@ -22197,6 +22277,21 @@ } }, { + "ename": "dream-theme", + "commit": "21d32adebc711ffcff2633c5ec4ba4fe58dcb0b5", + "sha256": "1lbfassmf2b6ibi3szp5p1q57nabj133bgwfnlf21svhb85zax05", + "fetcher": "github", + "repo": "djcb/dream-theme", + "unstable": { + "version": [ + 20210419, + 605 + ], + "commit": "0c27f05544b90e41338f79ea923044b358a323c6", + "sha256": "1dnfisa6smrnjxm6yvb3w57skz4i8akigvzr8lsh1zr7by821wl0" + } + }, + { "ename": "drill-instructor-AZIK-force", "commit": "fb5ee8a113b98e8df8368c5e17c6d762decf8f5b", "sha256": "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f", @@ -22377,11 +22472,11 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20210307, - 2140 + 20210423, + 745 ], - "commit": "37529fc7a98564164c87103e5107a6dca32b0e44", - "sha256": "1h2j25b6qayydl841zwbh73fw1177xgskrqm27cqmfx0bcpx7qq3" + "commit": "9714f2c5f1c9b7c21e732df8c15a870a88caba84", + "sha256": "1aygba84si1g8kx12hscwa6m3c3946r0vbk93p9izib9fkbgngw6" }, "stable": { "version": [ @@ -22467,8 +22562,8 @@ "popup", "s" ], - "commit": "8bc195000e17ce6c72755a8fb55ca0fcd36add76", - "sha256": "0dc31yy4r41nwwv57dzbd6zgwddizqh4q4qagpqx645l509s7k7i" + "commit": "8f70acbe164553b225476fed55019ecddcf0bbd6", + "sha256": "08g417yf4byhhldvcbkmhrlm7iaylkv0cbcg1c701dyfngxn01y2" }, "stable": { "version": [ @@ -22512,17 +22607,35 @@ 20210213, 757 ], - "commit": "65404cf973aa7ffc0e9dd7d05c9dd3709c7db2d4", - "sha256": "13v4i59f0m5syjz49g5xh4nnr7k2wck0nf0pc5hgsv6g61gkpwvj" + "commit": "07ca7ccf8ecaad2fb153fbd2ccfda3aeb9d3d5e2", + "sha256": "0kw3bvzvwn6hfa981qn13b3lmm74dwhrllssbs1wyf1fsx0x77ag" }, "stable": { "version": [ 2, 8, - 4 + 5 ], - "commit": "b6a3f66fb15378fc7170e94778f4d2c0b142ad92", - "sha256": "1p3r197cfb96675n2s7mbggndqspcxxmk9lkncirixm3k7ww36l1" + "commit": "e84ba5230f6afacb12f022937138a752f1c301b6", + "sha256": "0a1jj6njzsfjgklsirs6a79079wg4jhy6n888vg3dgp44awwq5jn" + } + }, + { + "ename": "dune-format", + "commit": "9158dc00e15f573e09d311f1389413d6168d7e07", + "sha256": "19kqy05hnzywc8hspv9vh5b7rcgv23rhzay5pcixsy464glxhnj6", + "fetcher": "github", + "repo": "purcell/dune-format-el", + "unstable": { + "version": [ + 20210411, + 2348 + ], + "deps": [ + "reformatter" + ], + "commit": "22af9fcf75eea577a39fc315fd9bcaa709fb4e1c", + "sha256": "0r0329x8r55ivnc6n16hi3rw3556xza5sdw2a06vk17pyiaskf1z" } }, { @@ -22572,11 +22685,11 @@ "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], - "commit": "66d92f592b35fd168f23d7c58d698a1ed2dcaa0a", - "sha256": "1pfz1wwrdpdkd29309dryy7ficl1h1rfmgv7fbpy9p33vs9mdi9p" + "commit": "61c5718ba64ace4c9e29de18aa2690ecc3f0f258", + "sha256": "14nd544ispfj165ys6lv9bpy41p9j8kf4lwy73qigr4c7qlf43by" } }, { @@ -22587,14 +22700,14 @@ "repo": "harsman/dyalog-mode", "unstable": { "version": [ - 20200822, - 1536 + 20210413, + 810 ], "deps": [ "cl-lib" ], - "commit": "f42e49b9dd7ab41f08361185cc25509f19b949a8", - "sha256": "1cqaa12pycwiv4cj100n8326f3yg59xgww3lk2l6x7841n7g7szm" + "commit": "697a84194766708d2607e8ba48a552e383c6523e", + "sha256": "1afcfqf9z1d67va9cdi2fxpr1l1nrgkksxh5g7h8ggqkml2ks8hn" } }, { @@ -22654,11 +22767,11 @@ "repo": "zellerin/dynamic-graphs", "unstable": { "version": [ - 20200902, - 1238 + 20210430, + 352 ], - "commit": "ba3fdf2cf0e5e1e952a1961a03dfb7f61a4ab0e7", - "sha256": "0cyngkba93swhgklh88r5czlvimc0pa9blg02cwz3mjwj5r558bl" + "commit": "f7239e381de56af5d6ff8e0d6ab31a78d3e3da58", + "sha256": "1v3p0ycm3yh8gvpbr96ml89470piam25qyhrwrkin228k17949br" } }, { @@ -22701,6 +22814,24 @@ } }, { + "ename": "dyncloze", + "commit": "4725983cb1d5d2c5ad1dda162050973516196323", + "sha256": "173z9skkmpmjw0h5z1dcdlplihjz9yszn1h20p53w9sicif58i1c", + "fetcher": "github", + "repo": "ahyatt/emacs-dyncloze", + "unstable": { + "version": [ + 20210405, + 212 + ], + "deps": [ + "dash" + ], + "commit": "38aac1a38017a707b4c539a7932cc8f6cd8f1a77", + "sha256": "05i0a1680a79xvawa93iip10ln6bkrnvzqh3a2lica4hfx0hsi0x" + } + }, + { "ename": "e2ansi", "commit": "5e655a3fdfae80ea120cdb2ce84dd4fd36f9a71e", "sha256": "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94", @@ -23183,26 +23314,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210407, - 2146 + 20210503, + 1412 ], "deps": [ "parsebib" ], - "commit": "bd1c9dcda79f734f6302e7c81ee0f13106a3a9e1", - "sha256": "1bd6hqiq178h1z8x0hjyrxg6l0h2inkzmrg6fadfj3ly1hbs5157" + "commit": "3142de8d64789c611e553667cac3bb84428d004c", + "sha256": "1xgpdw0sxl2c9dn6x6fk0rqpqlqxsjlj0vyag611blj600br7dqr" }, "stable": { "version": [ 2, - 30, + 32, 1 ], "deps": [ "parsebib" ], - "commit": "6a3351c4bee70517facf0eac457a17a1efc21144", - "sha256": "0ppp6a8qyllh1kjrh8fa8dvhv98wnq0w742mzh8gahkjbrsjdwcj" + "commit": "3142de8d64789c611e553667cac3bb84428d004c", + "sha256": "1xgpdw0sxl2c9dn6x6fk0rqpqlqxsjlj0vyag611blj600br7dqr" } }, { @@ -24031,8 +24162,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210410, - 1942 + 20210430, + 832 ], "deps": [ "eldoc", @@ -24041,8 +24172,8 @@ "project", "xref" ], - "commit": "8a5598d06a0539492ec30fc90201a263ea6a03e6", - "sha256": "0jlqskw08zlqhckhz64w2c0a14kk100lmnadwf4li5h2b2clmr7l" + "commit": "3f1ad3bd1bf6c2ccef61c3ca606ef69962ae6e55", + "sha256": "0532fd44lb913qpx6h6hdmk1gsmj3klwh2l41vkwc7vwqsb0rg23" }, "stable": { "version": [ @@ -24099,28 +24230,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200726, - 741 + 20210415, + 1207 ], "deps": [ "eglot", "julia-mode" ], - "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9", - "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4" + "commit": "49f170e01c5a107c2cb662c00544d827eaa2c4d8", + "sha256": "1bmp517zfsspxlj0k67q15ladiphjha45zgnq3djs631mvr9bfaw" }, "stable": { "version": [ 2, 1, - 0 + 1 ], "deps": [ "eglot", "julia-mode" ], - "commit": "84cff9d6ef1643f3eac6c9d620cc1e380a9847d9", - "sha256": "1g3k3ym0hx97dk3sv1kz3vq0p1s1zw6r34ynhwm31y954miwyvm4" + "commit": "49f170e01c5a107c2cb662c00544d827eaa2c4d8", + "sha256": "1bmp517zfsspxlj0k67q15ladiphjha45zgnq3djs631mvr9bfaw" } }, { @@ -24192,8 +24323,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210330, - 1531 + 20210429, + 1630 ], "deps": [ "anaphora", @@ -24204,8 +24335,8 @@ "websocket", "with-editor" ], - "commit": "608c3cbfd58a626aab3cea6aa5b31d8a4032cf10", - "sha256": "103sg5wzzr7zp0x181nardc8r63cyx1f7s1l5drig5dwzp4dnd60" + "commit": "d33e04da06421813cdffed6af18e5379f7399c07", + "sha256": "0b365lx7sv95k52w8k6zyz5nbs7v7br04mhn9r5xm126a8gcb285" }, "stable": { "version": [ @@ -24371,8 +24502,8 @@ 20200912, 1653 ], - "commit": "84dd1837f9ac80a329ab0c2de6859777f445f8ff", - "sha256": "098x17hg9dc28s7g50mxhv6m6fgch1xp1di7rplkg7w1dfphpc5a" + "commit": "d76ac84ae9670de7bf7725b362cafe86688771f9", + "sha256": "18x4qj75bh45b0dirp3jpw1zqni8xfqqh1q13q6b5ncy1nhvm4gl" }, "stable": { "version": [ @@ -24702,11 +24833,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210323, - 2234 + 20210416, + 1333 ], - "commit": "25531186c10b74a10ee24990f9e967296cc70342", - "sha256": "14lk3whvj45ilb7mv60dfpxhbw3jsddglz0mq5vhdgy6n8wkcpa9" + "commit": "6608e0392b46324fc09a5b5f4457c15ac1394f80", + "sha256": "0mr6xx1bwpfn24x6vbrzd482scz6mrdmgdrk03ixwlspaqmancdm" } }, { @@ -24751,20 +24882,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20210410, - 1721 + 20210425, + 2011 ], - "commit": "635744890ba2d55d9569a66cb72b13870418a513", - "sha256": "1hlsnd9ppw18p0kbjgf2g5xwikipjkzzqcvql63pn9ds5zr1gn6q" + "commit": "7256b1b953fd8bf09acc840354e3a28e63fd1ba6", + "sha256": "0491iq2ia76lm4sn9q4ks74qfn4wwzrj66mz4hck3962h8iabydz" }, "stable": { "version": [ 0, - 8, - 1 + 9 ], - "commit": "c4f9b7ff4d12c59cc80b4a67f856601ba7cff2cd", - "sha256": "19s45hdhcg5l608awfxvmhd61xzp7dd5pvviv89xzzksx74l1188" + "commit": "70612cead889bb763f7b353aa2ecf67577da344c", + "sha256": "1m067l3wf7dx2qya4mw1ngvl266ln26ngac3vkswxj9l3s69mqjn" } }, { @@ -24894,6 +25024,21 @@ } }, { + "ename": "electric-cursor", + "commit": "639747f3e5b2f8753478826a69b27727e1738d04", + "sha256": "12rlgyp9r4dgp0mid95rx0p5ygpxjzhvlxkmidlzakyirc1i0jlw", + "fetcher": "github", + "repo": "duckwork/electric-cursor", + "unstable": { + "version": [ + 20210501, + 2107 + ], + "commit": "e20c6f6e85c020e472ef05b12af7a12bbae65dbf", + "sha256": "0x1bhpb86bhkyyg28w81jw124l6zcbbqmf8i3fx28sc14q4y1gsd" + } + }, + { "ename": "electric-operator", "commit": "906cdf8647524bb76f644373cf8b65397d9053a5", "sha256": "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2", @@ -24932,11 +25077,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20210313, - 1118 + 20210430, + 1714 ], - "commit": "fb1437a3386f55440abdbe7c107c86e5b028bdc5", - "sha256": "00pmp1596p24i7pasmm080aly8ifinp9hbvia2l4jf8mbfg2ndlw" + "commit": "800e09af7b0cd5d78d22f857dbce10fb080637df", + "sha256": "0ykndvbbx8rvaxppmkngyrzp1x6fghj9xv55i847kpzx1c6gs4fc" } }, { @@ -25121,15 +25266,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20210401, - 100 + 20210430, + 846 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "2b2aaf2f3b92e7c27827e0f280598cb52db558e0", - "sha256": "1nffhs0mnc0j87wfk6siw3zaj6p1dm1hxz55p54v9895x8c5bakv" + "commit": "5e17d4280f5f8019c3f8962a710c9b3e633f41ff", + "sha256": "0kv6svwg1h0wcj7z89xs20a9wns7v67af9m9rir3m8f47iyy70gr" }, "stable": { "version": [ @@ -25153,26 +25298,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210302, - 2051 + 20210429, + 1337 ], "deps": [ "elfeed" ], - "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0", - "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd" + "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea", + "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra" }, "stable": { "version": [ 0, 7, - 7 + 8 ], "deps": [ "elfeed" ], - "commit": "f59cbc38c83007e160722347c8cb5438d5fe13a0", - "sha256": "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd" + "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea", + "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra" } }, { @@ -25866,20 +26011,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210325, - 1219 + 20210414, + 208 ], - "commit": "2d50b2861ab0ba6a2a518de44823869fb4b14dfc", - "sha256": "0x0sfim9l5xl4fysy61w7migf504ynnmnraiwisdxl9bap7iraw9" + "commit": "944c79d654739ae83c8003b2b483e393589eee3f", + "sha256": "1i1f8l66arwsl6yh9wfn63lnjnb4ifrqhhvnakrmhqckxrs009lm" }, "stable": { "version": [ 2, 1, - 4 + 6 ], - "commit": "47f194c77830946c66bc6ffecdecadc5a3191402", - "sha256": "00c33b0k5rw66xbzv1ggz1ai1yaqa705vqb25b54sirwr0s37wly" + "commit": "abc8d7b7de12e4eb06efa2dbb1cc77a714f14479", + "sha256": "0p5jbdbl7bmx94fj7qyqqsy0clvkzjgczbgvhx4ay9wyq83wdaav" } }, { @@ -26242,11 +26387,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20210228, - 2103 + 20210426, + 1933 ], - "commit": "de9d42c86fc3e71239492f64bf4ed7325b056363", - "sha256": "0778izaq1hjcc9i7d0v3p9xb08y6bwj9brcmpyd2yj3lfajbhxdx" + "commit": "95fe33007c663bc22ac60b6969551e07ce6cfa10", + "sha256": "0b2757m8zgdnb8vr21593ih5bq0cz0asy0i1x6sjr6mpd3sgysf9" }, "stable": { "version": [ @@ -26266,14 +26411,14 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20210303, - 1507 + 20210422, + 1053 ], "deps": [ "cl-lib" ], - "commit": "99997af93310128cc95b8ddceacb448daed2403a", - "sha256": "03syfvwsbrrmghdav3xkmpjvdfh1q1qr880a6f6wkri9iazg021g" + "commit": "64ba2e3f3096f48928f7be06ed690069b96add22", + "sha256": "1cjzrckbxcl1ahhnnk78778yxsrhwb725cwjbx6i8y6jxwbddpqj" } }, { @@ -26563,11 +26708,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210411, - 1954 + 20210430, + 1740 ], - "commit": "a005eef82a63950927a68a5ef79b33d25245687b", - "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg" + "commit": "05aa11bca37db1751c86fe78f784741be5b1a066", + "sha256": "1nnrn6dd248l6ngvgjjniqkahlwz45y3n50nw555a67pmi88grh9" }, "stable": { "version": [ @@ -26593,8 +26738,8 @@ "consult", "embark" ], - "commit": "a005eef82a63950927a68a5ef79b33d25245687b", - "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg" + "commit": "05aa11bca37db1751c86fe78f784741be5b1a066", + "sha256": "1nnrn6dd248l6ngvgjjniqkahlwz45y3n50nw555a67pmi88grh9" }, "stable": { "version": [ @@ -26761,27 +26906,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210407, - 1604 + 20210503, + 1629 ], "deps": [ "cl-lib", + "nadvice", "seq" ], - "commit": "f79343bf03f6ece09638ec27eeb831c0abe59667", - "sha256": "1ki2hd38fxvd4112bhgfifr3raar3yz345h9hya7dn8aw9hscr14" + "commit": "b0173b6b4c5b66a4706cb82c9b50a179bf159a0f", + "sha256": "1scppj8wkiml4dgsg4540hdd8mv9ghcp2r17b647az0ccxwp73qm" }, "stable": { "version": [ - 6, - 3 + 7, + 1 ], "deps": [ "cl-lib", "seq" ], - "commit": "a2738fe1a9013f641eeba31300e828e88b468b14", - "sha256": "0r2krmrhmwqcw3sdmy7z9rw4l222ja4jz8an8av11qjhpacr8v98" + "commit": "e1247af518d0d983d889d5ba60bbde38431d0c68", + "sha256": "17ny15p26nl29k2jis4kslh85cryljb151p71w5886rf3abr58pb" } }, { @@ -27486,6 +27632,19 @@ ], "commit": "99d3a4b6973d5b09864e0af7425a61f99c19b90a", "sha256": "0k6isn6szbwc6jc7kzfq82p8w737z7iyn2yi9aqf6j54a6xa5aka" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "dash", + "s" + ], + "commit": "0d5d80dd0c76f0d46a3565d940a2b0ed955dfd0a", + "sha256": "0bfab8yh2r08vqgnk81avw9n46fda5jb4fcm0h2y8f1lv6jgnfy0" } }, { @@ -27821,24 +27980,6 @@ } }, { - "ename": "erc-status-sidebar", - "commit": "29631de8ec4140a8e35cc500902b58115faa3955", - "sha256": "04qh70ih74vbavq7ccwj1ixpd8s3g8rck9bxv6zhm1yv34bslw5d", - "fetcher": "github", - "repo": "drewbarbs/erc-status-sidebar", - "unstable": { - "version": [ - 20200907, - 1307 - ], - "deps": [ - "seq" - ], - "commit": "87210a3ccc16a86e6b5992744b68daabed3b2d11", - "sha256": "1gb8lzsi3clbass40sllfwf8akzlgb2k93wqlw1lf4gfb9shx08v" - } - }, - { "ename": "erc-terminal-notifier", "commit": "f2ba978b1ba63fac3b7f1e9776ddc3b054455ac4", "sha256": "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c", @@ -28152,8 +28293,8 @@ 20200914, 644 ], - "commit": "3e079614f2b4810ff5920ae69a389da91c855217", - "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0" + "commit": "26d473648853255a6a46d9dedff66df7f644c42f", + "sha256": "18yz278724ydvkdpcwiszfx4lg40bqbwq78268pr5mg0wif0y4q6" }, "stable": { "version": [ @@ -28177,18 +28318,18 @@ 20210315, 1640 ], - "commit": "165f8fe9354aaf23c166b5c54f352b3024da9bd3", - "sha256": "102dbzpfcysq7pinli2jcdff1mxh2af0s79qmia1wfm8jmzh0zhf" + "commit": "ed2aee59bd43ff1cd0ac29a9b4bc2ecd5ba6ebdc", + "sha256": "1148di7jk8ayq07ck4zd0wxrw90iigrwzg2j9xmjh8skddh0yihd" }, "stable": { "version": [ 24, 0, -1, - 1 + 3 ], - "commit": "655bd1a27673720bcee187e9fd9f07d739860ad3", - "sha256": "00k0x24diq2z24582bjk65c07ky1kf5h1zihs06ndl782i5cqjfa" + "commit": "dd36117cca61bfd2554bf7980b170f76bbf92278", + "sha256": "0sq6kzs8zsvv9anmrjv85sy2m1yvysjfn9fmyf0m7ffx648lwv4n" } }, { @@ -28199,14 +28340,14 @@ "repo": "k32/erlstack-mode", "unstable": { "version": [ - 20190812, - 1117 + 20210419, + 1917 ], "deps": [ "dash" ], - "commit": "d0a67fb6f91cef02376e71b4b4669b071ebd9737", - "sha256": "10b77q2qwwlvj56g9yd6d9lkmk184mjf6x3067vvqs40xiv9bsgl" + "commit": "ca264bca24cdaa8b2bac57882716f03f633e42b0", + "sha256": "0541q21srscy8x7w4f8vbag1nsjksv9i1wi6sq5xjqnrl0piyv4k" }, "stable": { "version": [ @@ -28757,11 +28898,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20210223, - 936 + 20210429, + 413 ], - "commit": "eeace52ebb2c730f3665fb235017cd57dc6050a2", - "sha256": "1anlan2ldvx0qzj44dhb44flcs3h0d57v79qzn21jpy4d0y0m3kq" + "commit": "32d2568ebeb42553a30dda77e03c0e2ec8854199", + "sha256": "0my99472i5zdlhcv95jhfv58ph28gaw159p2llp4wv13acryin56" }, "stable": { "version": [ @@ -29040,11 +29181,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210403, - 520 + 20210414, + 2354 ], - "commit": "b501beec408b66e2f2a8c4f3117e0c84ee1b0262", - "sha256": "03rd1qp9d8br36cynxm73ajac0f2kyyjnffnciix3vf7w5lpsily" + "commit": "1782c6730a8fadcf4c162c7aac4329d4e28259b6", + "sha256": "0whjmvxxpx55cndngmky04kbfhcxamb7h3nhaclklm5sjlbc16qa" }, "stable": { "version": [ @@ -29245,8 +29386,8 @@ "cl-lib", "s" ], - "commit": "fa1413737b8d5173a4db8c18d8de9ac798365d53", - "sha256": "1barvpcxw9v0gy16drcrmq2izmasm0icahnzrpyzdfnvcmvp3al7" + "commit": "5169dd7fc8765a7377b0ab93aa63b7f0f934689a", + "sha256": "0mn9pffw7kzdzwv3jkhygdkmlqax9fsrbjznbck90ydiv095fmp6" }, "stable": { "version": [ @@ -29283,10 +29424,14 @@ "version": [ 0, 3, - 5 + 7 ], - "commit": "68efaa4a7e9841b9bf2b80ea4841ee07d7bd68f9", - "sha256": "16jn404vfmsvm12wrf8iczqlgdf2iycbxrvalvzxnm2gr5dfzp7z" + "deps": [ + "cl-lib", + "kv" + ], + "commit": "9f96449f6059cb75491dc812ddeb1b6200ec6740", + "sha256": "1xzxmgsg0j72sf1vjh9gjswz3c29js0kqhm7r3jrqrh3a5agdnml" } }, { @@ -29374,8 +29519,8 @@ "f", "xterm-color" ], - "commit": "05fdbd336a888a0f4068578a6d385d8bf812a4e8", - "sha256": "0ln1agcgr607n5akm0ax659g11kfbik7cq8ssnqpr3z7riiv95dm" + "commit": "c9cfccef03e730f7ab2b407aada3df15ace1fe32", + "sha256": "1ip1mcry2mryr3gzina16c7m2pw71klx1ldbfv8w7rv8fsx2dsma" }, "stable": { "version": [ @@ -29630,15 +29775,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210411, - 2050 + 20210424, + 1855 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "d998a8195e404b01e2ea62a455c3dec74d0823c3", - "sha256": "0d4839nqdhr858nzb2cqj3wak2g8ynm5l8ak3467p1k9sn4d487a" + "commit": "adb551dc36492c74ea6c2a75a85465c6bbbc1cf2", + "sha256": "090q0dcy019clrs3nkp68ljcfk1dggzlhl7x8dsvd1bb6a8phn67" }, "stable": { "version": [ @@ -29832,15 +29977,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210401, - 1012 + 20210424, + 2326 ], "deps": [ "annalist", "evil" ], - "commit": "f2be91297029ae002d15e23510f9f686d848d7a8", - "sha256": "0ikb3ic84bxj9rzvkjhcvzgiwjpwmhfi6xli5yh03li7qdqsg5j5" + "commit": "09b165d4c2ecac66224f674966c920c25d20f3f6", + "sha256": "1gj4ds110kx10bgxxflin7ghj3bcyll8pv2h4cqkp9wv79f7plam" }, "stable": { "version": [ @@ -29949,15 +30094,15 @@ "repo": "cute-jumper/evil-embrace.el", "unstable": { "version": [ - 20160519, - 1829 + 20210418, + 2038 ], "deps": [ "embrace", "evil-surround" ], - "commit": "4379adea032b25e359d01a36301b4a5afdd0d1b7", - "sha256": "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a" + "commit": "464e8ec52ff78edf3c9060143fc375f6ce5f275f", + "sha256": "1bga1idxj8mg5xpl7k4ymwaniyba2x13lf8yihyh713s5238fdmd" }, "stable": { "version": [ @@ -30411,13 +30556,13 @@ "version": [ 2, 3, - 10 + 11 ], "deps": [ "evil" ], - "commit": "b24a7232a2de114cb09774111c2ff8462451894f", - "sha256": "14nrc46290q54y7wv25251f2kqc0z8i9byl09xkgjijqldl9vdxa" + "commit": "a0c5bd1fe89119b94ffb0a266d2969434e7ec4c1", + "sha256": "1990g1b6v0i7jaiv35bdssdn601rjifzg4fy9s3sxk0drqm1xiss" } }, { @@ -30657,14 +30802,14 @@ "repo": "mamapanda/evil-owl", "unstable": { "version": [ - 20210408, - 32 + 20210416, + 1700 ], "deps": [ "evil" ], - "commit": "949ab1331ed9ff65d04930b215e033ef19f3696e", - "sha256": "1nkqxpzczlpw7yn8jjr9lqs2izdbw86x7nz0y67x9yy49aj19v6q" + "commit": "a41a6d28e26052b25f3d21da37ccf1d8fde1e6aa", + "sha256": "15yp158krz3znixgxgcblmsfh0dbxc6bf7fig8757vnmjcwlpqrv" }, "stable": { "version": [ @@ -31155,8 +31300,8 @@ "deps": [ "evil" ], - "commit": "d998a8195e404b01e2ea62a455c3dec74d0823c3", - "sha256": "0d4839nqdhr858nzb2cqj3wak2g8ynm5l8ak3467p1k9sn4d487a" + "commit": "adb551dc36492c74ea6c2a75a85465c6bbbc1cf2", + "sha256": "090q0dcy019clrs3nkp68ljcfk1dggzlhl7x8dsvd1bb6a8phn67" }, "stable": { "version": [ @@ -31186,8 +31331,8 @@ "auctex", "evil" ], - "commit": "5f0d6fb11bce66d32c27c765e93557f6ca89cc7d", - "sha256": "1856liiy75w3r6s5ss6hnzcrypymfp6fpnw0i6ybrw351fkw4k9w" + "commit": "c0b8a9215bba6844487f2a678ea85a0a6e1da825", + "sha256": "1vkdq4cf4q3ngdx0f6yx9mgrjm63i8bx7hxa73d9gkbbplkkkjw5" }, "stable": { "version": [ @@ -32140,39 +32285,30 @@ "repo": "tumashu/exwm-x", "unstable": { "version": [ - 20210411, - 1120 + 20210419, + 950 ], "deps": [ "async", - "bind-key", "cl-lib", - "counsel", - "exwm", - "ivy", - "swiper", - "switch-window" + "exwm" ], - "commit": "7bc7a930998117a714cf1f2940dcab12bcac9b73", - "sha256": "1zs2sixp77q6dd9pdsk3w4y3nj1iz8j74q7nn5rsdmk0ja8i9sws" + "commit": "2ab026f407b011a8e8380c889990e85e69cb3a4e", + "sha256": "05jilbhpbbqbgpxhy11yadmal4gsh8bh1fffxkz8b5k8dpajc634" }, "stable": { "version": [ - 1, - 9, - 0 + 2, + 0, + 2 ], "deps": [ - "bind-key", + "async", "cl-lib", - "counsel", - "exwm", - "ivy", - "swiper", - "switch-window" + "exwm" ], - "commit": "88c8b70be678ce0e9fa31e191ffd3f76bbfee61f", - "sha256": "03l3dl7s1qys1kkh40rm1sfx7axy1b8sf5f6nyksj9ps6d30p5i4" + "commit": "8fd00a0ca586e1c80d08209919f1414b448bc228", + "sha256": "0h248mma7kky30jr9bbhmp95wchl2cx5p6kh0gxmzpbc247dn2cc" } }, { @@ -32447,19 +32583,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210331, - 233 + 20210427, + 2150 ], - "commit": "ef7efae7a86979e9267f9a600ef1482e0f6a2aa3", - "sha256": "0dl9i2l8186ir56v9vx32rw30pj9xgd7zhf24y6sqfjxn80hkdz8" + "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf", + "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy" }, "stable": { "version": [ 2, - 17 + 19 ], - "commit": "2db5c559ca7356189083fb698a053bb1fee922a9", - "sha256": "1gk2dxmxv0sgkng7zgakz0gq9i0zh3wrwzsi785s338vjyypwm3g" + "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf", + "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy" } }, { @@ -32926,11 +33062,7 @@ 1942 ], "commit": "59ab02344f569069b9899a3a5ffdca4a30093df4", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 262 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 704 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 1035 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 2286 ms\nerror: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503\n" - ] + "sha256": "1vh6n2sg89g43sidymk22wjzjh71wgbajshhh7y3f6zf8xs94mmz" }, "stable": { "version": [ @@ -33072,9 +33204,20 @@ "ename": "filetree", "commit": "b4714ecde7200de934165d8e3b7f94ab5d711fa6", "sha256": "0d8ryxq7xa95av36fc25dxrrdxbm69iik22q52fjl9pzivrzlz58", - "error": "Not in archive", "fetcher": "github", - "repo": "knpatel401/filetree" + "repo": "knpatel401/filetree", + "unstable": { + "version": [ + 20210405, + 524 + ], + "deps": [ + "dash", + "helm" + ], + "commit": "1328a624847886f8f92dfaf13fb6d73ba3d5d7a6", + "sha256": "1zvv3h6c488v8wqnw71inz4s6ag3bnpnsqm1k20n9kwsfqysr1rf" + } }, { "ename": "fill-column-indicator", @@ -33233,11 +33376,11 @@ "repo": "ShuguangSun/find-dupes-dired", "unstable": { "version": [ - 20210204, - 49 + 20210426, + 835 ], - "commit": "3c9783589e43717b682c9e37dd229839735402e8", - "sha256": "1wd7n08cf1mnd7czca3mcsfyh4nlkl36arhc3lnh7lzi98nyd0zv" + "commit": "af56f75afc240d8121c8944a614a272be811830c", + "sha256": "151c9hvsb5bnprn7kf3g23igazkw9l7xvzizikifizfabay9wi2h" }, "stable": { "version": [ @@ -33256,20 +33399,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210323, - 118 + 20210427, + 1205 ], - "commit": "595c6ac9d5e5b2dc138b472a40bc85c7f20a56c0", - "sha256": "1fqg4jg3x7vrcap46vbncazzjaj6yan57rdmi2n8xbhmw3jcc8z9" + "commit": "3bf010d2be073d499de5ffdaa98f48bf8a3dd21e", + "sha256": "0zpckqcx4fbjni1f0c6wzi1356ab06j33himfgkhvyl1bn4w5jna" }, "stable": { "version": [ 6, 0, - 3 + 7 ], - "commit": "6a6328c59a96b09e771cbcc5f4188f20d0757aca", - "sha256": "17l5b9nibhfymyndppq0avbdr2rh20527fyr1q5i1c3xkn4d6wvp" + "commit": "2f44af320b4e62053c5b6b523f69a8f16eaaa1c9", + "sha256": "1qkfijqr839y605ssyalr2v9n6b86hr64mxikc96lx6nzdyjyyl0" } }, { @@ -34346,14 +34489,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210213, - 1822 + 20210411, + 2342 ], "deps": [ "flycheck" ], - "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508", - "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh" + "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec", + "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk" } }, { @@ -34895,15 +35038,15 @@ "repo": "atilaneves/flycheck-dmd-dub", "unstable": { "version": [ - 20210329, - 1926 + 20210412, + 1608 ], "deps": [ "f", "flycheck" ], - "commit": "0799b16872829405e9da4e806ffffa42ad51fa36", - "sha256": "07jip6x59h439m714kx0fs6xfqi9p7yfl47js2py0q51hr51k2ij" + "commit": "818bfed45ac8597b6ad568c71eb9428138a125c8", + "sha256": "19xgj1z1b6m30syq2ps99v1gk76prmvh27nqj83nbqz57nqa0vjb" }, "stable": { "version": [ @@ -35012,14 +35155,14 @@ "repo": "lbolla/emacs-flycheck-elixir", "unstable": { "version": [ - 20180810, - 642 + 20210413, + 612 ], "deps": [ "flycheck" ], - "commit": "11998d7e3e63a33453e934d25b3673f7c558e579", - "sha256": "1hdbg0hvb6hwzjma9mxy0h888c8j2z4g38gwixrdixzbw5727r75" + "commit": "b57a77a21d6cf9621b3387831cba34135c4fa35d", + "sha256": "10y2z3w2hjycy0hx8zbhma88i2v9fs5xs7pwz3k56jnv95ipjmpy" } }, { @@ -35256,8 +35399,8 @@ "flycheck", "grammarly" ], - "commit": "192109f43ca5508709a49875ff5f99c25b7f1696", - "sha256": "0ymnypijbivncjncs57dsn096wjccl7vwslv2pa8fl9hjl4y34r0" + "commit": "8321fc98a0809cad17e37ca924d364423c37b8c0", + "sha256": "1pga651wnvw3czqshn731nx0cdaf157v7v1c5n7kh95lc2r3jmn3" }, "stable": { "version": [ @@ -35767,8 +35910,8 @@ "deps": [ "flycheck" ], - "commit": "a285d849e6e227b79bef98f575ecfa43a70661da", - "sha256": "1wdv7iv3lmrpxxdas1p3grkpi08c4ipjfg170nfd2fy9nhr8iy38" + "commit": "2f5f7502c1e422c1df5b347b8142d67d5cd5caa7", + "sha256": "11bhblr96s8a19sb7lnzrwgihqjcwdnajxr6kiplgqd0wsh2h07v" }, "stable": { "version": [ @@ -36081,8 +36224,8 @@ "deps": [ "flycheck" ], - "commit": "039a6c9d0324208d4f4b006693c16248fcf5519b", - "sha256": "1sr1n7gv5n22w018z5nxfnknjqmk2lc8h2flv4d2f23aihlss9h3" + "commit": "ca00e018ecb9ebea4dde7f17eadb95d755ea88ab", + "sha256": "0j2klnv15v2gqnly5vgdrdrkccsza9mwz5c87i6qgnfawmnsh32d" }, "stable": { "version": [ @@ -36269,14 +36412,14 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20200828, - 1814 + 20210414, + 2023 ], "deps": [ "flycheck" ], - "commit": "e8ce874eea4bba13aead8eb8e0262e94fb51f25e", - "sha256": "0i98viqm5plifaw3qdf2sxnk70l32qnkr82gl6j561vqhycxjq40" + "commit": "771fb9a66223287fcd4998b5f6d32d8c602bd91c", + "sha256": "1p4fys8hb89dfqqrzrwqdglxxm50g4x5na2hgzvkq1n0ss617rdj" }, "stable": { "version": [ @@ -36843,11 +36986,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210213, - 1822 + 20210411, + 2342 ], - "commit": "8cd2e747c3f3c1a0879f66b42db090b2878af508", - "sha256": "0m6s8kjk1xpr9pp1s7r39mmm5ry2sa05ync3vjr4kr2m7s5fqchh" + "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec", + "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk" } }, { @@ -37149,8 +37292,8 @@ "deps": [ "grammarly" ], - "commit": "f09caa56254e6c639993afba29f5a4b8b9f9c73e", - "sha256": "0djjxnmy2bkkc6nyl5iq3axnp0marpzpnb8cgh79w1fch300avrf" + "commit": "bc7c7e74013816ea06463ff85627bdc08ad60d9a", + "sha256": "0yj0mqyg0c87kvxz21y0wmfx97lwvym6qm3sdppgkff5fwppyj91" }, "stable": { "version": [ @@ -38455,8 +38598,8 @@ 20191004, 1850 ], - "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", - "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" + "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", + "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" } }, { @@ -38533,8 +38676,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210406, - 1356 + 20210426, + 2126 ], "deps": [ "closql", @@ -38546,8 +38689,8 @@ "markdown-mode", "transient" ], - "commit": "ab3be5a703f319e6de7e76ed292d20deb60cb2d7", - "sha256": "1flpxzmxyz94vl0y2mw437nmcsls1fncapa75kqnbbcf641nidhy" + "commit": "aa5891178aa67d61ec17069375c07ca989f5741e", + "sha256": "07rxs00kk3xmk97i24rf7nbmcfdpa949j351ijcp3pdadinlijzw" }, "stable": { "version": [ @@ -38602,15 +38745,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210315, - 640 + 20210413, + 802 ], "deps": [ "inheritenv", "language-id" ], - "commit": "94239d35944830ce009d01ac3369e0d61f9723c2", - "sha256": "1q27yr916vhk0ah1406vs540f8hpp8bca1f118xwhyj1fw3yrbaw" + "commit": "eb5906c7070b667432194da3991daf21f24b516a", + "sha256": "02i9qijkwzwjcl52ivzhcjamsiygdxn62gdkb9v511036vv4dqff" }, "stable": { "version": [ @@ -38747,14 +38890,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210411, - 1308 + 20210425, + 335 ], "deps": [ "seq" ], - "commit": "3416d8cbf17af8b6f9118ae1963f203bf9b2509d", - "sha256": "1a9w6l46fs3dq52vih5dlm3163iy3dghz08d7c5xfg17c1b98yg8" + "commit": "7bee756bab352ecd93253343988bb274645cd10b", + "sha256": "062kp05x2iy0i5ni1viz2r26dnnvlh7wr7lk7pz1qrjh0qqqzi58" }, "stable": { "version": [ @@ -39037,8 +39180,8 @@ 20210201, 731 ], - "commit": "752fe042ba3153473cd149875388c8dd9b4a8a26", - "sha256": "0x4sp6n6dksa8vps465i8sqvdzacr7hrxd4jlxj9gqkcspalrjgy" + "commit": "d5dc811fc892d78e042394bb4a1342dea2480b5c", + "sha256": "0n1w3rycc5cpqvhw6d1dzkwjdy1xx7bps7d994l4hcpdfx5c25lx" }, "stable": { "version": [ @@ -39371,8 +39514,8 @@ "deps": [ "cl-lib" ], - "commit": "43dfeb07bd3932f9d42c2b964413001cf32f0d50", - "sha256": "16an39w1ycbw90d6l0d2mcvyndah1j21b2jf7iwnqipwsac9f1qm" + "commit": "ee4f57c0d0b5bd3fb8277b3bdced55540743162a", + "sha256": "1n89wjlsli7krb4fs8ln55wms5386xky4n2zm7k6457bhbh54fvn" }, "stable": { "version": [ @@ -39971,23 +40114,19 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20210410, - 2304 + 20210428, + 1942 ], - "commit": "aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 278 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 535 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 1141 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 2003 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503\n" - ] + "commit": "70c3d6d5d247836b2d9d988f204ce804ae5db67d", + "sha256": "16jqni4s2yxszhkbb83fkgflygbxzx01cmq2qq40p4ihbvwm0gb0" }, "stable": { "version": [ 0, - 12 + 16 ], - "commit": "adc5c4ab5ff33cf94cb3fcd892bb9503b5fa2aa2", - "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08" + "commit": "803dfeb9414ed7b99c5d567170f32c97cafa1114", + "sha256": "16jqni4s2yxszhkbb83fkgflygbxzx01cmq2qq40p4ihbvwm0gb0" } }, { @@ -39998,18 +40137,25 @@ "repo": "emacs-geiser/chez", "unstable": { "version": [ - 20210405, - 1922 + 20210421, + 120 + ], + "deps": [ + "geiser" + ], + "commit": "03da1c17253856d8713bc5a25140cb5002c9c188", + "sha256": "0cc1z5z5cpvxa5f3n8kvms0wxlybzcg4l1bh3rwv1l1sb0lk1xzx" + }, + "stable": { + "version": [ + 0, + 16 ], "deps": [ "geiser" ], - "commit": "4cb7f2667ea1c53da53f0144910fbbd67bccbf4d", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 257 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 677 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 1142 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 2316 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503\n" - ] + "commit": "03da1c17253856d8713bc5a25140cb5002c9c188", + "sha256": "0cc1z5z5cpvxa5f3n8kvms0wxlybzcg4l1bh3rwv1l1sb0lk1xzx" } }, { @@ -40020,18 +40166,25 @@ "repo": "emacs-geiser/chibi", "unstable": { "version": [ - 20210405, - 1924 + 20210421, + 123 + ], + "deps": [ + "geiser" + ], + "commit": "6f59291d8d1dc92ffd3f53f919d8cab4bf50b7d3", + "sha256": "0r92iay5cw7jqyd8cy2mm02y0sl89flp4asbz6ca9l818micphfn" + }, + "stable": { + "version": [ + 0, + 16 ], "deps": [ "geiser" ], - "commit": "54e7f384618c73d8fb675b5289d443a8ee3e4dc8", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 530 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 1321 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 2133 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503\n" - ] + "commit": "6f59291d8d1dc92ffd3f53f919d8cab4bf50b7d3", + "sha256": "0r92iay5cw7jqyd8cy2mm02y0sl89flp4asbz6ca9l818micphfn" } }, { @@ -40042,18 +40195,25 @@ "repo": "emacs-geiser/chicken", "unstable": { "version": [ - 20210405, - 1931 + 20210421, + 127 ], "deps": [ "geiser" ], - "commit": "47be5b43b35d3bf35b0f668b4c08715ea41fb97d", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 302 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 546 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 1206 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 2316 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503\n" - ] + "commit": "ceab39c89607f55cba88e5606ba5eb37c7df5260", + "sha256": "0klssx0vhj48868p36nkn22qh2k4188gpvi3c2pjk9lb7d5356xj" + }, + "stable": { + "version": [ + 0, + 16 + ], + "deps": [ + "geiser" + ], + "commit": "ceab39c89607f55cba88e5606ba5eb37c7df5260", + "sha256": "0klssx0vhj48868p36nkn22qh2k4188gpvi3c2pjk9lb7d5356xj" } }, { @@ -40064,18 +40224,25 @@ "repo": "emacs-geiser/gambit", "unstable": { "version": [ - 20210405, - 1925 + 20210421, + 124 ], "deps": [ "geiser" ], - "commit": "0ee4156640988497779345452c3aa0417356e606", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 251 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 559 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 1131 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 2010 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503\n" - ] + "commit": "3294c944d1c3b79db44ed14b133129fec454bd60", + "sha256": "1vwr0iv7pznr7n6j76i90n306mhq5pxdj8b2f7l5mb32m442w2w9" + }, + "stable": { + "version": [ + 0, + 16 + ], + "deps": [ + "geiser" + ], + "commit": "3294c944d1c3b79db44ed14b133129fec454bd60", + "sha256": "1vwr0iv7pznr7n6j76i90n306mhq5pxdj8b2f7l5mb32m442w2w9" } }, { @@ -40098,14 +40265,10 @@ "stable": { "version": [ 0, - 0, - 2 - ], - "deps": [ - "geiser" + 14 ], - "commit": "9e7ed54e5629f759660569bc7efc3d75dbabbc5f", - "sha256": "0rxncnzx7qgcpvc8nz0sd8r0hwrplazzraahdwhbpq0q6z8ywqgg" + "commit": "362f1d1189c090ece8b94f6a51680f74b1ff40f9", + "sha256": "1gsvl0r6r385lkv0z4gkxirz9as6k0ghmk402zsyz8gvdpl0f3jw" } }, { @@ -40116,36 +40279,54 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20210405, - 1917 + 20210421, + 118 ], "deps": [ "geiser" ], - "commit": "93ef7101fdfcc7eac6f465b4b9788c384a323c14", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 632 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 1153 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 2774 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503\n" - ] + "commit": "700ac985c1c729ba1005a0a076c683e9f781526f", + "sha256": "0bp70i8505rd0nwl44h9n9swnvqahr2fkhnv3q6020p1hgkjvdjs" + }, + "stable": { + "version": [ + 0, + 16 + ], + "deps": [ + "geiser" + ], + "commit": "700ac985c1c729ba1005a0a076c683e9f781526f", + "sha256": "0bp70i8505rd0nwl44h9n9swnvqahr2fkhnv3q6020p1hgkjvdjs" } }, { "ename": "geiser-kawa", - "commit": "68690d6b011c95197af6b5a87cc21c4dbe97ff00", - "sha256": "0gzzab0v93vd9n14s1bya0frf3dagh0gbwg1an4mapg7gjz9ffdg", + "commit": "8e3f52b2b0dbd2ace92ec33caa3afc51e5c5e5cf", + "sha256": "0rvcpcf8znbndzm481a3477dw61rih1ifj3z2pwv33z6al6lwlh4", "fetcher": "gitlab", - "repo": "spellcard199/geiser-kawa", + "repo": "emacs-geiser/kawa", "unstable": { "version": [ - 20200507, - 1305 + 20210427, + 1626 ], "deps": [ "geiser" ], - "commit": "b96c008e9c3b8dc210d8b536ee7b76b8690c8af6", - "sha256": "0j2djjgfd4hd2k60ymgxzpsy52ks6hxpd4rr81z5nh9fdg9axhrs" + "commit": "3d999a33deedd62dae60f3f7cedfbdb715587ea7", + "sha256": "1i4ywb4ggq884p2lbpmp6y53l8ys5ajma7sk21zxi1jx28nb01nm" + }, + "stable": { + "version": [ + 0, + 14 + ], + "deps": [ + "geiser" + ], + "commit": "f76b53dbc1465dbd799e29bdcd2be34cc1603f50", + "sha256": "1i4ywb4ggq884p2lbpmp6y53l8ys5ajma7sk21zxi1jx28nb01nm" } }, { @@ -40163,11 +40344,18 @@ "geiser" ], "commit": "d17394f577aaa2854a74a1a0039cb8f73378b400", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 286 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 541 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 1159 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 2059 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503\n" - ] + "sha256": "0w80ifs5d49ss81j34lnq91x2sbkc44i2xswkcwx23rh62p4jvyc" + }, + "stable": { + "version": [ + 0, + 14 + ], + "deps": [ + "geiser" + ], + "commit": "d17394f577aaa2854a74a1a0039cb8f73378b400", + "sha256": "0w80ifs5d49ss81j34lnq91x2sbkc44i2xswkcwx23rh62p4jvyc" } }, { @@ -40178,18 +40366,54 @@ "repo": "emacs-geiser/racket", "unstable": { "version": [ - 20210405, - 1929 + 20210421, + 125 ], "deps": [ "geiser" ], - "commit": "a87fd449cc6c7b0b17a0b08268e78d3f038f3351", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 346 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 544 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 1082 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 2114 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503\n" - ] + "commit": "22e56ce80389544d3872cf4beb4008fb514b2218", + "sha256": "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "geiser" + ], + "commit": "42376b74ae0ad84d02c26560dfd9181493dcccd7", + "sha256": "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx" + } + }, + { + "ename": "geiser-stklos", + "commit": "6530db79aafe4ac4cefa01f77a8cc1e259385171", + "sha256": "0bbxxxvzp4dd22lrlmg0lnishvqj1pcm82scds27nrkzrcdycs8s", + "fetcher": "gitlab", + "repo": "emacs-geiser/stklos", + "unstable": { + "version": [ + 20210503, + 944 + ], + "deps": [ + "geiser" + ], + "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981", + "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07" + }, + "stable": { + "version": [ + 1, + 6 + ], + "deps": [ + "geiser" + ], + "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981", + "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07" } }, { @@ -40358,8 +40582,8 @@ "magit", "s" ], - "commit": "63ca93be02f830f8d65905ebde72d60a2280687a", - "sha256": "08s7q7br8a68gs7w55g6i4g0d6ky2mksl1ws8iigiavkh64sihkb" + "commit": "6a90e7233dccc2f997af2cd5c896c8d72d3c3a76", + "sha256": "1nmgngxgzbp1l4av6vb6fgl2nbizsffv51qnki8yaycl1f3cmrg9" } }, { @@ -40617,28 +40841,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20210327, - 1647 + 20210427, + 1239 ], "deps": [ "let-alist", "treepy" ], - "commit": "2273c3b49a08cde0498b3b2cfae6c764629a4c93", - "sha256": "1pg46ycllg900cd8q5bsgv9b9mcc0bm0z5g2bw9gf5nnbw556jla" + "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f", + "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s" }, "stable": { "version": [ 3, 5, - 1 + 2 ], "deps": [ "let-alist", "treepy" ], - "commit": "5fae5e31586a11a2025168030e0eb3876502611c", - "sha256": "0i19h9zl8wky1296f0d7dcx9dpfmfixinnaf4l1w1bf4p2xmyfiw" + "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f", + "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s" } }, { @@ -40684,19 +40908,15 @@ 656 ], "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 272 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 546 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 1078 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 2648 ms\nerror: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503\n" - ] + "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "9522f7e41d07b59afe21e28abbf186f78be3eab6", - "sha256": "1g1by8lvf8c9vzm4wwsi5kp285kaj0ahsl54048ympin4pi0njw9" + "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff", + "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh" } }, { @@ -40995,8 +41215,8 @@ "transient", "with-editor" ], - "commit": "5882df245d3388cd6f443bc11df219a838104df2", - "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" + "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d", + "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw" }, "stable": { "version": [ @@ -41206,16 +41426,16 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20201223, - 948 + 20210430, + 1603 ], "deps": [ "dash", "f", "hydra" ], - "commit": "1c35e1693bbb7de41a8aac820a080a7299c13c17", - "sha256": "136j6gbpg8qx6ry1ryh4aal41b3c8pz7g2xisyipjj6p9lmykvqi" + "commit": "24360718c1666a246a39aadc8a251faa8578cc66", + "sha256": "129xv2ddgdkc9ipkxvwprkwp245x1zq2r75liv31x8x4g4i4305i" }, "stable": { "version": [ @@ -41480,20 +41700,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20180318, - 1956 + 20210426, + 2132 ], - "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2", - "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" }, "stable": { "version": [ 1, - 2, - 8 + 3, + 0 ], - "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", - "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" } }, { @@ -41528,20 +41748,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20180318, - 1956 + 20210426, + 2132 ], - "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2", - "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" }, "stable": { "version": [ 1, - 2, - 8 + 3, + 0 ], - "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", - "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" } }, { @@ -41816,20 +42036,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20180318, - 1956 + 20210426, + 2132 ], - "commit": "14adca24eb6b0b4e311ad144c5d41972c6b044b2", - "sha256": "1z3xyjlbxni98hqdnd46lg89dcmcaqjsv73wv16ia4z6lrkhv5dp" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" }, "stable": { "version": [ 1, - 2, - 8 + 3, + 0 ], - "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", - "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" + "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", + "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" } }, { @@ -41978,26 +42198,26 @@ "repo": "TxGVNN/gitlab-pipeline", "unstable": { "version": [ - 20210322, - 439 + 20210430, + 151 ], "deps": [ "ghub" ], - "commit": "089400ac1d411a2b58cf1a64f28911079d5c898f", - "sha256": "0zck5488fswqcl7ahknm6nan5al8db73p2jbxnwcv2cxcia81qza" + "commit": "0a07b64e402fa1e25423f8f6ed38b35ff09159d9", + "sha256": "1611nday1mxkkjjwcz62bvl8863vlkl4bq4vf3wj6p237m4ai3ks" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "ghub" ], - "commit": "ecb3a2277f6a1c7fed73f9381834724c143c85da", - "sha256": "1nqrim3fpgf5npzl14sd0h6dlhi925hns2f75l4arrhbcjgcn984" + "commit": "078f72d52e840907aa4c568468ce25758f20eb15", + "sha256": "0y2dkw7dwk1g4q0z1bjycj7sv47pvna6h7kwh8padn5l4fiy0hkd" } }, { @@ -43528,11 +43748,11 @@ "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "a4e80bbf83872fa6c8ace5197693d2f81c4ff1cd", - "sha256": "0bh3wbaiavz033isgl0m7crjhfsb0gxsgsnh54aph7pdrffci0r6" + "commit": "fb01f121c4c77db3e6750303894d57b31e410b14", + "sha256": "0jz4p6xa8nb36g96a8pbhpc4l16jzwryddlw2c442vmkngwy9s1j" } }, { @@ -43561,8 +43781,8 @@ 20180130, 1736 ], - "commit": "845e4f9a15a794071457e74c1fa99be2c68d75fe", - "sha256": "130bjw6bpizf0wq48d8n1cvgpdrq31d8ryd6wmah8a5vbwnczf6y" + "commit": "15fddd2eaf0fd656434b9ea72b374b29ffec7344", + "sha256": "0wya5sp4a4w2kg4c2pl26lpyxh8fvsmapry2sn8r996cd8lkdkra" } }, { @@ -43921,14 +44141,14 @@ "magit-popup", "s" ], - "commit": "52c75aa6b3d8eeacfede11b314e20514ca7c75a4", - "sha256": "1a2nzbxhqwpjxfm4sr1l2pyjxhvfwd3ralxmldgsdpssqx64lvsn" + "commit": "82b771e4e219cd826d73291913eb2291ff2d8bfd", + "sha256": "0dprikwq6cna3zrgl7l706p4rhccn2sdp42ynbsza2kaiyz4ar7a" }, "stable": { "version": [ 0, - 24, - 1 + 25, + 0 ], "deps": [ "dash", @@ -43936,8 +44156,8 @@ "magit-popup", "s" ], - "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411", - "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g" + "commit": "bb0307eb84ae981cfca7fc8d680821a2c2be3c6d", + "sha256": "0jwfk4kqz8jzxlhdihb0wvyiza1zfwcwr2p9frk0cw50p6fjqbs6" } }, { @@ -44156,8 +44376,8 @@ "s", "websocket" ], - "commit": "e11a5a67307f05e08812be190b23460a1bf97687", - "sha256": "10ral5vipq3jvg3l8l2vgia97dpsjzkjvidp63n5z6mpjdwblka1" + "commit": "175e68d7ce9fd4c44d1eb808954cf0ba66b59599", + "sha256": "1ylynb295p5c26ayb8kdxqfbj9z61vinnd6bdlwsynr1wncbwyy4" }, "stable": { "version": [ @@ -44534,11 +44754,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20200725, - 725 + 20210428, + 1052 ], - "commit": "98d566db769b865f102a0c6802a08ebce8ae5e7f", - "sha256": "0dh0a2msrbr31lzrp9b0xrp78g4h02qcsxjjzgmqyb6fqzhbr3kd" + "commit": "28552059c4643f571ef0883ad543270a48241572", + "sha256": "00prmjyfcnslb8b2gynlsrg80z6ns6jjyj87qniwj0rfmbfnh0qa" }, "stable": { "version": [ @@ -44878,8 +45098,8 @@ 20200416, 2136 ], - "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", - "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" + "commit": "fa0609b93f1ece777c0593529870390f21f5a788", + "sha256": "0aclxzxsh0ixibnw86d8gcyq5yzbfqzmz02rh2djk7l27yg50f10" }, "stable": { "version": [ @@ -45606,11 +45826,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210407, - 214 + 20210502, + 155 ], - "commit": "426e28bbee7853734664d75a7e5f960c6c15ee67", - "sha256": "01qrrbb2rgr780xna4a1ncv92y8af76kvj0hjdl3qa1mdn0ypc3j" + "commit": "886795c15036d566aeced66f9508ae61ec0287ec", + "sha256": "1m8wlm12n32kv9pfxsz0xlpzmwn6icwyjj5fansq9v212wawq2b8" }, "stable": { "version": [ @@ -45940,16 +46160,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210409, - 1016 + 20210426, + 551 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "4f16ec21f5ac4d0b9e36768c27abd453a959388d", - "sha256": "07v5gr61pvm5nh8xfi79i7ps6hjicm07zkg98m14z424dc8x6kl4" + "commit": "f680fcc9e771e4e798e4d2fa9aaf3708337c9289", + "sha256": "0rfjqcv53m7ccar7j51wfnxq6dnh75c44lxlnhaqg6i6a17gjd15" }, "stable": { "version": [ @@ -46242,8 +46462,8 @@ "cl-lib", "helm" ], - "commit": "9870333cdd4a54b309e2709af647cda6f4070a42", - "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86" + "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e", + "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik" }, "stable": { "version": [ @@ -46848,14 +47068,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210324, - 1445 + 20210425, + 1928 ], "deps": [ "async" ], - "commit": "4f16ec21f5ac4d0b9e36768c27abd453a959388d", - "sha256": "07v5gr61pvm5nh8xfi79i7ps6hjicm07zkg98m14z424dc8x6kl4" + "commit": "f680fcc9e771e4e798e4d2fa9aaf3708337c9289", + "sha256": "0rfjqcv53m7ccar7j51wfnxq6dnh75c44lxlnhaqg6i6a17gjd15" }, "stable": { "version": [ @@ -48391,8 +48611,8 @@ "helm", "lean-mode" ], - "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90", - "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg" + "commit": "bf32bb97930ed67c5cbe0fe3d4a69dedcf68be44", + "sha256": "1bkv5zs38ijawvavbba0fdf2flb6fiwici3qi99ws8wvwhnbkws2" } }, { @@ -48538,16 +48758,16 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20210226, - 2027 + 20210419, + 2014 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "74a02f89088484c42ffc184ece338b73abd4d6f6", - "sha256": "1p130xj03wh3pqwf1bb3xl86pqnv1kpmn90mwfg0g52jwl0grv6b" + "commit": "c2c6974dadfac459b1a69a1217441283874cea92", + "sha256": "0xpz9qrcbxknnncqf0hw7hs9k6sv9dckzsf081k2zmsks3l5qh4p" }, "stable": { "version": [ @@ -49210,15 +49430,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20200512, - 1146 + 20210412, + 1147 ], "deps": [ "helm", "posframe" ], - "commit": "b107e64eedef6292c49d590f30d320c29b64190b", - "sha256": "09y98ij4wkqh771ahwi3b7nsg6yb2b69n94v3ad41kp4q0c2rscd" + "commit": "2412e5b3c584c7683982a7e9cfa10a67427f2567", + "sha256": "0k4lmgvrxm4lswafc3fb8aab3ax0gnkkq64vg3vmiry85kih2cqb" } }, { @@ -50170,14 +50390,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20200814, - 448 + 20210426, + 547 ], "deps": [ "helm" ], - "commit": "1f7d3cf0d742b199e4ce13fcb8b19c977a44611e", - "sha256": "1r03d3ivmi0r5knsrlfx2cq5jljjl36h2l5n0mbs3sc6iad9wz20" + "commit": "1b3285791f1dc1fde548fe67aec07214d698fd57", + "sha256": "0wgi7pk2s4syi3fc8l60zcnz34f8ik9y558la0d5ryci4fssrl7i" }, "stable": { "version": [ @@ -51037,10 +51257,10 @@ "version": [ 0, 1, - 5 + 6 ], - "commit": "9cc03c7136b56c04ea053fbe08a3a4a6af26b90e", - "sha256": "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r" + "commit": "4420bdda419875dacb065468aafe273b2022580e", + "sha256": "0a9nn1jnbgv93kz1iz5iay34d0p7lkpd8ic619ysk8qcksc0yn2i" } }, { @@ -51195,23 +51415,20 @@ "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20210410, - 1932 + 20210420, + 1924 ], - "commit": "fdabfda5f6300f8dd4d2a62c49359605798cc001", - "sha256": "0x833ahd5m4rlqrgr7n5xj477vbs7mmp267in22hw0cxi9aan08q" + "commit": "891538de31524956136e1419e1206af0c8befe02", + "sha256": "08l5gb73ibs1mmfifnks5gxrcg8x8azw9g10jj2f8vn8viwwa7m0" }, "stable": { "version": [ 2, 0, - 0 - ], - "deps": [ - "cl-lib" + 2 ], - "commit": "e18f2c2b240d7586ff7ffdc2881079e2dd8944ca", - "sha256": "1agdsqn3g18s9nicp23mlwvshxqskkbfzs9lgjmzxsa5628rxixc" + "commit": "fdabfda5f6300f8dd4d2a62c49359605798cc001", + "sha256": "0x833ahd5m4rlqrgr7n5xj477vbs7mmp267in22hw0cxi9aan08q" } }, { @@ -51605,6 +51822,21 @@ } }, { + "ename": "hl-prog-extra", + "commit": "d4ababc787d4dd173c65cc1b4b4a0fc0bb6e6d07", + "sha256": "1dgjskhz1jq01j19dmy8d3fzrg1d8jzrycdsxmkjlc2h05285wkg", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-hl-prog-extra", + "unstable": { + "version": [ + 20210422, + 56 + ], + "commit": "42dee82058e49a7eae5490af2b6b4147600e87ed", + "sha256": "1csvhvjzhq1w9384i9n78qv8x0c2y8mdqig6fa2k5qi84cgsh8zp" + } + }, + { "ename": "hl-sentence", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs", @@ -51634,11 +51866,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210117, - 1140 + 20210503, + 1419 ], - "commit": "4d18ccde596aef84ef278aa60144390ab41f0046", - "sha256": "0r9yz485g393yh4nh1a8nqhk1yxjapq2dzjs3l13ld34hql776yc" + "commit": "d83f28ed95c04adf764acc6bd6faaa5f8ecfaea0", + "sha256": "1b864qf7n195sw3pkyp905px9p90cdacax74464if8n06l5m57a0" }, "stable": { "version": [ @@ -52412,11 +52644,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20210106, - 2120 + 20210422, + 1351 ], - "commit": "c1f9989bcecd1d93a2d7469d6b5c812bd35fe0f3", - "sha256": "180hj0ww30kjr4nrnlp5r59xr6qpi7xhw19cp91syqhclzylkpqr" + "commit": "1ce4f09af216f5bb643454da1a3f66beb4a26a55", + "sha256": "0f1aqkd9vxf32mafpd7hdbkj9wy5g4y2gqqlvgpy7j50iqkdcm5h" } }, { @@ -52984,11 +53216,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20210411, - 1913 + 20210424, + 1811 ], - "commit": "a258ff1033dd3d3cb894a039ac13ff3a85b96f57", - "sha256": "1r6cpq6nm3hhxhim4i0alcwmrvq17n7gh5dri9lfpcq6c7wqf0qi" + "commit": "d7ab5e5de18a027375666755e6610ea26c35ac16", + "sha256": "1jkykgf56091w2xb4mgnrfprarbjkqlmac3d388f9ckmiiyyqyrp" }, "stable": { "version": [ @@ -53846,11 +54078,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20210319, - 126 + 20210423, + 731 ], - "commit": "0fdc71bfa66ecc1f8a54cdcd2458eb47eab41ecd", - "sha256": "1ibd9i75x6gb0nprbdi0giklllfwsmvghi3fm19qm7hiw3kg9j3m" + "commit": "01bf1e1101ac9cd34bfda7016ce0f82f97a3de35", + "sha256": "08w76awwg1g7n67b2rvbwg0i366zshqnhvlp6zyfagjg2bz5gdmf" } }, { @@ -53915,11 +54147,11 @@ "repo": "bmag/imenu-list", "unstable": { "version": [ - 20210411, - 1703 + 20210420, + 1200 ], - "commit": "1447cdc8c0268e332fb4adc0c643702245d31bde", - "sha256": "1fhfxwwf622mjl3slnzyj0zzmbx15qhq6xv8p7fpw88dx1dki113" + "commit": "76f2335ee6f2f066d87fe4e4729219d70c9bc70d", + "sha256": "0b7q6h7ky7n20w1p471fmnwyfmc59c9ihgnl72m11dnciiz325wa" }, "stable": { "version": [ @@ -54089,8 +54321,8 @@ "deps": [ "impatient-mode" ], - "commit": "9ad16da9f78ae242b0a6fb1de388d5f4f1264207", - "sha256": "0h665wxnz3l97dxgk2rw3v0sdhb2lr30iqmf4q304wk7ljxg6lig" + "commit": "60ae30d07b857c074e2918680805cb37249de0ad", + "sha256": "0brj34ijgsgkbawp097wjwiaka2b082aypl5pal0298mpk97zxq0" }, "stable": { "version": [ @@ -54418,8 +54650,8 @@ "deps": [ "clojure-mode" ], - "commit": "c3ff2f40fdcedf3357cde868c278474767b65adb", - "sha256": "0ljxpjhm3v0wb851zfqvkr5cv4hblg29rz3a5lw48jwz9ijpapq9" + "commit": "a2cebf5362fe583538dda8dcf6348a8d73b462a2", + "sha256": "0sfn6x08i7sd2k6z4swpd8hxaab3ly0gfyapcaq768chi0grr0gw" }, "stable": { "version": [ @@ -54511,11 +54743,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20210314, - 123 + 20210427, + 1755 ], - "commit": "c6990a60c740b2d69495e34e95b29f13014b3cde", - "sha256": "05nz7hvly47n7d945gdb1x8xgzla5r9k629if81rgjh99w24dpgc" + "commit": "92d5d122fa172bc49b5ec9ee1891aa9c84805c92", + "sha256": "1dn8wml7jwf3dx2nbkjpf2v6k88apiin8wqmz4yix5d2k3x2qm46" }, "stable": { "version": [ @@ -54564,11 +54796,11 @@ "repo": "dakra/info-beamer.el", "unstable": { "version": [ - 20180604, - 2122 + 20210427, + 1033 ], - "commit": "97db34d23cb05b23e50c15875ee84f5d3236e0db", - "sha256": "0z1cya3mhgh5ibj3dgwzii1fkbzsq7zjjzg6hfdv3pd4a7722qlx" + "commit": "6b4cc29f1aec72d8e23b2c25a99cdd84e6cdc92b", + "sha256": "064igpiip1b037rs32z8w1g3w7rywyhabi1h92p1zkx3gjlqgpp2" }, "stable": { "version": [ @@ -54860,11 +55092,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20210109, - 1112 + 20210427, + 1337 ], - "commit": "e8ae7b2345b8b21dd866fc043906ceecd40832c7", - "sha256": "19fxqb6x05480wa4dp4mv2a6cw5sgc8bsm3syqpbhmflymfvxnsy" + "commit": "7c3a0a76fa00db41a4d3d990cc98a1c6b088df3d", + "sha256": "17x0afwfcr4k0nmliqajswmvaiglk1xl33r3j215w214xp6dqrp2" } }, { @@ -55124,30 +55356,6 @@ } }, { - "ename": "interleave", - "commit": "6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2", - "sha256": "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy", - "fetcher": "github", - "repo": "rudolfochrist/interleave", - "unstable": { - "version": [ - 20191129, - 958 - ], - "commit": "e1791a96a2633a9f5ea99fc0a20ebacedcefdaaa", - "sha256": "1biysf8cqfw4q7d2dnlisviign3n5knvrb0g6zdalzv8pnd1cxqr" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "6b28363eac939227c6cdc8a73a1d3ea5b002442d", - "sha256": "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h" - } - }, - { "ename": "interval-list", "commit": "afee0fed80f4fa444116b12653c034d760f5f1fb", "sha256": "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf", @@ -55713,11 +55921,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210404, - 1241 + 20210503, + 1143 ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", + "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" }, "stable": { "version": [ @@ -55744,8 +55952,8 @@ "avy", "ivy" ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", + "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" }, "stable": { "version": [ @@ -55777,8 +55985,8 @@ "cl-lib", "swiper" ], - "commit": "9870333cdd4a54b309e2709af647cda6f4070a42", - "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86" + "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e", + "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik" }, "stable": { "version": [ @@ -55847,16 +56055,16 @@ "repo": "jixiuf/ivy-dired-history", "unstable": { "version": [ - 20170626, - 556 + 20210418, + 1444 ], "deps": [ "cl-lib", "counsel", "ivy" ], - "commit": "c9c67ea1ee5e68443f0e6006ba162d6c8d868b69", - "sha256": "1lim9zi57w011df5zppb18yjkaxkgfy796pc6i01p4dl32x0rpfv" + "commit": "1ffa9b705c52a9d5b03c97150addb4f746c08380", + "sha256": "1li8vh94w1mkwqbh1f0i1mmv5advrbh1183vpjc2zbmmk02pynkf" }, "stable": { "version": [ @@ -56112,8 +56320,8 @@ "hydra", "ivy" ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", + "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" }, "stable": { "version": [ @@ -56156,28 +56364,30 @@ "repo": "ROCKTAKEY/ivy-migemo", "unstable": { "version": [ - 20210206, - 919 + 20210425, + 613 ], "deps": [ "ivy", - "migemo" + "migemo", + "nadvice" ], - "commit": "9cdf3823b3303d69c0c77dfee91136817da12aea", - "sha256": "0nxk1i208zm6p666920gh1nmrfhfqglhgs07b5ir4b7mz3m5caab" + "commit": "a2ce15abe6a30fae63ed457ab25a80455704f28e", + "sha256": "18j3h2ndrw92gpbd9q5ji6q8qrwqmzw2xw8yds8f0fd8aybkw8zz" }, "stable": { "version": [ 1, - 1, + 4, 0 ], "deps": [ "ivy", - "migemo" + "migemo", + "nadvice" ], - "commit": "fc4f44750466ba9385e3313c85adf83a8e55a1fa", - "sha256": "0lax72js89k5g007ra6ngy9gnphny4bgjggnl9d3j3mizw9cynvn" + "commit": "2d44f7bbc1eb5f95162db889b889488b65bc0042", + "sha256": "14jmxg56w6jxz9i4wllbr18c25ximdrbi8w4qcc8lxr9yjlakl15" } }, { @@ -56279,15 +56489,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20210410, - 530 + 20210426, + 2144 ], "deps": [ "ivy", "posframe" ], - "commit": "7f1ab7890040c4b8dc4e9645c824cd35210e1121", - "sha256": "053irrmqvlzs7597grsq0fn06w3apqkgma45xv5pfb2wqin2kx2w" + "commit": "084cc59ea2cd62afaa51445ada3d00404749a541", + "sha256": "170z5akdwxzrn0b4cbk6v8a3dqz229b7pj9n0534y1a7ydvcyv9h" }, "stable": { "version": [ @@ -56311,15 +56521,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210227, - 600 + 20210425, + 1720 ], "deps": [ "ivy", "prescient" ], - "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", - "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" + "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", + "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" }, "stable": { "version": [ @@ -57059,8 +57269,8 @@ "auto-complete", "jedi-core" ], - "commit": "3a9c503c35359d6bca6ff90c384c104c8743cdab", - "sha256": "1rx3qiicgg9p0chbfx8v1aypk93p6r5wlkia0b2sqr796r7xdn35" + "commit": "e942a0e410cbb2a214c9cb30aaf0e47eb0895b78", + "sha256": "1c4nqgg1w2qv0mhpi6hhz3xr5kk4bbxc951fhik6dpi2c2w8p73s" }, "stable": { "version": [ @@ -57084,16 +57294,16 @@ "repo": "tkf/emacs-jedi", "unstable": { "version": [ - 20210202, - 856 + 20210503, + 1315 ], "deps": [ "cl-lib", "epc", "python-environment" ], - "commit": "3a9c503c35359d6bca6ff90c384c104c8743cdab", - "sha256": "1rx3qiicgg9p0chbfx8v1aypk93p6r5wlkia0b2sqr796r7xdn35" + "commit": "e942a0e410cbb2a214c9cb30aaf0e47eb0895b78", + "sha256": "1c4nqgg1w2qv0mhpi6hhz3xr5kk4bbxc951fhik6dpi2c2w8p73s" }, "stable": { "version": [ @@ -57325,8 +57535,8 @@ 20200927, 1317 ], - "commit": "7a934115238d7b80df230a5ba7a70d866bc18c66", - "sha256": "087fj39m7gmi3bx2q983afal3738rc5zxnfs4d4c72z065z7gsss" + "commit": "b9b3c39743be5aeba17d4d8e5d379613451ddec6", + "sha256": "1j3dxj4cr26vir226zb84zn0jsjwnhz02xb60a69jv4k1wcl6bq9" }, "stable": { "version": [ @@ -57829,14 +58039,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20201220, - 1718 + 20210414, + 2241 ], "deps": [ "cl-lib" ], - "commit": "29979e5f3301796ba606759e39ee0b1b6a2a24f3", - "sha256": "1pvdzinxfd3b08d92cf5v0fk88dzlyw5r5g3hablh6gcfc9i57xx" + "commit": "b891edecedf30be6321e2f109fdfeb25b0edad27", + "sha256": "179vkwr57nibc148b961g1aim052v65qsva44imxibkm9h0n32w9" }, "stable": { "version": [ @@ -58369,7 +58579,7 @@ 0, 0, -1, - 5 + 6 ], "deps": [ "dash", @@ -58378,8 +58588,8 @@ "spinner", "vterm" ], - "commit": "34498596550b0f819106db8dd6e80dd01332c345", - "sha256": "05hrvidpgsinvq7n56c3kfk23x561djchsa10vybjk027fqfvlwb" + "commit": "03b4296ba7151963eb3c850f3314b02644101f51", + "sha256": "1jgs0pz8bzqg8116kyw3z7jwbf6karrl89ks028q091ylc00nm8b" } }, { @@ -58396,19 +58606,19 @@ "deps": [ "vterm" ], - "commit": "b8a749f19bef179c58068d3fa5cd53c3db5d1ecf", - "sha256": "1bp3dc915zq1qd7zycz8bdjq4pz172r3zbzjn8k4rsw0lz9j6w88" + "commit": "d57448466c11833d4fd67f5dbbea9cb9a07a74e2", + "sha256": "0v7l4jxq71vcw3sjs476smbw9ln6xfrq7n3vzw26apzkrplizqyy" }, "stable": { "version": [ 0, - 11 + 13 ], "deps": [ "vterm" ], - "commit": "06ee45bffb6e711278a7af5207899d2b4316706c", - "sha256": "1zwhbwm285gqy9bfhlaaa9wp3lz959i3d1s41msl70jxbrnjz7pw" + "commit": "b8a749f19bef179c58068d3fa5cd53c3db5d1ecf", + "sha256": "1bp3dc915zq1qd7zycz8bdjq4pz172r3zbzjn8k4rsw0lz9j6w88" } }, { @@ -58543,8 +58753,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20210407, - 212 + 20210422, + 1451 ], "deps": [ "cl-lib", @@ -58552,8 +58762,8 @@ "websocket", "zmq" ], - "commit": "7735d2b8fb32434992467f0d4d9d59c1a1a5dc0c", - "sha256": "12q70b249yygqr30l1vhgxzlbfxkcil9xaixzj8zy3xbd3vsjdns" + "commit": "1f0612eb936d36abab0f27b09cca691e81fc6e74", + "sha256": "1mpch20iahijlgwg8bjpjg7bm9hd2wyskqbknafw8jkwyj7dvng2" }, "stable": { "version": [ @@ -58633,14 +58843,14 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20210219, - 1317 + 20210414, + 1543 ], "deps": [ "yaml-mode" ], - "commit": "0df142ac98bcd072dd7017053c9c9c476345aeef", - "sha256": "1nxcp1hq9d1j7whfak60j4dmzsfmq2mgmdxxvlj3az7p7vannd2v" + "commit": "14f08627d5bc320fee5bd9926e9aabe6956f514e", + "sha256": "1rfglmslhv3i71fgsqs8gjcnkff06lnp0b9s182rsnfz29dnzd1a" }, "stable": { "version": [ @@ -58924,28 +59134,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210403, - 749 + 20210503, + 1257 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "367429c39e330cf2b87e8af0ca7c8883baa21ea3", - "sha256": "0hj21jmkcsjv7rxpfq6n77jsmm894rfgsdn80qymh6nyxznq93ym" + "commit": "28da5f50aa1ebe72f6b4e5bac1abeb720821a716", + "sha256": "0dg64wb9827wx0ax995hx4jhmxh5mn918zawasjwzi3dl92q7llb" }, "stable": { "version": [ 1, 6, - 2 + 4 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "5694f27f6e17bf2d840fa04728d392b5df77e20c", - "sha256": "1c5hdr654f012lj3ssxsavbnij0i109nykwcsgl2c2pb9yxqr5rw" + "commit": "c50bc11fdd42dc98ff806d1fc7cd94619c0ab7bb", + "sha256": "08ypmv43vjk1l409n894jxplnja6nicn2k3qwhwaf9qxhz0yxpjr" } }, { @@ -59122,11 +59332,11 @@ "repo": "Boruch-Baum/emacs-key-assist", "unstable": { "version": [ - 20201109, - 1358 + 20210415, + 227 ], - "commit": "7fd89c306c975a1fa3ab16ba7a4d3b102130a868", - "sha256": "1m1p3iydn5s3dlmjv751ligbwxkg472rhcbk80q2y1lnwjsnbhdy" + "commit": "fae7ce265db3bcfd1c6153eb051afd8789e61a4b", + "sha256": "16gi43wgqqjqljnmjwap8lng1p4davv8prvpip034qw9v6vjmm2p" }, "stable": { "version": [ @@ -59709,8 +59919,8 @@ 20210318, 2106 ], - "commit": "53b655b0ef4bdfe8bf81a2bef8f09179a4917076", - "sha256": "095z6dkqz6iw28ighqbl2c60i6bm6qyrkxl93yg9b31cd6yzlzin" + "commit": "c2b75c587abdc9594e69ef3f5069bd4920bb60e4", + "sha256": "16za2j07sdmb2r1r8fcpa45c66n6af41if5bnpk3maqvf1hm21zd" }, "stable": { "version": [ @@ -60252,28 +60462,29 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210327, - 1230 + 20210417, + 1141 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "654ea30aa0263e85891ddcabc0b7a0f0144b9e27", - "sha256": "1z5pw9xhp4gh156n9n3yq92zm6z8gw2ik7nfrvgnip2v3yr31pfb" + "commit": "e9bc939237bed4ce50d3d403120f7206c835ea4a", + "sha256": "1z2r52x9fsjm1y2m8n0fm9ymd0dx798iw5b3x79fkhnrrw4wfq0s" }, "stable": { "version": [ - 0, - 2 + 1, + 0 ], "deps": [ "aas", + "auctex", "yasnippet" ], - "commit": "94be7523159ee261077a33094775c7f73218a900", - "sha256": "0qyj4xwsxhn78akkv08ka9k47aa3jssd4mgws7ccbnqj68fv78gg" + "commit": "e9bc939237bed4ce50d3d403120f7206c835ea4a", + "sha256": "1z2r52x9fsjm1y2m8n0fm9ymd0dx798iw5b3x79fkhnrrw4wfq0s" } }, { @@ -60361,8 +60572,8 @@ "highlight", "math-symbol-lists" ], - "commit": "8609ec2101777362f45df493c593e0e125fe0824", - "sha256": "142v2yccbh5aiwy6xzxnz9656p9zj3j2vmmyy70x7vxn2jair3bl" + "commit": "74a47238ce1d2d86a3a62c5e8100a6198e73564b", + "sha256": "13cm2sgr9jkdjs649jlh4qsvi9fnma0qs48xbp2r5b29mnd4axrx" } }, { @@ -60974,14 +61185,14 @@ "repo": "conao3/leaf-tree.el", "unstable": { "version": [ - 20200412, - 2355 + 20210503, + 531 ], "deps": [ "imenu-list" ], - "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175", - "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7" + "commit": "8126baf45c881fd4a692c2d74f9cc2eb15170401", + "sha256": "1vb5id0y9002yabkxijfi0l8vbibbd863kq4qk3gqax9dgbld481" }, "stable": { "version": [ @@ -61004,8 +61215,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20210406, - 1038 + 20210502, + 2049 ], "deps": [ "dash", @@ -61013,8 +61224,8 @@ "flycheck", "s" ], - "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90", - "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg" + "commit": "bf32bb97930ed67c5cbe0fe3d4a69dedcf68be44", + "sha256": "1bkv5zs38ijawvavbba0fdf2flb6fiwici3qi99ws8wvwhnbkws2" } }, { @@ -61080,14 +61291,14 @@ "repo": "DamienCassou/ledger-import", "unstable": { "version": [ - 20210108, - 728 + 20210419, + 818 ], "deps": [ "ledger-mode" ], - "commit": "d1eda3ccafbfabbcc51be364146e31450f11745f", - "sha256": "0w6qgqmcv1nyrgjqrb1ah4wj94rn7zn00g0kib4vmc83wcnmyrjb" + "commit": "f77adf79ce67524c3e08546448ac88ea1a665b64", + "sha256": "1zgv3sxg1dwg7dgy0cl5df6nkxp79cg906hskxsdx6yfplxvi4px" }, "stable": { "version": [ @@ -61110,11 +61321,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20210329, - 2024 + 20210429, + 134 ], - "commit": "3b0fa5c22bd196dbe31a19f4b2ebbdf8f4081b20", - "sha256": "1igg1dmsn90crggm11xnlhrc36szr3dfc4463dn65cagwlck3g3k" + "commit": "58a2bf57af9289daeaac6892fa4008ea8255b205", + "sha256": "0sbyagz93yvr1a0y7k0nki7030drr27i3nqhwflsdrl0hy4f9iwr" }, "stable": { "version": [ @@ -61423,8 +61634,8 @@ 20201007, 2214 ], - "commit": "5677410abffa1d1bc66b867be8918f1423fd586b", - "sha256": "1lcyd7gh2d72vx47dh375d50qcf7xnx888xrx76yc5zfx2df4p80" + "commit": "dbfd16af065b12d2dbce26ff1fbad151765243fd", + "sha256": "00dbbyx4m32j7qw2b83p7hx7z2ydixv8zr04l0bzalnnm34yb38s" }, "stable": { "version": [ @@ -61670,21 +61881,17 @@ 20210303, 1751 ], - "commit": "d029f4d1738dad616df1a56b570cdf1e725cd967", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 286 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 612 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 1232 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 2325 ms\nerror: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503\n" - ] + "commit": "09e4da2dd9f6f1ecf5e1f19b9cd7566c465c05fd", + "sha256": "070fq9drdb6b4zbkc6qvkd99qjy0nw3x3nlrr13xzg51lpbmzi3d" }, "stable": { "version": [ 0, - 12, + 15, 0 ], - "commit": "70d42b3922d152e8be946c2415151d0551b591d4", - "sha256": "17k0v1nfcsq5kdfk05cdkh8nbbi5bqniydqcr6whzw3aawnjryyc" + "commit": "3c816a579cde789d9d6dd0a387577d4a997bfe3c", + "sha256": "070fq9drdb6b4zbkc6qvkd99qjy0nw3x3nlrr13xzg51lpbmzi3d" } }, { @@ -61695,14 +61902,15 @@ "repo": "jcs-elpa/line-reminder", "unstable": { "version": [ - 20210216, - 1451 + 20210426, + 1859 ], "deps": [ + "fringe-helper", "indicators" ], - "commit": "bc488bbdba2172629183891758cfa9466a64182f", - "sha256": "1993rwd9bgr1lqxgxzwp6h2r57ljsbjh5r08f57jaalanjp4iq55" + "commit": "8c9f824b1dc67c8489afef05b06d9525b29dab00", + "sha256": "0qr7qvcl6rlsagim3y71im24z85l3f7cvj39r0g77mnhm733z9m3" }, "stable": { "version": [ @@ -62361,11 +62569,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20210318, - 350 + 20210424, + 918 ], - "commit": "6979fc6369d55519d52ca1e8f7d80d73ce54c383", - "sha256": "180lsghxcjrn21c79jl7g9kkvd4lf4xabgbwbqlck7barfj256jv" + "commit": "3e00b497711ac78f0ac26669e35f375451f6711a", + "sha256": "0gpg60xr86qx2ib5q9ig5pi9lmhk5vjsb7fh5g6kifvsch31cry3" }, "stable": { "version": [ @@ -62458,20 +62666,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20210411, - 244 + 20210413, + 205 ], - "commit": "23b4308caddf02cc0312ebe4d971e3bfab22f3f8", - "sha256": "1zfqdbbknjdg73g1jdy758dln6hgi1rq6j0xpyasyasj169j1nxh" + "commit": "d799d074300aa7f1d78024167513a2316cffc204", + "sha256": "0dcz2npdf51284wq3c2sw7cq9r9z13irx9y06qi1xaxxv0p4r7z2" }, "stable": { "version": [ 4, - 3, + 4, 0 ], - "commit": "c6d3d34bae62f1d5e986625db74f2076af258900", - "sha256": "1d022chhib61ghrf847f2w9baqiscpp1s2qvj9i84zmk7bndjvag" + "commit": "26d51013e75ddedd5eb8600a0a3dd035319f9d3f", + "sha256": "10p4ijx4l56ikb10416bmdwfxbcyqfa29kk1nf48gibxyvdlwdby" } }, { @@ -63090,8 +63298,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210406, - 2012 + 20210501, + 2348 ], "deps": [ "dap-mode", @@ -63102,14 +63310,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "10e309acc31648ec9bf7ffeef0fc2ad16b2a8584", - "sha256": "1wm0lxllazfxrrv4cgalcnsf7g88g1cwz7b69dxfgirlcybcw9il" + "commit": "257d881ceda1c91d681787a9cd71d1831cda173c", + "sha256": "1lf8xs1z4y6a6kywykraiz0w7nqlrq9ibwwr4zpgn0bqh5fbgy5q" }, "stable": { "version": [ 1, 18, - 0 + 2 ], "deps": [ "dap-mode", @@ -63120,8 +63328,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d", - "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk" + "commit": "40a86d6547c5625980201f6f772f0d28d09d1aa7", + "sha256": "0gwx4i4plb836hkmzvp1krx9n7vn39as3lzpmbfbnpcwny45aj3k" } }, { @@ -63183,8 +63391,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210404, - 645 + 20210418, + 1806 ], "deps": [ "grammarly", @@ -63193,25 +63401,24 @@ "request", "s" ], - "commit": "aa2e70eec5755651ed6c9d9f4063542634760c91", - "sha256": "0qisz5117ifravbwvnaq2ci62v3sxl2dd1bd9giacscvshx2hw2c" + "commit": "aff219380a7d192a37c8c25823b6bfc816bae825", + "sha256": "0ghqmay00r7lfmqx57r5kkldkgr4r20fb5xqh3i440wjdw8m3i3p" }, "stable": { "version": [ 0, 2, - 1 + 2 ], "deps": [ "grammarly", "ht", - "keytar", "lsp-mode", "request", "s" ], - "commit": "739a7efc7de6e2b0eca9e72268790431a0fb3185", - "sha256": "1ksa685ggp9z0zndscwy9azxjibxd9l79qzvh50i7mz4x9xzdjbd" + "commit": "984037557b7e445183453faffc965fbe56df12f2", + "sha256": "12q3j0sgsgm73m3i0sw72dzkqa55zn0dbqjgp0g2wryhfhg0zq1p" } }, { @@ -63292,8 +63499,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210309, - 1856 + 20210501, + 500 ], "deps": [ "dap-mode", @@ -63305,8 +63512,8 @@ "request", "treemacs" ], - "commit": "542aaf16d6d3a410b0e41861d80f3fd6b5be7bb9", - "sha256": "07kpx8gx9v9v6zhpl7kyg3q4dgpkxk1n089cn1hdxr5vapw7xac9" + "commit": "9685334086c0b09d2bb16f631fb368f4ce931764", + "sha256": "0lzwwamdlyynq6lybhzcg8w7hmyraz7nhawk4nib0nfjawkr9jxm" }, "stable": { "version": [ @@ -63355,26 +63562,26 @@ "repo": "fredcamps/lsp-jedi", "unstable": { "version": [ - 20200812, - 1826 + 20210419, + 2007 ], "deps": [ "lsp-mode" ], - "commit": "10c782261b20ad459f5d2785592c4f46f7088126", - "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb" + "commit": "a6a6dcfbab69caee0b88dbe4244772e0bea5531a", + "sha256": "0l2dawi7avzb9i1wfff4kdfbz9s7vp4443y7x3va0jrsn3v33485" }, "stable": { "version": [ + 1, 0, - 0, - 1 + 0 ], "deps": [ "lsp-mode" ], - "commit": "10c782261b20ad459f5d2785592c4f46f7088126", - "sha256": "0rip6fq5mwk2lsa0wwr573mx4myqvc8a7v4mqalmqxgwzcv9w7vb" + "commit": "a6a6dcfbab69caee0b88dbe4244772e0bea5531a", + "sha256": "0l2dawi7avzb9i1wfff4kdfbz9s7vp4443y7x3va0jrsn3v33485" } }, { @@ -63398,15 +63605,15 @@ "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "72e26d0c1d34e3dd16ff6427af883bd0136015d3", - "sha256": "0f4zmvn13x468p6vpfixx3ghlrygdgdyx8xpb7nx232pv38156dn" + "commit": "81f7de5b9fe8e8e0e1e3a3ccc677f052edad140d", + "sha256": "1hwkx5ssix2si7jpsbfcg1i65v3z265l39158qjm31cxf8pk52dw" } }, { @@ -63447,8 +63654,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210410, - 615 + 20210426, + 739 ], "deps": [ "dap-mode", @@ -63457,28 +63664,30 @@ "ht", "lsp-mode", "lsp-treemacs", + "scala-mode", "treemacs" ], - "commit": "a603e9ec3d5f926774a8facb045f33eaa6df9037", - "sha256": "1pxfvmkk64v0sd7ghwj3dmhf7bbfh8wk2apxvckdq76l1wrd8izs" + "commit": "5aea52dfe08b8f5936ea3982be6c25339f652eba", + "sha256": "0ca5xq1l3lscx36pcdnpy2axgyikjrl18naqr140kr1y500sy37s" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ "dap-mode", "dash", - "dash-functional", "f", "ht", "lsp-mode", + "lsp-treemacs", + "scala-mode", "treemacs" ], - "commit": "efefcc0e936ec463f0d19b6cae7c8336dcd186e4", - "sha256": "01396r17ipmp0s5k5njm8m4vqw0g1sj9rq6dpkxv7wbad1c4izmx" + "commit": "5aea52dfe08b8f5936ea3982be6c25339f652eba", + "sha256": "0ca5xq1l3lscx36pcdnpy2axgyikjrl18naqr140kr1y500sy37s" } }, { @@ -63489,8 +63698,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210410, - 1801 + 20210503, + 1350 ], "deps": [ "dash", @@ -63500,8 +63709,8 @@ "markdown-mode", "spinner" ], - "commit": "65fb3e8d071406c4596dcc13e3f0230e1f730ec6", - "sha256": "1cdhgmqzg9dj491jqwfnqjdjkl4ki3gkpfn386mb5hwfl5aiv5pf" + "commit": "b2606d928222556552fab59a12da72e1fcbce6ed", + "sha256": "1yifkqhi42awvmdlq4253qn1cq8mcsrdpaz79y04jpd1a4i2wz10" }, "stable": { "version": [ @@ -63649,16 +63858,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20210220, - 1714 + 20210430, + 323 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "65fb14128127fb1ddf68dd4cb3140d6c7911a093", - "sha256": "0qhs4cv01b7aqq5r6bk91xgwsp8yg1bpn68xk90iirsxlgfb1ffq" + "commit": "6163527b4801c0e521d5d2e1d6ba90b8774ec946", + "sha256": "1c0d6cnk8w9zgq17c8aw22vvlrr38nm2gixddwcsxhkzb1gg06cf" } }, { @@ -63751,14 +63960,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210330, - 323 + 20210414, + 855 ], "deps": [ "lsp-mode" ], - "commit": "5df10c36d3162982f5100b8c66af957dd05712cf", - "sha256": "0vl5gajg1w5qrzafvkqrbkb9dlja4ina2i3gs6pfv1jrn473h8p7" + "commit": "b95e0e2db9e1561719c7f7815e7787fe71392871", + "sha256": "0a0746sjq40jxgpqdv3iixwvf97fnpj8wfyy88cxg2w6sf72scdl" } }, { @@ -63769,8 +63978,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20210411, - 1507 + 20210502, + 1804 ], "deps": [ "dash", @@ -63779,8 +63988,8 @@ "lsp-mode", "treemacs" ], - "commit": "4cfb46d7fe69cc537a8a86389c5d8d9fd3fbfabe", - "sha256": "0ca20xdmk0c5w3hpimly6pl355sjvzjaq3nwfaw3p6qr9sx1sy9w" + "commit": "b07868740d6f7d364e496048cee00bce10a6ab33", + "sha256": "1g8qkk6g67myz8rjvwa7iysrj0xpf0kcwrcdvf4dkc3rgh3kzm2v" }, "stable": { "version": [ @@ -64279,8 +64488,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210411, - 2036 + 20210430, + 404 ], "deps": [ "dash", @@ -64288,8 +64497,8 @@ "transient", "with-editor" ], - "commit": "5882df245d3388cd6f443bc11df219a838104df2", - "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" + "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d", + "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw" }, "stable": { "version": [ @@ -64469,14 +64678,15 @@ "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ - 20160226, - 930 + 20210414, + 1334 ], "deps": [ - "magit" + "magit", + "transient" ], - "commit": "ece6f369694aca17f3ac166ed2801b432acfe20d", - "sha256": "0mms0gxv9a3ns8lk5k2wjibm3088y1cmpr3axjdh6ppv7r5wdvii" + "commit": "31f5ce30e374716818df7deb0cdbf462ef67e679", + "sha256": "08pwdjknd7407922w7gli76ji87zqj9j87sinhzjc38cnlhvm77n" }, "stable": { "version": [ @@ -64635,8 +64845,8 @@ "libgit", "magit" ], - "commit": "5882df245d3388cd6f443bc11df219a838104df2", - "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" + "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d", + "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw" } }, { @@ -64790,8 +65000,8 @@ "deps": [ "dash" ], - "commit": "5882df245d3388cd6f443bc11df219a838104df2", - "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" + "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d", + "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw" }, "stable": { "version": [ @@ -64835,26 +65045,28 @@ "repo": "emacsorphanage/magit-svn", "unstable": { "version": [ - 20190821, - 1455 + 20210426, + 2114 ], "deps": [ - "magit" + "magit", + "transient" ], - "commit": "2cff1a30a30f2b3963342a7d185ec13fc12279c3", - "sha256": "0c4bn9wjjwb0f6hzh7d6vz33lrf75kal62329drzmbh1sla2s3h3" + "commit": "350493217afdb7637564e089f475909adecd9208", + "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd" }, "stable": { "version": [ 2, 2, - 2 + 3 ], "deps": [ - "magit" + "magit", + "transient" ], - "commit": "99601f47f47a421576809595ca7463fd010760b1", - "sha256": "00lsfkmsz26pz1paqn73skgx747250vc2pa0n8n0h7ywxj9dkzvb" + "commit": "350493217afdb7637564e089f475909adecd9208", + "sha256": "1v1y4fir1plz4kj0cvkcd29wibli4dw7vp4fmbxq4df76d8iy8yd" } }, { @@ -64865,14 +65077,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20210327, - 350 + 20210503, + 340 ], "deps": [ "magit" ], - "commit": "99cb9c0501f0f1ea7ec3ebf0fb398f3d36cddafb", - "sha256": "189c4hrgbrwx44nidf4xv30yyb2y7lid57by0fn9hyi21nbk2gmx" + "commit": "3958523f3e76254b19efd3f32b0a968685fce185", + "sha256": "13va4wviimkpw67p52nl8zv6sb9f738r47yk1xlf4fh0yd48bsj6" }, "stable": { "version": [ @@ -65580,19 +65792,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210409, - 2305 + 20210430, + 1736 ], - "commit": "668265af921285c726b2239dae32459bd1064d03", - "sha256": "1kl516mzcpdam787x5k55s0crspacvxnz2zqz5m32b13xl2pr847" + "commit": "d1b836db16cb693293a2cb7064e5cf9df625df2a", + "sha256": "02zbxkzsd7166vpkqv16kmlbxpg7l0xnf784wjay1ngkh55ihvdq" }, "stable": { "version": [ 0, - 4 + 5 ], - "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f", - "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh" + "commit": "5126ba6244e13e3e2cf608e7f3955377bcbd8c04", + "sha256": "07vfidgq9am07zz2ydhdifmp4jmgs9jn5l1nfqiyp16sd1br6czj" } }, { @@ -65700,11 +65912,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210405, - 1349 + 20210429, + 1605 ], - "commit": "ac9ea26b941eef512a3c206375a6404625c229ed", - "sha256": "0nszqrx6nfdzlib3w6l5pmzmgnrwzmvzlz7hv46x4iqzyxjg2jsn" + "commit": "94c65e2de2e10b7f3a5e72d412c64ab83b2b1a5e", + "sha256": "1lbxr6g53sz0nd3za44m6ixs6770zkdayihrm1bq2ip2xidl4kh7" }, "stable": { "version": [ @@ -66650,16 +66862,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210410, - 1837 + 20210427, + 438 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "6eb10d223fb7e0d87ac7ab7063fdb3951934e94c", - "sha256": "0b1s51yfklm52j2g0gnrwdahr1jql1fv93sn7inm5c1ygx3agc7c" + "commit": "e05a81e3793e370f04f414de8cb52948fe38e606", + "sha256": "1svw39xa9i7j0qiwbzjhw5lbcnqf7ipjz0dk29jhkxjzkk41qspk" } }, { @@ -66673,16 +66885,18 @@ 20210408, 1014 ], - "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", - "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + "commit": "08e24475ec498105993a3e47bf032c088fe2e302", + "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m" }, "stable": { "version": [ 4, - 1 + 2, + -4, + 412 ], - "commit": "ab02f60994c81166820791b5f465f467d752b8dc", - "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99" + "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", + "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" } }, { @@ -66700,8 +66914,22 @@ "auto-complete", "merlin" ], - "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", - "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + "commit": "08e24475ec498105993a3e47bf032c088fe2e302", + "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m" + }, + "stable": { + "version": [ + 4, + 2, + -4, + 412 + ], + "deps": [ + "auto-complete", + "merlin" + ], + "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", + "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" } }, { @@ -66719,8 +66947,22 @@ "company", "merlin" ], - "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", - "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + "commit": "08e24475ec498105993a3e47bf032c088fe2e302", + "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m" + }, + "stable": { + "version": [ + 4, + 2, + -4, + 412 + ], + "deps": [ + "company", + "merlin" + ], + "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", + "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" } }, { @@ -66767,8 +67009,22 @@ "iedit", "merlin" ], - "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", - "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + "commit": "08e24475ec498105993a3e47bf032c088fe2e302", + "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m" + }, + "stable": { + "version": [ + 4, + 2, + -4, + 412 + ], + "deps": [ + "iedit", + "merlin" + ], + "commit": "fe7380bb13ff91f8ed5cfbfea6a6ca01ee1ef88c", + "sha256": "0dlrxss3i1z584l0dack8v3pf02bimx8bydqkj3bfiljqsi912v1" } }, { @@ -66963,20 +67219,20 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20191018, - 242 + 20210422, + 326 ], - "commit": "c7f72a87952ed16323fce968462af897235f1719", - "sha256": "0v8zkzai5gfzng9dpkikwf60rvsr1148y5nb7hw65961xms855s4" + "commit": "c1b386f3522054f063f4ac60730397ed1f724478", + "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" }, "stable": { "version": [ 1, 1, - 10 + 11 ], - "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab", - "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr" + "commit": "c1b386f3522054f063f4ac60730397ed1f724478", + "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" } }, { @@ -67020,11 +67276,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20210131, - 740 + 20210416, + 33 ], - "commit": "8c6bc6bf9562beb74b3b4fda47b2fe473139eb1c", - "sha256": "0bf30kkrmi0qw8i0viv1dnvrd52a66rp6vcklidrnv4dh5b782n8" + "commit": "380d6059fa9f102e736969d086749980820a9e0e", + "sha256": "03fxicfl7yvxj6ac636544km1khhmrjqi97r0smwqfxvlm2gs037" }, "stable": { "version": [ @@ -67089,11 +67345,11 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20200104, - 108 + 20210131, + 2152 ], - "commit": "76ede10e0a0433d8aae6b3b4e132ca9dcce5ca75", - "sha256": "1n6avpk8ggpjqiin1qrwc3g1rjgq902cgks1kfd2r82bkri2sq1q" + "commit": "48fa796ab1669dc275b8c99238fff6c83ad2fcc6", + "sha256": "0rn7ahpj2kjkmy7gq4fj0n99af70xxxykyjqsza1nnizxfgmrpwj" }, "stable": { "version": [ @@ -67643,11 +67899,7 @@ 1900 ], "commit": "519e05f74825abf04b7d2e0e38ec040d013a125a", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 301 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 515 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 1011 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 2434 ms\nerror: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503\n" - ] + "sha256": "1yf21gm4ziplmgx8yn7jqq45mwfiindbrman7fc5b9ifq78x9ryn" }, "stable": { "version": [ @@ -68010,8 +68262,8 @@ 20210215, 2345 ], - "commit": "02b1da6278e43cc9cc0356110cc6bfbb37eb8241", - "sha256": "0ky330b2sfbzkbxbfp9b21hdywsjw26bllspglz08hrbni7jmry8" + "commit": "8454a5ef404c6f4fe954a10da6ce4fd4311decfa", + "sha256": "01aq4bgris8v7q0yfyz1928q4rh9mba3b799zw2df8slqiigbf8i" } }, { @@ -68118,24 +68370,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210411, - 751 + 20210503, + 743 ], - "commit": "3c9b98f61e9b781f756ac7a329005156406cae5a", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 595 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 1101 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 2792 ms\nerror: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503\n" - ] + "commit": "29fd33c19442c0be605830f0e01fc6789e2fa9a7", + "sha256": "0d3i07g8sxg30llzx519ph3qp4bx0vk0xy80sxhy5vra2l30ihlj" }, "stable": { "version": [ 1, - 2, - 3 + 3, + 0 ], - "commit": "0a36239baf908585cdf32c6188eb86713d9bf6c6", - "sha256": "1l392hz6zs6wg06x2zxnk7s0h5cpmvbkcynh68gjmqjj84l7mqrk" + "commit": "69248a97c9da98de786891215ab6baafcc44a55d", + "sha256": "0d3i07g8sxg30llzx519ph3qp4bx0vk0xy80sxhy5vra2l30ihlj" } }, { @@ -68170,11 +68418,11 @@ "repo": "sergiruiztrepat/molar-mass", "unstable": { "version": [ - 20210324, - 1832 + 20210426, + 1754 ], - "commit": "5b7d1d0004d27580e980fe8532658cd09174342e", - "sha256": "18s2np5wflbg0y6ffnjcbljyh3b5qsnjkma6dcl3razfr55mzmgn" + "commit": "27d3a305a9efe3ae8b57ec52cc644c219d0952eb", + "sha256": "09kmfq2klh446zdwnxa51z2i39f7p8f8f2wzcz874sm8nf10vszh" } }, { @@ -68290,11 +68538,11 @@ "repo": "ananthakumaran/monky", "unstable": { "version": [ - 20201226, - 1950 + 20210417, + 12 ], - "commit": "e04632277ef24acacc029ae29db1fadc458ae83b", - "sha256": "0xzn9fgxvbpgx5wky8vdhd3bw7hy6h6hngx7l8a0qspg560r7hz1" + "commit": "72c7cd21b7b995c476e938fd0b92a494aa25c3a7", + "sha256": "03khwadd3x3s9wrggdfjj8cff0nr64fj6hzc9yqbn2baxfkgrn8l" }, "stable": { "version": [ @@ -68502,11 +68750,11 @@ "stable": { "version": [ 1, - 5, + 6, 0 ], - "commit": "d0076ea22b2afc4c3faeea2138e836b1c8f08988", - "sha256": "0hz525xmv6kslss3yn8ibj6bi2xp442knad0030px7giia6y1pf6" + "commit": "f94cf84138a81212ffe856599834f7824a1b6e95", + "sha256": "0rdvcv8hwrxxbb9s8sfx5331a08kdk28x8chnnq3pj58pxqvagy3" } }, { @@ -68828,8 +69076,8 @@ 20210306, 1053 ], - "commit": "1ddec765e033d22079627dc14a06a204134e1b28", - "sha256": "0is1il0xws1k31p67s4xvpql7qm4rrv23fj2szdmfdds9f7qpp18" + "commit": "fc187dafa37aa9d3d9493c5506eb9089bf4eb884", + "sha256": "0zc81gyvp1aqjy21i298wgji4am32cmwb0ahz66ixxlz0f4zi8pz" }, "stable": { "version": [ @@ -69426,27 +69674,31 @@ "repo": "mihaiolteanu/mugur", "unstable": { "version": [ - 20200831, - 702 + 20210428, + 730 ], "deps": [ "anaphora", + "cl-lib", + "dash", "s" ], - "commit": "34dfba027bf11e4cca2c547ce80b73d7324c7ba6", - "sha256": "011qr9jc90arg3y8y49hjmv94968ym81a36db0dvxyf08hspz006" + "commit": "0381bda4cc6f8634131bbc0e5c3efe548703b0fb", + "sha256": "1k8g6xb8iw9i4dq30mm1x0534bhby93pvfbrzc2qc8lvakza6n7l" }, "stable": { "version": [ - 1, + 2, 0 ], "deps": [ "anaphora", + "cl-lib", + "dash", "s" ], - "commit": "34dfba027bf11e4cca2c547ce80b73d7324c7ba6", - "sha256": "011qr9jc90arg3y8y49hjmv94968ym81a36db0dvxyf08hspz006" + "commit": "b8ebfd18a579b834d062082a8018f73561a0cde1", + "sha256": "0a7yd9y6nfyxz9qc84yrn8ii2z6359vhj8if3bx6b0hi8g03m4xl" } }, { @@ -69680,8 +69932,8 @@ "deps": [ "cl-lib" ], - "commit": "7b13b03c995e13ad86e499d40ec49c4dc281f889", - "sha256": "1fysnjbh0dai1bzx4122fp4qhbyn82m8hh3smd0xhwphjwrbnl57" + "commit": "616fbdd3696f99d85660ad57ebbb0c44d6c7f426", + "sha256": "10raq8p881zzz7si3wfpcgdnwyl8y7y9rgw28akyigjyq8knl6kf" }, "stable": { "version": [ @@ -71117,8 +71369,8 @@ 20210318, 1654 ], - "commit": "a4d9d69442c9edac3f2cacabd2a7401dbefe7ff3", - "sha256": "1h828cxjacfqlhm719w2kwh91i0r1lai6wswpp7wp21wvvp28v5r" + "commit": "7e9ad5a617a26641988445503e235c68fa21b611", + "sha256": "1wy06kphgljlcnl55qx5g8hzcv9bnfrrp22pfsxpyawlrmmgxp1j" } }, { @@ -71248,6 +71500,21 @@ } }, { + "ename": "nix-modeline", + "commit": "6257a28862614c40db5ca933338e69faf7999eab", + "sha256": "0c3hr7l3d7qz83hgf3d4i171aya36qmfyvc5qzq7x0qdhiwavjpz", + "fetcher": "github", + "repo": "ocelot-project/nix-modeline", + "unstable": { + "version": [ + 20210405, + 742 + ], + "commit": "611ec73a72aac156511e9e3e61ee413ade9af5c1", + "sha256": "0jgzji627lfc4l4lnpv0j4570b4n89jn5a7p9s7c8xhww5w04z1i" + } + }, + { "ename": "nix-sandbox", "commit": "66be755a6566e8c0cfb5aafa50de29b434023c7a", "sha256": "13zr0jbc6if2wvyiplay2gkd5548imfm38x1qy1dw6m2vhbzwp0k", @@ -71388,26 +71655,6 @@ } }, { - "ename": "nm", - "commit": "cdad6565e83dd79db538d3b6a45e932864246da2", - "sha256": "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw", - "fetcher": "github", - "repo": "tjim/nevermore", - "unstable": { - "version": [ - 20151110, - 1910 - ], - "deps": [ - "company", - "notmuch", - "peg" - ], - "commit": "5a3f29174b3a4b2b2e7a700a862f3b16a942687e", - "sha256": "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak" - } - }, - { "ename": "nndiscourse", "commit": "1d6a236cd3ff51f2d4cfca114b2791c8ac7411e8", "sha256": "03kfb8c7knnd1n5sxxpldmscbwi5lrnsyh6w2ji4pvaq5xhmrlxb", @@ -71541,13 +71788,13 @@ "version": [ 1, 2, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "96ed5b8ecad8bcdcd212aacd9957276be3cf128e", - "sha256": "00chkzpjcdll907vpzfzmf9p3jprisnr8i0h1x5gixidwbfc2whi" + "commit": "57357e15643158b4e0d9b3b4f70a82f5fc73178a", + "sha256": "1kbbbx1agzcxc5n1b6cavdx3wjxz6mgi9rafja8mk8cyaaiz0rkd" } }, { @@ -71837,17 +72084,16 @@ 20210205, 1412 ], - "commit": "1459217e17e94277495c5c644b5a4ca1651c9452", - "sha256": "1p1g816ansbq388pqclckcjs0cgl38p0gc77rrgmab3mccdvib2r" + "commit": "63413a5563450bdedee4c077f2f998578e75083a", + "sha256": "0n6z9858l5yp89dv9y494f1xvs52rxr8qacn4rj3fm2n6h0v63p8" }, "stable": { "version": [ 0, - 31, - 4 + 32 ], - "commit": "3a3208bb7b8bfca1c0bcaa5b45b6ef71aa768612", - "sha256": "04q9zwy6mpck82zk70xnx2knh2jmqhf676703kjw0fbvdrzw9qik" + "commit": "5fe92332f2dcff460dea1f2aa78717d1954df62c", + "sha256": "1sgjjcc53ys8pspblbif24min5gg7l71xakhrvmb4xniw4rg2qx6" } }, { @@ -71917,26 +72163,26 @@ "url": "https://git.sr.ht/~tarsius/notmuch-maildir", "unstable": { "version": [ - 20201028, - 1330 + 20210416, + 1043 ], "deps": [ "notmuch" ], - "commit": "9f3e8bbce4c8c6cd80fb71b92d315d4f3334b450", - "sha256": "1rrd3ymc7k8irq1w4496h4whks7lnfam7ibfwgcra074ligfrs4p" + "commit": "e34c470521e83c3100f0d6eb9e7402ae35e19321", + "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "notmuch" ], - "commit": "8c641d9688f20262c9dac59901aaecd2a21525d7", - "sha256": "1nh7vkxhwb2cmm8g7gxh3rc6lcfqlhsbf82vi3lsbdq008p1b3kh" + "commit": "e34c470521e83c3100f0d6eb9e7402ae35e19321", + "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q" } }, { @@ -71961,14 +72207,14 @@ "version": [ 0, 3, - 3 + 4 ], "deps": [ "dash", "esxml" ], - "commit": "0ece7ccbf79c074a3e4fbad1d1fa06647093f8e4", - "sha256": "116klnjyggwfwvs9nqhpv97m00k63q6lg41ph41kywsqkfy42dlk" + "commit": "b3c7cc28e95fe25ce7b443e5f49e2e45360944a3", + "sha256": "0va9xjrq30cv5kb59a4rq5mcm83ggnv774r8spmskff3hj8012wf" } }, { @@ -72131,6 +72377,18 @@ ], "commit": "a5508d9958c2148c04ec32d7b3a9f72423e4b0aa", "sha256": "1d1snvxbdv0mh48jmi6dx0yr4hmblcq1aajxb1z56714702ycdgj" + }, + "stable": { + "version": [ + 0, + 9, + 0 + ], + "deps": [ + "org-roam" + ], + "commit": "c150603a25445d65b7b08d658793a6019fd763ea", + "sha256": "0qip0vhyvif5az7zph1m41gwamz84v01ay9qzicydzbizhzp4n5i" } }, { @@ -72531,16 +72789,16 @@ "repo": "astahlman/ob-async", "unstable": { "version": [ - 20200921, - 205 + 20210428, + 2052 ], "deps": [ "async", "dash", "org" ], - "commit": "de1cd6c93242a4cb8773bbe115b7be3d4dd6b97e", - "sha256": "12n6fvjiwkf02aypvj5zrbjrxhz2p0rcq2k3mfz5ravyarpvrybp" + "commit": "9aac486073f5c356ada20e716571be33a350a982", + "sha256": "0k0jcha7cckj8dc2cc1a6m2yhagsl5bmlnr3p8x3g8ij1axk533h" }, "stable": { "version": [ @@ -72583,11 +72841,11 @@ "repo": "corpix/ob-blockdiag.el", "unstable": { "version": [ - 20190720, - 1858 + 20210412, + 1541 ], - "commit": "272fafcf3bc37f9de41b11beb6a33e0dbf0a1909", - "sha256": "0gi7vnh5fchbjb7hp7yi08z2vqkmhjrg64ssir358qxqambxvrxb" + "commit": "c3794bf7bdb8fdb3db90db41619dda4e7d3dd7b9", + "sha256": "14lw5y8djl9ff71layshz4rrmknp4kisv9lak26d9lh1l2z69fi6" }, "stable": { "version": [ @@ -72858,28 +73116,28 @@ "repo": "frederic-santos/ob-ess-julia", "unstable": { "version": [ - 20201109, - 911 + 20210414, + 1444 ], "deps": [ "ess", "julia-mode" ], - "commit": "b97ebf19c3d68ff946584e78ab7943f8a691ebe5", - "sha256": "1g9p3i6iwhgh6wj1k326lswms59nx4n1dyb7rr1qia1d0y3k1zym" + "commit": "147e9e7fe55c41dd77171417e92af40db3530b84", + "sha256": "00wplflc4pp0ffhnkya19cqm3ihz8mybfj2ywk3ii2d9x08kjnp3" }, "stable": { "version": [ 1, 0, - 0 + 3 ], "deps": [ "ess", "julia-mode" ], - "commit": "337df3eefd85c01020fe08eae3ddcf3ec3e4ac2d", - "sha256": "0pk4b6zg08nacds129frk3qwn0mlm4sg03gihyn42fd8iq16mjzf" + "commit": "147e9e7fe55c41dd77171417e92af40db3530b84", + "sha256": "00wplflc4pp0ffhnkya19cqm3ihz8mybfj2ywk3ii2d9x08kjnp3" } }, { @@ -73031,6 +73289,35 @@ } }, { + "ename": "ob-julia-vterm", + "commit": "6e5f9703d8d4f9e5272db5be2c2bd89dfd27f32a", + "sha256": "0bkjqln8pi6j0lq5ch68v2r2rb2zbdch3g63kqjwskadgsypgfpj", + "fetcher": "github", + "repo": "shg/ob-julia-vterm.el", + "unstable": { + "version": [ + 20210418, + 2306 + ], + "deps": [ + "julia-vterm" + ], + "commit": "3e7ff901687c320869c5e17e3273185af68e8cd6", + "sha256": "0i155p3k2xf0p00xazqjw4llylb13svgad9a9m6as6lcvrvc0zsp" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "julia-vterm" + ], + "commit": "5893d75cdb9e687b98b99b3675165f4edf0083a6", + "sha256": "12ya7dn7fd0szm6pi68f7h4cyb5cy56cfs43nl9f4v8v2qvlyh5y" + } + }, + { "ename": "ob-kotlin", "commit": "7aa74d349eb55aafddfc4327b6160ae2da80d689", "sha256": "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx", @@ -73596,17 +73883,17 @@ 20201204, 945 ], - "commit": "fd078c3a37cb679dfffe890995a4e6a1f63ece15", - "sha256": "0vq3nnjk76i947wjmfddbr1fs6m8dkddlrqcdsvsf2xw2xfpsfvs" + "commit": "876682f6deef7306d7b16322464cc5ad05193494", + "sha256": "1jrf8jlp18pnwk99x2181b01mjgk3p6jj2ik29n5sqdg9p5q8czy" }, "stable": { "version": [ 0, - 17, + 18, 0 ], - "commit": "bfd6bbe95c614d1d982244c4fd0ba494275d2245", - "sha256": "0vy69sjl184czpwbhcbgzyh8kgj6n3jq8ckllcbwic859aq8lqvn" + "commit": "3697f0f92854a681fd1156fe4f6fb97d060da1d8", + "sha256": "0n6363km8xr81pvyk453n6h2mb0256c5yxw3p1li4dn83f3lwxr1" } }, { @@ -73790,30 +74077,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210405, - 820 + 20210418, + 707 ], "deps": [ "org-re-reveal" ], - "commit": "1150feb761047e241af1c5e67333665e729a4a63", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 298 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 617 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 1257 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 2660 ms\nerror: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503\n" - ] + "commit": "9f13380845c9eb69c45ad23888709cce0060d14d", + "sha256": "1r0l93w5lwczwl6p65yd2agvx46r06pf4znpvgcv3sg473f6hvj1" }, "stable": { "version": [ 3, - 17, - 0 + 18, + 3 ], "deps": [ "org-re-reveal" ], - "commit": "e880c4f65ad20e22ab845fc2918ca74cc37bf39a", - "sha256": "197fn08xhk6cbvi4hqf51v40x0ki5n8h1896g3bpl4fasfy5zicp" + "commit": "9f13380845c9eb69c45ad23888709cce0060d14d", + "sha256": "1r0l93w5lwczwl6p65yd2agvx46r06pf4znpvgcv3sg473f6hvj1" } }, { @@ -73918,20 +74201,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20210202, - 709 + 20210503, + 850 ], - "commit": "61d26644fd9dd2d45b80b9b82f5f930ed17530d0", - "sha256": "1nvnahwjqs9i2cinkpwg689lg134wp7l6f9f1k1jwn0dh1amqmvp" + "commit": "6f6c935dabe669a95196e459c0e516d31c711e45", + "sha256": "07jssr5v4l20dg24m15wbjzzfn8icnypx0k04d0zqyvmzz8hwkvg" }, "stable": { "version": [ 1, 11, - 3 + 4 ], - "commit": "a2dbd3dc4e7000fec29febbd089cd4558a7322b9", - "sha256": "0zcph7l0hxisbvsyzb1dw3paq5a5sjp5lrq5nq9zggvgc6zvx7sh" + "commit": "6902410cd857385a3c1aa20ba391901a78d2740b", + "sha256": "1pw1zc0pdwwi9dv8fypfxgn6xbfvm88qzhss880lspialff1wcxn" } }, { @@ -74371,6 +74654,29 @@ } }, { + "ename": "openfoam", + "commit": "f184e09d370d563852da2028b9c2546d6fc162c0", + "sha256": "09i02kqgw3mqvwzj4p23p66rpy30ziz4gxczs8p47l6ilw5j69rz", + "fetcher": "github", + "repo": "ralph-schleicher/emacs-openfoam", + "unstable": { + "version": [ + 20210502, + 1738 + ], + "commit": "6447c666d7446865860f1490856373d1de4a11fe", + "sha256": "02sc61gnn25pfc38shi8ybmg8d4228vk2lyffxj7pszxz6sjya92" + }, + "stable": { + "version": [ + 0, + 11 + ], + "commit": "2c77f46ec7bd4bd8fde694a7b009ec42730199aa", + "sha256": "02sc61gnn25pfc38shi8ybmg8d4228vk2lyffxj7pszxz6sjya92" + } + }, + { "ename": "opensource", "commit": "ec4255a403e912a14a7013ea96f554d3588dfc30", "sha256": "17gi20s2vi7m75qqaff907x1g8ja5ny90klldpqmj258m2j6a6my", @@ -74674,14 +74980,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210401, - 2114 + 20210427, + 819 ], "deps": [ "org" ], - "commit": "2380562fbec8a17ec193891da755a502a2ccd252", - "sha256": "14b1x446zwdsqy8lvmz3iw1byaq1rn92v19ib5zyk18g9lf9ma7i" + "commit": "6ee49875f8bdefafbde849f5628d673e9740cf8c", + "sha256": "0qsl273qd2cc4nvv0zhsd8wn8kaw3swq6l577rkh4r6iwkqci5gf" } }, { @@ -74883,8 +75189,8 @@ "stable": { "version": [ 0, - 2, - 21 + 3, + 0 ], "deps": [ "dash", @@ -74894,8 +75200,8 @@ "org", "s" ], - "commit": "a88d39e364757594c6b3830cc36f342ee0d1b8ab", - "sha256": "1axzhb9k1i8l9rksk14bb04v4q4mx498f5psnalxwvn0563ngs5r" + "commit": "9f4ec4a981bfc5eebff993c3ad49a4bed26aebd1", + "sha256": "1sgckvpjdaig9r2clcvs6ckgf2kx7amikkpq26y30jbnfnbskf0v" } }, { @@ -75337,16 +75643,16 @@ "repo": "phillord/org-drill", "unstable": { "version": [ - 20200412, - 1812 + 20210427, + 2003 ], "deps": [ "org", "persist", "seq" ], - "commit": "35c1ce349949cc213f3076799211210f49431850", - "sha256": "06hc98z4sml7jrwm5zvbsw5x6q5jpa335almzkh6h85g1p8syfsn" + "commit": "bf8fe812d44a3ce3e84361fb39b8ef28ca10fd0c", + "sha256": "079x6rcz50rpw0vdq5q2kjpixz95k9f3j9dwk91r5111vvr428w3" }, "stable": { "version": [ @@ -75456,14 +75762,14 @@ "repo": "eschulte/org-ehtml", "unstable": { "version": [ - 20150506, - 2358 + 20210428, + 1547 ], "deps": [ "web-server" ], - "commit": "9df85de1a0fe1e7b2d6c000777c1a0c0217f92d0", - "sha256": "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq" + "commit": "b4f97edf4150870b84d7ee8508088c0d375eaa83", + "sha256": "124fq9k7qmjvn5hp9i2b4xmrm9z18zhbc9j1rv68wpdqf0kqxkcd" } }, { @@ -75580,11 +75886,11 @@ "repo": "harrybournis/org-fancy-priorities", "unstable": { "version": [ - 20180328, - 2331 + 20210427, + 900 ], - "commit": "819bb993b71e7253cefef7047306ab4e0f9d0a86", - "sha256": "13cyzlx0415i953prq6ch7r5iy23c1pz116bdxi5yqags4igh4wv" + "commit": "44532ab8c25eb2c0028eecca7acd9e8ea8e2ff30", + "sha256": "1cvlyq5p505vx9gcqgvhj7qan1qhq859c2fv7a44kfs0093cb9fz" } }, { @@ -75625,8 +75931,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210407, - 57 + 20210421, + 2203 ], "deps": [ "alert", @@ -75634,8 +75940,8 @@ "request", "request-deferred" ], - "commit": "161465b9448a6413466f1dfe77844f5591fbdeae", - "sha256": "0pwi537cg1yb76bwx2sn1w8vkjgsjq38f7lbqvd159g9rbng7v21" + "commit": "4c2616a4f85adc77b91aa054bb10e76b06f706d5", + "sha256": "0isw9inxbdrf5rwqhjasbbz8av9sn56nwz7xxksr69nk5mv7zm17" }, "stable": { "version": [ @@ -75752,8 +76058,8 @@ "org-agenda-property", "org-edna" ], - "commit": "8d7acda24a00ef94fd14a4e2ebe2606009eb46e9", - "sha256": "1h9gfy2assjl2l9dfyp40ypkdm541cisx84vnapjnr6i1bxsvdck" + "commit": "034edc545335ecc0da20b4f1bb4aa9f048454afe", + "sha256": "0yhnrz7kcq81842sv7zf58fqc6wiy4ckcjyqy8m6bn2z6rwpj655" }, "stable": { "version": [ @@ -75792,15 +76098,15 @@ "stable": { "version": [ 1, - 5, - 7 + 6, + 0 ], "deps": [ "dash", "org" ], - "commit": "0877bd57f95ad96a342505a6ecef0c15977f6bd6", - "sha256": "02q343sznbw1ma9zcxnpa7sy37s85ph9phpg479pfz5c51kji09h" + "commit": "2cb87624238281b438cda67ed375c56403524489", + "sha256": "1xmbrrp1zyvij18v3rqmini6w9i6v7dl4fp103ph6wznav8x0jbl" } }, { @@ -75850,15 +76156,15 @@ "version": [ 7, 1, - 6 + 7 ], "deps": [ "dash", "org", "s" ], - "commit": "47dda7d3dce11e8ab9a3847f8c6a1cbb8345f861", - "sha256": "1s1y0xlin1yx716awzbq6lvzz5c3c5i9qvacgm006bypg8qlmz1a" + "commit": "47805bb8dc681872f3ad5dc74711938978d5c7f2", + "sha256": "0iiw798clq6hmml6fs60wwd38c4rzvxrdv4xr57innj06cja4dvy" } }, { @@ -75875,8 +76181,8 @@ "deps": [ "org" ], - "commit": "f9a3321712626d2f43a8849203ceb089cf8233b1", - "sha256": "195bzlfqf91f7prv4xh1x1p5xnyygr0mzwqxbsw2apc0haaz6ajk" + "commit": "b2dfbf41efac55edacde8a8a6bd0275418de6454", + "sha256": "1gs62qjllsz23qbs9zq767c8xxvxwknl1x6r4ixx9090j7bsrhpd" }, "stable": { "version": [ @@ -76149,14 +76455,14 @@ "repo": "dfeich/org-listcruncher", "unstable": { "version": [ - 20210304, - 1602 + 20210503, + 802 ], "deps": [ "seq" ], - "commit": "b0269843f317b6715dbde8a4e955aac9c38cbdb6", - "sha256": "1ywwngjqfvppxbb0dghqzr0kg9dxyqidjgjrh4ncc0zc9iamcx2w" + "commit": "50c06445a837c6677da035f72dbe0f973d9e10a7", + "sha256": "1nw5wd781a5nh5csvsr6ycjpji66k8vkvw8z1sfa0p8xsbln9rk9" } }, { @@ -76264,15 +76570,15 @@ "version": [ 5, 6, - 1 + 2 ], "deps": [ "dash", "org", "s" ], - "commit": "4fe1f194a8eba00858b78d611ad8a7f14392722d", - "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz" + "commit": "5aeed6d0f7f878b20483975200df43b6fc7f32f9", + "sha256": "102lrlf25i30xbpszr1mh6mkxd6wwgbwg32dafccxm4dmj3v9hqq" } }, { @@ -76325,14 +76631,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210409, - 1813 + 20210429, + 59 ], "deps": [ "htmlize" ], - "commit": "e57af9c057d97d14536cef08aca7a19bdf194830", - "sha256": "19m1y686jppl1j7ibigw1h6n518swgdcfgrk84r1nvd7x83vd8v0" + "commit": "d9a690eeca64231159cd0f3f0ee214619858490e", + "sha256": "1fr8nw4pxbhml1ly1wx5glybgdh5g1g87aivzmjddycdsfcx2zqi" } }, { @@ -77030,24 +77336,20 @@ "org" ], "commit": "4d8a63cba537705f4ecf3f45838e3cfc83fa2369", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 327 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 591 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 1200 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 2118 ms\nerror: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503\n" - ] + "sha256": "0y45g2d868ayl9igzdxzbfzw8n5qymzsdm9d3giwnlchqfrp987y" }, "stable": { "version": [ 3, - 7, - 0 + 8, + 1 ], "deps": [ "htmlize", "org" ], - "commit": "d404eb13d9e34354c081870ebdd69711937682b3", - "sha256": "1vzn0l8ig4rzh5h8j7kxn8kslqrij97qqv98fbnlwmrw4z87v8dr" + "commit": "4d8a63cba537705f4ecf3f45838e3cfc83fa2369", + "sha256": "0y45g2d868ayl9igzdxzbfzw8n5qymzsdm9d3giwnlchqfrp987y" } }, { @@ -77301,8 +77603,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210411, - 650 + 20210502, + 1936 ], "deps": [ "dash", @@ -77312,14 +77614,14 @@ "org", "s" ], - "commit": "997ddcbf4b0373bb449d09f1db6cf5de6983de5e", - "sha256": "0dh325syjn1dkblydbdxqqy24pbyk4h3rcmr8506lycyz1xg2m2k" + "commit": "d2e933cc3e4f5ee843bfca9525a30eb395c60990", + "sha256": "09fbbji67ipfw1xn2960v9pwc6xm6w9z10j3c343f9a02aqyjwif" }, "stable": { "version": [ 1, 2, - 3 + 4 ], "deps": [ "dash", @@ -77329,8 +77631,8 @@ "org", "s" ], - "commit": "cc01cf346e2d832f78694320947e0788c92f49b9", - "sha256": "0n8c0yxqb62i39kn0d5x83s96vwc0nbg0sx5hplffnbkfbj88bba" + "commit": "9065f6a999b98d4b495e3d8fa1fa4424eddd25a8", + "sha256": "10jrnjq65lpg1x8d7lqc537yai9m6pdnfbzwr87fcyv6f8yii8xn" } }, { @@ -77432,8 +77734,8 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20210102, - 1627 + 20210502, + 1732 ], "deps": [ "dash", @@ -77444,8 +77746,8 @@ "s", "seq" ], - "commit": "a05dcf6b9674406a9d616b53b4f199a3f87b3f2a", - "sha256": "0bj91c8zz804zclhl5ay8k2sjw9pi9mrkrjcmcs2h36klcb1x4qn" + "commit": "3206b4ea40614ba87a1b12f66ad0f84354bcdafb", + "sha256": "0b2gs6hm8k25539m7hxbhh5jza37mdfv3z763r130fxj3b646v01" }, "stable": { "version": [ @@ -77639,7 +77941,7 @@ "version": [ 3, 0, - 0 + 2 ], "deps": [ "dash", @@ -77647,8 +77949,8 @@ "org-ml", "s" ], - "commit": "1cc854e814f86bc35f536563837a97a832a06122", - "sha256": "1wp3d3b1wdw8v5drwbrfxrbq8psf82bs9cwjin2psfgb4n1166dy" + "commit": "40c8870b2ab93dde33994f46c0531b3978e25fde", + "sha256": "05c1hgzq69lnw59x1w5bybrdhnyli8d9pzjczixklrrahmx4ig8k" } }, { @@ -78325,11 +78627,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20200919, - 1348 + 20210414, + 1844 ], - "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", - "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" + "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", + "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" } }, { @@ -78508,8 +78810,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20200817, - 1842 + 20210422, + 339 ], "deps": [ "htmlize", @@ -78517,14 +78819,14 @@ "metaweblog", "xml-rpc" ], - "commit": "c7f72a87952ed16323fce968462af897235f1719", - "sha256": "0v8zkzai5gfzng9dpkikwf60rvsr1148y5nb7hw65961xms855s4" + "commit": "c1b386f3522054f063f4ac60730397ed1f724478", + "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" }, "stable": { "version": [ 1, 1, - 10 + 11 ], "deps": [ "htmlize", @@ -78532,8 +78834,8 @@ "metaweblog", "xml-rpc" ], - "commit": "19aa8a17428d6ee42f54e464c26eeab17a6478ab", - "sha256": "198ahgxji0kh6ynygrrdvllj9fwcqrnma4sd8msj2aq18xij9glr" + "commit": "c1b386f3522054f063f4ac60730397ed1f724478", + "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" } }, { @@ -78757,15 +79059,15 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20210309, - 1906 + 20210426, + 1746 ], "deps": [ "magit", "org" ], - "commit": "609fd0ccfb5268704b5bc7d7ac1014d4960b9707", - "sha256": "00rmp5pbn7bn4mrfzlkh9dc5m80qw72bs5jxdss9sk38v1gvxbr3" + "commit": "e8db8dc74106dfabe316e63cc9032dd7bb9bc598", + "sha256": "0dqinq1n78mjll3agiqif2rxz8ikdz4qr88hxhrwbl4222dlaagz" }, "stable": { "version": [ @@ -78789,8 +79091,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20200621, - 2144 + 20210426, + 2145 ], "deps": [ "forge", @@ -78798,8 +79100,8 @@ "org", "orgit" ], - "commit": "051d92661ef12b67ffadb231324806d87d1e6a54", - "sha256": "0x8wmqp9x2c7qv0ipj2rvjf7bc7z0pn8s253gjxpxmakz3l8wnyk" + "commit": "f7c1a83efbebad3c533259a3256c85012e2d13f4", + "sha256": "0xc070ykg5dnq1di4912ckhyw70c68lw43b2s06b5cg20ka79i6h" }, "stable": { "version": [ @@ -79276,19 +79578,20 @@ "repo": "emacsorphanage/osx-trash", "unstable": { "version": [ - 20160520, - 1300 + 20210419, + 2229 ], - "commit": "0f1dc052d0a750b8c75f14530a4897f5d4324b4e", - "sha256": "0f4md49175iyrgzv4pijf7qbxyddcm2yscrrlh91pg410la7fysk" + "commit": "af74a2055a15bf4182d8196600f7decd66eec634", + "sha256": "09960kif9gnfmic4iyv9d28577j6zsiji9fdrxcnhh6586hz70ri" }, "stable": { "version": [ 0, - 2 + 2, + 1 ], - "commit": "529619b84d21e18a38ec5255eb40f6b8ede38b2a", - "sha256": "1n44wdffkw14si9kb7bpkp6d9cjwjrvksfh22y9549dhs1vav6qq" + "commit": "af74a2055a15bf4182d8196600f7decd66eec634", + "sha256": "09960kif9gnfmic4iyv9d28577j6zsiji9fdrxcnhh6586hz70ri" } }, { @@ -79633,8 +79936,8 @@ "deps": [ "org" ], - "commit": "e931362e641f97d17dc738d22bb461e54045786d", - "sha256": "045kci7xvlp0kg8gmplnybc7ydv66hkl88dxgd113ac7ipf9zir7" + "commit": "efb74df1179702e19ce531f84993ac5b5039075f", + "sha256": "0sxwbqk6sm8qfpbcxhclin21k6xx5286df57rr0m72xrqqpdsw1p" } }, { @@ -79829,8 +80132,8 @@ "deps": [ "org" ], - "commit": "7a93b0f4b3e8e240d9451f1fa5704acfc494e9aa", - "sha256": "0dvhc559r9jhc8d91mv5an3vfklrfyfrpr32dqvphgk1i85kqvw4" + "commit": "be7fbd9f164d8937b2628719e21e8e6b4827e638", + "sha256": "1p074q7w3j1n98zzsmq2xb9kwbm7bb4lg8yss4q3rv9rkrrz7dk9" }, "stable": { "version": [ @@ -80157,14 +80460,14 @@ "repo": "DarkBuffalo/ox-report", "unstable": { "version": [ - 20210219, - 2023 + 20210430, + 1212 ], "deps": [ "org-msg" ], - "commit": "7e135fb51f252ab1ec5a31e05a1c7e638b656b85", - "sha256": "1lg00p7nr3y5wjm7r53c93gx0ycqjgsrj4w5jxw6fzrdacqdnsz9" + "commit": "1e730396b8b7aa5101b3e3f538d6d4c15514f415", + "sha256": "1firb26xnci1qprb4v4p3cp9vnmmp5bvsm3154gy0n2jr0hzvbjj" }, "stable": { "version": [ @@ -80617,14 +80920,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20210318, - 1411 + 20210421, + 1333 ], "deps": [ "cl-lib" ], - "commit": "0f13dd6655f6d4ff71b77c6d2c93727e5f43b254", - "sha256": "0l4qwz2s63r26y5v02yrpncjdiyspw7pill0bjjlcawvxffykw9i" + "commit": "b4eec13201093070a12f37396afce83eb6771df5", + "sha256": "1kr9iwsrpxbalhjz91pqplwkb44msdl2qv4rwsbapz8z8hs4xzji" }, "stable": { "version": [ @@ -80661,15 +80964,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210326, - 241 + 20210425, + 3 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4", - "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl" + "commit": "bc6c0577c0c87c43095955f8210b221bb759f103", + "sha256": "0rg51c0nj6fcxf4lcbfh0l997s08g3k19jxmsms5xj26aavp9zj2" }, "stable": { "version": [ @@ -80698,8 +81001,8 @@ "deps": [ "package-lint" ], - "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4", - "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl" + "commit": "bc6c0577c0c87c43095955f8210b221bb759f103", + "sha256": "0rg51c0nj6fcxf4lcbfh0l997s08g3k19jxmsms5xj26aavp9zj2" }, "stable": { "version": [ @@ -81128,8 +81431,8 @@ 20200510, 5 ], - "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", - "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" + "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", + "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" } }, { @@ -81357,11 +81660,11 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20210325, - 1714 + 20210413, + 2 ], - "commit": "a92e39e86ec24fbc536c68765b4af6f4c6ff24c5", - "sha256": "1l4xvyx4r7ld7d8k18x4khagiivp5a7m647zv7fvg7ivhkq2crqd" + "commit": "c2c1bbec6cc7dad4f546868aa07609b8d58a78f8", + "sha256": "0az4qp118vsqzgsl87wgszzq91qzqkpabifd8qrr2li3sizsn049" }, "stable": { "version": [ @@ -81644,11 +81947,11 @@ "repo": "vandrlexay/emacs-password-genarator", "unstable": { "version": [ - 20210327, - 1140 + 20210425, + 2227 ], - "commit": "de391a83e6a11f810f0141b7b4758dd978478234", - "sha256": "10yh56jlvnn01swb4pfq2gqpj2shxfp716fzij8c2c0hi52rgnbz" + "commit": "c1da9790d594bc745cdbcc8003153e408aa92a5f", + "sha256": "0nwfdf5ik7d11l2h2fg4pszifv3fncpxjzs933gj91mvjy2wrw98" } }, { @@ -82618,13 +82921,13 @@ "stable": { "version": [ 2, - 14 + 15 ], "deps": [ "cl-lib" ], - "commit": "2f2b59e693f08b8d9c81062fca25e6076b6e7f8d", - "sha256": "04r5h5zs5r6s22p5ynhpr860r2r552z9pyf4kbabfg1gz9jag7yp" + "commit": "dd2a380ac71edf1321a6462f14668baf99879e80", + "sha256": "0l9i7ky25d9ii04w2brgxc8dk2rky50naba8lbfqi7hcc34z8pp6" } }, { @@ -83065,11 +83368,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20210310, - 1724 + 20210430, + 1507 ], - "commit": "a2bca9be4c34a9dc38393602cb2708df24587838", - "sha256": "1rc67f3jzjhqykcn16s2ibviibxmr7b9y2c20hdwg49r41ax4f9v" + "commit": "209913f8ce0f18898625b41e0094a99ce8accd0d", + "sha256": "048rnzhxsgq6vi4d64826ma1rkxsz42qbbppwqx7wiqj4nnmxshw" }, "stable": { "version": [ @@ -83525,11 +83828,11 @@ "repo": "EricCrosson/pine-script-mode", "unstable": { "version": [ - 20181110, - 151 + 20210420, + 1249 ], - "commit": "f7892d373e30df0b2e8d2191e4ddb2064a92dd3c", - "sha256": "1zxmc2l41h28rl058lrfr8c26hjzqmp37ii8r29mpsm03hsw30fh" + "commit": "72d0cb20cc5c5dff363a08318ac7045f4a5f43e3", + "sha256": "0ry1gd1vgwnr7skalc39baqbffb5vq4bkpy5bnr2sprgj6p4mxvc" }, "stable": { "version": [ @@ -83928,26 +84231,28 @@ "repo": "ZachMassia/PlatformIO-Mode", "unstable": { "version": [ - 20161210, - 1339 + 20210501, + 1057 ], "deps": [ + "async", "projectile" ], - "commit": "1466aed132a77f48fcb31938d64abb1a1e58ec42", - "sha256": "1lfkp7df8as9gspynkyhz4dbm95kbngyba1ymg6ql67adyv79v1i" + "commit": "e7bde6fec31b57ffe1c0a98cd29477d5baea30f3", + "sha256": "0ian50v9vaz7kqzn20bhqadq50h0l3zhjkmniinpz4q9klh7drh9" }, "stable": { "version": [ 0, - 2, - 2 + 3, + 0 ], "deps": [ + "async", "projectile" ], - "commit": "470a80c1d764a6e1680a2b41ca5a847869a07a27", - "sha256": "1nznbkl06cdq4pyqmvkp9jynsjibn0fd6ai4mggz6ggcwzcixbf0" + "commit": "e7bde6fec31b57ffe1c0a98cd29477d5baea30f3", + "sha256": "0ian50v9vaz7kqzn20bhqadq50h0l3zhjkmniinpz4q9klh7drh9" } }, { @@ -84764,14 +85069,14 @@ "repo": "polymode/poly-rst", "unstable": { "version": [ - 20200316, - 1315 + 20210418, + 1009 ], "deps": [ "polymode" ], - "commit": "8530f56fbdce01bcf4004839ff54e4156282c2b5", - "sha256": "088wzagwxpf2j67wb1i6agqfa944sahh2fm8my2m50spbbd9ymhl" + "commit": "e71f2ae6a00683cdb8006f953e5db0673043e144", + "sha256": "1jhj1hrb998p9n6bjfdnmsinf0rd5wspm9gwsrdb0k6il897h7lf" }, "stable": { "version": [ @@ -84875,11 +85180,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20200606, - 1106 + 20210413, + 2004 ], - "commit": "9f4fa7971634f560e83d44b30aefc4d76d261943", - "sha256": "1dp3688kj89r2ywv4zwrji2qv1b0y1cj3dwhzxx1ihb9vx0bjwjn" + "commit": "b50ec54097d279bde6567ee3ba8a22471f466ec0", + "sha256": "0q2vjvz72m3nrnpck4hl059cjgcf2jdw2rl9h8fxyvbllyj0733f" }, "stable": { "version": [ @@ -85000,8 +85305,8 @@ "yafolding", "yasnippet" ], - "commit": "91ca19b2a93029a393f8873e273777b553d308e1", - "sha256": "07sn00k8krsb0bikbbypznvwrk13k4jdk6d66iai0a66s9dr84ys" + "commit": "3c011744e81263dab6a4b20e96ad1d290ef9d320", + "sha256": "15ach67d9n8csbsabm6lhmhli9f397pjpf6vk1rn59bfqrhdakmn" }, "stable": { "version": [ @@ -85178,15 +85483,16 @@ "stable": { "version": [ 0, - 6 + 6, + 1 ], "deps": [ "dash", "flx-ido", "popup" ], - "commit": "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09", - "sha256": "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8" + "commit": "b00c4d503cbbaf01c136b1647329e6a6257d012c", + "sha256": "0q081lw6zqzpbmscpk1yzyfpalr9ld5qwh962dwwy04rc5f0aq3s" } }, { @@ -85337,11 +85643,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210410, - 528 + 20210423, + 220 ], - "commit": "ae3c4ddfce698f4e24a0fcab938267e41e74da90", - "sha256": "1agzfliz6vk9zwvl0gm074xwzlywqrhkva9nz3d3581cjfanxqd1" + "commit": "739d8fd1081bdd0d20dee9e437d64df58747b871", + "sha256": "1hapg4dwrpa1ffkx8s3pialkh9zsh3r5jxk076c750k9rdwl3q4m" }, "stable": { "version": [ @@ -85432,14 +85738,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20210317, - 110 + 20210428, + 1229 ], "deps": [ "cl-lib" ], - "commit": "cfff1cfe63793ea1a8bcfcae50c296558384cf08", - "sha256": "12s3mp2dyslq1ilah64gpz7a2j0ca9yls7wvj9kcmjca1931s8s3" + "commit": "346de84be53cae3663b4e2512222c279933846d4", + "sha256": "00yy96a1rqcpbkvbn1hmb1pz5i7l0pwb2bqyxcc8qry7rkmvw7gy" }, "stable": { "version": [ @@ -85620,11 +85926,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210411, - 2007 + 20210425, + 1720 ], - "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", - "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" + "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", + "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" }, "stable": { "version": [ @@ -86253,14 +86559,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210407, - 707 + 20210503, + 738 ], "deps": [ "pkg-info" ], - "commit": "513228f473910128efcad13f46dfc22a74976675", - "sha256": "19yblhr88affwmlrfmf3bi7wypf2abgy56xfxgisvwx5d5xi6v25" + "commit": "4126799d94b6a9a4db22976d2dd6625323221359", + "sha256": "1wxv2fv680s89iz9dcxdz36l3mk9icspahh8s4mska7vi607qpzd" }, "stable": { "version": [ @@ -86522,16 +86828,16 @@ "repo": "waymondo/projector.el", "unstable": { "version": [ - 20190703, - 1418 + 20210421, + 1728 ], "deps": [ "alert", "cl-lib", "projectile" ], - "commit": "bad51a81fbcae9aabe47dafc2499ba27cd7308be", - "sha256": "0xiwn58wqm15kvbx0pi2zmh8gc1f06zncxki03bwry4nfpqxr2d0" + "commit": "7bbee0ef70817d52339119d4517dbbcbab930de6", + "sha256": "0zmng37fl8df1d3i66fbkjssv0x0hq74x68p1j01gb8sfayw4dgf" } }, { @@ -86664,11 +86970,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210408, - 1454 + 20210502, + 1922 ], - "commit": "d0acb626eba17023c55b002921870d60e48527a5", - "sha256": "0yn66lxx906nry53dr7msjfha2i85yiq2zw8g25d7y1f3mhjsjpz" + "commit": "c3505218ebb9b5c575b537c0f15736497a6c5700", + "sha256": "1vpmymgar4qn6zlkfwycrdp91iy86m6xhl43rd6awp6gh25b882g" }, "stable": { "version": [ @@ -86771,19 +87077,19 @@ 20200619, 1742 ], - "commit": "ee04809540c098718121e092107fbc0abc231725", - "sha256": "053j9j2axr2x7837xcvfgmdl3ddbw2px3fzflbna52fnk9bh2wkc" + "commit": "5e84a6169cf0f9716c9285c95c860bcb355dbdc1", + "sha256": "0ixs95c1f98kmkq8kjv6mv0sj9phgqlb39imjzrn4mg4w92bilfn" }, "stable": { "version": [ - 4, - 0, + 3, + 16, 0, -1, - 2 + 1 ], - "commit": "6c61c1e63b9be3c36db6bed19032dfc0d63aadda", - "sha256": "1910pnpy0mfzqga4mv52ybjfbxrbdflgb6nsh2vbpbpsv4jl58dq" + "commit": "7689f00ba8d1e818f2a8e7a4bf24577d9ccd5d84", + "sha256": "0r5k78m23jhcxxzhi2x6zz3dpglfx75f1zmkmdwpgc9y64kscckb" } }, { @@ -87627,15 +87933,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210319, - 1102 + 20210428, + 2307 ], "deps": [ "async", "xr" ], - "commit": "f48c3edee78ba5f020bcb42830db99a14761f176", - "sha256": "1ld3bqvfrda6fa4dv3g0wilznrdrsv544sr370sn3a9xlmy4fwp9" + "commit": "9e9cee799e95f53bf2d0462260c70ce8f59ddf4d", + "sha256": "1yjvf6h7rr7f3h6sdk95w3c2709c7jh6dfnfb7p9y1aw18ar9pvc" }, "stable": { "version": [ @@ -87675,21 +87981,39 @@ } }, { - "ename": "pyim-cangjie5dict", - "commit": "abad9b91bcf2dd29255a98ddcfd4b17d8847ecd5", - "sha256": "13sbbiqqpdplm36pa3zyqakbvlkvh7wvm7pmn0li6hnm56dwydg8", + "ename": "pyim-cangjiedict", + "commit": "a82ac773bb9bc36727314d1eb5a75610ec9ca694", + "sha256": "0ma99y1ijpdqrmypmj108ny7bfj9ylryav7hj7dnp9gj4b1bhxhh", "fetcher": "github", - "repo": "p1uxtar/pyim-cangjie5dict", + "repo": "p1uxtar/pyim-cangjiedict", "unstable": { "version": [ - 20170730, - 246 + 20210429, + 930 ], "deps": [ "pyim" ], - "commit": "c8618590780b818db1a67a29bc47c5d25903517a", - "sha256": "0p49h2kn8wy3b51zahzyc1cy24h3b44cg5yjpmv4w23dhsr4zlz8" + "commit": "87f3f9447750e74cdf9525d97621c56deafb2bbf", + "sha256": "0pk03gfrfhj2r82ghnr840bqr0ix14nhnl7hwg1g1v89jkphps84" + } + }, + { + "ename": "pyim-smzmdict", + "commit": "8bad2e8162f5a44bdbe1117efa31133ae7814489", + "sha256": "104kxd8d2b7rch0pfsdz5w98rskx1sl6fx0lqspcilir9k9my1cc", + "fetcher": "github", + "repo": "p1uxtar/pyim-smzmdict", + "unstable": { + "version": [ + 20210429, + 216 + ], + "deps": [ + "pyim" + ], + "commit": "9bfb8713543332a05c1d76fe755ab82b5ccbba51", + "sha256": "0s4s5rhrbpxlp7fimqd36pnbqpdpcfd12r5xxfrcni91f1apzlns" } }, { @@ -87700,14 +88024,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20210111, - 923 + 20210428, + 558 ], "deps": [ "pyim" ], - "commit": "62a1bd8b6070463e872137cf8eba50122b180e2c", - "sha256": "03zh5sdqc32q8an8k59csc95sczcs38ganxrg3lp2i2vn5ykza7h" + "commit": "24ac59a7b622d1a50ecdc69f9944bd39838de22c", + "sha256": "0apnf289jzfz5bmn7acq9lf13nf05phncvhc3cz9milax834c3l4" }, "stable": { "version": [ @@ -87779,8 +88103,17 @@ 20210411, 1931 ], - "commit": "38d15c98316359c7b0b190f2245a3b2e2bf62109", - "sha256": "1iipx981kz25iznb2p90a3cag71abw6np96r0mf99g44z8ghaapd" + "commit": "7cffd7ffeeaa64f57c7b617036d6d1ffd8756745", + "sha256": "080k3bm741338nj5d1f3rn9zn9pwaffbbgbyd20pmqh881v37m4m" + }, + "stable": { + "version": [ + 2, + 8, + 2 + ], + "commit": "091cb92314dc701f10390136da78fbbb362e892e", + "sha256": "13qiv3v8yc2b7sfvizlnx6xcam7yjicdkfjw00q50s5xqmali22p" } }, { @@ -87826,15 +88159,15 @@ "repo": "dakra/pyramid.el", "unstable": { "version": [ - 20181212, - 1204 + 20210427, + 1032 ], "deps": [ "pythonic", "tablist" ], - "commit": "f0687b8aee3e685b55e2c66b16211e02ac5f9d94", - "sha256": "18kqqdk7yifcjmn11jgsqxvzr6izcgify1d8gm504sxw2qqc3q0i" + "commit": "66f54f4a9cc9fa81edf768ab433d5b3c5517363c", + "sha256": "0sijy6nk46yw21j49x5n93za2zjzqqrfmjm7dz3z3gj7jknk27i9" }, "stable": { "version": [ @@ -88025,20 +88358,16 @@ 800 ], "commit": "710ffadeb43136d400de0a4c9e4a94c8b7ff36f0", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 326 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 558 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 1272 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 2702 ms\nerror: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503\n" - ] + "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0" }, "stable": { "version": [ 6, - 2, - 3 + 3, + 0 ], - "commit": "a0a534639bc6142c2c2f44bd7ca5878ad5f79518", - "sha256": "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml" + "commit": "906b0a107f7bcfe6e32bcfedb977e6f0f99fda59", + "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0" } }, { @@ -88371,8 +88700,8 @@ "leaf", "quelpa" ], - "commit": "eacc544b93f6fdc3be69a6ffbf960380a63fc715", - "sha256": "0ka2qk1y7byrq4rbmyhr06kfgc76afpmpdcxk3nf4g3krgi778dw" + "commit": "cc13df4a6c6cdf1dea558be5b6e99b6e8d8b4065", + "sha256": "0jiwdz1psfkha17by281ii0adjschld0hwl439bawgvzpw1a0zi2" }, "stable": { "version": [ @@ -88742,11 +89071,11 @@ "repo": "istib/rainbow-blocks", "unstable": { "version": [ - 20171025, - 1438 + 20210412, + 1937 ], - "commit": "dd435d7bb34ff6f162a5f315df308b90b7e9f842", - "sha256": "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795" + "commit": "ae5c11cd3dc64039c5e65c9f1804aceba5b3b209", + "sha256": "17ar9k2352h6cnvcknq945lna3illln87r1vf4ll1aa798azizpb" }, "stable": { "version": [ @@ -88866,26 +89195,26 @@ "repo": "Raku/raku-mode", "unstable": { "version": [ - 20200902, - 2139 + 20210412, + 2342 ], "deps": [ "pkg-info" ], - "commit": "8a6e17f1749c084251d19c3d58b9c1495891db6d", - "sha256": "1nxv5x9ywm9zzzl69ssvvxf0lphjqjfazf5qcd3qpv4w5rqa1s3b" + "commit": "7496ad3a03bed613c259405ec8839ae02950fdb1", + "sha256": "002pkw4wx6l64c1apg6n1psq4ckp9129yj3xqkjp68ji5nz2l3bw" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "pkg-info" ], - "commit": "e0639c89a3a29e9196e298951da6c3a79fb944e8", - "sha256": "02zn1sm86srwdzdkhw53ll0h41a9hwh6c8lan72530zysjrm4x1i" + "commit": "7496ad3a03bed613c259405ec8839ae02950fdb1", + "sha256": "002pkw4wx6l64c1apg6n1psq4ckp9129yj3xqkjp68ji5nz2l3bw" } }, { @@ -89046,6 +89375,30 @@ } }, { + "ename": "rbs-mode", + "commit": "c8bd3d8bf771c4d5d45cf1e00a08d54941924357", + "sha256": "0cdd7sypbpgr9j5ydj17pqgdb2rfm2563rwyvi0p2k2xd305bcgb", + "fetcher": "github", + "repo": "ybiquitous/rbs-mode", + "unstable": { + "version": [ + 20210430, + 135 + ], + "commit": "fd766a943d5f1f0624e10ffce096b9aaba14a5f4", + "sha256": "1gl5wqdyaqvdv0557idycfzgr5gvzvlv11jwccq43v6dmvydam15" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "commit": "ad36bb138cec7396f029821d0cf755a8bc663260", + "sha256": "143wz47446dahp5zx9vvhjrqjadzgz4apzlvwhdbs7dgs8bgs7r7" + } + }, + { "ename": "rbt", "commit": "ca7241985be1e8a26a454b8136a537040b7ae801", "sha256": "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm", @@ -89183,14 +89536,14 @@ "repo": "aaron-em/rcirc-styles.el", "unstable": { "version": [ - 20160207, - 250 + 20210414, + 1712 ], "deps": [ "cl-lib" ], - "commit": "f313bf6a7470bed314b27c7a40558cb787d7bc67", - "sha256": "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6" + "commit": "dd06ec5fa455131788bbc885fcfaaec16b08f13b", + "sha256": "116qvavvw72vkahknb7g7w7knaximw3m1pq6hic7h13xj8xqxz2w" }, "stable": { "version": [ @@ -89266,14 +89619,14 @@ "repo": "johnmastro/react-snippets.el", "unstable": { "version": [ - 20181002, - 1046 + 20210430, + 1510 ], "deps": [ "yasnippet" ], - "commit": "87ccb640d265fe799583ab55605b84d113223694", - "sha256": "0zs78mn37ngy86blmp2xfy7jr5p0s6r0qq6z3z924amrhy5bwdqc" + "commit": "9d0a1bb90ac36c689cded48b661e81d4544fd719", + "sha256": "15vnybyvz18scladfqy1qj6vrwx1ac38ra8ymdg938aayvl57354" }, "stable": { "version": [ @@ -89348,16 +89701,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20210411, - 1241 + 20210420, + 953 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "a854b8d4344e4606e77c7e73cc414991e53253d5", - "sha256": "0f5av8ldmh54cmqzniifl853mz9mdg6wn3i0wbm7v1m6d79nli88" + "commit": "962b5af40c8970d09581613d67b1a5d99eaa39e7", + "sha256": "1rpc0viymnm5jdrl16nmvsz0y8wnca03l0nhllwidyvazbf4x5zl" }, "stable": { "version": [ @@ -89440,15 +89793,15 @@ "repo": "realgud/realgud-lldb", "unstable": { "version": [ - 20190912, - 1335 + 20210417, + 1434 ], "deps": [ "load-relative", "realgud" ], - "commit": "47cb0178fdde50a9d9151ab45806b41007cd758a", - "sha256": "11vaiq7c4iaypsgs4x4sdfycjailba36qh0pwgdprmiyf8swy8hq" + "commit": "abffd0d2d23f6c87be5dc5d36e948af92de5df86", + "sha256": "1zjrjgs9vjaqsf5h9sxw1pf2f9sfngx1gxp37lb8myan52qmhlz1" }, "stable": { "version": [ @@ -89744,11 +90097,11 @@ "repo": "ncaq/recentf-remove-sudo-tramp-prefix", "unstable": { "version": [ - 20180205, - 556 + 20210502, + 436 ], - "commit": "84bbac534cb114d8d11b86790435b65d36e99e68", - "sha256": "0lnnh28qax4qk9n9sng7sgb0w0mnjc8abnch3bd0ba9g5x28z8bx" + "commit": "82e788e2c8a6834ca3db7696d5e90ccabede7587", + "sha256": "197a4xskmv88rbl9pdznvc5gfxskfp3zrl9larjdn5fxpiy5jmcb" } }, { @@ -89807,15 +90160,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20210404, - 716 + 20210418, + 925 ], - "commit": "802c85b02d99bce4cf540ed4b716eaa39df45c4a", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 301 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 505 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 1324 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 2228 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503\n" - ] + "commit": "ef800da3ff3112baa71ad20e84c752f7a56c90b9", + "sha256": "18m8djkbyykb6cxqayl2v3ap206jkng3w8ah6qr4bixqynkx4yg1" } }, { @@ -90768,8 +91117,8 @@ 20200901, 1442 ], - "commit": "abc307b965bf6720bc466281f2e204cd5ce37dc3", - "sha256": "0dv9was6ycwwyfabr8z71wcc3hbqnxgwbdqkdkx0iaccq2xyj07b" + "commit": "a97dcc486a54d947aa15eeaedaccb3481f14fd85", + "sha256": "0qxwmza21ys5ln8pb441a38sxm2gl29s46sf8hpyzaxcjvc6blvl" } }, { @@ -90787,8 +91136,8 @@ "helm", "restclient" ], - "commit": "abc307b965bf6720bc466281f2e204cd5ce37dc3", - "sha256": "0dv9was6ycwwyfabr8z71wcc3hbqnxgwbdqkdkx0iaccq2xyj07b" + "commit": "a97dcc486a54d947aa15eeaedaccb3481f14fd85", + "sha256": "0qxwmza21ys5ln8pb441a38sxm2gl29s46sf8hpyzaxcjvc6blvl" } }, { @@ -90799,25 +91148,25 @@ "repo": "simenheg/restclient-test.el", "unstable": { "version": [ - 20180106, - 2046 + 20210422, + 1815 ], "deps": [ "restclient" ], - "commit": "4518561bc9661fedacb6fb352e9677207f45c418", - "sha256": "0hbilpn77w0vykga9p4dkwaygipyna7mwn24y2kwfcahcr39pqjb" + "commit": "3c6661d087526510a04ea9de421c5869a1a1d061", + "sha256": "0bpvxv8bc671pa0sm4v8pqyla3i99y05mgpbgcjd8pdsfhiwjw7j" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "restclient" ], - "commit": "a21e41b905b423e762eeb4da3a236c8b1aea8c49", - "sha256": "1lan49723rpzg1q7w8x3iggazwl4zirq5l8nhpb8m5hmg21a4kih" + "commit": "3c6661d087526510a04ea9de421c5869a1a1d061", + "sha256": "0bpvxv8bc671pa0sm4v8pqyla3i99y05mgpbgcjd8pdsfhiwjw7j" } }, { @@ -91203,6 +91552,15 @@ ], "commit": "d0cc3599129db735c23abe74d0876286a2fd6b6a", "sha256": "1g0na5zjsy4600jzi5zr752nggndbwkr6ihxcmq1w82w0b3600rv" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "9df603a5c63ae38ec776e27dc93d3618e2b0fabe", + "sha256": "1qp338v1cwlikkzclbnxy2i4g2lad88qc6aakmla9f8x22gvlpi1" } }, { @@ -91428,14 +91786,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210328, - 1228 + 20210413, + 2202 ], "deps": [ "inf-ruby" ], - "commit": "0bc2645d140f65215a42f2b9365f1983cc949c6c", - "sha256": "0ff8zminjpgyi2lp2pmjh7cc7bgb15hii2r89zmy5xkq47slr2j4" + "commit": "dcde67f020d0efff35b6db9863e4687c08f1b421", + "sha256": "17ssr9144lnk48iyb3qn797whmvs2s526svfgs554k7bc0vl2j6x" }, "stable": { "version": [ @@ -91458,11 +91816,11 @@ "repo": "kopoli/robot-mode", "unstable": { "version": [ - 20201208, - 1959 + 20210425, + 1925 ], - "commit": "e8ca45ea811a4c6758fa1a086d8f89b8812653ca", - "sha256": "0iji80p1llvp93s42cgyffx0py9j1kjk3bjycajcy1hxsha240xl" + "commit": "e7e9c4d4750d048ad771fa735621ad813fa9c128", + "sha256": "127lydk66n90ih39q8gxzb44rss2xllb7bn3ygxrf5m5vvl9w5rj" } }, { @@ -92191,11 +92549,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20210226, - 1106 + 20210423, + 1157 ], - "commit": "e9e9e32c4f82a9b895543c120b327ab5536ec42b", - "sha256": "0f63lms4arkqj6161v2787dgfra23a01vi82s9dcylk9z6bqyz4v" + "commit": "494d59f92cbe12533eb89b202fc4f5342afcd543", + "sha256": "1g9hch2h3lqdx7ffabikl2ss98akhfpw5las6g5qwyj1l2lcrjbr" }, "stable": { "version": [ @@ -92238,22 +92596,22 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210328, - 1426 + 20210502, + 1646 ], "deps": [ "dash", "f", - "ht", "let-alist", "markdown-mode", + "project", "s", "seq", "spinner", "xterm-color" ], - "commit": "07d4d9af2c169d6cce6e2117628dfa3192937fb0", - "sha256": "1hv059nac1czpv367bs42qqw8lf6phpbzbiyk90n6mq996cinwrq" + "commit": "ed68fd3bb410869e1a4ce3943b5913ea88d9b509", + "sha256": "0896m5ajlq90pp7ds6iw7plqkffm6k01v3rfqfhb3qwd92nxgcf0" } }, { @@ -92672,8 +93030,8 @@ "deps": [ "cider" ], - "commit": "27f35778de9509067716a7bed14306787334a589", - "sha256": "01a6cvk3ycg0z1qg30rqsnx49drmdfpgd78mhf2m6avvagzf8l9s" + "commit": "c813d94ee8d0a85dd33d0c5dbae832c24cf37e4f", + "sha256": "0r0c6h7nikb4181a06bs88sqnqa68jw2f550q2zz34khl7zpr2s6" }, "stable": { "version": [ @@ -92696,11 +93054,11 @@ "repo": "hvesalai/emacs-sbt-mode", "unstable": { "version": [ - 20210409, - 1528 + 20210416, + 1845 ], - "commit": "9a6a8e47b657adeada41c445c9fcda301dbdb9b3", - "sha256": "1h8iqamz5crflhjpxfzgjxspwwkks8cp9m3bf4b42jqsffqkypnb" + "commit": "e29464a82bf706ef921f4e0052ce04fc74c34c84", + "sha256": "1r6n1hcpcy6icy8qs98gafqavmwx4z6v4rnknvrfnnynmrv2ajvr" }, "stable": { "version": [ @@ -92723,8 +93081,8 @@ 20200830, 301 ], - "commit": "5078c5c5e22f509338d20b7ae448b2bbe02e08f9", - "sha256": "03brsgbhsaynjc8xp5wpmla6cf0v4r7qc5hg0jdbp2ihnwp17i2f" + "commit": "d9d4a9757b4616df755c2219dfcff451f4e3c0a2", + "sha256": "0i8p8y2c8dvrm5a5vk1a6vf6cgfyc3ah58w095qn94mjgcdg026m" } }, { @@ -92753,11 +93111,11 @@ "repo": "hvesalai/emacs-scala-mode", "unstable": { "version": [ - 20210409, - 1441 + 20210414, + 1126 ], - "commit": "6966328dbfcbd1dfb166ff46e5deb9a68379cdf1", - "sha256": "0pmix0km9b7r28jxh31ig1h5j9vvvz4871irzlavzn7kl3qiqwgw" + "commit": "598cb680f321d9609295aa9b4679040cc703b602", + "sha256": "0ryr6jhl0irhaii6cz9nlly8rn4c6h5pnax6xzn9iszl8f7xgphs" }, "stable": { "version": [ @@ -93107,11 +93465,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20201013, - 123 + 20210418, + 1318 ], - "commit": "ad94790492d0d66686f3457cea1caeba8bbbdc51", - "sha256": "1b725iz5xhqki33jydq9vrxvrbfraxq2q79jdbrjy548rbsxzyjf" + "commit": "157637ba6b6cbe7a21c57f9eefb8a94fffa0085e", + "sha256": "195ckjmh65z4qg1afs5acz66r6xvc2g91mfnncz12kv7p8bxwrxx" } }, { @@ -93122,11 +93480,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20210103, - 2120 + 20210426, + 1226 ], - "commit": "69c86542a148222a7571506a2515fc52529d209d", - "sha256": "00qddxcax55pmfai7083w08mgz6c3876jb5p7fas4j5h417c09yb" + "commit": "30dc5f5e50fa702eb65756304f0fe406daec2397", + "sha256": "02w52rcs8gkf58yig55wn6198b7g6zy6ppp5mjh7k1l07cf2kmay" } }, { @@ -93527,11 +93885,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210411, - 1153 + 20210423, + 1822 ], - "commit": "35665560c217fc7c39ec7ef006edc6d556a4d3cf", - "sha256": "1w2iiparzs88z2zg8ylqdidgn6qb73x68hjl53yfqqgvrz8krs2f" + "commit": "c68c7f6c21877b09734a8543fee363cf2fbbecf4", + "sha256": "1g8y6wkmn8j5gjd37i344xmyln6x13jlry9pxdwq3kwkwzkznznm" }, "stable": { "version": [ @@ -93550,15 +93908,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210411, - 2007 + 20210425, + 1720 ], "deps": [ "prescient", "selectrum" ], - "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", - "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" + "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", + "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" }, "stable": { "version": [ @@ -93735,15 +94093,28 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210403, - 1354 + 20210420, + 1527 ], "deps": [ "dash", "edit-indirect" ], - "commit": "588a5dba2b38e57b88870efbc0cd2482202f28c8", - "sha256": "1m3kb6lvdr8manvlvi2avhba94lw16lvxy9p7vksk1gsmdmkgc0j" + "commit": "424b0f260a1bca20cd9359c42a0bc64a1a5e1928", + "sha256": "1i85mbnh6ijycsgxiknzvkimxag72cxg8asg3d1g4bakv3gp32rr" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "dash", + "edit-indirect" + ], + "commit": "424b0f260a1bca20cd9359c42a0bc64a1a5e1928", + "sha256": "1i85mbnh6ijycsgxiknzvkimxag72cxg8asg3d1g4bakv3gp32rr" } }, { @@ -93754,11 +94125,11 @@ "repo": "brannala/sequed", "unstable": { "version": [ - 20210315, - 2012 + 20210417, + 28 ], - "commit": "50c5dca413a12fe2d8a89eae833f10967c2f38d2", - "sha256": "16hsjk04xw88ddr2gbwlb4v8didqmk7ffwphp1iqy3a02wf4kif6" + "commit": "b28e20bf3e0ec7c56c705632e38ab842083d9c49", + "sha256": "09bw3kjr32z8hlhrczl8i3h4yavdcmfx6bk7qxsyhn1f0vmskh03" } }, { @@ -94212,21 +94583,6 @@ } }, { - "ename": "shell-command", - "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", - "sha256": "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk", - "fetcher": "github", - "repo": "emacsorphanage/shell-command", - "unstable": { - "version": [ - 20090830, - 1040 - ], - "commit": "7e22125f746ce9ffbe9b0282d62f4b4bbbe672bd", - "sha256": "1my2i26a03z8xyyacsnl5wdylnbhhvazn23bpy639d3l4x4l7jzw" - } - }, - { "ename": "shell-current-directory", "commit": "edcb78c3491a5999b39a40087b7f991c2b737e30", "sha256": "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd", @@ -94331,11 +94687,11 @@ "repo": "DamienCassou/shell-switcher", "unstable": { "version": [ - 20161029, - 552 + 20210501, + 604 ], - "commit": "28a7f753dd7addd2933510526f52620cb5a22048", - "sha256": "1x7rrf56hjasciim8rj29vfngwis4pr3mhclvxd4sbmhz9y66wm0" + "commit": "b16b4bdb54d807c5557f3fe95491bc611741eb37", + "sha256": "03fmryw522lh31jnrab8kclzzj3b1v0lr105a5qqalqh4srj6nq3" }, "stable": { "version": [ @@ -94531,8 +94887,8 @@ 20210329, 149 ], - "commit": "8bab3dc89d36b55ba26ae5941f294c57805d24b2", - "sha256": "15kp2lsfci6p8wkrda12m4vf12p13xd9x5rh3ypc6yvz1snypgyy" + "commit": "a395147050674ff88f03a6ac354a84ccbdc23f1e", + "sha256": "1gpbmnfxc5z2nm03d5989z8mb91wlq8788vvsl9kf2yl8s4fg5a0" } }, { @@ -94718,15 +95074,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20210321, - 844 + 20210502, + 1350 ], "deps": [ "language-detection", "org" ], - "commit": "a73268705e3558ee91dc05674c5c3bed7fe28202", - "sha256": "1jjs0pclv0ya4d65wzafkvgb7lmg7f13jj0pihs1ch507fyiw3gp" + "commit": "fb0fee03dfbebc21f2b9ce142764d04479cfaa58", + "sha256": "1m3kf8730brldx6l59xv92m9946aqb2b42pgjj8bl0l1x757ijk5" }, "stable": { "version": [ @@ -94927,11 +95283,11 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20210201, - 724 + 20210502, + 935 ], - "commit": "3993e8de44c141420efbec3cdb4c5620b862a200", - "sha256": "1ivm2xr7mc8hp7g1l6l3a4mm5byn2cp7m6bv2g222997xbpk0il5" + "commit": "ca73cec33880322c5bbab407825d502d87f4cf0f", + "sha256": "1qnrk8kib4rndgbljqxq7cmskgxwcc9d8wdbdr3mgkgbg08xv5gq" }, "stable": { "version": [ @@ -95575,15 +95931,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210214, - 2243 + 20210430, + 1239 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "68c58c0194ff03cd147fcec99f0ee90ba9178875", - "sha256": "0lammq7116hm79nldxlghi978m7bldccfdc9vy1rlfjj4mhnrlq0" + "commit": "a4c9c4cc5318fa0f023089755f81f2d2d2281d9b", + "sha256": "1ah15zagmsd65qfiwspcb0l2frza05iq4dw7hcrdlyqpx5rmhpd9" }, "stable": { "version": [ @@ -95638,28 +95994,28 @@ "repo": "cl-docker-images/slime-docker", "unstable": { "version": [ - 20210124, - 2145 + 20210426, + 1422 ], "deps": [ "docker-tramp", "slime" ], - "commit": "903470fe3860402794a4f268c1efffd44a30f273", - "sha256": "089yskdbkr7k25sns5vms7f0hqdbpnjg3ih95nhia1nghxcqj482" + "commit": "c7d073720f2bd8e9f72a20309fff2afa4c4e798d", + "sha256": "03jm0964qqggqia2fkvqgrx8r4knj1qgqr8vimr0x4q2j73lj12a" }, "stable": { "version": [ 0, 8, - 2 + 3 ], "deps": [ "docker-tramp", "slime" ], - "commit": "903470fe3860402794a4f268c1efffd44a30f273", - "sha256": "089yskdbkr7k25sns5vms7f0hqdbpnjg3ih95nhia1nghxcqj482" + "commit": "c7d073720f2bd8e9f72a20309fff2afa4c4e798d", + "sha256": "03jm0964qqggqia2fkvqgrx8r4knj1qgqr8vimr0x4q2j73lj12a" } }, { @@ -96007,11 +96363,11 @@ "repo": "malsyned/smart-dash", "unstable": { "version": [ - 20201202, - 1616 + 20210427, + 1709 ], - "commit": "b4a298572e7acc3f39a908997fdcfa356bac0591", - "sha256": "1lkld9g53064wz2m3xxpjpf8vs75fa8kxxnvgpipvzq55sl1j9v7" + "commit": "bc740889dd81e7dc8a90a33d1f075f21aba9b2d3", + "sha256": "0kadfyvvzfk66d5k263j8cykqh9lbwrdqizs2mag6ahnadpahhyy" } }, { @@ -96100,14 +96456,14 @@ "repo": "Malabarba/smart-mode-line", "unstable": { "version": [ - 20190527, - 1156 + 20210428, + 1641 ], "deps": [ "rich-minority" ], - "commit": "999be065b195f2eddb4e1b629f99038d832d44b7", - "sha256": "0jyvyn7pkqvyyv1rga3i10f4cwfbb0miacbib8lsrrhayrnal186" + "commit": "744ee1a9479a7901cedd6f0d59e6c6c86b20a78d", + "sha256": "18bf6f5yd8gympf5z8fs904qnjjdijapxpincjbpiyb2429yb34a" }, "stable": { "version": [ @@ -96154,8 +96510,8 @@ "powerline", "smart-mode-line" ], - "commit": "999be065b195f2eddb4e1b629f99038d832d44b7", - "sha256": "0jyvyn7pkqvyyv1rga3i10f4cwfbb0miacbib8lsrrhayrnal186" + "commit": "744ee1a9479a7901cedd6f0d59e6c6c86b20a78d", + "sha256": "18bf6f5yd8gympf5z8fs904qnjjdijapxpincjbpiyb2429yb34a" }, "stable": { "version": [ @@ -96778,15 +97134,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210410, - 1115 + 20210503, + 659 ], "deps": [ "dash", "s" ], - "commit": "7518cf3e1d6ca67e9ee8d9d1e930e1866f460c92", - "sha256": "05ncmknzrqsx8l3c1r3lm4b810m6hnrixbbzkik2brnyzqpqfphj" + "commit": "aef9dcb8b007c59525100fb989c7f8fc6dec71cf", + "sha256": "10fp0wlwla4y94kvl5ajk3jxvcr9k01y2s1f7q3fj1lr31zh7c6f" } }, { @@ -97178,11 +97534,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20210201, - 1830 + 20210426, + 1433 ], - "commit": "f765f193ccaf4ad438e1d9be842efd2f4394efa4", - "sha256": "1p6kzsci8hgccpjcy6swwa6yk741l6ay48rb35gmf03j04abszm0" + "commit": "12d3472e6823ff1bdc1591984367e2ed769afcb7", + "sha256": "1vyg73svawi8g1mq6v5y5g9hw0vnks2nhbwdkbn6d53b7bcr0hpx" }, "stable": { "version": [ @@ -97381,16 +97737,15 @@ "repo": "nathankot/company-sourcekit", "unstable": { "version": [ - 20180101, - 834 + 20210430, + 2155 ], "deps": [ "dash", - "dash-functional", "request" ], - "commit": "abf9bc5a0102eb666d3aa6d6bf22f6efcc852781", - "sha256": "1g8a4fgy2c5nqk8gysbnzn5jvfw6ynmfhc6j3hkrbswgf9188v5n" + "commit": "a1860ad4dd3a542acd2fa0dfac2a388cbdf4af0c", + "sha256": "18pv1hcilj7kndr7a29jjskp21khh1sd0wy01h8y8y9mf70kikg6" }, "stable": { "version": [ @@ -97706,11 +98061,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20210306, - 1600 + 20210415, + 1821 ], - "commit": "b9f49bab9551e8ca1232582acffdd0a90aaa35f3", - "sha256": "0k9dlkxns8yhv1yzfjlr5gkfc26ihhqjfsjchqg9fvfxqnd39pic" + "commit": "86c223a2db529768fd815dc0635ed432c1a215e8", + "sha256": "1bz6186w83xmajnw489dc1la7b6gly9vrp40mh58gknk5fjdx86w" } }, { @@ -97837,15 +98192,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20210328, - 413 + 20210415, + 1326 ], - "commit": "c566ed568aae0a73202a51e97a73c5e4af0053d2", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 265 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 703 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 1251 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 2299 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503\n" - ] + "commit": "fae15427a1027e5eafdff7e5627cd399f73dbc37", + "sha256": "05xarav1dw4315rh4qchvf6p9vsdyg09nm9rc6k657n4r8ip725c" } }, { @@ -98429,11 +98780,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210325, - 445 + 20210502, + 1549 ], - "commit": "633a0ff419438987f6271ff5a5da26307950a3cd", - "sha256": "070p4wyphhm7115afvq7lhxkb69c7l7fz3q5nkwbpjsdp5s8isns" + "commit": "688d55eeaedef9f95a123db130bfb456c94c587d", + "sha256": "0n633q3jv0l2klxf590lp9a3dy0wpmh37xl0fii9afsvaydrdww7" }, "stable": { "version": [ @@ -98546,11 +98897,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20210401, - 243 + 20210428, + 1752 ], - "commit": "6d4f8d12c6a7e7ff776271f3656be5f3ba5a784e", - "sha256": "1pxpm24rlrrdzmy129c6naz9zxfsjrk6hgx3qcizd25kq86sfy4g" + "commit": "4e5c9bf04394438a6256ea7b320df3b0ed129fe6", + "sha256": "19ls9cm4bswxp5zfwxf7mdpf0gcmnpqi8vzyw94j5hmakx89l3kz" } }, { @@ -98857,16 +99208,16 @@ 20200606, 1308 ], - "commit": "6af99af232c90d1629ac71be500eef2241245c81", - "sha256": "03wl804pacmzr2gjdz6ssq0l03hs68hadlgjdn6hinp2k0r90pxw" + "commit": "68f949852ab7f0e8bb52c6a6fc2ece2a74ded824", + "sha256": "129mms7gd0kxqcg3gb2rp5f61420ldlhb0iwslkm7iv64kbxzww1" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "11aa5944459e464a96f41d934e23da5320c13333", - "sha256": "0nc388hi362rks9q60yvs2gbbf9v6qp031c0linv29wdqvavwva1" + "commit": "68f949852ab7f0e8bb52c6a6fc2ece2a74ded824", + "sha256": "129mms7gd0kxqcg3gb2rp5f61420ldlhb0iwslkm7iv64kbxzww1" } }, { @@ -98907,11 +99258,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20210331, - 1140 + 20210430, + 839 ], - "commit": "0dc71ec178c3dab8973c90758fa730c70df01554", - "sha256": "0glp3h5anrsvm89zs99gdyp3rpc0g41va30nxw5pn02yv7cqz7hd" + "commit": "eac0f54da5ff116622a6448b68057b45c337f2de", + "sha256": "0b7glyq3z98vi7f79zg0phqm6ibc30lq2m4mwy22gg0941rr2zja" } }, { @@ -99340,30 +99691,6 @@ } }, { - "ename": "sudden-death", - "commit": "3f20f389a2d7ddf49ca64d945b41584a7c120faf", - "sha256": "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh", - "fetcher": "github", - "repo": "yewton/sudden-death.el", - "unstable": { - "version": [ - 20180217, - 23 - ], - "commit": "791a63d3f4df192e71f4232a9a4c5588f4b43dfb", - "sha256": "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps" - }, - "stable": { - "version": [ - 0, - 2, - 1 - ], - "commit": "791a63d3f4df192e71f4232a9a4c5588f4b43dfb", - "sha256": "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps" - } - }, - { "ename": "sudo-edit", "commit": "3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e", "sha256": "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4", @@ -99784,6 +100111,36 @@ } }, { + "ename": "sway", + "commit": "4c2d1eec09d5f69fbec99c6d190cc78882d8a74c", + "sha256": "00jysn6x6n54xpj6vwrp582p001bjbkjilqs4gsxs5r829cr3zyw", + "fetcher": "github", + "repo": "thblt/sway.el", + "unstable": { + "version": [ + 20210501, + 2201 + ], + "deps": [ + "dash" + ], + "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e", + "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d" + }, + "stable": { + "version": [ + 0, + 2, + 4 + ], + "deps": [ + "dash" + ], + "commit": "8a4d9cc1a469efa707cf67b57b752f28547e331e", + "sha256": "0x5w3f07dsgbl7qlcqpmpm3831lrv5jx59g7xnv25giwc3w21d2d" + } + }, + { "ename": "sweet-theme", "commit": "a149448c38504bdf6f782a10cb1440da9102990f", "sha256": "1ca56disxyr30anvpqahh33s062y35w003yxi1rhdrknka2cnl5q", @@ -99855,15 +100212,15 @@ "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "661e6fe419948419da4abf916b193b331b80a3be", - "sha256": "08w9h12y54aj2q6k48p9fglacppb5mlqh18h43n45hd7rcph3j93" + "commit": "ed36ea3d8cd80159f7f90b144c4503411b74ae3e", + "sha256": "0bcrnslqhgz122mv6br6w848a3x3g4jkz1pkdpb4726xssfzz8zk" } }, { @@ -99880,20 +100237,20 @@ "deps": [ "seq" ], - "commit": "fd3c824c3622aef4ad29983667f34ebad91e9f69", - "sha256": "1s60j7778n8vl53capi1bs5mbb1g2vwaaa4y7wdv6ajrlxh95a5x" + "commit": "ad12a3025156873995318b6a0480cd2459063bf7", + "sha256": "1cr484b8pixnk9rk2046wiq7i05r3sr6wmk0qiad1vibzlynz83q" }, "stable": { "version": [ 8, - 1, - 1 + 2, + 0 ], "deps": [ "seq" ], - "commit": "e65a80a659c74d0a62b00dff183a0f7fc8385ce1", - "sha256": "18i6m2zys0nc9j29f7bkzjcfp7rcaycr473ykhprsfikfcgwkj3y" + "commit": "fd3c824c3622aef4ad29983667f34ebad91e9f69", + "sha256": "1s60j7778n8vl53capi1bs5mbb1g2vwaaa4y7wdv6ajrlxh95a5x" } }, { @@ -99904,8 +100261,8 @@ "repo": "michael.sanders/swift-playground-mode", "unstable": { "version": [ - 20190730, - 1707 + 20190717, + 2223 ], "deps": [ "seq" @@ -99964,8 +100321,8 @@ "deps": [ "ivy" ], - "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", - "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" + "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", + "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" }, "stable": { "version": [ @@ -100225,14 +100582,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20210118, - 807 + 20210422, + 2110 ], "deps": [ "seq" ], - "commit": "5bcd6d7e3f3b6501ccec3e6c378f33f7e7488c99", - "sha256": "10n0871xzycifyqp73xnbqmrgy60imlb26yhm3p6vfj3d84mg1b2" + "commit": "4231a36e39b7393d639e9cdef19f311d780deeab", + "sha256": "0q2x39s3g5kmjf5q47qpqcnzdscnj112dfd7qqb2z0iq0sh2nbrd" }, "stable": { "version": [ @@ -100280,8 +100637,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210408, - 1839 + 20210416, + 353 ], "deps": [ "evil", @@ -100293,8 +100650,8 @@ "seq", "undo-tree" ], - "commit": "feaf6d847bbff6642cd3c4926899eee3cbac261b", - "sha256": "1k4b8aqwglgavj3rsjj0macmppjsgb5ykpl388434crn067rlfpz" + "commit": "3af93352a522bf8b88841a0d7114789a11741bb2", + "sha256": "1rrhzq9kixvvjjlb8xan5dd3g9jpygl83l77sl9r5ddv0flg6ali" }, "stable": { "version": [ @@ -100672,11 +101029,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20210315, - 1609 + 20210424, + 1927 ], - "commit": "d2ff6b1acb553bf1546e730640397b9e33ca5279", - "sha256": "1agjb68bjfjzgacrip2mjwzfdbvj3xn8cs3f6q5kdjg5v7lg9c9h" + "commit": "c60fceca7f0e7e400e4d660b23e6c64b178d9a06", + "sha256": "11h14wp0c30wc0y0y9qp5r9gwma09wl54bg0a1vxn037llwnfiv1" } }, { @@ -100687,14 +101044,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210321, - 2129 + 20210419, + 2057 ], "deps": [ "s" ], - "commit": "b83315c9a63ba2f6bbeaaa449a3b78b84a87ec1c", - "sha256": "03pc85g5f5ys0s45ccg3z7dni4cxngs3532xf9ng94a421yhxmkr" + "commit": "509b3a3909b074faa9677509de0becb9cc054a37", + "sha256": "1bnhxzbpk7xi0vi5m2mwwss97pzhwbxqn6k59028ibwxs3hvaq1c" } }, { @@ -100941,11 +101298,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20201222, - 602 + 20210417, + 626 ], - "commit": "468ee4f6ba7afb9dbfc8855ae2c333cb16ca4408", - "sha256": "0yqibx6wcdsj5k6130c3qp0hmj6zwhfjrrvw98lny23ksw6k0s3s" + "commit": "d5ccf6f53d65e80083acdfb0bced6bcd678c6ea9", + "sha256": "1wgk0xngamwgh242wfmxizi5r1ji5dxmr8s542g3p7rgfv5w0qs8" }, "stable": { "version": [ @@ -100965,11 +101322,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20210310, - 1632 + 20210415, + 1322 ], - "commit": "d6edb345f31a13918d603d44b90a4ce30b34632b", - "sha256": "0jx095yjpsh28r6a23w2fxqv0rysbwz49c22vri2s8hzw011m55p" + "commit": "1c0028d6c406cf4884e6aa35313e82041b7e857f", + "sha256": "0gv1iychm7xzdf99l1kiyvqfdhl9s8g900jjq7bj2kkd3r3c22ki" }, "stable": { "version": [ @@ -101156,28 +101513,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210409, - 2343 + 20210429, + 1950 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "88e10161e1aa2a7c83ebc41ba8492d84d8e64e26", - "sha256": "010jlhbidl3vny9z4dp4mhix827p2aa76ja2v822sdlszcb8vh9x" + "commit": "cc3c22a22e02a5606407d70e76ec221d5ec82533", + "sha256": "0j0zrravv4whakzgxvprisyxnlpcbmdywljq5vnvww2j1f75vwj7" }, "stable": { "version": [ 0, 7, - 22 + 24 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "3ed57544faf0fdd17dd8762126466b15dc471f8f", - "sha256": "1frljw1gipsr9l6cpb1skwi5b566x9yx3dhcc7bxfq11inh7bc74" + "commit": "9187e6e3d903474645f3e64806bc62ef687ec205", + "sha256": "1ra04cp49zzx8vy8aswd00l46ixyc44sxh1s3nw880b4ywzxmc6j" } }, { @@ -101295,20 +101652,20 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210327, - 2307 + 20210425, + 2215 ], - "commit": "dd7e76919f36da9f8efe7f9e3d84098f3c7c6644", - "sha256": "0apv1r756d984a47d9pvqzgcs652fdwy3swf4js9dki3nzljy756" + "commit": "3ee3761d9dd30b1c6af74dc393d43b9a91a75951", + "sha256": "1c58m2x4frwqxbi8n884c4l69pfwzdxsrig8p35y7mbywlwf1s2l" }, "stable": { "version": [ 0, 1, - 5 + 6 ], - "commit": "971153aa43addf88bfe0922bcac19cb0edd3f86d", - "sha256": "0ldb01sxzrvchjy160karvmksinicw3d14jazriy84dxks8i6w8a" + "commit": "8374097a129b2cd13c449568f95ee7380b36b307", + "sha256": "03n7amd2mfr4jmc4s1ar5ckm86knr7qarxxlkdhbnw3svy5kbc57" } }, { @@ -101419,22 +101776,22 @@ }, { "ename": "term-alert", - "commit": "0d77aee0b1b2eb7834436bdfa339f95cb97da140", - "sha256": "02qvfhklysfk1fd4ibdngf4crp9k5ab11zgg90hi1sp429a53f3m", + "commit": "8bcf021a68579f1b9c02dc959c525de0c6ca1fb0", + "sha256": "1hk1gzszqc3ijzarzi9d5hiw8ya19qp5jyb7alnsx7sn9pw6a612", "fetcher": "github", - "repo": "CallumCameron/term-alert", + "repo": "calliecameron/term-alert", "unstable": { "version": [ - 20161119, - 945 + 20210414, + 1638 ], "deps": [ "alert", "f", "term-cmd" ], - "commit": "1166c39cc3fb1cb7808eb8955b7f9f6094a306cd", - "sha256": "1hbyiwqv9waynf8gm3c717mph0p9mfi2x1wfpvdzzr25r0fz8xr0" + "commit": "ca1b48ad911bc972b049f48fe0531e702dbc553c", + "sha256": "0jnv1011y521pc4rrjyrv1la6r1q2sb120lxf1nbns17wv86d0cd" }, "stable": { "version": [ @@ -101452,21 +101809,21 @@ }, { "ename": "term-cmd", - "commit": "e08ea89cf193414cce5073fc9c312f2b382bc842", - "sha256": "0pbz9fy9rjfpzspwq78ggf1wcvjslwvj8fvc05w4g56ydza0gqi4", + "commit": "8bcf021a68579f1b9c02dc959c525de0c6ca1fb0", + "sha256": "0jcn77hcjykvd1778948pj2qr03n1w4q8alz50gnlwg3y031y92y", "fetcher": "github", - "repo": "CallumCameron/term-cmd", + "repo": "calliecameron/term-cmd", "unstable": { "version": [ - 20160517, - 1045 + 20210417, + 1447 ], "deps": [ "dash", "f" ], - "commit": "552aa58965aab9b78e46934462bafe54c0396ffb", - "sha256": "0l5xk8npc23c716fjckd65xq83hjwnvpyxixc9brxfz4ybngzwhy" + "commit": "281b9a6d864ca85dc1451dc46baca98f48dc3f60", + "sha256": "1knijk9l8ipb882h8awwx18lh3q1yy13dyjp5gm36nw06212qxx2" }, "stable": { "version": [ @@ -101764,11 +102121,11 @@ "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], - "commit": "d609290021ea7f2d10caadffc9131663838f8ad4", - "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v" + "commit": "77181c75cbde5954542688659cd4f2352ed29fbe", + "sha256": "1bcwja7hm11hxd1nmf1z93hkzcvkkpxavvbivg6j336ygzr1r82g" } }, { @@ -102247,18 +102604,18 @@ 20200212, 1903 ], - "commit": "9c6323483c9feaa9ffba8ceb98f54281733ed50c", - "sha256": "0qjx9arygjh7h3wjrfcwc7jw1jxah2jf6wfinprv7b6jg1n8k6vy" + "commit": "e7c2e64c404b5cba6b27948ffaf36b56992e4580", + "sha256": "0mshmbbl3v3f0qjmw9g1z5pkr2183j091wxr8nc1ksr28y2q6vnr" }, "stable": { "version": [ 2021, + 5, 3, - 15, 0 ], - "commit": "6d68811e7ee75f8e0b450b9b1778bfad2c44c715", - "sha256": "16yixl9qq6zh47zjnad9rv2vbjq936ms212j0wfdax7qhg094af8" + "commit": "5d2501709782c10358b73c85d8911880d34c7fa3", + "sha256": "022sgd9hsgmqr586xmzdbzmxfqaq69ps2ghq430h4ad992wanvkz" } }, { @@ -102314,20 +102671,20 @@ "deps": [ "haskell-mode" ], - "commit": "4f7bbb325631968d6e7b82b25ece810959d4b87f", - "sha256": "1p4w48zz25fym40l3wijr06qfd4drhkynbhf2nx2yh766yv8icmg" + "commit": "ce6d01ac1f41b9121e414cfcf6253cbbff4c034e", + "sha256": "0i12lswqpdfnbmq7q4vdds33qkm4f4lyh02c27y82c74aymh81d0" }, "stable": { "version": [ 1, 7, - 2 + 4 ], "deps": [ "haskell-mode" ], - "commit": "223b0f4388dce62c82eb2fb86cf1351d42aef198", - "sha256": "0k93i9smhw5bws2xiybha15g26mwyq0zj6xzxccwh0bfpl76xzqq" + "commit": "652d7a4e374d3c171278e6bdfccfa41c7621d4d3", + "sha256": "11590ifnh9ynwcfv31f5m59wr6ckrm3xi2g40wvk4ddxslj4yxnh" } }, { @@ -102338,8 +102695,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20210327, - 1928 + 20210412, + 1650 ], "deps": [ "cl-lib", @@ -102348,14 +102705,14 @@ "s", "typescript-mode" ], - "commit": "ad6fa78911d5d7e85c0851c0c1afc01f3cbde7c1", - "sha256": "1b815gxmn31x5b59mmlv5di72mz3vdm19crrpcnvb18vl2ak2vw3" + "commit": "ccff099e94beda9f5378ffc2b412cb4257111e8d", + "sha256": "17fb6zkz5d568151ypw8jkhnpikcrpwn3kc2w1mm9hs2g3hbigid" }, "stable": { "version": [ 4, - 0, - 2 + 2, + 3 ], "deps": [ "cl-lib", @@ -102364,8 +102721,8 @@ "s", "typescript-mode" ], - "commit": "dafb6befd83e5eea2e2c7f79ab89bc4877001b6d", - "sha256": "1n2dihpl53a48jis3l4rry581wpr5lxjd433drlkaa4lqgx8cw67" + "commit": "2a3ac4f38472d66e2d8a6bbe5dadb52bc008acbd", + "sha256": "1fj2fghiycnzds2zxfxgj1d9mdzsvs9rvl9bwy2f1vwawqk1m48w" } }, { @@ -102726,10 +103083,10 @@ "repo": "snosov1/toc-org", "unstable": { "version": [ - 20210323, - 1256 + 20210421, + 657 ], - "commit": "c4c61c5a382f94a3a4537e254243006dec2dcca4", + "commit": "df4ad6ff15e3b02f6322305638a441a636b9b37e", "sha256": "00a2al7ghrlabf65kfj1mk30p2pl37h6ppwlgghbgiy7rwlzkdbm" }, "stable": { @@ -102824,8 +103181,8 @@ "deps": [ "cl-lib" ], - "commit": "74e1fcbeca25734235afec9c6a4d0cf73736b62c", - "sha256": "0yrcsr4360v222klahbccfq3vb4kp5xdsibydwircv36xhxplzq3" + "commit": "2d76365d2aa13543121d5c623df465adb68b76f7", + "sha256": "1n247g5dq73rkxf0wys5lsbvma44y5qlh577s3rcx7l0yrylwdry" } }, { @@ -103124,8 +103481,8 @@ "deps": [ "w32-ime" ], - "commit": "809215eccfe8ff33d461c7ff980ed64c621a84bb", - "sha256": "1915v2x45cx9ydb53aw98da00wmqymn96af0wan9k46527ck54lg" + "commit": "92591f7c0b94f8b1875f1078d1ba3be40848f0b8", + "sha256": "0r5cmj8ih8n7m37fqwyymmd0swyxr6g124cw9cz24ri0dyiwi73k" }, "stable": { "version": [ @@ -103193,8 +103550,8 @@ 20201101, 1045 ], - "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da", - "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw" + "commit": "2f70aa236878d9c3726c31d6ba922e2d7076951d", + "sha256": "1fi0qc8qbcgkjjvi5iysifammqcc6nwcrwjhwi713zykd5cir180" }, "stable": { "version": [ @@ -103297,20 +103654,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210315, - 1902 + 20210426, + 2141 ], - "commit": "cc16a5eaa73617a281b0bbf71b24432c38994e30", - "sha256": "15ah0h7i96wn4w5321gydr6pxahb8mc8dk58b9paqv06klp5q2cd" + "commit": "6ceddc4d8c7a3c13d78c459213c796d2c19234c6", + "sha256": "0dhz5ca9i83vgi3pvkbvwanxbi1ibzwbmnhm8ymxdvzn508rlswl" }, "stable": { "version": [ 0, 3, - 0 + 2 ], - "commit": "9ca983bab26d1a8e189a8c44471d9575284b268d", - "sha256": "0g694ydmb9zjn99hxgfjd3m73kpmnkbrgqhr73b4crbxza5sl29c" + "commit": "162698aa9d40ecafefcb1af7bdf602954d766970", + "sha256": "1766hdqzg95k62nqhadfv502mpnjlx1l59ppqmc6r0las82dc6a8" } }, { @@ -103671,8 +104028,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210411, - 1031 + 20210422, + 2011 ], "deps": [ "ace-window", @@ -103684,8 +104041,8 @@ "pfuture", "s" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", + "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" }, "stable": { "version": [ @@ -103721,8 +104078,8 @@ "all-the-icons", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", + "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" } }, { @@ -103733,15 +104090,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210107, - 1251 + 20210419, + 1753 ], "deps": [ "evil", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", + "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" }, "stable": { "version": [ @@ -103770,8 +104127,8 @@ "deps": [ "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", + "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" }, "stable": { "version": [ @@ -103802,8 +104159,8 @@ "pfuture", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", + "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" }, "stable": { "version": [ @@ -103835,8 +104192,8 @@ "persp-mode", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", + "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" }, "stable": { "version": [ @@ -103868,8 +104225,8 @@ "perspective", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", + "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" } }, { @@ -103887,8 +104244,8 @@ "projectile", "treemacs" ], - "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", - "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" + "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", + "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" }, "stable": { "version": [ @@ -103994,20 +104351,20 @@ "repo": "ianpan870102/tron-legacy-emacs-theme", "unstable": { "version": [ - 20210315, - 712 + 20210420, + 1201 ], - "commit": "4d543fbb9cb2098af1be0f5b10e1e4cd5245a9d0", - "sha256": "0fyprvi4s331r6a54xa4dljw0k330kiyhzcfnnjhbsqxc86264pz" + "commit": "e7d16ebe4a824e7d7766fb34ffe4ea3b002f3d23", + "sha256": "15njpd9923rl07lq4mxs611glgnw3qyr21wk6xak6n1cminvy81g" }, "stable": { "version": [ 2, - 5, + 6, 0 ], - "commit": "cdc052b044448654109bfb7d9b3d8bbfcf49042d", - "sha256": "0q1i2q6pkld8rz938yj9g68a55041d9vnps05nn4v1l8rx1x8jif" + "commit": "74e0cf066392c6fa99327e42b24caf4ed2fc414f", + "sha256": "1vc50y7a248f0b4bk6mawb6f7n5dd6skrln8asall2m834bzzg37" } }, { @@ -104886,15 +105243,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200701, - 1435 + 20210418, + 920 ], - "commit": "7cbc3f852bcc1a22ce279cf36c89328841692493", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 296 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 553 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 1293 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 2555 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503\n" - ] + "commit": "e0ad06b5ef2ac2733dad2ad48e3957b5c36edfa5", + "sha256": "0xix4ghri62xdqlh48pydhih1zsnfsy7ncrk6w2wrnz4fa033pia" } }, { @@ -104905,15 +105258,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20210407, - 326 + 20210418, + 920 ], - "commit": "b2d8874bc8ce892a6702b4136626bd65e0ad7760", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 283 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 562 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 1339 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 2016 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503\n" - ] + "commit": "243d93b4c7c1224e7067cd323f64d23dfdfe7c0e", + "sha256": "1gdx6kir0a0v7q2ai59miibch9hccqlnx2y88qswfpqr9pf7z6vm" } }, { @@ -105778,11 +106127,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20210124, - 138 + 20210418, + 1050 ], - "commit": "d4b2014c5684b33ff73b4940bdff7b1138c1f85d", - "sha256": "00cx125pq6jad1v8pxq016hzg6wz1d06l4pc6z9r60l89y2m9hm2" + "commit": "21e74953a88ea5a0a17b86a951bf649dc9a0eaf4", + "sha256": "14hn22ld61l4w4livl83fjf4w59kzwn9qy2pc94p05qpgp8x2hy8" } }, { @@ -105858,15 +106207,15 @@ "repo": "damon-kwok/v-mode", "unstable": { "version": [ - 20200823, - 535 + 20210425, + 411 ], "deps": [ "dash", "hydra" ], - "commit": "d97fb8de5ab19359029dec1195f3d5b87aeb27b1", - "sha256": "1rhk9bcrn43gv0cz92cbvhhjvbifyq7lkdg3hcrla87b2dm4rp3l" + "commit": "96ca8dad3a3a402a44bf9066591fe27fa2e4fd9a", + "sha256": "08n577b8xr1pv2mdzqzdbkd5j0pih7zd4z4p5y5w4hq72mcid43q" } }, { @@ -106000,11 +106349,11 @@ "repo": "arthurgleckler/validate-html", "unstable": { "version": [ - 20210131, - 1704 + 20210420, + 2344 ], - "commit": "39890f7d00579954a660fc3b1c0195231325efd6", - "sha256": "0xb1gnf0f408z9p6iscb9g5c5xj2d460gyzk1mr0wjm847b9cs42" + "commit": "748e874d50c3a95c61590ae293778e26de05c5f9", + "sha256": "0b2b5dm85jwgkqvga23r3vfya07vxv2n7a3a6r1pxpk8asqlw41c" } }, { @@ -106263,14 +106612,14 @@ "repo": "justbur/emacs-vdiff", "unstable": { "version": [ - 20201103, - 1427 + 20210426, + 155 ], "deps": [ "hydra" ], - "commit": "007e44be19d068fd6b49874b6e9b8df8b1f552bd", - "sha256": "197xrwph1llrzjgkhlvagiwdgfp68pb45w5afg89ndahpqc2725s" + "commit": "84b8243d9f5d8082b05794dbc998d43dbdd7676a", + "sha256": "0lv9d9g8lnc3rzqi4v9iqr1ck5df8d52yh81cxzy7x2375b2mfgm" }, "stable": { "version": [ @@ -106487,20 +106836,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210402, - 1621 + 20210429, + 2113 ], - "commit": "f9e69bf42eb8108aeee020ed3f58f456e042967f", - "sha256": "1hycs3aaqw6ss3ccbjd8p3fpb4aslm9hk3b9cwqnz4lxcxvqbfvj" + "commit": "a6e46f436495fb54ba57832450995425ad8dbc26", + "sha256": "0zm3ks1j60vdm9fqspa06fcgcz5mmz1pz4fgr21q001bi3wg8vfq" }, "stable": { "version": [ 2, - 13, - 1 + 14, + 0 ], - "commit": "91827971f655936d8a8df95c9d2f39eaee667c97", - "sha256": "1bvvj25shkasy4b14ifkvh195w401xggmhjkflld5frzp7pm6zvp" + "commit": "0d7f7d36f6ae8130a9bd40845f156a3e3b30eb49", + "sha256": "1bpfxfgq5q022rx592wkigj5chq8ihry8lgrni4rsqbbmbrc1h4b" } }, { @@ -106984,19 +107333,19 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20210404, - 2152 + 20210419, + 857 ], - "commit": "6854932d7fe689caf5cbc1ab65271fcfd46590bd", - "sha256": "02ijylplnv8qzh6r2ci6h4sdm61vn0d2iajmbqyn91hs0695661j" + "commit": "6fa9e7912af412533aec0da8b8f62c227f9f3f54", + "sha256": "1wfww6bqdphv871in80fc84ml8gkl04il6w51z2ycx99km8b723l" }, "stable": { "version": [ 2, - 2 + 4 ], - "commit": "68784162d758fbe6a91d04e9caa8f05683fb6ba9", - "sha256": "1wjb4zm9mx07v0qx2fxmclg4pg0ssgnf8lp89wc56kmc0s40jhii" + "commit": "6fa9e7912af412533aec0da8b8f62c227f9f3f54", + "sha256": "1wfww6bqdphv871in80fc84ml8gkl04il6w51z2ycx99km8b723l" } }, { @@ -107007,14 +107356,14 @@ "repo": "benma/visual-regexp.el", "unstable": { "version": [ - 20190414, - 814 + 20210502, + 2019 ], "deps": [ "cl-lib" ], - "commit": "3e3ed81a3cbadef1f1f4cb16f9112a58641d70ca", - "sha256": "12p3rlhdphwmx1kxsjzcl2wj3i6qgpvw8iwhg1whs6yqgaxivixd" + "commit": "48457d42a5e0fe10fa3a9c15854f1f127ade09b5", + "sha256": "1z2cz6f8ymzrb7fdmw6824y7n5y7rmac5ljl03a6csdhp1yz5c2z" }, "stable": { "version": [ @@ -107189,11 +107538,11 @@ "repo": "jcs-elpa/vs-dark-theme", "unstable": { "version": [ - 20201025, - 1148 + 20210427, + 727 ], - "commit": "3d087e1c48872b5b623ac72c85a9bd3d80ec02cd", - "sha256": "1j326w78drqsr4bxq2sjfnf3ax3hwk1k63flbqj8vfq5w1pc5iy0" + "commit": "5a826e6ea3e9edd9241e3253ce97333955c8ae1a", + "sha256": "0q94crd6m6m000gjxwv92jz9rphmnr5wg7jzf6yig1hlhfqjgw9v" }, "stable": { "version": [ @@ -107212,11 +107561,11 @@ "repo": "jcs-elpa/vs-light-theme", "unstable": { "version": [ - 20201025, - 1148 + 20210427, + 727 ], - "commit": "4e6501118bafb62ecfca8797b6c6d81310d95fd2", - "sha256": "17n9c6fj70rgrc63g72vdxnv8xjnqa6w0rrvh6ih3z2xmky91b2a" + "commit": "e324120248c1d513a6516edff250d161f876aad9", + "sha256": "1jw9cbbvm76ijvcrkkn27r3n6qw14jxbirdc0bryv4k12yiwla9m" }, "stable": { "version": [ @@ -107250,20 +107599,20 @@ "repo": "ianpan870102/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210331, - 1541 + 20210430, + 819 ], - "commit": "3c349f64ff8f12348b865b8c6896db05386cdc49", - "sha256": "0f2dlgjczy45dygyw6was5m74fldrbf3l29bss370qcaj3h2bm3z" + "commit": "24c4cb28042b3b9cc8f4e5294d7597f986aa6fae", + "sha256": "0b85sm6n2ahyyj220k5mqd5ar3x8204p0cfxjyhlk2f989jvfm3i" }, "stable": { "version": [ - 1, - 5, + 2, + 0, 0 ], - "commit": "c64d5f7088f1295df0bd8f1dc87a532e00647fbe", - "sha256": "09a6plb2dqayj4m456ldh43a654jbkg8zjiky7bkj5m0kpdc5426" + "commit": "41772165b3b1195a7e86747ea5b316b16be4c7ef", + "sha256": "1vcaqvhdgr91pr7kqskbscs8awm8jp6dkh79h6w36i9ipmc4l4hl" } }, { @@ -107432,20 +107781,21 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20210329, - 605 + 20210503, + 624 ], "deps": [ "org", "org-roam", "s" ], - "commit": "b394b82cb463f67932dae0fbe3a67daa4d647ea6", - "sha256": "0ssh12jrqfk7llfcfdf6dn9pq0hiqi5f7zp75v1j56qfpijzcbl0" + "commit": "c4f39b853c54cbfab48876812012e040b56838ee", + "sha256": "1dgmxbdvyb9vdha2swg4ahai6xvfvlr7d03y3c2c3db2jbr00aw5" }, "stable": { "version": [ 0, + 1, 1 ], "deps": [ @@ -107453,8 +107803,8 @@ "org-roam", "s" ], - "commit": "4088c95bdd64ca1afbc59bacee571c7260988175", - "sha256": "03kynwkl4q91xz9wsmyx8g3aqgls1r8p5dxhixg586sr9xr4xck0" + "commit": "c4f39b853c54cbfab48876812012e040b56838ee", + "sha256": "1dgmxbdvyb9vdha2swg4ahai6xvfvlr7d03y3c2c3db2jbr00aw5" } }, { @@ -107524,11 +107874,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210409, - 626 + 20210420, + 1048 ], - "commit": "8bab3dc89d36b55ba26ae5941f294c57805d24b2", - "sha256": "15kp2lsfci6p8wkrda12m4vf12p13xd9x5rh3ypc6yvz1snypgyy" + "commit": "a395147050674ff88f03a6ac354a84ccbdc23f1e", + "sha256": "1gpbmnfxc5z2nm03d5989z8mb91wlq8788vvsl9kf2yl8s4fg5a0" } }, { @@ -107837,19 +108187,20 @@ "repo": "bnbeckwith/wc-mode", "unstable": { "version": [ - 20200108, - 1841 + 20210418, + 47 ], - "commit": "79107d1130e8be3e1db4619373b98045b4fd9033", - "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc" + "commit": "63be1433b8a63cdc3239cc751e36360429c42b51", + "sha256": "1wzgb4z2qyyv223x5fc7ff2fn5xpz4s7lr1q1y33q8878a7w9d45" }, "stable": { "version": [ 1, - 4 + 4, + 1 ], - "commit": "79107d1130e8be3e1db4619373b98045b4fd9033", - "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc" + "commit": "63be1433b8a63cdc3239cc751e36360429c42b51", + "sha256": "1wzgb4z2qyyv223x5fc7ff2fn5xpz4s7lr1q1y33q8878a7w9d45" } }, { @@ -108141,14 +108492,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210410, - 421 + 20210430, + 2251 ], "deps": [ "templatel" ], - "commit": "66bf957ace451ad0140e77d2fea235aefcd9ae26", - "sha256": "0qjrwpdi1zg8xbi9xnq5kpiw8dns1g899jh9vrsfqmkvr9vsm220" + "commit": "11ec801222eeb468878e6585efb55721592dbfe8", + "sha256": "01ipk5fwx5phsd6kr7kvdckhd19hly4szwlwl1a0jaxy0ab6iv54" }, "stable": { "version": [ @@ -108327,11 +108678,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210331, - 1857 + 20210426, + 2101 ], - "commit": "998c171becf2e589e65aae0283ebfee90c03d6df", - "sha256": "18zbawhrv9904frg686hlvqr4zqx62ay85igrwm8fr41wipxxhz6" + "commit": "ba042c41554cb46593ef67b40a5523487cf9c6f6", + "sha256": "1k2fyy8kdlpb9vqqm0izxjwqqh84ih78wkc2xpmck771a5xzggf8" } }, { @@ -108511,10 +108862,10 @@ "version": [ 3, 5, - 1 + 2 ], - "commit": "c0608e812a8d1bc7aefeacdfaeb56a7272eabf44", - "sha256": "1g07i6hyv9glhk6xq1z9vn81vi2f0byy7dp3rg4gw22sm6f6d1al" + "commit": "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199", + "sha256": "1wgygby4zwlbx6ry6asraaixl169qdz092zgk1brvg63w7f8vkkb" } }, { @@ -108660,19 +109011,19 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20200715, - 1715 + 20210429, + 805 ], - "commit": "11d01c483ab3ba78b6ea1e195bda65b5e35f2d4c", - "sha256": "14w1cchij7i8a9m9z71dsz76aphidmvp8lbai4gaxxi4qiyvkcn3" + "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39", + "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "7cc7e2734ec823bed6eb923387b3b33a1cde0c86", - "sha256": "0d8q8as85fjn2v65i25xv9bzg03mlk4jhxrbqrcg5ywjiv5i2ljg" + "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39", + "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n" } }, { @@ -109012,27 +109363,27 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20210411, - 1700 + 20210423, + 454 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "dc4f8a00a8b0c1cf6242e1bf47f82e08c508a51e", - "sha256": "0h5s448dgpqi24fpmkbalw4w96jf9ny5gar8qjw0kqmcfxxny9b0" + "commit": "1a556294131a78b557f88bd28d42b43d5c6bd79a", + "sha256": "15v3225irmgg6zsv4h3zyqrbcgx9kbr6rzx5v5hgf9h16fgibi8j" }, "stable": { "version": [ 1, - 7 + 8 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "a302340e183d20baa4445858d321f43449298829", - "sha256": "1dpy8hkjn87wbdkzyabhay4jx4dgc0ab2flyf0rjq1qaazk393sc" + "commit": "8f84defbb4d80ecaada37a2bbde2c1d8699f98af", + "sha256": "1bq0s56wj6ibyh625zfnisy8yniz72dpg4mcgq55azsbnd4fblqq" } }, { @@ -109211,8 +109562,8 @@ 20210405, 1410 ], - "commit": "4b4a8f05401bd08092518ddccdf35461f1124f5a", - "sha256": "16aknbzmh3a4lb0bzkljl70yx8v8g74vfji4h4iqvx013vwvqyp2" + "commit": "c67784cc0c44dc7c590f1f1f5a979a36b1e8c11d", + "sha256": "0pisq1b2yjfplv64xn33lw38ymmpr8wah84pfnwvzqnlfsn5s1hs" } }, { @@ -109253,11 +109604,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20210319, - 1930 + 20210427, + 1244 ], - "commit": "ebcbd3b137154e6c5a2b976bacbb89d48ddfa242", - "sha256": "0qir7kzvnlchpvmpl8gj11yqly6j5m260mmxny9xxwx0dzwaya4k" + "commit": "86bdff68a106bc9d383fdab3bbf1ad4b703a52f0", + "sha256": "1rk8vza2g8gxybhjk10xj3pw9whc80cs9qv4avyv926g7dw60as9" }, "stable": { "version": [ @@ -109580,8 +109931,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210309, - 1513 + 20210429, + 1645 ], "deps": [ "ace-link", @@ -109589,8 +109940,8 @@ "swiper", "zoutline" ], - "commit": "fff12d4d3bb1ddf70cd0abb78aecd9133b367990", - "sha256": "1fbi0rv9pvh9bf72fjc3pfql9xfnw7zif0rsw0r2gn4sdn7202id" + "commit": "7ed797cacf8949928b97bc0fab0bf0f80931b055", + "sha256": "0yp2z5j7vqjfk7s3pid44y2ygccvpgqxazzly3z9q4swjw59p5j8" }, "stable": { "version": [ @@ -109630,11 +109981,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20210402, - 1450 + 20210426, + 1223 ], - "commit": "b182bf853ec408de014ba35527177c7cab90d620", - "sha256": "11rmv6wc7brw1la73y9dvmmx2pqaxxwm4087qkgr9vjg5h02k67d" + "commit": "1d9de2d23ff4ebb61964b399a19bdb460cadd32f", + "sha256": "18hh6v15fjixjain9br26jdysdph4c1bb3wq9q1wmq62wb9x8n9d" }, "stable": { "version": [ @@ -109740,20 +110091,20 @@ "repo": "bnbeckwith/writegood-mode", "unstable": { "version": [ - 20180525, - 1343 + 20210418, + 110 ], - "commit": "b71757ec337e226909fb0422f0224e31acc71733", - "sha256": "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p" + "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0", + "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z" }, "stable": { "version": [ 2, 0, - 3 + 4 ], - "commit": "b71757ec337e226909fb0422f0224e31acc71733", - "sha256": "038gliy6l931r02bf2dbhmp188sgk1rq46ngg9nhf5q5rkf3pi8p" + "commit": "ed42d918d98826ad88928b7af9f2597502afc6b0", + "sha256": "1nwngnddlkcvix7qx39fadab7hqzg8snb0k63kwpr8v57lyrm48z" } }, { @@ -109894,11 +110245,11 @@ "repo": "ag91/writer-word-goals", "unstable": { "version": [ - 20210405, - 1155 + 20210503, + 656 ], - "commit": "77435ca396e7cc2685f4962e959070dbe1f70db1", - "sha256": "0kblcf1qfa06bwqm6pwwdmmpcipn3yjcjw09hmryipzhgf97zfxa" + "commit": "ef94f78b2c4e4fcf1a59d492637cbc84396cb032", + "sha256": "0xf2nvwvag21ds566r90rlf98hf80mz3zj2svhwmqrj6nm70p6z3" } }, { @@ -109979,26 +110330,26 @@ "repo": "skeeto/x86-lookup", "unstable": { "version": [ - 20210409, - 2313 + 20210412, + 2022 ], "deps": [ "cl-lib" ], - "commit": "5e194fdac8a1e12d87b8ed4edeb887eb5543c34d", - "sha256": "0f76qsb8hiryfgwkpymw5sicbmz1p48s0dxai1fmjlvaimrw56mm" + "commit": "1573d61cc4457737b94624598a891c837fb52c16", + "sha256": "16y13bwsfx4mm8p1n09f4443kh03hl7jvfvkbwdrm6dlbywiqq8m" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "609b2ba70dc5a246ac9b4b5f89eb5ef4331519bf", - "sha256": "19zgq7mcc3wx847xc911fibvphbsws99m2l3k54xdjp8mb5qfdzm" + "commit": "1573d61cc4457737b94624598a891c837fb52c16", + "sha256": "16y13bwsfx4mm8p1n09f4443kh03hl7jvfvkbwdrm6dlbywiqq8m" } }, { @@ -110099,11 +110450,11 @@ "repo": "xahlee/xah-math-input", "unstable": { "version": [ - 20210403, - 2312 + 20210419, + 1833 ], - "commit": "bc1ff04a11be7c3b728aa012324377305d48e087", - "sha256": "0q9civwf4mxapmq6hzrf3wimc7pfp28yipx007abchwimpdxvwws" + "commit": "6ccd3ca21aa71a2c1f831fabbdfc9e32c02e180d", + "sha256": "1bibdx0sawgsdzdiivy4x7rf4s5hnz2ypllwz9sk2fdmjyv8d08c" } }, { @@ -110560,11 +110911,7 @@ 1123 ], "commit": "8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 322 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 540 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 1079 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 2268 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503\n" - ] + "sha256": "07i9x2f1mgfr3d5v507ln5z8mh59zdzqv53yyyrcbhvr7j9vi1p3" } }, { @@ -110859,8 +111206,17 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210406, - 156 + 20210424, + 2033 + ], + "commit": "d0abc17e3ddf42624d87fa6d2d3e1ba1dd175035", + "sha256": "19937d26gvj5ir1absb8rxyv35ac85xwvgb0nqcldmnqxqa2h66p" + }, + "stable": { + "version": [ + 0, + 2, + 1 ], "commit": "d8ac09e8cad7f67339e19c53e77da1cd0ff98d36", "sha256": "0wkrvhb5yhb38sf7w1njxij1x0pfxp56hn97j2bk4w58dz94fxir" @@ -111108,11 +111464,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20210108, - 1826 + 20210427, + 645 ], - "commit": "b9061340cc15a3ace3ca8c6e54512b481c71acf1", - "sha256": "1vr0p3q5pnnqpdfvnz29v8sjsldp22hghqb16gmj7l0n2xnlvyv3" + "commit": "bd20a61ab7cd610625137c051c7f15e7404b7829", + "sha256": "0mxl8qxj9vdr8cg9xkh2v901n8m1drk0wzf4di34vkgkmrlkigyg" }, "stable": { "version": [ @@ -111192,14 +111548,13 @@ "stable": { "version": [ 0, - 23 + 24 ], "deps": [ - "s", "yasnippet" ], - "commit": "e5ebfcdb38eb79a6d6705107d07f7bab2e2b5c38", - "sha256": "18pcnjnqvcky6i49p38vy3ms5xiisn27vy47pc3vsgr3r2n87mqb" + "commit": "be823d7e1a1a46454d60a9f3dabb16b68b5dd853", + "sha256": "0ak0drxlg3m2v4ya5chpgl82rcl7ic2nmnybhpw1qk51mcmv643y" } }, { @@ -111942,11 +112297,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20201022, - 955 + 20210412, + 1428 ], - "commit": "6f10653cc17b9c74150ac2f6833eaaaf55488398", - "sha256": "00mz9z181ppr6ad9614k24vlzi4b6flqzzwc1f8vlp7ixnk9i47g" + "commit": "2d0eb23e6b5c12b946f12c23803157605c90f02f", + "sha256": "0lpsqclk37nx8i9jfskbnvxrhvh6vaflgh63xijhv9ajx2iwpw0r" } }, { @@ -112012,14 +112367,14 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20210402, - 2340 + 20210424, + 1943 ], "deps": [ "cl-lib" ], - "commit": "0a186a732b78aeb86599ea8123b36c4885789c7d", - "sha256": "0i6ghqwh35gnyz5b8ipbk030byibcmiy207pvplgszz39sjjjfp6" + "commit": "790033363cf0e78c616cfe117a2f681381e96f29", + "sha256": "0vssi5d02s7f9rhsgqnbh4ql2nvjcc4hsrmihwrk1ij50pn927yj" }, "stable": { "version": [ @@ -112048,8 +112403,8 @@ "deps": [ "cl-lib" ], - "commit": "e795739ec182d217ffaf3c595819c308911540ee", - "sha256": "108bw2k255rkngfkp5iff1frsirc06j70ar1gcrh9lc3fcxdawlp" + "commit": "57d89fc1e17d94a8e9f3365b0d647a80520cc4a8", + "sha256": "0vbpc5lav8pw7caa4442z15a5s1l9wzjv68dgrbjnjvpn6yz3pay" } }, { @@ -112296,11 +112651,21 @@ "s" ], "commit": "bee8196c5db26b75abc1359a5a7cb8a2b1f192ad", - "error": [ - "exited abnormally with code 1\n", - "", - "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 324 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 632 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 1159 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 2278 ms\nerror: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503\n" - ] + "sha256": "1n0y6wap2yvqa75jf5yvdb9dy304c7i5g28g5lqj20ikj914wai7" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "ht", + "oauth", + "s" + ], + "commit": "bee8196c5db26b75abc1359a5a7cb8a2b1f192ad", + "sha256": "1n0y6wap2yvqa75jf5yvdb9dy304c7i5g28g5lqj20ikj914wai7" } }, { @@ -112318,8 +112683,8 @@ "deferred", "request" ], - "commit": "a760009b9ecfa0b3362e77a6b44453821768d02e", - "sha256": "0vfdpgb0ln3xrx4i32mqisaj7qm2yx73rhagx6adr8hjw78gysfy" + "commit": "45961801f9e0350d7457d0d84c5004f63aed9070", + "sha256": "18hi6m2ngl9yz599q5bhifafi4vz1adc06bjl0bhb3rs62vbkwk2" }, "stable": { "version": [ @@ -112417,14 +112782,14 @@ "repo": "fourier/ztree", "unstable": { "version": [ - 20210409, - 1841 + 20210415, + 1947 ], "deps": [ "cl-lib" ], - "commit": "c9ad9136d52ca5a81475693864e255d29448f43f", - "sha256": "03i5pa3nfdz6g0yrdk7r2qcn679w0s85cc5kcmgrwlnhdzakgr80" + "commit": "f05677f9696e573c8c607e8876fb4a0cccbc491f", + "sha256": "1kav7xiarm0dgvgxf49qqcy2jp388b51x3qb92dyd3i73n6bk09j" } }, { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 6726790d50fe8..13062ae926139 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -94,8 +94,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ])); in '' substituteInPlace lisp/emacs-lisp/comp.el --replace \ - "(defcustom comp-native-driver-options nil" \ - "(defcustom comp-native-driver-options '(${backendPath})" + "(defcustom native-comp-driver-options nil" \ + "(defcustom native-comp-driver-options '(${backendPath})" '')) "" ]; @@ -175,7 +175,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { (comp-trampoline-compile (intern (pop argv))))" mkdir -p $out/share/emacs/native-lisp $out/bin/emacs --batch \ - --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ + --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index b8fcc678faa1f..8c395219aeb3e 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -5,20 +5,20 @@ stdenv.mkDerivation rec { pname = "emacs"; - version = "27.1"; + version = "27.2"; emacsName = "emacs-${version}"; - macportVersion = "8.0"; + macportVersion = "8.2"; name = "emacs-mac-${version}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; + sha256 = "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "0rjk82k9qp1g701pfd4f0q2myzvsnp9q8xzphlxwi5yzwbs91kjq"; + sha256 = "1bgm2g3ky7rkj1l27wnmyzqsqxzjng7y9bf72ym37wiyhyi2a9za"; }; hiresSrc = fetchurl { diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 01a6422d731fa..3f9ec25d99f0f 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -47,11 +47,11 @@ least specific (the system profile)" ;;; Set up native-comp load path. (when (featurep 'comp) ;; Append native-comp subdirectories from `NIX_PROFILES'. - (setq comp-eln-load-path + (setq native-comp-eln-load-path (append (mapcar (lambda (profile-dir) (concat profile-dir "/share/emacs/native-lisp/")) (nix--profile-paths)) - comp-eln-load-path))) + native-comp-eln-load-path))) ;;; Make `woman' find the man pages (defvar woman-manpath) diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 2249009af777d..4d6eafaa0f0d1 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.0.0-rc5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - sha256 = "sha256-Gc0/AHxxJd5Cq3dBQ0Xy2TF78CBmQFYUzm4s7q1aHEE="; + sha256 = "sha256-5O2W7ZQeDkNzwi6t9MfNbv4fmNvak1AcMnzJTE1F9L8="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index da7b70cecd2ab..998341d6bb524 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -6,7 +6,7 @@ , docbook_xml_dtd_43 , fetchurl , flatpak -, gnome3 +, gnome , libgit2-glib , gobject-introspection , glade @@ -34,16 +34,16 @@ , webkitgtk , wrapGAppsHook , dbus -, xvfb_run +, xvfb-run }: stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.38.2"; + version = "3.40.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jFNco64yoZC1TZbTIHGVf+wBYYQHo2JRiMZFHngzYTs="; + sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j"; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags flatpak - gnome3.devhelp + gnome.devhelp glade libgit2-glib libpeas @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { checkInputs = [ dbus - xvfb_run + xvfb-run ]; outputs = [ "out" "devdoc" ]; @@ -99,7 +99,6 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - "-Dpython_libprefix=${python3.libPrefix}" "-Ddocs=true" # Making the build system correctly detect clang header and library paths @@ -135,7 +134,10 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { description = "An IDE for writing GNOME-based software"; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 7967b78f13c28..8fc6feecd57c9 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,21 +1,49 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee -, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }: -let +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, gtk-doc +, vala +, gobject-introspection +, wrapGAppsHook +, gsettings-desktop-schemas +, gspell +, gtksourceview4 +, libgee +, tepl +, amtk +, gnome +, glib +, pkg-config +, intltool +, itstool +, libxml2 +}: + +stdenv.mkDerivation rec { version = "3.38.0"; pname = "gnome-latex"; -in stdenv.mkDerivation { - name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - configureFlags = ["--disable-dconf-migration"]; + patches = [ + # Fix build with latest tepl. + (fetchpatch { + url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch"; + sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY="; + }) + ]; nativeBuildInputs = [ pkg-config + autoreconfHook + gtk-doc + vala + gobject-introspection wrapGAppsHook itstool intltool @@ -23,7 +51,7 @@ in stdenv.mkDerivation { buildInputs = [ amtk - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme glib gsettings-desktop-schemas gspell @@ -33,9 +61,18 @@ in stdenv.mkDerivation { tepl ]; + configureFlags = [ + "--disable-dconf-migration" + ]; + doCheck = true; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + passthru.updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 27047f8e95a8b..35e96c89dad57 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,6 +1,6 @@ { avahiSupport ? false # build support for Avahi in libinfinity , lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools -, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 3d0e98602add7..cb1307d7ffb42 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "zile"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "mirror://gnu/zile/${pname}-${version}.tar.gz"; - hash = "sha256-v7rN33aOORc6J0Z5JP5AmZCj6XvjYyoCl5hl+7mvAnc="; + hash = "sha256-d+t9r/PJi9yI2qGsBA3MynK4HcMvwxZuB53Xpj5Cx0E="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index e0b75e7406428..01cbddcc2839c 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -2,6 +2,8 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices +, Foundation +, testVersion, imagemagick }: let @@ -50,7 +52,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] - ++ lib.optional stdenv.isDarwin ApplicationServices; + ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Foundation + ]; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] @@ -72,6 +77,9 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.version = + testVersion { package = imagemagick; }; + meta = with lib; { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 0e4f182ea50f2..02e5c7c0345a1 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome , xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [makeWrapper wrapGAppsHook unzip]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 2ff712851b941..469437c6c952c 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -2,7 +2,7 @@ , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt -, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 +, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome , ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml - libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes + libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk libX11 ocl-icd ] ++ lib.optional stdenv.isDarwin gtk-mac-integration diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index 9792ce4d6d2ba..465e78e434cae 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -63,17 +63,10 @@ rustPlatform.buildRustPackage rec { OpenGL ]; - installPhase = '' - runHook preInstall - install -D $releaseDir/emulsion $out/bin/emulsion - '' + lib.optionalString stdenv.isLinux '' - patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion - '' + '' - runHook postInstall + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion ''; - dontPatchELF = true; - meta = with lib; { description = "A fast and minimalistic image viewer"; homepage = "https://arturkovacs.github.io/emulsion-website/"; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index 04ac87c55da9c..34dd4926a49f9 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Find the most beautiful wallpapers for your desktop"; homepage = "https://github.com/calo001/fondo"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 2491d8d3a8ab4..08d3f122aab50 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , substituteAll , autoreconfHook , pkg-config @@ -34,6 +33,7 @@ , libexif , gettext , makeWrapper +, gtk-doc , xorg , glib-networking , libmypaint @@ -53,13 +53,13 @@ let python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.22"; + version = "2.10.24"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d"; + sha256 = "17lq6ns5qhspd171zqh76yf98xnn5n0hcl7hbhbx63cc6ribf6xx"; }; patches = [ @@ -73,12 +73,6 @@ in stdenv.mkDerivation rec { # Use absolute paths instead of relying on PATH # to make sure plug-ins are loaded by the correct interpreter. ./hardcode-plugin-interpreters.patch - - # Fix crash without dot. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04.patch"; - sha256 = "POuvBhOSStO7hBGp4HgNx5F9pElFRoqN3W+i3u4zOnk="; - }) ]; nativeBuildInputs = [ @@ -87,6 +81,7 @@ in stdenv.mkDerivation rec { intltool gettext makeWrapper + gtk-doc ]; buildInputs = [ diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index bb81a374fea21..679e9136c44ad 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: +{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); @@ -18,7 +18,7 @@ in symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ --set GIMP2_DATADIR "$out/share/gimp/2.0" \ - --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done set +x diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 33337739364e6..c2ce2840379c5 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook +{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkg-config, yelp-tools }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools - gnome3.gnome-common gsettings-desktop-schemas + gnome.gnome-common gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix index daa540d31e504..361b2ba38b6e2 100644 --- a/pkgs/applications/graphics/glimpse/wrapper.nix +++ b/pkgs/applications/graphics/glimpse/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }: +{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome, plugins ? null }: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins); @@ -19,7 +19,7 @@ symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \ --set GIMP2_DATADIR "$out/share/glimpse/2.0" \ - --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index a710d6c1e4794..f0911395404e3 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , at-spi2-core , babl , dbus @@ -14,7 +13,7 @@ , gfbgraph , glib , gnome-online-accounts -, gnome3 +, gnome , gobject-introspection , grilo , grilo-plugins @@ -22,6 +21,7 @@ , gtk3 , itstool , libdazzle +, libhandy , libgdata , libxml2 , meson @@ -36,32 +36,17 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.38.0"; + version = "40.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0"; }; patches = [ ./installed-tests-path.patch - - # Port to Tracker 3 - # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch"; - sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch"; - sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch"; - sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE="; - }) ]; nativeBuildInputs = [ @@ -93,12 +78,13 @@ stdenv.mkDerivation rec { gfbgraph glib gnome-online-accounts - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme grilo grilo-plugins gsettings-desktop-schemas gtk3 libdazzle + libhandy libgdata tracker tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema @@ -122,7 +108,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 616a0b7135663..67f624ce9c99a 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -4,7 +4,7 @@ # runtime dependencies imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk, # test dependencies - xvfb_run, liberation_ttf, file, tesseract }: + xvfb-run, liberation_ttf, file, tesseract }: with lib; @@ -94,7 +94,7 @@ perlPackages.buildPerlPackage rec { unpaper pdftk - xvfb_run + xvfb-run file tesseract # tests are expecting tesseract 3.x precisely ] ++ (with perlPackages; [ diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 26de91ee2252d..cd3a6f368e9c7 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , pkg-config , meson , ninja @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.10.2"; + version = "3.11.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/erkKBg3j5s8qwBgTu61t8Cnpez+ad4IuZOGd0ZDXJM="; + sha256 = "11bvcimamdcksgqj1ymh54yzhpwc5j8glda8brqqhwq3h2wj0j9d"; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { clutter-gtk exiv2 glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) @@ -95,8 +95,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 56ebbeb372284..c7d4a77ea2a94 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -9,14 +9,14 @@ pythonPackages.buildPythonPackage rec { pname = "hydrus"; - version = "436"; + version = "438"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-FXm8VUEY0OZ6/dc/qNwOXekhv5H2C9jjg/eNDoMvMn0=="; + sha256 = "sha256-iBJkbVUlsjt26SbDe92eIrWKQwWBhkjjeLM14Pm/obc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 11340fa74686b..bea288e295860 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,6 +5,7 @@ , cmake , double-conversion , fetchurl +, fetchpatch , gettext , gdl , ghostscript @@ -71,6 +72,13 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) + + # Fix build with glib 2.68 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/2790 + (fetchpatch { + url = "https://gitlab.com/inkscape/inkscape/-/commit/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch"; + sha256 = "d2FHRWcOzi0Vsr6t0MuLu3rWpvhFKuuvoXd4/NKUSJI="; + }) ]; postPatch = '' diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 294b6c4ca7012..4b9b93505ad87 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { description = "A Graphviz dot graph viewer for KDE"; license = licenses.gpl2; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 3d8a4c2bcebdd..9439a17f6ded5 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -6,7 +6,7 @@ , pkg-config , wrapGAppsHook , gtk3 -, gnome3 +, gnome , zbar , tiffSupport ? true , libraw @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ] + buildInputs = [ gtk3 gnome.adwaita-icon-theme zbar ] ++ optional tiffSupport libraw ++ optional jpgSupport graphicsmagick; diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index ff5d4bdf41de7..da5f1c5dcc499 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -8,7 +8,7 @@ , intltool , itstool , libxml2 -, gnome3 +, gnome , python3 , gobject-introspection , wrapGAppsHook diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index e3ab0c772a1dc..0d3a86663b30b 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -12,13 +12,14 @@ buildPythonPackage rec { pname = "pick-colour-picker"; - version = "unstable-2019-10-11"; # "1.5.0-3ec940" + version = "unstable-2021-01-19"; src = fetchFromGitHub { owner = "stuartlangridge"; repo = "ColourPicker"; - rev = "3ec9406d787ce373f6db0d520ed38a921edb9473"; - sha256 = "04l8ch9297nhkgcmyhsbg0il424c8vy0isns1c7aypn0zp0dc4zd"; + rev = "dec8f144918aa7964aaf86a346161beb7e997f09"; + sha256 = "hW2rarfchZ3M0JVfz5RbJRvMhv2PpyLNEMyMAp2gC+o="; + fetchSubmodules = false; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 7948ef0f08c03..f678af7061197 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config -, ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler +, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler }: stdenv.mkDerivation (rec { @@ -14,14 +14,14 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ]; + buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ]; prePatch = "patchShebangs ."; meta = with lib; { description = "Powerful image viewer with minimal UI"; - homepage = "http://www.pberndt.com/Programme/Linux/pqiv"; - license = licenses.gpl3; + homepage = "https://www.pberndt.com/Programme/Linux/pqiv"; + license = licenses.gpl3Plus; maintainers = []; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 626610728ae60..597bd1f17056f 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -13,14 +13,14 @@ let pythonPackages = python3Packages; in mkDerivation rec { - version = "1.12"; + version = "1.13"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "4k0WsTsz4WwPZC8Dj85l2ntJOZkLgmBBOJcX9Bb4U7I="; + sha256 = "MBvdnB1YPeCaXSgqqtGs0SMocbarjmaWtIUkBBCvufc="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 204d87a59c4e7..78b30ad44e036 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -12,7 +12,7 @@ , sqlite , webkitgtk , pkg-config -, gnome3 +, gnome , gst_all_1 , libgudev , libraw @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { librsvg librest gcr - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libgdata libchamplain libsecret @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index b00f7f33210cf..73c5a038aab6b 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { pname = "solvespace"; - version = "v3.0.rc2"; + version = "v3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1z0873gwcr0hybrpqy4hwislir6k2zb4s62lbsivq5nbkizy7gjm"; + sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9"; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 3f29d25fbe049..2b9fee974b377 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config -, imagemagick, intltool, autoreconfHook, which, gnome3 +, imagemagick, intltool, autoreconfHook, which, gnome }: let @@ -107,7 +107,7 @@ stdenv.mkDerivation { buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 - synfig which gnome3.adwaita-icon-theme + synfig which gnome.adwaita-icon-theme ]; postInstall = '' diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 3c48bbab0b853..6c9cee8514863 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, wrapGAppsHook -, libX11, libzip, glfw, libpng, xorg, gnome3 +, libX11, libzip, glfw, libpng, xorg, gnome }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/tev \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH ":" "${gnome3.zenity}/bin" + --prefix PATH ":" "${gnome.zenity}/bin" ''; meta = with lib; { diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index b5e9d0b8cf2dd..a6320f774fd59 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,8 +1,8 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, gnome3 +, gnome # Test requirements -, dbus, xvfb_run, xdotool +, dbus, xvfb-run, xdotool }: python3Packages.buildPythonApplication rec { @@ -37,8 +37,8 @@ python3Packages.buildPythonApplication rec { vimiv/imageactions.py ''; - checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ gnome3.adwaita-icon-theme librsvg ]; + checkInputs = [ python3Packages.nose dbus.daemon xvfb-run xdotool ]; + buildInputs = [ gnome.adwaita-icon-theme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index eb5dc8950f905..a4ef9b34318ca 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -8,7 +8,7 @@ , gcr , gettext , glib -, gnome3 +, gnome , gpgme , gtk3 , gtksourceview3 @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; # it is quite odd }; diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index f213faa44124b..5245d559d4474 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-YQDrxPqCa3OzNKd3UiAffqqvOrgbXmDFJGjYPetolyY="; + sha256 = "sha256-hKYZkKQOvNu2qDSOq1cjoiLwwOvEqdJfqGG5p3Vhkhs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 3f4e77bdd042b..ded30233d4cb6 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "0nxdyd0zg4w1zr8p9z2x88h36vbn7ryk7160zszdiwh5qmdlv47v"; + sha256 = "sha256-XJSWdXGa1qkkMfETUV8xx9oaMdNVFdO27/GvDvczjG8="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 234ed7410f9c9..33501d1c6673c 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -17,7 +17,7 @@ }: stdenv.mkDerivation rec { - pname = "dbeaver-ce"; + pname = "dbeaver"; version = "21.0.4"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { diff --git a/pkgs/applications/misc/dwmblocks/default.nix b/pkgs/applications/misc/dwmblocks/default.nix index 45757787c7c36..c31a1a4b06301 100644 --- a/pkgs/applications/misc/dwmblocks/default.nix +++ b/pkgs/applications/misc/dwmblocks/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { homepage = "https://github.com/torrinfail/dwmblocks"; license = licenses.isc; maintainers = with maintainers; [ sophrosyne ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index b116fbbbd7c8b..5274e606dda15 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "flavours"; @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rDy859jg+F8XC4sJogIgdn1FoT8cf7S+KORt+7kboAc="; }; + buildInputs = [ ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; + cargoSha256 = "sha256-cAXiAPhHdxdd8pFQ0Gq7eHO2p/Dam53gDbE583UYY/k="; meta = with lib; { diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 766ec9a55d9c0..29399ab2f5b57 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,20 +1,61 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3, - pkg-config, libxml2, json-glib , sqlite, itstool, yelp-tools, - vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection, - libsoup, webkitgtk +{ lib +, stdenv +, fetchFromGitHub +, meson +, fetchpatch +, ninja +, gettext +, python3 +, pkg-config +, libxml2 +, json-glib +, sqlite +, itstool +, yelp-tools +, vala +, gsettings-desktop-schemas +, gtk3 +, gnome +, desktop-file-utils +, wrapGAppsHook +, gobject-introspection +, libsoup +, glib-networking +, webkitgtk }: stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.8.5-1"; + version = "0.8.6"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "1p0hfnf06892hn25a6zv8fnhbh4ln11nn2fv1vjqs63rr59fprbk"; + sha256 = "0a18rbdy9d0fj0vnsc2rm7xlh17vjqn4kdyrq0ldzlzkb6zbdk2k"; }; + patches = [ + # Fix some Desktop Settings with GNOME 40. + # https://github.com/FontManager/font-manager/issues/215 + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/b28f325d7951a66ebf1a2a432ee09fd22048a033.patch"; + sha256 = "dKbrXGb9a4JuG/4x9vprMlh5J17HKJFifRWq9BWp1ow="; + }) + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/2147204d4c4c6b58161230500186c3a5d4eeb1c1.patch"; + sha256 = "2/PFLwf7h76fIIN4+lyjg/L0KVU1hhRQCfwCAGDpb00="; + }) + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/3abc541ef8606727c72af7631c021809600336ac.patch"; + sha256 = "rJPnW+7uuFLxTf5tk+Rzo+xkw2+uzU6BkzPXLeR/RGc="; + }) + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/03a822f0d7b72442cd2ffcc8668da265d3535e0d.patch"; + sha256 = "3Z2UqK5VV2bIwpGd1tA7fivd7ooIuV6CxTJhzgOAkIM="; + }) + ]; + nativeBuildInputs = [ pkg-config meson @@ -34,12 +75,18 @@ stdenv.mkDerivation rec { libxml2 json-glib sqlite + gsettings-desktop-schemas # for font settings gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libsoup + glib-networking # for SSL so that Google Fonts can load webkitgtk ]; + mesonFlags = [ + "-Dreproducible=true" # Do not hardcode build directory… + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ad0970e0fe29d..8f6c97d196d8e 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.1"; + version = "1.17.3"; src = fetchPypi { inherit pname version; - sha256 = "1cfaa3a617d5d222d4b9b41634b1bdede2673a8620d6b0e62fb755ae224ca2ac"; + sha256 = "5da10d931c371841575d988b4e91e9d4ce55c8c3c99aa6d4efa5abca34c75ec8"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index f8ebd8aed7ec5..cc13ad59332b2 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb-run, glib, gtk, gettext, libiconv, json_c, libintl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; }; - nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb_run ]; + nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb-run ]; buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 9d8ce3cc48045..c1a4ea2b6789d 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome3, libgksu, +{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring + gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 89a967d718bf5..31d81a3327905 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -4,7 +4,7 @@ , desktop-file-utils , gettext , glib -, gnome3 +, gnome , gtk3 , gusb , libcanberra-gtk3 @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-multi-writer"; - version = "3.32.1"; + version = "3.35.90"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw"; + sha256 = "07vgzjjdrxcp7h73z13h9agafxb4vmqx5i81bcfyw0ilw9kkdzmp"; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 168d5b9fb5ccb..b35319c386305 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , desktop-file-utils , gettext , itstool @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index bbd272754cdb9..a1b92572679c8 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -12,7 +12,7 @@ , gtk3 , libgtop , libdazzle -, gnome3 +, gnome , tracker , libhandy }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3 libdazzle libgtop @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 89a4198a749f7..1619f7f433422 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { intltool pkg-config wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; + buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ]; meta = with lib; { homepage = "https://blog.sarine.nl/tag/gpxviewer/"; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index f0416e232dcd6..c36f50b1cbdb4 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkgs -, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive +, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive , pkg-config, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 5d9fb0f30d76f..3fd80d4eff3ee 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-5cepT9Tfr/3nYbxRAMqKSUDB+suEyojnexWxZ0i7GBw="; + sha256 = "sha256-CY7n9eq/FtQ6srZ9L31nJi0b9rOQq60kNOY3iTFws/E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index a885b1643fe23..b446fe6223df1 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, testVersion +, hello +}: stdenv.mkDerivation rec { pname = "hello"; @@ -11,6 +16,9 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.version = + testVersion { package = hello; }; + meta = with lib; { description = "A program that produces a familiar, friendly greeting"; longDescription = '' diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix new file mode 100644 index 0000000000000..7f7b89618eb82 --- /dev/null +++ b/pkgs/applications/misc/kratos/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub, buildGoModule, lib, stdenv }: + +buildGoModule rec { + pname = "kratos"; + version = "0.6.0-alpha.1"; + + src = fetchFromGitHub { + owner = "ory"; + repo = "kratos"; + rev = "v${version}"; + sha256 = "0lnrm7ma203b5a0vxgm9zqsbs3nigx0kng5zymrjvrzll1gd79wm"; + }; + + vendorSha256 = "16qg44k97l6719hib8vbv0j15x6gvs9d6738d2y990a2qiqbsqpw"; + + subPackages = [ "." ]; + + buildFlags = [ "-tags sqlite" ]; + + doCheck = false; + + preBuild = '' + # Patch shebangs + files=( + test/e2e/run.sh + script/testenv.sh + script/test-envs.sh + persistence/sql/migratest/update_fixtures.sh + ) + patchShebangs "''${files[@]}" + + # patchShebangs doesn't work for this Makefile, do it manually + substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}' + ''; + + meta = with lib; { + maintainers = with maintainers; [ mrmebelman ]; + homepage = "https://www.ory.sh/kratos/"; + license = licenses.asl20; + description = "An API-first Identity and User Management system that is built according to cloud architecture best practices"; + }; +} diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index b580fabf58e90..c7238fb01551d 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -5,7 +5,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnome3Deps = pkgs: with pkgs; [ gnome3.zenity gtksourceview gnome3.gnome-desktop gnome3.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite @@ -86,7 +86,7 @@ in buildFHSUserEnv { # ZDOOM soundfont-fluid bzip2 game-music-emu ] ++ qt5Deps pkgs - ++ gnome3Deps pkgs + ++ gnomeDeps pkgs ++ lib.optional steamSupport pkgs.steam; multiPkgs = pkgs: with pkgs; [ diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/applications/misc/nimbo/default.nix new file mode 100644 index 0000000000000..1bc45bc6aee03 --- /dev/null +++ b/pkgs/applications/misc/nimbo/default.nix @@ -0,0 +1,28 @@ +{ lib, setuptools, boto3, requests, click, pyyaml, pydantic, buildPythonApplication +, pythonOlder, fetchFromGitHub, awscli }: + +buildPythonApplication rec { + pname = "nimbo"; + version = "0.2.4"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "nimbo-sh"; + repo = pname; + rev = "v${version}"; + sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24"; + }; + + propagatedBuildInputs = [ setuptools boto3 awscli requests click pyyaml pydantic ]; + + # nimbo tests require an AWS instance + doCheck = false; + pythonImportsCheck = [ "nimbo" ]; + + meta = with lib; { + description = "Run machine learning jobs on AWS with a single command"; + homepage = "https://github.com/nimbo-sh/nimbo"; + license = licenses.bsl11; + maintainers = with maintainers; [ alex-eyre noreferences ]; + }; +} diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 0b781f61369ac..724d9285ec2b6 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Stupidly-simple sticky notes applet"; homepage = "https://github.com/lainsce/notejot"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index e62b3a334876b..b00ee18d5f331 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -2,7 +2,7 @@ , dbus-glib , fetchurl , glib -, gnome3 +, gnome , libnotify , libtool , libwnck3 @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper - gsettings-desktop-schemas gnome3.gnome-common + gsettings-desktop-schemas gnome.gnome-common libtool ]; diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index fbaf140a9f78e..bde2ae07c9222 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -9,7 +9,7 @@ , python3 , libgee , gsettings-desktop-schemas -, gnome3 +, gnome , pantheon , wrapGAppsHook , gtk3 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib glib-networking - gnome3.libsoup + gnome.libsoup gsettings-desktop-schemas gtk3 json-glib @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey"; homepage = "https://github.com/cleac/olifant"; license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 72d68431b8c08..f8facbe01fa09 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -12,7 +12,7 @@ , python , pygobject3 , gtk3 -, gnome3 +, gnome , substituteAll , at-spi2-atk , at-spi2-core @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.38.2"; + version = "40.0"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000"; }; patches = [ @@ -92,7 +92,7 @@ buildPythonApplication rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -108,7 +108,7 @@ buildPythonApplication rec { GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. - Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. + Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`. ''; maintainers = with maintainers; [ berce ] ++ teams.gnome.members; license = licenses.lgpl21; diff --git a/pkgs/applications/misc/orca/fix-paths.patch b/pkgs/applications/misc/orca/fix-paths.patch index ffb56dbe239c4..037b323c8cb1a 100644 --- a/pkgs/applications/misc/orca/fix-paths.patch +++ b/pkgs/applications/misc/orca/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/src/orca/debug.py b/src/orca/debug.py +index e79482ed4..cbf3a24ec 100644 --- a/src/orca/debug.py +++ b/src/orca/debug.py -@@ -474,7 +474,7 @@ +@@ -502,7 +502,7 @@ def traceit(frame, event, arg): return traceit def getOpenFDCount(pid): @@ -9,7 +11,7 @@ procs = procs.decode('UTF-8').split('\n') files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) -@@ -482,7 +482,7 @@ +@@ -510,7 +510,7 @@ def getOpenFDCount(pid): def getCmdline(pid): try: @@ -18,7 +20,7 @@ cmdline = openFile.read() openFile.close() except: -@@ -492,7 +492,7 @@ +@@ -520,7 +520,7 @@ def getCmdline(pid): return cmdline def pidOf(procName): @@ -27,9 +29,11 @@ shell=True, stdout=subprocess.PIPE).stdout pids = openFile.read() +diff --git a/src/orca/orca.py b/src/orca/orca.py +index 2fe0a0bf2..087526556 100644 --- a/src/orca/orca.py +++ b/src/orca/orca.py -@@ -239,7 +239,7 @@ +@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent): def _setXmodmap(xkbmap): """Set the keyboard map using xkbcomp.""" @@ -38,7 +42,7 @@ stdin=subprocess.PIPE, stdout=None, stderr=None) p.communicate(xkbmap) -@@ -297,7 +297,7 @@ +@@ -363,7 +363,7 @@ def _storeXmodmap(keyList): """ global _originalXmodmap @@ -47,7 +51,7 @@ def _restoreXmodmap(keyList=[]): """Restore the original xmodmap values for the keys in keyList. -@@ -309,7 +309,7 @@ +@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]): global _capsLockCleared _capsLockCleared = False @@ -56,9 +60,11 @@ stdin=subprocess.PIPE, stdout=None, stderr=None) p.communicate(_originalXmodmap) +diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in +index 8c9d40153..eec0d5437 100644 --- a/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in -@@ -59,7 +59,7 @@ +@@ -62,7 +62,7 @@ class ListApps(argparse.Action): name = "[DEAD]" try: @@ -67,12 +73,12 @@ except: cmdline = '(exception encountered)' else: -@@ -192,7 +192,7 @@ +@@ -197,7 +197,7 @@ def inGraphicalDesktop(): def otherOrcas(): """Returns the pid of any other instances of Orca owned by this user.""" -- openFile = subprocess.Popen('pgrep -u %s orca' % os.getuid(), -+ openFile = subprocess.Popen('@pgrep@ -u %s orca' % os.getuid(), +- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(), ++ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(), shell=True, stdout=subprocess.PIPE).stdout pids = openFile.read() diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 474fddb25201a..a8b407dd7b5d4 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config -, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: +, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }: let libfm' = libfm.override { inherit withGtk3; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 6ef88fb07c65f..2e3f323051259 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -8,7 +8,7 @@ , python3 , wrapGAppsHook , libinput -, gnome3 +, gnome , glib , gtk3 , wayland @@ -60,9 +60,9 @@ in stdenv.mkDerivation rec { libinput glib gtk3 - gnome3.gnome-desktop + gnome.gnome-desktop # For keybindings settings schemas - gnome3.mutter + gnome.mutter wayland phocWlroots ]; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index b462e5f134b16..30d9533d45306 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -5,7 +5,7 @@ , cairo , dconf , glib -, gnome3 +, gnome , gtk3 , libwnck3 , libX11 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - gnome3.gnome-common + gnome.gnome-common libxml2 # xmllint pkg-config vala diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 44b2cd700ecf6..05cc834591f5f 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -2,7 +2,7 @@ , python3 , fetchFromGitHub , gdk-pixbuf -, gnome3 +, gnome , gpsbabel , glib-networking , glibcLocales @@ -13,7 +13,7 @@ , tzdata , webkitgtk , wrapGAppsHook -, xvfb_run +, xvfb-run }: let @@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec { gtk3 webkitgtk glib-networking - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gdk-pixbuf ]; @@ -66,7 +66,7 @@ in python.pkgs.buildPythonApplication rec { checkInputs = [ glibcLocales perl - xvfb_run + xvfb-run ] ++ (with python.pkgs; [ mysqlclient psycopg2 diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index d866b643ef254..179ebd33d8568 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg +{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg }: let inherit (python3Packages) python buildPythonApplication fetchPypi croniter; @@ -16,8 +16,8 @@ in buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - gnome3.adwaita-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index 5beacfad2f956..2c63431593368 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper +, gnome, gtk3, wrapGAppsHook, gtksourceview3, snapper , gobject-introspection }: @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; doCheck = false; # it doesn't have any tests diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 0f6747d69f836..63ac88ecac9d3 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -9,7 +9,7 @@ , python3 , libgee , gsettings-desktop-schemas -, gnome3 +, gnome , pantheon , wrapGAppsHook , gtk3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib glib-networking - gnome3.libsoup + gnome.libsoup gsettings-desktop-schemas gtk3 json-glib diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index c086cdb9503ba..fb1a85b1e4910 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { checkInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; - propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests ]; + propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests six ]; meta = with lib; { description = "Browse Reddit from your Terminal (fork of rtv)"; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 989649ec41468..ebfaaa1db51d7 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -4,7 +4,7 @@ , python3Packages , gdk-pixbuf , glib -, gnome3 +, gnome , gobject-introspection , gtk3 , wrapGAppsHook @@ -14,7 +14,7 @@ , libappindicator , intltool , wmctrl -, xvfb_run +, xvfb-run , librsvg }: @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gobject-introspection gtk3 keybinder3 @@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec { mock pytest pytest-mock - xvfb_run + xvfb-run ]; patches = [ @@ -115,6 +115,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ aaronjanse worldofpeace ]; + maintainers = with maintainers; [ aaronjanse ]; }; } diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 9b8821b5115ed..6a60e81933b9a 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.5.0.1"; + version = "5.5.0.11"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_1_291c031686ed44ff/${pname}_${version}_amd64.deb"; - sha256 = "49192ecfb10929b5b51cf8899186059649c894109ec172695cd7cfaa50923f6a"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_5_0_11_61df9c99b6df4e7b/${pname}_${version}_amd64.deb"; + sha256 = "db83d5fb1b5383992c6156284f6f3cd3a6b23f727ce324ba90c82817553fb4f7"; }; dontWrapGApps = true; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index fc609b280f995..ad49a1b291e27 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -15,13 +15,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.2.1"; + version = "2.4"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1gkvnywjg0n3n7d855ivclsj3d8mzihhkgv9a18srcszkmyix903"; + sha256 = "0mvf2603d9b0s6rh7sl7mg4ipbh0nk05xgh1078mwvx31qjsmq1i"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index bb4e1727f69ff..2d8af0465a772 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, xorg, pcre, gst_all_1, glib +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: stdenv.mkDerivation { @@ -21,6 +21,14 @@ stdenv.mkDerivation { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + patches = [ + (fetchpatch { + name = "gcc-10.patch"; + url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch"; + sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy"; + }) + ]; + postPatch = '' sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure ''; diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index bcb5beff2875d..8a8d2b071d082 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -1,17 +1,17 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { - name = "xplr"; - version = "0.5.12"; + pname = "xplr"; + version = "0.7.2"; src = fetchFromGitHub { owner = "sayanarijit"; - repo = name; + repo = pname; rev = "v${version}"; - sha256 = "0dmqa56sxyvrq03rpf9yczp75zk44s79ilz6kbykdghp0d9lyldf"; + sha256 = "1mqxnahhbf394niyc8i6gk2y3i7lj9cj71k460r58cmir5fch82m"; }; - cargoSha256 = "1mb1rfax91cbi2wvshl8jsfykx9kfwff8fkqa7rc4plqxnz0qxkx"; + cargoSha256 = "1dfcmkfclkq5b103jl98yalcl3mnvsq8xpkdasf72d3wgzarih16"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix index 6636691468ea2..f9221d06d022d 100644 --- a/pkgs/applications/networking/3proxy/default.nix +++ b/pkgs/applications/networking/3proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, coreutils }: +{ lib, stdenv, fetchFromGitHub, coreutils, nixosTests }: stdenv.mkDerivation rec { pname = "3proxy"; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { "DESTDIR=${placeholder "out"}" ]; + passthru.tests = { + smoke-test = nixosTests._3proxy; + }; + meta = with lib; { description = "Tiny free proxy server"; homepage = "https://github.com/z3APA3A/3proxy"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 1138c1e292eca..cb65c753bccc4 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , glib , gnome2 -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , libpulseaudio @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.23.71"; + version = "1.24.82"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "17ajn1vx5xwlp2yvjf1hr8vw3b7hiribv5gaipyb37zrhkff241h"; + sha256 = "iWUJ5yLWWQvg510Atf+Pd9ya/1NnMNW2Sp/RVFn4PCc="; }; dontConfigure = true; @@ -104,11 +104,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; installPhase = '' + runHook preInstall + mkdir -p $out $out/bin cp -R usr/share $out @@ -148,6 +150,8 @@ stdenv.mkDerivation rec { # Replace xdg-settings and xdg-mime ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + + runHook postInstall ''; installCheckPhase = '' diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 73ce022915c7d..a2bc293eaaf58 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -20,12 +20,13 @@ , pipewire , libva , libdrm, wayland, mesa, libxkbcommon # Ozone +, curl # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport # package customization -, gnomeSupport ? false, gnome ? null +, gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true @@ -155,8 +156,9 @@ let pipewire libva libdrm wayland mesa.drivers libxkbcommon + curl ] ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] + ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e921169cf067a..14ee3290c71c6 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,6 @@ { newScope, config, stdenv, fetchurl, makeWrapper , llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire , gcc, nspr, nss, runCommand @@ -9,7 +9,7 @@ # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" -, gnomeSupport ? false, gnome ? null +, gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enableWideVine ? false @@ -31,7 +31,7 @@ let upstream-info = (lib.importJSON ./upstream-info.json).${channel}; mkChromiumDerivation = callPackage ./common.nix ({ - inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs + inherit channel gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; @@ -156,7 +156,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 874a73dae8e84..f6dc79a2a0f37 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook, gnome3 }: +, gobject-introspection, wrapGAppsHook, gnome }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer - gnome3.gnome-settings-daemon + gnome.gnome-settings-daemon gtk3 gtkspell3 hunspell @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { description = "A new GNOME web browser"; homepage = "https://wiki.gnome.org/Apps/Eolie"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ samdroid-apps worldofpeace ]; + maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index ffba1096d1d4b..fc7029933383f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -28,7 +28,7 @@ , libXt , libcanberra , libnotify -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -139,7 +139,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ wrapGAppsHook gtk3 gnome.adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 62bb722652a71..793e8688a5fa4 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,7 +3,7 @@ ## various stuff that can be plugged in , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify -, gnome3/*.gnome-shell*/ +, gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge @@ -269,7 +269,7 @@ let --set MOZ_ENABLE_WAYLAND "1" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' + --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' '' } ############################# diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 36d97b5a87c47..a7b9ddd07d0d9 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -38,7 +38,7 @@ , chromium , gsettings-desktop-schemas -, gnome3 +, gnome # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) , libvaSupport ? true, libva @@ -88,7 +88,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 93e5da02e57ae..c9846d92b8c0b 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -10,23 +10,24 @@ , pcre , SDL2 , AppKit +, zlib }: stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.3.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-hPNqyTH2oMPytvYAF9sjEQ9ibaJYDODA33ZrDuWnloU="; + sha256 = "sha256-l8k81w+ilkOk8iQTc46+HK40JQZ0dCYVAvkGTrEpZSQ="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libunistring mpg123 openssl pcre SDL2 ] + buildInputs = [ libunistring mpg123 openssl pcre SDL2 zlib ] ++ lib.optional stdenv.isDarwin AppKit; hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 9bc9727dd188c..63f1958f4a6c0 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -142,6 +142,8 @@ stdenv.mkDerivation rec { ac_add_options --enable-jemalloc ac_add_options --enable-strip ac_add_options --enable-devtools + # Missing from build instructions, https://forum.palemoon.org/viewtopic.php?f=5&t=25843#p214767 + ac_add_options --enable-av1 ac_add_options --disable-eme ac_add_options --disable-webrtc @@ -159,8 +161,6 @@ stdenv.mkDerivation rec { ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]} - export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION - # # NixOS-specific adjustments # diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index acd10e0ea388c..72b17400df30d 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -36,7 +36,7 @@ # Wrapper runtime , coreutils , glibcLocales -, gnome3 +, gnome , runtimeShell , shared-mime-info , gsettings-desktop-schemas @@ -246,7 +246,7 @@ stdenv.mkDerivation rec { "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme shared-mime-info ]} WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 8937404e91d33..52e1bc50601a4 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -17,10 +17,11 @@ , desktop-file-utils , appstream-glib , libpeas +, libgdata , dbus , vala , wrapGAppsHook -, xvfb_run +, xvfb-run , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 @@ -65,11 +66,12 @@ stdenv.mkDerivation rec { callaudiod gtk3 libpeas + libgdata # required by some dependency transitively ]; checkInputs = [ dbus - xvfb_run + xvfb-run ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 9cf0e715e0e6b..517bd1e01cc5d 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , glib , gtk3 @@ -22,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.3.2"; + version = "1.4.1"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "1baw3h5wq2ib4bnphazq7n9c9wc94g0n6v4y5kg71n1dir0c3jkh"; + sha256 = "0lmrgcj1ky1vhzynl36k6ba3ws089x4qdrnkjk3lbr334kicx9na"; }; nativeBuildInputs = [ @@ -69,11 +70,18 @@ stdenv.mkDerivation rec { patchShebangs data/meson_post_install.py ''; + # supply Twitter API keys + # use default keys supplied by upstream, see https://github.com/IBBoard/cawbird/blob/master/README.md#preparation + mesonFlags = [ + "-Dconsumer_key_base64=VmY5dG9yRFcyWk93MzJEZmhVdEk5Y3NMOA==" + "-Dconsumer_secret_base64=MThCRXIxbWRESDQ2Y0podzVtVU13SGUyVGlCRXhPb3BFRHhGYlB6ZkpybG5GdXZaSjI=" + ]; + meta = with lib; { description = "Native GTK Twitter client for the Linux desktop"; longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; homepage = "https://ibboard.co.uk/cawbird/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with lib.maintainers; [ jonafato schmittlauch ]; }; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 4a338ac9a42f1..0bb4c57e089d9 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.13.2"; + version = "0.13.3"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-yWcoHUHEiRp4YxTDxi+inJkpb8dnTVTwSO3MgFyhvps="; + sha256 = "sha256-RaQOefVqDPHvTF1qMtgAFNpA1Gx7Vo2JKiwteePsGyo="; }; - vendorSha256 = "sha256-hSnTM89s3R7UDn1gLlb1gu6rhTPqVKJpWKCz1SDyfmg="; + vendorSha256 = "sha256-GR40BgNMHi3TXVQVN1FaPNVi0HXYVm3vbg4NTXfYBes="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 3c6d66769060d..53b0412343862 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.138.7"; + version = "0.139.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-LFNsSd+S+mQiTk7bCnSD/Kp/D0Jefxo80eRsGkStBhs="; + sha256 = "sha256-bwhiua+KQdt9fyvM4TeS6Mm7EQB9K2L04FPhGS380xI="; }; - vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; + vendorSha256 = "sha256-Qpou4e1My/obIHL/4/IEUml0F82atIwPGZX5+vpvk0k="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index ed828feefdae7..dc777ad0298c3 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-SGVch7mMtHi5GYFOrSss4dk29aRTQmBzkPYOetPdF88="; + sha256 = "sha256-6w2CV6Uj1b8b3vwB933eNHPe1rK+TRyUL++Vy38cKqo="; }; - vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8="; + vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index d0ffb22217f04..85b6c623ae36e 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-gCI4LRUjsE6V7fomWaQsseX1Xi2f+2ZgtvWBDarpXvw="; + sha256 = "sha256-QyiGDk9lA9Y49VpRNRGNbir/ql/Vzp6wsZ1LGodGTks="; }; - vendorSha256 = "sha256-yJHYyRPl1V1WNV0nJoR3bRTTGRTQaT/tG4TSQeL5U88="; + vendorSha256 = "sha256-N+7xajNkxuaC1yDTkPCg80bl2gRy2+Sa4Qq1A8zSGD8="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index d9740c759a187..16b7796dc6416 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.19.0"; in +let version = "0.19.1"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "sha256-G3yLpo/6hv6t3i6b/KMgoZqltyGDddg/SsNPF8hNeUg="; + sha256 = "sha256-makRYWBtOjvuv7dAY1vNh1Nxv+nETVlaFh1C3oiojUo="; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 12127e223a3d3..52bd01ae17b04 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.20.5"; + version = "1.21.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-RDaD7tlTtAucW8ido9FumKb5E9n6F9H8HwxQ9TPyOLk="; + sha256 = "sha256-5IUcKVbHxL5qb7M087sZSsd50t5zSaeWATnyLHkVsRU="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 0d8e4fbe6d62a..3b55c99b263b0 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -164,8 +164,8 @@ in rec { }); terraform_0_15 = pluggable (generic { - version = "0.15.2"; - sha256 = "1zsid3ri52cjhn4gr2vgnyf50zmqiz71fh18fkakql8vsqzb3zr0"; + version = "0.15.3"; + sha256 = "12dny8f89ry75ljarhdqlwgzv6py75s1wcmb62n5fp9nk03bjf2p"; vendorSha256 = "13ap1arn81lcxry08j42ck6lgvdcvdxgah6d40pmpkzkw9jcf55b"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 57b39383e97da..f602bab27e8a8 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -5,7 +5,7 @@ , python3 , dropbox , gtk3 -, gnome3 +, gnome , gdk-pixbuf , gobject-introspection }: @@ -49,7 +49,7 @@ stdenv.mkDerivation { buildInputs = [ python3 gtk3 - gnome3.nautilus + gnome.nautilus ]; configureFlags = [ diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index c9339601a4b3a..4eb8da760bff1 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas -, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 +, curl, glib, gnome, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl glib json-glib libnotify libsecret sqlite gumbo gtk3 - libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas + libgee libpeas gnome.libsoup librest webkitgtk gsettings-desktop-schemas gnome-online-accounts ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = "https://jangernert.github.io/FeedReader/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo worldofpeace ]; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index bcff9e4f8b745..9e76a73233cf9 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python -, pythonPackages, qt5, sphinx, xvfb_run }: +, pythonPackages, qt5, sphinx, xvfb-run }: buildPythonApplication rec { pname = "flent"; @@ -12,7 +12,7 @@ buildPythonApplication rec { buildInputs = [ sphinx ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; propagatedBuildInputs = [ matplotlib procps pyqt5 ]; - checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ]; + checkInputs = [ procps pythonPackages.mock pyqt5 xvfb-run ]; checkPhase = '' cat >test-runner <<EOF diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index a359bf3a7c0cd..9e6ee864137ba 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "The FTP Client that drives you anywhere"; homepage = "https://github.com/Alecaddd/taxi"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 52d4ae07ce5e2..d47560c4e874a 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gNMLVh5ntVCxiIKLshRvYXi5dYLZ8qiZFwZxbNPVFTk="; + sha256 = "sha256-s8EmoVZUUeaKTaINXvKO5tSdPUS3MlhEucwnmTTC3Wk="; }; - vendorSha256 = "sha256-f/1Vxuc87eQie/j1b14q/1lAAzRk+ZDkBaTmHtCy7go="; + vendorSha256 = "sha256-jkiTpDsJN628YKkFZcng9P05hmNUc3UeFsanLf+QtJY="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 31896f20184f7..abcdf617352b4 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,5 +1,5 @@ { lib, buildGoPackage, fetchFromGitHub, pkg-config, - cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: + cairo, gdk-pixbuf, glib, gnome, wrapGAppsHook, gtk3 }: buildGoPackage rec { pname = "coyim"; @@ -16,7 +16,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ]; meta = with lib; { description = "a safe and secure chat client"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 29a69b4019202..d07b7d2912a39 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext -, gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking +, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { glib-networking glib libgee - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme sqlite gdk-pixbuf gtk3 diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 23a4aebb0265a..d957daced26dc 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]); }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index c78141f6eb224..74a4ab968c9c4 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,11 +1,11 @@ { lib, fetchurl, gettext, wrapGAppsHook # Native dependencies -, python3, gtk3, gobject-introspection, gnome3 +, python3, gtk3, gobject-introspection, gnome , glib-networking # Test dependencies -, xvfb_run, dbus +, xvfb-run, dbus # Optional dependencies , enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-good, libnice @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { }; buildInputs = [ - gobject-introspection gtk3 gnome3.adwaita-icon-theme + gobject-introspection gtk3 gnome.adwaita-icon-theme glib-networking ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] ++ lib.optional enableSecrets libsecret @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ extraPythonPackages python3.pkgs; - checkInputs = [ xvfb_run dbus.daemon ]; + checkInputs = [ xvfb-run dbus.daemon ]; checkPhase = '' # https://dev.gajim.org/gajim/gajim/-/issues/10478 diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 121bd3f8fe324..058a96ea622eb 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -43,18 +43,18 @@ let in stdenv.mkDerivation rec { pname = "mattermost-desktop"; - version = "4.5.2"; + version = "4.6.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - sha256 = "0r9xmhzif1ia1m53yr59q6p3niyq3jv3vgv4703x68jmd46f91n6"; + sha256 = "0i836bc0gx375a9fm2cdxg84k03zhpx1z6jqxndf2m8pkfsblc3x"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; - sha256 = "1h8lw06p3cqz9dkgbhfmzcrzjsir5cfhx28xm4zrmvkj4yfzbcnv"; + sha256 = "04jv9hkmkh0jipv0fjdprnp5kmkjvf3c0fah6ysi21wmnmp5ab3m"; } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; @@ -63,9 +63,13 @@ in dontConfigure = true; dontPatchELF = true; - buildInputs = [ wrapGAppsHook gtk3 hicolor-icon-theme ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ gtk3 hicolor-icon-theme ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/mattermost-desktop cp -R . $out/share/mattermost-desktop @@ -86,6 +90,8 @@ in --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}:$out/share/mattermost-desktop" \ $out/share/mattermost-desktop/mattermost-desktop + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 9c99741823aa5..dd46b64e4f64d 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, - setuptools, + setuptools, fetchpatch, pytest, faker, pytest-aiohttp, aioresponses, @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.8.0"; + version = "0.9.2"; disabled = pythonOlder "3.6"; @@ -19,9 +19,17 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0n86cdpw85qzlcr1ynvar0f0zbphmdz1jia9r75lmj07iw4r5hk9"; + sha256 = "11dfv5b2slqybisq6npmrqxrzslh4bjs4093vrc05s94046d9d9n"; }; + patches = [ + # accept newer matrix-nio versions + (fetchpatch { + url = "https://github.com/matrix-org/pantalaimon/commit/73f68c76fb05037bd7fe71688ce39eb1f526a385.patch"; + sha256 = "0wvqcfan8yp67p6khsqkynbkifksp2422b9jy511mvhpy51sqykl"; + }) + ]; + propagatedBuildInputs = [ aiohttp appdirs diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 468d7f64c4cf3..fa314e82dac84 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pidgin, intltool, libxml2, gmime, nss }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, intltool, libxml2, gmime, nss }: stdenv.mkDerivation rec { pname = "pidgin-sipe"; @@ -9,6 +9,20 @@ stdenv.mkDerivation rec { sha256 = "0262sz00iqxylx0xfyr48xikhiqzr8pg7b4b7vwj5iv4qxpxv939"; }; + patches = [ + # add sipe_utils_memdup() function + (fetchpatch { + url = "https://repo.or.cz/siplcs.git/patch/567d0ddc0692adfef5f15d0d383825a9b2ea4b49"; + sha256 = "24L8ZfoOGc3JoTCGxuTNjuHzt5QgFDu1+vSoJpGvde4="; + }) + # replace g_memdup() with sipe_utils_memdup() + # g_memdup is deprecatein newer Glib + (fetchpatch { + url = "https://repo.or.cz/siplcs.git/patch/583a734e63833f03d11798b7b0d59a17d08ae60f"; + sha256 = "Ai6Czpy/FYvBi4GZR7yzch6OcouJgfreI9HcojhGVV4="; + }) + ]; + nativeBuildInputs = [ intltool ]; buildInputs = [ pidgin gmime libxml2 nss ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 764a5ac3db51a..8caafdd57624e 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3 +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -31,7 +31,7 @@ let gtk3 libappindicator-gtk3 - gnome3.gnome-keyring + gnome.gnome-keyring libnotify libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 99465cc7971e9..38ee5579b5a2b 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Link-local XMPP connection manager for Telepathy"; platforms = platforms.gnu ++ platforms.linux; # Random choice - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 7c0f80d223836..46215db3eb566 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, gnome3, cmake, pkg-config, +{ fetchFromGitHub, lib, stdenv, gnome, cmake, pkg-config, libappindicator-gtk3, gst_all_1, pcre }: stdenv.mkDerivation rec { @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtkmm - gnome3.webkitgtk + gnome.gtkmm + gnome.webkitgtk libappindicator-gtk3 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4dc29dd22835b..4d94801df9595 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -51,7 +51,6 @@ let arianvp kiwi toonn - worldofpeace ]; platforms = [ "x86_64-darwin" diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 570b2d13be14f..4401a0a7df80f 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome3, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 gmime3 webkitgtk libsass libpeas python3 - notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme + notmuch boost gsettings-desktop-schemas gnome.adwaita-icon-theme glib-networking protobuf vim ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 3471795b435b2..ad43ed97e09cc 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution +{ lib, stdenv, fetchurl, gnome, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution , sqlite, gtk3, webkitgtk, libgdata, libmspack }: stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.38.3"; + version = "3.40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1s2jpviliazmhnpkh8dc57ga3c3612f2rnc0nfya5ndbi6lpzxhi"; + sha256 = "1kgxdacqqcq8yfkij6vyqlk5r4yqvw7gh7mxqii670hrn1mb2s50"; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; @@ -19,23 +19,17 @@ stdenv.mkDerivation rec { libmspack ]; - # Building with libmspack as reccommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews cmakeFlags = [ + # Building with libmspack as recommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews "-DWITH_MSPACK=ON" + # don't try to install into ${evolution} + "-DFORCE_INSTALL_PREFIX=ON" ]; - PKG_CONFIG_EVOLUTION_SHELL_3_0_ERRORDIR = "${placeholder "out"}/share/evolution/errors"; - PKG_CONFIG_EVOLUTION_SHELL_3_0_PRIVLIBDIR = "${placeholder "out"}/lib/evolution"; - PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; - PKG_CONFIG_LIBEDATA_BOOK_1_2_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/addressbook-backends"; - PKG_CONFIG_LIBEDATA_CAL_2_0_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/calendar-backends"; - PKG_CONFIG_LIBEBACKEND_1_2_MODULEDIR = "${placeholder "out"}/lib/evolution-data-server/registry-modules"; - PKG_CONFIG_EVOLUTION_SHELL_3_0_MODULEDIR = "${placeholder "out"}/lib/evolution/modules"; - PKG_CONFIG_EVOLUTION_DATA_SERVER_1_2_PRIVDATADIR = "${placeholder "out"}/share/evolution-data-server"; - passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "evolution-ews"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index e17507366ffa8..53fe3d6f9496c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -24,7 +24,7 @@ , db , gcr , sqlite -, gnome3 +, gnome , librsvg , gdk-pixbuf , libsecret @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.38.4"; + version = "3.40.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "NB+S0k4rRMJ4mwA38aiU/xZUh9qksAuA+uMTii4Fr9Q="; + sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g"; }; nativeBuildInputs = [ @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme bogofilter db evolution-data-server @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib glib-networking - gnome3.gnome-desktop + gnome.gnome-desktop gsettings-desktop-schemas gst_all_1.gst-plugins-base gst_all_1.gstreamer @@ -114,13 +114,10 @@ stdenv.mkDerivation rec { doCheck = true; - patches = [ - ./moduledir_from_env.patch - ]; - passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "evolution"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch b/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch deleted file mode 100644 index 2a5edfb9a5a1b..0000000000000 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/shell/main.c b/src/shell/main.c -index 5d089225ca..030908d684 100644 ---- a/src/shell/main.c -+++ b/src/shell/main.c -@@ -407,7 +407,15 @@ create_default_shell (void) - } - - /* Load all shared library modules. */ -- module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR); -+ const gchar *modules_directory = EVOLUTION_MODULEDIR; -+ const gchar *modules_directory_env; -+ -+ modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR"); -+ if (modules_directory_env && -+ g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR)) -+ modules_directory = g_strdup (modules_directory_env); -+ -+ module_types = e_module_load_all_in_directory (modules_directory); - g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse); - - flags = G_APPLICATION_HANDLES_OPEN | diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index ea3f09b8f4c3d..7837393926f63 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -1,8 +1,8 @@ -{ lib, makeWrapper, symlinkJoin, gnome3, plugins }: +{ lib, makeWrapper, symlinkJoin, gnome, plugins }: symlinkJoin { name = "evolution-with-plugins"; - paths = [ gnome3.evolution-data-server ] ++ plugins; + paths = [ gnome.evolution-data-server ] ++ plugins; nativeBuildInputs = [ makeWrapper ]; @@ -10,13 +10,7 @@ symlinkJoin { for i in $out/bin/* $out/libexec/**; do if [ ! -d $i ]; then echo wrapping $i - wrapProgram $i \ - --set LD_LIBRARY_PATH "$out/lib" \ - --set EDS_ADDRESS_BOOK_MODULES "$out/lib/evolution-data-server/addressbook-backends/" \ - --set EDS_CALENDAR_MODULES "$out/lib/evolution-data-server/calendar-backends/" \ - --set EDS_CAMEL_PROVIDER_DIR "$out/lib/evolution-data-server/camel-providers/" \ - --set EDS_REGISTRY_MODULES "$out/lib/evolution-data-server/registry-modules/" \ - --set EVOLUTION_MODULEDIR "$out/lib/evolution/modules" + wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}" fi done diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index dda6abac8e56a..83e8984db7bd8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -30,7 +30,7 @@ , libXt , libxcb , libcanberra -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -116,7 +116,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index d16cbfc1bca02..b81128545d59b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , glib , glibc -, gnome3 +, gnome , gnugrep , gnupg , gnused @@ -115,7 +115,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 4e127a1e7b8a5..f08e5c42e1d75 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libowfat, zlib }: +{ lib, stdenv, fetchgit, libowfat, zlib, nixosTests }: stdenv.mkDerivation { name = "opentracker-2018-05-26"; @@ -23,6 +23,10 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.tests = { + bittorrent-integration = nixosTests.bittorrent; + }; + meta = with lib; { homepage = "https://erdgeist.org/arts/software/opentracker/"; license = licenses.beerware; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index a39b4aab8371d..f0fb5a1239a1a 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2 +{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome, glib, libssh, pkg-config, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ - speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools + speex libupnp gpgme gnome.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 ]; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 363e5f7cfbee2..43ca9d455bd9c 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -17,6 +17,7 @@ , wrapGAppsHook , enableQt ? false , qt5 +, nixosTests , enableSystemd ? stdenv.isLinux , enableDaemon ? true , enableCli ? true @@ -74,6 +75,10 @@ in stdenv.mkDerivation { NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation"; + passthru.tests = { + smoke-test = nixosTests.bittorrent; + }; + meta = { description = "A fast, easy and free BitTorrent client"; longDescription = '' diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 6cff01c1cc290..4b1eca32750e2 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -21,7 +21,7 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. - alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss + alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss }: let @@ -94,7 +94,7 @@ in stdenv.mkDerivation { # This is required for the file picker dialog - otherwise pcloud just # crashes - export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + export XDG_DATA_DIRS="${gnome.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" exec "$out/app/pcloud" EOF diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 8b1ef3c5863f6..8a96cf84755bf 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more -, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 +, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { freetype gdk-pixbuf gnome2.gtkglext - gnome3.webkitgtk + gnome.webkitgtk gtk2 gtk2-x11 gtk3 diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 5d0195b62f880..e2f1cf2c8a2ee 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -6,7 +6,7 @@ , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. -, gnome3 +, gnome }: with lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core - openssl gnome3.adwaita-icon-theme json-glib libsodium webkitgtk + openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz ]; diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 61f318009f727..86a3e48ae8ff8 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, runCommand +, testVersion , seaweedfs }: @@ -20,10 +20,8 @@ buildGoModule rec { subPackages = [ "weed" ]; - passthru.tests.check-version = runCommand "weed-version" { meta.timeout = 3; } '' - ${seaweedfs}/bin/weed version | grep -Fw ${version} - touch $out - ''; + passthru.tests.version = + testVersion { package = seaweedfs; command = "weed version"; }; meta = with lib; { description = "Simple and highly scalable distributed file system"; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 015033d6ca569..158999f86fee4 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook -, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 +, gnome, buildPythonApplication, dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas , pango, gdk-pixbuf, atk }: @@ -24,7 +24,7 @@ buildPythonApplication rec { buildInputs = [ gtk3 librsvg libappindicator-gtk3 - libnotify gnome3.adwaita-icon-theme + libnotify gnome.adwaita-icon-theme # Schemas with proxy configuration gsettings-desktop-schemas ]; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 3de0d450de5e9..a5edbac135f99 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Know the forecast of the next hours & days"; homepage = "https://gitlab.com/bitseater/meteo"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 4e83f36ea5276..e32502749dc37 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, gnome3 +, boost, libxslt, goffice, wrapGAppsHook, gnome }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme + libgsf enchant wv libjpeg perl boost libxslt goffice gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 8633f1daecdc6..88a063158bd18 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -15,6 +15,7 @@ , glib-networking , sqlite , libsoup +, libgdata , gtk3 , pantheon /* granite, icons, maintainers */ , webkitgtk @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { pantheon.granite sqlite webkitgtk + libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 959aa30c0371a..d2251da700738 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, makeWrapper, cmake, gtest , boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales , webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi , libdbiDrivers, guile, perl, perlPackages @@ -25,13 +25,21 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "sha256-2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no="; + sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w="; }; + patches = [ + # Fix build with GLib 2.68. + (fetchpatch { + url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch"; + sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ="; + }) + ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; buildInputs = [ diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 263a555ab4c1a..aacc2a2a579c7 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages +, goffice, gnome, wrapGAppsHook, gtk3, bison, python3Packages , itstool }: @@ -20,15 +20,16 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome3.adwaita-icon-theme + goffice gtk3 gnome.adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 9d085b6c88300..1d2d6f0d851d9 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -7,7 +7,7 @@ , intltool , wrapGAppsHook , libsoup -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libofx intltool libsoup - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 3b7052dff7f3c..4b9237d23ce7a 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -11,7 +11,7 @@ , pango , gdk-pixbuf , gobject-introspection -, xvfb_run +, xvfb-run }: python3Packages.buildPythonApplication rec { @@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ nose mock - xvfb_run + xvfb-run ]; preBuild = '' diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index a586cea47ab39..b7da8c777a95c 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook -, libsoup, gnome3 }: +, libsoup, gnome }: stdenv.mkDerivation rec { name = "homebank-5.5.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libofx intltool libsoup - gnome3.adwaita-icon-theme ]; + gnome.adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 1d8a214c81836..95da79cca4f2b 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -8,7 +8,7 @@ , sqlcipher # Needed for running tests: -, qtbase, xvfb_run +, qtbase, xvfb-run , python2, python3Packages }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; - installCheckInputs = [ xvfb_run ]; + installCheckInputs = [ xvfb-run ]; installCheckPhase = lib.optionalString doInstallCheck '' xvfb-run -s '-screen 0 1024x768x24' make test \ diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 90e5995669e84..74fcf1af8f9ff 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -2,16 +2,24 @@ python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; - version = "1.0.2"; + version = "unstable-2021-04-01"; -# no tests included in PyPI tarball + # no tests included in PyPI tarball src = fetchFromGitHub { owner = "egh"; repo = "ledger-autosync"; - rev = "v${version}"; - sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk"; + rev = "0b674c57c833f75b1a36d8caf78e1567c8e2180c"; + sha256 = "0q404gr85caib5hg83cnmgx4684l72w9slxyxrwsiwhlf7gm443q"; }; + patches = [ + # ledger-autosync specifies an URL for its ofxparse + # dependency. This patch removes the URL to only use the + # `ofxparse` name. This works because nixpkgs' version of ofxparse + # is more recent than the latest release. + ./fix-ofxparse-dependency.patch + ]; + propagatedBuildInputs = with python3Packages; [ asn1crypto beautifulsoup4 diff --git a/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch b/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch new file mode 100644 index 0000000000000..cb12ba9f33511 --- /dev/null +++ b/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index eda6db5..ed6b90b 100644 +--- a/setup.py ++++ b/setup.py +@@ -38,7 +38,7 @@ setup( + install_requires=[ + 'setuptools>=26', + 'ofxclient', +- "ofxparse @ https://github.com/jseutter/ofxparse/tarball/3236cfd96434feb6bc79a8b66f3400f18e2ad3c4" ++ 'ofxparse' + ], + + extras_require={ \ No newline at end of file diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c9b1099f8b96b..1c5327ebc6ceb 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 -, gnome3, glib, ncurses, epoxy, gpgme +, gnome, glib, ncurses, epoxy, 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 @@ -399,7 +399,7 @@ in (mkDrv rec { mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux librevenge libe-book libmwaw glm ncurses epoxy - libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext + libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 3b8bba9ac19e7..f6243476f1b04 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -637,11 +637,11 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.31.1.tar.gz"; - url = "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz"; - sha256 = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d"; + name = "neon-0.31.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz"; + sha256 = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678"; md5 = ""; - md5name = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d-neon-0.31.1.tar.gz"; + md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; } { name = "nss-3.55-with-nspr-4.27.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index d3fbc261c3663..3870c478c8031 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "2"; + patch = "3"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1y19p9701msf6jjzp9d5ighvmyjzj68qzhm2bk3l5p16ys8qk9bb"; + sha256 = "1gr9c8kv7nc9kaag1sw9r36843pfba1my80afx7p0lxj0k8pzbrm"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1j5251lbc35d521d92w52lgps0v5pg8mhr8y3r6x2nl9p0gvw957"; + sha256 = "09xkr6jmnwq55savw9xjsy8l8zcyflnsg4nfwhknvm3ls8sqj4w6"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1bsrkmzhhpyrmi7akmdfvz4zb543fc093az9965k14rp8l6rhnvf"; + sha256 = "0dc981vmxfdwlyfgq84axkr99d8chm1ypknj39v0cmaqn56lpwg0"; }; } diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 7ab5bc838ec09..8271b2974ce42 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { + lib.optionalString withPantheon " - built with Contractor support"; homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2; - maintainers = with maintainers; [ davidak worldofpeace ]; + maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 847287c8c856b..3bf9f1af9a526 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,9 +2,9 @@ , python3Packages , gtk3 , cairo -, gnome3 +, gnome , librsvg -, xvfb_run +, xvfb-run , dbus , libnotify , wrapGAppsHook @@ -53,7 +53,7 @@ python3Packages.buildPythonApplication rec { done ''; - checkInputs = [ xvfb_run dbus.daemon ]; + checkInputs = [ xvfb-run dbus.daemon ]; nativeBuildInputs = [ wrapGAppsHook @@ -63,7 +63,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libnotify librsvg gtk3 diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix new file mode 100644 index 0000000000000..f4f83ce8e7a72 --- /dev/null +++ b/pkgs/applications/office/timeline/default.nix @@ -0,0 +1,89 @@ +{ lib +, fetchurl +, python3 +, gettext +, makeDesktopItem +, copyDesktopItems +}: + +python3.pkgs.buildPythonApplication rec { + pname = "timeline"; + version = "2.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; + sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23"; + }; + + nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; + + pythonPath = with python3.pkgs; [ + wxPython_4_0 # not compatible with wxPython_4_1. reported upstream https://github.com/wxWidgets/Phoenix/issues/1956 + humblewx + icalendar + markdown + pysvg-py3 + pillow + ]; + + checkInputs = [ + gettext + python3.pkgs.mock + ]; + + desktopItems = [ + (makeDesktopItem { + desktopName = "Timeline"; + name = "timeline"; + comment = "Display and navigate information on a timeline"; + icon = "timeline"; + terminal = false; + exec = "timeline"; + categories = "Office;Calendar;"; + }) + ]; + + dontBuild = true; + doCheck = false; + + patchPhase = '' + sed -i "s|_ROOT =.*|_ROOT = \"$out/usr/share/timeline/\"|" source/timelinelib/config/paths.py + ''; + + installPhase = '' + runHook preInstall + + site_packages=$out/${python3.pkgs.python.sitePackages} + install -D -m755 source/timeline.py $out/bin/timeline + mkdir -p $site_packages + cp -r source/timelinelib $site_packages/ + + mkdir -p $out/usr/share/timeline/locale + cp -r icons $out/usr/share/timeline/ + cp -r translations/ $out/usr/share/timeline/ + + mkdir -p $out/share/icons/hicolor/{48x48,32x32,16x16}/apps + cp icons/48.png $out/share/icons/hicolor/48x48/apps/timeline.png + cp icons/32.png $out/share/icons/hicolor/32x32/apps/timeline.png + cp icons/16.png $out/share/icons/hicolor/16x16/apps/timeline.png + + runHook postInstall + ''; + + # tests fail because they need an x server + # Unable to access the X Display, is $DISPLAY set properly? + checkPhase = '' + runHook preCheck + ${python3.interpreter} tools/execute-specs.py + runHook postCheck + ''; + + meta = with lib; { + homepage = "http://thetimelineproj.sourceforge.net/"; + changelog = "http://thetimelineproj.sourceforge.net/changelog.html"; + description = "Display and navigate information on a timeline"; + license = with licenses; [ gpl3Only cc-by-sa-30 ]; + platforms = with platforms; unix; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 65eb48f3b2d9c..b3a5ae44c936e 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -6,7 +6,7 @@ , atk , gtk3 , gtkspell3 -, gnome3 +, gnome , glib , goocanvas2 , gdk-pixbuf @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme goocanvas2 fontconfig freetype diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index f34a3e806af76..4cf3c3d78cecb 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: # # TODO: Declare configuration options for the following optional dependencies: @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { sha256 = "13vhwsgv6mscgixypc0ixkgj0y7cpcm7z7wn1vmdrwp7kn8m3xgx"; }; - buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 1584972cbebd5..99fd54c5cc7f5 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -26,7 +26,7 @@ , libXrender , libXt , libnotify -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome3.adwaita-icon-theme dconf ]; + buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 76048733a6a38..86bda3092bc47 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, gnome3 +, gnome , dconf , wxGTK30 , wxGTK31 @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share" + "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook did these two as well, no idea if it matters... diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 20a17b11221a0..9d6212fef1126 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses , buildIde ? true -, glib, gnome3, wrapGAppsHook +, glib, gnome, wrapGAppsHook , csdp ? null , version, coq-version ? null, }@args: @@ -128,7 +128,7 @@ self = stdenv.mkDerivation { buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ] + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]); postPatch = '' diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index 531081beafaf3..e9b0cc7540b59 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -5,7 +5,7 @@ , ant , jre , makeWrapper -, runCommand +, testVersion , key }: @@ -51,10 +51,13 @@ in stdenv.mkDerivation rec { --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main" ''; - passthru.tests.check-version = runCommand "key-help" {} '' - ${key}/bin/KeY --help | grep 2.5 # Wrong version in the code. On next version change to ${version} - touch $out - ''; + passthru.tests.version = + testVersion { + package = key; + command = "KeY --help"; + # Wrong '2.5' version in the code. On next version change to ${version} + version = "2.5"; + }; meta = with lib; { description = "Java formal verification tool"; diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix index 38039f61fda62..e28137dde75b3 100644 --- a/pkgs/applications/science/logic/petrinizer/default.nix +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,12 +1,8 @@ -{ mkDerivation, callPackage, buildPackages +{ mkDerivation , async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, lib, stm, transformers +, parallel-io, parsec, lib, stm, transformers, sbv_7_13, z3 }: -let - z3 = callPackage ./z3.nix { gomp = null; z3 = buildPackages.z3; }; -in let - sbv = callPackage ./sbv-7.13.nix { inherit z3; }; -in + mkDerivation rec { pname = "petrinizer"; version = "0.9.1.1"; @@ -22,10 +18,11 @@ mkDerivation rec { isLibrary = false; isExecutable = true; executableHaskellDepends = [ - async base bytestring containers mtl parallel-io parsec sbv stm + async base bytestring containers mtl parallel-io parsec sbv_7_13 stm transformers ]; description = "Safety and Liveness Analysis of Petri Nets with SMT solvers"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ raskin ]; + inherit (sbv_7_13.meta) platforms; } diff --git a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix b/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix deleted file mode 100644 index f0c8dd2490482..0000000000000 --- a/pkgs/applications/science/logic/petrinizer/sbv-7.13.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ mkDerivation, array, async, base, bytestring, containers -, crackNum, deepseq, directory, doctest, filepath, generic-deriving -, ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random -, lib, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck -, template-haskell, time, z3 -}: -mkDerivation { - pname = "sbv"; - version = "7.13"; - sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array async base containers crackNum deepseq directory filepath - generic-deriving ghc mtl pretty process QuickCheck random syb - template-haskell time - ]; - testHaskellDepends = [ - base bytestring containers crackNum directory doctest filepath Glob - hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit - tasty-quickcheck template-haskell - ]; - testSystemDepends = [ z3 ]; - homepage = "http://leventerkok.github.com/sbv/"; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = lib.licenses.bsd3; -} diff --git a/pkgs/applications/science/logic/petrinizer/z3.nix b/pkgs/applications/science/logic/petrinizer/z3.nix deleted file mode 100644 index a20ccea16dc7b..0000000000000 --- a/pkgs/applications/science/logic/petrinizer/z3.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkDerivation, fetchpatch -, base, containers, gomp, hspec, QuickCheck, lib -, transformers, z3 -}: -mkDerivation { - pname = "z3"; - version = "408.0"; - sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers transformers ]; - librarySystemDepends = [ gomp z3 ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/IagoAbal/haskell-z3"; - description = "Bindings for the Z3 Theorem Prover"; - license = lib.licenses.bsd3; - doCheck = false; - patches = [ - (fetchpatch { - url = "https://github.com/IagoAbal/haskell-z3/commit/b10e09b8a809fb5bbbb1ef86aeb62109ece99cae.patch"; - sha256 = "13fnrs27mg3985r3lwks8fxfxr5inrayy2cyx2867d92pnl3yry4"; - }) - ]; -} diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix index 15e89138c6b38..d0344a3737daf 100644 --- a/pkgs/applications/science/logic/poly/default.nix +++ b/pkgs/applications/science/logic/poly/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libpoly"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "libpoly"; # they've pushed to the release branch, use explicit tag rev = "refs/tags/v${version}"; - sha256 = "1n3gijksnl2ybznq4lkwm2428f82423sxq18gnb2g1kiwqlzdaa3"; + sha256 = "sha256-E2lHo8Bt4ujoGQ623fjkQbqRnDYJYilXdRt4lnF4wJk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index cc9fe7c4d2ced..450021925bdee 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2021a"; + version = "2021b"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-BDaTv6PORiBnsEaU7uXJIKuxTqIgpY44vUmSViyME0A="; + sha256 = "sha256-3KSAA0UPx3cqMXf/G5nrlCfLjWcDiGtzvJe/syRyE6c="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 25215d7abb56d..94e675d7dd444 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , wrapGAppsHook, cmake, gettext -, maxima, wxGTK, gnome3 }: +, maxima, wxGTK, gnome }: stdenv.mkDerivation rec { pname = "wxmaxima"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc="; }; - buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; + buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; diff --git a/pkgs/applications/terminal-emulators/kgx/default.nix b/pkgs/applications/terminal-emulators/kgx/default.nix index 4e8cf06c1fdb6..dc5c651d50a59 100644 --- a/pkgs/applications/terminal-emulators/kgx/default.nix +++ b/pkgs/applications/terminal-emulators/kgx/default.nix @@ -3,7 +3,7 @@ , genericBranding ? false , fetchFromGitLab , gettext -, gnome3 +, gnome , libgtop , gtk3 , libhandy @@ -35,7 +35,7 @@ stdenv.mkDerivation { buildInputs = [ gettext libgtop - gnome3.nautilus + gnome.nautilus gtk3 libhandy pcre2 diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 94629314341de..b9f7d4ef677be 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { "--enable-ind" #indic scripts "--enable-fribidi" #bidi scripts "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" - #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core + #mlterm-menu and mlconfig depend on enabling gnome.at-spi2-core #and configuring ~/.mlterm/key correctly. ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-x=yes" diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index c0f4ea32576e0..a5c4b4574df38 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = "https://gnunn1.github.io/tilix-web"; license = licenses.mpl20; - maintainers = with maintainers; [ midchildan worldofpeace ]; + maintainers = with maintainers; [ midchildan ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index a7df1645c7a96..aff39a6a44f4e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -14,6 +14,7 @@ , withpcre2 ? true , sendEmailSupport , darwin +, nixosTests , withLibsecret ? false , pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi @@ -334,6 +335,9 @@ stdenv.mkDerivation { stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; + passthru.tests = { + buildbot-integration = nixosTests.buildbot; + }; meta = { homepage = "https://git-scm.com/"; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index b8584f5a5339c..6f4173f30db1d 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "stgit"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - sha256 = "16q8994widg040n1ag4m82kbn3r02n39ah7dvwa7aixhw5y35vlm"; + sha256 = "sha256-gfPf1yRmx1Mn1TyCBWmjQJBgXLlZrDcew32C9o6uNYk="; }; nativeBuildInputs = [ installShellFiles ]; @@ -24,7 +24,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A patch manager implemented on top of Git"; homepage = "https://stacked-git.github.io/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; + maintainers = with maintainers; [ jshholland ]; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 72f6d67c2f1d5..cd6d9b0fd51cf 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.13.1"; + version = "2.14.5"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-D6gh14XOZ6Fjypfhg9l5ozPhyf6u6M0Wc8HdagdPM/Q="; + sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ="; }; patches = [ ./import-ssl-module.patch ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 7e4b7a84075ea..c8b95fa238f73 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib -, libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 89e3a5ea0b53c..9859163031c34 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -12,7 +12,7 @@ , gobject-introspection , gtk3 , gtksourceview4 -, gnome3 +, gnome , gsettings-desktop-schemas }: @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 gtksourceview4 gsettings-desktop-schemas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3.pkgs; [ @@ -57,8 +57,9 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index f20d827dc5ff0..48af459260df7 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, boost, zlib, botan, libidn -, lua, pcre, sqlite, perl, pkg-config, expect +{ lib, stdenv, fetchurl, fetchFromGitHub, boost, zlib, botan2, libidn +, lua, pcre, sqlite, perl, pkg-config, expect, less , bzip2, gmp, openssl +, autoreconfHook, texinfo }: let - version = "1.1"; + version = "1.1-unstable-2021-05-01"; perlVersion = lib.getVersion perl; in @@ -14,22 +15,41 @@ stdenv.mkDerivation rec { pname = "monotone"; inherit version; - src = fetchurl { - url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; - sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r"; + # src = fetchurl { + # url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2"; + # sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r"; + # }; + + # My mirror of upstream Monotone repository + # Could fetchmtn, but circular dependency; snapshot requested + # https://lists.nongnu.org/archive/html/monotone-devel/2021-05/msg00000.html + src = fetchFromGitHub { + owner = "7c6f434c"; + repo = "monotone-mirror"; + rev = "b30b0e1c16def043d2dad57d1467d5bfdecdb070"; + hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd"; }; patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ boost zlib botan libidn lua pcre sqlite expect - openssl gmp bzip2 ]; + postPatch = '' + sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc + ''; + + nativeBuildInputs = [ pkg-config autoreconfHook texinfo ]; + buildInputs = [ boost zlib botan2 libidn lua pcre sqlite expect + openssl gmp bzip2 perl ]; postInstall = '' mkdir -p $out/share/${pname}-${version} cp -rv contrib/ $out/share/${pname}-${version}/contrib mkdir -p $out/${perl.libPrefix}/${perlVersion} cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion} + + patchShebangs "$out/share/monotone" + patchShebangs "$out/share/${pname}-${version}" + + find "$out"/share/{doc/monotone,${pname}-${version}}/contrib/ -type f | xargs sed -e 's@! */usr/bin/@!/usr/bin/env @; s@! */bin/bash@!/usr/bin/env bash@' -i ''; #doCheck = true; # some tests fail (and they take VERY long) @@ -38,6 +58,6 @@ stdenv.mkDerivation rec { description = "A free distributed version control system"; maintainers = [ maintainers.raskin ]; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 324c61ab194bd..14e1173d406ff 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -4,7 +4,7 @@ , jre , gtk3 , glib -, gnome3 +, gnome , wrapGAppsHook , libXtst , which @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ jre gnome3.adwaita-icon-theme gtk3 ]; + buildInputs = [ jre gnome.adwaita-icon-theme gtk3 ]; preFixup = with lib; '' gappsWrapperArgs+=( \ diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 80e1c1260bd4a..a9eee05d238f8 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: stdenv.mkDerivation { version = "0.2.3.alpha"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] + buildInputs = [ which gnome.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with lib; { diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 57eaf91f2aea4..838d306c68541 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/celluloid-player/celluloid"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index eed4c030cfab5..dfb110795f4c2 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-Ny/PJu+ifs9hQRDUv1pONBb6fKJzoiNtjPOFc4veU8c="; + sha256 = "sha256-Ok8FJweSzmewjYzfBJQ28xGHKK/Y32ng1hOCPVwc8eU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 83c38b933dd41..81f3cac73e19d 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -6,11 +6,14 @@ , docbook5 , dvdauthor , dvdplusrwtools +, ffmpeg , flex , fontconfig , gettext +, libexif , makeWrapper , pkg-config +, wxGTK30 , wxSVG , xine-ui , xmlto @@ -42,11 +45,14 @@ in stdenv.mkDerivation rec { docbook5 dvdauthor dvdplusrwtools + ffmpeg flex fontconfig gettext + libexif makeWrapper wxSVG + wxGTK30 xine-ui xmlto zip @@ -67,6 +73,8 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}" ''; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://www.dvdstyler.org/"; description = "A DVD authoring software"; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index a9d56cc910853..92c15fea9a356 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { version = "4.9.3"; src = fetchurl { - url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "sha256-xgdCjo2RLp+EtUTfSiys7PURhnC00R9IOLPtz3427pA="; + url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "sha256-T+y8k757/qFCVOCc/SNc7a+KmyscPlowubNQYzMr8jY="; }; unpackPhase = "tar xvf $src"; diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 829cc4835eac2..f7abc95cb0c91 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -26,18 +26,18 @@ mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-A3vo6678XFUV2RN1lcGYbIjCbBjR1oeORcidKZVnImg="; + sha256 = "sha256-u19WJupSqIzA8W0QG9mue8Ticy+HxBAniuKIUFl7ONs="; }; jmpDist = fetchzip { - url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-3/dist.zip"; - sha256 = "sha256-Rb0q3NFmnYkueq0JkIWkX0C/oL+gFrNOELCNfh9X/P4="; + url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.3/dist.zip"; + sha256 = "sha256-P7WEYbVvpaVLwMgqC2e8QtMOaJclg0bX78J1fdGzcCU="; }; patches = [ @@ -106,5 +106,6 @@ mkDerivation rec { license = with licenses; [ gpl2Only mit ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ jojosch ]; + mainProgram = "jellyfinmediaplayer"; }; } diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index b050e2636ccb3..3411b2d5c3313 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "0riwqfh5lyjg7as75kyx7jw6zq4gikbglhv8s05y7pzgsc9xy75j"; + sha256 = "sha256-KyiLZuzQ0kCReUEPBf0YbmdXhw9nBfghBBsXiy9+N0E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix index e258270dad63e..1aac5f8e9b273 100644 --- a/pkgs/applications/video/kodi-packages/netflix/default.nix +++ b/pkgs/applications/video/kodi-packages/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "1jibzzm8viqpanby6lqxpb95gw5hw3lfsw4jasjskiinbf8n469k"; + sha256 = "0c5cdi6s76vg2gyxzf0ylisxai1ii8vi6h4q4mznpfmplfdp667v"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/osmc-skin/default.nix b/pkgs/applications/video/kodi-packages/osmc-skin/default.nix index c83fd66a43331..7bbb62029bba2 100644 --- a/pkgs/applications/video/kodi-packages/osmc-skin/default.nix +++ b/pkgs/applications/video/kodi-packages/osmc-skin/default.nix @@ -15,7 +15,7 @@ buildKodiAddon rec { homepage = "https://github.com/osmc/skin.osmc"; description = "The default skin for OSMC"; platforms = platforms.all; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; license = licenses.cc-by-nc-sa-30; }; } diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 1531378db89b6..223ed132c9284 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -4,14 +4,14 @@ python3.pkgs.buildPythonApplication rec { pname = "kooha"; - version = "1.1.2"; + version = "1.1.3"; format = "other"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "0jr55b39py9c8dc9rihn7ffx2yh71qqdk6pfn3c2ciiajjs74l17"; + sha256 = "14lrx6wplvlk3cg3wij88h4ydp3m69pw7lvvzrq3j9qnh431bs36"; }; buildInputs = [ diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 2a1418cb37315..d4e8f9d21b29e 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/phw/peek"; description = "Simple animated GIF screen recorder with an easy to use interface"; license = licenses.gpl3; - maintainers = with maintainers; [ puffnfresh worldofpeace ]; + maintainers = with maintainers; [ puffnfresh ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 45c96fb180d3b..b1be6035f9e83 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -11,7 +11,7 @@ , gobject-introspection , libpeas , librsvg -, gnome3 +, gnome , libnotify , gsound , meson @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "pitivi"; - version = "2020.09.2"; + version = "2021.01"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/pitivi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0"; + url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0krzsrv19v3mwhbsm72ica6m3p8ijy0lbd0c3s87yd7pmbwld2c1"; }; patches = [ @@ -52,9 +52,9 @@ python3Packages.buildPythonApplication rec { gtk3 libpeas librsvg - gnome3.gnome-desktop + gnome.gnome-desktop gsound - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas libnotify ] ++ (with gst_all_1; [ @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "pitivi"; versionPolicy = "none"; # we are using dev version, since the stable one is too old }; diff --git a/pkgs/applications/video/prism/default.nix b/pkgs/applications/video/prism/default.nix new file mode 100644 index 0000000000000..8cb6153b81113 --- /dev/null +++ b/pkgs/applications/video/prism/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "prism"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = pname; + rev = "v${version}"; + sha256 = "0q7q7aj3fm45bnx6hgl9c1ll8na16x6p7qapr0c4a6dhxwd7n511"; + }; + + vendorSha256 = "1mkd1s9zgzy9agy2rjjk8wfdga7nzv9cmwgiarfi4xrqzj4mbaxq"; + + meta = with lib; { + description = "An RTMP stream recaster/splitter"; + homepage = "https://github.com/muesli/prism"; + license = licenses.mit; + maintainers = with maintainers; [ paperdigits ]; + }; +} diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index d0f414135703e..e37a8b1ed4ae0 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -1,13 +1,22 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }: +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, boost +, qtbase +, xz +, qmake +, pkg-config +}: mkDerivation rec { pname = "QMediathekView"; - version = "2019-01-06"; + version = "0.2.1"; src = fetchFromGitHub { owner = "adamreichold"; repo = pname; - rev = "e098aaec552ec4e367078bf19953a08067316b4b"; + rev = "v${version}"; sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6"; }; @@ -16,7 +25,7 @@ mkDerivation rec { --replace /usr "" ''; - buildInputs = [ qtbase qttools xz boost ]; + buildInputs = [ qtbase xz boost ]; nativeBuildInputs = [ qmake pkg-config ]; @@ -28,5 +37,6 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; + broken = stdenv.isAarch64; }; } diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 0a206befaf107..ed60fad56c3b7 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { xorgproto ]); - postPatch = "sed -e '/curl\/types\.h/d' -i src/xitk/download.c"; - configureFlags = [ "--with-readline=${readline.dev}" ]; LIRC_CFLAGS="-I${lirc}/include"; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 8a4302de64fa8..657588e5eaf13 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoPackage rec { pname = "containerd"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb"; + sha256 = "sha256-dUn9lvDLoljq5JPFvUdJ8te0VHkCs9Y9Em2mcq5mHvY="; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 922d6fa9ff1d4..f15a2e9149669 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, libosinfo, gnome3 +, gsettings-desktop-schemas, libosinfo, gnome , gtksourceview4, docutils , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ wrapGAppsHook - libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi + libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index de996f080e769..d88bc0cdbdfea 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -9,7 +9,6 @@ , meson , ninja , nixosTests -, pandoc , pango , pixman , pkg-config @@ -23,20 +22,19 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "project-repo"; repo = pname; rev = version; - hash = "sha256-HpAjJHu5sxZKof3ydnU3wcP5GpnH6Ax8m1T1vVoq+oI="; + hash = "sha256-1IztedN5/I/4TDKHLJ26fSrDsvJ5QAr+cbzS2PQITDE="; }; nativeBuildInputs = [ makeWrapper meson ninja - pandoc pkg-config scdoc wayland @@ -55,37 +53,33 @@ stdenv.mkDerivation rec { wlroots ]; - outputs = [ - "out" - "contrib" - ]; - mesonFlags = [ "-Dman-pages=true" "-Dversion_override=${version}" "-Dxwayland=${lib.boolToString withXwayland}" ]; + # TODO: investigate why is this happening postPatch = '' sed -i -e 's|<drm_fourcc.h>|<libdrm/drm_fourcc.h>|' *.c ''; postInstall = '' - mkdir -p $contrib/share/cagebreak - cp $src/examples/config $contrib/share/cagebreak/config + install -d $out/share/cagebreak/ + install -m644 $src/examples/config $out/share/cagebreak/ ''; postFixup = lib.optionalString withXwayland '' wrapProgram $out/bin/cagebreak --prefix PATH : "${xwayland}/bin" ''; - passthru.tests.basic = nixosTests.cagebreak; - meta = with lib; { - description = "A Wayland tiling compositor inspired by ratpoison"; homepage = "https://github.com/project-repo/cagebreak"; + description = "A Wayland tiling compositor inspired by ratpoison"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ berbiche ]; + platforms = platforms.linux; }; + + passthru.tests.basic = nixosTests.cagebreak; } diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index d8f102ed76759..04944a1e90926 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -5,6 +5,7 @@ , libinput , libxcb , libxkbcommon +, pixman , wayland , wayland-protocols , wlroots @@ -16,32 +17,18 @@ }: let - # Add two patches to fix compile errors with wlroots 0.13: - totalPatches = patches ++ [ - # Fix the renamed constant WLR_KEY_PRESSED => WL_KEYBOARD_KEY_STATE_PRESSED - # https://github.com/djpohly/dwl/pull/66 - (fetchpatch { - url = "https://github.com/djpohly/dwl/commit/a42613db9d9f6debfa4fb2363d75af9457d238ed.patch"; - sha256 = "0h76hx1fhazi07gqg7sljh13f91v6bvjy7m9qqmimhvqgfwdcc0j"; - }) - # Use the new signature for wlr_backend_autocreate, which removes an argument: - # https://github.com/djpohly/dwl/pull/76 - (fetchpatch { - url = "https://github.com/djpohly/dwl/commit/0ff13cf216056a36a261f4eed53c6a864989a9fb.patch"; - sha256 = "18clpdb4il1vxf1b0cx0qrwild68s9dism8ab66zpmvxs5qag2dm"; - }) - ]; + totalPatches = patches ++ [ ]; in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "gUaFTkpIQDswEubllMgvxPfCaEYFO7mODzjPyW7XsGQ="; + sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs="; }; nativeBuildInputs = [ pkg-config ]; @@ -49,6 +36,7 @@ stdenv.mkDerivation rec { libinput libxcb libxkbcommon + pixman wayland wayland-protocols wlroots diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index e32cd38ec2d47..ba284b76867d1 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "Gerschtli"; - repo = "dwm-status"; + repo = pname; rev = version; - sha256 = "172qkzbi37j6wx81pyqqffi9wxbg3bf8nis7d15ncn1yfd5r4gqh"; + sha256 = "sha256-Y1J0nCVEmGKgQP+GEtPqK8l3SRuls5yesvJuowLDzUo="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "041sd9zm1c3v6iihnwjcya2xg5yxb2y4biyxpjlfblz2srxa15dm"; + cargoSha256 = "sha256-8/vzJXZjSQmefHMo5BXKTRiLy2F3wfIn8VgPMJxtIvY="; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Gerschtli/dwm-status"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; + mainProgram = pname; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 305c1d728f34f..70c6b9942db96 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb_run }: +, xorgserver, xvfb-run }: stdenv.mkDerivation rec { pname = "i3"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.InlineC - xorgserver xvfb_run + xorgserver xvfb-run ]; configureFlags = [ "--disable-builddir" ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 88d035bce6619..6ee1be4126258 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.14.7"; + version = "0.20.0"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "1ndqh4bzwim32n8psgsgdd47xmlb45rhvcwla1wm506byb21nk4c"; + sha256 = "sha256-rio+3S3bA8KfosKAE9Txzftr/q2PVyd8Z9crz1O/ysc="; }; - cargoSha256 = "098dzwqwbhcyswm73m880z0w03i7xrq56x79vfyvacw4k27q2zm9"; + cargoSha256 = "sha256-17bIeK/mPE+rAO/c65IWvMGqAU6sOClJQC8z+O36cmU="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=notmuch" + "--features=maildir" ]; postFixup = '' diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 95faee74dbc7e..64677c8505f52 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -11,14 +11,14 @@ , pulseaudio , glib , gtk3 -, gnome3 +, gnome , gcr , pam , systemd , upower , wayland , dbus -, xvfb_run +, xvfb-run , phoc , feedbackd , networkmanager @@ -52,7 +52,7 @@ let [ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput export WLR_BACKENDS exec "${phoc}/bin/phoc" -C "$PHOC_INI" \ - -E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome3.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'" + -E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'" ''; in stdenv.mkDerivation rec { @@ -85,9 +85,9 @@ in stdenv.mkDerivation rec { gcr networkmanager polkit - gnome3.gnome-control-center - gnome3.gnome-desktop - gnome3.gnome-session + gnome.gnome-control-center + gnome.gnome-desktop + gnome.gnome-session gtk3 pam systemd @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { checkInputs = [ dbus - xvfb_run + xvfb-run ]; # Temporarily disabled - Test is broken (SIGABRT) @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { # Depends on GSettings schemas in gnome-shell preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share/gsettings-schemas/${gnome3.gnome-shell.name}" + --prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" ) ''; diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index cc457f8158994..da495606930d0 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }: +{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }: let -taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self); + taffybarEnv = haskellPackages.ghc.withPackages (self: [ + self.taffybar + ] ++ packages self); in stdenv.mkDerivation { name = "taffybar-with-packages-${taffybarEnv.version}"; @@ -13,8 +15,5 @@ in stdenv.mkDerivation { --set NIX_GHC "${taffybarEnv}/bin/ghc" ''; - meta = { - platforms = lib.platforms.unix; - license = lib.licenses.bsd3; - }; + inherit (haskellPackages.taffybar) meta; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 830242667db6b..2e41cc2c97c63 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 -, gtk3, gnome3, mate +, gtk3, gnome, mate , libxfce4util, xfce4-panel }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ] ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 7659c9f42a10e..3a820853b1fb5 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -61,7 +61,7 @@ rec { targetPkgs = pkgs: with pkgs; [ gtk3 bashInteractive - gnome3.zenity + gnome.zenity python2 xorg.xrandr which diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index fcbf5bcabe6d0..571d0eb687ce5 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -159,7 +159,7 @@ runCommand (add-to-list 'load-path "$out/share/emacs/site-lisp") (add-to-list 'exec-path "$out/bin") ${optionalString nativeComp '' - (add-to-list 'comp-eln-load-path "$out/share/emacs/native-lisp/") + (add-to-list 'native-comp-eln-load-path "$out/share/emacs/native-lisp/") ''} EOF # Link subdirs.el from the emacs distribution @@ -170,7 +170,7 @@ runCommand ${optionalString nativeComp '' $emacs/bin/emacs --batch \ - --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ + --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ -f batch-native-compile "$siteStart" "$subdirs" ''} ''; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index f2df9d9a86932..661e0d674c584 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -47,6 +47,7 @@ Options: --deepClone Clone the entire repository. --no-deepClone Make a shallow clone of just the required ref. --leave-dotGit Keep the .git directories. + --fetch-lfs Fetch git Large File Storage (LFS) files. --fetch-submodules Fetch submodules. --builder Clone as fetchgit does, but url, rev, and out option are mandatory. --quiet Only print the final json summary. diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 4995efd9a4bfc..142a04f9a10c4 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -541,4 +541,37 @@ rec { phases = "unpackPhase patchPhase installPhase"; installPhase = "cp -R ./ $out"; }; + + /* Checks the command output contains the specified version + * + * Although simplistic, this test assures that the main program + * can run. While there's no substitute for a real test case, + * it does catch dynamic linking errors and such. It also provides + * some protection against accidentally building the wrong version, + * for example when using an 'old' hash in a fixed-output derivation. + * + * Examples: + * + * passthru.tests.version = testVersion { package = hello; }; + * + * passthru.tests.version = testVersion { + * package = seaweedfs; + * command = "weed version"; + * }; + * + * passthru.tests.version = testVersion { + * package = key; + * command = "KeY --help"; + * # Wrong '2.5' version in the code. Drop on next version. + * version = "2.5"; + * }; + */ + testVersion = + { package, + command ? "${package.meta.mainProgram or package.pname or package.name} --version", + version ? package.version, + }: runCommand "test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } '' + ${command} | grep -Fw ${version} + touch $out + ''; } diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 6e21220918725..e76fee1a6eb87 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , gettext -, gnome3 +, gnome , itstool , libxml2 , yelp-tools @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m"; + url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "09ld9r29nz64s04fmp3b2wwldmfnwxp4w36dkh7mbz5pdd3z7fwk"; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 5129cf2718866..011e88dc1d2ec 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome }: -let +stdenv.mkDerivation rec { pname = "cantarell-fonts"; - version = "0.111"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.301"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"; }; nativeBuildInputs = [ meson ninja gettext appstream-glib ]; @@ -21,10 +19,10 @@ in stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "12ps2gjv1lmzbmkv16vgjmaahl3ayadpniyrx0z31sqn443r57hq"; + outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 77083268b0c8b..a7015c83563e2 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip }: let - version = "0.035"; + version = "0.037"; in fetchzip { name = "JuliaMono-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip"; - sha256 = "sha256:17w8rn37wadxnmakhd6mpmqdx14dsrc3qym4k9b47albl1a34i1j"; + sha256 = "06hyl7fri39s7jxjqayi00r83cbf1ca47h5xq55a19igdm1xl79q"; postFetch = '' mkdir -p $out/share/fonts/truetype @@ -16,7 +16,11 @@ in fetchzip { meta = with lib; { description = "A monospaced font for scientific and technical computing"; longDescription = '' - JuliaMono is a monospaced typeface designed for use in text editing environments that require a wide range of specialist and technical Unicode characters. It was intended as a fun experiment to be presented at the 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t physically happen in Lisbon, but online). + JuliaMono is a monospaced typeface designed for use in text editing + environments that require a wide range of specialist and technical Unicode + characters. It was intended as a fun experiment to be presented at the + 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t + physically happen in Lisbon, but online). ''; maintainers = with maintainers; [ suhr ]; platforms = with platforms; all; diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix index ecca50537f1d3..0c9cf7b6a35ee 100644 --- a/pkgs/data/fonts/open-sans/default.nix +++ b/pkgs/data/fonts/open-sans/default.nix @@ -26,6 +26,6 @@ in fetchFromGitLab { homepage = "https://www.opensans.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.worldofpeace ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 6b7de57a4ff12..88184b585ecf8 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "arc-icon-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ moka-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index dfcd2f596797b..384086204c1b6 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pantheon.elementary-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix index 13ee96d049985..12e2d0a06d629 100644 --- a/pkgs/data/icons/humanity-icon-theme/default.nix +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, gtk3, gnome, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "humanity-icon-theme"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index c84369a8a4a94..a8eb1a8736d68 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index cb7db20d67cac..1bcfab57b4a99 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -4,7 +4,7 @@ , ninja , gtk3 , breeze-icons -, gnome3 +, gnome , pantheon , hicolor-icon-theme }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ breeze-icons - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme pantheon.elementary-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/misc/fedora-backgrounds/default.nix b/pkgs/data/misc/fedora-backgrounds/default.nix index 31bc28a9f9c10..3089e721a7c9c 100644 --- a/pkgs/data/misc/fedora-backgrounds/default.nix +++ b/pkgs/data/misc/fedora-backgrounds/default.nix @@ -20,4 +20,15 @@ in { # Fix broken symlinks in the Xfce background directory. patches = [ ./f33-fix-xfce-path.patch ]; }; + + f34 = fedoraBackground rec { + version = "34.0.1"; + src = fetchurl { + url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz"; + hash = "sha256-0gotgQ4N0yE8WZbsu7B3jmUIZrycbqjEMxZl01JcJj4="; + }; + # Fix broken symlinks in the Xfce background directory. + patches = [ ./f34-fix-xfce-path.patch ]; + }; + } diff --git a/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch b/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch new file mode 100644 index 0000000000000..8479276671334 --- /dev/null +++ b/pkgs/data/misc/fedora-backgrounds/f34-fix-xfce-path.patch @@ -0,0 +1,13 @@ +diff --git a/default/Makefile b/default/Makefile +index 172d5d9..540a1c0 100644 +--- a/default/Makefile ++++ b/default/Makefile +@@ -1,7 +1,7 @@ + WP_NAME=f34 + WP_BIGNAME=F34 + WP_DIR=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME) +-WP_DIR_LN=/usr/share/backgrounds/$(WP_NAME) ++WP_DIR_LN=$(DESTDIR)/usr/share/backgrounds/$(WP_NAME) + GNOME_BG_DIR=$(DESTDIR)/usr/share/gnome-background-properties + KDE_BG_DIR=$(DESTDIR)/usr/share/wallpapers + MATE_BG_DIR=$(DESTDIR)/usr/share/mate-background-properties diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index d8599c50b1db2..e559281303d78 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,10 @@ +# Hackage database snapshot, used by maintainers/scripts/regenerate-hackage-packages.sh +# and callHackage { fetchurl }: - +let + pin = builtins.fromJSON (builtins.readFile ./pin.json); +in fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d202e2aff06500ede787ed63544476f6d41e9eb7.tar.gz"; - sha256 = "00hmclrhr3a2h9vshsl909g0zgymlamx491lkhwr5kgb3qx9sfh2"; + inherit (pin) url sha256; + passthru.updateScript = ../../../../maintainers/scripts/haskell/update-hackage.sh; } diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json new file mode 100644 index 0000000000000..5b72040438587 --- /dev/null +++ b/pkgs/data/misc/hackage/pin.json @@ -0,0 +1,6 @@ +{ + "commit": "3d54acea35f6f709fa96c87696b845b3044dcab5", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3d54acea35f6f709fa96c87696b845b3044dcab5.tar.gz", + "sha256": "1zlkjs9d8r5k803wbsz5fmsrs76150chcnz2jaapmq32riyvm21g", + "msg": "Update from Hackage at 2021-05-07T19:29:19Z" +} diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index f487edba98156..49755dbd8ad6f 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,16 +1,21 @@ -{ lib, stdenv, fetchurl, gnome3 }: +{ lib, stdenv, fetchurl, gnome, libxslt }: stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20190116"; + version = "20201225"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic"; + sha256 = "1g9x2i4xjm2sagaha07n9psacbylrwfrmfqkp17gjwhpyi6w0zqd"; }; + nativeBuildInputs = [ + # fixes configure: error: xsltproc not found + libxslt + ]; + passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index f67d689a4bfc0..fc6e5b8c35534 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inkscape libxml2 glib.dev - gnome3.gnome-shell + gnome.gnome-shell ]; buildInputs = [ diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index ace93fa44950f..9c71c7871121f 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { description = "A style to bend Qt applications to look like they belong into GNOME Shell"; homepage = "https://github.com/FedoraQt/adwaita-qt"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.linux; }; } diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 8a283a0418522..fff5e4bf41a5a 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , pkg-config , gtk3 -, gnome3 +, gnome , gtk-engine-murrine , optipng , inkscape @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gtk-engine-murrine ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cinnamon=${cinnamon.cinnamon-common.version}" - "--with-gnome-shell=${gnome3.gnome-shell.version}" + "--with-gnome-shell=${gnome.gnome-shell.version}" "--disable-unity" ]; diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index cf1223152088c..431522fa85e89 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -4,7 +4,7 @@ , librsvg , gtk-engine-murrine , gtk3 -, gnome3 +, gnome , gnome-icon-theme , numix-icon-theme-circle , hicolor-icon-theme @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme numix-icon-theme-circle hicolor-icon-theme diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index 162b878850895..067c2b88a0990 100644 --- a/pkgs/data/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ lib, stdenv, fetchFromGitHub, gnome, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { pname = "equilux-theme"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib libxml2 bc ]; - buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs install.sh sed -i install.sh \ -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome3.gnome-shell.version}|" + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome.gnome-shell.version}|" mkdir -p $out/share/themes ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix index 0c51b78333dc1..ab945f5105383 100644 --- a/pkgs/data/themes/lounge/default.nix +++ b/pkgs/data/themes/lounge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; mesonFlags = [ - "-D gnome_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" + "-D gnome_version=${lib.versions.majorMinor gnome.gnome-shell.version}" ]; postFixup = '' diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index d34ece5c94f7f..f9e3463f2fdc6 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -3,7 +3,7 @@ , meson , ninja , sassc -, gnome3 +, gnome , gtk-engine-murrine , gdk-pixbuf , librsvg @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gdk-pixbuf librsvg ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dontBuild = true; mesonFlags = [ - "-Dgnome_shell_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" + "-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}" ]; postInstall = '' diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/data/themes/ubuntu-themes/default.nix index 732c9a74573b9..fb23141a64eb9 100644 --- a/pkgs/data/themes/ubuntu-themes/default.nix +++ b/pkgs/data/themes/ubuntu-themes/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , gnome-icon-theme -, gnome3 +, gnome , gtk-engine-murrine , gtk3 , hicolor-icon-theme @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gnome-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme humanity-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index f0d2493473a48..c2f449e9f2080 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, - python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: + python3, gtk3, gnome, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "yaru"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome3.gnome-themes-extra ]; + buildInputs = [ gtk3 gnome.gnome-themes-extra ]; propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 65eede2583264..a5800b01a3036 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -28,7 +28,7 @@ , wrapGAppsHook , libxml2 , gtk-doc -, gnome3 +, gnome , python3 , keybinder3 , cairo @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { # bindings cairo - gnome3.caribou + gnome.caribou keybinder3 upower xapps diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index c2e50c65557ef..4208b92ae2d55 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -18,7 +18,7 @@ , libxklavier , networkmanager , libwacom -, gnome3 +, gnome , wrapGAppsHook , tzdata , glibc diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 39dee473cc5a2..b70673253edf2 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -12,7 +12,7 @@ , libxslt , gtk3 , libgnomekbd -, gnome3 +, gnome , libtool , wrapGAppsHook , gobject-introspection @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { cinnamon-desktop cinnamon-common libgnomekbd - gnome3.caribou + gnome.caribou # things iso-flags-png-320x420 diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 3c01d00393724..2e1c739c0f075 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -7,7 +7,7 @@ , wrapGAppsHook , python3 , cairo -, gnome3 +, gnome , xapps , keybinder3 , upower @@ -20,7 +20,7 @@ , meson , sysprof , dbus -, xvfb_run +, xvfb-run , ninja , makeWrapper , which @@ -58,14 +58,14 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - xvfb_run + xvfb-run ]; propagatedBuildInputs = [ glib # bindings - gnome3.caribou + gnome.caribou keybinder3 upower xapps diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index f52b0556d564d..f4a04cf33a84a 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib, stdenv -, gnome3 +, gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme humanity-icon-theme diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 8d55e81c58c21..e04a1baa6696d 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib, stdenv -, gnome3 +, gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 2df5f875b41cb..5470933d619b8 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -2,7 +2,7 @@ , cinnamon-desktop , glib , file -, gnome3 +, gnome , gnome-doc-utils , fetchpatch , gobject-introspection @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { xorg.xkeyboardconfig libxkbcommon - gnome3.zenity + gnome.zenity libinput libstartup_notification libXtst diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix deleted file mode 100644 index 82c40fc429d55..0000000000000 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - pname = "gnome-getting-started-docs"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EPviPyw85CdTmk4wekYWlNOHCyMgBGT3BbfYGvmTyFk="; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-getting-started-docs"; attrPath = "gnome3.gnome-getting-started-docs"; }; - }; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with lib; { - homepage = "https://live.gnome.org/DocumentationProject"; - description = "Help a new user get started in GNOME"; - maintainers = teams.gnome.members; - license = licenses.cc-by-sa-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix deleted file mode 100644 index 81faf79cbb691..0000000000000 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, gettext, fetchurl, vala, desktop-file-utils -, meson, ninja, pkg-config, python3, gtk3, glib, libxml2 -, wrapGAppsHook, itstool, gnome3 }: - -let - pname = "baobab"; - version = "3.38.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104"; - }; - - nativeBuildInputs = [ meson ninja pkg-config vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ]; - buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with lib; { - description = "Graphical application to analyse disk usage in any GNOME environment"; - homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; - license = licenses.gpl2; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix deleted file mode 100644 index 1374cfc9358af..0000000000000 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf -, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "dconf-editor"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ElPa2H5iE/vzE/+eydxDWKobECYfKAcsHcDgmXuS+DU="; - }; - - nativeBuildInputs = [ - meson ninja vala libxslt pkg-config wrapGAppsHook - gettext docbook_xsl libxml2 gobject-introspection python3 - ]; - - buildInputs = [ glib gtk3 dconf ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix deleted file mode 100644 index 36bf7b3e92c91..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-backgrounds"; - version = "3.38.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qqygm15rcdgm36vz2iy7b9axndjzvpi29lmygyakjc07a3jlwgp"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; - }; - - nativeBuildInputs = [ meson ninja pkg-config gettext ]; - - meta = with lib; { - platforms = platforms.unix; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix deleted file mode 100644 index 2397b9d7be90d..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }: - -let - pname = "gnome-bluetooth"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "3.34.3"; - - # TODO: split out "lib" - outputs = [ "out" "dev" "devdoc" "man" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha"; - }; - - nativeBuildInputs = [ - meson ninja intltool itstool pkg-config libxml2 wrapGAppsHook gobject-introspection - gtk-doc docbook_xsl docbook_xml_dtd_43 python3 - ]; - buildInputs = [ - glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.adwaita-icon-theme gsettings-desktop-schemas - ]; - - mesonFlags = [ - "-Dicon_update=false" - "-Dgtk_doc=true" - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with lib; { - homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; - description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix deleted file mode 100644 index e033197b3475d..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkg-config, libxml2 -, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 -, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }: - -stdenv.mkDerivation rec { - pname = "gnome-calculator"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0sri58cp6v07cqpdsf8dhf9dnykz305kvkx0l9dd25g06djcr0wc"; - }; - - nativeBuildInputs = [ - meson ninja pkg-config vala gettext itstool wrapGAppsHook python3 - gobject-introspection # for finding vapi files - ]; - - buildInputs = [ - gtk3 glib libxml2 gtksourceview4 mpfr gmp - gnome3.adwaita-icon-theme libgee - gsettings-desktop-schemas libsoup libmpc - ]; - - doCheck = true; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-calculator"; - attrPath = "gnome3.gnome-calculator"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Calculator"; - description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = teams.gnome.members; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix deleted file mode 100644 index c6d8b319308d7..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, substituteAll, pkg-config, libxslt, ninja, gnome3, gtk3, glib -, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland -, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: - -stdenv.mkDerivation rec { - pname = "gnome-desktop"; - version = "3.38.4"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-P2A+pb/UdyLJLPybiFRGtGJg6gnIz7Y/a92f7+NC5Iw="; - }; - - nativeBuildInputs = [ - pkg-config meson ninja gettext libxslt libxml2 gobject-introspection - gtk-doc docbook_xsl glib - ]; - buildInputs = [ - bubblewrap xkeyboard_config isocodes wayland - gtk3 glib libseccomp systemd - ]; - - propagatedBuildInputs = [ gsettings-desktop-schemas ]; - - patches = [ - (substituteAll { - src = ./bubblewrap-paths.patch; - bubblewrap_bin = "${bubblewrap}/bin/bwrap"; - inherit (builtins) storeDir; - }) - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - "-Ddesktop_docs=false" - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-desktop"; - attrPath = "gnome3.gnome-desktop"; - }; - }; - - meta = with lib; { - description = "Library with common API for various GNOME modules"; - license = with licenses; [ gpl2 lgpl2 ]; - platforms = platforms.linux; - maintainers = teams.gnome.members; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix deleted file mode 100644 index 5c573d2502c2d..0000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, gettext, fetchurl, pkg-config, udisks2, libsecret, libdvdread -, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify -, itstool, gnome3, libxml2, gsettings-desktop-schemas -, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }: - -stdenv.mkDerivation rec { - pname = "gnome-disk-utility"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-EL7d5UlL6zTjoiDW8w2TIMiCUv7rhCa9mM760YNteOk="; - }; - - nativeBuildInputs = [ - meson ninja pkg-config gettext itstool libxslt docbook_xsl - wrapGAppsHook python3 libxml2 - ]; - - buildInputs = [ - gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - udisks2 gnome3.adwaita-icon-theme systemd - gnome3.gnome-settings-daemon gsettings-desktop-schemas - ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-disk-utility"; - attrPath = "gnome3.gnome-disk-utility"; - }; - }; - - meta = with lib; { - homepage = "https://en.wikipedia.org/wiki/GNOME_Disks"; - description = "A udisks graphical front-end"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix b/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix deleted file mode 100644 index b2db2baf025da..0000000000000 --- a/pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ fetchFromGitLab }: - -let - # We need a gvc different then that which is shipped in the source tarball of - # whatever package that imports this file - gvc-src-with-ucm = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libgnome-volume-control"; - rev = "7a621180b46421e356b33972e3446775a504139c"; - sha256 = "07rkgh9f7qcmlpy6jqh944axzh3z38f47g48ii842f2i3a1mrbw9"; - }; -in -'' - rm -r ./subprojects/gvc - cp -r ${gvc-src-with-ucm} ./subprojects/gvc -'' diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix deleted file mode 100644 index 918adc0eccffe..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, wrapGAppsHook, gobject-introspection -, gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }: - -stdenv.mkDerivation rec { - pname = "gnome-chess"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bpmi5p5vvjdq2rlm5x9k4gpci8jbrjvdxr1q62h5znzq0vz0w0l"; - }; - - nativeBuildInputs = [ meson ninja vala pkg-config gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; - buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-chess"; - attrPath = "gnome3.gnome-chess"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Chess"; - description = "Play the classic two-player boardgame of chess"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix deleted file mode 100644 index 501b894a1df17..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3 -, libxml2, libgee, libgnome-games-support, meson, ninja -, desktop-file-utils, hicolor-icon-theme}: - -stdenv.mkDerivation rec { - pname = "gnome-nibbles"; - version = "3.38.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; - }; - - nativeBuildInputs = [ - meson ninja vala python3 - pkg-config wrapGAppsHook gettext itstool libxml2 - desktop-file-utils hicolor-icon-theme - ]; - buildInputs = [ - gtk3 librsvg gsound clutter-gtk gnome3.adwaita-icon-theme - libgee libgnome-games-support - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-nibbles"; - attrPath = "gnome3.gnome-nibbles"; - }; - }; - - meta = with lib; { - description = "Guide a worm around a maze"; - homepage = "https://wiki.gnome.org/Apps/Nibbles"; - license = licenses.gpl2; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix deleted file mode 100644 index e9a079216b733..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support -, libgee, meson, ninja, python3, desktop-file-utils, adwaita-icon-theme }: - -stdenv.mkDerivation rec { - pname = "gnome-robots"; - version = "3.38.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qpzpsyj9i5dsfy7anfb2dcm602bjkcgqj86fxvnxy6llx56ks0z"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; }; - }; - - nativeBuildInputs = [ - pkg-config meson ninja python3 - libxml2 wrapGAppsHook gettext itstool desktop-file-utils - ]; - buildInputs = [ - gtk3 librsvg gsound libgnome-games-support libgee adwaita-icon-theme - ]; - - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Robots"; - description = "Avoid the robots and make them crash into each other"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix deleted file mode 100644 index 9b8c78d6e4a24..0000000000000 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook -, librsvg, gsound, gettext, itstool, libxml2 -, meson, ninja, vala, python3, desktop-file-utils -}: - -stdenv.mkDerivation rec { - pname = "gnome-taquin"; - version = "3.38.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; }; - }; - - nativeBuildInputs = [ - pkg-config wrapGAppsHook meson ninja python3 - gettext itstool libxml2 vala desktop-file-utils - ]; - buildInputs = [ - gtk3 librsvg gsound - gnome3.adwaita-icon-theme - ]; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Taquin"; - description = "Move tiles so that they reach their places"; - maintainers = teams.gnome.members; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix deleted file mode 100644 index 33dd9de1b4231..0000000000000 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, glib, gtk3, gnome3, desktop-file-utils -, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }: - -let - pname = "swell-foop"; - version = "3.34.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1032psxm59nissi268bh3j964m4a0n0ah4dy1pf0ph27j3zvdik1"; - }; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - nativeBuildInputs = [ meson ninja vala pkg-config wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ]; - buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ]; - - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; - description = "Puzzle game, previously known as Same GNOME"; - maintainers = teams.gnome.members; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch b/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch deleted file mode 100644 index abd8772cf31e0..0000000000000 --- a/pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/test/meson.build b/test/meson.build -index 6ea5e27a..450c03e3 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -167,4 +167,4 @@ test_integration_bin = executable('test-integration', - ) - - test('engine-tests', test_engine_bin) --test('client-tests', test_client_bin) -+test('client-tests', test_client_bin, timeout: 300) diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome/apps/accerciser/default.nix index 2f8163adc7289..d81b846619417 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome/apps/accerciser/default.nix @@ -1,7 +1,7 @@ { lib , fetchurl , pkg-config -, gnome3 +, gnome , gtk3 , wrapGAppsHook , gobject-introspection @@ -57,9 +57,10 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "accerciser"; - attrPath = "gnome3.accerciser"; + attrPath = "gnome.accerciser"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index 04c6b31563cd4..d0a9d6aaabb12 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , gettext , fetchurl +, fetchpatch , wrapGAppsHook , gnome-video-effects , libcanberra-gtk3 @@ -9,23 +11,19 @@ , glib , clutter-gtk , clutter-gst -, udev , gst_all_1 , itstool -, libgudev , vala , docbook_xml_dtd_43 -, docbook_xsl +, docbook-xsl-nons , appstream-glib , libxslt -, yelp-tools -, gnome-common , gtk-doc , adwaita-icon-theme , librsvg , totem , gdk-pixbuf -, gnome3 +, gnome , gnome-desktop , libxml2 , meson @@ -38,37 +36,37 @@ stdenv.mkDerivation rec { pname = "cheese"; version = "3.38.0"; + outputs = [ "out" "man" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"; }; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - passthru = { - updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; }; - }; + patches = [ + # Fix build with latest Vala or GLib + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch"; + sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4="; + }) + ]; nativeBuildInputs = [ appstream-glib docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gettext - gnome-common gtk-doc itstool libxml2 - libxslt + libxslt # for xsltproc meson ninja pkg-config python3 vala wrapGAppsHook - yelp-tools + glib # for glib-compile-schemas ]; buildInputs = [ @@ -86,12 +84,13 @@ stdenv.mkDerivation rec { gst_all_1.gstreamer gtk3 libcanberra-gtk3 - libgudev librsvg - udev ]; - outputs = [ "out" "man" "devdoc" ]; + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; preFixup = '' gappsWrapperArgs+=( @@ -105,13 +104,18 @@ stdenv.mkDerivation rec { ) ''; - enableParallelBuilding = true; + passthru = { + updateScript = gnome.updateScript { + packageName = "cheese"; + attrPath = "gnome.cheese"; + }; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index 02801cd5a78e7..6af1994fb0609 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive -, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: +{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome, gettext, itstool, libxml2, libarchive +, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales +, unzip, cpio }: stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.38.1"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mxwdbfqizakxq65fa8zlvjf48v5f44lv8ckjw8sl8fk2871784l"; + sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a"; }; LANG = "en_US.UTF-8"; # postinstall.py nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; - buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ]; + buildInputs = [ glib gtk3 json-glib libarchive file gnome.adwaita-icon-theme libnotify nautilus cpio ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; @@ -24,10 +25,16 @@ stdenv.mkDerivation rec { patchShebangs data/set-mime-type-entry.py ''; + postFixup = '' + # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40 + wrapProgram "$out/bin/file-roller" \ + --prefix PATH : ${lib.makeBinPath [ unzip ]} + ''; + passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "file-roller"; - attrPath = "gnome3.file-roller"; + attrPath = "gnome.file-roller"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index 79d31c3b8c70e..a8479e9cdcad6 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -13,7 +13,7 @@ , ninja , libsoup , tepl -, gnome3 +, gnome , gspell , perl , itstool @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "3.38.1"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gedit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0"; + url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; }; nativeBuildInputs = [ @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gedit"; - attrPath = "gnome3.gedit"; + attrPath = "gnome.gedit"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index fb8cf0a1a1c7c..500e60feb75c9 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -5,7 +5,7 @@ , meson , ninja , python3 -, gnome3 +, gnome , desktop-file-utils , appstream-glib , gettext @@ -68,9 +68,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "ghex"; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome/apps/gnome-books/default.nix index bff7c5fb281cf..0e8b322cf5ed7 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-books/default.nix @@ -14,11 +14,11 @@ , webkitgtk , gnome-desktop , libgepub -, gnome3 +, gnome , gdk-pixbuf , gsettings-desktop-schemas , adwaita-icon-theme -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_42 , desktop-file-utils , python3 @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "gnome-books"; - version = "3.34.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0c41l8m2di8h39bmk2fnhpwglwp6qhljmwqqbihzp4ay9976zrc5"; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gettext libxslt desktop-file-utils - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_42 wrapGAppsHook python3 @@ -70,14 +70,13 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-books"; - attrPath = "gnome3.gnome-books"; + attrPath = "gnome.gnome-books"; }; }; meta = with lib; { - broken = true; # Tracker 3 not supported and it cannot start Tracker 2. homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 302fb7f8127c1..605275be7ded7 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -19,7 +19,7 @@ , python3 , appstream-glib , spice-protocol -, libhandy_0 +, libhandy , libsoup , libosinfo , systemd @@ -31,7 +31,7 @@ , gmp , gdbm , cyrus_sasl -, gnome3 +, gnome , librsvg , desktop-file-utils , mtools @@ -53,11 +53,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "seKPLH+3a/T7uGLQ1S6BG5TL6f8W8GdAiWRWhpCILvg="; }; doCheck = true; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { glib glib-networking gmp - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk-vnc gtk3 gtksourceview4 @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { libcap libcap_ng libgudev - libhandy_0 + libhandy libosinfo librsvg libsecret @@ -129,16 +129,16 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; meta = with lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; homepage = "https://wiki.gnome.org/Apps/Boxes"; - license = licenses.gpl3; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index e15125a00bf29..3e80575a33db2 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -12,7 +11,7 @@ , python3 , gettext , libxml2 -, gnome3 +, gnome , gtk3 , evolution-data-server , libsoup @@ -25,31 +24,23 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0d74hng9jdmwdcjgj4xfrcink2gwkbp1k1mad4wanaf7q31c6f38"; }; patches = [ - # Port to libhandy-1 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch"; - sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE="; - }) - # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84.patch"; - sha256 = "czG3uIHl3tBnjDUvCOPm8IRp2o7yZYCb0/jWtv3uzIY="; - }) + # A refactor has caused the PR patch to drift enough to need rebasing + ./gtk_image_reset_crash.patch ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch b/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch new file mode 100644 index 0000000000000..5065295b57b77 --- /dev/null +++ b/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch @@ -0,0 +1,17 @@ +diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c +index ac32a8f9..532425c1 100644 +--- a/src/gui/views/gcal-year-view.c ++++ b/src/gui/views/gcal-year-view.c +@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self) + if (!updated) + { + gtk_label_set_text (self->temp_label, ""); +- gtk_image_clear (self->weather_icon); ++ /* FIXME: This should never be NULL, but it somehow is. ++ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299 ++ */ ++ if (self->weather_icon != NULL) ++ gtk_image_clear (self->weather_icon); + } + } + diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 3a65be9440e50..5cbd58d602a9b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , meson , ninja , pkg-config , gettext -, gnome3 +, gnome , glib , gtk3 , pango @@ -13,6 +14,7 @@ , gobject-introspection , gjs , libunistring +, libhandy , gsettings-desktop-schemas , adwaita-icon-theme , gnome-desktop @@ -20,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "3.34.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mqaxsa7hcmvid3zbzvxpfkp7s01ghiq6kaibmd3169axrr8ahql"; + url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"; }; nativeBuildInputs = [ @@ -46,6 +48,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 libunistring + libhandy pango ]; @@ -69,17 +72,17 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; meta = with lib; { - homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap"; + homepage = "https://wiki.gnome.org/Apps/Characters"; description = "Simple utility application to find and insert unusual characters"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index a2caaf068eb75..d9a749a24b093 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -18,7 +18,7 @@ , adwaita-icon-theme , gnome-desktop , geocode-glib -, gnome3 +, gnome , gdk-pixbuf , geoclue2 , libgweather @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr"; + url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "02d3jg46sn8d9gd4dsaly22gg5vkbz2gpq4pmwpvncb4rsqk7sn2"; }; nativeBuildInputs = [ @@ -71,9 +71,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-clocks"; - attrPath = "gnome3.gnome-clocks"; + attrPath = "gnome.gnome-clocks"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 17f11d0efdc30..abdf751baeb1d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , meson , ninja , vala @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "connections"; attrPath = "gnome-connections"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome/apps/gnome-documents/default.nix index 3172ae271233d..3f7ac34696bfe 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-documents/default.nix @@ -18,7 +18,7 @@ , gnome-desktop , libzapojit , libgepub -, gnome3 +, gnome , gdk-pixbuf , libsoup , docbook_xsl @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme evince libsoup webkitgtk @@ -110,9 +110,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index 20b27b2ddd055..da06eb4404c11 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , wrapGAppsHook @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { gtk3 systemd gsettings-desktop-schemas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; mesonFlags = [ @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-logs"; - attrPath = "gnome3.gnome-logs"; + attrPath = "gnome.gnome-logs"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index f0a80bc525ada..2818215a4ff9c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -5,7 +5,7 @@ , gettext , python3 , pkg-config -, gnome3 +, gnome , gtk3 , gobject-introspection , gdk-pixbuf @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "3.38.4"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1WQekf/kePsqqcpIliJczxjsLqTZjjV2UXmBin2+RKM="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-mAXUwFs6NpV0bTdisoFr/+bZ19VuF7y7nZ1B3C0CYxo="; }; doCheck = true; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gfbgraph gjs gnome-online-accounts - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gobject-introspection gsettings-desktop-schemas gtk3 @@ -82,10 +82,15 @@ stdenv.mkDerivation rec { "Exec=$out/bin/gnome-maps" ''; + preCheck = '' + # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema. + export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS" + ''; + passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index be456071e41d5..51e3d5a9cdf37 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -21,7 +21,7 @@ , desktop-file-utils , appstream-glib , itstool -, gnome3 +, gnome , gst_all_1 , libdazzle , libsoup @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.38.2"; + version = "40.0"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38"; }; nativeBuildInputs = [ @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gnome-online-accounts gobject-introspection gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme python3 grilo grilo-plugins @@ -97,9 +97,9 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix index 6fca1c0eea5ef..ca75b7aae07f4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , libgtop, intltool, itstool, libxml2, nmap, inetutils }: stdenv.mkDerivation rec { @@ -13,15 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; propagatedUserEnvPkgs = [ nmap inetutils ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "none"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix index c6d4a30ab0a72..6af206069e292 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -12,11 +12,12 @@ , gtk3 , evolution-data-server , gnome-online-accounts +, json-glib , libuuid -, libhandy_0 +, curl +, libhandy , webkitgtk -, zeitgeist -, gnome3 +, gnome , libxml2 , gsettings-desktop-schemas , tracker @@ -24,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-notes"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/bijiben/${lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis="; + url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz"; + sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; }; doCheck = true; @@ -53,26 +54,26 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 + json-glib libuuid - libhandy_0 # doesn't support libhandy-1 yet + curl + libhandy webkitgtk tracker gnome-online-accounts - zeitgeist gsettings-desktop-schemas evolution-data-server - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; mesonFlags = [ - "-Dzeitgeist=true" "-Dupdate_mimedb=false" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "bijiben"; - attrPath = "gnome3.gnome-notes"; + attrPath = "gnome.gnome-notes"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix index cb79a772b7953..0337f70a20e51 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix @@ -10,7 +10,7 @@ , python3 , desktop-file-utils , wrapGAppsHook -, gnome3 }: +, gnome }: let pname = "gnome-power-manager"; @@ -24,9 +24,9 @@ in stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { gtk3 glib upower - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index 6cc5c2ab78330..29f7aa6e9ee4b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -9,7 +9,7 @@ , gtk3 , gdk-pixbuf , gst_all_1 -, gnome3 +, gnome , meson , ninja , python3 @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2Z6k+WPsEInpzVl6fUQ5ihHs7xMeQUInGhyQwVuqRSE="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "00b55vsfzx877b7mj744abzjws7zclz71wbvh0axsrbl9l84ranl"; }; nativeBuildInputs = [ @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index 34aed52fa8510..885f21cf3ec80 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -7,7 +7,7 @@ , python3 , wrapGAppsHook , gettext -, gnome3 +, gnome , glib , gtk3 , libpeas @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libpeas gnome-online-accounts gsettings-desktop-schemas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme # Plug-ins evolution-data-server libxml2 @@ -73,9 +73,9 @@ stdenv.mkDerivation rec { preBuild = "ninja src/gtd-vcs-identifier.h"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 9a5079dfc6437..39c10e82a1c2e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -1,19 +1,49 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection -, libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gnome +, gtk3 +, libhandy +, wrapGAppsHook +, gjs +, gobject-introspection +, libgweather +, meson +, ninja +, geoclue2 +, gnome-desktop +, python3 +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "3.36.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"; + url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1vxfcvga5waangq3rzwdrdxyy5sw40vv0l463lc651s0n8xafd9a"; }; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook python3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wrapGAppsHook + python3 + ]; + buildInputs = [ - gtk3 gjs gobject-introspection gnome-desktop - libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas + gtk3 + libhandy + gjs + gobject-introspection + gnome-desktop + libgweather + gnome.adwaita-icon-theme + geoclue2 + gsettings-desktop-schemas ]; postPatch = '' @@ -30,9 +60,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-weather"; - attrPath = "gnome3.gnome-weather"; + attrPath = "gnome.gnome-weather"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix index 727a82e5ff392..0675ccb2f82d1 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib -, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: +, gnome, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: let pname = "polari"; @@ -38,9 +38,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch index 0fb09eb154af1..0fb09eb154af1 100644 --- a/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch +++ b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 60ec6792e5dd7..d46aed7bbe940 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -11,7 +11,7 @@ , itstool , gnupg , libsoup -, gnome3 +, gnome , gpgme , python3 , openldap @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.38.0.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw="; }; doCheck = true; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { gcr gsettings-desktop-schemas gnupg - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gpgme libsecret avahi @@ -68,9 +68,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix index 49abb2f1a7068..31e198783e04f 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ]; buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg + gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "vinagre"; - attrPath = "gnome3.vinagre"; + attrPath = "gnome.vinagre"; }; }; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index a1be29b01830a..04f8a7a3c37b9 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gnome3 +{ lib, stdenv, fetchurl, pkg-config, intltool, gnome , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "3.38.0"; + version = "40.1.1"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15xgz9wzk07442x3s3052as95g0223z4pp9qlsgcs323yama30v6"; + url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY="; }; # For convenience, we can specify adwaita-icon-theme only in packages @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { postInstall = '' rm -rf "$out/locale" ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "adwaita-icon-theme"; - attrPath = "gnome3.adwaita-icon-theme"; + attrPath = "gnome.adwaita-icon-theme"; }; }; diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix new file mode 100644 index 0000000000000..8d0f9459c3b07 --- /dev/null +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, gettext +, fetchurl +, vala +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, gtk3 +, libhandy +, glib +, libxml2 +, wrapGAppsHook +, itstool +, gnome +}: + +stdenv.mkDerivation rec { + pname = "baobab"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gettext + itstool + libxml2 + desktop-file-utils + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + libhandy + glib + gnome.adwaita-icon-theme + ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + description = "Graphical application to analyse disk usage in any GNOME environment"; + homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; + license = licenses.gpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix index 88260f05acf11..5985ff8226677 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 +{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook, libgee }: @@ -38,9 +38,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix new file mode 100644 index 0000000000000..165980d7e9c13 --- /dev/null +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, vala +, libxslt +, pkg-config +, glib +, gtk3 +, gnome +, python3 +, dconf +, libxml2 +, gettext +, docbook-xsl-nons +, wrapGAppsHook +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "dconf-editor"; + version = "3.38.3"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-Vxr0x9rU8Em1PmzXKLea3fCMJ92ra8V7OW0hGGbueeM="; + }; + + nativeBuildInputs = [ + meson + ninja + vala + libxslt + pkg-config + wrapGAppsHook + gettext + docbook-xsl-nons + libxml2 + gobject-introspection + python3 + ]; + + buildInputs = [ + glib + gtk3 + dconf + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + description = "GSettings editor for GNOME"; + homepage = "https://wiki.gnome.org/Apps/DconfEditor"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome/core/empathy/default.nix index 8ebb5c3f64f11..fbfee37cd13e9 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome/core/empathy/default.nix @@ -7,7 +7,7 @@ , glib , file , librsvg -, gnome3 +, gnome , gdk-pixbuf , python3 , telepathy-glib @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 telepathy-farstream farstream - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas librsvg @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "empathy"; versionPolicy = "none"; }; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index cec0ac7a6815c..426a878335289 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -9,7 +9,7 @@ , libjpeg , libpeas , libportal -, gnome3 +, gnome , gtk3 , glib , gsettings-desktop-schemas @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ilT9+T4wag9khToYgxrIwEg4IEdxBqrgvcAKrDc4bw4="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-e+CGA3/tm2v4S6yXqD48kYMBt+nJavEwsnJS0KURFok="; }; nativeBuildInputs = [ @@ -79,9 +79,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 9f949b60738e6..f286d384c4e80 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -8,7 +8,7 @@ , glib , icu , wrapGAppsHook -, gnome3 +, gnome , libportal , libxml2 , libxslt @@ -19,6 +19,7 @@ , libsecret , gnome-desktop , libnotify +, libarchive , p11-kit , sqlite , gcr @@ -36,18 +37,13 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0v8iymg72m83ikxxyhapvz5v8zh8hlr1pw7n215cy3p8q6yg41cb"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1l0sb1xg16g4wg3z99xb0w2kbyczbn7q4mphs3w4lxq22xml4sk9"; }; - # Tests need an X display - mesonFlags = [ - "-Dunit_tests=disabled" - ]; - nativeBuildInputs = [ desktop-file-utils gettext @@ -68,7 +64,7 @@ stdenv.mkDerivation rec { glib glib-networking gnome-desktop - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gst_all_1.gst-libav gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base @@ -83,6 +79,7 @@ stdenv.mkDerivation rec { libhandy libportal libnotify + libarchive libsecret libsoup libxml2 @@ -92,13 +89,18 @@ stdenv.mkDerivation rec { webkitgtk ]; + # Tests need an X display + mesonFlags = [ + "-Dunit_tests=disabled" + ]; + postPatch = '' chmod +x post_install.py # patchShebangs requires executable file patchShebangs post_install.py ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -107,7 +109,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Epiphany"; description = "WebKit based web browser for GNOME"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 31828bad0af11..3d7f3e0b8356c 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -13,12 +13,13 @@ , gdk-pixbuf , shared-mime-info , itstool -, gnome3 +, gnome , poppler , ghostscriptX , djvulibre , libspectre , libarchive +, libhandy , libsecret , wrapGAppsHook , librsvg @@ -43,13 +44,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.38.2"; + version = "40.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J9QZ1f7WMF4HRijtz94MtzT//aIF1jysMjORwEkDvZQ="; + url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks"; }; postPatch = '' @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { gspell gtk3 libarchive + libhandy librsvg libsecret libspectre @@ -110,7 +112,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index dc43bdfd4932f..0ed3565d7f039 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection +{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit , db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja , libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.38.4"; + version = "3.40.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "rFPxay1R8+f/gCX5yhn0otTOOEHXKun+K7iX3ICZ1wU="; + sha256 = "08iykha7zhk21b3axsp3v1jfwda612v0m8rz8zlzppm5i8s5ziza"; }; patches = [ @@ -50,8 +50,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "evolution-data-server"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch index 334235516591f..334235516591f 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index 4e345c3cb3ca8..4e345c3cb3ca8 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index 324ab865b11e5..f304497734953 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -13,7 +13,7 @@ , xorg , accountsservice , libX11 -, gnome3 +, gnome , systemd , dconf , gtk3 @@ -42,13 +42,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "3.38.2.1"; + version = "40.0"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gdm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "yliiBdXr/L2rVqEXFriY4Wrl3/Ia7nnQdgRkRGKOxNo="; + url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "XtdLc506Iy/7HkoTK8+WW9/pVdmVtSh3NYh3WwLylQ4="; }; mesonFlags = [ @@ -90,10 +90,13 @@ stdenv.mkDerivation rec { ]; patches = [ - # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/112 + # GDM fails to find g-s with the following error in the journal. + # gdm-x-session[976]: dbus-run-session: failed to exec 'gnome-session': No such file or directory + # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/1d28d4b3568381b8590d2235737b924aefd1746c.patch"; - sha256 = "ZUXKZS4T0o0hzrApxaqcR0txCRv5zBgqeQ9K9fLNX1o="; + url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch"; + sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q="; + revert = true; }) # Change hardcoded paths to nix store paths. @@ -157,9 +160,9 @@ stdenv.mkDerivation rec { DESTDIR = "${placeholder "out"}/dest"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gdm"; - attrPath = "gnome3.gdm"; + attrPath = "gnome.gdm"; }; # Used in GDM NixOS module diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome/core/gdm/fix-paths.patch index d649556fe9e62..d649556fe9e62 100644 --- a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gdm/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch b/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch index 401b6aea0c28e..401b6aea0c28e 100644 --- a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch +++ b/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch index 66071aa4af805..66071aa4af805 100644 --- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch +++ b/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch b/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch index 58481f0730fae..58481f0730fae 100644 --- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch +++ b/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override index 8c17f494b0f2a..8c17f494b0f2a 100644 --- a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override +++ b/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override diff --git a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch b/pkgs/desktops/gnome/core/gdm/reset-environment.patch index 61defd9c4bc20..61defd9c4bc20 100644 --- a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch +++ b/pkgs/desktops/gnome/core/gdm/reset-environment.patch diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix new file mode 100644 index 0000000000000..370cd14e46775 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-backgrounds"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4="; + }; + + passthru = { + updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; }; + }; + + nativeBuildInputs = [ meson ninja pkg-config gettext ]; + + meta = with lib; { + platforms = platforms.unix; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix new file mode 100644 index 0000000000000..07b77c04994d8 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchurl +, gnome +, meson +, ninja +, pkg-config +, gtk3 +, gettext +, glib +, udev +, itstool +, libxml2 +, wrapGAppsHook +, libnotify +, libcanberra-gtk3 +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, python3 +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-bluetooth"; + version = "3.34.5"; + + # TODO: split out "lib" + outputs = [ "out" "dev" "devdoc" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"; + }; + + nativeBuildInputs = [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 + ]; + + buildInputs = [ + glib + gtk3 + udev + libnotify + libcanberra-gtk3 + gnome.adwaita-icon-theme + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dicon_update=false" + "-Dgtk_doc=true" + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; + description = "Application that let you manage Bluetooth in the GNOME destkop"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix new file mode 100644 index 0000000000000..7e19e9523ce84 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, lib +, meson +, ninja +, vala +, gettext +, itstool +, fetchurl +, pkg-config +, libxml2 +, gtk3 +, glib +, gtksourceview4 +, wrapGAppsHook +, gobject-introspection +, python3 +, gnome +, mpfr +, gmp +, libsoup +, libmpc +, libhandy +, gsettings-desktop-schemas +, libgee +}: + +stdenv.mkDerivation rec { + pname = "gnome-calculator"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gettext + itstool + wrapGAppsHook + python3 + gobject-introspection # for finding vapi files + ]; + + buildInputs = [ + gtk3 + glib + libxml2 + gtksourceview4 + mpfr + gmp + gnome.adwaita-icon-theme + libgee + gsettings-desktop-schemas + libsoup + libmpc + libhandy + ]; + + doCheck = true; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + preCheck = '' + # Currency conversion test tries to store currency data in $HOME/.cache. + export HOME=$TMPDIR + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-calculator"; + attrPath = "gnome.gnome-calculator"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Calculator"; + description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index 73db99f3d379e..dae367f1d5baa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -6,7 +6,7 @@ , gettext , itstool , desktop-file-utils -, gnome3 +, gnome , glib , gtk3 , libexif @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome/core/gnome-common/default.nix index 53e3ed47ebe79..cb50396a40401 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome/core/gnome-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, which, gnome3, autoconf, automake }: +{ lib, stdenv, fetchurl, which, gnome, autoconf, automake }: stdenv.mkDerivation rec { pname = "gnome-common"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; }; + updateScript = gnome.updateScript { packageName = "gnome-common"; attrPath = "gnome.gnome-common"; }; }; patches = [(fetchurl { diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index ef5e564beb957..62a43d20d5806 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -17,8 +17,9 @@ , gnome-online-accounts , wrapGAppsHook , folks +, libgdata , libxml2 -, gnome3 +, gnome , vala , meson , ninja @@ -28,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9"; + url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9"; }; propagatedUserEnvPkgs = [ @@ -58,12 +59,13 @@ stdenv.mkDerivation rec { evolution-data-server gsettings-desktop-schemas folks + libgdata # required by some dependency transitively gnome-desktop libhandy libxml2 gnome-online-accounts cheese - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libchamplain clutter-gtk geocode-glib @@ -77,9 +79,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-contacts"; - attrPath = "gnome3.gnome-contacts"; + attrPath = "gnome.gnome-contacts"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index f8c458a3df1fe..6170f53c716ba 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -1,6 +1,7 @@ { fetchurl -, fetchFromGitLab -, lib, stdenv +, fetchpatch +, lib +, stdenv , substituteAll , accountsservice , adwaita-icon-theme @@ -10,7 +11,7 @@ , colord , colord-gtk , cups -, docbook_xsl +, docbook-xsl-nons , fontconfig , gdk-pixbuf , gettext @@ -22,7 +23,7 @@ , gnome-desktop , gnome-online-accounts , gnome-settings-daemon -, gnome3 +, gnome , grilo , grilo-plugins , gsettings-desktop-schemas @@ -69,20 +70,32 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.38.4"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SdxjeNTTXBxu1ZIk9WNpFsK2+km7+4tW6xmoTW6QzRk="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE="; }; - # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html - prePatch = (import ../gvc-with-ucm-prePatch.nix { - inherit fetchFromGitLab; - }); + patches = [ + (substituteAll { + src = ./paths.patch; + gcm = gnome-color-manager; + gnome_desktop = gnome-desktop; + inherit glibc libgnomekbd tzdata; + inherit cups networkmanagerapplet; + }) + + # Fix startup assertion in power panel. + # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/974 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/9acaa10567c94048657c69538e5d7813f82c4224.patch"; + sha256 = "59GeTPcG2UiVTL4VTS/TP0p0QkAQpm3VgvuAiw64wUU="; + }) + ]; nativeBuildInputs = [ - docbook_xsl + docbook-xsl-nons gettext libxslt meson @@ -142,16 +155,6 @@ stdenv.mkDerivation rec { upower ]; - patches = [ - (substituteAll { - src = ./paths.patch; - gcm = gnome-color-manager; - gnome_desktop = gnome-desktop; - inherit glibc libgnomekbd tzdata; - inherit cups networkmanagerapplet; - }) - ]; - postPatch = '' chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file patchShebangs build-aux/meson/meson_post_install.py @@ -172,9 +175,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index 361972f2635af..a6787477b8144 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -1,26 +1,26 @@ diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c -index 49ca35220..adefb87b9 100644 +index 603178efc..c363a6a5c 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c -@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs) +@@ -591,7 +591,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs) /* run with modal set */ argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL)); +- g_ptr_array_add (argv, g_strdup ("gcm-calibrate")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL)); g_ptr_array_add (argv, g_strdup ("--device")); g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) +@@ -1029,7 +1029,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile) /* open up gcm-viewer as a info pane */ argv = g_ptr_array_new_with_free_func (g_free); -- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL)); +- g_ptr_array_add (argv, g_strdup ("gcm-viewer")); + g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL)); g_ptr_array_add (argv, g_strdup ("--profile")); g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile))); g_ptr_array_add (argv, g_strdup ("--parent-window")); -@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) +@@ -1275,15 +1275,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device) static void gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device) { @@ -38,12 +38,12 @@ index 49ca35220..adefb87b9 100644 else gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE); diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h -index 96b25140c..1ad704d4a 100644 +index a2376f8a4..98769e08f 100644 --- a/panels/datetime/tz.h +++ b/panels/datetime/tz.h @@ -27,11 +27,7 @@ - #include <glib.h> + G_BEGIN_DECLS -#ifndef __sun -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" @@ -55,25 +55,42 @@ index 96b25140c..1ad704d4a 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c -index 4541986db..da7826bfe 100644 +index bd0e07762..0e71351f8 100644 --- a/panels/info-overview/cc-info-overview-panel.c +++ b/panels/info-overview/cc-info-overview-panel.c -@@ -169,7 +169,7 @@ load_gnome_version (char **version, +@@ -172,7 +172,7 @@ load_gnome_version (char **version, gsize length; g_autoptr(VersionData) data = NULL; - + - if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml", + if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml", &contents, &length, &error)) +diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c +index 6c2cb5614..8f57159cc 100644 +--- a/panels/keyboard/cc-input-list-box.c ++++ b/panels/keyboard/cc-input-list-box.c +@@ -223,10 +223,10 @@ row_layout_cb (CcInputListBox *self, + layout_variant = cc_input_source_get_layout_variant (source); + + if (layout_variant && layout_variant[0]) +- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", + layout, layout_variant); + else +- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", ++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", + layout); + + g_spawn_command_line_async (commandline, NULL); diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c -index 9390a3308..d30b4a68e 100644 +index 505b8ee25..62e94009f 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -278,9 +278,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) +@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) g_autoptr(GError) error = NULL; - + if (self->is_new_connection) { - cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); + cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); @@ -84,19 +101,20 @@ index 9390a3308..d30b4a68e 100644 } diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c +index 74dfb0e9a..5f53d1a20 100644 --- a/panels/network/net-device-bluetooth.c +++ b/panels/network/net-device-bluetooth.c @@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) update_off_switch_from_device_state (self->device_off_switch, state, self); - + /* set up the Options button */ - path = g_find_program_in_path ("nm-connection-editor"); + path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); } - + @@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) - + connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); - cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); @@ -105,19 +123,20 @@ diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-b if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); @@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) - + gtk_widget_init_template (GTK_WIDGET (self)); - + - path = g_find_program_in_path ("nm-connection-editor"); + path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); } - + diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c +index 34eb86241..50d0a2bed 100644 --- a/panels/network/net-device-mobile.c +++ b/panels/network/net-device-mobile.c -@@ -484,7 +484,7 @@ options_button_clicked_cb (NetDeviceMobile *self) - +@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self) + connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); - cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); @@ -125,21 +144,21 @@ diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobi g_debug ("Launching '%s'\n", cmdline); if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -776,7 +776,7 @@ net_device_mobile_init (NetDeviceMobile *self) - +@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self) + self->cancellable = g_cancellable_new (); - + - path = g_find_program_in_path ("nm-connection-editor"); + path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); } - + diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c -index f53ba217e..d24bcaeb9 100644 +index a31a606e3..ed5133d29 100644 --- a/panels/printers/pp-host.c +++ b/panels/printers/pp-host.c @@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task, - devices = g_new0 (PpDevicesList, 1); + devices = g_ptr_array_new_with_free_func (g_object_unref); argv = g_new0 (gchar *, 3); - argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); @@ -147,25 +166,8 @@ index f53ba217e..d24bcaeb9 100644 argv[1] = g_strdup (priv->hostname); /* Use SNMP to get printer's informations */ -diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c -index 35859526d..21486c917 100644 ---- a/panels/region/cc-region-panel.c -+++ b/panels/region/cc-region-panel.c -@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self, - layout_variant = cc_input_source_get_layout_variant (source); - - if (layout_variant && layout_variant[0]) -- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", - layout, layout_variant); - else -- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", -+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", - layout); - - g_spawn_command_line_async (commandline, NULL); diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 00239ce0f..617c98870 100644 +index 86f53d4fc..0b052856f 100644 --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c @@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch index 57eb4b3d44a9a..57eb4b3d44a9a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix new file mode 100644 index 0000000000000..56bd074c2cb90 --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -0,0 +1,96 @@ +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, libxslt +, ninja +, gnome +, gtk3 +, glib +, gettext +, libxml2 +, xkeyboard_config +, libxkbcommon +, isocodes +, meson +, wayland +, libseccomp +, systemd +, bubblewrap +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "gnome-desktop"; + version = "40.1"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8="; + }; + + patches = [ + (substituteAll { + src = ./bubblewrap-paths.patch; + bubblewrap_bin = "${bubblewrap}/bin/bwrap"; + inherit (builtins) storeDir; + }) + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + libxslt + libxml2 + gobject-introspection + gtk-doc + docbook-xsl-nons + glib + ]; + + buildInputs = [ + bubblewrap + xkeyboard_config + libxkbcommon # for xkbregistry + isocodes + wayland + gtk3 + glib + libseccomp + systemd + ]; + + propagatedBuildInputs = [ + gsettings-desktop-schemas + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Ddesktop_docs=false" + ]; + + separateDebugInfo = stdenv.isLinux; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-desktop"; + attrPath = "gnome.gnome-desktop"; + }; + }; + + meta = with lib; { + description = "Library with common API for various GNOME modules"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.linux; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix index bb602c8b3fa13..a399c4e85377c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -1,36 +1,28 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk3, glib, gsettings-desktop-schemas }: +, gnome, gtk3, glib, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-dictionary"; - version = "3.26.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; + url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; }; - patches = [ - # fix AppStream validation - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/commit/1c94d612030ef87c6e26a01a490470b71c39e341.patch"; - sha256 = "0cbswmhs9mks3gsc0iy4wnidsa8sfzzf4s1kgvb80qwffgxz5m8b"; - }) - ]; - doCheck = true; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-dictionary"; - attrPath = "gnome3.gnome-dictionary"; + attrPath = "gnome.gnome-dictionary"; }; }; diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix new file mode 100644 index 0000000000000..c11a1df883a0b --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -0,0 +1,85 @@ +{ lib +, stdenv +, gettext +, fetchurl +, pkg-config +, udisks2 +, libhandy +, libsecret +, libdvdread +, meson +, ninja +, gtk3 +, glib +, wrapGAppsHook +, python3 +, libnotify +, itstool +, gnome +, libxml2 +, gsettings-desktop-schemas +, libcanberra-gtk3 +, libxslt +, docbook-xsl-nons +, libpwquality +, systemd +}: + +stdenv.mkDerivation rec { + pname = "gnome-disk-utility"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-KkuZrBHKIzlLKMVYS56WKE6MWk2mXPBiB95U9Csf8UE="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + itstool + libxslt + docbook-xsl-nons + wrapGAppsHook + python3 + libxml2 + ]; + + buildInputs = [ + gtk3 + glib + libhandy + libsecret + libpwquality + libnotify + libdvdread + libcanberra-gtk3 + udisks2 + gnome.adwaita-icon-theme + systemd + gnome.gnome-settings-daemon + gsettings-desktop-schemas + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-disk-utility"; + attrPath = "gnome.gnome-disk-utility"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Disks"; + description = "A udisks graphical front-end"; + maintainers = teams.gnome.members; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 83563c7d212c9..622a7de1bffa2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -1,28 +1,28 @@ { lib, stdenv, meson, ninja, gettext, fetchurl -, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme -, wrapGAppsHook, gnome3, harfbuzz }: +, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy +, wrapGAppsHook, gnome, harfbuzz }: stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "3.34.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa"; + url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"; }; doCheck = true; nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ]; + buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz libhandy ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-font-viewer"; - attrPath = "gnome3.gnome-font-viewer"; + attrPath = "gnome.gnome-font-viewer"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch b/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch index d4065c144996c..2323759522535 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch @@ -5,29 +5,10 @@ Date: Sun, 20 Sep 2020 14:46:59 -0400 Subject: [PATCH] fix paths --- - data/gnome-welcome-tour | 4 ++-- gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++--- gnome-initial-setup/pages/timezone/tz.h | 4 ++-- - 3 files changed, 7 insertions(+), 7 deletions(-) + 3 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour -index 51c9b59..68ab0c4 100755 ---- a/data/gnome-welcome-tour -+++ b/data/gnome-welcome-tour -@@ -3,11 +3,11 @@ - cfgdir=${XDG_CONFIG_DIR:-$HOME/.config} - - # Don't do anything if gnome-tour isn't installed --gnome_tour_path=$(which gnome-tour 2>/dev/null) -+gnome_tour_path="@gnome_tour@" - if test -z "${gnome_tour_path}"; then - rm -f $cfgdir/run-welcome-tour - exit - fi - --gnome-tour -+@gnome_tour@ - rm -f $cfgdir/run-welcome-tour diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c index 196abf6..613d0e5 100644 --- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 435da4e3720ab..6d57e29a596df 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -6,7 +6,7 @@ , ninja , pkg-config , wrapGAppsHook -, gnome3 +, gnome , accountsservice , fontconfig , gdm @@ -14,7 +14,6 @@ , geocode-glib , glib , gnome-desktop -, gnome-getting-started-docs , gnome-online-accounts , gtk3 , libgweather @@ -32,18 +31,24 @@ , tzdata , libgnomekbd , gsettings-desktop-schemas -, gnome-tour }: stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.38.4"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "001jdzsvc541qracn68r609pr5qwymrh85xrqmvzzc1dbg5w3mlg"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "10zf87n6c947k9rkk2rqc9cbfwcvq23axq3rf7x1an7npv3414gi"; }; + patches = [ + (substituteAll { + src = ./0001-fix-paths.patch; + inherit tzdata libgnomekbd; + }) + ]; + nativeBuildInputs = [ gettext meson @@ -61,7 +66,6 @@ stdenv.mkDerivation rec { geocode-glib glib gnome-desktop - gnome-getting-started-docs gnome-online-accounts gsettings-desktop-schemas gtk3 @@ -78,14 +82,6 @@ stdenv.mkDerivation rec { webkitgtk ]; - patches = [ - (substituteAll { - src = ./0001-fix-paths.patch; - inherit tzdata libgnomekbd; - gnome_tour = "${gnome-tour}/bin/gnome-tour"; - }) - ]; - mesonFlags = [ "-Dcheese=disabled" "-Dibus=disabled" @@ -94,9 +90,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf b/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf index a06b37e100edc..a06b37e100edc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 93453cc72e949..8c9815509e2d5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -1,51 +1,72 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt -, gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook -, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, dbus +, libgcrypt +, pam +, python2 +, glib +, libxslt +, gettext +, gcr +, libcap_ng +, libselinux +, p11-kit +, openssh +, wrapGAppsHook +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gnome +}: stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "3.36.0"; + version = "40.0"; + + outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; + url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3"; }; - patches = [ - # version 3.36.0 is incompatible with libncap_ng >= 0.8.1. remove patch after update. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/ebc7bc9efacc17049e54da8d96a4a29943621113.diff"; - sha256 = "07bx7zmdswqsa3dj37m729g35n1prhylkw7ya8a7h64i10la12cs"; - }) + nativeBuildInputs = [ + pkg-config + gettext + libxslt + docbook-xsl-nons + docbook_xml_dtd_43 + wrapGAppsHook ]; - outputs = [ "out" "dev" ]; - buildInputs = [ - glib libgcrypt pam openssh libcap_ng libselinux - gcr p11-kit + glib + libgcrypt + pam + openssh + libcap_ng + libselinux + gcr + p11-kit ]; - nativeBuildInputs = [ - pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook - ]; + # In 3.20.1, tests do not support Python 3 + checkInputs = [ dbus python2 ]; configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/" ]; - postPatch = '' - patchShebangs build - ''; - # Tends to fail non-deterministically. # - https://github.com/NixOS/nixpkgs/issues/55293 # - https://github.com/NixOS/nixpkgs/issues/51121 doCheck = false; - # In 3.20.1, tests do not support Python 3 - checkInputs = [ dbus python2 ]; + postPatch = '' + patchShebangs build + ''; checkPhase = '' export HOME=$(mktemp -d) @@ -65,9 +86,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-keyring"; - attrPath = "gnome3.gnome-keyring"; + attrPath = "gnome.gnome-keyring"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix index 3cc85053bcef9..95fdf35b8831b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix @@ -5,7 +5,7 @@ , autoreconfHook , pkg-config , glib -, gnome3 +, gnome , libxml2 , libgdata , grilo @@ -100,9 +100,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-online-miners"; - attrPath = "gnome3.gnome-online-miners"; + attrPath = "gnome.gnome-online-miners"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 8411b2edecb49..8411b2edecb49 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix index 432f7d9e2ad5b..5b02fda3e32ff 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils -, gnome3, gsettings-desktop-schemas }: +, gnome, gsettings-desktop-schemas }: let pname = "gnome-screenshot"; - version = "3.38.0"; + version = "40.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1h4zsaybjrlkfcrvriyybg4gfr7v9d1ndh2p516k94ad2gfx6mp5"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${name}.tar.xz"; + sha256 = "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n"; }; doCheck = true; @@ -22,14 +22,14 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme + gtk3 glib libcanberra-gtk3 libhandy gnome.adwaita-icon-theme gsettings-desktop-schemas ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix b/pkgs/desktops/gnome/core/gnome-session/ctl.nix index 05d28de768a8e..6a274e35bf568 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix +++ b/pkgs/desktops/gnome/core/gnome-session/ctl.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-session-ctl"; - version = "3.38.0"; + version = "40.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; - rev = "c20907fea27fa96568b8375a6756c40d0bfb9e40"; # main - hash = "sha256-y9/yOH6N8wf93+gPqnqzRzV/lPXYD0M6v7dsLFF8lWo="; + rev = version; + hash = "sha256-gvBmLx8Qoj1vPsOwaZsd9+pTDvU5D7uUts7ZT1pXwNo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 1fa0a0b0fc64d..c1ebc43620715 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -1,17 +1,16 @@ -{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas +{ 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 -, fetchpatch }: +, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: stdenv.mkDerivation rec { pname = "gnome-session"; - version = "3.38.0"; + version = "40.1.1"; outputs = ["out" "sessions"]; src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v"; + url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "10nzyhmgkrzk6i70kj7690na0hmsv6qy5bmr10akxq9jxqlphy4w"; }; patches = [ @@ -22,12 +21,6 @@ stdenv.mkDerivation rec { grep = "${gnugrep}/bin/grep"; bash = "${bash}/bin/bash"; }) - # Fixes 2 minute delay at poweroff. - # https://gitlab.gnome.org/GNOME/gnome-session/issues/74 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-session/-/commit/9de6e40f12e8878f524f8d429d85724c156a0517.diff"; - sha256 = "19vrjdf7d6dfl7sqxvbc5h5lcgk1krgzg5rkssrdzd1h4ma6y8fz"; - }) ]; mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; @@ -39,8 +32,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme - gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy + glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme + gnome.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy ]; postPatch = '' @@ -63,8 +56,8 @@ stdenv.mkDerivation rec { wrapProgram "$out/libexec/gnome-session-binary" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\ - --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" + --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\ + --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" ''; # We move the GNOME sessions to another output since gnome-session is a dependency of @@ -80,9 +73,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-session"; - attrPath = "gnome3.gnome-session"; + attrPath = "gnome.gnome-session"; }; providedSessions = [ "gnome" "gnome-xorg" ]; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch index 320b3024deee2..320b3024deee2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index e5923e6b56abd..e091cf2365af3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , perl , gettext , gtk3 @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.38.1"; + version = "40.0.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0r010wzw3dj87mapzvq15zv93i86wg0x0rpii3x2wapq3bcj30g2"; + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp"; }; patches = [ @@ -119,9 +119,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch index 2229302cab7c0..2229302cab7c0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch index 8f3951af2da85..8f3951af2da85 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 8b882df3b0078..6c38b7909590d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, spidermonkey_68, glib -, gnome3, gnome-menus, substituteAll }: +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, pkg-config, spidermonkey_68, glib +, gnome, gnome-menus, substituteAll }: stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hzn975v49rv3nsqp8m0mzv8gcm7nyvn54gj3zsml8ahlxwl592p"; + url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "15hak4prx2nx1svfii39clxy1lll8crdf7p91if85jcsh6r8ab8p"; }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { src = ./fix_gmenu.patch; gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) + + # Do not show welcome dialog in gnome-classic. + # Needed for gnome-shell 40.1. + # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/169 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/commit/3e8bbb07ea7109c44d5ac7998f473779e742d041.patch"; + sha256 = "jSmPwSBgRBfPPP9mGVjw1mSWumIXQqtA6tSqHr3U+3w="; + }) ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch index 555664e8ae25f..555664e8ae25f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 97a72e379a58e..66eaafb2cc795 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -1,11 +1,12 @@ { fetchurl , fetchpatch +, fetchgit , substituteAll , lib, stdenv , meson , ninja , pkg-config -, gnome3 +, gnome , json-glib , gettext , libsecret @@ -22,8 +23,7 @@ , librsvg , geoclue2 , perl -, docbook_xml_dtd_42 -, docbook_xml_dtd_43 +, docbook_xml_dtd_45 , desktop-file-utils , libpulseaudio , libical @@ -46,6 +46,7 @@ , mutter , evolution-data-server , gtk3 +, gtk4 , sassc , systemd , pipewire @@ -66,14 +67,20 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.38.3"; + version = "40.0-unstable-2021-05-01"; outputs = [ "out" "devdoc" ]; - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-U0W0GMsSqXKVXOXM6u1mYkgAJzNrXFHa6lcwV1tiHO0="; + src = fetchgit { + url = "https://gitlab.gnome.org/GNOME/gnome-shell.git"; + rev = "a8a79c03330427808e776c344f7ebc42782a1b5a"; + sha256 = "ivHV0SRpnBqsdC7fu1Xhtd/BA55O0UdbUyDLy5KHNYs="; + fetchSubmodules = true; }; + # src = fetchurl { + # url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; + # sha256 = "sha256-vOcfQC36qcXiab9lv0iiI0PYlubPmiw0ZpOS1/v2hHg="; + # }; patches = [ # Hardcode paths to various dependencies so that they can be found at runtime. @@ -97,6 +104,12 @@ stdenv.mkDerivation rec { revert = true; sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl"; }) + + # Work around failing fingerprint auth + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; + sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw="; + }) ]; nativeBuildInputs = [ @@ -105,9 +118,7 @@ stdenv.mkDerivation rec { pkg-config gettext docbook-xsl-nons - # Switch to 4.5 in the 40. - docbook_xml_dtd_42 - docbook_xml_dtd_43 + docbook_xml_dtd_45 gtk-doc perl wrapGAppsHook @@ -137,6 +148,7 @@ stdenv.mkDerivation rec { evolution-data-server libical gtk3 + gtk4 gdm geoclue2 adwaita-icon-theme @@ -189,16 +201,16 @@ stdenv.mkDerivation rec { postFixup = '' # The services need typelibs. - for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do + for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do wrapGApp $out/share/gnome-shell/$svc done ''; passthru = { mozillaPlugin = "/lib/mozilla/plugins"; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-shell"; - attrPath = "gnome3.gnome-shell"; + attrPath = "gnome.gnome-shell"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch index e17a608a2d85e..e17a608a2d85e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch b/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch index 2d7bdf303151d..6d888725b5d2e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch @@ -3,7 +3,7 @@ @@ -13,7 +13,7 @@ shew_sources = [ libshew = library(full_name, sources: shew_sources, - dependencies: [gtk_dep], + dependencies: [gtk_dep, x11_dep], - install_dir: pkglibdir, + install_dir: get_option('prefix') / pkglibdir, install: true, diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch index bc494caea9dd0..bc494caea9dd0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index ff80efaa4de4d..64cd214e8090f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -6,13 +6,14 @@ , meson , ninja , gettext -, gnome3 +, gnome , wrapGAppsHook , packagekit , ostree , glib -, appstream-glib +, appstream , libsoup +, libhandy , polkit , isocodes , gspell @@ -42,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-software/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rjm486vgn6gi9mv1rqdcvr9cilmw6in4r6djqkxbxqll89cp2l7"; + url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "16q2902swxsjdxb1nj335sv1bb76rvq4w6dn4yszkwf3s0fd86in"; }; patches = [ @@ -76,8 +77,9 @@ stdenv.mkDerivation rec { gtk3 glib packagekit - appstream-glib + appstream libsoup + libhandy gsettings-desktop-schemas gnome-desktop gspell @@ -94,7 +96,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dubuntu_reviews=false" "-Dgudev=false" # FIXME: package malcontent parental controls "-Dmalcontent=false" @@ -103,9 +104,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.gnome-software"; + attrPath = "gnome.gnome-software"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch index 6f443a8a43edb..6f443a8a43edb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index db978f953b794..77579be6272da 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -1,26 +1,63 @@ -{ lib, stdenv, gettext, fetchurl, pkg-config, gtkmm3, libxml2 -, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 -, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: +{ lib +, stdenv +, gettext +, fetchurl +, pkg-config +, gtkmm3 +, libxml2 +, bash +, gtk3 +, libhandy +, glib +, wrapGAppsHook +, meson +, ninja +, python3 +, gsettings-desktop-schemas +, itstool +, gnome +, librsvg +, gdk-pixbuf +, libgtop +, systemd +}: stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1x5gd30g87im7fnqj63njlac69zywfd1r0vgsxkjag2hsns7mgvk"; + url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx"; }; - doCheck = true; - nativeBuildInputs = [ - pkg-config gettext itstool wrapGAppsHook meson ninja python3 + pkg-config + gettext + itstool + wrapGAppsHook + meson + ninja + python3 ]; + buildInputs = [ - bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg - gsettings-desktop-schemas systemd + bash + gtk3 + libhandy + glib + libxml2 + gtkmm3 + libgtop + gdk-pixbuf + gnome.adwaita-icon-theme + librsvg + gsettings-desktop-schemas + systemd ]; + doCheck = true; + postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py @@ -28,9 +65,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-system-monitor"; - attrPath = "gnome3.gnome-system-monitor"; + attrPath = "gnome.gnome-system-monitor"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 52aee2a004a7e..ab3e3aecc0352 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus +{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook, pcre2 , libxslt, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.38.3"; + version = "3.40.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "EaWw1jXxX9znUINRpRD79OkqpTMVKlD/DHhF4xAuR2Q="; + sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07"; }; buildInputs = [ @@ -26,16 +26,16 @@ stdenv.mkDerivation rec { # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-terminal"; - attrPath = "gnome3.gnome-terminal"; + attrPath = "gnome.gnome-terminal"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix index 7b42d724593a2..53f775833a8fd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkg-config, pango, atk, gtk2 +{ lib, stdenv, fetchurl, intltool, gtk3, gnome, librsvg, pkg-config, pango, atk, gtk2 , gdk-pixbuf, hicolor-icon-theme }: let @@ -13,14 +13,14 @@ in stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; - propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome.adwaita-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index 61f8761ce8175..7440749e0a9b9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -13,7 +13,7 @@ , appstream-glib , wrapGAppsHook , python3 -, gnome3 +, gnome , libhandy , librsvg , rustc @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-hV/C/Lyz6e9zhe3FRw4Sox5gMqThDP57wVCTgcekjng="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-cGMiOGmgdHJ0FL7H23ONhQYhbuhMz8O8p9rFLkmMG/k="; }; cargoVendorDir = "vendor"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix index 54fcf531c6586..211326cfcdbd1 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -15,7 +15,7 @@ , itstool , libnotify , mod_dnssd -, gnome3 +, gnome , libcanberra-gtk3 , python3 }: @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index aac5a43e4339a..336a4d260c4ed 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -11,7 +11,7 @@ , desktop-file-utils , gtk-doc , wrapGAppsHook -, gnome3 +, gnome , itstool , libxml2 , yelp-tools @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix index 65d2bbc2157a4..aa3c7ed398114 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }: let pname = "libgnome-keyring"; @@ -17,13 +17,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch b/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch index 3691c034d1ee6..3691c034d1ee6 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch +++ b/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch index 28f89ac7c0c61..28f89ac7c0c61 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch +++ b/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch b/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch index 9f78a324d9daf..9f78a324d9daf 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch +++ b/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch b/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch index cd98d3950415b..cd98d3950415b 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch +++ b/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch b/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch index 138970ddda0ac..138970ddda0ac 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch +++ b/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch b/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch index 6d88f0f5e7660..6d88f0f5e7660 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch +++ b/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch b/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch index 8376fc649b5f0..8376fc649b5f0 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch +++ b/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome/core/mutter/3.34/default.nix index 1f4ca5d3213d8..42f07d45e62f5 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/pkgs/desktops/gnome/core/mutter/3.34/default.nix @@ -3,7 +3,7 @@ , substituteAll , lib, stdenv , pkg-config -, gnome3 +, gnome , pantheon , gettext , gobject-introspection diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 03c20e1ef6a70..9f6a64ef1829b 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -4,7 +4,7 @@ , runCommand , lib, stdenv , pkg-config -, gnome3 +, gnome , gettext , gobject-introspection , cairo @@ -45,24 +45,31 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.38.3"; + version = "40.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sjIec9Hj/i6Q5jAfQrugf02UvGR1aivxPXWunW+qIB8="; + url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-enGzEuWmZ8U3SJUYilBqP2tnF2i8s2K2jv3FYnc9GY4="; }; patches = [ # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 - ./drop-inheritable.patch + # ./drop-inheritable.patch (substituteAll { src = ./fix-paths.patch; inherit zenity; }) + + # Fix non-deterministic build failure: + # https://gitlab.gnome.org/GNOME/mutter/-/issues/1682 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/91117bb052ed0d69c8ea4159c1df15c814d90627.patch"; + sha256 = "ek8hEoPP4S2TGOm6SGGOhUVIp4OT68nz0SQzZrceFUU="; + }) ]; mesonFlags = [ @@ -146,16 +153,16 @@ let self = stdenv.mkDerivation rec { ''; }; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; meta = with lib; { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch index 7374e1b86935e..7374e1b86935e 100644 --- a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch +++ b/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/fix-paths.patch index 6ac0a431f61ff..6ac0a431f61ff 100644 --- a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch +++ b/pkgs/desktops/gnome/core/mutter/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 5ca1efe1ca329..f3ccdbce98cba 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -9,7 +9,9 @@ , python3 , wrapGAppsHook , gtk3 -, gnome3 +, libhandy +, libportal +, gnome , gnome-autoar , glib-networking , shared-mime-info @@ -32,11 +34,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.38.2"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0cwxr7bfa19dvzra81s9wfshzv0zv7ycpfffn4amigd0fh0vkkwf"; }; patches = [ @@ -67,10 +69,12 @@ stdenv.mkDerivation rec { gexiv2 glib-networking gnome-desktop - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base gtk3 + libhandy + libportal libexif libnotify libseccomp @@ -98,9 +102,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch index e1313999675d0..e1313999675d0 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch +++ b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch diff --git a/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch b/pkgs/desktops/gnome/core/nautilus/fix-paths.patch index dc9874359b233..dc9874359b233 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch +++ b/pkgs/desktops/gnome/core/nautilus/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch index 6fe651b9cbb47..6fe651b9cbb47 100644 --- a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch +++ b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index 75b2bd292704f..f43df23f44a1d 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -23,7 +23,7 @@ , systemd , tracker , shared-mime-info -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -93,9 +93,10 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix index 64009cd75eb33..91ac4f14b22af 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -14,21 +14,22 @@ , gtk3 , gusb , packagekit +, libhandy , libwebp , libxml2 , sane-backends , vala -, gnome3 +, gnome , gobject-introspection }: stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-qI2AcpaCiIZJzfzfqGkrCjSs3ladwICIjyea/DqcTQs="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-E4EbsqhhnmOkP8Lva3E1ny1cQITG1cizqtYXJLIHUa8="; }; nativeBuildInputs = [ @@ -48,9 +49,10 @@ stdenv.mkDerivation rec { gdk-pixbuf colord glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gusb gtk3 + libhandy libwebp packagekit sane-backends @@ -64,7 +66,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "simple-scan"; }; }; diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index f5e85a1f16cde..c42b6964bf65f 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -5,9 +5,7 @@ , gettext , gobject-introspection , glib -, clutter-gtk -, clutter-gst -, gnome3 +, gnome , gtksourceview4 , gjs , webkitgtk @@ -40,14 +38,13 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsHook ]; + buildInputs = [ glib gtk3 - gnome3.evince + gnome.evince icu harfbuzz - clutter-gtk - clutter-gst gjs gtksourceview4 gdk-pixbuf @@ -70,9 +67,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "sushi"; - attrPath = "gnome3.sushi"; + attrPath = "gnome.sushi"; }; }; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index a98265ff508b5..45b99680a120f 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -17,7 +17,7 @@ , itstool , libxml2 , vala -, gnome3 +, gnome , grilo , grilo-plugins , libpeas @@ -25,7 +25,7 @@ , gnome-desktop , gsettings-desktop-schemas , gdk-pixbuf -, xvfb_run +, xvfb-run }: stdenv.mkDerivation rec { @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - xvfb_run + xvfb-run ]; mesonFlags = [ @@ -107,9 +107,9 @@ stdenv.mkDerivation rec { wrapPrefixVariables = [ "PYTHONPATH" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "totem"; - attrPath = "gnome3.totem"; + attrPath = "gnome.totem"; }; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 22ce6c72011d4..7c9b4eb839c03 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -5,16 +5,16 @@ , itstool , libxml2 , libxslt -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "3.38.3"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GTtqvUaXt7Qh6Yw21NMTXaCw/bUapT5gLtNo3YTR/QM="; + url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-Nh7NTTP8zbO7CKaH9g5cPpCdLp47Ai2ETgSYINDPYrA="; }; nativeBuildInputs = [ @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 754a77486682f..f4df80f5611f3 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -1,27 +1,27 @@ { lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib -, gnome3, sqlite +, gnome, sqlite , itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "yelp"; - version = "3.38.3"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-r9RqTQrrRrtCXFIAcdgY+LKzLmnnVqv9mXlodpphVJ0="; + url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-B3dfoGzSg2Xs2Cm7FqhaaCiXqyHYzONFlrvvXNRVquA="; }; nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; buildInputs = [ gtk3 glib webkitgtk sqlite - libxml2 libxslt gnome3.yelp-xsl - gnome3.adwaita-icon-theme + libxml2 libxslt gnome.yelp-xsl + gnome.adwaita-icon-theme gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "yelp"; }; }; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index d02cb581cb8cc..51ad81a77a469 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -2,7 +2,7 @@ , fetchurl , pkg-config , libxml2 -, gnome3 +, gnome , gtk3 , yelp-tools , gettext @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "zenity"; - attrPath = "gnome3.zenity"; + attrPath = "gnome.zenity"; }; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome/default.nix index c4e203913bea5..b529a65026d71 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -20,7 +20,6 @@ lib.makeScope pkgs.newScope (self: with self; { libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; - gnome3 = self // { recurseForDerivations = false; }; # ISO installer # installerIso = callPackage ./installer.nix {}; @@ -176,8 +175,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-documents = callPackage ./apps/gnome-documents { }; - gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { }; - gnome-logs = callPackage ./apps/gnome-logs { }; gnome-maps = callPackage ./apps/gnome-maps { }; @@ -332,9 +329,9 @@ lib.makeScope pkgs.newScope (self: with self; { pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01 # added 2019-08-25 - corePackages = throw "gnome3.corePackages is removed since 2019-08-25: please use `services.gnome3.core-shell.enable`"; - optionalPackages = throw "gnome3.optionalPackages is removed since 2019-08-25: please use `services.gnome3.core-utilities.enable`"; - gamesPackages = throw "gnome3.gamesPackages is removed since 2019-08-25: please use `services.gnome3.games.enable`"; + corePackages = throw "gnome.corePackages is removed since 2019-08-25: please use `services.gnome.core-shell.enable`"; + optionalPackages = throw "gnome.optionalPackages is removed since 2019-08-25: please use `services.gnome.core-utilities.enable`"; + gamesPackages = throw "gnome.gamesPackages is removed since 2019-08-25: please use `services.gnome.games.enable`"; nautilus-sendto = throw "nautilus-sendto is removed since 2019-09-17: abandoned upstream"; @@ -361,4 +358,9 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = lib.teams.gnome.members; mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; + + gnome-getting-started-docs = throw "Removed in favour of gnome-tour."; + + # Added 2021-05-07 + gnome3 = self // { recurseForDerivations = false; }; }) diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome/devtools/anjuta/default.nix index 4802287cb1221..5b841557b6b20 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome/devtools/anjuta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, gjs, flex, bison, libxml2, intltool, gdl, libgda, gtksourceview, gsettings-desktop-schemas, itstool, python3, ncurses, makeWrapper }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "anjuta"; attrPath = "gnome3.anjuta"; }; + updateScript = gnome.updateScript { packageName = "anjuta"; attrPath = "gnome.anjuta"; }; }; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index 173e4a9e5b8c8..46491cffc5f68 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , gtk3 , wrapGAppsHook , glib @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13sa25mmlc49kn520hdfbskma65y7smvwmyhfggj0n9s3fazba2d"; + url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0zr64qp5c6jcc3x5hmfp7jhzpi96qwr6xplyfkmz4kjzvr9xidjd"; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 webkitgtk amtk - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas ]; @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "devhelp"; - attrPath = "gnome3.devhelp"; + attrPath = "gnome.devhelp"; }; }; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix index bdbe73d2f88ca..501aaa91c978f 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: +{ lib, stdenv, fetchurl, gnome, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { pname = "gnome-devel-docs"; - version = "3.38.2"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1h6481hbz1c5p69r6h96hbgf560lhp1jibszscgw0s2yikdh6q8n"; + url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0zqp01ks8m3s6jn5xqd05rw4fwbvxy5qvcfg9g50b2ar2j7v1ar8"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome3.gnome-devel-docs"; }; + updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; }; }; buildInputs = [ intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index fa1d89173fdd6..57d78bf756abb 100644 --- a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }: +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-EasyScreenCast"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-gi-path.patch; - gnomeShell = gnome3.gnome-shell; + gnomeShell = gnome.gnome-shell; }) ]; diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch index 2d32021b6c665..2d32021b6c665 100644 --- a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome/extensions/appindicator/default.nix index aaf8c92c672db..0906d76295632 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome/extensions/appindicator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato ]; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 851a816c61c73..851a816c61c73 100644 --- a/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch index 5d8584f52a6aa..5d8584f52a6aa 100644 --- a/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch +++ b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome/extensions/caffeine/default.nix index 41155391f89c5..3085a4461e712 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }: +{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-caffeine"; diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix index f6adf85de4d00..779d7506abf54 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix @@ -4,7 +4,7 @@ , ninja , jq , python3 -, gnome3 +, gnome , wrapGAppsHook , gobject-introspection }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gnome-shell + gnome.gnome-shell python pygobject3 requests @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "chrome-gnome-shell"; }; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "GNOME Shell integration for Chrome"; homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"; longDescription = '' - To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome3.chrome-gnome-shell.enable</option> to <literal>true</literal>. + To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome.chrome-gnome-shell.enable</option> to <literal>true</literal>. ''; license = licenses.gpl3; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix index ee64fc5113d05..ee64fc5113d05 100644 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix index 6d3a752c886f3..3e02d33857a69 100644 --- a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, gnome3, gettext, glib }: +{ lib, stdenv, fetchzip, gnome, gettext, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clock-override"; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; - broken = versionOlder gnome3.gnome-shell.version "3.18"; + broken = versionOlder gnome.gnome-shell.version "3.18"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 45233e52f8932..45233e52f8932 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix index 7a9dc066cc77e..7a9dc066cc77e 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix index 0a9145de3db35..166ab61565f85 100644 --- a/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix +++ b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-disable-unredirect"; - version = "unstable-2021-01-17"; + version = "unstable-2021-04-13"; src = fetchFromGitHub { owner = "kazysmaster"; repo = "gnome-shell-extension-disable-unredirect"; - rev = "2ecb2f489ea3316b77d04f03a0c885f322c67e79"; - sha256 = "1rjyrg8qya0asndxr7189a9npww0rcxk02wkxrxjy7fdp5m89p7y"; + rev = "2a4c0e6a7a7a5f1aad9907ee2cf43d0725e10c19"; + sha256 = "06hbyy20xz0bvzg0vs5w4092nyfpg372c86cdm1akcjm72m5sim9"; }; uuid = "unredirect@vaina.lt"; diff --git a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix index 0e0dab64be165..90e8bffeec972 100644 --- a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix +++ b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, gettext, gnome3 }: +{ lib, stdenv, fetchgit, gettext, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-draw-on-your-screen"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A drawing extension for GNOME Shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ericdallo ahuzik ]; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix index 8cd567a590dbd..a994e427fb0e8 100644 --- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }: +{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-drop-down-terminal"; diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch b/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch index 3544c91ee8958..3544c91ee8958 100644 --- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch diff --git a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix index bf637ecab1830..f31e170b975dd 100644 --- a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix +++ b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3, glib }: +{ lib, stdenv, fetchFromGitHub, gnome, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-dynamic-panel-transparency"; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/ewlsh/dynamic-panel-transparency"; - broken = versionOlder gnome3.gnome-shell.version "3.36"; + broken = versionOlder gnome.gnome-shell.version "3.36"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix index 5470dc996be01..5470dc996be01 100644 --- a/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix +++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix index f30e2f6f8a250..f30e2f6f8a250 100644 --- a/pkgs/desktops/gnome-3/extensions/freon/default.nix +++ b/pkgs/desktops/gnome/extensions/freon/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix index f8a8803435baa..302b21f2aefc5 100755 --- a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix +++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, gnome3, glib }: +{ lib, stdenv, fetchFromGitLab, gnome, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-fuzzy-app-search"; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search"; - broken = versionOlder gnome3.gnome-shell.version "3.18"; + broken = versionOlder gnome.gnome-shell.version "3.18"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch b/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch index 1795f998c9bde..1795f998c9bde 100755 --- a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch +++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index cb8ece571e71b..c924b4e3eca05 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -12,14 +12,14 @@ , glib-networking , gtk3 , openssh -, gnome3 +, gnome , gjs , nixosTests }: stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "44"; + version = "46"; outputs = [ "out" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "C+8mhK4UOs2iZplDyY45bCX0mMGgwVV/ZfaPpYUlWxA="; + sha256 = "161379kipr6z6gbhchb5b17djrkg5fbvblyyabzkc2gv05r3h6fw"; }; patches = [ @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { gtk3 gsound gjs # for running daemon - gnome3.evolution-data-server # for libebook-contacts typelib + gnome.evolution-data-server # for libebook-contacts typelib ]; mesonFlags = [ - "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib" + "-Dgnome_shell_libdir=${gnome.gnome-shell}/lib" "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch index 58c02a92eb2ef..58c02a92eb2ef 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch +++ b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch b/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch index 78e1ad96d74c3..78e1ad96d74c3 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch +++ b/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch diff --git a/pkgs/desktops/gnome/extensions/hot-edge/default.nix b/pkgs/desktops/gnome/extensions/hot-edge/default.nix new file mode 100644 index 0000000000000..aaa5870996aba --- /dev/null +++ b/pkgs/desktops/gnome/extensions/hot-edge/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-hot-edge"; + version = "jdoda"; + + src = fetchFromGitHub { + owner = "jdoda"; + repo = "hotedge"; + rev = "bb7f651becea5287241caf7cda246a68ab07dac8"; + sha256 = "oeTs0kRan6b5relxzhK1IKbV0Yv2d5YdvvUPJ3fM9ik="; + }; + + dontBuild = true; + + uuid = "hotedge@jonathan.jdoda.ca"; + + installPhase = '' + runHook preInstall + install -Dt $out/share/gnome-shell/extensions/${uuid} extension.js metadata.json stylesheet.css + runHook postInstall + ''; + + meta = with lib; { + description = "Replace the top-left hot corner with a bottom hot edge"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ jtojnar ]; + homepage = "https://github.com/jdoda/hotedge"; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix index 00c67421e54a5..820d96988c9ab 100644 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-icon-hider"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { description = "Icon Hider is a GNOME Shell extension for managing status area items"; license = licenses.bsd3; maintainers = with maintainers; [ jonafato ]; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix index 82551efef3c78..82551efef3c78 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/pkgs/desktops/gnome/extensions/material-shell/default.nix index 87b9a3c1507c4..9b683c1af6b57 100644 --- a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/material-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gnome3 }: +{ stdenv, lib, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-material-shell"; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ benley ]; homepage = "https://github.com/material-shell/material-shell"; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; }; } diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix index 9ab2168d2dcac..8d9faaa89addd 100644 --- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple MPRIS indicator button for GNOME Shell"; license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; - platforms = gnome3.gnome-shell.meta.platforms; + maintainers = with maintainers; [ ]; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://github.com/JasonLG1979/gnome-shell-extension-mpris-indicator-button"; - broken = versionOlder gnome3.gnome-shell.version "3.34"; + broken = versionOlder gnome.gnome-shell.version "3.34"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix index f663aa8977b1c..fd0d2dbb57849 100644 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, glib, gnome3, unzip }: +{ lib, stdenv, fetchFromGitLab, glib, gnome, unzip }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip ]; - buildInputs = [ glib gnome3.gnome-shell ]; + buildInputs = [ glib gnome.gnome-shell ]; uuid = "nightthemeswitcher@romainvigier.fr"; diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index ad588be18ce9e..ad588be18ce9e 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch index fb2d3d57e51d3..fb2d3d57e51d3 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch +++ b/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix b/pkgs/desktops/gnome/extensions/noannoyance/default.nix index 4763d90575517..4763d90575517 100644 --- a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix +++ b/pkgs/desktops/gnome/extensions/noannoyance/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index 201628b4b424e..201628b4b424e 100644 --- a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index d16477403474b..93ffcda830a1e 100644 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, gnome3 }: +{ lib, stdenv, fetchFromGitHub, glib, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-pidgin-im-integration"; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix index e310f5dcf10c5..e310f5dcf10c5 100644 --- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index e58d8ce6e42f7..e58d8ce6e42f7 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch index 1971bf1e5e745..1971bf1e5e745 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index 3935150c57e54..e7b5e8a1a9c18 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: +{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./paths_and_nonexisting_dirs.patch; - clutter_path = gnome3.mutter.libdir; # this should not be used in settings but 🤷♀️ + clutter_path = gnome.mutter.libdir; # this should not be used in settings but 🤷♀️ gtop_path = "${libgtop}/lib/girepository-1.0"; glib_net_path = "${glib-networking}/lib/girepository-1.0"; }) diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch index 280af965af3f6..280af965af3f6 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch +++ b/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index 68d07e2d1429a..68d07e2d1429a 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch index 2ea54f4b0897d..2ea54f4b0897d 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix index dcea4c69ff82e..c1ca77d9d73f2 100644 --- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, glib, gnome3 }: +{ stdenv, lib, fetchFromGitHub, glib, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-tilingnome-unstable"; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ benley ]; homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome"; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; }; } diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome/extensions/timepp/default.nix index 94b8540c1bf32..cb4234a2513c2 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome/extensions/timepp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-timepp"; diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix index 084548e1a1053..084548e1a1053 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index 79d7a335239b7..1fbd31ec10a53 100644 --- a/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }: +{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/hardpixel/unite-shell"; - broken = versionOlder gnome3.gnome-shell.version "3.32"; + broken = versionOlder gnome.gnome-shell.version "3.32"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix index 42f226e96777c..0e71345bb8a7b 100644 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-corner-preview"; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; homepage = "https://github.com/medenagan/window-corner-preview"; - broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix index 3f0e9e71b571b..3f0e9e71b571b 100644 --- a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix +++ b/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix index eb1d6e7e319c6..eb1d6e7e319c6 100644 --- a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix +++ b/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome/find-latest-version.py index ad80af24bcb8a..3078999e3e5bf 100644 --- a/pkgs/desktops/gnome-3/find-latest-version.py +++ b/pkgs/desktops/gnome/find-latest-version.py @@ -3,14 +3,21 @@ import math import json import requests import sys +from libversion import Version +from typing import Optional def version_to_list(version): return list(map(int, version.split("."))) -def odd_unstable(version_str, selected): - version = version_to_list(version_str) +def odd_unstable(version: Version, selected): + try: + version = version_to_list(version.value) + except: + # Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release. + return selected != "stable" + if len(version) < 2: return True @@ -23,28 +30,34 @@ def odd_unstable(version_str, selected): return True -def no_policy(version, selected): +def tagged(version: Version, selected): + if selected == "stable": + return not ("alpha" in version.value or "beta" in version.value or "rc" in version.value) + else: + return True + + +def no_policy(version: Version, selected): return True version_policies = { "odd-unstable": odd_unstable, + "tagged": tagged, "none": no_policy, } -def make_version_policy(version_predicate, selected, upper_bound): +def make_version_policy(version_predicate, selected, upper_bound: Optional[Version]): if not upper_bound: - upper_bound = [math.inf, math.inf] + return lambda version: version_predicate(version, selected) else: - upper_bound = version_to_list(upper_bound) - - return lambda version: version_predicate(version, selected) and version_to_list(version) < upper_bound + return lambda version: version_predicate(version, selected) and version < upper_bound parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.") parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.") -parser.add_argument("version-policy", help="Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="odd-unstable") +parser.add_argument("version-policy", help="Policy determining which versions are considered stable. GNOME packages usually denote stability by alpha/beta/rc tag in the version. For older packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="tagged") parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable") parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).") @@ -55,6 +68,8 @@ if __name__ == "__main__": package_name = getattr(args, "package-name") requested_release = getattr(args, "requested-release") upper_bound = getattr(args, "upper-bound") + if upper_bound: + upper_bound = Version(upper_bound) version_predicate = version_policies[getattr(args, "version-policy")] version_policy = make_version_policy(version_predicate, requested_release, upper_bound) @@ -64,11 +79,11 @@ if __name__ == "__main__": print("Unknown format of cache.json file.", file=sys.stderr) sys.exit(1) - versions = cache[2][package_name] - versions = sorted(filter(version_policy, versions), key=version_to_list) + versions = map(Version, cache[2][package_name]) + versions = sorted(filter(version_policy, versions)) if len(versions) == 0: print("No versions matched.", file=sys.stderr) sys.exit(1) - print(versions[-1]) + print(versions[-1].value) diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index bb513df4c7a90..8893846698e80 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , pkg-config -, gnome3 +, gnome , itstool , gtk3 , wrapGAppsHook @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index 802d92bf19a0a..43d9aaa7680c5 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 -, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }: +, gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }: let pname = "atomix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ]; - buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py @@ -21,9 +21,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome/games/five-or-more/default.nix index 9f6ea6aac04c4..f01d137979ec1 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gtk3, wrapGAppsHook , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { vala ]; buildInputs = [ - gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme + gtk3 librsvg libgnome-games-support gnome.adwaita-icon-theme ]; postPatch = '' @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "five-or-more"; - attrPath = "gnome3.five-or-more"; + attrPath = "gnome.five-or-more"; }; }; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome/games/four-in-a-row/default.nix index 17dc8fe7c2c7a..2c6899ee1aa90 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook gettext meson itstool vala ninja python3 desktop-file-utils ]; - buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gsound librsvg gnome.adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "four-in-a-row"; - attrPath = "gnome3.four-in-a-row"; + attrPath = "gnome.four-in-a-row"; }; }; diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix new file mode 100644 index 0000000000000..c632bce407bc4 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, vala +, pkg-config +, wrapGAppsHook4 +, gobject-introspection +, gettext +, itstool +, libxml2 +, python3 +, gnome +, glib +, gtk4 +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "gnome-chess"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk"; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + gettext + itstool + libxml2 + python3 + wrapGAppsHook4 + gobject-introspection + ]; + + buildInputs = [ + glib + gtk4 + librsvg + gnome.adwaita-icon-theme + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-chess"; + attrPath = "gnome.gnome-chess"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Chess"; + description = "Play the classic two-player boardgame of chess"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix index fe1f092fbf0f7..bb4cdae8fa358 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +{ lib, stdenv, fetchurl, pkg-config, vala, gnome, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support , meson, ninja, python3 }: let pname = "gnome-klotski"; - version = "3.38.1"; + version = "3.38.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00rwi6z0068pbq01sq2d389ffcqsh3ylq3i8zkrqvblqid1hvnlv"; + sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi"; }; nativeBuildInputs = [ pkg-config vala meson ninja python3 wrapGAppsHook gettext itstool libxml2 appstream-glib desktop-file-utils - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; @@ -27,9 +27,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index d5d2de53e47cc..7ef68e470e1d6 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , librsvg, gettext, itstool, libxml2 , meson, ninja, glib, vala, desktop-file-utils }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja vala desktop-file-utils - pkg-config gnome3.adwaita-icon-theme + pkg-config gnome.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook glib # for glib-compile-schemas ]; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix index 600b0d9846813..6a7168badbfee 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome, gtk3, wrapGAppsHook , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { pname = "gnome-mines"; - version = "3.36.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0m2680r94nk61imym4x73j03jwfjd8cxm592m5ybiqdfdw6i723i"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z"; }; # gobject-introspection for finding vapi files @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meson ninja vala gobject-introspection pkg-config gettext itstool python3 libxml2 wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; + buildInputs = [ gtk3 librsvg gnome.adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-mines"; - attrPath = "gnome3.gnome-mines"; + attrPath = "gnome.gnome-mines"; }; }; diff --git a/pkgs/desktops/gnome/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix new file mode 100644 index 0000000000000..34b50f2244fa9 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, clutter-gtk +, gettext +, itstool +, vala +, python3 +, libxml2 +, libgee +, libgnome-games-support +, meson +, ninja +, desktop-file-utils +, hicolor-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "gnome-nibbles"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5"; + }; + + patches = [ + # Fix build with recent Vala. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/62964e9256fcac616109af874dbb2bd8342a9853.patch"; + sha256 = "4VijELRxycS8rwi1HU9U3h9K/VtdQjJntfdtMN9Uz34="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch"; + sha256 = "X0+Go5ae4F06WTPDYc2HIIax8X4RDgUGO6A6Qp8UifQ="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + vala + python3 + pkg-config + wrapGAppsHook + gettext + itstool + libxml2 + desktop-file-utils + hicolor-icon-theme + ]; + + buildInputs = [ + gtk3 + librsvg + gsound + clutter-gtk + gnome.adwaita-icon-theme + libgee + libgnome-games-support + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-nibbles"; + attrPath = "gnome.gnome-nibbles"; + }; + }; + + meta = with lib; { + description = "Guide a worm around a maze"; + homepage = "https://wiki.gnome.org/Apps/Nibbles"; + license = licenses.gpl2; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-robots/default.nix b/pkgs/desktops/gnome/games/gnome-robots/default.nix new file mode 100644 index 0000000000000..c9f7cbfc213be --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-robots/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, gettext +, itstool +, libxml2 +, libgnome-games-support +, libgee +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, adwaita-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "gnome-robots"; + version = "40.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "04fbykj576dq1h6cycgfhh8wd6yxmlsqykvj188sbwahay42zgvg"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + vala + python3 + libxml2 + wrapGAppsHook + gettext + itstool + desktop-file-utils + ]; + + buildInputs = [ + gtk3 + librsvg + gsound + libgnome-games-support + libgee + adwaita-icon-theme + ]; + + postPatch = '' + chmod +x build-aux/meson_post_install.py + patchShebangs build-aux/meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-robots"; + attrPath = "gnome.gnome-robots"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Robots"; + description = "Avoid the robots and make them crash into each other"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 7c5fd8f1ac9a7..3bd0ec3b3cdf2 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome, wrapGAppsHook , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "3.38.0"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cpxx63liczmax6ry06r5k0f221xpg2rqh49vkdj2snmqq61swrq"; + url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1nr1g4q1gxqbzmaz15y3zgssnj7w01cq9l422ja4rglyg0fwjhbm"; }; nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-sudoku"; - attrPath = "gnome3.gnome-sudoku"; + attrPath = "gnome.gnome-sudoku"; }; }; diff --git a/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/pkgs/desktops/gnome/games/gnome-taquin/default.nix new file mode 100644 index 0000000000000..c3e78ff201446 --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gsound +, gettext +, itstool +, libxml2 +, meson +, ninja +, vala +, python3 +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "gnome-taquin"; + version = "3.38.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; + }; + + patches = [ + # Fix build with recent Vala. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch"; + sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/66be44dc20d114e449fc33156e3939fd05dfbb16.patch"; + sha256 = "RN41RCLHlJyXTARSH9qjsmpYi1UFeMRssoYxRsbngDQ="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + meson + ninja + python3 + gettext + itstool + libxml2 + vala + desktop-file-utils + ]; + buildInputs = [ + gtk3 + librsvg + gsound + gnome.adwaita-icon-theme + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-taquin"; + attrPath = "gnome.gnome-taquin"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Taquin"; + description = "Move tiles so that they reach their places"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 9ae7377379933..a1cdf98d9a155 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , libxml2, gettext, itstool, meson, ninja, python3 , vala, desktop-file-utils }: @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; }; + updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; }; }; nativeBuildInputs = [ - wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme + wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme pkg-config gettext meson ninja python3 vala desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix index 8369c571f5419..1dc07bae26b12 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , cairo @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome/games/iagno/default.nix index db3b0d211512c..d7e3930eae1ec 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome/games/iagno/default.nix @@ -3,7 +3,7 @@ , fetchpatch , pkg-config , gtk3 -, gnome3 +, gnome , gdk-pixbuf , librsvg , wrapGAppsHook @@ -26,6 +26,20 @@ stdenv.mkDerivation rec { sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; }; + patches = [ + # Fix build with recent Vala. + # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/e8a0aeec350ea80349582142c0e8e3cd3f1bce38.patch"; + sha256 = "OO1x0Yx56UFzHTBsPAMYAjnJHlnTjdO1Vk7q6XU8wKQ="; + }) + # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/13 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/508c0f94e5f182e50ff61be6e04f72574dee97cb.patch"; + sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -40,16 +54,16 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gdk-pixbuf librsvg gsound ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "iagno"; - attrPath = "gnome3.iagno"; + attrPath = "gnome.iagno"; }; }; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome/games/lightsoff/default.nix index 6783147840c71..94b71f0e8568c 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook +{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib , meson, ninja, python3 }: stdenv.mkDerivation rec { pname = "lightsoff"; - version = "3.38.0"; + version = "40.0.1"; src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dpnnw8v1yk1p0y08f9c9xkgswqlm8x83dfn96798nif2zbypdnh"; + url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1aziy64g15bm83zfn3ifs20z9yvscdvsxbx132xnq77i0r3qvlxc"; }; nativeBuildInputs = [ vala pkg-config wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "lightsoff"; - attrPath = "gnome3.lightsoff"; + attrPath = "gnome.lightsoff"; }; }; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome/games/quadrapassel/default.nix index de3d67b58bffc..d54c49eafee28 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf , librsvg, gsound, libmanette , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook , meson, ninja, python3, vala, desktop-file-utils @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja python3 vala desktop-file-utils - pkg-config gnome3.adwaita-icon-theme + pkg-config gnome.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome/games/swell-foop/default.nix b/pkgs/desktops/gnome/games/swell-foop/default.nix new file mode 100644 index 0000000000000..50fab598153ad --- /dev/null +++ b/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, vala +, glib +, gtk3 +, libgnome-games-support +, gnome +, desktop-file-utils +, clutter +, clutter-gtk +, gettext +, itstool +, libxml2 +, wrapGAppsHook +, python3 +}: + +stdenv.mkDerivation rec { + pname = "swell-foop"; + version = "40.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1"; + }; + + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + wrapGAppsHook + python3 + itstool + gettext + libxml2 + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk3 + libgnome-games-support + gnome.adwaita-icon-theme + clutter + clutter-gtk + ]; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; + description = "Puzzle game, previously known as Same GNOME"; + maintainers = teams.gnome.members; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index b9409605f2478..3e2abc8730468 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf , librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook , meson, ninja, python3, desktop-file-utils }: stdenv.mkDerivation rec { pname = "tali"; - version = "3.38.3"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/tali/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "AhVCi1DEoIJ/sN4uTmum5WZ4+bp22NJbfuyoUhXyWjk="; + url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "19gic6yjg3bg6jf87zvhm7ihsz1y58dz86p4x3a16xdhjyrk40q2"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; }; + updateScript = gnome.updateScript { packageName = "tali"; attrPath = "gnome.tali"; }; }; nativeBuildInputs = [ meson ninja python3 desktop-file-utils - pkg-config gnome3.adwaita-icon-theme + pkg-config gnome.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ]; diff --git a/pkgs/desktops/gnome-3/installer.nix b/pkgs/desktops/gnome/installer.nix index 4999e1f3343cf..4999e1f3343cf 100644 --- a/pkgs/desktops/gnome-3/installer.nix +++ b/pkgs/desktops/gnome/installer.nix diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index ff97d34f7ce45..37eca7ccc729f 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , gtk3 @@ -15,6 +16,7 @@ , libsecret , gmime3 , isocodes +, icu , libxml2 , gettext , sqlite @@ -22,12 +24,12 @@ , json-glib , itstool , libgee -, gnome3 +, gnome , webkitgtk , python3 , gnutls , cacert -, xvfb_run +, xvfb-run , glibcLocales , dbus , shared-mime-info @@ -37,6 +39,7 @@ , gobject-introspection , gspell , appstream-glib +, libstemmer , libytnef , libhandy , gsound @@ -44,18 +47,13 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.38.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik"; }; - patches = [ - # Longer timeout for client test. - ./Bump-client-test-timeout-to-300s.patch - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -84,12 +82,14 @@ stdenv.mkDerivation rec { gspell gtk3 isocodes + icu json-glib libgee libhandy libpeas libsecret libunwind + libstemmer libytnef sqlite webkitgtk @@ -99,12 +99,13 @@ stdenv.mkDerivation rec { dbus gnutls # for certtool cacert # trust store for glib-networking - xvfb_run + xvfb-run glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation ]; mesonFlags = [ - "-Dcontractor=true" # install the contractor file (Pantheon specific) + "-Dprofile=release" + "-Dcontractor=enabled" # install the contractor file (Pantheon specific) ]; # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: @@ -118,21 +119,23 @@ stdenv.mkDerivation rec { patchShebangs build-aux/yaml_to_json.py chmod +x desktop/geary-attach - - # Drop test that breaks after webkitgtk 2.32.0 update - # https://gitlab.gnome.org/GNOME/geary/-/issues/1180 - sed -i '/add_test("edit_context_font", edit_context_font);/d' test/js/composer-page-state-test.vala ''; - doCheck = true; + # Some tests time out. + doCheck = false; checkPhase = '' + runHook preCheck + NO_AT_BRIDGE=1 \ GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules \ + HOME=$TMPDIR \ XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test -v --no-stdsplit + + runHook postCheck ''; preFixup = '' @@ -141,9 +144,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome/misc/gitg/default.nix index 0f4f8e67737ae..8f73bdaeb7da3 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome/misc/gitg/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , vala , gettext , pkg-config @@ -15,7 +15,7 @@ , gtksourceview , gsettings-desktop-schemas , adwaita-icon-theme -, gnome3 +, gnome , gtkspell3 , shared-mime-info , libgee @@ -36,16 +36,16 @@ stdenv.mkDerivation rec { sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; }; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - - substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" - ''; - - doCheck = true; - - enableParallelBuilding = true; + nativeBuildInputs = [ + gobject-introspection + gettext + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; buildInputs = [ adwaita-icon-theme @@ -63,16 +63,14 @@ stdenv.mkDerivation rec { libsoup ]; - nativeBuildInputs = [ - gobject-introspection - gettext - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook - ]; + doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + + substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" + ''; preFixup = '' gappsWrapperArgs+=( @@ -82,7 +80,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -91,7 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Gitg"; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix index 1947179028bf2..d414266a9d9e8 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -16,17 +16,18 @@ , adwaita-icon-theme , libgweather , gucharmap +, tracker , polkit -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.38.0"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04qrzycwm7pz556agl08xw3d0r1mmr4ja9n9jfijjxs9inrhp5yc"; + sha256 = "1k6mdkg16ia29fyg8ikf4dfs51gnrmg0f8xwpvd3192lhfsbsh19"; }; nativeBuildInputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme libgweather gucharmap - # tracker # Tracker 3 not supported. + tracker polkit wirelesstools linuxPackages.cpupower @@ -62,9 +63,10 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 2d66dabb5a086..8a74c05dfea2a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, gnome3 +, gnome , gtk3 , glib , gobject-introspection @@ -11,17 +11,17 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.3.1"; + version = "0.3.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f"; + sha256 = "0wkwix44yg126xn1v4f2j60bv9yiyadfpzf8ifx0bvd9x5f4v354"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; }; + updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; }; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 935778aa6490b..7e578f27cd29f 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -7,7 +7,7 @@ , gnome-desktop , gnome-panel , gnome-session -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , ibus @@ -30,7 +30,7 @@ }: let pname = "gnome-flashback"; - version = "3.38.0"; + version = "3.40.0"; # From data/sessions/Makefile.am requiredComponentsCommon = [ @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1r51yqdqichp4jv54kiaqrh0xhykngr4ymlvrkjhzdhivwadsg4m"; + sha256 = "0fxv13m2q9z1q3i9jbggl35cb7jlckbdrfsr5sf030hr1w836gz0"; }; # make .desktop Execs absolute @@ -120,9 +120,10 @@ let PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; mkSessionForWm = { wmName, wmLabel, wmCommand }: diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix index 53be2df471b4e..6e0aa78e6fdaf 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome3, packagekit, polkit +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome, packagekit, polkit , gtk3, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-packagekit"; - attrPath = "gnome3.gnome-packagekit"; + attrPath = "gnome.gnome-packagekit"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index b820f7750dc06..4e42f91e1e3cb 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -8,7 +8,7 @@ , glib , gnome-desktop , gnome-menus -, gnome3 +, gnome , gtk3 , itstool , libgweather @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-GosVrvCgKmyqm5IJyNP7Q+e5h6OAB2aRwj8DFOwwLxU="; + hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs="; }; # make .desktop Exec absolute @@ -82,9 +82,10 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch b/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch index 81e037ee690de..81e037ee690de 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch +++ b/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index b6a12fca13349..460ab47733ca3 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -5,12 +5,12 @@ , gdk-pixbuf , gettext , glib -, gnome3 +, gnome , gobject-introspection , gsettings-desktop-schemas , gtk3 , itstool -, libhandy_0 +, libhandy , libnotify , libsoup , libxml2 @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "3.34.1"; + version = "40.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "+V8/4DGwsBwC95oWWfiJFS03cq4+RN+EA9FGC6Xuw2o="; }; nativeBuildInputs = [ @@ -43,15 +43,15 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome3.gnome-desktop - gnome3.gnome-settings-daemon - gnome3.gnome-shell + gnome.gnome-desktop + gnome.gnome-settings-daemon + gnome.gnome-shell # Makes it possible to select user themes through the `user-theme` extension - gnome3.gnome-shell-extensions - gnome3.mutter + gnome.gnome-shell-extensions + gnome.mutter gsettings-desktop-schemas gtk3 - libhandy_0 + libhandy libnotify libsoup ]; @@ -65,17 +65,17 @@ python3Packages.buildPythonApplication rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; meta = with lib; { - homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"; + homepage = "https://wiki.gnome.org/Apps/Tweaks"; description = "A tool to customize advanced GNOME 3 options"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index 7dbf6daffa7f2..15fcfbfe390a3 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.38.6"; + version = "3.40.2"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-6CIzOBq/Y9XKiv/lQAtDYK6bxhT1WxjbXhu4+noO5nI="; + sha256 = "sha256-DUikcnkDBRkCwPLrl8lkNr+SeNpc3bPwPTWRn91nOo4="; }; patches = [ diff --git a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch index c8a3fad2272b0..46e30ce2e2cb1 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch +++ b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch @@ -17,7 +17,7 @@ +imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); + - const { GPaste } = imports.gi; + //const { GPaste } = imports.gi; const ExtensionUtils = imports.misc.extensionUtils; --- a/src/libgpaste/settings/gpaste-settings.c diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome/misc/gtkhtml/default.nix index cc054a983c633..88fb31c4333b2 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome/misc/gtkhtml/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, intltool -, gnome3, enchant, isocodes, gsettings-desktop-schemas }: +, gnome, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gtkhtml"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gtkhtml"; attrPath = "gnome3.gtkhtml"; }; + updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme + buildInputs = [ gtk3 intltool gnome.adwaita-icon-theme gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix index 01899d20b5774..dd65f858b6dea 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix @@ -6,7 +6,7 @@ , libgee , gettext , vala -, gnome3 +, gnome , libintl , meson , ninja @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "libgnome-games-support"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pdk9hc30xdlv0ba24f7pvcr2d5370zykrmpws7hgmjgl4wfbpdb"; + sha256 = "0gs1k88wwafn5cdyb5yq1cxpi9azachb0ysxgwh15sx77g6plyy3"; }; nativeBuildInputs = [ @@ -41,9 +41,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index c74d57d9f4ddd..702b7ffb38bba 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -2,7 +2,7 @@ , fetchurl , gettext , glib -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , xorg @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.38.0"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1b0i9sq6qa540f2006cv1p8i6lxg1h6w00apxwzwjpfqn0hk26c1"; + sha256 = "1d8mj2nshijshfiaica8dirfws1p6i9631frq7q23b3y91jiyk12"; }; patches = [ @@ -55,9 +55,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch b/pkgs/desktops/gnome/misc/metacity/fix-paths.patch index ff3a244e67d97..ff3a244e67d97 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch +++ b/pkgs/desktops/gnome/misc/metacity/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix index 4db81228a0734..40c1d4c767af0 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix @@ -9,7 +9,7 @@ , ncurses , nautilus , gtk3 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -46,9 +46,10 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix index ae52c41787be6..830900ed8c926 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { This GNOME utility helps to manage time according to Pomodoro Technique. It intends to improve productivity and focus by taking short breaks. ''; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome/update.nix index 1bceddf77eb5b..928eac45160ab 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome/update.nix @@ -1,8 +1,8 @@ { stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }: -{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable", freeze ? false }: +{ packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }: let - python = python3.withPackages (p: [ p.requests ]); + python = python3.withPackages (p: [ p.requests p.libversion ]); upperBoundFlag = let package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 6ac9c3864abd6..8c6df49fd1276 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +, libXdamage, libXpresent, libstartup_notification, gnome, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libXpresent libstartup_notification gtk3 - gnome3.zenity + gnome.zenity mate-settings-daemon ]; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 1046e431a3b8b..ccd20a6b875a0 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3 +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck3 , libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook , mateUpdateScript }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 gtksourceview3 - gnome3.gucharmap + gnome.gucharmap libwnck3 libgtop libxml2 diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index b1b59dc6402cb..62e0b5b3195b5 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-desktop"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 3a99538d92984..fd7b19e1de37e 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libxml2 libcanberra-gtk3 gtk3 - gnome3.libgnome-keyring + gnome.libgnome-keyring libnotify dbus-glib upower diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 4c98c9cf5207e..5e226f4d88691 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: +, gnome, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { python3 gtksourceview3 libpeas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 1c86de616077a..a3e75d231f196 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -37,9 +37,18 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-8r0DlmG8xlCQ1uFHZQjXG2ls4VBrsRzrVY8Ey3/OYAU="; + sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI="; }; + patches = [ + # Allow build with appstream 0.14.x + # https://github.com/elementary/appcenter/pull/1493 + (fetchpatch { + url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch"; + sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index f9ab49a72b953..cf0d0d812fe14 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -18,6 +18,7 @@ , python3 , libnotify , libical +, libgdata , evolution-data-server , appstream-glib , elementary-icon-theme @@ -67,6 +68,7 @@ stdenv.mkDerivation rec { libgee libical libnotify + libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 7339038b08090..e8b10227eaa42 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -39,6 +40,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-4AEayj+K/lOW6jEYmvmdan1kTqqqLL1YzwcU7/3PH5U="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/code/commit/c50580d3336296823da9a2c50b824f21fde50286.patch"; + sha256 = "F+ZYlnZWYCU68G4oayLfbTnvSnTb4YA0zHVGD/Uf3KA="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 24eafcabdea08..5a5c314b3e9b6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -41,6 +42,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/music/commit/9ed3bbb3a0d68e289a772b4603f58e52a4973316.patch"; + sha256 = "fFO97SQzTc2fYFJFGfFPSUCdkCgZxfX1fjDQ7GH4BUs="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index ca0b3951351f5..7280051361a9b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -45,6 +46,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-bTk4shryAWWMrKX3mza6xQ05qpBPf80Ey7fmYgKLUiY="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/photos/commit/27e529fc96da828982563e2e19a6f0cef883a29e.patch"; + sha256 = "w39wh45VHggCs62TN6wpUEyz/hJ1y7qL1Ox+sp0Pt2s="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 06d8041339db5..7387ea34e4de6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-tnAJyyPN/Xy1pmlgBpgO2Eb5CeHrRltjQTHmuTPBt8s="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-printers/commit/5eced5ddda6f229d7265ea0a713f6c1cd181a526.patch"; + sha256 = "lPTNqka6jjvv1JnAqVzVIQBIdDXlCOQ5ASvgZNuEUC8="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 6a18f6b6e2327..26e26de33b121 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-Sws6FqUL7QAROInDrcqYAp6j1TCC4aGV0/hi5Kmm5wQ="; }; + patches = [ + # Fix build with latest Vala. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/c8e422e630bbee0badcf4df26364c9e83e06bad0.patch"; + sha256 = "5Gm+muZiCraJC5JaGVVo0HDJ7KxjOpclHRW1RKsk3bc="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index e5182807b3f78..82d6a87b10905 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, gnome3 }: +{ config, pkgs, lib, gnome }: lib.makeScope pkgs.newScope (self: with self; { @@ -23,9 +23,9 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-session wingpanel-indicator-sound ]; - maintainers = with pkgs.lib.maintainers; [ worldofpeace ]; + maintainers = with pkgs.lib.maintainers; [ ]; - mutter = pkgs.gnome3.mutter334; + mutter = pkgs.gnome.mutter334; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; @@ -72,17 +72,17 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; elementary-session-settings = callPackage ./desktop/elementary-session-settings { - inherit (gnome3) gnome-session gnome-keyring; + inherit (gnome) gnome-session gnome-keyring; }; elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { }; extra-elementary-contracts = callPackage ./desktop/extra-elementary-contracts { - inherit (gnome3) file-roller gnome-bluetooth; + inherit (gnome) file-roller gnome-bluetooth; }; gala = callPackage ./desktop/gala { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; wingpanel = callPackage ./desktop/wingpanel { }; @@ -109,7 +109,7 @@ lib.makeScope pkgs.newScope (self: with self; { # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 # Take note of "I am holding off on "fixing" this bug for as long as possible." elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; @@ -169,7 +169,7 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { }; switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index c4e070aeacb99..03954fac64489 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -15,6 +15,7 @@ , libgee , libxml2 , libsoup +, libgdata , elementary-calendar }: @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { libical libsoup wingpanel + libgdata # required by some dependency transitively ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index a37e43cd35516..43fd7a69e8ad3 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -2,10 +2,11 @@ , substituteAll , fetchurl , fetchgit +, fetchpatch , meson , ninja , pkg-config -, gnome3 +, gnome , perl , gettext , gtk3 @@ -73,6 +74,20 @@ stdenv.mkDerivation rec { #"${patchPath}/ubuntu_ibus_configs.patch" # https://github.com/elementary/os-patches/blob/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch ./elementary-dpms.patch + + # Query GWeather DB on the fly instead of caching. + # Needed for the next patch to apply. + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/merge_requests/175 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/df6c69f028d27b53ac86829e11df103b25ed5a74.patch"; + sha256 = "bKZkPzN64DXMgitjn0vUzUvKl7ldhN/mNVtPKVmHd0Q="; + }) + # Adjust to libgweather changes. + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch"; + sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg="; + }) ]; nativeBuildInputs = [ @@ -137,7 +152,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = repoName; attrPath = "pantheon.${pname}"; }; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 1b7877cd79da3..6ccd2a0c6124b 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -80,7 +80,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-terminal = callPackage ./applications/xfce4-terminal { }; xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { - inherit (pkgs.gnome3) libsoup; + inherit (pkgs.gnome) libsoup; }; xfdashboard = callPackage ./applications/xfdashboard {}; @@ -211,7 +211,7 @@ lib.makeScope pkgs.newScope (self: with self; { libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library"; xinitrc = xfce4-session.xinitrc; inherit (pkgs.gnome2) libglade; - inherit (pkgs.gnome3) vte gtksourceview; + inherit (pkgs.gnome) vte gtksourceview; xfce4-mixer-pulse = xfce4-mixer; thunar-bare = thunar.override { thunarPlugins = []; diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix deleted file mode 100644 index d39aa2806a454..0000000000000 --- a/pkgs/development/compilers/avian/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }: - -stdenv.mkDerivation rec { - pname = "avian"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "readytalk"; - repo = "avian"; - rev = "v${version}"; - sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48"; - }; - - buildInputs = [ zlib jdk ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Foundation ]; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - postPatch = '' - substituteInPlace makefile \ - --replace 'g++' 'c++' \ - --replace 'gcc' 'cc' - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/*/avian $out/bin/ - cp build/*/avian-dynamic $out/bin/ - ''; - - meta = { - description = "Lightweight Java virtual machine"; - longDescription = '' - Avian is a lightweight virtual machine and class library designed - to provide a useful subset of Java’s features, suitable for - building self-contained applications. - ''; - homepage = "https://readytalk.github.io/avian/"; - license = lib.licenses.isc; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.earldouglas ]; - }; -} diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 611efb11f4450..4679e01e9002c 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -27,6 +27,33 @@ let param = { }; "3.8" = { sha256 = "1gzlyxvw64ca12qql3wnq3bidcx9ygsklv9grjma3ib4hvg7vnr7"; + patches = [ + # Support for Coq 8.12.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/06956421b4307054af221c118c5f59593c0e67b9.patch"; + sha256 = "1f90q6j3xfvnf3z830bkd4d8526issvmdlrjlc95bfsqs78i1yrl"; + }) + # Support for Coq 8.13.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/0895388e7ebf9c9f3176d225107e21968919fb97.patch"; + sha256 = "0qhkzgb2xl5kxys81pldp3mr39gd30lvr2l2wmplij319vp3xavd"; + }) + # Support for Coq 8.13.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/6bf310dd678285dc193798e89fc2c441d8430892.patch"; + sha256 = "026ahhvpj5pksy90f8pnxgmhgwfqk4kwyvcf8x3dsanvz98d4pj5"; + }) + # Drop support for Coq < 8.9 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/7563a5df926a4c6fb1489a7a4c847641c8a35095.patch"; + sha256 = "05vkslzy399r3dm6dmjs722rrajnyfa30xsyy3djl52isvn4gyfb"; + }) + # Support for Coq 8.13.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/48bc183167c4ce01a5c9ea86e49d60530adf7290.patch"; + sha256 = "0j62lppfk26d1brdp3qwll2wi4gvpx1k70qivpvby5f7dpkrkax1"; + }) + ]; useExternalFlocq = true; }; }."${version}"; in diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 02373d00b10fd..13eba00fae6b5 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -31,6 +31,8 @@ let else "${lib.getLib glibc}/lib/ld-linux*"; + downloadsUrl = "https://downloads.haskell.org/ghc"; + in stdenv.mkDerivation rec { @@ -41,23 +43,23 @@ stdenv.mkDerivation rec { # https://downloads.haskell.org/~ghc/8.10.2/ src = fetchurl ({ i686-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; sha256 = "0bvwisl4w0z5z8z0da10m9sv0mhm9na2qm43qxr8zl23mn32mblx"; }; x86_64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz"; sha256 = "0chnzy9j23b2wa8clx5arwz8wnjfxyjmz9qkj548z14cqf13slcl"; }; armv7l-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz"; sha256 = "1j41cq5d3rmlgz7hzw8f908fs79gc5mn3q5wz277lk8zdf19g75v"; }; aarch64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; sha256 = "14smwl3741ixnbgi0l51a7kh7xjkiannfqx15b72svky0y4l3wjw"; }; x86_64-darwin = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "1hngyq14l4f950hzhh2d204ca2gfc98pc9xdasxihzqd1jq75dzd"; }; }.${stdenv.hostPlatform.system} @@ -212,11 +214,12 @@ stdenv.mkDerivation rec { enableShared = true; }; - meta = { + meta = rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; license = lib.licenses.bsd3; platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms; maintainers = with lib.maintainers; [ lostnet ]; }; } diff --git a/pkgs/development/compilers/ghc/8.10.4.nix b/pkgs/development/compilers/ghc/8.10.4.nix index 075e9bf9d5480..da957f93520b2 100644 --- a/pkgs/development/compilers/ghc/8.10.4.nix +++ b/pkgs/development/compilers/ghc/8.10.4.nix @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index ca984c36957df..092511ba6d783 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -28,6 +28,8 @@ let else "${lib.getLib glibc}/lib/ld-linux*"; + downloadsUrl = "https://downloads.haskell.org/ghc"; + in stdenv.mkDerivation rec { @@ -39,22 +41,22 @@ stdenv.mkDerivation rec { src = fetchurl ({ i686-linux = { # Don't use the Fedora27 build (as below) because there isn't one! - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w"; }; x86_64-linux = { # This is the Fedora build because it links against ncurses6 where the # deb9 one links against ncurses5, see here # https://github.com/NixOS/nixpkgs/issues/85924 for a discussion - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; sha256 = "18dlqm5d028fqh6ghzn7pgjspr5smw030jjzl3kq6q1kmwzbay6g"; }; aarch64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq"; }; x86_64-darwin = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; + url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz"; }; }.${stdenv.hostPlatform.system} @@ -171,6 +173,9 @@ stdenv.mkDerivation rec { enableShared = true; }; - meta.license = lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + meta = rec { + license = lib.licenses.bsd3; + platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms; + }; } diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 9bef190ad1c38..b0336ad3992d9 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -18,7 +18,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index 83f3534d3e4a6..58beef5d6882e 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -19,7 +19,7 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 3ba88763117d3..74e03550255ac 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -22,7 +22,7 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. @@ -38,7 +38,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.11.20200824" +, version ? "9.3.20210504" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -110,8 +110,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "3f50154591ada9064351ccec4adfe6df53ca2439"; - sha256 = "1w2p5bc74aswspzvgvrhcb95hvj5ky38rgqqjvrri19z2qyiky6d"; + rev = "049c3a83fbce67e58e70c727d89e8331608a4e04"; + sha256 = "0dk7c9ywam9fj33lqzpwxhiwz017m58j6ixvc8b07kzp7kskaxq7"; }; enableParallelBuilding = true; @@ -139,6 +139,9 @@ stdenv.mkDerivation (rec { export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + # otherwise haddock fails when generating the compiler docs + export LANG=C.UTF-8 + echo -n "${buildMK dontStrip}" > mk/build.mk echo ${version} > VERSION echo ${src.rev} > GIT_COMMIT_ID diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 474a960d35f26..7bce45c455f2f 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.14.4"; + version = "0.15.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iW4mH9zLJzD+E+H/b0NAbPWzfSbDmRpirDwrLlyZppI="; + sha256 = "sha256-vBxVGIgg2BpVvEYjmX99YSf1zy9aWOHr6ftaYxJWkzY="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-ErLwrve2Fpyg9JaH3y7VIYuFcOPVP++XAIrRvv5dGm0="; + cargoSha256 = "sha256-2zHc7xk5MuEUO9YGifSWbgRTi51ZUk84QLro94LsBtQ="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 7f7870b7e06da..1aa0ec030174c 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -11,7 +11,7 @@ let inherit (lib) optionals optionalString; - version = "1.15.11"; + version = "1.15.12"; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1rb1s130yqy80kcl140k5a53xhvw4fmrpmclvqygcv67si0j8nzj"; + sha256 = "sha256-HGkRk330onf6dOe378PQhZRJjExK3AtsSuNWYTdSgJE="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index f82a0d72b7adf..219f19ad27c70 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -11,7 +11,7 @@ let inherit (lib) optionals optionalString; - version = "1.16.3"; + version = "1.16.4"; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-spjSnekjbKR6Aj44IxO8wtLu0x36cGtgoEEDzoOnGiU="; + sha256 = "sha256-rk9rbioWd9MYF5hGVadiB0tTVtpQ+1hyK5kQSHDUNQM="; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 9154b7d76a641..8a34c6166fa81 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, unzip }: -let - version = "1.4.21"; -in stdenv.mkDerivation { - inherit version; +stdenv.mkDerivation rec { pname = "kotlin"; + version = "1.4.32"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1ixnwrvgs14f9160d9d69r7w2dfp5cdwiwpk1ky0ps8nly8hjwj6"; + hash = "sha256-3+8ju4a9XzYWbU7BJnyN5Ts4J8RG1U6CMixrbarTWUw="; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ponyc/pony-corral.nix b/pkgs/development/compilers/ponyc/pony-corral.nix index 8910d7f1e6109..e9473b81f4848 100644 --- a/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/pkgs/development/compilers/ponyc/pony-corral.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( rec { pname = "corral"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "sha256-YJZ1jGMOeZKGZaTrWO2mtR94F0voC2DXaghi0LytF7I="; + sha256 = "sha256-mQ/SxnppChZ+6PKVo5VM+QiNn94F4qJT1kQSrwXTa7k="; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index b56f509b31aa8..0c002227914a7 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -40,6 +40,8 @@ let "0.50" = ./disable-graphviz-0.46.1.patch; + "0.52" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -88,7 +90,7 @@ let # Wait for PR #59372 # passthru = { - # updateScript = gnome3.updateScript { + # updateScript = gnome.updateScript { # attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; # packageName = pname; # }; @@ -99,7 +101,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ]; + maintainers = with maintainers; [ antono jtojnar peterhoeg ]; }; }); @@ -125,8 +127,8 @@ in rec { }; vala_0_48 = generic { - version = "0.48.14"; - sha256 = "0iz3zzimmk5wxvy5bi75v8ckv153gjrz3r5iqvl8xqackzi7v9fw"; + version = "0.48.17"; + sha256 = "1wlb4vd7k6hg10s09npglbhfcgjzxkywd4v0l96qhn19m9b8cszj"; }; vala_0_50 = generic { @@ -134,5 +136,10 @@ in rec { sha256 = "1353j852h04d1x6b4n6lbg3ay40ph0adb9yi25dh74pligx33z2q"; }; - vala = vala_0_48; + vala_0_52 = generic { + version = "0.52.2"; + sha256 = "sha256-OjxGCAO6Zh5RO+PQmEtYPgVHP2AsdfqY6RdVUDcUqXs="; + }; + + vala = vala_0_52; } diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 4c5b6a4f6a9a7..46738343431a9 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -5,11 +5,13 @@ with lib; mkCoqDerivation { owner = "fblanqui"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + {case = range "8.12" "8.13"; out = "1.8.1"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } {case = range "8.6" "8.7"; out = "1.4.0"; } ] null; + release."1.8.1".sha256 = "0knhca9fffmyldn4q16h9265i7ih0h4jhcarq4rkn0wnn7x8w8yw"; release."1.7.0".rev = "08b5481ed6ea1a5d2c4c068b62156f5be6d82b40"; release."1.7.0".sha256 = "1w7fmcpf0691gcwq00lm788k4ijlwz3667zj40j5jjc8j8hj7cq3"; release."1.6.0".rev = "328aa06270584b578edc0d2925e773cced4f14c8"; diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index af560ec49a0b5..ad5caec949211 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -7,7 +7,11 @@ with lib; mkCoqDerivation { owner = "PrincetonUniversity"; repo = "VST"; inherit version; - defaultVersion = if coq.coq-version == "8.11" then "2.6" else null; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.12" "8.13"; out = "2.7.1"; } + { case = "8.11"; out = "2.6"; } + ] null; + release."2.7.1".sha256 = "1674j7bkvihiv19vizm99dp6gj3lryb00zx6a87jz214f3ydcvnj"; release."2.6".sha256 = "00bf9hl4pvmsqa08lzjs1mrxyfgfxq4k6778pnldmc8ichm90jgk"; releaseRev = v: "v${v}"; propagatedBuildInputs = [ compcert ]; diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix new file mode 100644 index 0000000000000..1ec16eaf5eb4b --- /dev/null +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -0,0 +1,40 @@ +# This file defines cabal2nix-unstable, used by maintainers/scripts/haskell/regenerate-hackage-packages.sh. +{ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal +, containers, deepseq, directory, distribution-nixpkgs, fetchzip +, filepath, hackage-db, hopenssl, hpack, language-nix, lens, lib +, monad-par, monad-par-extras, mtl, optparse-applicative, pretty +, process, split, tasty, tasty-golden, text, time, transformers +, yaml +}: +mkDerivation { + pname = "cabal2nix"; + version = "unstable-2021-05-06"; + src = fetchzip { + url = "https://github.com/NixOS/cabal2nix/archive/b598bc4682b0827554b5780acdd6f948d320283b.tar.gz"; + sha256 = "04afm56cyhj2l41cvq4z11k92jjchr21a8vg9pjaz438pma7jgw1"; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base bytestring Cabal containers deepseq + directory distribution-nixpkgs filepath hackage-db hopenssl hpack + language-nix lens optparse-applicative pretty process split text + time transformers yaml + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers directory + distribution-nixpkgs filepath hopenssl language-nix lens monad-par + monad-par-extras mtl optparse-applicative pretty + ]; + testHaskellDepends = [ + base Cabal containers directory filepath language-nix lens pretty + process tasty tasty-golden + ]; + preCheck = '' + export PATH="$PWD/dist/build/cabal2nix:$PATH" + export HOME="$TMPDIR/home" + ''; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Convert Cabal files into Nix build instructions"; + license = lib.licenses.bsd3; +} diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix new file mode 100644 index 0000000000000..bcbf325405382 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -0,0 +1,71 @@ +# ARM-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS +# +# This extension is applied to all haskell package sets in nixpkgs +# if `stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64` +# to apply arm specific workarounds or fixes. +# +# The file is split into three parts: +# +# * Overrides that are applied for all arm platforms +# * Overrides for aarch32 platforms +# * Overrides for aarch64 platforms +# +# This may be extended in the future to also include compiler- +# specific sections as compiler and linker related bugs may +# get fixed subsequently. +# +# When adding new overrides, try to research which section they +# belong into. Most likely we'll be favouring aarch64 overrides +# in practice since that is the only platform we can test on +# Hydra. Also take care to group overrides by the issue they +# solve, so refactors and updates to this file are less tedious. +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib; +in + +with haskellLib; + +self: super: { + # COMMON ARM OVERRIDES + + # moved here from configuration-common.nix, no reason given. + servant-docs = dontCheck super.servant-docs; + swagger2 = dontHaddock (dontCheck super.swagger2); + + # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + happy = dontCheck super.happy; + +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { + # AARCH64-SPECIFIC OVERRIDES + + # Doctests fail on aarch64 due to a GHCi linking bug + # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437 + # TODO: figure out if needed on aarch32 as well + language-nix = dontCheck super.language-nix; + trifecta = dontCheck super.trifecta; + ad = dontCheck super.ad; + vinyl = dontCheck super.vinyl; + BNFC = dontCheck super.BNFC; + C-structs = dontCheck super.C-structs; + accelerate = dontCheck super.accelerate; + focuslist = dontCheck super.focuslist; + flight-kml = dontCheck super.flight-kml; + exact-real = dontCheck super.exact-real; + autoapply = dontCheck super.autoapply; + hint = dontCheck super.hint; + hgeometry = dontCheck super.hgeometry; + headroom = dontCheck super.headroom; + haskell-time-range = dontCheck super.haskell-time-range; + hsakamai = dontCheck super.hsakamai; + hsemail-ns = dontCheck super.hsemail-ns; + openapi3 = dontCheck super.openapi3; + + # https://github.com/ekmett/half/issues/35 + half = dontCheck super.half; + +} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { + # AARCH32-SPECIFIC OVERRIDES + +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3965d4cfce80a..d8f5348f5ad0b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -75,10 +75,6 @@ self: super: { # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; - - # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo - # see: https://github.com/psibi/shell-conduit/issues/12 - doCheck = !pkgs.stdenv.isDarwin; }); # https://github.com/froozen/kademlia/issues/2 @@ -117,15 +113,6 @@ self: super: { # Jailbreak is necessary for QuickCheck dependency. vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); - conduit-extra = if pkgs.stdenv.isDarwin - then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }) - else super.conduit-extra; - - # Fix Darwin build. - halive = if pkgs.stdenv.isDarwin - then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit - else super.halive; - # Test suite fails due golden tests checking text representation # of normalized dhall expressions, and newer dhall versions format # differently. @@ -134,19 +121,6 @@ self: super: { then throw "Drop dontCheck override for hpack-dhall > 0.5.2" else dontCheck super.hpack-dhall; - barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit; - - # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux - hakyll = if pkgs.stdenv.isDarwin - then dontCheck (overrideCabal super.hakyll (drv: { - testToolDepends = []; - })) - else super.hakyll; - - double-conversion = if !pkgs.stdenv.isDarwin - then super.double-conversion - else addExtraLibrary super.double-conversion pkgs.libcxx; - inline-c-cpp = overrideCabal super.inline-c-cpp (drv: { postPatch = (drv.postPatch or "") + '' substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" "" @@ -197,7 +171,19 @@ self: super: { digit = doJailbreak super.digit; # 2020-06-05: HACK: does not pass own build suite - `dontCheck` - hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix); + hnix = generateOptparseApplicativeCompletion "hnix" + (overrideCabal super.hnix (drv: { + doCheck = false; + prePatch = '' + # fix encoding problems when patching + ${pkgs.dos2unix}/bin/dos2unix hnix.cabal + '' + (drv.prePatch or ""); + patches = [ + # support ref-tf in hnix 0.12.0.1, can be removed after + # https://github.com/haskell-nix/hnix/pull/918 + ./patches/hnix-ref-tf-0.5-support.patch + ] ++ (drv.patches or []); + })); # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -291,28 +277,20 @@ self: super: { htsn = dontCheck super.htsn; htsn-import = dontCheck super.htsn-import; http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105 - ihaskell = dontCheck super.ihaskell; influxdb = dontCheck super.influxdb; integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0 itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; - language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275 language-slice = dontCheck super.language-slice; ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; - math-functions = if pkgs.stdenv.isDarwin - then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63 - else super.math-functions; matplotlib = dontCheck super.matplotlib; # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :') memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; - mockery = if pkgs.stdenv.isDarwin - then overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }) # darwin doesn't have sub-second resolution https://github.com/hspec/mockery/issues/11 - else super.mockery; modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*) nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; @@ -362,7 +340,6 @@ self: super: { tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; - trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; wai-logger = dontCheck super.wai-logger; @@ -454,9 +431,8 @@ self: super: { # https://github.com/andrewthad/haskell-ip/issues/67 ip = dontCheck super.ip; - # https://github.com/ndmitchell/shake/issues/206 - # https://github.com/ndmitchell/shake/issues/267 - shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; }); + # https://github.com/ndmitchell/shake/issues/804 + shake = dontCheck super.shake; # https://github.com/nushio3/doctest-prop/issues/1 doctest-prop = dontCheck super.doctest-prop; @@ -831,7 +807,6 @@ self: super: { # With ghc-8.2.x haddock would time out for unknown reason # See https://github.com/haskell/haddock/issues/679 language-puppet = dontHaddock super.language-puppet; - filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; }); # https://github.com/alphaHeavy/protobuf/issues/34 protobuf = dontCheck super.protobuf; @@ -842,20 +817,23 @@ self: super: { configureFlags = ["--ghc-option=-DU_DEFINE_FALSE_AND_TRUE=1"]; # https://github.com/haskell/text-icu/issues/49 }); - # aarch64 and armv7l fixes. - happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 - servant-docs = - let - f = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) - then dontCheck - else pkgs.lib.id; - in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. + # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. + servant-docs = doJailbreak super.servant-docs; snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22 - swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # hledger-lib requires the latest version of pretty-simple - hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple; }; + hledger-lib = appendPatch super.hledger-lib + # This patch has been merged but not released yet: + # https://github.com/simonmichael/hledger/pull/1512. It is + # important for ledger-autosync test suite: + # https://github.com/egh/ledger-autosync/issues/123 + (pkgs.fetchpatch { + name = "hledger-properly-escape-quotes-csv.patch"; + url = "https://github.com/simonmichael/hledger/commit/c9a72e1615e2ddc2824f2e248456e1042eb31e1d.patch"; + sha256 = "10knvrd5bl9nrmi27i0pm82sfr64jy04xgbjp228qywyijpr3pqv"; + includes = [ "Hledger/Read/CsvReader.hs" ]; + stripLen = 1; + }); # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. @@ -1143,11 +1121,6 @@ self: super: { ''; }); - # gtk/gtk3 needs to be told on Darwin to use the Quartz - # rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249). - gtk3 = appendConfigureFlags super.gtk3 (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); - gtk = appendConfigureFlags super.gtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); - # Chart-tests needs and compiles some modules from Chart itself Chart-tests = (addExtraLibrary super.Chart-tests self.QuickCheck).overrideAttrs (old: { preCheck = old.postPatch or "" + '' @@ -1284,16 +1257,34 @@ self: super: { # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; - haskell-gi-base = addBuildDepends super.haskell-gi-base [ pkgs.gobject-introspection ]; - - # 2020-08-14: Needs some manual patching to be compatible with haskell-gi-base 0.24 + # nixpkgs has bumped gdkpixbuf C lib, so we need gi-gdkpixbuf_2_0_26 to link against that. + # This leads to all this bumps which can be removed once stackage has haskell-gi 0.25. + haskell-gi = self.haskell-gi_0_25_0; + haskell-gi-base = addBuildDepends super.haskell-gi-base_0_25_0 [ pkgs.gobject-introspection ]; + gi-glib = self.gi-glib_2_0_25; + gi-cairo = self.gi-cairo_1_0_25; + gi-gobject = self.gi-gobject_2_0_26; + gi-atk = self.gi-atk_2_0_23; + gi-gio = self.gi-gio_2_0_28; + gi-harfbuzz = self.gi-harfbuzz_0_0_4; + gi-javascriptcore = self.gi-javascriptcore_4_0_23; + gi-pango = self.gi-pango_1_0_24; + gi-soup = self.gi-soup_2_4_24; + gi-gdkpixbuf = self.gi-gdkpixbuf_2_0_26; + gi-gdk = self.gi-gdk_3_0_24; + gi-gtk = self.gi-gtk_3_0_37; + gi-webkit2 = self.gi-webkit2_4_0_27; + gi-cairo-render = doJailbreak super.gi-cairo-render; + gi-cairo-connector = doJailbreak super.gi-cairo-connector; + gi-gtk-hs = self.gi-gtk-hs_0_3_10; + gi-dbusmenu = self.gi-dbusmenu_0_4_9; + gi-xlib = self.gi-xlib_2_0_10; + gi-gdkx11 = self.gi-gdkx11_3_0_11; + gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10; + + # 2021-05-17: Needs some manual patching to be compatible with haskell-gi-base 0.25 # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 - jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk (pkgs.fetchpatch { - url = "https://github.com/ghcjs/jsaddle/compare/9727365...f842748.patch"; - sha256 = "07l4l999lmlx7sqxf7v4f70rmxhx9r0cjblkgc4n0y6jin4iv1cb"; - stripLen = 2; - extraPrefix = ""; - }); + jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch; # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 @@ -1399,6 +1390,12 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck super.haskell-language-server; + # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1808 + hls-splice-plugin = dontCheck super.hls-splice-plugin; + + # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 + hls-eval-plugin = dontCheck super.hls-eval-plugin; + # 2021-03-19: Too restrictive upper bound on optparse-applicative stylish-haskell = doJailbreak super.stylish-haskell; @@ -1427,7 +1424,7 @@ self: super: { }); # 2021-03-09: Overrides because nightly is to old for hls 1.0.0 - lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0); + lsp-test = doDistribute (dontCheck self.lsp-test_0_14_0_0); # 2021-03-21 Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 @@ -1482,11 +1479,6 @@ self: super: { # Due to tests restricting base in 0.8.0.0 release http-media = doJailbreak super.http-media; - # https://github.com/ekmett/half/issues/35 - half = if pkgs.stdenv.isAarch64 - then dontCheck super.half - else super.half; - # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 heist = doJailbreak super.heist; @@ -1541,10 +1533,6 @@ self: super: { # https://github.com/yesodweb/yesod/issues/1714 yesod-core = dontCheck super.yesod-core; - # Add ApplicationServices on darwin - apecs-physics = addPkgconfigDepends super.apecs-physics - (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices); - # Break out of overspecified constraint on QuickCheck. algebraic-graphs = dontCheck super.algebraic-graphs; attoparsec = doJailbreak super.attoparsec; # https://github.com/haskell/attoparsec/pull/168 @@ -1790,4 +1778,90 @@ self: super: { excludes = ["test/buildtest"]; }); + # workaround for https://github.com/peti/distribution-nixpkgs/issues/9 + pam = super.pam.override { inherit (pkgs) pam; }; + + # Too strict version bounds on base: + # https://github.com/obsidiansystems/database-id/issues/1 + database-id-class = doJailbreak super.database-id-class; + + cabal2nix-unstable = overrideCabal super.cabal2nix-unstable { + passthru.updateScript = ../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh; + }; + + # Too strict version bounds on base and optparse-applicative + # https://github.com/diagrams/diagrams-cairo/issues/77 + diagrams-cairo = doJailbreak super.diagrams-cairo; + + # Too strict version bounds on base + # https://github.com/gibiansky/IHaskell/issues/1217 + ihaskell-display = doJailbreak super.ihaskell-display; + ihaskell-basic = doJailbreak super.ihaskell-basic; + + # too strict bounds on QuickCheck + # https://github.com/HeinrichApfelmus/hyper-haskell/issues/42 + hyper-extra = doJailbreak super.hyper-extra; + + # Fixes too strict version bounds on regex libraries + # Presumably to be removed at the next release + yi-language = appendPatch super.yi-language (pkgs.fetchpatch { + url = "https://github.com/yi-editor/yi/commit/0d3bcb5ba4c237d57ce33a3dc39b63c56d890765.patch"; + sha256 = "0r4mzngs0x1akqpajzx7ssa9rax977fvj5ra8d3grfbpx6z0nm01"; + includes = [ "yi-language.cabal" ]; + stripLen = 2; + extraPrefix = ""; + }); + + # https://github.com/ghcjs/jsaddle/issues/123 + jsaddle = overrideCabal super.jsaddle (drv: { + # lift conditional version constraint on ref-tf + postPatch = '' + sed -i 's/ref-tf.*,/ref-tf,/' jsaddle.cabal + '' + (drv.postPatch or ""); + }); + + # Tests need to lookup target triple x86_64-unknown-linux + # https://github.com/llvm-hs/llvm-hs/issues/334 + llvm-hs = overrideCabal super.llvm-hs { + doCheck = pkgs.stdenv.targetPlatform.system == "x86_64-linux"; + }; + + # Fix build failure by picking patch from 8.5, + # we need this version of sbv for petrinizer + sbv_7_13 = appendPatch super.sbv_7_13 + (pkgs.fetchpatch { + url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch"; + sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm"; + }); + + # Too strict bounds on dimensional + # https://github.com/enomsg/science-constants-dimensional/pull/1 + science-constants-dimensional = doJailbreak super.science-constants-dimensional; + + # Tests are flaky on busy machines + # https://github.com/merijn/paramtree/issues/4 + paramtree = dontCheck super.paramtree; + + # Too strict version bounds on haskell-gi + # https://github.com/owickstrom/gi-gtk-declarative/issues/100 + gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; + gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; + + # Test assets missing from sdist + # https://github.com/hadolint/language-docker/issues/63 + language-docker = overrideSrc super.language-docker { + src = pkgs.fetchFromGitHub { + owner = "hadolint"; + repo = "language-docker"; + rev = "refs/tags/${super.language-docker.version}"; + sha256 = "06263jy538ni31vms5pzggmh64fyk62cv3lxnvkc6gylb94kljb8"; + name = "language-docker-${super.language-docker.version}-source"; + }; + }; + + phonetic-languages-phonetics-basics = appendPatch super.phonetic-languages-phonetics-basics ./patches/phonetic-languages-phonetics-basics-haddock.patch; + + # 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions. + tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix new file mode 100644 index 0000000000000..6768bc5d6b4f4 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -0,0 +1,164 @@ +# DARWIN-SPECIFIC OVERRIDES FOR THE HASKELL PACKAGE SET IN NIXPKGS + +{ pkgs, haskellLib }: + +let + inherit (pkgs) lib darwin; +in + +with haskellLib; + +self: super: { + + # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo + # see: https://github.com/psibi/shell-conduit/issues/12 + shell-conduit = dontCheck super.shell-conduit; + + conduit-extra = super.conduit-extra.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + + halive = addBuildDepend super.halive darwin.apple_sdk.frameworks.AppKit; + + # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux + hakyll = overrideCabal super.hakyll { + testToolDepends = []; + doCheck = false; + }; + + barbly = addBuildDepend super.barbly darwin.apple_sdk.frameworks.AppKit; + + double-conversion = addExtraLibrary super.double-conversion pkgs.libcxx; + + apecs-physics = addPkgconfigDepends super.apecs-physics [ + darwin.apple_sdk.frameworks.ApplicationServices + ]; + + # "erf table" test fails on Darwin + # https://github.com/bos/math-functions/issues/63 + math-functions = dontCheck super.math-functions; + + # darwin doesn't have sub-second resolution + # https://github.com/hspec/mockery/issues/11 + mockery = overrideCabal super.mockery (drv: { + preCheck = '' + export TRAVIS=true + '' + (drv.preCheck or ""); + }); + + # https://github.com/ndmitchell/shake/issues/206 + shake = dontCheck super.shake; + + filecache = dontCheck super.filecache; + + # gtk/gtk3 needs to be told on Darwin to use the Quartz + # rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249). + gtk3 = appendConfigureFlag super.gtk3 "-f have-quartz-gtk"; + gtk = appendConfigureFlag super.gtk "-f have-quartz-gtk"; + + OpenAL = addExtraLibrary super.OpenAL darwin.apple_sdk.frameworks.OpenAL; + + proteaaudio = addExtraLibrary super.proteaaudio darwin.apple_sdk.frameworks.AudioToolbox; + + # the system-fileio tests use canonicalizePath, which fails in the sandbox + system-fileio = dontCheck super.system-fileio; + + # Prevents needing to add `security_tool` as a run-time dependency for + # everything using x509-system to give access to the `security` executable. + # + # darwin.security_tool is broken in Mojave (#45042) + # + # We will use the system provided security for now. + # Beware this WILL break in sandboxes! + # + # TODO(matthewbauer): If someone really needs this to work in sandboxes, + # I think we can add a propagatedImpureHost dep here, but I’m hoping to + # get a proper fix available soonish. + x509-system = overrideCabal super.x509-system (drv: + lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) { + postPatch = '' + substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security + '' + (drv.postPatch or ""); + }); + + # https://github.com/haskell-foundation/foundation/pull/412 + foundation = dontCheck super.foundation; + + llvm-hs = overrideCabal super.llvm-hs (oldAttrs: { + # One test fails on darwin. + doCheck = false; + # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to + # the DYLD_LIBRARY_PATH environment variable. This messes up clang + # when called from GHC, probably because clang is version 7, but we are + # using LLVM8. + preCompileBuildDriver = '' + substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" + '' + (oldAttrs.preCompileBuildDriver or ""); + }); + + yesod-bin = addBuildDepend super.yesod-bin darwin.apple_sdk.frameworks.Cocoa; + + hmatrix = addBuildDepend super.hmatrix darwin.apple_sdk.frameworks.Accelerate; + + # Ensure the necessary frameworks are propagatedBuildInputs on darwin + OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.OpenGL + ]; + preConfigure = '' + frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) + frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") + configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) + '' + (drv.preConfigure or ""); + }); + GLURaw = overrideCabal super.GLURaw (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.OpenGL + ]; + }); + bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.AGL + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.OpenGL + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Kernel + darwin.apple_sdk.frameworks.CoreVideo + darwin.CF + ]; + }); + OpenCL = overrideCabal super.OpenCL (drv: { + librarySystemDepends = []; + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ + darwin.apple_sdk.frameworks.OpenCL + ]; + }); + + # cabal2nix likes to generate dependencies on hinotify when hfsevents is + # really required on darwin: https://github.com/NixOS/cabal2nix/issues/146. + hinotify = self.hfsevents; + + # FSEvents API is very buggy and tests are unreliable. See + # http://openradar.appspot.com/10207999 and similar issues. + fsnotify = addBuildDepend (dontCheck super.fsnotify) + darwin.apple_sdk.frameworks.Cocoa; + + FractalArt = overrideCabal super.FractalArt (drv: { + librarySystemDepends = [ + darwin.libobjc + darwin.apple_sdk.frameworks.AppKit + ] ++ (drv.librarySystemDepends or []); + }); + + arbtt = overrideCabal super.arbtt (drv: { + librarySystemDepends = [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.IOKit + ] ++ (drv.librarySystemDepends or []); + }); + +} diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 92d26a6eb0e77..c55d720033eed 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -98,4 +98,10 @@ self: super: { # The test suite seems pretty broken. base64-bytestring = dontCheck super.base64-bytestring; + # 5.6 introduced support for GHC 9.0.x, but hasn't landed in stackage yet + profunctors = super.profunctors_5_6_2; + + # 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet + lens = super.lens_5_0_1; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 21d5934eed5b9..52c18b3e43dfd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1,3100 +1,5 @@ -# pkgs/development/haskell-modules/configuration-hackage2nix.yaml - -compiler: ghc-8.10.4 - -core-packages: - - array-0.5.4.0 - - base-4.14.1.0 - - binary-0.8.8.0 - - bytestring-0.10.12.0 - - Cabal-3.2.1.0 - - containers-0.6.2.1 - - deepseq-1.4.4.0 - - directory-1.3.6.0 - - exceptions-0.10.4 - - filepath-1.4.2.1 - - ghc-8.10.4 - - ghc-boot-8.10.4 - - ghc-boot-th-8.10.4 - - ghc-compact-0.1.0.0 - - ghc-heap-8.10.4 - - ghc-prim-0.6.1 - - ghci-8.10.4 - - haskeline-0.8.0.1 - - hpc-0.6.1.0 - - integer-gmp-1.0.3.0 - - libiserv-8.10.4 - - mtl-2.2.2 - - parsec-3.1.14.0 - - pretty-1.1.3.6 - - process-1.6.9.0 - - rts-1.0 - - stm-2.5.0.0 - - template-haskell-2.16.0.0 - - terminfo-0.4.1.4 - - text-1.2.4.1 - - time-1.9.3 - - transformers-0.5.6.2 - - unix-2.7.2.2 - - xhtml-3000.2.2.1 - - # Hack: The following package is a core package of GHCJS. If we don't declare - # it, then hackage2nix will generate a Hackage database where all dependants - # of this library are marked as "broken". - - ghcjs-base-0 - -# This is a list of packages with versions from the latest Stackage LTS release. -# -# The packages and versions in this list cause the `hackage2nix` tool to -# generate the package at the given version. -# -# For instance, with a line like the following: -# -# - aeson ==1.4.6.0 -# -# `hackage2nix` will generate the `aeson` package at version 1.4.6.0 in the -# ./hackage-packages.nix file. -# -# Since the packages in the LTS package set are sometimes older than the latest -# on Hackage, `hackage2nix` is smart enough to also generate the latest version -# of a given package. -# -# In the above example with aeson, if there was version 1.5.0.0 of aeson -# available on Hackage, `hackage2nix` would generate two packages, `aeson` -# at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0. -# -# WARNING: This list is generated semiautomatically based on the most recent -# LTS package set. If you want to add entries to it, you must do so before the -# comment saying "# LTS Haskell x.y". Any changes after that comment will be -# lost the next time `update-stackage.sh` runs. -default-package-overrides: - # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag - - MissingH ==1.4.2.0 - # gi-gdkx11-4.x requires gtk-4.x, which is still under development and - # not yet available in Nixpkgs - - gi-gdkx11 < 4 - # Needs Cabal 3.4 for Setup.hs - - gi-javascriptcore < 4.0.23 # - - gi-soup < 2.4.24 # - - gi-webkit2 < 4.0.27 # - # To stay hls 1.0 compatible - - ghcide < 1.1 - - hls-retrie-plugin < 1.0.0.1 - - lsp < 1.2 - - lsp-types < 1.2 - - hls-plugin-api < 1.1.0.0 - - hls-explicit-imports-plugin < 1.0.0.1 - # 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25, - # so we need to restrict these to compatible versions - # Remove these as soon as haskell-gi{,-base} are 0.25.* - # in Stackage Nightly! - - gi-ggit < 1.0.10 - - gi-girepository < 1.0.24 - - gi-gst < 1.0.24 - - gi-gstbase < 1.0.24 - - gi-gstvideo < 1.0.24 - - gi-gtksource < 3.0.24 - - gi-ibus < 1.5.3 - - gi-notify < 0.7.23 - - gi-ostree < 1.0.14 - - gi-pangocairo < 1.0.25 - - gi-secret < 0.0.13 - - gi-vte < 2.91.28 - - # Stackage Nightly 2021-04-28 - - abstract-deque ==0.3 - - abstract-par ==0.3.3 - - AC-Angle ==1.0 - - accuerr ==0.2.0.2 - - ace ==0.6 - - action-permutations ==0.0.0.1 - - ad ==4.4.1 - - adjunctions ==4.4 - - adler32 ==0.1.2.0 - - aeson ==1.5.6.0 - - aeson-attoparsec ==0.0.0 - - aeson-better-errors ==0.9.1.0 - - aeson-casing ==0.2.0.0 - - aeson-combinators ==0.0.5.0 - - aeson-commit ==1.3 - - aeson-compat ==0.3.9 - - aeson-default ==0.9.1.0 - - aeson-diff ==1.1.0.9 - - aeson-generic-compat ==0.0.1.3 - - aeson-lens ==0.5.0.0 - - aeson-optics ==1.1.0.1 - - aeson-picker ==0.1.0.5 - - aeson-pretty ==0.8.8 - - aeson-qq ==0.8.3 - - aeson-schemas ==1.3.3 - - aeson-with ==0.1.2.0 - - aeson-yak ==0.1.1.3 - - aeson-yaml ==1.1.0.0 - - Agda ==2.6.1.3 - - agda2lagda ==0.2020.11.1 - - al ==0.1.4.2 - - alarmclock ==0.7.0.5 - - alerts ==0.1.2.0 - - alex ==3.2.6 - - alex-meta ==0.3.0.13 - - alg ==0.2.13.1 - - algebraic-graphs ==0.5 - - Allure ==0.10.2.0 - - almost-fix ==0.0.2 - - alsa-core ==0.5.0.1 - - alsa-mixer ==0.3.0 - - alsa-pcm ==0.6.1.1 - - alsa-seq ==0.6.0.8 - - alternative-vector ==0.0.0 - - ALUT ==2.4.0.3 - - amazonka-apigateway ==1.6.1 - - amazonka-application-autoscaling ==1.6.1 - - amazonka-appstream ==1.6.1 - - amazonka-athena ==1.6.1 - - amazonka-autoscaling ==1.6.1 - - amazonka-budgets ==1.6.1 - - amazonka-certificatemanager ==1.6.1 - - amazonka-cloudformation ==1.6.1 - - amazonka-cloudfront ==1.6.1 - - amazonka-cloudhsm ==1.6.1 - - amazonka-cloudsearch ==1.6.1 - - amazonka-cloudsearch-domains ==1.6.1 - - amazonka-cloudtrail ==1.6.1 - - amazonka-cloudwatch ==1.6.1 - - amazonka-cloudwatch-events ==1.6.1 - - amazonka-cloudwatch-logs ==1.6.1 - - amazonka-codebuild ==1.6.1 - - amazonka-codecommit ==1.6.1 - - amazonka-codedeploy ==1.6.1 - - amazonka-codepipeline ==1.6.1 - - amazonka-cognito-identity ==1.6.1 - - amazonka-cognito-idp ==1.6.1 - - amazonka-cognito-sync ==1.6.1 - - amazonka-config ==1.6.1 - - amazonka-core ==1.6.1 - - amazonka-datapipeline ==1.6.1 - - amazonka-devicefarm ==1.6.1 - - amazonka-directconnect ==1.6.1 - - amazonka-discovery ==1.6.1 - - amazonka-dms ==1.6.1 - - amazonka-ds ==1.6.1 - - amazonka-dynamodb ==1.6.1 - - amazonka-dynamodb-streams ==1.6.1 - - amazonka-ecr ==1.6.1 - - amazonka-ecs ==1.6.1 - - amazonka-efs ==1.6.1 - - amazonka-elasticache ==1.6.1 - - amazonka-elasticbeanstalk ==1.6.1 - - amazonka-elasticsearch ==1.6.1 - - amazonka-elastictranscoder ==1.6.1 - - amazonka-elb ==1.6.1 - - amazonka-elbv2 ==1.6.1 - - amazonka-emr ==1.6.1 - - amazonka-gamelift ==1.6.1 - - amazonka-glacier ==1.6.1 - - amazonka-glue ==1.6.1 - - amazonka-health ==1.6.1 - - amazonka-iam ==1.6.1 - - amazonka-importexport ==1.6.1 - - amazonka-inspector ==1.6.1 - - amazonka-iot ==1.6.1 - - amazonka-iot-dataplane ==1.6.1 - - amazonka-kinesis ==1.6.1 - - amazonka-kinesis-analytics ==1.6.1 - - amazonka-kinesis-firehose ==1.6.1 - - amazonka-kms ==1.6.1 - - amazonka-lambda ==1.6.1 - - amazonka-lightsail ==1.6.1 - - amazonka-marketplace-analytics ==1.6.1 - - amazonka-marketplace-metering ==1.6.1 - - amazonka-ml ==1.6.1 - - amazonka-opsworks ==1.6.1 - - amazonka-opsworks-cm ==1.6.1 - - amazonka-pinpoint ==1.6.1 - - amazonka-polly ==1.6.1 - - amazonka-rds ==1.6.1 - - amazonka-redshift ==1.6.1 - - amazonka-rekognition ==1.6.1 - - amazonka-route53 ==1.6.1 - - amazonka-route53-domains ==1.6.1 - - amazonka-s3 ==1.6.1 - - amazonka-sdb ==1.6.1 - - amazonka-servicecatalog ==1.6.1 - - amazonka-ses ==1.6.1 - - amazonka-shield ==1.6.1 - - amazonka-sms ==1.6.1 - - amazonka-snowball ==1.6.1 - - amazonka-sns ==1.6.1 - - amazonka-sqs ==1.6.1 - - amazonka-ssm ==1.6.1 - - amazonka-stepfunctions ==1.6.1 - - amazonka-storagegateway ==1.6.1 - - amazonka-sts ==1.6.1 - - amazonka-support ==1.6.1 - - amazonka-swf ==1.6.1 - - amazonka-test ==1.6.1 - - amazonka-waf ==1.6.1 - - amazonka-workspaces ==1.6.1 - - amazonka-xray ==1.6.1 - - amqp ==0.22.0 - - amqp-utils ==0.6.1.0 - - annotated-wl-pprint ==0.7.0 - - ansi-terminal ==0.11 - - ansi-wl-pprint ==0.6.9 - - ANum ==0.2.0.2 - - apecs ==0.9.2 - - apecs-gloss ==0.2.4 - - apecs-physics ==0.4.5 - - api-field-json-th ==0.1.0.2 - - api-maker ==0.1.0.0 - - ap-normalize ==0.1.0.0 - - appar ==0.1.8 - - appendmap ==0.1.5 - - apply-refact ==0.9.2.0 - - apportionment ==0.0.0.3 - - approximate ==0.3.4 - - approximate-equality ==1.1.0.2 - - app-settings ==0.2.0.12 - - arbor-lru-cache ==0.1.1.1 - - arithmoi ==0.11.0.1 - - array-memoize ==0.6.0 - - arrow-extras ==0.1.0.1 - - ascii ==1.0.1.4 - - ascii-case ==1.0.0.4 - - ascii-char ==1.0.0.8 - - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.4 - - ascii-predicates ==1.0.0.4 - - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.4 - - ascii-th ==1.0.0.4 - - asif ==6.0.4 - - asn1-encoding ==0.9.6 - - asn1-parse ==0.9.5 - - asn1-types ==0.3.4 - - assert-failure ==0.1.2.5 - - assoc ==1.0.2 - - astro ==0.4.2.1 - - async ==2.2.3 - - async-extra ==0.2.0.0 - - async-pool ==0.9.1 - - async-refresh ==0.3.0.0 - - async-refresh-tokens ==0.4.0.0 - - atom-basic ==0.2.5 - - atomic-primops ==0.8.4 - - atomic-write ==0.2.0.7 - - attoparsec ==0.13.2.5 - - attoparsec-base64 ==0.0.0 - - attoparsec-binary ==0.2 - - attoparsec-expr ==0.1.1.2 - - attoparsec-iso8601 ==1.0.2.0 - - attoparsec-path ==0.0.0.1 - - audacity ==0.0.2 - - aur ==7.0.6 - - aura ==3.2.4 - - authenticate ==1.3.5 - - authenticate-oauth ==1.6.0.1 - - auto ==0.4.3.1 - - autoexporter ==1.1.20 - - auto-update ==0.1.6 - - avers ==0.0.17.1 - - avro ==0.5.2.0 - - aws-cloudfront-signed-cookies ==0.2.0.6 - - backprop ==0.2.6.4 - - backtracking ==0.1.0 - - bank-holidays-england ==0.2.0.6 - - barbies ==2.0.2.0 - - base16 ==0.3.0.1 - - base16-bytestring ==1.0.1.0 - - base16-lens ==0.1.3.2 - - base32 ==0.2.0.0 - - base32-lens ==0.1.1.1 - - base32string ==0.9.1 - - base58-bytestring ==0.1.0 - - base58string ==0.10.0 - - base64 ==0.4.2.3 - - base64-bytestring ==1.1.0.0 - - base64-bytestring-type ==1.0.1 - - base64-lens ==0.3.1 - - base64-string ==0.2 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 - - basement ==0.0.12 - - base-orphans ==0.8.4 - - base-prelude ==1.4 - - base-unicode-symbols ==0.2.4.2 - - basic-prelude ==0.7.0 - - bazel-runfiles ==0.12 - - bbdb ==0.8 - - bcp47 ==0.2.0.3 - - bcp47-orphans ==0.1.0.3 - - bcrypt ==0.0.11 - - bech32 ==1.1.0 - - bech32-th ==1.0.2 - - bench ==1.0.12 - - benchpress ==0.2.2.16 - - between ==0.11.0.0 - - bibtex ==0.1.0.6 - - bifunctors ==5.5.10 - - bimap ==0.4.0 - - bimaps ==0.1.0.2 - - bimap-server ==0.1.0.1 - - bin ==0.1.1 - - binary-conduit ==1.3.1 - - binary-ext ==2.0.4 - - binary-ieee754 ==0.1.0.0 - - binary-instances ==1.0.1 - - binary-list ==1.1.1.2 - - binary-orphans ==1.0.1 - - binary-parser ==0.5.7 - - binary-parsers ==0.2.4.0 - - binary-search ==2.0.0 - - binary-shared ==0.8.3 - - binary-tagged ==0.3 - - bindings-DSL ==1.0.25 - - bindings-GLFW ==3.3.2.0 - - bindings-libzip ==1.0.1 - - bindings-uname ==0.1 - - bins ==0.1.2.0 - - bitarray ==0.0.1.1 - - bits ==0.5.3 - - bitset-word8 ==0.1.1.2 - - bits-extra ==0.0.2.0 - - bitvec ==1.1.1.0 - - bitwise-enum ==1.0.1.0 - - blake2 ==0.3.0 - - blanks ==0.5.0 - - blas-carray ==0.1.0.1 - - blas-comfort-array ==0.0.0.2 - - blas-ffi ==0.1 - - blaze-bootstrap ==0.1.0.1 - - blaze-builder ==0.4.2.1 - - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.8 - - blaze-svg ==0.3.6.1 - - blaze-textual ==0.2.1.0 - - bmp ==1.2.6.3 - - BNFC ==2.9.1 - - BNFC-meta ==0.6.1 - - board-games ==0.3 - - boltzmann-samplers ==0.1.1.0 - - Boolean ==0.2.4 - - boolean-like ==0.1.1.0 - - boolsimplifier ==0.1.8 - - boots ==0.2.0.1 - - bordacount ==0.1.0.0 - - boring ==0.2 - - both ==0.1.1.1 - - bound ==2.0.3 - - BoundedChan ==1.0.3.0 - - bounded-queue ==1.0.0 - - boundingboxes ==0.2.3 - - bower-json ==1.0.0.1 - - boxes ==0.1.5 - - brick ==0.61 - - broadcast-chan ==0.2.1.1 - - bsb-http-chunked ==0.0.0.4 - - bson ==0.4.0.1 - - btrfs ==0.2.0.0 - - buffer-builder ==0.2.4.7 - - buffer-pipe ==0.0 - - bugsnag-haskell ==0.0.4.1 - - bugsnag-hs ==0.2.0.3 - - bugzilla-redhat ==0.3.1 - - burrito ==1.2.0.1 - - butcher ==1.3.3.2 - - buttplug-hs-core ==0.1.0.0 - - bv ==0.5 - - bv-little ==1.1.1 - - byteable ==0.1.1 - - byte-count-reader ==0.10.1.2 - - bytedump ==1.0 - - byte-order ==0.1.2.0 - - byteorder ==1.0.4 - - bytes ==0.17.1 - - byteset ==0.1.1.0 - - bytestring-builder ==0.10.8.2.0 - - bytestring-conversion ==0.3.1 - - bytestring-lexing ==0.5.0.2 - - bytestring-mmap ==0.2.2 - - bytestring-strict-builder ==0.4.5.4 - - bytestring-to-vector ==0.3.0.1 - - bytestring-tree-builder ==0.2.7.9 - - bz2 ==1.0.1.0 - - bzlib ==0.5.1.0 - - bzlib-conduit ==0.3.0.2 - - c14n ==0.1.0.1 - - c2hs ==0.28.7 - - cabal-appimage ==0.3.0.2 - - cabal-debian ==5.1 - - cabal-doctest ==1.0.8 - - cabal-file ==0.1.1 - - cabal-flatpak ==0.1.0.2 - - cabal-plan ==0.7.2.0 - - cabal-rpm ==2.0.8 - - cache ==0.1.3.0 - - cacophony ==0.10.1 - - calendar-recycling ==0.0.0.1 - - call-stack ==0.3.0 - - can-i-haz ==0.3.1.0 - - capability ==0.4.0.0 - - ca-province-codes ==1.0.0.0 - - cardano-coin-selection ==1.0.1 - - carray ==0.1.6.8 - - casa-client ==0.0.1 - - casa-types ==0.0.2 - - cased ==0.1.0.0 - - case-insensitive ==1.2.1.0 - - cases ==0.1.4.1 - - casing ==0.1.4.1 - - cassava ==0.5.2.0 - - cassava-conduit ==0.6.0 - - cassava-megaparsec ==2.0.2 - - cast ==0.1.0.2 - - category ==0.2.5.0 - - cayley-client ==0.4.15 - - cborg ==0.2.5.0 - - cborg-json ==0.2.2.0 - - cereal ==0.5.8.1 - - cereal-conduit ==0.8.0 - - cereal-text ==0.1.0.2 - - cereal-vector ==0.2.0.1 - - cfenv ==0.1.0.0 - - cgi ==3001.5.0.0 - - chan ==0.0.4.1 - - ChannelT ==0.0.0.7 - - character-cases ==0.1.0.6 - - charset ==0.3.8 - - charsetdetect-ae ==1.1.0.4 - - Chart ==1.9.3 - - chaselev-deque ==0.5.0.5 - - ChasingBottoms ==1.3.1.10 - - cheapskate ==0.1.1.2 - - cheapskate-highlight ==0.1.0.0 - - cheapskate-lucid ==0.1.0.0 - - checkers ==0.5.6 - - checksum ==0.0 - - chimera ==0.3.1.0 - - chiphunk ==0.1.4.0 - - choice ==0.2.2 - - chronologique ==0.3.1.3 - - chronos ==1.1.1 - - chronos-bench ==0.2.0.2 - - chunked-data ==0.3.1 - - cipher-aes ==0.2.11 - - cipher-camellia ==0.0.2 - - cipher-des ==0.0.6 - - cipher-rc4 ==0.1.4 - - circle-packing ==0.1.0.6 - - circular ==0.3.1.1 - - citeproc ==0.3.0.9 - - clash-ghc ==1.2.5 - - clash-lib ==1.2.5 - - clash-prelude ==1.2.5 - - classy-prelude ==1.5.0 - - classy-prelude-conduit ==1.5.0 - - clay ==0.13.3 - - clientsession ==0.9.1.2 - - climb ==0.3.3 - - Clipboard ==2.3.2.0 - - clock ==0.8 - - clock-extras ==0.1.0.2 - - closed ==0.2.0.1 - - clumpiness ==0.17.0.2 - - ClustalParser ==1.3.0 - - cmark ==0.6 - - cmark-gfm ==0.2.2 - - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.21 - - codec-beam ==0.2.0 - - code-page ==0.2.1 - - co-log-concurrent ==0.5.0.0 - - co-log-core ==0.2.1.1 - - Color ==0.3.1 - - colorful-monoids ==0.2.1.3 - - colorize-haskell ==1.0.1 - - colour ==2.3.5 - - combinatorial ==0.1.0.1 - - comfort-array ==0.4.1 - - comfort-graph ==0.0.3.1 - - commonmark ==0.1.1.4 - - commonmark-extensions ==0.2.0.4 - - commonmark-pandoc ==0.2.0.1 - - commutative ==0.0.2 - - comonad ==5.0.8 - - comonad-extras ==4.0.1 - - compactmap ==0.1.4.2.1 - - compdata ==0.12.1 - - compensated ==0.8.3 - - compiler-warnings ==0.1.0 - - composable-associations ==0.1.0.0 - - composable-associations-aeson ==0.1.0.1 - - composite-aeson ==0.7.5.0 - - composite-aeson-path ==0.7.5.0 - - composite-aeson-refined ==0.7.5.0 - - composite-aeson-throw ==0.1.0.0 - - composite-base ==0.7.5.0 - - composite-binary ==0.7.5.0 - - composite-ekg ==0.7.5.0 - - composite-hashable ==0.7.5.0 - - composite-tuple ==0.1.2.0 - - composite-xstep ==0.1.0.0 - - composition ==1.0.2.2 - - composition-extra ==2.0.0 - - concise ==0.1.0.1 - - concurrency ==1.11.0.1 - - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.12 - - concurrent-split ==0.0.1.1 - - concurrent-supply ==0.1.8 - - cond ==0.4.1.1 - - conduit ==1.3.4.1 - - conduit-algorithms ==0.0.11.0 - - conduit-combinators ==1.3.0 - - conduit-concurrent-map ==0.1.1 - - conduit-extra ==1.3.5 - - conduit-parse ==0.2.1.0 - - conduit-zstd ==0.0.2.0 - - conferer ==1.1.0.0 - - conferer-aeson ==1.1.0.1 - - conferer-hspec ==1.1.0.0 - - conferer-warp ==1.1.0.0 - - ConfigFile ==1.1.4 - - config-ini ==0.2.4.0 - - configurator ==0.3.0.0 - - configurator-export ==0.1.0.1 - - configurator-pg ==0.2.5 - - connection ==0.3.1 - - connection-pool ==0.2.2 - - console-style ==0.0.2.1 - - constraint ==0.1.4.0 - - constraints ==0.13 - - constraint-tuples ==0.1.2 - - construct ==0.3.0.2 - - contravariant ==1.5.3 - - contravariant-extras ==0.3.5.2 - - control-bool ==0.2.1 - - control-dsl ==0.2.1.3 - - control-monad-free ==0.6.2 - - control-monad-omega ==0.3.2 - - convertible ==1.1.1.0 - - cookie ==0.4.5 - - core-data ==0.2.1.9 - - core-program ==0.2.6.0 - - core-text ==0.3.0.0 - - countable ==1.0 - - country ==0.2.1 - - cpphs ==1.20.9.1 - - cprng-aes ==0.6.1 - - cpu ==0.1.2 - - cpuinfo ==0.1.0.2 - - crackNum ==2.4 - - crc32c ==0.0.0 - - credential-store ==0.1.2 - - criterion ==1.5.9.0 - - criterion-measurement ==0.1.2.0 - - cron ==0.7.0 - - crypto-api ==0.13.3 - - crypto-cipher-types ==0.0.9 - - cryptocompare ==0.1.2 - - crypto-enigma ==0.1.1.6 - - cryptohash ==0.11.9 - - cryptohash-cryptoapi ==0.1.4 - - cryptohash-md5 ==0.11.100.1 - - cryptohash-sha1 ==0.11.100.1 - - cryptohash-sha256 ==0.11.102.0 - - cryptohash-sha512 ==0.11.100.1 - - cryptonite ==0.28 - - cryptonite-conduit ==0.2.2 - - cryptonite-openssl ==0.7 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 - - crypto-pubkey-types ==0.4.3 - - crypto-random ==0.0.9 - - crypto-random-api ==0.2.0 - - csp ==1.4.0 - - css-syntax ==0.1.0.0 - - css-text ==0.1.3.0 - - csv ==0.1.2 - - ctrie ==0.2 - - cubicbezier ==0.6.0.6 - - cubicspline ==0.1.2 - - cuckoo-filter ==0.2.0.2 - - cue-sheet ==2.0.1 - - curl ==1.3.8 - - currencies ==0.2.0.0 - - currency ==0.2.0.0 - - cursor ==0.3.0.0 - - cursor-brick ==0.1.0.0 - - cursor-fuzzy-time ==0.0.0.0 - - cursor-gen ==0.3.0.0 - - cutter ==0.0 - - cyclotomic ==1.1.1 - - czipwith ==1.0.1.3 - - d10 ==0.2.1.6 - - data-accessor ==0.2.3 - - data-accessor-mtl ==0.2.0.4 - - data-accessor-template ==0.2.1.16 - - data-accessor-transformers ==0.2.1.7 - - data-ascii ==1.0.0.6 - - data-binary-ieee754 ==0.4.4 - - data-bword ==0.1.0.1 - - data-checked ==0.3 - - data-clist ==0.1.2.3 - - data-compat ==0.1.0.3 - - data-default ==0.7.1.1 - - data-default-class ==0.1.2.0 - - data-default-instances-containers ==0.0.1 - - data-default-instances-dlist ==0.0.1 - - data-default-instances-old-locale ==0.0.1 - - data-diverse ==4.7.0.0 - - datadog ==0.2.5.0 - - data-dword ==0.3.2 - - data-endian ==0.1.1 - - data-fix ==0.3.1 - - data-forest ==0.1.0.8 - - data-has ==0.4.0.0 - - data-hash ==0.2.0.1 - - data-interval ==2.1.0 - - data-inttrie ==0.1.4 - - data-lens-light ==0.1.2.2 - - data-memocombinators ==0.5.1 - - data-msgpack ==0.0.13 - - data-msgpack-types ==0.0.3 - - data-or ==1.0.0.5 - - data-ordlist ==0.4.7.0 - - data-ref ==0.0.2 - - data-reify ==0.6.3 - - data-serializer ==0.3.5 - - data-textual ==0.3.0.3 - - dataurl ==0.1.0.0 - - DAV ==1.3.4 - - DBFunctor ==0.1.1.1 - - dbus ==1.2.17 - - dbus-hslogger ==0.1.0.1 - - debian ==4.0.2 - - debian-build ==0.10.2.0 - - debug-trace-var ==0.2.0 - - dec ==0.0.4 - - Decimal ==0.5.2 - - declarative ==0.5.4 - - deepseq-generics ==0.2.0.0 - - deepseq-instances ==0.1.0.1 - - deferred-folds ==0.9.17 - - dejafu ==2.4.0.2 - - dense-linear-algebra ==0.1.0.0 - - depq ==0.4.2 - - deque ==0.4.3 - - deriveJsonNoPrefix ==0.1.0.1 - - derive-topdown ==0.0.2.2 - - deriving-aeson ==0.2.6.1 - - deriving-compat ==0.5.10 - - derulo ==1.0.10 - - dhall ==1.38.1 - - dhall-bash ==1.0.36 - - dhall-json ==1.7.6 - - dhall-lsp-server ==1.0.14 - - dhall-yaml ==1.2.6 - - diagrams-solve ==0.1.3 - - dialogflow-fulfillment ==0.1.1.3 - - di-core ==1.0.4 - - dictionary-sharing ==0.1.0.0 - - Diff ==0.4.0 - - digest ==0.0.1.2 - - digits ==0.3.1 - - dimensional ==1.3 - - di-monad ==1.3.1 - - directory-tree ==0.12.1 - - direct-sqlite ==2.3.26 - - dirichlet ==0.1.0.2 - - discount ==0.1.1 - - disk-free-space ==0.1.0.1 - - distributed-closure ==0.4.2.0 - - distribution-opensuse ==1.1.1 - - distributive ==0.6.2.1 - - dl-fedora ==0.9 - - dlist ==0.8.0.8 - - dlist-instances ==0.1.1.1 - - dlist-nonempty ==0.1.1 - - dns ==4.0.1 - - dockerfile ==0.2.0 - - doclayout ==0.3.0.2 - - doctemplates ==0.9 - - doctest ==0.16.3 - - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.3 - - doctest-exitcode-stdio ==0.0 - - doctest-extract ==0.1 - - doctest-lib ==0.1 - - doldol ==0.4.1.2 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 - - dot ==0.3 - - dotenv ==0.8.0.7 - - dotgen ==0.4.3 - - dotnet-timespan ==0.0.1.0 - - double-conversion ==2.0.2.0 - - download ==0.3.2.7 - - download-curl ==0.1.4 - - drinkery ==0.4 - - dsp ==0.2.5.1 - - dual ==0.1.1.1 - - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.7.0 - - duration ==0.2.0.0 - - dvorak ==0.1.0.0 - - dynamic-state ==0.3.1 - - dyre ==0.8.12 - - eap ==0.9.0.2 - - earcut ==0.1.0.4 - - Earley ==0.13.0.1 - - easy-file ==0.2.2 - - Ebnf2ps ==1.0.15 - - echo ==0.1.4 - - ecstasy ==0.2.1.0 - - ed25519 ==0.0.5.0 - - edit-distance ==0.2.2.1 - - edit-distance-vector ==1.0.0.4 - - editor-open ==0.6.0.0 - - egison ==4.1.2 - - egison-pattern-src ==0.2.1.2 - - egison-pattern-src-th-mode ==0.2.1.2 - - either ==5.0.1.1 - - either-both ==0.1.1.1 - - either-unwrap ==1.1 - - ekg ==0.4.0.15 - - ekg-core ==0.1.1.7 - - ekg-json ==0.1.0.6 - - ekg-statsd ==0.2.5.0 - - elerea ==2.9.0 - - elf ==0.30 - - eliminators ==0.7 - - elm2nix ==0.2.1 - - elm-bridge ==0.6.1 - - elm-core-sources ==1.0.0 - - elm-export ==0.6.0.1 - - elynx ==0.5.0.2 - - elynx-markov ==0.5.0.2 - - elynx-nexus ==0.5.0.2 - - elynx-seq ==0.5.0.2 - - elynx-tools ==0.5.0.2 - - elynx-tree ==0.5.0.2 - - email-validate ==2.3.2.13 - - emojis ==0.1 - - enclosed-exceptions ==1.0.3 - - ENIG ==0.0.1.0 - - entropy ==0.4.1.6 - - enummapset ==0.6.0.3 - - enumset ==0.0.5 - - enum-subset-generate ==0.1.0.0 - - envelope ==0.2.2.0 - - envparse ==0.4.1 - - envy ==2.1.0.0 - - epub-metadata ==4.5 - - eq ==4.2.1 - - equal-files ==0.0.5.3 - - equational-reasoning ==0.7.0.0 - - equivalence ==0.3.5 - - erf ==2.0.0.0 - - error-or ==0.1.2.0 - - error-or-utils ==0.1.1 - - errors ==2.3.0 - - errors-ext ==0.4.2 - - ersatz ==0.4.9 - - esqueleto ==3.4.1.1 - - essence-of-live-coding ==0.2.5 - - essence-of-live-coding-gloss ==0.2.5 - - essence-of-live-coding-pulse ==0.2.5 - - essence-of-live-coding-quickcheck ==0.2.5 - - etc ==0.4.1.0 - - eve ==0.1.9.0 - - eventful-core ==0.2.0 - - eventful-test-helpers ==0.2.0 - - event-list ==0.1.2 - - eventstore ==1.4.1 - - every ==0.0.1 - - exact-combinatorics ==0.2.0.9 - - exact-pi ==0.5.0.1 - - exception-hierarchy ==0.1.0.4 - - exception-mtl ==0.4.0.1 - - exceptions ==0.10.4 - - exception-transformers ==0.4.0.9 - - exception-via ==0.1.0.0 - - executable-path ==0.0.3.1 - - exit-codes ==1.0.0 - - exomizer ==1.0.0 - - experimenter ==0.1.0.12 - - expiring-cache-map ==0.0.6.1 - - explicit-exception ==0.1.10 - - exp-pairs ==0.2.1.0 - - express ==0.1.6 - - extended-reals ==0.2.4.0 - - extensible-effects ==5.0.0.1 - - extensible-exceptions ==0.1.1.4 - - extra ==1.7.9 - - extractable-singleton ==0.0.1 - - extrapolate ==0.4.4 - - fail ==4.9.0.0 - - failable ==1.2.4.0 - - fakedata ==0.8.0 - - fakedata-parser ==0.1.0.0 - - fakefs ==0.3.0.2 - - fakepull ==0.3.0.2 - - faktory ==1.0.2.1 - - fast-digits ==0.3.0.0 - - fast-logger ==3.0.3 - - fast-math ==1.0.2 - - fb ==2.1.1 - - fclabels ==2.0.5 - - feature-flags ==0.1.0.1 - - fedora-dists ==1.1.2 - - fedora-haskell-tools ==0.9 - - feed ==1.3.2.0 - - FenwickTree ==0.1.2.1 - - fft ==0.1.8.6 - - fgl ==5.7.0.3 - - file-embed ==0.0.13.0 - - file-embed-lzma ==0 - - filelock ==0.1.1.5 - - filemanip ==0.3.6.3 - - file-modules ==0.1.2.4 - - filepath-bytestring ==1.4.2.1.7 - - file-path-th ==0.1.0.0 - - filepattern ==0.1.2 - - fileplow ==0.1.0.0 - - filtrable ==0.1.4.0 - - fin ==0.2 - - FindBin ==0.0.5 - - fingertree ==0.1.4.2 - - finite-typelits ==0.1.4.2 - - first-class-families ==0.8.0.1 - - first-class-patterns ==0.3.2.5 - - fitspec ==0.4.8 - - fixed ==0.3 - - fixed-length ==0.2.2.1 - - fixed-vector ==1.2.0.0 - - fixed-vector-hetero ==0.6.1.0 - - fix-whitespace ==0.0.5 - - flac ==0.2.0 - - flac-picture ==0.1.2 - - flags-applicative ==0.1.0.3 - - flat ==0.4.4 - - flat-mcmc ==1.5.2 - - flexible-defaults ==0.0.3 - - FloatingHex ==0.5 - - floatshow ==0.2.4 - - flow ==1.0.22 - - flush-queue ==1.0.0 - - fmlist ==0.9.4 - - fmt ==0.6.1.2 - - fn ==0.3.0.2 - - focus ==1.0.2 - - focuslist ==0.1.0.2 - - foldable1 ==0.1.0.0 - - fold-debounce ==0.2.0.9 - - fold-debounce-conduit ==0.2.0.6 - - foldl ==1.4.11 - - folds ==0.7.6 - - follow-file ==0.0.3 - - FontyFruity ==0.5.3.5 - - foreign-store ==0.2 - - ForestStructures ==0.0.1.0 - - forkable-monad ==0.2.0.3 - - forma ==1.1.3 - - format-numbers ==0.1.0.1 - - formatting ==6.3.7 - - foundation ==0.0.26.1 - - fourmolu ==0.3.0.0 - - free ==5.1.5 - - free-categories ==0.2.0.2 - - freenect ==1.2.1 - - freer-simple ==1.2.1.1 - - freetype2 ==0.2.0 - - free-vl ==0.1.4 - - friendly-time ==0.4.1 - - from-sum ==0.2.3.0 - - frontmatter ==0.1.0.2 - - fsnotify ==0.3.0.1 - - fsnotify-conduit ==0.1.1.1 - - ftp-client ==0.5.1.4 - - ftp-client-conduit ==0.5.0.5 - - funcmp ==1.9 - - function-builder ==0.3.0.1 - - functor-classes-compat ==1.0.1 - - fusion-plugin ==0.2.2 - - fusion-plugin-types ==0.1.0 - - fuzzcheck ==0.1.1 - - fuzzy ==0.1.0.0 - - fuzzy-dates ==0.1.1.2 - - fuzzyset ==0.2.0 - - fuzzy-time ==0.1.0.0 - - gauge ==0.2.5 - - gd ==3000.7.3 - - gdp ==0.0.3.0 - - general-games ==1.1.1 - - generic-aeson ==0.2.0.12 - - generic-arbitrary ==0.1.0 - - generic-constraints ==1.1.1.1 - - generic-data ==0.9.2.0 - - generic-data-surgery ==0.3.0.0 - - generic-deriving ==1.13.1 - - generic-functor ==0.2.0.0 - - generic-lens ==2.1.0.0 - - generic-lens-core ==2.1.0.0 - - generic-monoid ==0.1.0.1 - - generic-optics ==2.1.0.0 - - GenericPretty ==1.2.2 - - generic-random ==1.3.0.1 - - generics-eot ==0.4.0.1 - - generics-sop ==0.5.1.1 - - generics-sop-lens ==0.2.0.1 - - geniplate-mirror ==0.7.7 - - genvalidity ==0.11.0.0 - - genvalidity-aeson ==0.3.0.0 - - genvalidity-bytestring ==0.6.0.0 - - genvalidity-containers ==0.9.0.0 - - genvalidity-criterion ==0.2.0.0 - - genvalidity-hspec ==0.7.0.4 - - genvalidity-hspec-aeson ==0.3.1.1 - - genvalidity-hspec-binary ==0.2.0.4 - - genvalidity-hspec-cereal ==0.2.0.4 - - genvalidity-hspec-hashable ==0.2.0.5 - - genvalidity-hspec-optics ==0.1.1.2 - - genvalidity-hspec-persistent ==0.0.0.1 - - genvalidity-mergeful ==0.2.0.0 - - genvalidity-mergeless ==0.2.0.0 - - genvalidity-path ==0.3.0.4 - - genvalidity-persistent ==0.0.0.0 - - genvalidity-property ==0.5.0.1 - - genvalidity-scientific ==0.2.1.1 - - genvalidity-sydtest ==0.0.0.0 - - genvalidity-sydtest-aeson ==0.0.0.0 - - genvalidity-sydtest-hashable ==0.0.0.0 - - genvalidity-sydtest-lens ==0.0.0.0 - - genvalidity-sydtest-persistent ==0.0.0.1 - - genvalidity-text ==0.7.0.2 - - genvalidity-time ==0.3.0.0 - - genvalidity-typed-uuid ==0.0.0.2 - - genvalidity-unordered-containers ==0.3.0.1 - - genvalidity-uuid ==0.1.0.4 - - genvalidity-vector ==0.3.0.1 - - geojson ==4.0.2 - - getopt-generics ==0.13.0.4 - - ghc-byteorder ==4.11.0.0.10 - - ghc-check ==0.5.0.4 - - ghc-core ==0.5.6 - - ghc-events ==0.16.0 - - ghc-exactprint ==0.6.4 - - ghcid ==0.8.7 - - ghci-hexcalc ==0.1.1.0 - - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.4.20210206 - - ghc-lib-parser ==8.10.4.20210206 - - ghc-lib-parser-ex ==8.10.0.19 - - ghc-parser ==0.2.3.0 - - ghc-paths ==0.1.0.12 - - ghc-prof ==1.4.1.8 - - ghc-source-gen ==0.4.0.0 - - ghc-syntax-highlighter ==0.0.6.0 - - ghc-tcplugins-extra ==0.4.1 - - ghc-trace-events ==0.1.2.2 - - ghc-typelits-extra ==0.4.2 - - ghc-typelits-knownnat ==0.7.5 - - ghc-typelits-natnormalise ==0.7.4 - - ghc-typelits-presburger ==0.6.0.0 - - ghost-buster ==0.1.1.0 - - gi-atk ==2.0.22 - - gi-cairo ==1.0.24 - - gi-cairo-connector ==0.1.0 - - gi-cairo-render ==0.1.0 - - gi-dbusmenu ==0.4.8 - - gi-dbusmenugtk3 ==0.4.9 - - gi-gdk ==3.0.23 - - gi-gdkpixbuf ==2.0.24 - - gi-gdkx11 ==3.0.10 - - gi-gio ==2.0.27 - - gi-glib ==2.0.24 - - gi-gobject ==2.0.25 - - gi-graphene ==1.0.2 - - gi-gtk ==3.0.36 - - gi-gtk-hs ==0.3.9 - - gi-harfbuzz ==0.0.3 - - ginger ==0.10.1.0 - - gingersnap ==0.3.1.0 - - gi-pango ==1.0.23 - - githash ==0.1.5.0 - - github-release ==1.3.7 - - github-rest ==1.0.3 - - github-types ==0.2.1 - - github-webhooks ==0.15.0 - - gitlab-haskell ==0.2.5 - - gitrev ==1.3.1 - - gi-xlib ==2.0.9 - - gl ==0.9 - - glabrous ==2.0.3 - - GLFW-b ==3.3.0.0 - - Glob ==0.10.1 - - gloss ==1.13.2.1 - - gloss-rendering ==1.13.1.1 - - GLURaw ==2.0.0.4 - - GLUT ==2.7.0.16 - - gluturtle ==0.0.58.1 - - gnuplot ==0.5.6.1 - - google-isbn ==1.0.3 - - gopher-proxy ==0.1.1.2 - - gothic ==0.1.6 - - gpolyline ==0.1.0.1 - - graph-core ==0.3.0.0 - - graphite ==0.10.0.1 - - graphql-client ==1.1.1 - - graphs ==0.7.1 - - graphula ==2.0.0.4 - - graphviz ==2999.20.1.0 - - graph-wrapper ==0.2.6.0 - - gravatar ==0.8.0 - - greskell ==1.2.0.1 - - greskell-core ==0.1.3.6 - - greskell-websocket ==0.1.2.5 - - groom ==0.1.2.1 - - group-by-date ==0.1.0.4 - - groups ==0.5.2 - - gtk-sni-tray ==0.1.6.0 - - gtk-strut ==0.1.3.0 - - guarded-allocation ==0.0.1 - - H ==0.9.0.1 - - hackage-db ==2.1.0 - - hackage-security ==0.6.0.1 - - haddock-library ==1.9.0 - - hadoop-streaming ==0.2.0.3 - - hakyll-convert ==0.3.0.4 - - half ==0.3.1 - - hall-symbols ==0.1.0.6 - - hamtsolo ==1.0.3 - - HandsomeSoup ==0.4.2 - - hapistrano ==0.4.1.3 - - happstack-server ==7.7.0 - - happy ==1.20.0 - - happy-meta ==0.2.0.11 - - HasBigDecimal ==0.1.1 - - hasbolt ==0.1.4.4 - - hashable ==1.3.0.0 - - hashable-time ==0.2.1 - - hashids ==1.0.2.4 - - hashing ==0.1.0.1 - - hashmap ==1.3.3 - - hashtables ==1.2.4.1 - - haskeline ==0.8.1.2 - - haskell-awk ==1.2 - - haskell-gi ==0.24.7 - - haskell-gi-base ==0.24.5 - - haskell-gi-overloading ==1.0 - - haskell-import-graph ==1.0.4 - - haskell-lexer ==1.1 - - haskell-lsp ==0.22.0.0 - - haskell-lsp-types ==0.22.0.0 - - haskell-names ==0.9.9 - - HaskellNet ==0.6 - - haskell-src ==1.0.3.1 - - haskell-src-exts ==1.23.1 - - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.7 - - haskey-btree ==0.3.0.1 - - hasql ==1.4.5.1 - - hasql-notifications ==0.2.0.0 - - hasql-optparse-applicative ==0.3.0.6 - - hasql-pool ==0.5.2 - - hasql-queue ==1.2.0.2 - - hasql-transaction ==1.0.0.2 - - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.3.0 - - HaXml ==1.25.5 - - haxr ==3000.11.4.1 - - HCodecs ==0.5.2 - - hdaemonize ==0.5.6 - - HDBC ==2.4.0.3 - - HDBC-session ==0.1.2.0 - - headroom ==0.4.1.0 - - heap ==1.0.4 - - heaps ==0.4 - - hebrew-time ==0.1.2 - - hedgehog ==1.0.5 - - hedgehog-corpus ==0.2.0 - - hedgehog-fakedata ==0.0.1.4 - - hedgehog-fn ==1.0 - - hedgehog-quickcheck ==0.1.1 - - hedis ==0.14.2 - - hedn ==0.3.0.2 - - here ==1.2.13 - - heredoc ==0.2.0.0 - - heterocephalus ==1.0.5.4 - - hexml ==0.3.4 - - hexml-lens ==0.2.1 - - hexpat ==0.20.13 - - hformat ==0.3.3.1 - - hfsevents ==0.1.6 - - hgrev ==0.2.6 - - hidapi ==0.1.7 - - hie-bios ==0.7.5 - - hi-file-parser ==0.1.2.0 - - higher-leveldb ==0.6.0.0 - - highlighting-kate ==0.6.4 - - hinfo ==0.0.3.0 - - hinotify ==0.4.1 - - hint ==0.9.0.4 - - hjsmin ==0.2.0.4 - - hkd-default ==1.1.0.0 - - hkgr ==0.2.7 - - hlibcpuid ==0.2.0 - - hlibgit2 ==0.18.0.16 - - hlibsass ==0.1.10.1 - - hmatrix ==0.20.2 - - hmatrix-backprop ==0.1.3.0 - - hmatrix-gsl ==0.19.0.1 - - hmatrix-gsl-stats ==0.4.1.8 - - hmatrix-morpheus ==0.1.1.2 - - hmatrix-vector-sized ==0.1.3.0 - - hmm-lapack ==0.4 - - hmpfr ==0.4.4 - - hnock ==0.4.0 - - hoauth2 ==1.16.0 - - hocon ==0.1.0.4 - - hOpenPGP ==2.9.5 - - hopenpgp-tools ==0.23.6 - - hopfli ==0.2.2.1 - - hosc ==0.18.1 - - hostname ==1.0 - - hostname-validate ==1.0.0 - - hourglass ==0.2.12 - - hourglass-orphans ==0.1.0.0 - - hp2pretty ==0.10 - - hpack ==0.34.4 - - hpack-dhall ==0.5.2 - - hpc-codecov ==0.3.0.0 - - hpc-lcov ==1.0.1 - - hprotoc ==2.4.17 - - hruby ==0.3.8.1 - - hsass ==0.8.0 - - hs-bibutils ==6.10.0.0 - - hsc2hs ==0.68.7 - - hscolour ==1.24.4 - - hsdns ==1.8 - - hsebaysdk ==0.4.1.0 - - hsemail ==2.2.1 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - - hsini ==0.5.1.2 - - hsinstall ==2.6 - - HSlippyMap ==3.0.1 - - hslogger ==1.3.1.0 - - hslua ==1.3.0.1 - - hslua-aeson ==1.0.3.1 - - hslua-module-doclayout ==0.2.0.1 - - hslua-module-path ==0.1.0.1 - - hslua-module-system ==0.2.2.1 - - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.7 - - HsOpenSSL-x509-system ==0.1.0.4 - - hsp ==0.10.0 - - hspec ==2.7.10 - - hspec-attoparsec ==0.1.0.2 - - hspec-checkers ==0.1.0.2 - - hspec-contrib ==0.5.1 - - hspec-core ==2.7.10 - - hspec-discover ==2.7.10 - - hspec-expectations ==0.8.2 - - hspec-expectations-json ==1.0.0.3 - - hspec-expectations-lifted ==0.10.0 - - hspec-expectations-pretty-diff ==0.7.2.5 - - hspec-golden ==0.1.0.3 - - hspec-golden-aeson ==0.7.0.0 - - hspec-hedgehog ==0.0.1.2 - - hspec-junit-formatter ==1.0.0.2 - - hspec-leancheck ==0.0.4 - - hspec-megaparsec ==2.2.0 - - hspec-meta ==2.7.8 - - hspec-need-env ==0.1.0.6 - - hspec-parsec ==0 - - hspec-smallcheck ==0.5.2 - - hspec-tables ==0.0.1 - - hspec-wai ==0.11.0 - - hspec-wai-json ==0.11.0 - - hs-php-session ==0.0.9.3 - - hsshellscript ==3.5.0 - - hs-tags ==0.1.5 - - HStringTemplate ==0.8.7 - - HSvm ==0.1.1.3.22 - - HsYAML ==0.2.1.0 - - HsYAML-aeson ==0.2.0.0 - - hsyslog ==5.0.2 - - htaglib ==1.2.0 - - HTF ==0.14.0.6 - - html ==1.0.1.2 - - html-conduit ==1.3.2.1 - - html-entities ==1.1.4.5 - - html-entity-map ==0.1.0.0 - - htoml ==1.0.0.3 - - http2 ==3.0.1 - - HTTP ==4000.3.16 - - http-api-data ==0.4.2 - - http-client ==0.6.4.1 - - http-client-openssl ==0.3.2.0 - - http-client-overrides ==0.1.1.0 - - http-client-tls ==0.3.5.3 - - http-common ==0.8.2.1 - - http-conduit ==2.3.8 - - http-date ==0.0.11 - - http-directory ==0.1.8 - - http-download ==0.2.0.0 - - httpd-shed ==0.4.1.1 - - http-link-header ==1.2.0 - - http-media ==0.8.0.0 - - http-query ==0.1.0.1 - - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.7.2 - - http-types ==0.12.3 - - human-readable-duration ==0.2.1.4 - - HUnit ==1.6.2.0 - - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==2.0.0.4 - - hvect ==0.4.0.0 - - hvega ==0.11.0.1 - - hw-balancedparens ==0.4.1.1 - - hw-bits ==0.7.2.1 - - hw-conduit ==0.2.1.0 - - hw-conduit-merges ==0.2.1.0 - - hw-diagnostics ==0.0.1.0 - - hw-dsv ==0.4.1.0 - - hweblib ==0.6.3 - - hw-eliasfano ==0.1.2.0 - - hw-excess ==0.2.3.0 - - hw-fingertree ==0.1.2.0 - - hw-fingertree-strict ==0.1.2.0 - - hw-hedgehog ==0.1.1.0 - - hw-hspec-hedgehog ==0.1.1.0 - - hw-int ==0.0.2.0 - - hw-ip ==2.4.2.0 - - hw-json ==1.3.2.2 - - hw-json-simd ==0.1.1.0 - - hw-json-simple-cursor ==0.1.1.0 - - hw-json-standard-cursor ==0.2.3.1 - - hw-kafka-client ==4.0.3 - - hw-mquery ==0.2.1.0 - - hw-packed-vector ==0.2.1.0 - - hw-parser ==0.1.1.0 - - hw-prim ==0.6.3.0 - - hw-rankselect ==0.13.4.0 - - hw-rankselect-base ==0.3.4.1 - - hw-simd ==0.1.2.0 - - hw-streams ==0.0.1.0 - - hw-string-parse ==0.0.0.4 - - hw-succinct ==0.1.0.1 - - hw-xml ==0.5.1.0 - - hxt ==9.3.1.22 - - hxt-charproperties ==9.5.0.0 - - hxt-css ==0.1.0.3 - - hxt-curl ==9.1.1.1 - - hxt-expat ==9.1.1 - - hxt-http ==9.1.5.2 - - hxt-regex-xmlschema ==9.2.0.7 - - hxt-tagsoup ==9.1.4 - - hxt-unicode ==9.0.2.4 - - hybrid-vectors ==0.2.2 - - hyper ==0.2.1.0 - - hyperloglog ==0.4.4 - - hyphenation ==0.8.1 - - iconv ==0.4.1.3 - - identicon ==0.2.2 - - ieee754 ==0.8.0 - - if ==0.1.0.0 - - iff ==0.0.6 - - ihaskell ==0.10.2.0 - - ihs ==0.1.0.3 - - ilist ==0.4.0.1 - - imagesize-conduit ==1.1 - - Imlib ==0.1.2 - - immortal ==0.3 - - immortal-queue ==0.1.0.1 - - inbox ==0.1.0 - - include-file ==0.1.0.4 - - incremental-parser ==0.5.0.2 - - indents ==0.5.0.1 - - indexed ==0.1.3 - - indexed-containers ==0.1.0.2 - - indexed-list-literals ==0.2.1.3 - - indexed-profunctors ==0.1.1 - - indexed-traversable ==0.1.1 - - indexed-traversable-instances ==0.1 - - infer-license ==0.2.0 - - inflections ==0.4.0.6 - - influxdb ==1.9.1.2 - - ini ==0.4.1 - - inj ==1.0 - - inline-c ==0.9.1.4 - - inline-c-cpp ==0.4.0.3 - - inline-r ==0.10.4 - - inliterate ==0.1.0 - - input-parsers ==0.2.2 - - insert-ordered-containers ==0.2.4 - - inspection-testing ==0.4.4.0 - - instance-control ==0.1.2.0 - - int-cast ==0.2.0.0 - - integer-logarithms ==1.0.3.1 - - integer-roots ==1.0 - - integration ==0.2.1 - - intern ==0.9.4 - - interpolate ==0.2.1 - - interpolatedstring-perl6 ==1.0.2 - - interpolation ==0.1.1.1 - - interpolator ==1.1.0.2 - - IntervalMap ==0.6.1.2 - - intervals ==0.9.2 - - intro ==0.9.0.0 - - intset-imperative ==0.1.0.0 - - invariant ==0.5.4 - - invertible ==0.2.0.7 - - invertible-grammar ==0.1.3 - - io-machine ==0.2.0.0 - - io-manager ==0.1.0.3 - - io-memoize ==1.1.1.0 - - io-region ==0.1.1 - - io-storage ==0.3 - - io-streams ==1.5.2.0 - - io-streams-haproxy ==1.0.1.0 - - ip6addr ==1.0.2 - - ipa ==0.3 - - iproute ==1.7.11 - - IPv6Addr ==2.0.2 - - ipynb ==0.1.0.1 - - ipython-kernel ==0.10.2.1 - - irc ==0.6.1.0 - - irc-client ==1.1.2.0 - - irc-conduit ==0.3.0.4 - - irc-ctcp ==0.1.3.0 - - isbn ==1.1.0.2 - - islink ==0.1.0.0 - - iso3166-country-codes ==0.20140203.8 - - iso639 ==0.1.0.3 - - iso8601-time ==0.1.5 - - iterable ==3.0 - - ixset-typed ==0.5 - - ixset-typed-binary-instance ==0.1.0.2 - - ixset-typed-conversions ==0.1.2.0 - - ixset-typed-hashable-instance ==0.1.0.2 - - ix-shapable ==0.1.0 - - jack ==0.7.2 - - jalaali ==1.0.0.0 - - jira-wiki-markup ==1.3.4 - - jose ==0.8.4 - - jose-jwt ==0.9.2 - - js-chart ==2.9.4.1 - - js-dgtable ==0.5.2 - - js-flot ==0.8.3 - - js-jquery ==3.3.1 - - json-feed ==1.0.12 - - jsonpath ==0.2.0.0 - - json-rpc ==1.0.3 - - json-rpc-generic ==0.2.1.5 - - JuicyPixels ==3.3.5 - - JuicyPixels-blurhash ==0.1.0.3 - - JuicyPixels-extra ==0.4.1 - - JuicyPixels-scale-dct ==0.1.2 - - junit-xml ==0.1.0.2 - - justified-containers ==0.3.0.0 - - jwt ==0.10.0 - - kan-extensions ==5.2.2 - - kanji ==3.4.1 - - katip ==0.8.5.0 - - katip-logstash ==0.1.0.0 - - kawhi ==0.3.0 - - kazura-queue ==0.1.0.4 - - kdt ==0.2.4 - - keep-alive ==0.2.0.0 - - keycode ==0.2.2 - - keys ==3.12.3 - - ki ==0.2.0.1 - - kind-apply ==0.3.2.0 - - kind-generics ==0.4.1.0 - - kind-generics-th ==0.2.2.2 - - kmeans ==0.1.3 - - koji ==0.0.1 - - koofr-client ==1.0.0.3 - - krank ==0.2.2 - - kubernetes-webhook-haskell ==0.2.0.3 - - l10n ==0.1.0.1 - - labels ==0.3.3 - - lackey ==1.0.14 - - LambdaHack ==0.10.2.0 - - lame ==0.2.0 - - language-avro ==0.1.3.1 - - language-bash ==0.9.2 - - language-c ==0.8.3 - - language-c-quote ==0.12.2.1 - - language-docker ==9.3.0 - - language-java ==0.2.9 - - language-javascript ==0.7.1.0 - - language-protobuf ==1.0.1 - - language-python ==0.5.8 - - language-thrift ==0.12.0.0 - - lapack ==0.3.2 - - lapack-carray ==0.0.3 - - lapack-comfort-array ==0.0.0.1 - - lapack-ffi ==0.0.3 - - lapack-ffi-tools ==0.1.2.1 - - largeword ==1.2.5 - - latex ==0.1.0.4 - - lattices ==2.0.2 - - lawful ==0.1.0.0 - - lazy-csv ==0.5.1 - - lazyio ==0.1.0.4 - - lca ==0.4 - - leancheck ==0.9.4 - - leancheck-instances ==0.0.4 - - leapseconds-announced ==2017.1.0.1 - - learn-physics ==0.6.5 - - lens ==4.19.2 - - lens-action ==0.2.5 - - lens-aeson ==1.1.1 - - lens-csv ==0.1.1.0 - - lens-datetime ==0.3 - - lens-family ==2.0.0 - - lens-family-core ==2.0.0 - - lens-family-th ==0.5.2.0 - - lens-misc ==0.0.2.0 - - lens-process ==0.4.0.0 - - lens-properties ==4.11.1 - - lens-regex ==0.1.3 - - lens-regex-pcre ==1.1.0.0 - - lenz ==0.4.2.0 - - leveldb-haskell ==0.6.5 - - libffi ==0.1 - - libgit ==0.3.1 - - libgraph ==1.14 - - libjwt-typed ==0.2 - - libmpd ==0.10.0.0 - - liboath-hs ==0.0.1.2 - - libyaml ==0.1.2 - - LibZip ==1.0.1 - - lifted-async ==0.10.2 - - lifted-base ==0.2.3.12 - - lift-generics ==0.2 - - lift-type ==0.1.0.1 - - line ==4.0.1 - - linear ==1.21.5 - - linear-circuit ==0.1.0.2 - - linenoise ==0.3.2 - - linux-file-extents ==0.2.0.0 - - linux-namespaces ==0.1.3.0 - - liquid-fixpoint ==0.8.10.2 - - List ==0.6.2 - - ListLike ==4.7.4 - - list-predicate ==0.1.0.1 - - listsafe ==0.1.0.1 - - list-singleton ==1.0.0.5 - - list-t ==1.0.4 - - ListTree ==0.2.3 - - little-rio ==0.2.2 - - llvm-hs ==9.0.1 - - llvm-hs-pure ==9.0.0 - - lmdb ==0.2.5 - - load-env ==0.2.1.0 - - loc ==0.1.3.10 - - locators ==0.3.0.3 - - loch-th ==0.2.2 - - lockfree-queue ==0.2.3.1 - - log-domain ==0.13.1 - - logfloat ==0.13.3.3 - - logging ==3.0.5 - - logging-facade ==0.3.0 - - logging-facade-syslog ==1 - - logict ==0.7.1.0 - - logstash ==0.1.0.1 - - loop ==0.3.0 - - lrucache ==1.2.0.1 - - lrucaching ==0.3.3 - - lsp-test ==0.11.0.5 - - lucid ==2.9.12.1 - - lucid-cdn ==0.2.2.0 - - lucid-extras ==0.2.2 - - lukko ==0.1.1.3 - - lz4-frame-conduit ==0.1.0.1 - - lzma ==0.0.0.3 - - lzma-conduit ==1.2.1 - - machines ==0.7.2 - - magic ==1.1 - - magico ==0.0.2.1 - - mainland-pretty ==0.7.0.1 - - main-tester ==0.2.0.1 - - makefile ==1.1.0.0 - - managed ==1.0.8 - - MapWith ==0.2.0.0 - - markdown ==0.1.17.4 - - markdown-unlit ==0.5.1 - - markov-chain ==0.0.3.4 - - massiv ==0.6.0.0 - - massiv-io ==0.4.1.0 - - massiv-persist ==0.1.0.0 - - massiv-serialise ==0.1.0.0 - - massiv-test ==0.1.6.1 - - mathexpr ==0.3.0.0 - - math-extras ==0.1.1.0 - - math-functions ==0.3.4.2 - - matplotlib ==0.7.5 - - matrices ==0.5.0 - - matrix ==0.3.6.1 - - matrix-as-xyz ==0.1.2.2 - - matrix-market-attoparsec ==0.1.1.3 - - matrix-static ==0.3 - - maximal-cliques ==0.1.1 - - mbox ==0.3.4 - - mbox-utility ==0.0.3.1 - - mcmc ==0.4.0.0 - - mcmc-types ==1.0.3 - - medea ==1.2.0 - - median-stream ==0.7.0.0 - - med-module ==0.1.2.1 - - megaparsec ==9.0.1 - - megaparsec-tests ==9.0.1 - - membrain ==0.0.0.2 - - memory ==0.15.0 - - MemoTrie ==0.6.10 - - mercury-api ==0.1.0.2 - - mergeful ==0.2.0.0 - - mergeless ==0.3.0.0 - - mersenne-random-pure64 ==0.2.2.0 - - messagepack ==0.5.4 - - metrics ==0.4.1.1 - - mfsolve ==0.3.2.0 - - microlens ==0.4.12.0 - - microlens-aeson ==2.3.1 - - microlens-contra ==0.1.0.2 - - microlens-ghc ==0.4.13 - - microlens-mtl ==0.2.0.1 - - microlens-platform ==0.4.2 - - microlens-process ==0.2.0.2 - - microlens-th ==0.4.3.9 - - microspec ==0.2.1.3 - - microstache ==1.0.1.2 - - midair ==0.2.0.1 - - midi ==0.2.2.2 - - mighty-metropolis ==2.0.0 - - mime-mail ==0.5.1 - - mime-mail-ses ==0.4.3 - - mime-types ==0.1.0.9 - - mini-egison ==1.0.0 - - minimal-configuration ==0.1.4 - - minimorph ==0.3.0.0 - - minio-hs ==1.5.3 - - miniutter ==0.5.1.1 - - min-max-pqueue ==0.1.0.2 - - mintty ==0.1.2 - - missing-foreign ==0.1.1 - - MissingH ==1.4.3.0 - - mixed-types-num ==0.4.1 - - mltool ==0.2.0.1 - - mmap ==0.5.9 - - mmark ==0.0.7.2 - - mmark-cli ==0.0.5.0 - - mmark-ext ==0.2.1.3 - - mmorph ==1.1.5 - - mnist-idx ==0.1.2.8 - - mockery ==0.3.5 - - mock-time ==0.1.0 - - mod ==0.1.2.2 - - model ==0.5 - - modern-uri ==0.3.4.1 - - modular ==0.1.0.8 - - monad-chronicle ==1.0.0.1 - - monad-control ==1.0.2.3 - - monad-control-aligned ==0.0.1.1 - - monad-coroutine ==0.9.1 - - monad-extras ==0.6.0 - - monadic-arrays ==0.2.2 - - monad-journal ==0.8.1 - - monadlist ==0.0.2 - - monad-logger ==0.3.36 - - monad-logger-json ==0.1.0.0 - - monad-logger-logstash ==0.1.0.0 - - monad-logger-prefix ==0.1.12 - - monad-loops ==0.4.3 - - monad-memo ==0.5.3 - - monad-metrics ==0.2.2.0 - - monad-par ==0.3.5 - - monad-parallel ==0.7.2.4 - - monad-par-extras ==0.3.3 - - monad-peel ==0.2.1.2 - - monad-primitive ==0.1 - - monad-products ==4.0.1 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.3 - - monad-resumption ==0.1.4.0 - - monad-skeleton ==0.1.5 - - monad-st ==0.2.4.1 - - monads-tf ==0.1.0.3 - - monad-time ==0.3.1.0 - - monad-unlift ==0.2.0 - - monad-unlift-ref ==0.2.1 - - mongoDB ==2.7.0.0 - - monoid-subclasses ==1.0.1 - - monoid-transformer ==0.0.4 - - mono-traversable ==1.0.15.1 - - mono-traversable-instances ==0.1.1.0 - - mono-traversable-keys ==0.1.0 - - more-containers ==0.2.2.2 - - morpheus-graphql ==0.17.0 - - morpheus-graphql-app ==0.17.0 - - morpheus-graphql-client ==0.17.0 - - morpheus-graphql-core ==0.17.0 - - morpheus-graphql-subscriptions ==0.17.0 - - moss ==0.2.0.0 - - mountpoints ==1.0.2 - - mpi-hs ==0.7.2.0 - - mpi-hs-binary ==0.1.1.0 - - mpi-hs-cereal ==0.1.0.0 - - mtl-compat ==0.2.2 - - mtl-prelude ==2.0.3.1 - - multiarg ==0.30.0.10 - - multi-containers ==0.1.1 - - multimap ==1.2.1 - - multipart ==0.2.1 - - multiset ==0.3.4.3 - - multistate ==0.8.0.3 - - murmur3 ==1.0.4 - - murmur-hash ==0.1.0.9 - - MusicBrainz ==0.4.1 - - mustache ==2.3.1 - - mutable-containers ==0.3.4 - - mwc-probability ==2.3.1 - - mwc-random ==0.14.0.0 - - mwc-random-monad ==0.7.3.1 - - mx-state-codes ==1.0.0.0 - - mysql ==0.2.0.1 - - mysql-simple ==0.4.5 - - n2o ==0.11.1 - - nagios-check ==0.3.2 - - names-th ==0.3.0.1 - - nano-erl ==0.1.0.1 - - nanospec ==0.2.2 - - nats ==1.1.2 - - natural-induction ==0.2.0.0 - - natural-sort ==0.1.2 - - natural-transformation ==0.4 - - ndjson-conduit ==0.1.0.5 - - neat-interpolation ==0.5.1.2 - - netcode-io ==0.0.2 - - netlib-carray ==0.1 - - netlib-comfort-array ==0.0.0.1 - - netlib-ffi ==0.1.1 - - netpbm ==1.0.4 - - nettle ==0.3.0 - - netwire ==5.0.3 - - netwire-input ==0.0.7 - - netwire-input-glfw ==0.0.11 - - network ==3.1.1.1 - - network-bsd ==2.8.1.0 - - network-byte-order ==0.1.6 - - network-conduit-tls ==1.3.2 - - network-info ==0.2.0.10 - - network-ip ==0.3.0.3 - - network-messagepack-rpc ==0.1.2.0 - - network-messagepack-rpc-websocket ==0.1.1.1 - - network-run ==0.2.4 - - network-simple ==0.4.5 - - network-simple-tls ==0.4 - - network-transport ==0.5.4 - - network-transport-composed ==0.2.1 - - network-uri ==2.6.4.1 - - newtype ==0.2.2.0 - - newtype-generics ==0.6 - - nicify-lib ==1.0.1 - - NineP ==0.0.2.1 - - nix-derivation ==1.1.2 - - nix-paths ==1.0.1 - - nonce ==1.0.7 - - nondeterminism ==1.4 - - non-empty ==0.3.3 - - nonempty-containers ==0.3.4.1 - - nonemptymap ==0.0.6.0 - - non-empty-sequence ==0.2.0.4 - - nonempty-vector ==0.2.1.0 - - nonempty-zipper ==1.0.0.2 - - non-negative ==0.1.2 - - not-gloss ==0.7.7.0 - - no-value ==1.0.0.0 - - nowdoc ==0.1.1.0 - - nqe ==0.6.3 - - nri-env-parser ==0.1.0.7 - - nri-observability ==0.1.0.2 - - nri-prelude ==0.6.0.0 - - nsis ==0.3.3 - - numbers ==3000.2.0.2 - - numeric-extras ==0.1 - - numeric-prelude ==0.4.3.3 - - numhask ==0.6.0.2 - - NumInstances ==1.4 - - numtype-dk ==0.5.0.2 - - nuxeo ==0.3.2 - - nvim-hs ==2.1.0.4 - - nvim-hs-contrib ==2.0.0.0 - - nvim-hs-ghcid ==2.0.0.0 - - oauthenticated ==0.2.1.0 - - ObjectName ==1.1.0.1 - - o-clock ==1.2.0.1 - - odbc ==0.2.2 - - oeis2 ==1.0.5 - - ofx ==0.4.4.0 - - old-locale ==1.0.0.7 - - old-time ==1.1.0.3 - - once ==0.4 - - one-liner ==1.0 - - one-liner-instances ==0.1.2.1 - - OneTuple ==0.2.2.1 - - Only ==0.1 - - oo-prototypes ==0.1.0.0 - - opaleye ==0.7.1.0 - - OpenAL ==1.7.0.5 - - openapi3 ==3.1.0 - - open-browser ==0.2.1.0 - - openexr-write ==0.1.0.2 - - OpenGL ==3.0.3.0 - - OpenGLRaw ==3.3.4.0 - - openpgp-asciiarmor ==0.1.2 - - opensource ==0.1.1.0 - - openssl-streams ==1.2.3.0 - - opentelemetry ==0.6.1 - - opentelemetry-extra ==0.6.1 - - opentelemetry-lightstep ==0.6.1 - - opentelemetry-wai ==0.6.1 - - operational ==0.2.3.5 - - operational-class ==0.3.0.0 - - optics ==0.3 - - optics-core ==0.3.0.1 - - optics-extra ==0.3 - - optics-th ==0.3.0.2 - - optics-vl ==0.2.1 - - optional-args ==1.0.2 - - options ==1.2.1.1 - - optparse-applicative ==0.16.1.0 - - optparse-generic ==1.4.4 - - optparse-simple ==0.1.1.3 - - optparse-text ==0.1.1.0 - - ordered-containers ==0.2.2 - - ormolu ==0.1.4.1 - - overhang ==1.0.0 - - packcheck ==0.5.1 - - packdeps ==0.6.0.0 - - pager ==0.1.1.0 - - pagination ==0.2.2 - - pagure-cli ==0.2 - - pandoc ==2.13 - - pandoc-dhall-decoder ==0.1.0.1 - - pandoc-plot ==1.1.1 - - pandoc-throw ==0.1.0.0 - - pandoc-types ==1.22 - - pantry ==0.5.1.5 - - parallel ==3.2.2.0 - - parallel-io ==0.3.3 - - parameterized ==0.5.0.0 - - paripari ==0.7.0.0 - - parseargs ==0.2.0.9 - - parsec-class ==1.0.0.0 - - parsec-numbers ==0.1.0 - - parsec-numeric ==0.1.0.0 - - ParsecTools ==0.0.2.0 - - parser-combinators ==1.2.1 - - parser-combinators-tests ==1.2.1 - - parsers ==0.12.10 - - partial-handler ==1.0.3 - - partial-isomorphisms ==0.2.2.1 - - partial-semigroup ==0.5.1.8 - - password ==3.0.0.0 - - password-instances ==3.0.0.0 - - password-types ==1.0.0.0 - - path ==0.7.0 - - path-binary-instance ==0.1.0.1 - - path-extensions ==0.1.1.0 - - path-extra ==0.2.0 - - path-io ==1.6.2 - - path-like ==0.2.0.2 - - path-pieces ==0.2.1 - - path-text-utf8 ==0.0.1.6 - - pathtype ==0.8.1.1 - - pathwalk ==0.3.1.2 - - pattern-arrows ==0.0.2 - - pava ==0.1.1.1 - - pcg-random ==0.1.3.7 - - pcre2 ==1.1.4 - - pcre-heavy ==1.0.0.2 - - pcre-light ==0.4.1.0 - - pcre-utils ==0.1.8.2 - - pdfinfo ==1.5.4 - - peano ==0.1.0.1 - - pem ==0.2.4 - - percent-format ==0.0.1 - - peregrin ==0.3.1 - - perfect-hash-generator ==0.2.0.6 - - perfect-vector-shuffle ==0.1.1.1 - - persist ==0.1.1.5 - - persistable-record ==0.6.0.5 - - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.11.0.4 - - persistent-documentation ==0.1.0.2 - - persistent-mtl ==0.2.1.0 - - persistent-mysql ==2.10.3.1 - - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.11.0.1 - - persistent-qq ==2.9.2.1 - - persistent-sqlite ==2.11.1.0 - - persistent-template ==2.9.1.0 - - persistent-test ==2.0.3.5 - - persistent-typed-db ==0.1.0.2 - - pg-harness-client ==0.6.0 - - pgp-wordlist ==0.1.0.3 - - pg-transact ==0.3.1.1 - - phantom-state ==0.2.1.2 - - pid1 ==0.1.2.0 - - pinboard ==0.10.2.0 - - pipes ==4.3.15 - - pipes-aeson ==0.4.1.8 - - pipes-attoparsec ==0.5.1.5 - - pipes-binary ==0.4.2 - - pipes-bytestring ==2.1.7 - - pipes-concurrency ==2.0.12 - - pipes-csv ==1.4.3 - - pipes-extras ==1.0.15 - - pipes-fastx ==0.3.0.0 - - pipes-group ==1.0.12 - - pipes-http ==1.0.6 - - pipes-network ==0.6.5 - - pipes-network-tls ==0.4 - - pipes-ordered-zip ==1.2.1 - - pipes-parse ==3.0.9 - - pipes-random ==1.0.0.5 - - pipes-safe ==2.3.3 - - pipes-wai ==3.2.0 - - pkcs10 ==0.2.0.0 - - pkgtreediff ==0.4.1 - - place-cursor-at ==1.0.1 - - placeholders ==0.1 - - plaid ==0.1.0.4 - - plotlyhs ==0.2.1 - - pointed ==5.0.2 - - pointedlist ==0.6.1 - - pointless-fun ==1.1.0.6 - - poll ==0.0.0.2 - - poly ==0.5.0.0 - - poly-arity ==0.1.0 - - polynomials-bernstein ==1.1.2 - - polyparse ==1.13 - - polysemy ==1.5.0.0 - - polysemy-plugin ==0.3.0.0 - - pooled-io ==0.0.2.2 - - port-utils ==0.2.1.0 - - posix-paths ==0.2.1.6 - - possibly ==1.0.0.0 - - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.4 - - postgresql-libpq ==0.9.4.3 - - postgresql-libpq-notify ==0.2.0.0 - - postgresql-orm ==0.5.1 - - postgresql-simple ==0.6.4 - - postgresql-typed ==0.6.2.0 - - postgrest ==7.0.1 - - post-mess-age ==0.2.1.0 - - pptable ==0.3.0.0 - - pqueue ==1.4.1.3 - - prairie ==0.0.1.0 - - prefix-units ==0.2.0 - - prelude-compat ==0.0.0.2 - - prelude-safeenum ==0.1.1.2 - - prettyclass ==1.0.0.0 - - pretty-class ==1.0.1.1 - - pretty-diff ==0.4.0.3 - - pretty-hex ==1.1 - - prettyprinter ==1.7.0 - - prettyprinter-ansi-terminal ==1.1.2 - - prettyprinter-compat-annotated-wl-pprint ==1.1 - - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - - prettyprinter-compat-wl-pprint ==1.0.0.1 - - prettyprinter-convert-ansi-wl-pprint ==1.1.1 - - pretty-relative-time ==0.2.0.0 - - pretty-show ==1.10 - - pretty-simple ==4.0.0.0 - - pretty-sop ==0.2.0.3 - - pretty-terminal ==0.1.0.0 - - primes ==0.2.1.0 - - primitive ==0.7.1.0 - - primitive-addr ==0.1.0.2 - - primitive-extras ==0.10.1 - - primitive-unaligned ==0.1.1.1 - - primitive-unlifted ==0.1.3.0 - - print-console-colors ==0.1.0.0 - - probability ==0.2.7 - - process-extras ==0.7.4 - - product-isomorphic ==0.0.3.3 - - product-profunctors ==0.11.0.2 - - profiterole ==0.1 - - profunctors ==5.5.2 - - projectroot ==0.2.0.1 - - project-template ==0.2.1.0 - - prometheus ==2.2.2 - - prometheus-client ==1.0.1 - - prometheus-wai-middleware ==1.0.1.0 - - promises ==0.3 - - prompt ==0.1.1.2 - - prospect ==0.1.0.0 - - proto3-wire ==1.2.1 - - protobuf ==0.2.1.3 - - protobuf-simple ==0.1.1.0 - - protocol-buffers ==2.4.17 - - protocol-buffers-descriptor ==2.4.17 - - protocol-radius ==0.0.1.1 - - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.0.0 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - - protolude ==0.3.0 - - proxied ==0.3.1 - - psqueues ==0.2.7.2 - - publicsuffix ==0.20200526 - - pulse-simple ==0.1.14 - - pureMD5 ==2.1.3 - - purescript-bridge ==0.14.0.0 - - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==2.1.0.0 - - pvar ==1.0.0.0 - - PyF ==0.9.0.3 - - qchas ==1.1.0.1 - - qm-interpolated-string ==0.3.0.0 - - qrcode-core ==0.9.4 - - qrcode-juicypixels ==0.8.2 - - quadratic-irrational ==0.1.1 - - QuasiText ==0.1.2.6 - - QuickCheck ==2.14.2 - - quickcheck-arbitrary-adt ==0.3.1.0 - - quickcheck-assertions ==0.3.0 - - quickcheck-classes ==0.6.5.0 - - quickcheck-classes-base ==0.6.2.0 - - quickcheck-higherorder ==0.1.0.0 - - quickcheck-instances ==0.3.25.2 - - quickcheck-io ==0.2.0 - - quickcheck-simple ==0.1.1.1 - - quickcheck-special ==0.1.0.6 - - quickcheck-text ==0.1.2.1 - - quickcheck-transformer ==0.3.1.1 - - quickcheck-unicode ==1.0.1.0 - - quiet ==0.2 - - quote-quot ==0.2.0.0 - - radius ==0.7.1.0 - - rainbow ==0.34.2.2 - - rainbox ==0.26.0.0 - - ral ==0.2 - - rampart ==1.1.0.2 - - ramus ==0.1.2 - - rando ==0.0.0.4 - - random ==1.1 - - random-bytestring ==0.1.4 - - random-fu ==0.2.7.4 - - random-shuffle ==0.0.4 - - random-source ==0.3.0.8 - - random-tree ==0.6.0.5 - - range ==0.3.0.2 - - ranged-list ==0.1.0.0 - - Ranged-sets ==0.4.0 - - range-set-list ==0.1.3.1 - - rank1dynamic ==0.4.1 - - rank2classes ==1.4.1 - - Rasterific ==0.7.5.3 - - rasterific-svg ==0.3.3.2 - - ratel ==1.0.14 - - rate-limit ==1.4.2 - - ratel-wai ==1.1.5 - - rattle ==0.2 - - rattletrap ==11.1.0 - - Rattus ==0.5 - - rawfilepath ==0.2.4 - - rawstring-qm ==0.2.3.0 - - raw-strings-qq ==1.1 - - rcu ==0.2.5 - - rdf ==0.1.0.5 - - rdtsc ==1.3.0.1 - - re2 ==0.3 - - readable ==0.3.1 - - read-editor ==0.1.0.2 - - read-env-var ==1.0.0.0 - - rebase ==1.6.1 - - record-dot-preprocessor ==0.2.10 - - record-hasfield ==1.0 - - records-sop ==0.1.1.0 - - record-wrangler ==0.1.1.0 - - recursion-schemes ==5.2.2.1 - - reducers ==3.12.3 - - refact ==0.3.0.2 - - ref-fd ==0.4.0.2 - - refined ==0.6.2 - - reflection ==2.1.6 - - reform ==0.2.7.4 - - reform-blaze ==0.2.4.3 - - reform-hamlet ==0.0.5.3 - - reform-happstack ==0.2.5.4 - - RefSerialize ==0.4.0 - - ref-tf ==0.4.0.2 - - regex ==1.1.0.0 - - regex-applicative ==0.3.4 - - regex-applicative-text ==0.1.0.1 - - regex-base ==0.94.0.1 - - regex-compat ==0.95.2.1 - - regex-compat-tdfa ==0.95.1.4 - - regex-pcre ==0.95.0.0 - - regex-pcre-builtin ==0.95.2.3.8.43 - - regex-posix ==0.96.0.0 - - regex-tdfa ==1.3.1.0 - - regex-with-pcre ==1.1.0.0 - - registry ==0.2.0.3 - - reinterpret-cast ==0.1.0 - - relapse ==1.0.0.0 - - relational-query ==0.12.2.3 - - relational-query-HDBC ==0.7.2.0 - - relational-record ==0.2.2.0 - - relational-schemas ==0.1.8.0 - - reliable-io ==0.0.1 - - relude ==0.7.0.0 - - renderable ==0.2.0.1 - - replace-attoparsec ==1.4.4.0 - - replace-megaparsec ==1.4.4.0 - - repline ==0.4.0.0 - - req ==3.9.0 - - req-conduit ==1.0.0 - - rerebase ==1.6.1 - - rescue ==0.4.2.1 - - resistor-cube ==0.0.1.2 - - resolv ==0.1.2.0 - - resource-pool ==0.2.3.2 - - resourcet ==1.2.4.2 - - result ==0.2.6.0 - - rethinkdb-client-driver ==0.0.25 - - retry ==0.8.1.2 - - rev-state ==0.1.2 - - rfc1751 ==0.1.3 - - rfc5051 ==0.2 - - rhbzquery ==0.4.3 - - rhine ==0.7.0 - - rhine-gloss ==0.7.0 - - rigel-viz ==0.2.0.0 - - rio ==0.1.20.0 - - rio-orphans ==0.1.2.0 - - rio-prettyprint ==0.1.1.0 - - roc-id ==0.1.0.0 - - rocksdb-haskell ==1.0.1 - - rocksdb-haskell-jprupp ==2.1.3 - - rocksdb-query ==0.4.2 - - roles ==0.2.0.0 - - rope-utf16-splay ==0.3.2.0 - - rosezipper ==0.2 - - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.3.2 - - RSA ==2.4.1 - - runmemo ==1.0.0.1 - - rvar ==0.2.0.6 - - safe ==0.3.19 - - safe-coloured-text ==0.0.0.0 - - safecopy ==0.10.4.2 - - safe-decimal ==0.2.0.0 - - safe-exceptions ==0.1.7.1 - - safe-foldable ==0.1.0.0 - - safeio ==0.0.5.0 - - safe-json ==1.1.1.1 - - safe-money ==0.9 - - SafeSemaphore ==0.10.1 - - safe-tensor ==0.2.1.1 - - salak ==0.3.6 - - salak-yaml ==0.3.5.3 - - saltine ==0.1.1.1 - - salve ==1.0.11 - - sample-frame ==0.0.3 - - sample-frame-np ==0.0.4.1 - - sampling ==0.3.5 - - sandwich ==0.1.0.3 - - sandwich-slack ==0.1.0.3 - - sandwich-webdriver ==0.1.0.4 - - say ==0.1.0.1 - - sbp ==2.6.3 - - scalpel ==0.6.2 - - scalpel-core ==0.6.2 - - scanf ==0.1.0.0 - - scanner ==0.3.1 - - scheduler ==1.5.0 - - scientific ==0.3.6.2 - - scotty ==0.12 - - scrypt ==0.5.0 - - sdl2 ==2.5.3.0 - - sdl2-gfx ==0.2 - - sdl2-image ==2.0.0 - - sdl2-mixer ==1.1.0 - - sdl2-ttf ==2.1.2 - - search-algorithms ==0.3.1 - - secp256k1-haskell ==0.5.0 - - securemem ==0.1.10 - - selda ==0.5.1.0 - - selda-json ==0.1.1.0 - - selda-postgresql ==0.1.8.1 - - selda-sqlite ==0.1.7.1 - - selections ==0.3.0.0 - - selective ==0.4.2 - - semialign ==1.1.0.1 - - semialign-indexed ==1.1 - - semialign-optics ==1.1 - - semigroupoid-extras ==5 - - semigroupoids ==5.3.5 - - semigroups ==0.19.1 - - semirings ==0.6 - - semiring-simple ==1.0.0.1 - - semver ==0.4.0.1 - - sendfile ==0.7.11.1 - - sendgrid-v3 ==0.3.0.0 - - seqalign ==0.2.0.4 - - seqid ==0.6.2 - - seqid-streams ==0.7.2 - - sequence-formats ==1.6.1 - - sequenceTools ==1.4.0.5 - - serf ==0.1.1.0 - - serialise ==0.2.3.0 - - servant ==0.18.2 - - servant-auth ==0.4.0.0 - - servant-auth-client ==0.4.1.0 - - servant-auth-docs ==0.2.10.0 - - servant-auth-server ==0.4.6.0 - - servant-auth-swagger ==0.2.10.1 - - servant-blaze ==0.9.1 - - servant-client ==0.18.2 - - servant-client-core ==0.18.2 - - servant-conduit ==0.15.1 - - servant-docs ==0.11.8 - - servant-elm ==0.7.2 - - servant-errors ==0.1.6.0 - - servant-exceptions ==0.2.1 - - servant-exceptions-server ==0.2.1 - - servant-foreign ==0.15.3 - - servant-http-streams ==0.18.2 - - servant-machines ==0.15.1 - - servant-multipart ==0.12 - - servant-openapi3 ==2.0.1.2 - - servant-pipes ==0.15.2 - - servant-rawm ==1.0.0.0 - - servant-server ==0.18.2 - - servant-swagger ==1.1.10 - - servant-swagger-ui ==0.3.5.3.47.1 - - servant-swagger-ui-core ==0.3.5 - - serverless-haskell ==0.12.6 - - serversession ==1.0.2 - - serversession-frontend-wai ==1.0 - - ses-html ==0.4.0.0 - - set-cover ==0.1.1 - - setenv ==0.1.1.3 - - setlocale ==1.0.0.10 - - sexp-grammar ==2.3.0 - - SHA ==1.6.4.4 - - shake-language-c ==0.12.0 - - shake-plus ==0.3.3.1 - - shake-plus-extended ==0.4.1.0 - - shakespeare ==2.0.25 - - shared-memory ==0.2.0.0 - - shell-conduit ==5.0.0 - - shell-escape ==0.2.0 - - shellmet ==0.0.4.0 - - shelltestrunner ==1.9 - - shell-utility ==0.1 - - shelly ==1.9.0 - - shikensu ==0.3.11 - - shortcut-links ==0.5.1.1 - - should-not-typecheck ==2.1.0 - - show-combinators ==0.2.0.0 - - siggy-chardust ==1.0.0 - - signal ==0.1.0.4 - - silently ==1.2.5.1 - - simple-affine-space ==0.1.1 - - simple-cabal ==0.1.3 - - simple-cmd ==0.2.3 - - simple-cmd-args ==0.1.6 - - simple-log ==0.9.12 - - simple-reflect ==0.3.3 - - simple-sendfile ==0.2.30 - - simple-templates ==1.0.0 - - simple-vec3 ==0.6.0.1 - - simplistic-generics ==2.0.0 - - since ==0.0.0 - - singleton-bool ==0.1.5 - - singleton-nats ==0.4.5 - - singletons ==2.7 - - singletons-presburger ==0.6.0.0 - - siphash ==1.0.3 - - sitemap-gen ==0.1.0.0 - - sized ==1.0.0.0 - - skein ==1.0.9.4 - - skews ==0.1.0.3 - - skip-var ==0.1.1.0 - - skylighting ==0.10.5.1 - - skylighting-core ==0.10.5.1 - - slack-api ==0.12 - - slack-progressbar ==0.1.0.1 - - slick ==1.1.1.0 - - slist ==0.2.0.0 - - slynx ==0.5.0.2 - - smallcheck ==1.2.1 - - smash ==0.1.2 - - smash-aeson ==0.1.0.0 - - smash-lens ==0.1.0.1 - - smash-microlens ==0.1.0.0 - - smoothie ==0.4.2.11 - - smtp-mail ==0.3.0.0 - - snap-blaze ==0.2.1.5 - - snap-core ==1.0.4.2 - - snap-server ==1.1.2.0 - - snowflake ==0.1.1.1 - - soap ==0.2.3.6 - - soap-openssl ==0.1.0.2 - - soap-tls ==0.1.1.4 - - socket ==0.8.3.0 - - socks ==0.6.1 - - some ==1.0.3 - - sop-core ==0.5.0.1 - - sort ==1.0.0.0 - - sorted-list ==0.2.1.0 - - sourcemap ==0.1.6.1 - - sox ==0.2.3.1 - - soxlib ==0.0.3.1 - - spacecookie ==1.0.0.0 - - sparse-linear-algebra ==0.3.1 - - sparse-tensor ==0.2.1.5 - - spatial-math ==0.5.0.1 - - special-values ==0.1.0.0 - - speculate ==0.4.6 - - speedy-slice ==0.3.2 - - Spintax ==0.3.6 - - splice ==0.6.1.1 - - splint ==1.0.1.4 - - split ==0.2.3.4 - - splitmix ==0.1.0.3 - - spoon ==0.3.1 - - spreadsheet ==0.1.3.8 - - sqlcli ==0.2.2.0 - - sqlcli-odbc ==0.2.0.1 - - sqlite-simple ==0.4.18.0 - - sql-words ==0.1.6.4 - - squeal-postgresql ==0.7.0.1 - - squeather ==0.6.0.0 - - srcloc ==0.5.1.2 - - stache ==2.2.1 - - stackcollapse-ghc ==0.0.1.3 - - stack-templatizer ==0.1.0.2 - - stateref ==0.3 - - StateVar ==1.2.1 - - static-text ==0.2.0.6 - - statistics ==0.15.2.0 - - status-notifier-item ==0.3.0.5 - - stb-image-redux ==0.2.1.3 - - step-function ==0.2 - - stm-chans ==3.0.0.4 - - stm-conduit ==4.0.1 - - stm-containers ==1.2 - - stm-delay ==0.1.1.1 - - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.6 - - stm-lifted ==2.5.0.0 - - STMonadTrans ==0.4.5 - - stm-split ==0.0.2.1 - - stopwatch ==0.1.0.6 - - storable-complex ==0.2.3.0 - - storable-endian ==0.2.6 - - storable-record ==0.0.5 - - storable-tuple ==0.0.3.3 - - storablevector ==0.2.13.1 - - store ==0.7.11 - - store-core ==0.4.4.4 - - store-streaming ==0.2.0.3 - - stratosphere ==0.59.1 - - streaming ==0.2.3.0 - - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.2.0 - - streaming-commons ==0.2.2.1 - - streamly ==0.7.3 - - streams ==3.3 - - strict ==0.4.0.1 - - strict-concurrency ==0.2.4.3 - - strict-list ==0.1.5 - - strict-tuple ==0.1.4 - - strict-tuple-lens ==0.1.0.1 - - stringbuilder ==0.5.1 - - string-class ==0.1.7.0 - - string-combinators ==0.6.0.5 - - string-conv ==0.1.2 - - string-conversions ==0.4.0.1 - - string-interpolate ==0.3.1.0 - - string-qq ==0.0.4 - - string-random ==0.1.4.1 - - stringsearch ==0.3.6.6 - - string-transform ==1.1.1 - - stripe-concepts ==1.0.2.6 - - stripe-core ==2.6.2 - - stripe-haskell ==2.6.2 - - stripe-http-client ==2.6.2 - - stripe-tests ==2.6.2 - - strive ==5.0.14 - - structs ==0.1.5 - - structured ==0.1.0.1 - - structured-cli ==2.7.0.1 - - subcategories ==0.1.1.0 - - sum-type-boilerplate ==0.1.1 - - sundown ==0.6 - - superbuffer ==0.3.1.1 - - svg-tree ==0.6.2.4 - - swagger ==0.3.0 - - swagger2 ==2.6 - - sweet-egison ==0.1.1.3 - - swish ==0.10.0.4 - - syb ==0.7.2.1 - - sydtest ==0.1.0.0 - - sydtest-discover ==0.0.0.0 - - sydtest-persistent-sqlite ==0.0.0.0 - - sydtest-servant ==0.0.0.0 - - sydtest-wai ==0.0.0.0 - - sydtest-yesod ==0.0.0.0 - - symbol ==0.2.4 - - symengine ==0.1.2.0 - - symmetry-operations-symbols ==0.0.2.1 - - sysinfo ==0.1.1 - - system-argv0 ==0.1.1 - - systemd ==2.3.0 - - system-fileio ==0.3.16.4 - - system-filepath ==0.4.14 - - system-info ==0.5.2 - - tabular ==0.2.2.8 - - taffybar ==3.2.3 - - tagchup ==0.4.1.1 - - tagged ==0.8.6.1 - - tagged-binary ==0.2.0.1 - - tagged-identity ==0.1.3 - - tagged-transformer ==0.8.1 - - tagshare ==0.0 - - tagsoup ==0.14.8 - - tao ==1.0.0 - - tao-example ==1.0.0 - - tar ==0.5.1.1 - - tar-conduit ==0.3.2 - - tardis ==0.4.3.0 - - tasty ==1.4.1 - - tasty-ant-xml ==1.1.8 - - tasty-bench ==0.2.5 - - tasty-dejafu ==2.0.0.7 - - tasty-discover ==4.2.2 - - tasty-expected-failure ==0.12.3 - - tasty-focus ==1.0.1 - - tasty-golden ==2.3.4 - - tasty-hedgehog ==1.0.1.0 - - tasty-hspec ==1.1.6 - - tasty-hunit ==0.10.0.3 - - tasty-hunit-compat ==0.2.0.1 - - tasty-kat ==0.0.3 - - tasty-leancheck ==0.0.1 - - tasty-lua ==0.2.3.2 - - tasty-program ==1.0.5 - - tasty-quickcheck ==0.10.1.2 - - tasty-rerun ==1.1.18 - - tasty-silver ==3.2.1 - - tasty-smallcheck ==0.8.2 - - tasty-test-reporter ==0.1.1.4 - - tasty-th ==0.1.7 - - tasty-wai ==0.1.1.1 - - Taxonomy ==2.1.0 - - TCache ==0.12.1 - - tce-conf ==1.3 - - tdigest ==0.2.1.1 - - template-haskell-compat-v0208 ==0.1.5 - - temporary ==1.3 - - temporary-rc ==1.2.0.3 - - temporary-resourcet ==0.1.0.1 - - tensorflow-test ==0.1.0.0 - - tensors ==0.1.5 - - termbox ==0.3.0 - - terminal-progress-bar ==0.4.1 - - terminal-size ==0.3.2.1 - - test-framework ==0.8.2.0 - - test-framework-hunit ==0.3.0.2 - - test-framework-leancheck ==0.0.1 - - test-framework-quickcheck2 ==0.3.0.5 - - test-framework-smallcheck ==0.2 - - test-fun ==0.1.0.0 - - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.2 - - text-ansi ==0.1.1 - - text-binary ==0.2.1.1 - - text-builder ==0.6.6.2 - - text-conversions ==0.3.1 - - text-format ==0.3.2 - - text-icu ==0.7.0.1 - - text-latin1 ==0.3.1 - - text-ldap ==0.1.1.13 - - textlocal ==0.1.0.5 - - text-manipulate ==0.3.0.0 - - text-metrics ==0.3.0 - - text-postgresql ==0.0.3.1 - - text-printer ==0.5.0.1 - - text-regex-replace ==0.1.1.4 - - text-region ==0.3.1.0 - - text-short ==0.1.3 - - text-show ==3.9 - - text-show-instances ==3.8.4 - - text-zipper ==0.11 - - tfp ==1.0.2 - - tf-random ==0.5 - - th-abstraction ==0.4.2.0 - - th-bang-compat ==0.0.1.0 - - th-compat ==0.1.2 - - th-constraint-compat ==0.0.1.0 - - th-data-compat ==0.1.0.0 - - th-desugar ==1.11 - - th-env ==0.1.0.2 - - these ==1.1.1.1 - - these-lens ==1.0.1.2 - - these-optics ==1.0.1.2 - - these-skinny ==0.7.4 - - th-expand-syns ==0.4.8.0 - - th-extras ==0.0.0.4 - - th-lift ==0.8.2 - - th-lift-instances ==0.1.18 - - th-nowq ==0.1.0.5 - - th-orphans ==0.13.11 - - th-printf ==0.7 - - thread-hierarchy ==0.3.0.2 - - thread-local-storage ==0.2 - - threads ==0.5.1.6 - - thread-supervisor ==0.2.0.0 - - threepenny-gui ==0.9.0.0 - - th-reify-compat ==0.0.1.5 - - th-reify-many ==0.1.9 - - throttle-io-stream ==0.2.0.1 - - through-text ==0.1.0.0 - - throwable-exceptions ==0.1.0.9 - - th-strict-compat ==0.1.0.1 - - th-test-utils ==1.1.0 - - th-utilities ==0.2.4.3 - - thyme ==0.3.5.5 - - tidal ==1.7.4 - - tile ==0.3.0.0 - - time-compat ==1.9.5 - - timeit ==2.0 - - timelens ==0.2.0.2 - - time-lens ==0.4.0.2 - - time-locale-compat ==0.1.1.5 - - time-locale-vietnamese ==1.0.0.0 - - time-manager ==0.0.0 - - time-parsers ==0.1.2.1 - - timerep ==2.0.1.0 - - timer-wheel ==0.3.0 - - time-units ==1.0.0 - - timezone-olson ==0.2.0 - - timezone-series ==0.1.9 - - tinylog ==0.15.0 - - titlecase ==1.0.1 - - tldr ==0.9.0 - - tls ==1.5.5 - - tls-debug ==0.4.8 - - tls-session-manager ==0.0.4 - - tlynx ==0.5.0.2 - - tmapchan ==0.0.3 - - tmapmvar ==0.0.4 - - tmp-postgres ==1.34.1.0 - - tomland ==1.3.2.0 - - tonalude ==0.1.1.1 - - topograph ==1.0.0.1 - - torsor ==0.1 - - tostring ==0.2.1.1 - - transaction ==0.1.1.3 - - transformers-base ==0.4.5.2 - - transformers-bifunctors ==0.1 - - transformers-compat ==0.6.6 - - transformers-fix ==1.0 - - traverse-with-class ==1.0.1.0 - - tree-diff ==0.2 - - tree-fun ==0.8.1.0 - - tree-view ==0.5.1 - - trifecta ==2.1.1 - - triplesec ==0.2.2.1 - - tsv2csv ==0.1.0.2 - - ttc ==0.4.0.0 - - ttl-hashtables ==1.4.1.0 - - ttrie ==0.1.2.1 - - tuple ==0.3.0.2 - - tuples-homogenous-h98 ==0.1.1.0 - - tuple-sop ==0.3.1.0 - - tuple-th ==0.2.5 - - turtle ==1.5.22 - - typecheck-plugin-nat-simple ==0.1.0.2 - - TypeCompose ==0.9.14 - - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 - - type-equality ==1 - - type-errors ==0.2.0.0 - - type-errors-pretty ==0.0.1.1 - - type-hint ==0.1 - - type-level-integers ==0.0.1 - - type-level-kv-list ==1.1.0 - - type-level-natural-number ==2.0 - - type-level-numbers ==0.1.1.1 - - type-map ==0.1.6.0 - - type-natural ==1.1.0.0 - - typenums ==0.1.4 - - type-of-html ==1.6.2.0 - - type-of-html-static ==0.1.0.2 - - type-operators ==0.2.0.0 - - typerep-map ==0.3.3.0 - - type-spec ==0.4.0.0 - - tzdata ==0.2.20201021.0 - - ua-parser ==0.7.6.0 - - uglymemo ==0.1.0.1 - - ulid ==0.3.0.0 - - unagi-chan ==0.4.1.3 - - unbounded-delays ==0.1.1.1 - - unboxed-ref ==0.4.0.0 - - unboxing-vector ==0.2.0.0 - - uncaught-exception ==0.1.0 - - uncertain ==0.3.1.0 - - unconstrained ==0.1.0.2 - - unexceptionalio ==0.5.1 - - unexceptionalio-trans ==0.5.1 - - unicode ==0.0.1.1 - - unicode-show ==0.1.0.4 - - unicode-transforms ==0.3.7.1 - - unification-fd ==0.11.1 - - union-find ==0.2 - - unipatterns ==0.0.0.0 - - uniplate ==1.6.13 - - uniprot-kb ==0.1.2.0 - - uniq-deep ==1.2.0 - - unique ==0.0.1 - - unique-logic ==0.4 - - unique-logic-tf ==0.5.1 - - unit-constraint ==0.0.0 - - universe ==1.2.1 - - universe-base ==1.1.2 - - universe-instances-base ==1.1 - - universe-instances-extended ==1.1.2 - - universe-instances-trans ==1.1 - - universe-reverse-instances ==1.1.1 - - universe-some ==1.2.1 - - universum ==1.7.2 - - unix-bytestring ==0.3.7.3 - - unix-compat ==0.5.3 - - unix-time ==0.4.7 - - unliftio ==0.2.14 - - unliftio-core ==0.2.0.1 - - unliftio-pool ==0.2.1.1 - - unliftio-streams ==0.1.1.1 - - unlit ==0.4.0.0 - - unordered-containers ==0.2.13.0 - - unsafe ==0.0 - - urbit-hob ==0.3.3 - - uri-bytestring ==0.3.3.0 - - uri-bytestring-aeson ==0.1.0.8 - - uri-encode ==1.5.0.7 - - url ==2.1.3 - - users ==0.5.0.0 - - utf8-conversions ==0.1.0.4 - - utf8-light ==0.4.2 - - utf8-string ==1.0.2 - - util ==0.1.17.1 - - utility-ht ==0.0.16 - - uuid ==1.3.14 - - uuid-types ==1.0.4 - - validation ==1.1.1 - - validation-selective ==0.1.0.1 - - validity ==0.11.0.0 - - validity-aeson ==0.2.0.4 - - validity-bytestring ==0.4.1.1 - - validity-containers ==0.5.0.4 - - validity-path ==0.4.0.1 - - validity-persistent ==0.0.0.0 - - validity-primitive ==0.0.0.1 - - validity-scientific ==0.2.0.3 - - validity-text ==0.3.1.1 - - validity-time ==0.4.0.0 - - validity-unordered-containers ==0.2.0.3 - - validity-uuid ==0.1.0.3 - - validity-vector ==0.2.0.3 - - valor ==0.1.0.0 - - vault ==0.3.1.5 - - vec ==0.4 - - vector ==0.12.3.0 - - vector-algorithms ==0.8.0.4 - - vector-binary-instances ==0.2.5.2 - - vector-buffer ==0.4.1 - - vector-builder ==0.3.8.1 - - vector-bytes-instances ==0.1.1 - - vector-circular ==0.1.3 - - vector-instances ==3.4 - - vector-mmap ==0.0.3 - - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.3.1 - - vector-space ==0.16 - - vector-split ==1.0.0.2 - - vector-th-unbox ==0.2.1.9 - - verbosity ==0.4.0.0 - - versions ==4.0.3 - - vformat ==0.14.1.0 - - vformat-aeson ==0.1.0.1 - - vformat-time ==0.1.0.0 - - ViennaRNAParser ==1.3.3 - - vinyl ==0.13.1 - - void ==0.7.3 - - vty ==5.33 - - wai ==3.2.3 - - wai-app-static ==3.1.7.2 - - wai-conduit ==3.0.0.4 - - wai-cors ==0.2.7 - - wai-enforce-https ==0.0.2.1 - - wai-eventsource ==3.0.0 - - wai-extra ==3.1.6 - - wai-feature-flags ==0.1.0.1 - - wai-handler-launch ==3.0.3.1 - - wai-logger ==2.3.6 - - wai-middleware-auth ==0.2.4.1 - - wai-middleware-caching ==0.1.0.2 - - wai-middleware-clacks ==0.1.0.1 - - wai-middleware-static ==0.9.0 - - wai-rate-limit ==0.1.0.0 - - wai-rate-limit-redis ==0.1.0.0 - - wai-saml2 ==0.2.1.2 - - wai-session ==0.3.3 - - wai-session-redis ==0.1.0.1 - - wai-slack-middleware ==0.2.0 - - wai-websockets ==3.0.1.2 - - wakame ==0.1.0.0 - - warp ==3.3.15 - - warp-tls ==3.3.0 - - warp-tls-uid ==0.2.0.6 - - wave ==0.2.0 - - wcwidth ==0.0.2 - - webby ==1.0.1 - - webdriver ==0.9.0.1 - - webex-teams-api ==0.2.0.1 - - webex-teams-conduit ==0.2.0.1 - - webex-teams-pipes ==0.2.0.1 - - webgear-server ==0.2.1 - - webrtc-vad ==0.1.0.3 - - websockets ==0.12.7.2 - - websockets-snap ==0.10.3.1 - - weigh ==0.0.16 - - wide-word ==0.1.1.2 - - wikicfp-scraper ==0.1.0.12 - - wild-bind ==0.1.2.7 - - wild-bind-x11 ==0.2.0.12 - - Win32 ==2.6.1.0 - - Win32-notify ==0.3.0.3 - - windns ==0.1.0.1 - - witch ==0.2.0.2 - - witherable ==0.4.1 - - within ==0.2.0.1 - - with-location ==0.1.0 - - with-utf8 ==1.0.2.2 - - wizards ==1.0.3 - - wl-pprint-annotated ==0.1.0.1 - - wl-pprint-console ==0.1.0.2 - - wl-pprint-text ==1.2.0.1 - - word24 ==2.0.1 - - word8 ==0.1.3 - - word-trie ==0.3.0 - - word-wrap ==0.4.1 - - world-peace ==1.0.2.0 - - wrap ==0.0.0 - - wreq ==0.5.3.3 - - writer-cps-exceptions ==0.1.0.1 - - writer-cps-mtl ==0.1.1.6 - - writer-cps-transformers ==0.5.6.1 - - wss-client ==0.3.0.0 - - wuss ==1.1.18 - - X11 ==1.9.2 - - X11-xft ==0.3.1 - - x11-xim ==0.0.9.0 - - x509 ==1.7.5 - - x509-store ==1.6.7 - - x509-system ==1.6.6 - - x509-validation ==1.6.11 - - Xauth ==0.1 - - xdg-basedir ==0.2.2 - - xdg-desktop-entry ==0.1.1.1 - - xdg-userdirs ==0.1.0.2 - - xeno ==0.4.2 - - xlsx ==0.8.3 - - xlsx-tabular ==0.2.2.1 - - xml ==1.3.14 - - xml-basic ==0.1.3.1 - - xml-conduit ==1.9.1.1 - - xml-conduit-writer ==0.1.1.2 - - xmlgen ==0.6.2.2 - - xml-hamlet ==0.5.0.1 - - xml-helpers ==1.0.0 - - xml-html-qq ==0.1.0.1 - - xml-indexed-cursor ==0.1.1.0 - - xml-lens ==0.3 - - xml-picklers ==0.3.6 - - xml-to-json ==2.0.1 - - xml-to-json-fast ==2.0.0 - - xml-types ==0.3.8 - - xmonad ==0.15 - - xmonad-contrib ==0.16 - - xmonad-extras ==0.15.3 - - xss-sanitize ==0.3.6 - - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.5.0 - - yamlparse-applicative ==0.1.0.3 - - yesod ==1.6.1.1 - - yesod-auth ==1.6.10.3 - - yesod-auth-hashdb ==1.7.1.6 - - yesod-auth-oauth2 ==0.6.3.0 - - yesod-bin ==1.6.1 - - yesod-core ==1.6.19.0 - - yesod-fb ==0.6.1 - - yesod-form ==1.6.7 - - yesod-gitrev ==0.2.1 - - yesod-markdown ==0.12.6.9 - - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.6 - - yesod-paginator ==1.1.1.0 - - yesod-persistent ==1.6.0.6 - - yesod-sitemap ==1.6.0 - - yesod-static ==1.6.1.0 - - yesod-test ==1.6.12 - - yesod-websockets ==0.3.0.3 - - yes-precure5-command ==5.5.3 - - yi-rope ==0.11 - - yjsvg ==0.2.0.1 - - yjtools ==0.9.18 - - yoga ==0.0.0.5 - - youtube ==0.2.1.1 - - zenacy-html ==2.0.3 - - zenacy-unicode ==1.0.1 - - zero ==0.1.5 - - zeromq4-haskell ==0.8.0 - - zeromq4-patterns ==0.3.1.0 - - zim-parser ==0.2.1.0 - - zio ==0.1.0.2 - - zip ==1.7.0 - - zip-archive ==0.4.1 - - zipper-extra ==0.1.3.2 - - zippers ==0.3.1 - - zip-stream ==0.2.1.0 - - zlib ==0.6.2.3 - - zlib-bindings ==0.1.1.5 - - zlib-lens ==0.1.2.1 - - zot ==0.0.3 - - zstd ==0.1.2.0 - - ztail ==1.2.0.2 - - zydiskell ==0.2.0.0 - -extra-packages: - - base16-bytestring < 1 # required for cabal-install etc. - - Cabal == 2.2.* # required for jailbreak-cabal etc. - - Cabal == 2.4.* # required for cabal-install etc. - - Cabal == 3.2.* # required for cabal-install etc. - - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - - dhall == 1.29.0 # required for ats-pkg - - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - - haddock == 2.23.* # required on GHC < 8.10.x - - haddock-api == 2.23.* # required on GHC < 8.10.x - - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - - happy == 1.19.9 # for purescript - - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. - - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - - lsp-test < 0.14 # needed for hls 1.0.0 - - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - - optparse-applicative < 0.16 # needed for niv-0.2.19 - - refinery == 0.3.* # required by hls-tactics-plugin-1.0.0.0 - - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - -package-maintainers: - peti: - - cabal-install - - cabal2nix - - cabal2spec - - distribution-nixpkgs - - funcmp - - git-annex - - hackage-db - - hledger - - hledger-interest - - hledger-ui - - hledger-web - - hopenssl - - hsdns - - hsemail - - hsyslog - - jailbreak-cabal - - language-nix - - logging-facade-syslog - - nix-paths - - pandoc - - structured-haskell-mode - - titlecase - - xmonad - - xmonad-contrib - gridaphobe: - - located-base - jb55: - # - bson-lens - - cased - - elm-export-persistent - # - pipes-mongodb - - streaming-wai - kiwi: - - config-schema - - config-value - - glirc - - irc-core - - matterhorn - - mattermost-api - - mattermost-api-qc - - Unique - psibi: - - path-pieces - - persistent - - persistent-sqlite - - persistent-template - - shakespeare - abbradar: - - Agda - roberth: - - arion-compose - - hercules-ci-agent - - hercules-ci-api - - hercules-ci-api-agent - - hercules-ci-api-core - - hercules-ci-cli - - hercules-ci-cnix-expr - - hercules-ci-cnix-store - cdepillabout: - - pretty-simple - - spago - terlar: - - nix-diff - maralorn: - - reflex-dom - - cabal-fmt - - shh - - neuron - - releaser - - taskwarrior - - haskell-language-server - - shake-bench - - iCalendar - - stm-containers - sorki: - - cayenne-lpp - - data-stm32 - - gcodehs - - nix-derivation - - nix-narinfo - - ttn - - ttn-client - - update-nix-fetchgit - - zre - utdemir: - - nix-tree - turion: - - rhine - - rhine-gloss - - essence-of-live-coding - - essence-of-live-coding-gloss - - essence-of-live-coding-pulse - - essence-of-live-coding-quickcheck - - Agda - - dunai - - finite-typelits - - pulse-simple - - simple-affine-space - sternenseemann: - # also maintain upstream package - - spacecookie - - gopher-proxy - # other packages I can help out for - - systemd - - fast-logger - - Euterpea2 - - utc - - socket - - gitit - - yarn-lock - - yarn2nix - poscat: - - hinit - -unsupported-platforms: - alsa-mixer: [ x86_64-darwin ] - alsa-pcm: [ x86_64-darwin ] - alsa-seq: [ x86_64-darwin ] - AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] - bindings-directfb: [ x86_64-darwin ] - d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - freenect: [ x86_64-darwin ] - FTGL: [ x86_64-darwin ] - gi-ostree: [ x86_64-darwin ] - gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] - hcwiid: [ x86_64-darwin ] - HFuse: [ x86_64-darwin ] - hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - lio-fs: [ x86_64-darwin ] - midi-alsa: [ x86_64-darwin ] - pam: [ x86_64-darwin ] - PortMidi: [ x86_64-darwin ] - Raincat: [ x86_64-darwin ] - reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - rtlsdr: [ x86_64-darwin ] - rubberband: [ x86_64-darwin ] - sdl2-mixer: [ x86_64-darwin ] - sdl2-ttf: [ x86_64-darwin ] - tokyotyrant-haskell: [ x86_64-darwin ] - vulkan: [ i686-linux, armv7l-linux ] - VulkanMemoryAllocator: [ i686-linux, armv7l-linux ] - Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - xattr: [ x86_64-darwin ] - XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] - xmobar: [ x86_64-darwin ] - -dont-distribute-packages: - # Depends on shine, which is a ghcjs project. - - shine-varying - - # these packages depend on software with an unfree license - - accelerate-bignum - - accelerate-blas - - accelerate-cublas - - accelerate-cuda - - accelerate-cufft - - accelerate-examples - - accelerate-fft - - accelerate-fourier-benchmark - - accelerate-io-array - - accelerate-io-bmp - - accelerate-io-bytestring - - accelerate-io-cereal - - accelerate-io-JuicyPixels - - accelerate-io-repa - - accelerate-io-vector - - accelerate-kullback-liebler - - accelerate-llvm-ptx - - bindings-yices - - boolector - - ccelerate-cuda - - containers-accelerate - - cplex-hs - - cublas - - cuda # 2020-08-18 because of dependency nvidia-x11 - - cufft - - cusolver - - cusparse - - gloss-raster-accelerate - - hashable-accelerate - - libnvvm - - matlab - - nvvm - - Obsidian - - odpic-raw - - patch-image - # license for input data unclear, dependency not on Hackage - # see https://github.com/NixOS/nixpkgs/pull/88604 - - tensorflow-mnist - - yices-easy - - yices-painless - - # these packages don't evaluate because they have broken (system) dependencies - - XML - - comark - - couch-simple - - diagrams-hsqml - - diagrams-reflex - - dialog - - fltkhs-demos - - fltkhs-fluid-demos - - fltkhs-hello-world - - fltkhs-themes - - ghcjs-dom-hello - - ghcjs-dom-webkit - - gi-javascriptcore - - gi-webkit - - gi-webkit2 - - gi-webkit2webextension - - gsmenu - - haste-gapi - - haste-perch - - hbro - - hplayground - - hs-mesos - - hsqml - - hsqml-datamodel - - hsqml-datamodel-vinyl - - hsqml-datemodel-vinyl - - hsqml-demo-manic - - hsqml-demo-morris - - hsqml-demo-notes - - hsqml-demo-notes - - hsqml-demo-samples - - hsqml-morris - - hsqml-morris - - hstorchat - - imprevu-happstack - - jsaddle-webkit2gtk - - jsaddle-webkitgtk - - jsc - - lambdacat - - leksah - - manatee-all - - manatee-browser - - manatee-reader - - markup-preview - - nomyx-api - - nomyx-core - - nomyx-language - - nomyx-library - - nomyx-server - - passman-cli - - passman-core - - reflex-dom-colonnade - - reflex-dom-contrib - - reflex-dom-fragment-shader-canvas - - reflex-dom-helpers - - reflex-jsx - - sneathlane-haste - - spike - - tianbar - - trasa-reflex - - treersec - - wai-middleware-brotli - - web-browser-in-haskell - - webkit - - webkitgtk3 - - webkitgtk3-javascriptcore - - websnap - broken-packages: - # These packages don't compile or depend on packages that don't compile. + # These packages don't compile. - 3dmodels - 4Blocks - a50 @@ -4099,7 +1004,6 @@ broken-packages: - Chart-simple - chart-svg - chart-svg-various - - Chart-tests - chart-unit - charter - chatty-text @@ -4649,7 +1553,6 @@ broken-packages: - data-util - data-validation - data-variant - - database-id-class - database-id-groundhog - database-study - datadog @@ -4789,7 +1692,6 @@ broken-packages: - diagrams-boolean - diagrams-braille - diagrams-builder - - diagrams-cairo - diagrams-canvas - diagrams-graphviz - diagrams-gtk @@ -5728,7 +2630,6 @@ broken-packages: - ghcup - ght - gi-cairo-again - - gi-gmodule - gi-graphene - gi-gsk - gi-gstaudio @@ -6564,7 +3465,6 @@ broken-packages: - hidden-char - hie-core - hieraclus - - hierarchical-clustering-diagrams - hierarchical-exceptions - hierarchical-spectral-clustering - hierarchy @@ -7091,7 +3991,6 @@ broken-packages: - hxt-pickle-utils - hxthelper - hxweb - - hyahtzee - hyakko - hybrid - hydra-hs @@ -7112,8 +4011,6 @@ broken-packages: - hylolib - hylotab - hyloutils - - hyper-extra - - hyper-haskell-server - hyperdrive - hyperfunctions - hyperion @@ -7154,22 +4051,7 @@ broken-packages: - ige-mac-integration - ignore - igraph - - ihaskell - - ihaskell-aeson - - ihaskell-basic - - ihaskell-blaze - - ihaskell-charts - - ihaskell-diagrams - - ihaskell-display - - ihaskell-gnuplot - - ihaskell-graphviz - - ihaskell-hatex - - ihaskell-hvega - - ihaskell-inline-r - - ihaskell-juicypixels - - ihaskell-magic - ihaskell-parsec - - ihaskell-plot - ihaskell-rlangqq - ihaskell-widgets - ihttp @@ -8806,7 +5688,6 @@ broken-packages: - Paillier - pairing - palette - - pam - pan-os-syslog - panda - pandoc-citeproc @@ -9090,7 +5971,6 @@ broken-packages: - plot-gtk3 - Plot-ho-matic - plot-lab - - plots - PlslTools - plugins - plugins-auto @@ -10628,9 +7508,7 @@ broken-packages: - streaming-sort - streaming-utils - streaming-with - - streamly-archive - streamly-fsnotify - - streamly-lmdb - streamproc - strelka - strict-base-types @@ -11873,7 +8751,6 @@ broken-packages: - yesod-lucid - yesod-mangopay - yesod-markdown - - yesod-media-simple - yesod-page-cursor - yesod-paginate - yesod-pagination @@ -11904,24 +8781,8 @@ broken-packages: - yggdrasil - yhccore - yhseq - - yi - yi-contrib - - yi-core - - yi-dynamic-configuration - - yi-emacs-colours - - yi-frontend-pango - - yi-frontend-vty - - yi-fuzzy-open - - yi-ireader - - yi-keymap-cua - - yi-keymap-emacs - - yi-keymap-vim - - yi-language - - yi-misc-modes - - yi-mode-haskell - - yi-mode-javascript - yi-monokai - - yi-snippet - yi-solarized - yi-spolsky - yices diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml new file mode 100644 index 0000000000000..fe22ee7ea6de0 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -0,0 +1,428 @@ +# pkgs/development/haskell-modules/configuration-hackage2nix.yaml + +compiler: ghc-8.10.4 + +core-packages: + - array-0.5.4.0 + - base-4.14.1.0 + - binary-0.8.8.0 + - bytestring-0.10.12.0 + - Cabal-3.2.1.0 + - containers-0.6.2.1 + - deepseq-1.4.4.0 + - directory-1.3.6.0 + - exceptions-0.10.4 + - filepath-1.4.2.1 + - ghc-8.10.4 + - ghc-boot-8.10.4 + - ghc-boot-th-8.10.4 + - ghc-compact-0.1.0.0 + - ghc-heap-8.10.4 + - ghc-prim-0.6.1 + - ghci-8.10.4 + - haskeline-0.8.0.1 + - hpc-0.6.1.0 + - integer-gmp-1.0.3.0 + - libiserv-8.10.4 + - mtl-2.2.2 + - parsec-3.1.14.0 + - pretty-1.1.3.6 + - process-1.6.9.0 + - rts-1.0 + - stm-2.5.0.0 + - template-haskell-2.16.0.0 + - terminfo-0.4.1.4 + - text-1.2.4.1 + - time-1.9.3 + - transformers-0.5.6.2 + - unix-2.7.2.2 + - xhtml-3000.2.2.1 + + # Hack: The following package is a core package of GHCJS. If we don't declare + # it, then hackage2nix will generate a Hackage database where all dependants + # of this library are marked as "broken". + - ghcjs-base-0 + +# This is a list of packages with versions from the latest Stackage LTS release. +# +# The packages and versions in this list cause the `hackage2nix` tool to +# generate the package at the given version. +# +# For instance, with a line like the following: +# +# - aeson ==1.4.6.0 +# +# `hackage2nix` will generate the `aeson` package at version 1.4.6.0 in the +# ./hackage-packages.nix file. +# +# Since the packages in the LTS package set are sometimes older than the latest +# on Hackage, `hackage2nix` is smart enough to also generate the latest version +# of a given package. +# +# In the above example with aeson, if there was version 1.5.0.0 of aeson +# available on Hackage, `hackage2nix` would generate two packages, `aeson` +# at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0. +# +# WARNING: This list is generated semiautomatically based on the most recent +# LTS package set. If you want to add entries to it, you must do so before the +# comment saying "# LTS Haskell x.y". Any changes after that comment will be +# lost the next time `update-stackage.sh` runs. +default-package-overrides: + # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag + - MissingH ==1.4.2.0 + # gi-gdkx11-4.x requires gtk-4.x, which is still under development and + # not yet available in Nixpkgs + - gi-gdkx11 < 4 + # Needs Cabal 3.4 for Setup.hs + - gi-javascriptcore < 4.0.23 # + - gi-soup < 2.4.24 # + - gi-webkit2 < 4.0.27 # + +extra-packages: + - base16-bytestring < 1 # required for cabal-install etc. + - Cabal == 2.2.* # required for jailbreak-cabal etc. + - Cabal == 2.4.* # required for cabal-install etc. + - Cabal == 3.2.* # required for cabal-install etc. + - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 + - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 + - dhall == 1.29.0 # required for ats-pkg + - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 + - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 + - haddock == 2.23.* # required on GHC < 8.10.x + - haddock-api == 2.23.* # required on GHC < 8.10.x + - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 + - happy == 1.19.9 # for purescript + - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 + - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. + - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 + - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls + - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 + - optparse-applicative < 0.16 # needed for niv-0.2.19 + - refinery == 0.3.* # required by hls-tactics-plugin-1.0.0.0 + - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x + - sbv == 7.13 # required for pkgs.petrinizer + - gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4 + - gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4 + - gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4 + +package-maintainers: + peti: + - cabal-install + - cabal2nix + - cabal2spec + - distribution-nixpkgs + - funcmp + - git-annex + - hackage-db + - hledger + - hledger-interest + - hledger-ui + - hledger-web + - hopenssl + - hsdns + - hsemail + - hsyslog + - jailbreak-cabal + - language-nix + - logging-facade-syslog + - nix-paths + - pandoc + - structured-haskell-mode + - titlecase + - xmonad + - xmonad-contrib + gridaphobe: + - located-base + jb55: + # - bson-lens + - cased + - elm-export-persistent + # - pipes-mongodb + - streaming-wai + kiwi: + - config-schema + - config-value + - glirc + - irc-core + - matterhorn + - mattermost-api + - mattermost-api-qc + - Unique + psibi: + - path-pieces + - persistent + - persistent-sqlite + - persistent-template + - shakespeare + abbradar: + - Agda + roberth: + - arion-compose + - hercules-ci-agent + - hercules-ci-api + - hercules-ci-api-agent + - hercules-ci-api-core + - hercules-ci-cli + - hercules-ci-cnix-expr + - hercules-ci-cnix-store + cdepillabout: + - pretty-simple + - spago + terlar: + - nix-diff + maralorn: + - reflex-dom + - cabal-fmt + - shh + - neuron + - releaser + - taskwarrior + - haskell-language-server + - shake-bench + - iCalendar + - stm-containers + sorki: + - cayenne-lpp + - data-stm32 + - gcodehs + - nix-derivation + - nix-narinfo + - ttn + - ttn-client + - update-nix-fetchgit + - zre + utdemir: + - nix-tree + turion: + - rhine + - rhine-gloss + - essence-of-live-coding + - essence-of-live-coding-gloss + - essence-of-live-coding-pulse + - essence-of-live-coding-quickcheck + - Agda + - dunai + - finite-typelits + - pulse-simple + - simple-affine-space + sternenseemann: + # also maintain upstream package + - spacecookie + - gopher-proxy + # other packages I can help out for + - systemd + - fast-logger + - flat + - Euterpea2 + - utc + - socket + - gitit + - yarn-lock + - yarn2nix + poscat: + - hinit + bdesham: + - pinboard-notes-backup + +unsupported-platforms: + alsa-mixer: [ x86_64-darwin ] + alsa-pcm: [ x86_64-darwin ] + alsa-seq: [ x86_64-darwin ] + AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] + bdcs-api: [ x86_64-darwin ] + bindings-sane: [ x86_64-darwin ] + bindings-directfb: [ x86_64-darwin ] + cut-the-crap: [ x86_64-darwin ] + d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Euterpea: [ x86_64-darwin ] + freenect: [ x86_64-darwin ] + FTGL: [ x86_64-darwin ] + gi-dbusmenugtk3: [ x86_64-darwin ] + gi-dbusmenu: [ x86_64-darwin ] + gi-ggit: [ x86_64-darwin ] + gi-ibus: [ x86_64-darwin ] + gi-ostree: [ x86_64-darwin ] + gi-vte: [ x86_64-darwin ] + gnome-keyring: [ x86_64-darwin ] + gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] + gtk-sni-tray: [ x86_64-darwin ] + haskell-snake: [ x86_64-darwin ] + hcwiid: [ x86_64-darwin ] + HFuse: [ x86_64-darwin ] + hidapi: [ x86_64-darwin ] + hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + HSoM: [ x86_64-darwin ] + iwlib: [ x86_64-darwin ] + libmodbus: [ x86_64-darwin ] + libsystemd-journal: [ x86_64-darwin ] + libtelnet: [ x86_64-darwin ] + libzfs: [ x86_64-darwin ] + linearEqSolver: [ aarch64-linux ] + lio-fs: [ x86_64-darwin ] + logging-facade-journald: [ x86_64-darwin ] + midi-alsa: [ x86_64-darwin ] + mpi-hs: [ aarch64-linux, x86_64-darwin ] + mpi-hs-binary: [ aarch64-linux, x86_64-darwin ] + mpi-hs-cereal: [ aarch64-linux, x86_64-darwin ] + mpi-hs-store: [ aarch64-linux, x86_64-darwin ] + mplayer-spot: [ aarch64-linux ] + oculus: [ x86_64-darwin ] + pam: [ x86_64-darwin ] + piyo: [ x86_64-darwin ] + PortMidi-simple: [ x86_64-darwin ] + PortMidi: [ x86_64-darwin ] + posix-api: [ x86_64-darwin ] + Raincat: [ x86_64-darwin ] + reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + reflex-dom: [ x86_64-darwin ] + rtlsdr: [ x86_64-darwin ] + rubberband: [ x86_64-darwin ] + sbv: [ aarch64-linux ] + sdl2-mixer: [ x86_64-darwin ] + sdl2-ttf: [ x86_64-darwin ] + synthesizer-alsa: [ x86_64-darwin ] + taffybar: [ x86_64-darwin ] + termonad: [ x86_64-darwin ] + tokyotyrant-haskell: [ x86_64-darwin ] + udev: [ x86_64-darwin ] + vrpn: [ x86_64-darwin ] + vulkan: [ i686-linux, armv7l-linux, x86_64-darwin ] + VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin ] + vulkan-utils: [ x86_64-darwin ] + webkit2gtk3-javascriptcore: [ x86_64-darwin ] + Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + xattr: [ x86_64-darwin ] + xgboost-haskell: [ aarch64-linux, armv7l-linux ] + XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + xmobar: [ x86_64-darwin ] + xmonad-extras: [ x86_64-darwin ] + xmonad-volume: [ x86_64-darwin ] + +dont-distribute-packages: + # Depends on shine, which is a ghcjs project. + - shine-varying + + # these packages depend on software with an unfree license + - accelerate-bignum + - accelerate-blas + - accelerate-cublas + - accelerate-cuda + - accelerate-cufft + - accelerate-examples + - accelerate-fft + - accelerate-fourier-benchmark + - accelerate-io-array + - accelerate-io-bmp + - accelerate-io-bytestring + - accelerate-io-cereal + - accelerate-io-JuicyPixels + - accelerate-io-repa + - accelerate-io-vector + - accelerate-kullback-liebler + - accelerate-llvm-ptx + - bindings-yices + - boolector + - ccelerate-cuda + - containers-accelerate + - cplex-hs + - cublas + - cuda # 2020-08-18 because of dependency nvidia-x11 + - cufft + - cusolver + - cusparse + - gloss-raster-accelerate + - hashable-accelerate + - libnvvm + - matlab + - nvvm + - Obsidian + - odpic-raw + - patch-image + # license for input data unclear, dependency not on Hackage + # see https://github.com/NixOS/nixpkgs/pull/88604 + - tensorflow-mnist + - yices-easy + - yices-painless + + # these packages don't evaluate because they have broken (system) dependencies + - XML + - comark + - couch-simple + - diagrams-hsqml + - diagrams-reflex + - dialog + - fltkhs-demos + - fltkhs-fluid-demos + - fltkhs-hello-world + - fltkhs-themes + - ghcjs-dom-hello + - ghcjs-dom-webkit + - gi-javascriptcore + - gi-webkit + - gi-webkit2 + - gi-webkit2webextension + - gsmenu + - haste-gapi + - haste-perch + - hbro + - hplayground + - hs-mesos + - hsqml + - hsqml-datamodel + - hsqml-datamodel-vinyl + - hsqml-datemodel-vinyl + - hsqml-demo-manic + - hsqml-demo-morris + - hsqml-demo-notes + - hsqml-demo-notes + - hsqml-demo-samples + - hsqml-morris + - hsqml-morris + - hstorchat + - imprevu-happstack + - jsaddle-webkit2gtk + - jsaddle-webkitgtk + - jsc + - lambdacat + - leksah + - manatee-all + - manatee-browser + - manatee-reader + - markup-preview + - nomyx-api + - nomyx-core + - nomyx-language + - nomyx-library + - nomyx-server + - passman-cli + - passman-core + - reflex-dom-colonnade + - reflex-dom-contrib + - reflex-dom-fragment-shader-canvas + - reflex-dom-helpers + - reflex-jsx + - sneathlane-haste + - spike + - tianbar + - trasa-reflex + - treersec + - wai-middleware-brotli + - web-browser-in-haskell + - webkit + - webkitgtk3 + - webkitgtk3-javascriptcore + - websnap diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml new file mode 100644 index 0000000000000..cdae5528cc2e4 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -0,0 +1,2697 @@ +# Stackage Nightly 2021-05-07 +# This file is auto-generated by +# maintainers/scripts/haskell/update-stackage.sh +default-package-overrides: + - abstract-deque ==0.3 + - abstract-par ==0.3.3 + - AC-Angle ==1.0 + - accuerr ==0.2.0.2 + - ace ==0.6 + - action-permutations ==0.0.0.1 + - ad ==4.4.1 + - adjunctions ==4.4 + - adler32 ==0.1.2.0 + - aeson ==1.5.6.0 + - aeson-attoparsec ==0.0.0 + - aeson-better-errors ==0.9.1.0 + - aeson-casing ==0.2.0.0 + - aeson-combinators ==0.0.5.0 + - aeson-commit ==1.3 + - aeson-compat ==0.3.9 + - aeson-default ==0.9.1.0 + - aeson-diff ==1.1.0.9 + - aeson-generic-compat ==0.0.1.3 + - aeson-lens ==0.5.0.0 + - aeson-optics ==1.1.0.1 + - aeson-picker ==0.1.0.5 + - aeson-pretty ==0.8.8 + - aeson-qq ==0.8.3 + - aeson-schemas ==1.3.3 + - aeson-with ==0.1.2.0 + - aeson-yak ==0.1.1.3 + - aeson-yaml ==1.1.0.0 + - Agda ==2.6.1.3 + - agda2lagda ==0.2020.11.1 + - al ==0.1.4.2 + - alarmclock ==0.7.0.5 + - alerts ==0.1.2.0 + - alex ==3.2.6 + - alex-meta ==0.3.0.13 + - alg ==0.2.13.1 + - algebraic-graphs ==0.5 + - Allure ==0.10.2.0 + - almost-fix ==0.0.2 + - alsa-core ==0.5.0.1 + - alsa-mixer ==0.3.0 + - alsa-pcm ==0.6.1.1 + - alsa-seq ==0.6.0.8 + - alternative-vector ==0.0.0 + - ALUT ==2.4.0.3 + - amazonka-apigateway ==1.6.1 + - amazonka-application-autoscaling ==1.6.1 + - amazonka-appstream ==1.6.1 + - amazonka-athena ==1.6.1 + - amazonka-autoscaling ==1.6.1 + - amazonka-budgets ==1.6.1 + - amazonka-certificatemanager ==1.6.1 + - amazonka-cloudformation ==1.6.1 + - amazonka-cloudfront ==1.6.1 + - amazonka-cloudhsm ==1.6.1 + - amazonka-cloudsearch ==1.6.1 + - amazonka-cloudsearch-domains ==1.6.1 + - amazonka-cloudtrail ==1.6.1 + - amazonka-cloudwatch ==1.6.1 + - amazonka-cloudwatch-events ==1.6.1 + - amazonka-cloudwatch-logs ==1.6.1 + - amazonka-codebuild ==1.6.1 + - amazonka-codecommit ==1.6.1 + - amazonka-codedeploy ==1.6.1 + - amazonka-codepipeline ==1.6.1 + - amazonka-cognito-identity ==1.6.1 + - amazonka-cognito-idp ==1.6.1 + - amazonka-cognito-sync ==1.6.1 + - amazonka-config ==1.6.1 + - amazonka-core ==1.6.1 + - amazonka-datapipeline ==1.6.1 + - amazonka-devicefarm ==1.6.1 + - amazonka-directconnect ==1.6.1 + - amazonka-discovery ==1.6.1 + - amazonka-dms ==1.6.1 + - amazonka-ds ==1.6.1 + - amazonka-dynamodb ==1.6.1 + - amazonka-dynamodb-streams ==1.6.1 + - amazonka-ecr ==1.6.1 + - amazonka-ecs ==1.6.1 + - amazonka-efs ==1.6.1 + - amazonka-elasticache ==1.6.1 + - amazonka-elasticbeanstalk ==1.6.1 + - amazonka-elasticsearch ==1.6.1 + - amazonka-elastictranscoder ==1.6.1 + - amazonka-elb ==1.6.1 + - amazonka-elbv2 ==1.6.1 + - amazonka-emr ==1.6.1 + - amazonka-gamelift ==1.6.1 + - amazonka-glacier ==1.6.1 + - amazonka-glue ==1.6.1 + - amazonka-health ==1.6.1 + - amazonka-iam ==1.6.1 + - amazonka-importexport ==1.6.1 + - amazonka-inspector ==1.6.1 + - amazonka-iot ==1.6.1 + - amazonka-iot-dataplane ==1.6.1 + - amazonka-kinesis ==1.6.1 + - amazonka-kinesis-analytics ==1.6.1 + - amazonka-kinesis-firehose ==1.6.1 + - amazonka-kms ==1.6.1 + - amazonka-lambda ==1.6.1 + - amazonka-lightsail ==1.6.1 + - amazonka-marketplace-analytics ==1.6.1 + - amazonka-marketplace-metering ==1.6.1 + - amazonka-ml ==1.6.1 + - amazonka-opsworks ==1.6.1 + - amazonka-opsworks-cm ==1.6.1 + - amazonka-pinpoint ==1.6.1 + - amazonka-polly ==1.6.1 + - amazonka-rds ==1.6.1 + - amazonka-redshift ==1.6.1 + - amazonka-rekognition ==1.6.1 + - amazonka-route53 ==1.6.1 + - amazonka-route53-domains ==1.6.1 + - amazonka-s3 ==1.6.1 + - amazonka-sdb ==1.6.1 + - amazonka-servicecatalog ==1.6.1 + - amazonka-ses ==1.6.1 + - amazonka-shield ==1.6.1 + - amazonka-sms ==1.6.1 + - amazonka-snowball ==1.6.1 + - amazonka-sns ==1.6.1 + - amazonka-sqs ==1.6.1 + - amazonka-ssm ==1.6.1 + - amazonka-stepfunctions ==1.6.1 + - amazonka-storagegateway ==1.6.1 + - amazonka-sts ==1.6.1 + - amazonka-support ==1.6.1 + - amazonka-swf ==1.6.1 + - amazonka-test ==1.6.1 + - amazonka-waf ==1.6.1 + - amazonka-workspaces ==1.6.1 + - amazonka-xray ==1.6.1 + - amqp ==0.22.0 + - amqp-utils ==0.6.1.0 + - annotated-wl-pprint ==0.7.0 + - ansi-terminal ==0.11 + - ansi-wl-pprint ==0.6.9 + - ANum ==0.2.0.2 + - apecs ==0.9.2 + - apecs-gloss ==0.2.4 + - apecs-physics ==0.4.5 + - api-field-json-th ==0.1.0.2 + - api-maker ==0.1.0.0 + - ap-normalize ==0.1.0.0 + - appar ==0.1.8 + - appendmap ==0.1.5 + - apply-refact ==0.9.2.0 + - apportionment ==0.0.0.3 + - approximate ==0.3.4 + - approximate-equality ==1.1.0.2 + - app-settings ==0.2.0.12 + - arbor-lru-cache ==0.1.1.1 + - arithmoi ==0.11.0.1 + - array-memoize ==0.6.0 + - arrow-extras ==0.1.0.1 + - ascii ==1.0.1.4 + - ascii-case ==1.0.0.4 + - ascii-char ==1.0.0.8 + - asciidiagram ==1.3.3.3 + - ascii-group ==1.0.0.4 + - ascii-predicates ==1.0.0.4 + - ascii-progress ==0.3.3.0 + - ascii-superset ==1.0.1.4 + - ascii-th ==1.0.0.4 + - asif ==6.0.4 + - asn1-encoding ==0.9.6 + - asn1-parse ==0.9.5 + - asn1-types ==0.3.4 + - assert-failure ==0.1.2.5 + - assoc ==1.0.2 + - astro ==0.4.2.1 + - async ==2.2.3 + - async-extra ==0.2.0.0 + - async-pool ==0.9.1 + - async-refresh ==0.3.0.0 + - async-refresh-tokens ==0.4.0.0 + - atom-basic ==0.2.5 + - atomic-primops ==0.8.4 + - atomic-write ==0.2.0.7 + - attoparsec ==0.13.2.5 + - attoparsec-base64 ==0.0.0 + - attoparsec-binary ==0.2 + - attoparsec-expr ==0.1.1.2 + - attoparsec-iso8601 ==1.0.2.0 + - attoparsec-path ==0.0.0.1 + - audacity ==0.0.2 + - aur ==7.0.6 + - aura ==3.2.4 + - authenticate ==1.3.5 + - authenticate-oauth ==1.6.0.1 + - auto ==0.4.3.1 + - autoexporter ==1.1.20 + - auto-update ==0.1.6 + - avers ==0.0.17.1 + - avro ==0.5.2.0 + - aws-cloudfront-signed-cookies ==0.2.0.6 + - backprop ==0.2.6.4 + - backtracking ==0.1.0 + - bank-holidays-england ==0.2.0.6 + - barbies ==2.0.2.0 + - base16 ==0.3.0.1 + - base16-bytestring ==1.0.1.0 + - base16-lens ==0.1.3.2 + - base32 ==0.2.0.0 + - base32-lens ==0.1.1.1 + - base32string ==0.9.1 + - base58-bytestring ==0.1.0 + - base58string ==0.10.0 + - base64 ==0.4.2.3 + - base64-bytestring ==1.1.0.0 + - base64-bytestring-type ==1.0.1 + - base64-lens ==0.3.1 + - base64-string ==0.2 + - base-compat ==0.11.2 + - base-compat-batteries ==0.11.2 + - basement ==0.0.12 + - base-orphans ==0.8.4 + - base-prelude ==1.4 + - base-unicode-symbols ==0.2.4.2 + - basic-prelude ==0.7.0 + - bazel-runfiles ==0.12 + - bbdb ==0.8 + - bcp47 ==0.2.0.3 + - bcp47-orphans ==0.1.0.3 + - bcrypt ==0.0.11 + - bech32 ==1.1.0 + - bech32-th ==1.0.2 + - bench ==1.0.12 + - benchpress ==0.2.2.16 + - between ==0.11.0.0 + - bibtex ==0.1.0.6 + - bifunctors ==5.5.11 + - bimap ==0.4.0 + - bimaps ==0.1.0.2 + - bimap-server ==0.1.0.1 + - bin ==0.1.1 + - binary-conduit ==1.3.1 + - binary-ext ==2.0.4 + - binary-ieee754 ==0.1.0.0 + - binary-instances ==1.0.1 + - binary-list ==1.1.1.2 + - binary-orphans ==1.0.1 + - binary-parser ==0.5.7 + - binary-parsers ==0.2.4.0 + - binary-search ==2.0.0 + - binary-shared ==0.8.3 + - binary-tagged ==0.3 + - bindings-DSL ==1.0.25 + - bindings-GLFW ==3.3.2.0 + - bindings-libzip ==1.0.1 + - bindings-uname ==0.1 + - bins ==0.1.2.0 + - bitarray ==0.0.1.1 + - bits ==0.5.3 + - bitset-word8 ==0.1.1.2 + - bits-extra ==0.0.2.0 + - bitvec ==1.1.1.0 + - bitwise-enum ==1.0.1.0 + - blake2 ==0.3.0 + - blanks ==0.5.0 + - blas-carray ==0.1.0.1 + - blas-comfort-array ==0.0.0.2 + - blas-ffi ==0.1 + - blaze-bootstrap ==0.1.0.1 + - blaze-builder ==0.4.2.1 + - blaze-html ==0.9.1.2 + - blaze-markup ==0.8.2.8 + - blaze-svg ==0.3.6.1 + - blaze-textual ==0.2.1.0 + - bmp ==1.2.6.3 + - BNFC ==2.9.1 + - BNFC-meta ==0.6.1 + - board-games ==0.3 + - boltzmann-samplers ==0.1.1.0 + - Boolean ==0.2.4 + - boolean-like ==0.1.1.0 + - boolsimplifier ==0.1.8 + - boots ==0.2.0.1 + - bordacount ==0.1.0.0 + - boring ==0.2 + - both ==0.1.1.1 + - bound ==2.0.3 + - BoundedChan ==1.0.3.0 + - bounded-queue ==1.0.0 + - boundingboxes ==0.2.3 + - bower-json ==1.0.0.1 + - boxes ==0.1.5 + - brick ==0.62 + - broadcast-chan ==0.2.1.1 + - bsb-http-chunked ==0.0.0.4 + - bson ==0.4.0.1 + - btrfs ==0.2.0.0 + - buffer-builder ==0.2.4.7 + - buffer-pipe ==0.0 + - bugsnag-haskell ==0.0.4.1 + - bugsnag-hs ==0.2.0.3 + - bugzilla-redhat ==0.3.1 + - burrito ==1.2.0.1 + - butcher ==1.3.3.2 + - buttplug-hs-core ==0.1.0.0 + - bv ==0.5 + - bv-little ==1.1.1 + - byteable ==0.1.1 + - byte-count-reader ==0.10.1.2 + - bytedump ==1.0 + - byte-order ==0.1.2.0 + - byteorder ==1.0.4 + - bytes ==0.17.1 + - byteset ==0.1.1.0 + - bytestring-builder ==0.10.8.2.0 + - bytestring-conversion ==0.3.1 + - bytestring-lexing ==0.5.0.2 + - bytestring-mmap ==0.2.2 + - bytestring-strict-builder ==0.4.5.4 + - bytestring-to-vector ==0.3.0.1 + - bytestring-tree-builder ==0.2.7.9 + - bz2 ==1.0.1.0 + - bzlib ==0.5.1.0 + - bzlib-conduit ==0.3.0.2 + - c14n ==0.1.0.1 + - c2hs ==0.28.7 + - cabal-appimage ==0.3.0.2 + - cabal-debian ==5.1 + - cabal-doctest ==1.0.8 + - cabal-file ==0.1.1 + - cabal-flatpak ==0.1.0.2 + - cabal-plan ==0.7.2.0 + - cabal-rpm ==2.0.8 + - cache ==0.1.3.0 + - cacophony ==0.10.1 + - calendar-recycling ==0.0.0.1 + - call-stack ==0.3.0 + - can-i-haz ==0.3.1.0 + - capability ==0.4.0.0 + - ca-province-codes ==1.0.0.0 + - cardano-coin-selection ==1.0.1 + - carray ==0.1.6.8 + - casa-client ==0.0.1 + - casa-types ==0.0.2 + - cased ==0.1.0.0 + - case-insensitive ==1.2.1.0 + - cases ==0.1.4.1 + - casing ==0.1.4.1 + - cassava ==0.5.2.0 + - cassava-conduit ==0.6.0 + - cassava-megaparsec ==2.0.2 + - cast ==0.1.0.2 + - category ==0.2.5.0 + - cayley-client ==0.4.15 + - cborg ==0.2.5.0 + - cborg-json ==0.2.2.0 + - cereal ==0.5.8.1 + - cereal-conduit ==0.8.0 + - cereal-text ==0.1.0.2 + - cereal-vector ==0.2.0.1 + - cfenv ==0.1.0.0 + - cgi ==3001.5.0.0 + - chan ==0.0.4.1 + - ChannelT ==0.0.0.7 + - character-cases ==0.1.0.6 + - charset ==0.3.8 + - charsetdetect-ae ==1.1.0.4 + - Chart ==1.9.3 + - chaselev-deque ==0.5.0.5 + - ChasingBottoms ==1.3.1.10 + - cheapskate ==0.1.1.2 + - cheapskate-highlight ==0.1.0.0 + - cheapskate-lucid ==0.1.0.0 + - checkers ==0.5.6 + - checksum ==0.0 + - chimera ==0.3.1.0 + - chiphunk ==0.1.4.0 + - choice ==0.2.2 + - chronologique ==0.3.1.3 + - chronos ==1.1.1 + - chronos-bench ==0.2.0.2 + - chunked-data ==0.3.1 + - cipher-aes ==0.2.11 + - cipher-camellia ==0.0.2 + - cipher-des ==0.0.6 + - cipher-rc4 ==0.1.4 + - circle-packing ==0.1.0.6 + - circular ==0.3.1.1 + - citeproc ==0.3.0.9 + - clash-ghc ==1.2.5 + - clash-lib ==1.2.5 + - clash-prelude ==1.2.5 + - classy-prelude ==1.5.0 + - classy-prelude-conduit ==1.5.0 + - clay ==0.13.3 + - clientsession ==0.9.1.2 + - climb ==0.3.3 + - Clipboard ==2.3.2.0 + - clock ==0.8 + - clock-extras ==0.1.0.2 + - closed ==0.2.0.1 + - clumpiness ==0.17.0.2 + - ClustalParser ==1.3.0 + - cmark ==0.6 + - cmark-gfm ==0.2.2 + - cmark-lucid ==0.1.0.0 + - cmdargs ==0.10.21 + - codec-beam ==0.2.0 + - code-page ==0.2.1 + - collect-errors ==0.1.0.0 + - co-log-concurrent ==0.5.0.0 + - co-log-core ==0.2.1.1 + - Color ==0.3.1 + - colorful-monoids ==0.2.1.3 + - colorize-haskell ==1.0.1 + - colour ==2.3.5 + - combinatorial ==0.1.0.1 + - comfort-array ==0.4.1 + - comfort-graph ==0.0.3.1 + - commonmark ==0.1.1.4 + - commonmark-extensions ==0.2.0.4 + - commonmark-pandoc ==0.2.0.1 + - commutative ==0.0.2 + - comonad ==5.0.8 + - comonad-extras ==4.0.1 + - compactmap ==0.1.4.2.1 + - compdata ==0.12.1 + - compensated ==0.8.3 + - compiler-warnings ==0.1.0 + - composable-associations ==0.1.0.0 + - composable-associations-aeson ==0.1.0.1 + - composite-aeson ==0.7.5.0 + - composite-aeson-path ==0.7.5.0 + - composite-aeson-refined ==0.7.5.0 + - composite-aeson-throw ==0.1.0.0 + - composite-base ==0.7.5.0 + - composite-binary ==0.7.5.0 + - composite-ekg ==0.7.5.0 + - composite-hashable ==0.7.5.0 + - composite-tuple ==0.1.2.0 + - composite-xstep ==0.1.0.0 + - composition ==1.0.2.2 + - composition-extra ==2.0.0 + - concise ==0.1.0.1 + - concurrency ==1.11.0.1 + - concurrent-extra ==0.7.0.12 + - concurrent-output ==1.10.12 + - concurrent-split ==0.0.1.1 + - concurrent-supply ==0.1.8 + - cond ==0.4.1.1 + - conduit ==1.3.4.1 + - conduit-algorithms ==0.0.11.0 + - conduit-combinators ==1.3.0 + - conduit-concurrent-map ==0.1.1 + - conduit-extra ==1.3.5 + - conduit-parse ==0.2.1.0 + - conduit-zstd ==0.0.2.0 + - conferer ==1.1.0.0 + - conferer-aeson ==1.1.0.1 + - conferer-hspec ==1.1.0.0 + - conferer-warp ==1.1.0.0 + - ConfigFile ==1.1.4 + - config-ini ==0.2.4.0 + - configurator ==0.3.0.0 + - configurator-export ==0.1.0.1 + - configurator-pg ==0.2.5 + - connection ==0.3.1 + - connection-pool ==0.2.2 + - console-style ==0.0.2.1 + - constraint ==0.1.4.0 + - constraints ==0.13 + - constraint-tuples ==0.1.2 + - construct ==0.3.0.2 + - contravariant ==1.5.3 + - contravariant-extras ==0.3.5.2 + - control-bool ==0.2.1 + - control-dsl ==0.2.1.3 + - control-monad-free ==0.6.2 + - control-monad-omega ==0.3.2 + - convertible ==1.1.1.0 + - cookie ==0.4.5 + - core-data ==0.2.1.9 + - core-program ==0.2.7.1 + - core-text ==0.3.0.0 + - countable ==1.0 + - country ==0.2.1 + - cpphs ==1.20.9.1 + - cprng-aes ==0.6.1 + - cpu ==0.1.2 + - cpuinfo ==0.1.0.2 + - crackNum ==2.4 + - crc32c ==0.0.0 + - credential-store ==0.1.2 + - criterion ==1.5.9.0 + - criterion-measurement ==0.1.2.0 + - cron ==0.7.0 + - crypto-api ==0.13.3 + - crypto-cipher-types ==0.0.9 + - cryptocompare ==0.1.2 + - crypto-enigma ==0.1.1.6 + - cryptohash ==0.11.9 + - cryptohash-cryptoapi ==0.1.4 + - cryptohash-md5 ==0.11.100.1 + - cryptohash-sha1 ==0.11.100.1 + - cryptohash-sha256 ==0.11.102.0 + - cryptohash-sha512 ==0.11.100.1 + - cryptonite ==0.28 + - cryptonite-conduit ==0.2.2 + - cryptonite-openssl ==0.7 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 + - csp ==1.4.0 + - css-syntax ==0.1.0.0 + - css-text ==0.1.3.0 + - csv ==0.1.2 + - ctrie ==0.2 + - cubicbezier ==0.6.0.6 + - cubicspline ==0.1.2 + - cuckoo-filter ==0.2.0.2 + - cue-sheet ==2.0.1 + - curl ==1.3.8 + - currencies ==0.2.0.0 + - currency ==0.2.0.0 + - cursor ==0.3.0.0 + - cursor-brick ==0.1.0.0 + - cursor-fuzzy-time ==0.0.0.0 + - cursor-gen ==0.3.0.0 + - cutter ==0.0 + - cyclotomic ==1.1.1 + - czipwith ==1.0.1.3 + - d10 ==0.2.1.6 + - data-accessor ==0.2.3 + - data-accessor-mtl ==0.2.0.4 + - data-accessor-template ==0.2.1.16 + - data-accessor-transformers ==0.2.1.7 + - data-ascii ==1.0.0.6 + - data-binary-ieee754 ==0.4.4 + - data-bword ==0.1.0.1 + - data-checked ==0.3 + - data-clist ==0.1.2.3 + - data-compat ==0.1.0.3 + - data-default ==0.7.1.1 + - data-default-class ==0.1.2.0 + - data-default-instances-containers ==0.0.1 + - data-default-instances-dlist ==0.0.1 + - data-default-instances-old-locale ==0.0.1 + - data-diverse ==4.7.0.0 + - datadog ==0.2.5.0 + - data-dword ==0.3.2 + - data-endian ==0.1.1 + - data-fix ==0.3.1 + - data-forest ==0.1.0.8 + - data-has ==0.4.0.0 + - data-hash ==0.2.0.1 + - data-interval ==2.1.0 + - data-inttrie ==0.1.4 + - data-lens-light ==0.1.2.2 + - data-memocombinators ==0.5.1 + - data-msgpack ==0.0.13 + - data-msgpack-types ==0.0.3 + - data-or ==1.0.0.5 + - data-ordlist ==0.4.7.0 + - data-ref ==0.0.2 + - data-reify ==0.6.3 + - data-serializer ==0.3.5 + - data-textual ==0.3.0.3 + - dataurl ==0.1.0.0 + - DAV ==1.3.4 + - DBFunctor ==0.1.1.1 + - dbus ==1.2.17 + - dbus-hslogger ==0.1.0.1 + - debian ==4.0.2 + - debian-build ==0.10.2.0 + - debug-trace-var ==0.2.0 + - dec ==0.0.4 + - Decimal ==0.5.2 + - declarative ==0.5.4 + - deepseq-generics ==0.2.0.0 + - deepseq-instances ==0.1.0.1 + - deferred-folds ==0.9.17 + - dejafu ==2.4.0.2 + - dense-linear-algebra ==0.1.0.0 + - depq ==0.4.2 + - deque ==0.4.3 + - deriveJsonNoPrefix ==0.1.0.1 + - derive-topdown ==0.0.2.2 + - deriving-aeson ==0.2.6.1 + - deriving-compat ==0.5.10 + - derulo ==1.0.10 + - dhall ==1.38.1 + - dhall-bash ==1.0.36 + - dhall-json ==1.7.6 + - dhall-lsp-server ==1.0.14 + - dhall-yaml ==1.2.6 + - diagrams-solve ==0.1.3 + - dialogflow-fulfillment ==0.1.1.3 + - di-core ==1.0.4 + - dictionary-sharing ==0.1.0.0 + - Diff ==0.4.0 + - digest ==0.0.1.2 + - digits ==0.3.1 + - dimensional ==1.4 + - di-monad ==1.3.1 + - directory-tree ==0.12.1 + - direct-sqlite ==2.3.26 + - dirichlet ==0.1.0.2 + - discount ==0.1.1 + - disk-free-space ==0.1.0.1 + - distributed-closure ==0.4.2.0 + - distribution-opensuse ==1.1.1 + - distributive ==0.6.2.1 + - dl-fedora ==0.9 + - dlist ==0.8.0.8 + - dlist-instances ==0.1.1.1 + - dlist-nonempty ==0.1.1 + - dns ==4.0.1 + - dockerfile ==0.2.0 + - doclayout ==0.3.0.2 + - doctemplates ==0.9 + - doctest ==0.16.3 + - doctest-discover ==0.2.0.0 + - doctest-driver-gen ==0.3.0.3 + - doctest-exitcode-stdio ==0.0 + - doctest-extract ==0.1 + - doctest-lib ==0.1 + - doldol ==0.4.1.2 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 + - dot ==0.3 + - dotenv ==0.8.0.7 + - dotgen ==0.4.3 + - dotnet-timespan ==0.0.1.0 + - double-conversion ==2.0.2.0 + - download ==0.3.2.7 + - download-curl ==0.1.4 + - drinkery ==0.4 + - dsp ==0.2.5.1 + - dual ==0.1.1.1 + - dublincore-xml-conduit ==0.1.0.2 + - dunai ==0.7.0 + - duration ==0.2.0.0 + - dvorak ==0.1.0.0 + - dynamic-state ==0.3.1 + - dyre ==0.8.12 + - eap ==0.9.0.2 + - earcut ==0.1.0.4 + - Earley ==0.13.0.1 + - easy-file ==0.2.2 + - Ebnf2ps ==1.0.15 + - echo ==0.1.4 + - ecstasy ==0.2.1.0 + - ed25519 ==0.0.5.0 + - edit-distance ==0.2.2.1 + - edit-distance-vector ==1.0.0.4 + - editor-open ==0.6.0.0 + - egison ==4.1.2 + - egison-pattern-src ==0.2.1.2 + - egison-pattern-src-th-mode ==0.2.1.2 + - either ==5.0.1.1 + - either-both ==0.1.1.1 + - either-unwrap ==1.1 + - ekg ==0.4.0.15 + - ekg-core ==0.1.1.7 + - ekg-json ==0.1.0.6 + - ekg-statsd ==0.2.5.0 + - elerea ==2.9.0 + - elf ==0.30 + - eliminators ==0.7 + - elm2nix ==0.2.1 + - elm-bridge ==0.6.1 + - elm-core-sources ==1.0.0 + - elm-export ==0.6.0.1 + - elynx ==0.5.0.2 + - elynx-markov ==0.5.0.2 + - elynx-nexus ==0.5.0.2 + - elynx-seq ==0.5.0.2 + - elynx-tools ==0.5.0.2 + - elynx-tree ==0.5.0.2 + - email-validate ==2.3.2.13 + - emojis ==0.1 + - enclosed-exceptions ==1.0.3 + - ENIG ==0.0.1.0 + - entropy ==0.4.1.6 + - enummapset ==0.6.0.3 + - enumset ==0.0.5 + - enum-subset-generate ==0.1.0.0 + - envelope ==0.2.2.0 + - envparse ==0.4.1 + - envy ==2.1.0.0 + - epub-metadata ==4.5 + - eq ==4.2.1 + - equal-files ==0.0.5.3 + - equational-reasoning ==0.7.0.0 + - equivalence ==0.3.5 + - erf ==2.0.0.0 + - error-or ==0.1.2.0 + - error-or-utils ==0.1.1 + - errors ==2.3.0 + - errors-ext ==0.4.2 + - ersatz ==0.4.9 + - esqueleto ==3.4.1.1 + - essence-of-live-coding ==0.2.5 + - essence-of-live-coding-gloss ==0.2.5 + - essence-of-live-coding-pulse ==0.2.5 + - essence-of-live-coding-quickcheck ==0.2.5 + - etc ==0.4.1.0 + - eve ==0.1.9.0 + - eventful-core ==0.2.0 + - eventful-test-helpers ==0.2.0 + - event-list ==0.1.2 + - eventstore ==1.4.1 + - every ==0.0.1 + - exact-combinatorics ==0.2.0.9 + - exact-pi ==0.5.0.1 + - exception-hierarchy ==0.1.0.4 + - exception-mtl ==0.4.0.1 + - exceptions ==0.10.4 + - exception-transformers ==0.4.0.9 + - exception-via ==0.1.0.0 + - executable-path ==0.0.3.1 + - exit-codes ==1.0.0 + - exomizer ==1.0.0 + - experimenter ==0.1.0.12 + - expiring-cache-map ==0.0.6.1 + - explicit-exception ==0.1.10 + - exp-pairs ==0.2.1.0 + - express ==0.1.8 + - extended-reals ==0.2.4.0 + - extensible-effects ==5.0.0.1 + - extensible-exceptions ==0.1.1.4 + - extra ==1.7.9 + - extractable-singleton ==0.0.1 + - extrapolate ==0.4.4 + - fail ==4.9.0.0 + - failable ==1.2.4.0 + - fakedata ==0.8.0 + - fakedata-parser ==0.1.0.0 + - fakefs ==0.3.0.2 + - fakepull ==0.3.0.2 + - faktory ==1.0.2.1 + - fast-digits ==0.3.0.0 + - fast-logger ==3.0.5 + - fast-math ==1.0.2 + - fb ==2.1.1 + - fclabels ==2.0.5 + - feature-flags ==0.1.0.1 + - fedora-dists ==1.1.2 + - fedora-haskell-tools ==0.9 + - feed ==1.3.2.0 + - FenwickTree ==0.1.2.1 + - fft ==0.1.8.6 + - fgl ==5.7.0.3 + - file-embed ==0.0.13.0 + - file-embed-lzma ==0 + - filelock ==0.1.1.5 + - filemanip ==0.3.6.3 + - file-modules ==0.1.2.4 + - filepath-bytestring ==1.4.2.1.7 + - file-path-th ==0.1.0.0 + - filepattern ==0.1.2 + - fileplow ==0.1.0.0 + - filtrable ==0.1.4.0 + - fin ==0.2 + - FindBin ==0.0.5 + - fingertree ==0.1.4.2 + - finite-typelits ==0.1.4.2 + - first-class-families ==0.8.0.1 + - first-class-patterns ==0.3.2.5 + - fitspec ==0.4.8 + - fixed ==0.3 + - fixed-length ==0.2.2.1 + - fixed-vector ==1.2.0.0 + - fixed-vector-hetero ==0.6.1.0 + - fix-whitespace ==0.0.5 + - flac ==0.2.0 + - flac-picture ==0.1.2 + - flags-applicative ==0.1.0.3 + - flat ==0.4.4 + - flat-mcmc ==1.5.2 + - flexible-defaults ==0.0.3 + - FloatingHex ==0.5 + - floatshow ==0.2.4 + - flow ==1.0.22 + - flush-queue ==1.0.0 + - fmlist ==0.9.4 + - fmt ==0.6.1.2 + - fn ==0.3.0.2 + - focus ==1.0.2 + - focuslist ==0.1.0.2 + - foldable1 ==0.1.0.0 + - fold-debounce ==0.2.0.9 + - fold-debounce-conduit ==0.2.0.6 + - foldl ==1.4.11 + - folds ==0.7.6 + - follow-file ==0.0.3 + - FontyFruity ==0.5.3.5 + - foreign-store ==0.2 + - ForestStructures ==0.0.1.0 + - forkable-monad ==0.2.0.3 + - forma ==1.1.3 + - format-numbers ==0.1.0.1 + - formatting ==6.3.7 + - foundation ==0.0.26.1 + - fourmolu ==0.3.0.0 + - free ==5.1.5 + - free-categories ==0.2.0.2 + - freenect ==1.2.1 + - freer-simple ==1.2.1.1 + - freetype2 ==0.2.0 + - free-vl ==0.1.4 + - friendly-time ==0.4.1 + - from-sum ==0.2.3.0 + - frontmatter ==0.1.0.2 + - fsnotify ==0.3.0.1 + - fsnotify-conduit ==0.1.1.1 + - ftp-client ==0.5.1.4 + - ftp-client-conduit ==0.5.0.5 + - funcmp ==1.9 + - function-builder ==0.3.0.1 + - functor-classes-compat ==1.0.1 + - fusion-plugin ==0.2.2 + - fusion-plugin-types ==0.1.0 + - fuzzcheck ==0.1.1 + - fuzzy ==0.1.0.0 + - fuzzy-dates ==0.1.1.2 + - fuzzyset ==0.2.0 + - fuzzy-time ==0.1.0.0 + - gauge ==0.2.5 + - gd ==3000.7.3 + - gdp ==0.0.3.0 + - general-games ==1.1.1 + - generic-aeson ==0.2.0.12 + - generic-arbitrary ==0.1.0 + - generic-constraints ==1.1.1.1 + - generic-data ==0.9.2.0 + - generic-data-surgery ==0.3.0.0 + - generic-deriving ==1.13.1 + - generic-functor ==0.2.0.0 + - generic-lens ==2.1.0.0 + - generic-lens-core ==2.1.0.0 + - generic-monoid ==0.1.0.1 + - generic-optics ==2.1.0.0 + - GenericPretty ==1.2.2 + - generic-random ==1.3.0.1 + - generics-eot ==0.4.0.1 + - generics-sop ==0.5.1.1 + - generics-sop-lens ==0.2.0.1 + - geniplate-mirror ==0.7.7 + - genvalidity ==0.11.0.0 + - genvalidity-aeson ==0.3.0.0 + - genvalidity-bytestring ==0.6.0.0 + - genvalidity-containers ==0.9.0.0 + - genvalidity-criterion ==0.2.0.0 + - genvalidity-hspec ==0.7.0.4 + - genvalidity-hspec-aeson ==0.3.1.1 + - genvalidity-hspec-binary ==0.2.0.4 + - genvalidity-hspec-cereal ==0.2.0.4 + - genvalidity-hspec-hashable ==0.2.0.5 + - genvalidity-hspec-optics ==0.1.1.2 + - genvalidity-hspec-persistent ==0.0.0.1 + - genvalidity-mergeful ==0.2.0.0 + - genvalidity-mergeless ==0.2.0.0 + - genvalidity-path ==0.3.0.4 + - genvalidity-persistent ==0.0.0.0 + - genvalidity-property ==0.5.0.1 + - genvalidity-scientific ==0.2.1.1 + - genvalidity-sydtest ==0.0.0.0 + - genvalidity-sydtest-aeson ==0.0.0.0 + - genvalidity-sydtest-hashable ==0.0.0.0 + - genvalidity-sydtest-lens ==0.0.0.0 + - genvalidity-sydtest-persistent ==0.0.0.1 + - genvalidity-text ==0.7.0.2 + - genvalidity-time ==0.3.0.0 + - genvalidity-typed-uuid ==0.0.0.2 + - genvalidity-unordered-containers ==0.3.0.1 + - genvalidity-uuid ==0.1.0.4 + - genvalidity-vector ==0.3.0.1 + - geojson ==4.0.2 + - getopt-generics ==0.13.0.4 + - ghc-byteorder ==4.11.0.0.10 + - ghc-check ==0.5.0.4 + - ghc-core ==0.5.6 + - ghc-events ==0.17.0 + - ghc-exactprint ==0.6.4 + - ghcid ==0.8.7 + - ghci-hexcalc ==0.1.1.0 + - ghcjs-codemirror ==0.0.0.2 + - ghc-lib ==8.10.4.20210206 + - ghc-lib-parser ==8.10.4.20210206 + - ghc-lib-parser-ex ==8.10.0.19 + - ghc-parser ==0.2.3.0 + - ghc-paths ==0.1.0.12 + - ghc-prof ==1.4.1.8 + - ghc-source-gen ==0.4.0.0 + - ghc-syntax-highlighter ==0.0.6.0 + - ghc-tcplugins-extra ==0.4.1 + - ghc-trace-events ==0.1.2.2 + - ghc-typelits-extra ==0.4.2 + - ghc-typelits-knownnat ==0.7.5 + - ghc-typelits-natnormalise ==0.7.4 + - ghc-typelits-presburger ==0.6.0.0 + - ghost-buster ==0.1.1.0 + - gi-atk ==2.0.22 + - gi-cairo ==1.0.24 + - gi-cairo-connector ==0.1.0 + - gi-cairo-render ==0.1.0 + - gi-dbusmenu ==0.4.8 + - gi-dbusmenugtk3 ==0.4.9 + - gi-gdk ==3.0.23 + - gi-gdkpixbuf ==2.0.24 + - gi-gdkx11 ==3.0.10 + - gi-gio ==2.0.27 + - gi-glib ==2.0.24 + - gi-gobject ==2.0.25 + - gi-graphene ==1.0.2 + - gi-gtk ==3.0.36 + - gi-gtk-hs ==0.3.9 + - gi-harfbuzz ==0.0.3 + - ginger ==0.10.1.0 + - gingersnap ==0.3.1.0 + - gi-pango ==1.0.23 + - githash ==0.1.5.0 + - github-release ==1.3.7 + - github-rest ==1.0.3 + - github-types ==0.2.1 + - github-webhooks ==0.15.0 + - gitlab-haskell ==0.2.5 + - gitrev ==1.3.1 + - gi-xlib ==2.0.9 + - gl ==0.9 + - glabrous ==2.0.3 + - GLFW-b ==3.3.0.0 + - Glob ==0.10.1 + - gloss ==1.13.2.1 + - gloss-rendering ==1.13.1.1 + - GLURaw ==2.0.0.4 + - GLUT ==2.7.0.16 + - gluturtle ==0.0.58.1 + - gnuplot ==0.5.6.1 + - google-isbn ==1.0.3 + - gopher-proxy ==0.1.1.2 + - gothic ==0.1.6 + - gpolyline ==0.1.0.1 + - graph-core ==0.3.0.0 + - graphite ==0.10.0.1 + - graphql-client ==1.1.1 + - graphs ==0.7.1 + - graphula ==2.0.0.4 + - graphviz ==2999.20.1.0 + - graph-wrapper ==0.2.6.0 + - gravatar ==0.8.0 + - greskell ==1.2.0.1 + - greskell-core ==0.1.3.6 + - greskell-websocket ==0.1.2.5 + - groom ==0.1.2.1 + - group-by-date ==0.1.0.4 + - groups ==0.5.2 + - gtk-sni-tray ==0.1.6.0 + - gtk-strut ==0.1.3.0 + - guarded-allocation ==0.0.1 + - H ==0.9.0.1 + - hackage-db ==2.1.0 + - hackage-security ==0.6.0.1 + - haddock-library ==1.9.0 + - hadoop-streaming ==0.2.0.3 + - hakyll-convert ==0.3.0.4 + - half ==0.3.1 + - hall-symbols ==0.1.0.6 + - hamtsolo ==1.0.3 + - HandsomeSoup ==0.4.2 + - hapistrano ==0.4.1.3 + - happstack-server ==7.7.0 + - happy ==1.20.0 + - happy-meta ==0.2.0.11 + - HasBigDecimal ==0.1.1 + - hasbolt ==0.1.4.5 + - hashable ==1.3.0.0 + - hashable-time ==0.2.1 + - hashids ==1.0.2.4 + - hashing ==0.1.0.1 + - hashmap ==1.3.3 + - hashtables ==1.2.4.1 + - haskeline ==0.8.1.2 + - haskell-awk ==1.2 + - haskell-gi ==0.24.7 + - haskell-gi-base ==0.24.5 + - haskell-gi-overloading ==1.0 + - haskell-import-graph ==1.0.4 + - haskell-lexer ==1.1 + - haskell-lsp ==0.22.0.0 + - haskell-lsp-types ==0.22.0.0 + - haskell-names ==0.9.9 + - HaskellNet ==0.6 + - haskell-src ==1.0.3.1 + - haskell-src-exts ==1.23.1 + - haskell-src-exts-util ==0.2.5 + - haskell-src-meta ==0.8.7 + - haskey-btree ==0.3.0.1 + - hasql ==1.4.5.1 + - hasql-notifications ==0.2.0.0 + - hasql-optparse-applicative ==0.3.0.6 + - hasql-pool ==0.5.2 + - hasql-queue ==1.2.0.2 + - hasql-transaction ==1.0.0.2 + - hasty-hamiltonian ==1.3.4 + - HaTeX ==3.22.3.0 + - HaXml ==1.25.5 + - haxr ==3000.11.4.1 + - HCodecs ==0.5.2 + - hdaemonize ==0.5.6 + - HDBC ==2.4.0.3 + - HDBC-session ==0.1.2.0 + - headroom ==0.4.1.0 + - heap ==1.0.4 + - heaps ==0.4 + - hebrew-time ==0.1.2 + - hedgehog ==1.0.5 + - hedgehog-corpus ==0.2.0 + - hedgehog-fakedata ==0.0.1.4 + - hedgehog-fn ==1.0 + - hedgehog-quickcheck ==0.1.1 + - hedis ==0.14.2 + - hedn ==0.3.0.2 + - here ==1.2.13 + - heredoc ==0.2.0.0 + - heterocephalus ==1.0.5.4 + - hexml ==0.3.4 + - hexml-lens ==0.2.1 + - hexpat ==0.20.13 + - hformat ==0.3.3.1 + - hfsevents ==0.1.6 + - hgrev ==0.2.6 + - hidapi ==0.1.7 + - hie-bios ==0.7.5 + - hi-file-parser ==0.1.2.0 + - higher-leveldb ==0.6.0.0 + - highlighting-kate ==0.6.4 + - hinfo ==0.0.3.0 + - hinotify ==0.4.1 + - hint ==0.9.0.4 + - hjsmin ==0.2.0.4 + - hkd-default ==1.1.0.0 + - hkgr ==0.2.7 + - hlibcpuid ==0.2.0 + - hlibgit2 ==0.18.0.16 + - hlibsass ==0.1.10.1 + - hmatrix ==0.20.2 + - hmatrix-backprop ==0.1.3.0 + - hmatrix-gsl ==0.19.0.1 + - hmatrix-gsl-stats ==0.4.1.8 + - hmatrix-morpheus ==0.1.1.2 + - hmatrix-vector-sized ==0.1.3.0 + - hmm-lapack ==0.4 + - hmpfr ==0.4.4 + - hnock ==0.4.0 + - hoauth2 ==1.16.0 + - hocon ==0.1.0.4 + - hOpenPGP ==2.9.5 + - hopenpgp-tools ==0.23.6 + - hopfli ==0.2.2.1 + - hosc ==0.18.1 + - hostname ==1.0 + - hostname-validate ==1.0.0 + - hourglass ==0.2.12 + - hourglass-orphans ==0.1.0.0 + - hp2pretty ==0.10 + - hpack ==0.34.4 + - hpack-dhall ==0.5.2 + - hpc-codecov ==0.3.0.0 + - hpc-lcov ==1.0.1 + - hprotoc ==2.4.17 + - hruby ==0.3.8.1 + - hsass ==0.8.0 + - hs-bibutils ==6.10.0.0 + - hsc2hs ==0.68.7 + - hscolour ==1.24.4 + - hsdns ==1.8 + - hsebaysdk ==0.4.1.0 + - hsemail ==2.2.1 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 + - hsini ==0.5.1.2 + - hsinstall ==2.6 + - HSlippyMap ==3.0.1 + - hslogger ==1.3.1.0 + - hslua ==1.3.0.1 + - hslua-aeson ==1.0.3.1 + - hslua-module-doclayout ==0.2.0.1 + - hslua-module-path ==0.1.0.1 + - hslua-module-system ==0.2.2.1 + - hslua-module-text ==0.3.0.1 + - HsOpenSSL ==0.11.7 + - HsOpenSSL-x509-system ==0.1.0.4 + - hsp ==0.10.0 + - hspec ==2.7.10 + - hspec-attoparsec ==0.1.0.2 + - hspec-checkers ==0.1.0.2 + - hspec-contrib ==0.5.1 + - hspec-core ==2.7.10 + - hspec-discover ==2.7.10 + - hspec-expectations ==0.8.2 + - hspec-expectations-json ==1.0.0.3 + - hspec-expectations-lifted ==0.10.0 + - hspec-expectations-pretty-diff ==0.7.2.5 + - hspec-golden ==0.2.0.0 + - hspec-golden-aeson ==0.7.0.0 + - hspec-hedgehog ==0.0.1.2 + - hspec-junit-formatter ==1.0.0.2 + - hspec-leancheck ==0.0.4 + - hspec-megaparsec ==2.2.0 + - hspec-meta ==2.7.8 + - hspec-need-env ==0.1.0.6 + - hspec-parsec ==0 + - hspec-smallcheck ==0.5.2 + - hspec-tables ==0.0.1 + - hspec-wai ==0.11.0 + - hspec-wai-json ==0.11.0 + - hs-php-session ==0.0.9.3 + - hsshellscript ==3.5.0 + - hs-tags ==0.1.5 + - HStringTemplate ==0.8.7 + - HSvm ==0.1.1.3.22 + - HsYAML ==0.2.1.0 + - HsYAML-aeson ==0.2.0.0 + - hsyslog ==5.0.2 + - htaglib ==1.2.0 + - HTF ==0.14.0.6 + - html ==1.0.1.2 + - html-conduit ==1.3.2.1 + - html-entities ==1.1.4.5 + - html-entity-map ==0.1.0.0 + - htoml ==1.0.0.3 + - http2 ==3.0.1 + - HTTP ==4000.3.16 + - http-api-data ==0.4.2 + - http-client ==0.6.4.1 + - http-client-openssl ==0.3.2.0 + - http-client-overrides ==0.1.1.0 + - http-client-tls ==0.3.5.3 + - http-common ==0.8.2.1 + - http-conduit ==2.3.8 + - http-date ==0.0.11 + - http-directory ==0.1.8 + - http-download ==0.2.0.0 + - httpd-shed ==0.4.1.1 + - http-link-header ==1.2.0 + - http-media ==0.8.0.0 + - http-query ==0.1.0.1 + - http-reverse-proxy ==0.6.0 + - http-streams ==0.8.7.2 + - http-types ==0.12.3 + - human-readable-duration ==0.2.1.4 + - HUnit ==1.6.2.0 + - HUnit-approx ==1.1.1.1 + - hunit-dejafu ==2.0.0.4 + - hvect ==0.4.0.0 + - hvega ==0.11.0.1 + - hw-balancedparens ==0.4.1.1 + - hw-bits ==0.7.2.1 + - hw-conduit ==0.2.1.0 + - hw-conduit-merges ==0.2.1.0 + - hw-diagnostics ==0.0.1.0 + - hw-dsv ==0.4.1.0 + - hweblib ==0.6.3 + - hw-eliasfano ==0.1.2.0 + - hw-excess ==0.2.3.0 + - hw-fingertree ==0.1.2.0 + - hw-fingertree-strict ==0.1.2.0 + - hw-hedgehog ==0.1.1.0 + - hw-hspec-hedgehog ==0.1.1.0 + - hw-int ==0.0.2.0 + - hw-ip ==2.4.2.0 + - hw-json ==1.3.2.2 + - hw-json-simd ==0.1.1.0 + - hw-json-simple-cursor ==0.1.1.0 + - hw-json-standard-cursor ==0.2.3.1 + - hw-kafka-client ==4.0.3 + - hw-mquery ==0.2.1.0 + - hw-packed-vector ==0.2.1.0 + - hw-parser ==0.1.1.0 + - hw-prim ==0.6.3.0 + - hw-rankselect ==0.13.4.0 + - hw-rankselect-base ==0.3.4.1 + - hw-simd ==0.1.2.0 + - hw-streams ==0.0.1.0 + - hw-string-parse ==0.0.0.4 + - hw-succinct ==0.1.0.1 + - hw-xml ==0.5.1.0 + - hxt ==9.3.1.22 + - hxt-charproperties ==9.5.0.0 + - hxt-css ==0.1.0.3 + - hxt-curl ==9.1.1.1 + - hxt-expat ==9.1.1 + - hxt-http ==9.1.5.2 + - hxt-regex-xmlschema ==9.2.0.7 + - hxt-tagsoup ==9.1.4 + - hxt-unicode ==9.0.2.4 + - hybrid-vectors ==0.2.2 + - hyper ==0.2.1.0 + - hyperloglog ==0.4.4 + - hyphenation ==0.8.1 + - iconv ==0.4.1.3 + - identicon ==0.2.2 + - ieee754 ==0.8.0 + - if ==0.1.0.0 + - iff ==0.0.6 + - ihaskell ==0.10.2.0 + - ihs ==0.1.0.3 + - ilist ==0.4.0.1 + - imagesize-conduit ==1.1 + - Imlib ==0.1.2 + - immortal ==0.3 + - immortal-queue ==0.1.0.1 + - inbox ==0.1.0 + - include-file ==0.1.0.4 + - incremental-parser ==0.5.0.2 + - indents ==0.5.0.1 + - indexed ==0.1.3 + - indexed-containers ==0.1.0.2 + - indexed-list-literals ==0.2.1.3 + - indexed-profunctors ==0.1.1 + - indexed-traversable ==0.1.1 + - indexed-traversable-instances ==0.1 + - infer-license ==0.2.0 + - inflections ==0.4.0.6 + - influxdb ==1.9.1.2 + - ini ==0.4.1 + - inj ==1.0 + - inline-c ==0.9.1.4 + - inline-c-cpp ==0.4.0.3 + - inline-r ==0.10.4 + - inliterate ==0.1.0 + - input-parsers ==0.2.2 + - insert-ordered-containers ==0.2.4 + - inspection-testing ==0.4.5.0 + - instance-control ==0.1.2.0 + - int-cast ==0.2.0.0 + - integer-logarithms ==1.0.3.1 + - integer-roots ==1.0 + - integration ==0.2.1 + - intern ==0.9.4 + - interpolate ==0.2.1 + - interpolatedstring-perl6 ==1.0.2 + - interpolation ==0.1.1.1 + - interpolator ==1.1.0.2 + - IntervalMap ==0.6.1.2 + - intervals ==0.9.2 + - intro ==0.9.0.0 + - intset-imperative ==0.1.0.0 + - invariant ==0.5.4 + - invertible ==0.2.0.7 + - invertible-grammar ==0.1.3 + - io-machine ==0.2.0.0 + - io-manager ==0.1.0.3 + - io-memoize ==1.1.1.0 + - io-region ==0.1.1 + - io-storage ==0.3 + - io-streams ==1.5.2.0 + - io-streams-haproxy ==1.0.1.0 + - ip6addr ==1.0.2 + - ipa ==0.3.1 + - iproute ==1.7.11 + - IPv6Addr ==2.0.2 + - ipynb ==0.1.0.1 + - ipython-kernel ==0.10.2.1 + - irc ==0.6.1.0 + - irc-client ==1.1.2.1 + - irc-conduit ==0.3.0.4 + - irc-ctcp ==0.1.3.0 + - isbn ==1.1.0.2 + - islink ==0.1.0.0 + - iso3166-country-codes ==0.20140203.8 + - iso639 ==0.1.0.3 + - iso8601-time ==0.1.5 + - iterable ==3.0 + - ixset-typed ==0.5 + - ixset-typed-binary-instance ==0.1.0.2 + - ixset-typed-conversions ==0.1.2.0 + - ixset-typed-hashable-instance ==0.1.0.2 + - ix-shapable ==0.1.0 + - jack ==0.7.2 + - jalaali ==1.0.0.0 + - jira-wiki-markup ==1.3.4 + - jose ==0.8.4 + - jose-jwt ==0.9.2 + - js-chart ==2.9.4.1 + - js-dgtable ==0.5.2 + - js-flot ==0.8.3 + - js-jquery ==3.3.1 + - json-feed ==1.0.12 + - jsonpath ==0.2.0.0 + - json-rpc ==1.0.3 + - json-rpc-generic ==0.2.1.5 + - JuicyPixels ==3.3.5 + - JuicyPixels-blurhash ==0.1.0.3 + - JuicyPixels-extra ==0.4.1 + - JuicyPixels-scale-dct ==0.1.2 + - junit-xml ==0.1.0.2 + - justified-containers ==0.3.0.0 + - jwt ==0.10.0 + - kan-extensions ==5.2.2 + - kanji ==3.4.1 + - katip ==0.8.5.0 + - katip-logstash ==0.1.0.0 + - kawhi ==0.3.0 + - kazura-queue ==0.1.0.4 + - kdt ==0.2.4 + - keep-alive ==0.2.0.0 + - keycode ==0.2.2 + - keys ==3.12.3 + - ki ==0.2.0.1 + - kind-apply ==0.3.2.0 + - kind-generics ==0.4.1.0 + - kind-generics-th ==0.2.2.2 + - kmeans ==0.1.3 + - koji ==0.0.1 + - koofr-client ==1.0.0.3 + - krank ==0.2.2 + - kubernetes-webhook-haskell ==0.2.0.3 + - l10n ==0.1.0.1 + - labels ==0.3.3 + - lackey ==1.0.14 + - LambdaHack ==0.10.2.0 + - lame ==0.2.0 + - language-avro ==0.1.3.1 + - language-bash ==0.9.2 + - language-c ==0.8.3 + - language-c-quote ==0.13 + - language-docker ==10.0.0 + - language-java ==0.2.9 + - language-javascript ==0.7.1.0 + - language-protobuf ==1.0.1 + - language-python ==0.5.8 + - language-thrift ==0.12.0.0 + - lapack ==0.3.2 + - lapack-carray ==0.0.3 + - lapack-comfort-array ==0.0.0.1 + - lapack-ffi ==0.0.3 + - lapack-ffi-tools ==0.1.2.1 + - largeword ==1.2.5 + - latex ==0.1.0.4 + - lattices ==2.0.2 + - lawful ==0.1.0.0 + - lazy-csv ==0.5.1 + - lazyio ==0.1.0.4 + - lca ==0.4 + - leancheck ==0.9.4 + - leancheck-instances ==0.0.4 + - leapseconds-announced ==2017.1.0.1 + - learn-physics ==0.6.5 + - lens ==4.19.2 + - lens-action ==0.2.5 + - lens-aeson ==1.1.1 + - lens-csv ==0.1.1.0 + - lens-datetime ==0.3 + - lens-family ==2.0.0 + - lens-family-core ==2.0.0 + - lens-family-th ==0.5.2.0 + - lens-misc ==0.0.2.0 + - lens-process ==0.4.0.0 + - lens-properties ==4.11.1 + - lens-regex ==0.1.3 + - lens-regex-pcre ==1.1.0.0 + - lenz ==0.4.2.0 + - leveldb-haskell ==0.6.5 + - libffi ==0.1 + - libgit ==0.3.1 + - libgraph ==1.14 + - libjwt-typed ==0.2 + - libmpd ==0.10.0.0 + - liboath-hs ==0.0.1.2 + - libyaml ==0.1.2 + - LibZip ==1.0.1 + - lifted-async ==0.10.2 + - lifted-base ==0.2.3.12 + - lift-generics ==0.2 + - lift-type ==0.1.0.1 + - line ==4.0.1 + - linear ==1.21.5 + - linear-circuit ==0.1.0.2 + - linenoise ==0.3.2 + - linux-file-extents ==0.2.0.0 + - linux-namespaces ==0.1.3.0 + - liquid-fixpoint ==0.8.10.2 + - List ==0.6.2 + - ListLike ==4.7.4 + - list-predicate ==0.1.0.1 + - listsafe ==0.1.0.1 + - list-singleton ==1.0.0.5 + - list-t ==1.0.4 + - ListTree ==0.2.3 + - little-rio ==0.2.2 + - llvm-hs ==9.0.1 + - llvm-hs-pure ==9.0.0 + - lmdb ==0.2.5 + - load-env ==0.2.1.0 + - loc ==0.1.3.10 + - locators ==0.3.0.3 + - loch-th ==0.2.2 + - lockfree-queue ==0.2.3.1 + - log-domain ==0.13.1 + - logfloat ==0.13.3.3 + - logging ==3.0.5 + - logging-facade ==0.3.0 + - logging-facade-syslog ==1 + - logict ==0.7.1.0 + - logstash ==0.1.0.1 + - loop ==0.3.0 + - lrucache ==1.2.0.1 + - lrucaching ==0.3.3 + - lsp-test ==0.11.0.5 + - lucid ==2.9.12.1 + - lucid-cdn ==0.2.2.0 + - lucid-extras ==0.2.2 + - lukko ==0.1.1.3 + - lz4-frame-conduit ==0.1.0.1 + - lzma ==0.0.0.3 + - lzma-conduit ==1.2.1 + - machines ==0.7.2 + - machines-binary ==7.0.0.0 + - magic ==1.1 + - magico ==0.0.2.1 + - mainland-pretty ==0.7.1 + - main-tester ==0.2.0.1 + - makefile ==1.1.0.0 + - managed ==1.0.8 + - MapWith ==0.2.0.0 + - markdown ==0.1.17.4 + - markdown-unlit ==0.5.1 + - markov-chain ==0.0.3.4 + - massiv ==0.6.0.0 + - massiv-io ==0.4.1.0 + - massiv-persist ==0.1.0.0 + - massiv-serialise ==0.1.0.0 + - massiv-test ==0.1.6.1 + - mathexpr ==0.3.0.0 + - math-extras ==0.1.1.0 + - math-functions ==0.3.4.2 + - matplotlib ==0.7.5 + - matrices ==0.5.0 + - matrix ==0.3.6.1 + - matrix-as-xyz ==0.1.2.2 + - matrix-market-attoparsec ==0.1.1.3 + - matrix-static ==0.3 + - maximal-cliques ==0.1.1 + - mbox ==0.3.4 + - mbox-utility ==0.0.3.1 + - mcmc ==0.4.0.0 + - mcmc-types ==1.0.3 + - medea ==1.2.0 + - median-stream ==0.7.0.0 + - med-module ==0.1.2.1 + - megaparsec ==9.0.1 + - megaparsec-tests ==9.0.1 + - membrain ==0.0.0.2 + - memory ==0.15.0 + - MemoTrie ==0.6.10 + - mercury-api ==0.1.0.2 + - mergeful ==0.2.0.0 + - mergeless ==0.3.0.0 + - mersenne-random-pure64 ==0.2.2.0 + - messagepack ==0.5.4 + - metrics ==0.4.1.1 + - mfsolve ==0.3.2.0 + - microlens ==0.4.12.0 + - microlens-aeson ==2.3.1 + - microlens-contra ==0.1.0.2 + - microlens-ghc ==0.4.13 + - microlens-mtl ==0.2.0.1 + - microlens-platform ==0.4.2 + - microlens-process ==0.2.0.2 + - microlens-th ==0.4.3.9 + - microspec ==0.2.1.3 + - microstache ==1.0.1.2 + - midair ==0.2.0.1 + - midi ==0.2.2.2 + - mighty-metropolis ==2.0.0 + - mime-mail ==0.5.1 + - mime-mail-ses ==0.4.3 + - mime-types ==0.1.0.9 + - mini-egison ==1.0.0 + - minimal-configuration ==0.1.4 + - minimorph ==0.3.0.0 + - minio-hs ==1.5.3 + - miniutter ==0.5.1.1 + - min-max-pqueue ==0.1.0.2 + - mintty ==0.1.2 + - missing-foreign ==0.1.1 + - MissingH ==1.4.3.0 + - mixed-types-num ==0.4.1 + - mltool ==0.2.0.1 + - mmap ==0.5.9 + - mmark ==0.0.7.2 + - mmark-cli ==0.0.5.0 + - mmark-ext ==0.2.1.3 + - mmorph ==1.1.5 + - mnist-idx ==0.1.2.8 + - mockery ==0.3.5 + - mock-time ==0.1.0 + - mod ==0.1.2.2 + - model ==0.5 + - modern-uri ==0.3.4.1 + - modular ==0.1.0.8 + - monad-chronicle ==1.0.0.1 + - monad-control ==1.0.2.3 + - monad-control-aligned ==0.0.1.1 + - monad-coroutine ==0.9.1 + - monad-extras ==0.6.0 + - monadic-arrays ==0.2.2 + - monad-journal ==0.8.1 + - monadlist ==0.0.2 + - monad-logger ==0.3.36 + - monad-logger-json ==0.1.0.0 + - monad-logger-logstash ==0.1.0.0 + - monad-logger-prefix ==0.1.12 + - monad-loops ==0.4.3 + - monad-memo ==0.5.3 + - monad-metrics ==0.2.2.0 + - monad-par ==0.3.5 + - monad-parallel ==0.7.2.4 + - monad-par-extras ==0.3.3 + - monad-peel ==0.2.1.2 + - monad-primitive ==0.1 + - monad-products ==4.0.1 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.3 + - monad-resumption ==0.1.4.0 + - monad-skeleton ==0.1.5 + - monad-st ==0.2.4.1 + - monads-tf ==0.1.0.3 + - monad-time ==0.3.1.0 + - monad-unlift ==0.2.0 + - monad-unlift-ref ==0.2.1 + - mongoDB ==2.7.0.0 + - monoid-subclasses ==1.0.1 + - monoid-transformer ==0.0.4 + - mono-traversable ==1.0.15.1 + - mono-traversable-instances ==0.1.1.0 + - mono-traversable-keys ==0.1.0 + - more-containers ==0.2.2.2 + - morpheus-graphql ==0.17.0 + - morpheus-graphql-app ==0.17.0 + - morpheus-graphql-client ==0.17.0 + - morpheus-graphql-core ==0.17.0 + - morpheus-graphql-subscriptions ==0.17.0 + - moss ==0.2.0.0 + - mountpoints ==1.0.2 + - mpi-hs ==0.7.2.0 + - mpi-hs-binary ==0.1.1.0 + - mpi-hs-cereal ==0.1.0.0 + - mtl-compat ==0.2.2 + - mtl-prelude ==2.0.3.1 + - multiarg ==0.30.0.10 + - multi-containers ==0.1.1 + - multimap ==1.2.1 + - multipart ==0.2.1 + - multiset ==0.3.4.3 + - multistate ==0.8.0.3 + - murmur3 ==1.0.4 + - murmur-hash ==0.1.0.9 + - MusicBrainz ==0.4.1 + - mustache ==2.3.1 + - mutable-containers ==0.3.4 + - mwc-probability ==2.3.1 + - mwc-random ==0.14.0.0 + - mwc-random-monad ==0.7.3.1 + - mx-state-codes ==1.0.0.0 + - mysql ==0.2.0.1 + - mysql-simple ==0.4.5 + - n2o ==0.11.1 + - nagios-check ==0.3.2 + - names-th ==0.3.0.1 + - nano-erl ==0.1.0.1 + - nanospec ==0.2.2 + - nats ==1.1.2 + - natural-induction ==0.2.0.0 + - natural-sort ==0.1.2 + - natural-transformation ==0.4 + - ndjson-conduit ==0.1.0.5 + - neat-interpolation ==0.5.1.2 + - netcode-io ==0.0.2 + - netlib-carray ==0.1 + - netlib-comfort-array ==0.0.0.1 + - netlib-ffi ==0.1.1 + - netpbm ==1.0.4 + - nettle ==0.3.0 + - netwire ==5.0.3 + - netwire-input ==0.0.7 + - netwire-input-glfw ==0.0.11 + - network ==3.1.1.1 + - network-bsd ==2.8.1.0 + - network-byte-order ==0.1.6 + - network-conduit-tls ==1.3.2 + - network-info ==0.2.0.10 + - network-ip ==0.3.0.3 + - network-messagepack-rpc ==0.1.2.0 + - network-messagepack-rpc-websocket ==0.1.1.1 + - network-run ==0.2.4 + - network-simple ==0.4.5 + - network-simple-tls ==0.4 + - network-transport ==0.5.4 + - network-transport-composed ==0.2.1 + - network-uri ==2.6.4.1 + - newtype ==0.2.2.0 + - newtype-generics ==0.6 + - nicify-lib ==1.0.1 + - NineP ==0.0.2.1 + - nix-derivation ==1.1.2 + - nix-paths ==1.0.1 + - nonce ==1.0.7 + - nondeterminism ==1.4 + - non-empty ==0.3.3 + - nonempty-containers ==0.3.4.1 + - nonemptymap ==0.0.6.0 + - non-empty-sequence ==0.2.0.4 + - nonempty-vector ==0.2.1.0 + - nonempty-zipper ==1.0.0.2 + - non-negative ==0.1.2 + - not-gloss ==0.7.7.0 + - no-value ==1.0.0.0 + - nowdoc ==0.1.1.0 + - nqe ==0.6.3 + - nri-env-parser ==0.1.0.7 + - nri-observability ==0.1.0.2 + - nri-prelude ==0.6.0.0 + - nsis ==0.3.3 + - numbers ==3000.2.0.2 + - numeric-extras ==0.1 + - numeric-prelude ==0.4.3.3 + - numhask ==0.6.0.2 + - NumInstances ==1.4 + - numtype-dk ==0.5.0.2 + - nuxeo ==0.3.2 + - nvim-hs ==2.1.0.4 + - nvim-hs-contrib ==2.0.0.0 + - nvim-hs-ghcid ==2.0.0.0 + - oauthenticated ==0.2.1.0 + - ObjectName ==1.1.0.1 + - o-clock ==1.2.0.1 + - odbc ==0.2.2 + - oeis2 ==1.0.5 + - ofx ==0.4.4.0 + - old-locale ==1.0.0.7 + - old-time ==1.1.0.3 + - once ==0.4 + - one-liner ==1.0 + - one-liner-instances ==0.1.2.1 + - OneTuple ==0.2.2.1 + - Only ==0.1 + - oo-prototypes ==0.1.0.0 + - opaleye ==0.7.1.0 + - OpenAL ==1.7.0.5 + - openapi3 ==3.1.0 + - open-browser ==0.2.1.0 + - openexr-write ==0.1.0.2 + - OpenGL ==3.0.3.0 + - OpenGLRaw ==3.3.4.0 + - openpgp-asciiarmor ==0.1.2 + - opensource ==0.1.1.0 + - openssl-streams ==1.2.3.0 + - opentelemetry ==0.6.1 + - opentelemetry-extra ==0.6.1 + - opentelemetry-lightstep ==0.6.1 + - opentelemetry-wai ==0.6.1 + - operational ==0.2.3.5 + - operational-class ==0.3.0.0 + - optics ==0.3 + - optics-core ==0.3.0.1 + - optics-extra ==0.3 + - optics-th ==0.3.0.2 + - optics-vl ==0.2.1 + - optional-args ==1.0.2 + - options ==1.2.1.1 + - optparse-applicative ==0.16.1.0 + - optparse-generic ==1.4.4 + - optparse-simple ==0.1.1.3 + - optparse-text ==0.1.1.0 + - ordered-containers ==0.2.2 + - ormolu ==0.1.4.1 + - overhang ==1.0.0 + - packcheck ==0.5.1 + - packdeps ==0.6.0.0 + - pager ==0.1.1.0 + - pagination ==0.2.2 + - pagure-cli ==0.2 + - pandoc ==2.13 + - pandoc-dhall-decoder ==0.1.0.1 + - pandoc-plot ==1.2.0 + - pandoc-throw ==0.1.0.0 + - pandoc-types ==1.22 + - pantry ==0.5.1.5 + - parallel ==3.2.2.0 + - parallel-io ==0.3.3 + - parameterized ==0.5.0.0 + - paripari ==0.7.0.0 + - parseargs ==0.2.0.9 + - parsec-class ==1.0.0.0 + - parsec-numbers ==0.1.0 + - parsec-numeric ==0.1.0.0 + - ParsecTools ==0.0.2.0 + - parser-combinators ==1.2.1 + - parser-combinators-tests ==1.2.1 + - parsers ==0.12.10 + - partial-handler ==1.0.3 + - partial-isomorphisms ==0.2.2.1 + - partial-semigroup ==0.5.1.8 + - password ==3.0.0.0 + - password-instances ==3.0.0.0 + - password-types ==1.0.0.0 + - path ==0.7.0 + - path-binary-instance ==0.1.0.1 + - path-extensions ==0.1.1.0 + - path-extra ==0.2.0 + - path-io ==1.6.2 + - path-like ==0.2.0.2 + - path-pieces ==0.2.1 + - path-text-utf8 ==0.0.1.6 + - pathtype ==0.8.1.1 + - pathwalk ==0.3.1.2 + - pattern-arrows ==0.0.2 + - pava ==0.1.1.1 + - pcg-random ==0.1.3.7 + - pcre2 ==1.1.4 + - pcre-heavy ==1.0.0.2 + - pcre-light ==0.4.1.0 + - pcre-utils ==0.1.8.2 + - pdfinfo ==1.5.4 + - peano ==0.1.0.1 + - pem ==0.2.4 + - percent-format ==0.0.1 + - peregrin ==0.3.1 + - perfect-hash-generator ==0.2.0.6 + - perfect-vector-shuffle ==0.1.1.1 + - persist ==0.1.1.5 + - persistable-record ==0.6.0.5 + - persistable-types-HDBC-pg ==0.0.3.5 + - persistent ==2.11.0.4 + - persistent-documentation ==0.1.0.2 + - persistent-mtl ==0.2.1.0 + - persistent-mysql ==2.10.3.1 + - persistent-pagination ==0.1.1.2 + - persistent-postgresql ==2.11.0.1 + - persistent-qq ==2.9.2.1 + - persistent-sqlite ==2.11.1.0 + - persistent-template ==2.9.1.0 + - persistent-test ==2.0.3.5 + - persistent-typed-db ==0.1.0.2 + - pg-harness-client ==0.6.0 + - pgp-wordlist ==0.1.0.3 + - pg-transact ==0.3.1.1 + - phantom-state ==0.2.1.2 + - pid1 ==0.1.2.0 + - pinboard ==0.10.2.0 + - pipes ==4.3.15 + - pipes-aeson ==0.4.1.8 + - pipes-attoparsec ==0.5.1.5 + - pipes-binary ==0.4.2 + - pipes-bytestring ==2.1.7 + - pipes-concurrency ==2.0.12 + - pipes-csv ==1.4.3 + - pipes-extras ==1.0.15 + - pipes-fastx ==0.3.0.0 + - pipes-group ==1.0.12 + - pipes-http ==1.0.6 + - pipes-network ==0.6.5 + - pipes-network-tls ==0.4 + - pipes-ordered-zip ==1.2.1 + - pipes-parse ==3.0.9 + - pipes-random ==1.0.0.5 + - pipes-safe ==2.3.3 + - pipes-wai ==3.2.0 + - pkcs10 ==0.2.0.0 + - pkgtreediff ==0.4.1 + - place-cursor-at ==1.0.1 + - placeholders ==0.1 + - plaid ==0.1.0.4 + - plotlyhs ==0.2.1 + - pointed ==5.0.2 + - pointedlist ==0.6.1 + - pointless-fun ==1.1.0.6 + - poll ==0.0.0.2 + - poly ==0.5.0.0 + - poly-arity ==0.1.0 + - polynomials-bernstein ==1.1.2 + - polyparse ==1.13 + - polysemy ==1.5.0.0 + - polysemy-plugin ==0.3.0.0 + - pooled-io ==0.0.2.2 + - port-utils ==0.2.1.0 + - posix-paths ==0.2.1.6 + - possibly ==1.0.0.0 + - postgres-options ==0.2.0.0 + - postgresql-binary ==0.12.4 + - postgresql-libpq ==0.9.4.3 + - postgresql-libpq-notify ==0.2.0.0 + - postgresql-orm ==0.5.1 + - postgresql-simple ==0.6.4 + - postgresql-typed ==0.6.2.0 + - postgrest ==7.0.1 + - post-mess-age ==0.2.1.0 + - pptable ==0.3.0.0 + - pqueue ==1.4.1.3 + - prairie ==0.0.1.0 + - prefix-units ==0.2.0 + - prelude-compat ==0.0.0.2 + - prelude-safeenum ==0.1.1.2 + - prettyclass ==1.0.0.0 + - pretty-class ==1.0.1.1 + - pretty-diff ==0.4.0.3 + - pretty-hex ==1.1 + - prettyprinter ==1.7.0 + - prettyprinter-ansi-terminal ==1.1.2 + - prettyprinter-compat-annotated-wl-pprint ==1.1 + - prettyprinter-compat-ansi-wl-pprint ==1.0.1 + - prettyprinter-compat-wl-pprint ==1.0.0.1 + - prettyprinter-convert-ansi-wl-pprint ==1.1.1 + - pretty-relative-time ==0.2.0.0 + - pretty-show ==1.10 + - pretty-simple ==4.0.0.0 + - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 + - primes ==0.2.1.0 + - primitive ==0.7.1.0 + - primitive-addr ==0.1.0.2 + - primitive-extras ==0.10.1 + - primitive-unaligned ==0.1.1.1 + - primitive-unlifted ==0.1.3.0 + - print-console-colors ==0.1.0.0 + - probability ==0.2.7 + - process-extras ==0.7.4 + - product-isomorphic ==0.0.3.3 + - product-profunctors ==0.11.0.2 + - profiterole ==0.1 + - profunctors ==5.5.2 + - projectroot ==0.2.0.1 + - project-template ==0.2.1.0 + - prometheus ==2.2.2 + - prometheus-client ==1.0.1 + - prometheus-wai-middleware ==1.0.1.0 + - promises ==0.3 + - prompt ==0.1.1.2 + - prospect ==0.1.0.0 + - proto3-wire ==1.2.1 + - protobuf ==0.2.1.3 + - protobuf-simple ==0.1.1.0 + - protocol-buffers ==2.4.17 + - protocol-buffers-descriptor ==2.4.17 + - protocol-radius ==0.0.1.1 + - protocol-radius-test ==0.1.0.1 + - proto-lens ==0.7.0.0 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 + - protolude ==0.3.0 + - proxied ==0.3.1 + - psqueues ==0.2.7.2 + - publicsuffix ==0.20200526 + - pulse-simple ==0.1.14 + - pureMD5 ==2.1.3 + - purescript-bridge ==0.14.0.0 + - pushbullet-types ==0.4.1.0 + - pusher-http-haskell ==2.1.0.1 + - pvar ==1.0.0.0 + - PyF ==0.9.0.3 + - qchas ==1.1.0.1 + - qm-interpolated-string ==0.3.0.0 + - qrcode-core ==0.9.4 + - qrcode-juicypixels ==0.8.2 + - quadratic-irrational ==0.1.1 + - QuasiText ==0.1.2.6 + - QuickCheck ==2.14.2 + - quickcheck-arbitrary-adt ==0.3.1.0 + - quickcheck-assertions ==0.3.0 + - quickcheck-classes ==0.6.5.0 + - quickcheck-classes-base ==0.6.2.0 + - quickcheck-higherorder ==0.1.0.0 + - quickcheck-instances ==0.3.25.2 + - quickcheck-io ==0.2.0 + - quickcheck-simple ==0.1.1.1 + - quickcheck-special ==0.1.0.6 + - quickcheck-text ==0.1.2.1 + - quickcheck-transformer ==0.3.1.1 + - quickcheck-unicode ==1.0.1.0 + - quiet ==0.2 + - quote-quot ==0.2.0.0 + - radius ==0.7.1.0 + - rainbow ==0.34.2.2 + - rainbox ==0.26.0.0 + - ral ==0.2 + - rampart ==1.1.0.2 + - ramus ==0.1.2 + - rando ==0.0.0.4 + - random ==1.1 + - random-bytestring ==0.1.4 + - random-fu ==0.2.7.4 + - random-shuffle ==0.0.4 + - random-source ==0.3.0.8 + - random-tree ==0.6.0.5 + - range ==0.3.0.2 + - ranged-list ==0.1.0.0 + - Ranged-sets ==0.4.0 + - range-set-list ==0.1.3.1 + - rank1dynamic ==0.4.1 + - rank2classes ==1.4.1 + - Rasterific ==0.7.5.3 + - rasterific-svg ==0.3.3.2 + - ratel ==1.0.14 + - rate-limit ==1.4.2 + - ratel-wai ==1.1.5 + - rattle ==0.2 + - rattletrap ==11.1.1 + - Rattus ==0.5 + - rawfilepath ==0.2.4 + - rawstring-qm ==0.2.3.0 + - raw-strings-qq ==1.1 + - rcu ==0.2.5 + - rdf ==0.1.0.5 + - rdtsc ==1.3.0.1 + - re2 ==0.3 + - readable ==0.3.1 + - read-editor ==0.1.0.2 + - read-env-var ==1.0.0.0 + - rebase ==1.6.1 + - record-dot-preprocessor ==0.2.10 + - record-hasfield ==1.0 + - records-sop ==0.1.1.0 + - record-wrangler ==0.1.1.0 + - recursion-schemes ==5.2.2.1 + - reducers ==3.12.3 + - refact ==0.3.0.2 + - ref-fd ==0.5 + - refined ==0.6.2 + - reflection ==2.1.6 + - reform ==0.2.7.4 + - reform-blaze ==0.2.4.3 + - reform-hamlet ==0.0.5.3 + - reform-happstack ==0.2.5.4 + - RefSerialize ==0.4.0 + - ref-tf ==0.5 + - regex ==1.1.0.0 + - regex-applicative ==0.3.4 + - regex-applicative-text ==0.1.0.1 + - regex-base ==0.94.0.1 + - regex-compat ==0.95.2.1 + - regex-compat-tdfa ==0.95.1.4 + - regex-pcre ==0.95.0.0 + - regex-pcre-builtin ==0.95.2.3.8.43 + - regex-posix ==0.96.0.0 + - regex-tdfa ==1.3.1.0 + - regex-with-pcre ==1.1.0.0 + - registry ==0.2.0.3 + - reinterpret-cast ==0.1.0 + - relapse ==1.0.0.0 + - relational-query ==0.12.2.3 + - relational-query-HDBC ==0.7.2.0 + - relational-record ==0.2.2.0 + - relational-schemas ==0.1.8.0 + - reliable-io ==0.0.1 + - relude ==0.7.0.0 + - renderable ==0.2.0.1 + - replace-attoparsec ==1.4.4.0 + - replace-megaparsec ==1.4.4.0 + - repline ==0.4.0.0 + - req ==3.9.0 + - req-conduit ==1.0.0 + - rerebase ==1.6.1 + - rescue ==0.4.2.1 + - resistor-cube ==0.0.1.2 + - resolv ==0.1.2.0 + - resource-pool ==0.2.3.2 + - resourcet ==1.2.4.2 + - result ==0.2.6.0 + - rethinkdb-client-driver ==0.0.25 + - retry ==0.8.1.2 + - rev-state ==0.1.2 + - rfc1751 ==0.1.3 + - rfc5051 ==0.2 + - rhbzquery ==0.4.3 + - rhine ==0.7.0 + - rhine-gloss ==0.7.0 + - rigel-viz ==0.2.0.0 + - rio ==0.1.20.0 + - rio-orphans ==0.1.2.0 + - rio-prettyprint ==0.1.1.0 + - roc-id ==0.1.0.0 + - rocksdb-haskell ==1.0.1 + - rocksdb-haskell-jprupp ==2.1.3 + - rocksdb-query ==0.4.2 + - roles ==0.2.0.0 + - rope-utf16-splay ==0.3.2.0 + - rosezipper ==0.2 + - rot13 ==0.2.0.1 + - rpmbuild-order ==0.4.3.2 + - RSA ==2.4.1 + - runmemo ==1.0.0.1 + - rvar ==0.2.0.6 + - safe ==0.3.19 + - safe-coloured-text ==0.0.0.0 + - safecopy ==0.10.4.2 + - safe-decimal ==0.2.0.0 + - safe-exceptions ==0.1.7.1 + - safe-foldable ==0.1.0.0 + - safeio ==0.0.5.0 + - safe-json ==1.1.1.1 + - safe-money ==0.9 + - SafeSemaphore ==0.10.1 + - safe-tensor ==0.2.1.1 + - salak ==0.3.6 + - salak-yaml ==0.3.5.3 + - saltine ==0.1.1.1 + - salve ==1.0.11 + - sample-frame ==0.0.3 + - sample-frame-np ==0.0.4.1 + - sampling ==0.3.5 + - sandwich ==0.1.0.5 + - sandwich-quickcheck ==0.1.0.5 + - sandwich-slack ==0.1.0.4 + - sandwich-webdriver ==0.1.0.4 + - say ==0.1.0.1 + - sbp ==2.6.3 + - scalpel ==0.6.2 + - scalpel-core ==0.6.2 + - scanf ==0.1.0.0 + - scanner ==0.3.1 + - scheduler ==1.5.0 + - scientific ==0.3.6.2 + - scotty ==0.12 + - scrypt ==0.5.0 + - sdl2 ==2.5.3.0 + - sdl2-gfx ==0.2 + - sdl2-image ==2.0.0 + - sdl2-mixer ==1.1.0 + - sdl2-ttf ==2.1.2 + - search-algorithms ==0.3.1 + - secp256k1-haskell ==0.5.0 + - securemem ==0.1.10 + - selda ==0.5.1.0 + - selda-json ==0.1.1.0 + - selda-postgresql ==0.1.8.1 + - selda-sqlite ==0.1.7.1 + - selections ==0.3.0.0 + - selective ==0.4.2 + - semialign ==1.1.0.1 + - semialign-indexed ==1.1 + - semialign-optics ==1.1 + - semigroupoid-extras ==5 + - semigroupoids ==5.3.5 + - semigroups ==0.19.1 + - semirings ==0.6 + - semiring-simple ==1.0.0.1 + - semver ==0.4.0.1 + - sendfile ==0.7.11.1 + - sendgrid-v3 ==0.3.0.0 + - seqalign ==0.2.0.4 + - seqid ==0.6.2 + - seqid-streams ==0.7.2 + - sequence-formats ==1.6.1 + - sequenceTools ==1.4.0.5 + - serf ==0.1.1.0 + - serialise ==0.2.3.0 + - servant ==0.18.2 + - servant-auth ==0.4.0.0 + - servant-auth-client ==0.4.1.0 + - servant-auth-docs ==0.2.10.0 + - servant-auth-server ==0.4.6.0 + - servant-auth-swagger ==0.2.10.1 + - servant-blaze ==0.9.1 + - servant-client ==0.18.2 + - servant-client-core ==0.18.2 + - servant-conduit ==0.15.1 + - servant-docs ==0.11.8 + - servant-elm ==0.7.2 + - servant-errors ==0.1.6.0 + - servant-exceptions ==0.2.1 + - servant-exceptions-server ==0.2.1 + - servant-foreign ==0.15.3 + - servant-http-streams ==0.18.2 + - servant-machines ==0.15.1 + - servant-multipart ==0.12 + - servant-openapi3 ==2.0.1.2 + - servant-pipes ==0.15.2 + - servant-rawm ==1.0.0.0 + - servant-server ==0.18.2 + - servant-swagger ==1.1.10 + - servant-swagger-ui ==0.3.5.3.47.1 + - servant-swagger-ui-core ==0.3.5 + - serverless-haskell ==0.12.6 + - serversession ==1.0.2 + - serversession-frontend-wai ==1.0 + - ses-html ==0.4.0.0 + - set-cover ==0.1.1 + - setenv ==0.1.1.3 + - setlocale ==1.0.0.10 + - sexp-grammar ==2.3.0 + - SHA ==1.6.4.4 + - shake-language-c ==0.12.0 + - shake-plus ==0.3.3.1 + - shake-plus-extended ==0.4.1.0 + - shakespeare ==2.0.25 + - shared-memory ==0.2.0.0 + - shell-conduit ==5.0.0 + - shell-escape ==0.2.0 + - shellmet ==0.0.4.0 + - shelltestrunner ==1.9 + - shell-utility ==0.1 + - shelly ==1.9.0 + - shikensu ==0.3.11 + - shortcut-links ==0.5.1.1 + - should-not-typecheck ==2.1.0 + - show-combinators ==0.2.0.0 + - siggy-chardust ==1.0.0 + - signal ==0.1.0.4 + - silently ==1.2.5.1 + - simple-affine-space ==0.1.1 + - simple-cabal ==0.1.3 + - simple-cmd ==0.2.3 + - simple-cmd-args ==0.1.6 + - simple-log ==0.9.12 + - simple-reflect ==0.3.3 + - simple-sendfile ==0.2.30 + - simple-templates ==1.0.0 + - simple-vec3 ==0.6.0.1 + - simplistic-generics ==2.0.0 + - since ==0.0.0 + - singleton-bool ==0.1.5 + - singleton-nats ==0.4.5 + - singletons ==2.7 + - singletons-presburger ==0.6.0.0 + - siphash ==1.0.3 + - sitemap-gen ==0.1.0.0 + - sized ==1.0.0.0 + - skein ==1.0.9.4 + - skews ==0.1.0.3 + - skip-var ==0.1.1.0 + - skylighting ==0.10.5.1 + - skylighting-core ==0.10.5.1 + - slack-api ==0.12 + - slack-progressbar ==0.1.0.1 + - slick ==1.1.1.0 + - slist ==0.2.0.0 + - slynx ==0.5.0.2 + - smallcheck ==1.2.1 + - smash ==0.1.2 + - smash-aeson ==0.1.0.0 + - smash-lens ==0.1.0.1 + - smash-microlens ==0.1.0.0 + - smoothie ==0.4.2.11 + - smtp-mail ==0.3.0.0 + - snap-blaze ==0.2.1.5 + - snap-core ==1.0.4.2 + - snap-server ==1.1.2.0 + - snowflake ==0.1.1.1 + - soap ==0.2.3.6 + - soap-openssl ==0.1.0.2 + - soap-tls ==0.1.1.4 + - socket ==0.8.3.0 + - socks ==0.6.1 + - some ==1.0.3 + - sop-core ==0.5.0.1 + - sort ==1.0.0.0 + - sorted-list ==0.2.1.0 + - sourcemap ==0.1.6.1 + - sox ==0.2.3.1 + - soxlib ==0.0.3.1 + - spacecookie ==1.0.0.0 + - sparse-linear-algebra ==0.3.1 + - sparse-tensor ==0.2.1.5 + - spatial-math ==0.5.0.1 + - special-values ==0.1.0.0 + - speculate ==0.4.6 + - speedy-slice ==0.3.2 + - Spintax ==0.3.6 + - splice ==0.6.1.1 + - splint ==1.0.1.4 + - split ==0.2.3.4 + - splitmix ==0.1.0.3 + - splitmix-distributions ==0.7.0.0 + - spoon ==0.3.1 + - spreadsheet ==0.1.3.8 + - sqlcli ==0.2.2.0 + - sqlcli-odbc ==0.2.0.1 + - sqlite-simple ==0.4.18.0 + - sql-words ==0.1.6.4 + - squeal-postgresql ==0.7.0.1 + - squeather ==0.6.0.0 + - srcloc ==0.6 + - stache ==2.2.1 + - stackcollapse-ghc ==0.0.1.3 + - stack-templatizer ==0.1.0.2 + - stateref ==0.3 + - StateVar ==1.2.1 + - static-text ==0.2.0.6 + - statistics ==0.15.2.0 + - status-notifier-item ==0.3.0.5 + - stb-image-redux ==0.2.1.3 + - step-function ==0.2 + - stm-chans ==3.0.0.4 + - stm-conduit ==4.0.1 + - stm-containers ==1.2 + - stm-delay ==0.1.1.1 + - stm-extras ==0.1.0.3 + - stm-hamt ==1.2.0.6 + - stm-lifted ==2.5.0.0 + - STMonadTrans ==0.4.5 + - stm-split ==0.0.2.1 + - stopwatch ==0.1.0.6 + - storable-complex ==0.2.3.0 + - storable-endian ==0.2.6 + - storable-record ==0.0.5 + - storable-tuple ==0.0.3.3 + - storablevector ==0.2.13.1 + - store ==0.7.11 + - store-core ==0.4.4.4 + - store-streaming ==0.2.0.3 + - stratosphere ==0.59.1 + - streaming ==0.2.3.0 + - streaming-attoparsec ==1.0.0.1 + - streaming-bytestring ==0.2.0 + - streaming-commons ==0.2.2.1 + - streamly ==0.7.3 + - streams ==3.3 + - strict ==0.4.0.1 + - strict-concurrency ==0.2.4.3 + - strict-list ==0.1.5 + - strict-tuple ==0.1.4 + - strict-tuple-lens ==0.1.0.1 + - stringbuilder ==0.5.1 + - string-class ==0.1.7.0 + - string-combinators ==0.6.0.5 + - string-conv ==0.1.2 + - string-conversions ==0.4.0.1 + - string-interpolate ==0.3.1.0 + - string-qq ==0.0.4 + - string-random ==0.1.4.1 + - stringsearch ==0.3.6.6 + - string-transform ==1.1.1 + - stripe-concepts ==1.0.2.6 + - stripe-core ==2.6.2 + - stripe-haskell ==2.6.2 + - stripe-http-client ==2.6.2 + - stripe-tests ==2.6.2 + - strive ==5.0.14 + - structs ==0.1.6 + - structured ==0.1.0.1 + - structured-cli ==2.7.0.1 + - subcategories ==0.1.1.0 + - sum-type-boilerplate ==0.1.1 + - sundown ==0.6 + - superbuffer ==0.3.1.1 + - svg-tree ==0.6.2.4 + - swagger ==0.3.0 + - swagger2 ==2.6 + - sweet-egison ==0.1.1.3 + - swish ==0.10.0.4 + - syb ==0.7.2.1 + - sydtest ==0.1.0.0 + - sydtest-discover ==0.0.0.0 + - sydtest-persistent-sqlite ==0.0.0.0 + - sydtest-servant ==0.0.0.0 + - sydtest-wai ==0.0.0.0 + - sydtest-yesod ==0.0.0.0 + - symbol ==0.2.4 + - symengine ==0.1.2.0 + - symmetry-operations-symbols ==0.0.2.1 + - sysinfo ==0.1.1 + - system-argv0 ==0.1.1 + - systemd ==2.3.0 + - system-fileio ==0.3.16.4 + - system-filepath ==0.4.14 + - system-info ==0.5.2 + - tabular ==0.2.2.8 + - taffybar ==3.2.3 + - tagchup ==0.4.1.1 + - tagged ==0.8.6.1 + - tagged-binary ==0.2.0.1 + - tagged-identity ==0.1.3 + - tagged-transformer ==0.8.1 + - tagshare ==0.0 + - tagsoup ==0.14.8 + - tao ==1.0.0 + - tao-example ==1.0.0 + - tar ==0.5.1.1 + - tar-conduit ==0.3.2 + - tardis ==0.4.3.0 + - tasty ==1.4.1 + - tasty-ant-xml ==1.1.8 + - tasty-bench ==0.2.5 + - tasty-dejafu ==2.0.0.7 + - tasty-discover ==4.2.2 + - tasty-expected-failure ==0.12.3 + - tasty-focus ==1.0.1 + - tasty-golden ==2.3.4 + - tasty-hedgehog ==1.0.1.0 + - tasty-hspec ==1.1.6 + - tasty-hunit ==0.10.0.3 + - tasty-hunit-compat ==0.2.0.1 + - tasty-kat ==0.0.3 + - tasty-leancheck ==0.0.1 + - tasty-lua ==0.2.3.2 + - tasty-program ==1.0.5 + - tasty-quickcheck ==0.10.1.2 + - tasty-rerun ==1.1.18 + - tasty-silver ==3.2.1 + - tasty-smallcheck ==0.8.2 + - tasty-test-reporter ==0.1.1.4 + - tasty-th ==0.1.7 + - tasty-wai ==0.1.1.1 + - Taxonomy ==2.1.0 + - TCache ==0.12.1 + - tce-conf ==1.3 + - tdigest ==0.2.1.1 + - template-haskell-compat-v0208 ==0.1.5 + - temporary ==1.3 + - temporary-rc ==1.2.0.3 + - temporary-resourcet ==0.1.0.1 + - tensorflow-test ==0.1.0.0 + - tensors ==0.1.5 + - termbox ==0.3.0 + - terminal-progress-bar ==0.4.1 + - terminal-size ==0.3.2.1 + - test-framework ==0.8.2.0 + - test-framework-hunit ==0.3.0.2 + - test-framework-leancheck ==0.0.1 + - test-framework-quickcheck2 ==0.3.0.5 + - test-framework-smallcheck ==0.2 + - test-fun ==0.1.0.0 + - testing-type-modifiers ==0.1.0.1 + - texmath ==0.12.2 + - text-ansi ==0.1.1 + - text-binary ==0.2.1.1 + - text-builder ==0.6.6.2 + - text-conversions ==0.3.1 + - text-format ==0.3.2 + - text-icu ==0.7.0.1 + - text-latin1 ==0.3.1 + - text-ldap ==0.1.1.13 + - textlocal ==0.1.0.5 + - text-manipulate ==0.3.0.0 + - text-metrics ==0.3.0 + - text-postgresql ==0.0.3.1 + - text-printer ==0.5.0.1 + - text-regex-replace ==0.1.1.4 + - text-region ==0.3.1.0 + - text-short ==0.1.3 + - text-show ==3.9 + - text-show-instances ==3.8.4 + - text-zipper ==0.11 + - tfp ==1.0.2 + - tf-random ==0.5 + - th-abstraction ==0.4.2.0 + - th-bang-compat ==0.0.1.0 + - th-compat ==0.1.2 + - th-constraint-compat ==0.0.1.0 + - th-data-compat ==0.1.0.0 + - th-desugar ==1.11 + - th-env ==0.1.0.2 + - these ==1.1.1.1 + - these-lens ==1.0.1.2 + - these-optics ==1.0.1.2 + - these-skinny ==0.7.4 + - th-expand-syns ==0.4.8.0 + - th-extras ==0.0.0.4 + - th-lift ==0.8.2 + - th-lift-instances ==0.1.18 + - th-nowq ==0.1.0.5 + - th-orphans ==0.13.11 + - th-printf ==0.7 + - thread-hierarchy ==0.3.0.2 + - thread-local-storage ==0.2 + - threads ==0.5.1.6 + - thread-supervisor ==0.2.0.0 + - threepenny-gui ==0.9.0.0 + - th-reify-compat ==0.0.1.5 + - th-reify-many ==0.1.9 + - throttle-io-stream ==0.2.0.1 + - through-text ==0.1.0.0 + - throwable-exceptions ==0.1.0.9 + - th-strict-compat ==0.1.0.1 + - th-test-utils ==1.1.0 + - th-utilities ==0.2.4.3 + - thyme ==0.3.5.5 + - tidal ==1.7.4 + - tile ==0.3.0.0 + - time-compat ==1.9.5 + - timeit ==2.0 + - timelens ==0.2.0.2 + - time-lens ==0.4.0.2 + - time-locale-compat ==0.1.1.5 + - time-locale-vietnamese ==1.0.0.0 + - time-manager ==0.0.0 + - time-parsers ==0.1.2.1 + - timerep ==2.0.1.0 + - timer-wheel ==0.3.0 + - time-units ==1.0.0 + - timezone-olson ==0.2.0 + - timezone-series ==0.1.9 + - tinylog ==0.15.0 + - titlecase ==1.0.1 + - tldr ==0.9.0 + - tls ==1.5.5 + - tls-debug ==0.4.8 + - tls-session-manager ==0.0.4 + - tlynx ==0.5.0.2 + - tmapchan ==0.0.3 + - tmapmvar ==0.0.4 + - tmp-postgres ==1.34.1.0 + - tomland ==1.3.2.0 + - tonalude ==0.1.1.1 + - topograph ==1.0.0.1 + - torsor ==0.1 + - tostring ==0.2.1.1 + - transaction ==0.1.1.3 + - transformers-base ==0.4.5.2 + - transformers-bifunctors ==0.1 + - transformers-compat ==0.6.6 + - transformers-fix ==1.0 + - traverse-with-class ==1.0.1.0 + - tree-diff ==0.2 + - tree-fun ==0.8.1.0 + - tree-view ==0.5.1 + - trifecta ==2.1.1 + - triplesec ==0.2.2.1 + - tsv2csv ==0.1.0.2 + - ttc ==0.4.0.0 + - ttl-hashtables ==1.4.1.0 + - ttrie ==0.1.2.1 + - tuple ==0.3.0.2 + - tuples-homogenous-h98 ==0.1.1.0 + - tuple-sop ==0.3.1.0 + - tuple-th ==0.2.5 + - turtle ==1.5.22 + - typecheck-plugin-nat-simple ==0.1.0.2 + - TypeCompose ==0.9.14 + - typed-process ==0.2.6.0 + - typed-uuid ==0.0.0.2 + - type-equality ==1 + - type-errors ==0.2.0.0 + - type-errors-pretty ==0.0.1.1 + - type-hint ==0.1 + - type-level-integers ==0.0.1 + - type-level-kv-list ==1.1.0 + - type-level-natural-number ==2.0 + - type-level-numbers ==0.1.1.1 + - type-map ==0.1.6.0 + - type-natural ==1.1.0.0 + - typenums ==0.1.4 + - type-of-html ==1.6.2.0 + - type-of-html-static ==0.1.0.2 + - type-operators ==0.2.0.0 + - typerep-map ==0.3.3.0 + - type-spec ==0.4.0.0 + - tzdata ==0.2.20201021.0 + - ua-parser ==0.7.6.0 + - uglymemo ==0.1.0.1 + - ulid ==0.3.0.0 + - unagi-chan ==0.4.1.3 + - unbounded-delays ==0.1.1.1 + - unboxed-ref ==0.4.0.0 + - unboxing-vector ==0.2.0.0 + - uncaught-exception ==0.1.0 + - uncertain ==0.3.1.0 + - unconstrained ==0.1.0.2 + - unexceptionalio ==0.5.1 + - unexceptionalio-trans ==0.5.1 + - unicode ==0.0.1.1 + - unicode-show ==0.1.0.4 + - unicode-transforms ==0.3.7.1 + - unification-fd ==0.11.1 + - union-find ==0.2 + - unipatterns ==0.0.0.0 + - uniplate ==1.6.13 + - uniprot-kb ==0.1.2.0 + - uniq-deep ==1.2.0 + - unique ==0.0.1 + - unique-logic ==0.4 + - unique-logic-tf ==0.5.1 + - unit-constraint ==0.0.0 + - universe ==1.2.1 + - universe-base ==1.1.2 + - universe-instances-base ==1.1 + - universe-instances-extended ==1.1.2 + - universe-instances-trans ==1.1 + - universe-reverse-instances ==1.1.1 + - universe-some ==1.2.1 + - universum ==1.7.2 + - unix-bytestring ==0.3.7.3 + - unix-compat ==0.5.3 + - unix-time ==0.4.7 + - unliftio ==0.2.14 + - unliftio-core ==0.2.0.1 + - unliftio-pool ==0.2.1.1 + - unliftio-streams ==0.1.1.1 + - unlit ==0.4.0.0 + - unordered-containers ==0.2.13.0 + - unsafe ==0.0 + - urbit-hob ==0.3.3 + - uri-bytestring ==0.3.3.0 + - uri-bytestring-aeson ==0.1.0.8 + - uri-encode ==1.5.0.7 + - url ==2.1.3 + - users ==0.5.0.0 + - utf8-conversions ==0.1.0.4 + - utf8-light ==0.4.2 + - utf8-string ==1.0.2 + - util ==0.1.17.1 + - utility-ht ==0.0.16 + - uuid ==1.3.15 + - uuid-types ==1.0.5 + - validation ==1.1.1 + - validation-selective ==0.1.0.1 + - validity ==0.11.0.0 + - validity-aeson ==0.2.0.4 + - validity-bytestring ==0.4.1.1 + - validity-containers ==0.5.0.4 + - validity-path ==0.4.0.1 + - validity-persistent ==0.0.0.0 + - validity-primitive ==0.0.0.1 + - validity-scientific ==0.2.0.3 + - validity-text ==0.3.1.1 + - validity-time ==0.4.0.0 + - validity-unordered-containers ==0.2.0.3 + - validity-uuid ==0.1.0.3 + - validity-vector ==0.2.0.3 + - valor ==0.1.0.0 + - vault ==0.3.1.5 + - vec ==0.4 + - vector ==0.12.3.0 + - vector-algorithms ==0.8.0.4 + - vector-binary-instances ==0.2.5.2 + - vector-buffer ==0.4.1 + - vector-builder ==0.3.8.1 + - vector-bytes-instances ==0.1.1 + - vector-circular ==0.1.3 + - vector-instances ==3.4 + - vector-mmap ==0.0.3 + - vector-rotcev ==0.1.0.0 + - vector-sized ==1.4.3.1 + - vector-space ==0.16 + - vector-split ==1.0.0.2 + - vector-th-unbox ==0.2.1.9 + - verbosity ==0.4.0.0 + - versions ==4.0.3 + - vformat ==0.14.1.0 + - vformat-aeson ==0.1.0.1 + - vformat-time ==0.1.0.0 + - ViennaRNAParser ==1.3.3 + - vinyl ==0.13.1 + - void ==0.7.3 + - vty ==5.33 + - wai ==3.2.3 + - wai-app-static ==3.1.7.2 + - wai-conduit ==3.0.0.4 + - wai-cors ==0.2.7 + - wai-enforce-https ==0.0.2.1 + - wai-eventsource ==3.0.0 + - wai-extra ==3.1.6 + - wai-feature-flags ==0.1.0.1 + - wai-handler-launch ==3.0.3.1 + - wai-logger ==2.3.6 + - wai-middleware-auth ==0.2.4.1 + - wai-middleware-caching ==0.1.0.2 + - wai-middleware-clacks ==0.1.0.1 + - wai-middleware-static ==0.9.0 + - wai-rate-limit ==0.1.0.0 + - wai-rate-limit-redis ==0.1.0.0 + - wai-saml2 ==0.2.1.2 + - wai-session ==0.3.3 + - wai-session-redis ==0.1.0.1 + - wai-slack-middleware ==0.2.0 + - wai-websockets ==3.0.1.2 + - wakame ==0.1.0.0 + - warp ==3.3.15 + - warp-tls ==3.3.0 + - warp-tls-uid ==0.2.0.6 + - wave ==0.2.0 + - wcwidth ==0.0.2 + - webby ==1.0.1 + - webdriver ==0.9.0.1 + - webex-teams-api ==0.2.0.1 + - webex-teams-conduit ==0.2.0.1 + - webex-teams-pipes ==0.2.0.1 + - webgear-server ==0.2.1 + - webrtc-vad ==0.1.0.3 + - websockets ==0.12.7.2 + - websockets-snap ==0.10.3.1 + - weigh ==0.0.16 + - wide-word ==0.1.1.2 + - wikicfp-scraper ==0.1.0.12 + - wild-bind ==0.1.2.7 + - wild-bind-x11 ==0.2.0.12 + - Win32 ==2.6.1.0 + - Win32-notify ==0.3.0.3 + - windns ==0.1.0.1 + - witch ==0.2.1.1 + - witherable ==0.4.1 + - within ==0.2.0.1 + - with-location ==0.1.0 + - with-utf8 ==1.0.2.2 + - wizards ==1.0.3 + - wl-pprint-annotated ==0.1.0.1 + - wl-pprint-console ==0.1.0.2 + - wl-pprint-text ==1.2.0.1 + - word24 ==2.0.1 + - word8 ==0.1.3 + - word-trie ==0.3.0 + - word-wrap ==0.4.1 + - world-peace ==1.0.2.0 + - wrap ==0.0.0 + - wreq ==0.5.3.3 + - writer-cps-exceptions ==0.1.0.1 + - writer-cps-mtl ==0.1.1.6 + - writer-cps-transformers ==0.5.6.1 + - wss-client ==0.3.0.0 + - wuss ==1.1.18 + - X11 ==1.9.2 + - X11-xft ==0.3.1 + - x11-xim ==0.0.9.0 + - x509 ==1.7.5 + - x509-store ==1.6.7 + - x509-system ==1.6.6 + - x509-validation ==1.6.11 + - Xauth ==0.1 + - xdg-basedir ==0.2.2 + - xdg-desktop-entry ==0.1.1.1 + - xdg-userdirs ==0.1.0.2 + - xeno ==0.4.2 + - xlsx ==0.8.3 + - xlsx-tabular ==0.2.2.1 + - xml ==1.3.14 + - xml-basic ==0.1.3.1 + - xml-conduit ==1.9.1.1 + - xml-conduit-writer ==0.1.1.2 + - xmlgen ==0.6.2.2 + - xml-hamlet ==0.5.0.1 + - xml-helpers ==1.0.0 + - xml-html-qq ==0.1.0.1 + - xml-indexed-cursor ==0.1.1.0 + - xml-lens ==0.3 + - xml-picklers ==0.3.6 + - xml-to-json ==2.0.1 + - xml-to-json-fast ==2.0.0 + - xml-types ==0.3.8 + - xmonad ==0.15 + - xmonad-contrib ==0.16 + - xmonad-extras ==0.15.3 + - xss-sanitize ==0.3.6 + - xxhash-ffi ==0.2.0.0 + - yaml ==0.11.5.0 + - yamlparse-applicative ==0.1.0.3 + - yesod ==1.6.1.1 + - yesod-auth ==1.6.10.3 + - yesod-auth-hashdb ==1.7.1.6 + - yesod-auth-oauth2 ==0.6.3.0 + - yesod-bin ==1.6.1 + - yesod-core ==1.6.19.0 + - yesod-fb ==0.6.1 + - yesod-form ==1.6.7 + - yesod-gitrev ==0.2.1 + - yesod-markdown ==0.12.6.9 + - yesod-newsfeed ==1.7.0.0 + - yesod-page-cursor ==2.0.0.6 + - yesod-paginator ==1.1.1.0 + - yesod-persistent ==1.6.0.6 + - yesod-sitemap ==1.6.0 + - yesod-static ==1.6.1.0 + - yesod-test ==1.6.12 + - yesod-websockets ==0.3.0.3 + - yes-precure5-command ==5.5.3 + - yi-rope ==0.11 + - yjsvg ==0.2.0.1 + - yjtools ==0.9.18 + - yoga ==0.0.0.5 + - youtube ==0.2.1.1 + - zenacy-html ==2.0.3 + - zenacy-unicode ==1.0.1 + - zero ==0.1.5 + - zeromq4-haskell ==0.8.0 + - zeromq4-patterns ==0.3.1.0 + - zim-parser ==0.2.1.0 + - zio ==0.1.0.2 + - zip ==1.7.0 + - zip-archive ==0.4.1 + - zipper-extra ==0.1.3.2 + - zippers ==0.3.1 + - zip-stream ==0.2.1.0 + - zlib ==0.6.2.3 + - zlib-bindings ==0.1.1.5 + - zlib-lens ==0.1.2.1 + - zot ==0.0.3 + - zstd ==0.1.2.0 + - ztail ==1.2.0.2 + - zydiskell ==0.2.0.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml new file mode 100644 index 0000000000000..a8ccc4f3851f5 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -0,0 +1,122 @@ +# This file is automatically generated by +# maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +# It is supposed to list all haskellPackages that cannot evaluate because they +# depend on a dependency marked as broken. +dont-distribute-packages: + - AesonBson + - HGamer3D-API + - HGamer3D-CAudio-Binding + - HGamer3D-OIS-Binding + - HipmunkPlayground + - Holumbus-Distribution + - Holumbus-MapReduce + - Holumbus-Storage + - KiCS + - KiCS-debugger + - KiCS-prophecy + - RESTng + - ViennaRNA-bindings + - XML + - acme-safe + - aeson-bson + - approx-rand-test + - barley + - bson-mapping + - bv-sized-lens + - clash-prelude-quickcheck + - click-clack + - cloudyfs + - cognimeta-utils + - comark + - comonad-random + - containers-accelerate + - definitive-graphics + - ecdsa + - effective-aspects-mzv + - eliminators_0_8 + - fltkhs-demos + - fltkhs-fluid-demos + - fltkhs-hello-world + - fltkhs-themes + - fluent-logger-conduit + - gi-gtk_4_0_4 + - goat + - gridfs + - gsmenu + - gtk2hs-cast-glade + - gtk2hs-cast-gnomevfs + - gtk2hs-cast-gtkglext + - gtk2hs-cast-gtksourceview2 + - hakyll-contrib-i18n + - hascat + - hascat-lib + - hascat-setup + - hascat-system + - haste-gapi + - haste-perch + - hatexmpp3 + - hplayground + - hs2dot + - hsqml-datamodel-vinyl + - hsqml-demo-morris + - hsqml-morris + - hubris + - hxt-binary + - hxt-filter + - imprevu-happstack + - javaclass + - keera-posture + - lambdabot-xmpp + - leksah + - liquidhaskell-cabal-demo + - mp3decoder + - network-pgi + - nomyx-api + - nomyx-core + - nomyx-language + - nomyx-library + - nomyx-server + - one-liner_2_0 + - openpgp-crypto-api + - patch-image + - perdure + - persistent-mysql_2_13_0_0 + - persistent-postgresql_2_13_0_0 + - persistent-sqlite_2_13_0_0 + - pontarius-mediaserver + - pontarius-xmpp-extras + - pontarius-xpmn + - procrastinating-structure + - reactive + - redHandlers + - reflex-dom-colonnade + - regex-genex + - ribosome + - ribosome-root + - ribosome-test + - ripple + - robot + - roguestar-engine + - roguestar-gl + - roguestar-glut + - route-generator + - sc2hs + - sexpresso + - shine-varying + - singleton-nats_0_4_6 + - smtp2mta + - sneathlane-haste + - sock2stream + - starrover2 + - text-xml-generic + - trasa-reflex + - treersec + - tuple-hlist + - wai-dispatch + - wai-hastache + - wai-middleware-brotli + - wai-session-tokyocabinet + - wx + - wxc + - wxcore + diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ba00d20007377..c5d8b418b512c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -101,17 +101,6 @@ self: super: builtins.intersectAttrs super { ormolu = enableSeparateBinOutput super.ormolu; ghcid = enableSeparateBinOutput super.ghcid; - # Ensure the necessary frameworks for Darwin. - OpenAL = if pkgs.stdenv.isDarwin - then addExtraLibrary super.OpenAL pkgs.darwin.apple_sdk.frameworks.OpenAL - else super.OpenAL; - - # Ensure the necessary frameworks for Darwin. - proteaaudio = if pkgs.stdenv.isDarwin - then addExtraLibrary super.proteaaudio pkgs.darwin.apple_sdk.frameworks.AudioToolbox - else super.proteaaudio; - - hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; configureFlags = [ "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" ]; @@ -131,39 +120,11 @@ self: super: builtins.intersectAttrs super { # Foreign dependency name clashes with another Haskell package. libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; }; - # Fix Darwin build. - halive = if pkgs.stdenv.isDarwin - then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit - else super.halive; - # Heist's test suite requires system pandoc heist = overrideCabal super.heist (drv: { testToolDepends = [pkgs.pandoc]; }); - # the system-fileio tests use canonicalizePath, which fails in the sandbox - system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; - - # Prevents needing to add `security_tool` as a run-time dependency for - # everything using x509-system to give access to the `security` executable. - x509-system = - if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc - then - # darwin.security_tool is broken in Mojave (#45042) - - # We will use the system provided security for now. - # Beware this WILL break in sandboxes! - - # TODO(matthewbauer): If someone really needs this to work in sandboxes, - # I think we can add a propagatedImpureHost dep here, but I’m hoping to - # get a proper fix available soonish. - overrideCabal super.x509-system (drv: { - postPatch = (drv.postPatch or "") + '' - substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security - ''; - }) - else super.x509-system; - # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"]; @@ -266,12 +227,6 @@ self: super: builtins.intersectAttrs super { # /homeless-shelter. Disabled. purescript = dontCheck super.purescript; - # https://github.com/haskell-foundation/foundation/pull/412 - foundation = - if pkgs.stdenv.isDarwin - then dontCheck super.foundation - else super.foundation; - # Hardcoded include path poppler = overrideCabal super.poppler (drv: { postPatch = '' @@ -283,23 +238,8 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; - llvm-hs = - let llvmHsWithLlvm9 = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; - in - if pkgs.stdenv.isDarwin - then - overrideCabal llvmHsWithLlvm9 (oldAttrs: { - # One test fails on darwin. - doCheck = false; - # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to - # the DYLD_LIBRARY_PATH environment variable. This messes up clang - # when called from GHC, probably because clang is version 7, but we are - # using LLVM8. - preCompileBuildDriver = oldAttrs.preCompileBuildDriver or "" + '' - substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" - ''; - }) - else llvmHsWithLlvm9; + # requires llvm 9 specifically https://github.com/llvm-hs/llvm-hs/#building-from-source + llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -307,7 +247,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal super.leksah (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... + gnome.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); @@ -322,14 +262,6 @@ self: super: builtins.intersectAttrs super { # Patch to consider NIX_GHC just like xmonad does dyre = appendPatch super.dyre ./patches/dyre-nix.patch; - yesod-bin = if pkgs.stdenv.isDarwin - then addBuildDepend super.yesod-bin pkgs.darwin.apple_sdk.frameworks.Cocoa - else super.yesod-bin; - - hmatrix = if pkgs.stdenv.isDarwin - then addBuildDepend super.hmatrix pkgs.darwin.apple_sdk.frameworks.Accelerate - else super.hmatrix; - # https://github.com/edwinb/EpiVM/issues/13 # https://github.com/edwinb/EpiVM/issues/14 epic = addExtraLibraries (addBuildTool super.epic self.buildHaskellPackages.happy) [pkgs.boehmgc pkgs.gmp]; @@ -405,43 +337,8 @@ self: super: builtins.intersectAttrs super { # Looks like Avahi provides the missing library dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; }; - # Ensure the necessary frameworks are propagatedBuildInputs on darwin - OpenGLRaw = overrideCabal super.OpenGLRaw (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; - preConfigure = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' - frameworkPaths=($(for i in $nativeBuildInputs; do if [ -d "$i"/Library/Frameworks ]; then echo "-F$i/Library/Frameworks"; fi done)) - frameworkPaths=$(IFS=, ; echo "''${frameworkPaths[@]}") - configureFlags+=$(if [ -n "$frameworkPaths" ]; then echo -n "--ghc-options=-optl=$frameworkPaths"; fi) - ''; - }); - GLURaw = overrideCabal super.GLURaw (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]; - }); - bindings-GLFW = overrideCabal super.bindings-GLFW (drv: { - doCheck = false; # requires an active X11 display - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - (with pkgs.darwin.apple_sdk.frameworks; - [ AGL Cocoa OpenGL IOKit Kernel CoreVideo - pkgs.darwin.CF ]); - }); - OpenCL = overrideCabal super.OpenCL (drv: { - librarySystemDepends = - pkgs.lib.optionals (!pkgs.stdenv.isDarwin) drv.librarySystemDepends; - libraryHaskellDepends = drv.libraryHaskellDepends - ++ pkgs.lib.optionals pkgs.stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]; - }); + # requires an X11 display + bindings-GLFW = dontCheck super.bindings-GLFW; # requires an X11 display in test suite gi-gtk-declarative = dontCheck super.gi-gtk-declarative; @@ -474,16 +371,8 @@ self: super: builtins.intersectAttrs super { testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; }); - # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required - # on darwin: https://github.com/NixOS/cabal2nix/issues/146. - hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify; - - # FSEvents API is very buggy and tests are unreliable. See - # http://openradar.appspot.com/10207999 and similar issues. # https://github.com/haskell-fswatch/hfsnotify/issues/62 - fsnotify = if pkgs.stdenv.isDarwin - then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa - else dontCheck super.fsnotify; + fsnotify = dontCheck super.fsnotify; hidapi = addExtraLibrary super.hidapi pkgs.udev; @@ -657,10 +546,6 @@ self: super: builtins.intersectAttrs super { spago = let - # spago requires an older version of megaparsec, but it appears to work - # fine with newer versions. - spagoWithOverrides = doJailbreak super.spago; - docsSearchApp_0_0_10 = pkgs.fetchurl { url = "https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js"; sha256 = "0m5ah29x290r0zk19hx2wix2djy7bs4plh9kvjz6bs9r45x25pa5"; @@ -681,17 +566,8 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoFixHpack = overrideCabal spagoWithOverrides (drv: { + spagoDocs = overrideCabal super.spago (drv: { postUnpack = (drv.postUnpack or "") + '' - # The source for spago is pulled directly from GitHub. It uses a - # package.yaml file with hpack, not a .cabal file. In the package.yaml file, - # it uses defaults from the master branch of the hspec repo. It will try to - # fetch these at build-time (but it will fail if running in the sandbox). - # - # The following line modifies the package.yaml to not pull in - # defaults from the hspec repo. - substituteInPlace "$sourceRoot/package.yaml" --replace 'defaults: hspec/hspec@master' "" - # Spago includes the following two files directly into the binary # with Template Haskell. They are fetched at build-time from the # `purescript-docs-search` repo above. If they cannot be fetched at @@ -717,9 +593,8 @@ self: super: builtins.intersectAttrs super { ''; }); - # Because of the problem above with pulling in hspec defaults to the - # package.yaml file, the tests are disabled. - spagoWithoutChecks = dontCheck spagoFixHpack; + # Tests require network access. + spagoWithoutChecks = dontCheck spagoDocs; in spagoWithoutChecks; @@ -826,4 +701,75 @@ self: super: builtins.intersectAttrs super { # Tests access internet prune-juice = dontCheck super.prune-juice; + + # based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix + ihaskell = overrideCabal super.ihaskell (drv: { + configureFlags = (drv.configureFlags or []) ++ [ + # ihaskell's cabal file forces building a shared executable, + # but without passing --enable-executable-dynamic, the RPATH + # contains /build/ and leads to a build failure with nix + "--enable-executable-dynamic" + ]; + preCheck = '' + export HOME=$TMPDIR/home + export PATH=$PWD/dist/build/ihaskell:$PATH + export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH + ''; + }); + + # tests need to execute the built executable + stutter = overrideCabal super.stutter (drv: { + preCheck = '' + export PATH=dist/build/stutter:$PATH + '' + (drv.preCheck or ""); + }); + + # Install man page and generate shell completions + pinboard-notes-backup = overrideCabal + (generateOptparseApplicativeCompletion "pnbackup" super.pinboard-notes-backup) + (drv: { + postInstall = '' + install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 + '' + (drv.postInstall or ""); + }); + + # set more accurate set of platforms instead of maintaining + # an ever growing list of platforms to exclude via unsupported-platforms + cpuid = overrideCabal super.cpuid { + platforms = pkgs.lib.platforms.x86; + }; + + # Pass the correct libarchive into the package. + streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; }; + + # passes the -msse2 flag which only works on x86 platforms + hsignal = overrideCabal super.hsignal { + platforms = pkgs.lib.platforms.x86; + }; + + hls-brittany-plugin = overrideCabal super.hls-brittany-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-class-plugin = overrideCabal super.hls-class-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + # Tests have file permissions expections that don‘t work with the nix store. + hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; + hls-haddock-comments-plugin = overrideCabal super.hls-haddock-comments-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-eval-plugin = overrideCabal super.hls-eval-plugin (drv: { + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index a4f0399cf3c62..8392e751da2d6 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -7,6 +7,8 @@ , nonHackagePackages ? import ./non-hackage-packages.nix , configurationCommon ? import ./configuration-common.nix , configurationNix ? import ./configuration-nix.nix +, configurationArm ? import ./configuration-arm.nix +, configurationDarwin ? import ./configuration-darwin.nix }: let @@ -19,17 +21,24 @@ let inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; }; - commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; - nixConfiguration = configurationNix { inherit pkgs haskellLib; }; - - extensible-self = makeExtensible - (extends overrides - (extends packageSetConfig - (extends compilerConfig - (extends commonConfiguration - (extends nixConfiguration - (extends nonHackagePackages - haskellPackages)))))); + isArm = with stdenv.hostPlatform; isAarch64 || isAarch32; + platformConfigurations = lib.optionals isArm [ + (configurationArm { inherit pkgs haskellLib; }) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (configurationDarwin { inherit pkgs haskellLib; }) + ]; + + extensions = lib.composeManyExtensions ([ + nonHackagePackages + (configurationNix { inherit pkgs haskellLib; }) + (configurationCommon { inherit pkgs haskellLib; }) + ] ++ platformConfigurations ++ [ + compilerConfig + packageSetConfig + overrides + ]); + + extensible-self = makeExtensible (extends extensions haskellPackages); in diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index faf80da0c7d96..2f9127e30f3b3 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -464,7 +464,12 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall - ${if !isLibrary then "${setupCommand} install" else '' + ${if !isLibrary && buildTarget == "" then "${setupCommand} install" + # ^^ if the project is not a library, and no build target is specified, we can just use "install". + else if !isLibrary then "${setupCommand} copy ${buildTarget}" + # ^^ if the project is not a library, and we have a build target, then use "copy" to install + # just the target specified; "install" will error here, since not all targets have been built. + else '' ${setupCommand} copy local packageConfDir="$out/lib/${ghc.name}/package.conf.d" local packageConfFile="$packageConfDir/${pname}-${version}.conf" diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6fa8f7335580c..24849b1e5ba82 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3141,8 +3141,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Tests of the Charts library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ChasingBottoms" = callPackage @@ -5622,6 +5620,9 @@ self: { ]; description = "Library for computer music research and education"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "EventSocket" = callPackage @@ -9402,6 +9403,9 @@ self: { ]; description = "Library for computer music education"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "HSoundFile" = callPackage @@ -16154,6 +16158,9 @@ self: { executableHaskellDepends = [ base PortMidi ]; description = "Simplified PortMidi wrapper"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "PostgreSQL" = callPackage @@ -20947,7 +20954,7 @@ self: { ]; description = "Bindings to the VulkanMemoryAllocator library"; license = lib.licenses.bsd3; - platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }) {}; "WAVE" = callPackage @@ -25709,20 +25716,20 @@ self: { "agda-unused" = callPackage ({ mkDerivation, aeson, Agda, base, containers, directory, filepath - , hspec, megaparsec, mtl, optparse-applicative, text + , hspec, mtl, optparse-applicative, text }: mkDerivation { pname = "agda-unused"; - version = "0.1.0"; - sha256 = "1g0iyv9x46ql8j9ggb6nw58274vqb6z850x26glaqcdwa3wvn1i1"; + version = "0.2.0"; + sha256 = "0fxrmcc0kn3jyjbij2fv72pw0r1l2rvg8wglj1i8d438jqpffigw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - Agda base containers directory filepath megaparsec mtl text + Agda base containers directory filepath mtl text ]; executableHaskellDepends = [ - aeson base directory filepath mtl optparse-applicative text + aeson base directory mtl optparse-applicative text ]; testHaskellDepends = [ base containers filepath hspec text ]; description = "Check for unused code in an Agda project"; @@ -33159,16 +33166,14 @@ self: { "armor" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, hspec, HUnit, lens, text + , filepath, hashable, hspec, HUnit, lens, text }: mkDerivation { pname = "armor"; - version = "0.1"; - sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71"; - revision = "4"; - editedCabalFile = "1vnjq91pawr4r7parg2kxs01d47b3lp8jpsji270bbmimqa0nql9"; + version = "0.2"; + sha256 = "1flidqihfgb1vwikm3q4dyjdjzrc5z2955ph6h30q0dyv4707s94"; libraryHaskellDepends = [ - base bytestring containers directory filepath HUnit lens + base bytestring containers directory filepath hashable HUnit lens ]; testHaskellDepends = [ aeson base bytestring containers directory hspec HUnit lens text @@ -39392,6 +39397,9 @@ self: { ]; description = "BDCS API Server"; license = lib.licenses.gpl3Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libgit2-glib;}; @@ -40447,28 +40455,6 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.5.10"; - sha256 = "03d96df4j1aq9z7hrk3n519g3h7fjgjf82fmgp6wxxbaigyrqwp7"; - libraryHaskellDepends = [ - base base-orphans comonad containers tagged template-haskell - th-abstraction transformers - ]; - testHaskellDepends = [ - base hspec QuickCheck template-haskell transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - description = "Bifunctors"; - license = lib.licenses.bsd3; - }) {}; - - "bifunctors_5_5_11" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , hspec-discover, QuickCheck, tagged, template-haskell - , th-abstraction, transformers, transformers-compat - }: - mkDerivation { - pname = "bifunctors"; version = "5.5.11"; sha256 = "070964w7gz578379lyj6xvdbcf367csmz22cryarjr5bz9r9csrb"; libraryHaskellDepends = [ @@ -40482,7 +40468,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bifunctors"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -42023,6 +42008,9 @@ self: { libraryPkgconfigDepends = [ sane-backends ]; description = "FFI bindings to libsane"; license = lib.licenses.lgpl3Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) sane-backends;}; "bindings-sc3" = callPackage @@ -43257,8 +43245,8 @@ self: { pname = "bits-extra"; version = "0.0.2.0"; sha256 = "1c54008kinzcx93kc8vcp7wq7la662m8nk82ax76i9b0gvbkk21f"; - revision = "1"; - editedCabalFile = "1ri4z6zj20qsyyzsrl89sjcm4ir2w6538i6l36a6ffz7f0h0ahng"; + revision = "2"; + editedCabalFile = "01qlnzbc3kgbyacqg9c7ldab2s91h9s4kalld0wz9q2k1d4063lv"; libraryHaskellDepends = [ base ghc-prim vector ]; testHaskellDepends = [ base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog @@ -45973,32 +45961,6 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.61"; - sha256 = "0cwrsndplgw5226cpdf7aad03jjidqh5wwwgm75anmya7c5lzl2d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = lib.licenses.bsd3; - }) {}; - - "brick_0_62" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; version = "0.62"; sha256 = "1f74m9yxwqv3xs1jhhpww2higfz3w0v1niff257wshhrvrkigh36"; isLibrary = true; @@ -46014,7 +45976,6 @@ self: { ]; description = "A declarative terminal user interface library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "brick-dropdownmenu" = callPackage @@ -47574,6 +47535,18 @@ self: { broken = true; }) {}; + "bv-sized-lens" = callPackage + ({ mkDerivation, base, bv-sized, lens, parameterized-utils }: + mkDerivation { + pname = "bv-sized-lens"; + version = "0.1.0.0"; + sha256 = "1njwizsxpmlpb3vm460ciw2x7byfz4y0g8bhsnfiimmyn7yazdr6"; + libraryHaskellDepends = [ base bv-sized lens parameterized-utils ]; + description = "Well-typed lenses for bv-sized bitvectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "byline" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, colour , exceptions, free, haskeline, mtl, optparse-applicative, relude @@ -48450,6 +48423,17 @@ self: { broken = true; }) {}; + "c-enum" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "c-enum"; + version = "0.1.0.0"; + sha256 = "02jxhscf8ibzqkhyvsgb04wxl3a02n2qipi3gmdppi6jffk2a1sj"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + license = lib.licenses.bsd3; + }) {}; + "c-io" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50505,8 +50489,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.5"; - sha256 = "09ja2imqhz7kr97fhfskj1g7s7q88yrpa0p2s1n55fwkn1f2d3bs"; + version = "0.1.29.0"; + sha256 = "05i8364x6d5kh4vimg8xp5cwskbzayk71kb6r4gg95xdi6vhgnjx"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -50529,8 +50513,8 @@ self: { }: mkDerivation { pname = "calamity-commands"; - version = "0.1.0.0"; - sha256 = "0l2x65w7inib5bdfw0gzffm3pdlsylnivnjc8y82x7fi6jha8jcp"; + version = "0.1.1.0"; + sha256 = "0sx0pcxh9f7r4nlhii5i3vwxpbhngzprp4h3yvp2xvkr8mp6pyk2"; libraryHaskellDepends = [ base generic-lens lens megaparsec polysemy polysemy-plugin text text-show unordered-containers @@ -54237,8 +54221,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.6.0.0"; - sha256 = "0lc0bif9bp4h0131cy9rss90qv026mlknr16ayxlvfn3ynyarqv8"; + version = "0.6.1.0"; + sha256 = "0agrj7k2kfyfdh23m7nciywl9sgi4vy82h83p76jlclbcakdqy1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54296,27 +54280,38 @@ self: { }) {}; "chiasma" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , either, filepath, free, HTF, lens, mtl, parsec, posix-pty - , process, resourcet, split, transformers, typed-process, unix - , unliftio + ({ mkDerivation, aeson, attoparsec, base, bytestring, composition + , composition-extra, conduit, conduit-extra, containers, cornea + , data-default, deepseq, directory, either, exceptions, filepath + , free, hedgehog, lens, mtl, parsec, parsers, posix-pty + , prettyprinter, prettyprinter-ansi-terminal, process, random + , relude, resourcet, split, stm-chans, stm-conduit, tasty + , tasty-hedgehog, text, transformers, typed-process, unix, unliftio + , unliftio-core, uuid }: mkDerivation { pname = "chiasma"; - version = "0.1.0.0"; - sha256 = "140p3qrrdh3im5qj43swl9cvljgyc39zy7ci5048j42h8x9q7glg"; - libraryHaskellDepends = [ - base bytestring data-default-class directory either filepath free - lens mtl parsec posix-pty process resourcet split transformers - typed-process unix unliftio - ]; - testHaskellDepends = [ - base bytestring data-default-class directory either filepath free - HTF lens mtl parsec posix-pty process resourcet split transformers - typed-process unix unliftio + version = "0.2.0.0"; + sha256 = "11pbg9mlmp15hs2wdca0qyhbc94d91xkl75jlcaksla8l1qnnz9m"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring composition composition-extra + conduit conduit-extra containers cornea data-default deepseq + directory either exceptions filepath free lens mtl parsec parsers + posix-pty prettyprinter prettyprinter-ansi-terminal process random + relude resourcet split stm-chans stm-conduit text transformers + typed-process unix unliftio unliftio-core uuid + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring composition composition-extra + conduit conduit-extra containers cornea data-default deepseq + directory either exceptions filepath free hedgehog lens mtl parsec + parsers posix-pty prettyprinter prettyprinter-ansi-terminal process + random relude resourcet split stm-chans stm-conduit tasty + tasty-hedgehog text transformers typed-process unix unliftio + unliftio-core uuid ]; description = "tmux api"; - license = lib.licenses.mit; + license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58220,8 +58215,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.1.0"; - sha256 = "0zagchakak4mrdpgy23d2wfb357dc6fn78fpcjs1ik025wmldy88"; + version = "0.2.2"; + sha256 = "1rf9d6mwg965r4bnjxbcw2dzcf4fxqn9hnysxzyqxnyhrr8q4149"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -64554,8 +64549,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.6.0"; - sha256 = "1qyl7kcdqxfl2inx66n7pa1z2pqjxrz1bpg3jjknjj0kpw9rlhf3"; + version = "0.2.7.1"; + sha256 = "1bm75bdmcrjizmrspl52qqs4vq9hlyh7fjv5y5lfpkmqrs45045b"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -64651,25 +64646,24 @@ self: { }) {inherit (pkgs) rocksdb;}; "cornea" = callPackage - ({ mkDerivation, base-noprelude, either, HTF, lens, lifted-base - , monad-control, mtl, relude, template-haskell, th-abstraction - , transformers + ({ mkDerivation, base, either, hedgehog, lens, lifted-base + , monad-control, mtl, relude, tasty, tasty-hedgehog + , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "cornea"; - version = "0.3.1.2"; - sha256 = "04iika5r5w3347w87b8whwrxym5nzvgl5pr76fpxw78fwvi1nvzk"; + version = "0.4.0.0"; + sha256 = "0hm17g350gnklvgi5nsx03lgbx2zs9h4q11y2gi9zjnm6gv6gjrn"; libraryHaskellDepends = [ - base-noprelude either lens lifted-base monad-control mtl relude + base either lens lifted-base monad-control mtl relude template-haskell th-abstraction transformers ]; testHaskellDepends = [ - base-noprelude either HTF lens lifted-base monad-control mtl relude - template-haskell th-abstraction transformers + base either hedgehog lens lifted-base monad-control mtl relude + tasty tasty-hedgehog template-haskell th-abstraction transformers ]; description = "classy optical monadic state"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; + license = "BSD-2-Clause-Patent"; }) {}; "coroutine-enumerator" = callPackage @@ -64756,7 +64750,7 @@ self: { description = "A modern, lightweight, complete client for CouchDB"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) couchdb;}; + }) {couchdb = null;}; "couchdb-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base @@ -67399,22 +67393,22 @@ self: { "css-selectors" = callPackage ({ mkDerivation, aeson, alex, array, base, binary, blaze-markup - , bytestring, data-default, Decimal, happy, QuickCheck, shakespeare - , template-haskell, test-framework, test-framework-quickcheck2 - , text, zlib + , bytestring, data-default, Decimal, happy, hashable, QuickCheck + , shakespeare, template-haskell, test-framework + , test-framework-quickcheck2, text, zlib }: mkDerivation { pname = "css-selectors"; - version = "0.3.0.0"; - sha256 = "1p7zzp40gvl5nq2zrb19cjw47w3sf20qwi3mplxq67ryzljmbaz4"; + version = "0.4.0.1"; + sha256 = "0wj16835xcr33kqpwlrqgsain0dv6dl9cxcxncxhp0c0z5bl4ysd"; libraryHaskellDepends = [ aeson array base binary blaze-markup bytestring data-default - Decimal QuickCheck shakespeare template-haskell text zlib + Decimal hashable QuickCheck shakespeare template-haskell text zlib ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ - base binary QuickCheck test-framework test-framework-quickcheck2 - text + base binary hashable QuickCheck test-framework + test-framework-quickcheck2 text ]; description = "Parsing, rendering and manipulating css selectors in Haskell"; license = lib.licenses.bsd3; @@ -68387,6 +68381,9 @@ self: { testToolDepends = [ c2hs ]; description = "Cuts out uninteresting parts of videos by detecting silences"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;}; "cutter" = callPackage @@ -70946,8 +70943,6 @@ self: { libraryHaskellDepends = [ aeson base ]; description = "Class for types with a database id"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "database-id-groundhog" = callPackage @@ -74977,8 +74972,6 @@ self: { ]; description = "Cairo backend for diagrams drawing EDSL"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "diagrams-canvas" = callPackage @@ -76162,10 +76155,8 @@ self: { }: mkDerivation { pname = "dimensional"; - version = "1.3"; - sha256 = "0i4k7m134w3pczj8qllc59djdhisj92z78qrzap9v0f4rx8jb8r9"; - revision = "2"; - editedCabalFile = "10xkgwjb9kqa95jck3b9wa3sz6vcb2lkygfmcqqz6hz6j65l79r8"; + version = "1.4"; + sha256 = "19w6plp97ylwqgwzhfy54cvjvh0dd1gj843y59cmryckh80jap8s"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk semigroups vector ]; @@ -76174,7 +76165,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Statically checked physical dimensions, using Type Families and Data Kinds"; + description = "Statically checked physical dimensions"; license = lib.licenses.bsd3; }) {}; @@ -76182,8 +76173,8 @@ self: { ({ mkDerivation, base, dimensional, numtype-dk }: mkDerivation { pname = "dimensional-codata"; - version = "2014.0.0.2"; - sha256 = "1bmal7i0zvfivri5w7fbl4n0gyybnr2wy2cvz21b33jrzjblr1g0"; + version = "2014.0.0.3"; + sha256 = "1303i7f8c9nsr5x128qaqisny4r3fnfq7zarl4g9q0zckxgqhpgj"; libraryHaskellDepends = [ base dimensional numtype-dk ]; description = "CODATA Recommended Physical Constants with Dimensional Types"; license = lib.licenses.bsd3; @@ -78339,6 +78330,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "do-spaces" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring + , case-insensitive, conduit, conduit-extra, config-ini, containers + , cryptonite, exceptions, extra, filepath, generic-lens, hspec + , http-client-tls, http-conduit, http-types, memory, microlens + , mime-types, mtl, resourcet, text, time, transformers, xml-conduit + }: + mkDerivation { + pname = "do-spaces"; + version = "0.1.0"; + sha256 = "1xj0n2pmmwkm4ss5gvsbvw8m545w4890a3hhk1ns1vbbm06zmvsi"; + libraryHaskellDepends = [ + base base16-bytestring bytestring case-insensitive conduit + conduit-extra config-ini containers cryptonite exceptions extra + filepath generic-lens http-client-tls http-conduit http-types + memory microlens mime-types mtl text time transformers xml-conduit + ]; + testHaskellDepends = [ + base bytestring case-insensitive conduit conduit-extra containers + generic-lens hspec http-client-tls http-conduit http-types + microlens mtl resourcet text time + ]; + description = "DigitalOcean Spaces API bindings"; + license = lib.licenses.bsd3; + }) {}; + "dobutok" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -85961,6 +85978,8 @@ self: { pname = "esqueleto"; version = "3.4.1.1"; sha256 = "15355vc3ysqr4yd149xz7zm7iba7pb04p3yxgp1n6dxczwldjf43"; + revision = "1"; + editedCabalFile = "0rwj2cg7pkn4nwapyk9syb64f0qycq7kqwbpciwwq9xdviwcvqzk"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -85977,7 +85996,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_4_2_0" = callPackage + "esqueleto_3_4_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -85987,8 +86006,10 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.4.2.0"; - sha256 = "1gmh96a0vqvxizgs2k66p06jhjcgqrm5phbvahs7b2iavaralpr3"; + version = "3.4.2.1"; + sha256 = "0yh2fgk5rjphszn2prww190nsvw84j68js7wnd6p5iwynrw6ahxh"; + revision = "1"; + editedCabalFile = "0nsm17spkhsykizmpr29x8zq16ha6j0325r08ms675jn574ni2g1"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -88323,8 +88344,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.6"; - sha256 = "1yfbym97j3ih6zvlkg0d08qiivi7cyv61lbyc6qi094apazacq6c"; + version = "0.1.8"; + sha256 = "1g586cv6j79w40bmagqi156rjv09k1whhvpg67p0f707hbq1ph0a"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -89138,17 +89159,17 @@ self: { }) {}; "fake" = callPackage - ({ mkDerivation, base, containers, generics-sop, hspec, random - , text, time + ({ mkDerivation, base, containers, generics-sop, hspec, lens + , random, text, time }: mkDerivation { pname = "fake"; - version = "0.1.1.3"; - sha256 = "07ciaxbfvhajjdj5sidvy9cxpjfssjkxykrbgnghihrla78pwq1n"; + version = "0.1.2"; + sha256 = "03v224sag70w1ibymw1cmi3lwby25wl0254p2gzy7s330fmlbymr"; libraryHaskellDepends = [ base containers generics-sop random text time ]; - testHaskellDepends = [ base hspec random text time ]; + testHaskellDepends = [ base hspec lens random text time ]; description = "Randomly generated fake data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -89492,26 +89513,6 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.0.3"; - sha256 = "0s7hsbii1km7dqkxa27v2fw553wqx6x00204s6iapv2k20ra0qsp"; - libraryHaskellDepends = [ - array auto-update base bytestring directory easy-file filepath text - unix-compat unix-time - ]; - testHaskellDepends = [ base bytestring directory hspec ]; - testToolDepends = [ hspec-discover ]; - description = "A fast logging system"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sternenseemann ]; - }) {}; - - "fast-logger_3_0_5" = callPackage - ({ mkDerivation, array, auto-update, base, bytestring, directory - , easy-file, filepath, hspec, hspec-discover, text, unix-compat - , unix-time - }: - mkDerivation { - pname = "fast-logger"; version = "3.0.5"; sha256 = "1mbnah6n8lig494523czcd95dfn01f438qai9pf20wpa2gdbz4x6"; libraryHaskellDepends = [ @@ -89522,7 +89523,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; @@ -93117,6 +93117,7 @@ self: { ]; description = "Principled and efficient bit-oriented binary serialization"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "flat-maybe" = callPackage @@ -101681,8 +101682,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.16.0"; - sha256 = "0cr6aj4v9j2fadwhhifjlbg4anyc05phfmy3pvd9h7gn12a2ydr9"; + version = "0.17.0"; + sha256 = "059csl9j391iqbxaia9kawsksgbiy3ffdk9pqabb68gqrn0b7icc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102491,8 +102492,8 @@ self: { }: mkDerivation { pname = "ghc-tags-core"; - version = "0.2.4.1"; - sha256 = "0d1srd72ajp2csyic6wpj6i7818rimqbcg5c3lxj76cz9zpjr1g8"; + version = "0.3.0.0"; + sha256 = "035k7akyhhn5jf2231ahplgggymc8h8k2kxia6i22v9cv976zgna"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath-bytestring ghc mtl pipes pipes-attoparsec pipes-bytestring text transformers @@ -102521,8 +102522,8 @@ self: { }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.2.4.1"; - sha256 = "1hzv3s6pys1cqwj3hs1xww52v5yapisw9y3d5fmxzh0s6nawpxf2"; + version = "0.3.0.0"; + sha256 = "1d39jnz79vlxqqg2bw3cj1djii3bkmayqs4sm2a6bs5xzsplc5w3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102932,69 +102933,6 @@ self: { }) {}; "ghcide" = callPackage - ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, bytestring-encoding, case-insensitive - , containers, cryptohash-sha1, data-default, deepseq, dependent-map - , dependent-sum, Diff, directory, dlist, extra, filepath - , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check - , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob - , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb - , hls-plugin-api, hp2pretty, hslogger, implicit-hie - , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl - , network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions - , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unliftio-core, unordered-containers, utf8-string, vector, yaml - }: - mkDerivation { - pname = "ghcide"; - version = "1.0.0.0"; - sha256 = "15hz49d68229bnp8g7q1ac60ryd4zbyc1rbxsfaq5lb586ps82k8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - bytestring-encoding case-insensitive containers cryptohash-sha1 - data-default deepseq dependent-map dependent-sum Diff directory - dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable - heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger - implicit-hie-cradle lens lsp lsp-types mtl network-uri - opentelemetry parallel prettyprinter prettyprinter-ansi-terminal - regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake - sorted-list sqlite-simple stm syb text time transformers unix - unliftio unliftio-core unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api - lens lsp lsp-test lsp-types optparse-applicative process - safe-exceptions shake text unordered-containers - ]; - testHaskellDepends = [ - aeson base binary bytestring containers data-default directory - extra filepath ghc ghc-typelits-knownnat haddock-library - hls-plugin-api lens lsp lsp-test lsp-types network-uri - optparse-applicative process QuickCheck quickcheck-instances - record-dot-preprocessor record-hasfield rope-utf16-splay safe - safe-exceptions shake tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text - ]; - testToolDepends = [ implicit-hie ]; - benchmarkHaskellDepends = [ - aeson base directory extra filepath optparse-applicative shake - shake-bench text yaml - ]; - benchmarkToolDepends = [ hp2pretty implicit-hie ]; - description = "The core of an IDE"; - license = lib.licenses.asl20; - }) {}; - - "ghcide_1_2_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, binary, bytestring, bytestring-encoding , case-insensitive, containers, cryptohash-sha1, data-default @@ -103058,7 +102996,6 @@ self: { benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -103621,6 +103558,9 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenu_0_4_9" = callPackage @@ -103640,6 +103580,9 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libdbusmenu;}; @@ -103665,6 +103608,9 @@ self: { libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-dbusmenugtk3_0_4_10" = callPackage @@ -103689,6 +103635,9 @@ self: { libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; @@ -103716,6 +103665,31 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; + "gi-gdk_3_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gdk"; + version = "3.0.24"; + sha256 = "17slysv7zj3nbzh302w8jkvcfkvwfk5s80n99lqhggd6lnhf5fjx"; + setupHaskellDepends = [ + base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango + haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gdk bindings"; + license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) gtk3;}; + "gi-gdk_4_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 @@ -103806,15 +103780,15 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; - "gi-gdkx11_4_0_3" = callPackage + "gi-gdkx11_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi + , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkx11"; - version = "4.0.3"; - sha256 = "13m2dvab8hqwa7h648asjg3llvdnpwdf1rli9i44nb6n1dfk7jbv"; + version = "3.0.11"; + sha256 = "07r47fpx6rvsahgnv8g741fl6h1s6y1xrlyacbpc3d8cv7x4aax2"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -103823,34 +103797,36 @@ self: { gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ gtk4-x11 ]; + libraryPkgconfigDepends = [ gtk3 ]; description = "GdkX11 bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {gtk4-x11 = null;}; + }) {inherit (pkgs) gtk3;}; - "gi-ggit" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libgit2-glib, text, transformers + "gi-gdkx11_4_0_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { - pname = "gi-ggit"; - version = "1.0.9"; - sha256 = "0qvmppdby40ncd9alnnk8ang90qcaj00c0g0nrq0s0m1ynar8ccd"; + pname = "gi-gdkx11"; + version = "4.0.3"; + sha256 = "13m2dvab8hqwa7h648asjg3llvdnpwdf1rli9i44nb6n1dfk7jbv"; setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi + base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers + base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject + gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text + transformers ]; - libraryPkgconfigDepends = [ libgit2-glib ]; - description = "libgit2-glib bindings"; + libraryPkgconfigDepends = [ gtk4-x11 ]; + description = "GdkX11 bindings"; license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libgit2-glib;}; + hydraPlatforms = lib.platforms.none; + }) {gtk4-x11 = null;}; - "gi-ggit_1_0_10" = callPackage + "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libgit2-glib, text, transformers @@ -103869,7 +103845,9 @@ self: { libraryPkgconfigDepends = [ libgit2-glib ]; description = "libgit2-glib bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage @@ -103918,25 +103896,6 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.23"; - sha256 = "0a8sis3zayiywi7mgs1g4p7nr9szv392j7bimq5nvva04lj6sdzc"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gobject-introspection ]; - description = "GIRepository (gobject-introspection) bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gobject-introspection;}; - - "gi-girepository_1_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-girepository"; version = "1.0.24"; sha256 = "1sj68k3wih2345gkmv0jb1smka73pxnjy8jwmk2ifgl407f3hhfw"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; @@ -103947,7 +103906,6 @@ self: { libraryPkgconfigDepends = [ gobject-introspection ]; description = "GIRepository (gobject-introspection) bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage @@ -104006,8 +103964,6 @@ self: { libraryPkgconfigDepends = [ gmodule ]; description = "GModule bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {gmodule = null;}; "gi-gobject" = callPackage @@ -104124,25 +104080,6 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.23"; - sha256 = "0w4xscgd49d6d00gvsqc210r63c0wj748dqa5ypppr4mzllsm0qv"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gstreamer ]; - description = "GStreamer bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs.gst_all_1) gstreamer;}; - - "gi-gst_1_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gstreamer, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gst"; version = "1.0.24"; sha256 = "01xbjxwipg1s93fkswag8gp8s696z1l1gaazl2w4wnpyykx4hh8s"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; @@ -104153,7 +104090,6 @@ self: { libraryPkgconfigDepends = [ gstreamer ]; description = "GStreamer bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -104186,27 +104122,6 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.23"; - sha256 = "0im25z9pf9j0cxj0b6lbbr3lis9kbvzzvzns65cmargbh1018959"; - setupHaskellDepends = [ - base Cabal gi-glib gi-gobject gi-gst haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject gi-gst haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gst-plugins-base ]; - description = "GStreamerBase bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; - - "gi-gstbase_1_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gstbase"; version = "1.0.24"; sha256 = "0b8k2xk3ha6b79kkw72kgdmj8vjyh40r26saavin54gznlgd5xh8"; setupHaskellDepends = [ @@ -104219,7 +104134,6 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerBase bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -104278,8 +104192,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.23"; - sha256 = "1kb09kal08x7nznc0g8c2n9jfijapdndbnsfs5cvz0p9smvd092i"; + version = "1.0.24"; + sha256 = "0qjfjk5jnpy1f4grn8i68kwdd1yvnq1yc55rk6yxhlj7wks1d35h"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -104292,29 +104206,31 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; - "gi-gstvideo_1_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers + "gi-gtk" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers }: mkDerivation { - pname = "gi-gstvideo"; - version = "1.0.24"; - sha256 = "0qjfjk5jnpy1f4grn8i68kwdd1yvnq1yc55rk6yxhlj7wks1d35h"; + pname = "gi-gtk"; + version = "3.0.36"; + sha256 = "0bzb3xrax5k5r5fd6vv4by6hprmk77qrqr9mqn3dxqm6an8jwjn9"; setupHaskellDepends = [ - base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi + base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib + gi-gobject gi-pango haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi haskell-gi-base haskell-gi-overloading text transformers + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ gst-plugins-base ]; - description = "GStreamerVideo bindings"; + libraryPkgconfigDepends = [ gtk3 ]; + description = "Gtk bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; + }) {inherit (pkgs) gtk3;}; - "gi-gtk" = callPackage + "gi-gtk_3_0_37" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-pango, gtk3, haskell-gi, haskell-gi-base @@ -104322,8 +104238,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.36"; - sha256 = "0bzb3xrax5k5r5fd6vv4by6hprmk77qrqr9mqn3dxqm6an8jwjn9"; + version = "3.0.37"; + sha256 = "1psg789lrpcnrwh1y80y7s09hcxl3hihi0gwsmd7j3v731dp7a0k"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -104336,6 +104252,7 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gi-gtk_4_0_4" = callPackage @@ -104500,30 +104417,6 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.23"; - sha256 = "13rsxjbl62q8zhwqr8jm2fh5njzfa86izqwag4d6aw8xi71wqfrn"; - setupHaskellDepends = [ - base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-gtk gi-pango haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtksourceview3 ]; - description = "GtkSource bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gtksourceview3;}; - - "gi-gtksource_3_0_24" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-gtk, gi-pango, gtksourceview3, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gtksource"; version = "3.0.24"; sha256 = "0bnwqcn7y5a3z3lkl9l886m9albvc602nb7qsh2jkiilf0ng64dp"; setupHaskellDepends = [ @@ -104538,7 +104431,6 @@ self: { libraryPkgconfigDepends = [ gtksourceview3 ]; description = "GtkSource bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtksourceview3;}; "gi-handy" = callPackage @@ -104613,27 +104505,6 @@ self: { }: mkDerivation { pname = "gi-ibus"; - version = "1.5.2"; - sha256 = "14chw0qhzdxixsqsn2ra31z561kn2zclk15b7hfpfzayqr6dqci1"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ ibus ]; - description = "IBus bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) ibus;}; - - "gi-ibus_1_5_3" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, ibus, text, transformers - }: - mkDerivation { - pname = "gi-ibus"; version = "1.5.3"; sha256 = "1gbpbxcdl9f5di2vpnkx3zsy54dkfhz81h3yxss91r65lp9fwrm8"; setupHaskellDepends = [ @@ -104646,7 +104517,9 @@ self: { libraryPkgconfigDepends = [ ibus ]; description = "IBus bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) ibus;}; "gi-javascriptcore" = callPackage @@ -104696,27 +104569,6 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.22"; - sha256 = "0j5cxx9dsxh2wafw4xa7yasr6n98h2qwpm1y08nm7m6i0kwrksap"; - setupHaskellDepends = [ - base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gdkpixbuf gi-glib gi-gobject - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libnotify ]; - description = "Libnotify bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libnotify;}; - - "gi-notify_0_7_23" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libnotify, text, transformers - }: - mkDerivation { - pname = "gi-notify"; version = "0.7.23"; sha256 = "00p10lw9v9q8mh6630ijpz8smnpz5hiiw8kxk1fv8497akssxjsh"; setupHaskellDepends = [ @@ -104729,7 +104581,6 @@ self: { libraryPkgconfigDepends = [ libnotify ]; description = "Libnotify bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libnotify;}; "gi-ostree" = callPackage @@ -104739,30 +104590,6 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.13"; - sha256 = "07k02mffidw18f104crmhayr5nf3v5xcldc8fbmxdinp7wik5c7f"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ ostree ]; - description = "OSTree bindings"; - license = lib.licenses.lgpl21Only; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; - }) {inherit (pkgs) ostree;}; - - "gi-ostree_1_0_14" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, ostree, text, transformers - }: - mkDerivation { - pname = "gi-ostree"; version = "1.0.14"; sha256 = "08jglqkq0h497iv83rc0br83qrf000gm202hp0j1pnhwvdgp7d0f"; setupHaskellDepends = [ @@ -104778,7 +104605,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -104840,32 +104666,6 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.24"; - sha256 = "1yya5gsqrkagmm33rsasshlj691nmax47fqdn1p2rnf4aqx1jcqr"; - setupHaskellDepends = [ - base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-cairo gi-glib gi-gobject gi-pango - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo pango ]; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "PangoCairo bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; - - "gi-pangocairo_1_0_25" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, pango, text - , transformers - }: - mkDerivation { - pname = "gi-pangocairo"; version = "1.0.25"; sha256 = "1w7sdwxfsymysazv9b045li97mjj2xspgrfyhm74x7sd7b4jl4aa"; setupHaskellDepends = [ @@ -104882,7 +104682,6 @@ self: { ''; description = "PangoCairo bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -104915,27 +104714,6 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.12"; - sha256 = "19mr7mvay2slm5k6afqj0hhy4ddh0advrb5dyzqi75xysx7xagm8"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libsecret ]; - description = "Libsecret bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libsecret;}; - - "gi-secret_0_0_13" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libsecret, text, transformers - }: - mkDerivation { - pname = "gi-secret"; version = "0.0.13"; sha256 = "0n37sdm4q6q807j4wgwwsl28knc71d8jiyx4prxbl2d69gg6i2ka"; setupHaskellDepends = [ @@ -104948,7 +104726,6 @@ self: { libraryPkgconfigDepends = [ libsecret ]; description = "Libsecret bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -105023,30 +104800,6 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.27"; - sha256 = "0a4n8yah3nirwciw0y1i8vpcjqbbk3pw15nd8av109cyxgl8nzx8"; - setupHaskellDepends = [ - base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango - haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading - text transformers - ]; - libraryPkgconfigDepends = [ vte_291 ]; - description = "Vte bindings"; - license = lib.licenses.lgpl21Only; - }) {vte_291 = pkgs.vte;}; - - "gi-vte_2_91_28" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , vte_291 - }: - mkDerivation { - pname = "gi-vte"; version = "2.91.28"; sha256 = "06bgl5r1r4ri22c43an4h538p0b3icrb8nq1w7fw8cmxqj7y5m33"; setupHaskellDepends = [ @@ -105061,7 +104814,9 @@ self: { libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage @@ -107703,7 +107458,10 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; - }) {inherit (pkgs.gnome3) gnome-keyring; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; + }) {inherit (pkgs.gnome) gnome-keyring; inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage @@ -113410,6 +113168,9 @@ self: { ]; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) gtk3;}; "gtk-strut" = callPackage @@ -115736,8 +115497,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.3.0"; - sha256 = "03cz3inkkqbdnwwvsf7dhclp9svi8c0lpjmcp81ff9vxr1v6x73x"; + version = "2.4.0"; + sha256 = "1b24hc695v18gpj276wmzpbns6bfn0qjhj30nq6yiqbiq04md1h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115909,8 +115670,8 @@ self: { }: mkDerivation { pname = "haggle"; - version = "0.1.0.0"; - sha256 = "0fpbmllp0p23c258gam7xm0dvwphw0zpmydmg9ygl4yl1kiav470"; + version = "0.1.0.1"; + sha256 = "1j598hcjw0p9iac4h91w47k4rh9k0h2r9gk3rrfkklvw84aznkrz"; libraryHaskellDepends = [ base containers deepseq hashable monad-primitive primitive ref-tf vector @@ -118675,30 +118436,6 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.4.4"; - sha256 = "0kk1lamyms1mf8d290c3asnvgk51i8sqj810whms2a5346w9n4ll"; - revision = "1"; - editedCabalFile = "1bnbhq6k2af08riyaplfgm2lzghhi3nc0ijiw0yk1y5pq618zhxy"; - libraryHaskellDepends = [ - base binary bytestring connection containers data-binary-ieee754 - data-default mtl network text - ]; - testHaskellDepends = [ - base bytestring containers hspec QuickCheck text - ]; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "hasbolt_0_1_4_5" = callPackage - ({ mkDerivation, base, binary, bytestring, connection, containers - , data-binary-ieee754, data-default, hspec, mtl, network - , QuickCheck, text - }: - mkDerivation { - pname = "hasbolt"; version = "0.1.4.5"; sha256 = "185qh24n6j3b5awwmm92hxravb3sq40l5q8vyng74296mjc65nkw"; libraryHaskellDepends = [ @@ -118791,8 +118528,8 @@ self: { }: mkDerivation { pname = "hascard"; - version = "0.5.0.1"; - sha256 = "08j3bi6a04pkkf99ghw2h7z1bdisby0d3hyqv559a1pxwpbi7k22"; + version = "0.5.0.2"; + sha256 = "1sh4903x05fwci7nmlqd0f2wjjs5b9bqckmgrkjpnawcnsbby1ds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120332,53 +120069,49 @@ self: { }) {}; "haskell-language-server" = callPackage - ({ mkDerivation, aeson, async, base, base16-bytestring, binary - , blaze-markup, brittany, bytestring, containers, cryptohash-sha1 - , data-default, deepseq, directory, extra, filepath, floskell - , fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths, ghcide, gitrev - , hashable, hie-bios, hiedb, hls-class-plugin, hls-eval-plugin - , hls-explicit-imports-plugin, hls-haddock-comments-plugin - , hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin - , hls-splice-plugin, hls-tactics-plugin, hslogger, hspec - , hspec-core, hspec-expectations, lens, lsp, lsp-test, megaparsec - , mtl, optparse-applicative, optparse-simple, ormolu, process - , regex-tdfa, safe-exceptions, shake, sqlite-simple, stm - , stylish-haskell, tasty, tasty-ant-xml, tasty-expected-failure - , tasty-golden, tasty-hunit, tasty-rerun, temporary, text - , transformers, unordered-containers, with-utf8, yaml + ({ mkDerivation, aeson, aeson-pretty, async, base + , base16-bytestring, binary, bytestring, containers + , cryptohash-sha1, data-default, deepseq, directory, extra + , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths + , ghcide, gitrev, hashable, hie-bios, hiedb, hls-brittany-plugin + , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin + , hls-haddock-comments-plugin, hls-hlint-plugin, hls-plugin-api + , hls-retrie-plugin, hls-splice-plugin, hls-stylish-haskell-plugin + , hls-tactics-plugin, hls-test-utils, hslogger, hspec-expectations + , lens, lsp, lsp-test, lsp-types, mtl, optparse-applicative + , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions + , shake, sqlite-simple, temporary, text, transformers + , unordered-containers }: mkDerivation { pname = "haskell-language-server"; - version = "1.0.0.0"; - sha256 = "0jchps7rwsbfq1fsyyf4jgxb4b11d8c3iaq2p4c5vz7vz2d6w1s3"; + version = "1.1.0.0"; + sha256 = "0zbr8qr097mjcsbgdkm6a8ala1ifdajmllr8basvrndn28zgi5cg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base16-bytestring bytestring containers cryptohash-sha1 - data-default directory extra filepath ghc ghcide gitrev hie-bios - hiedb hls-plugin-api hslogger lsp optparse-applicative - optparse-simple process safe-exceptions shake sqlite-simple text - unordered-containers + aeson-pretty async base base16-bytestring bytestring containers + cryptohash-sha1 data-default directory extra filepath ghc ghcide + gitrev hie-bios hiedb hls-plugin-api hslogger lsp + optparse-applicative optparse-simple process safe-exceptions shake + sqlite-simple text unordered-containers ]; executableHaskellDepends = [ - aeson async base base16-bytestring binary brittany bytestring - containers cryptohash-sha1 data-default deepseq directory extra - filepath floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths ghcide - gitrev hashable hie-bios hiedb hls-class-plugin hls-eval-plugin - hls-explicit-imports-plugin hls-haddock-comments-plugin - hls-hlint-plugin hls-plugin-api hls-retrie-plugin hls-splice-plugin + aeson async base base16-bytestring binary bytestring containers + cryptohash-sha1 data-default deepseq directory extra filepath + floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths ghcide gitrev + hashable hie-bios hiedb hls-brittany-plugin hls-class-plugin + hls-eval-plugin hls-explicit-imports-plugin + hls-haddock-comments-plugin hls-hlint-plugin hls-plugin-api + hls-retrie-plugin hls-splice-plugin hls-stylish-haskell-plugin hls-tactics-plugin hslogger lens lsp mtl optparse-applicative optparse-simple ormolu process regex-tdfa safe-exceptions shake - sqlite-simple stylish-haskell temporary text transformers - unordered-containers with-utf8 + sqlite-simple temporary text transformers unordered-containers ]; testHaskellDepends = [ - aeson base blaze-markup bytestring containers data-default deepseq - directory extra filepath ghcide hie-bios hls-plugin-api hslogger - hspec hspec-core hspec-expectations lens lsp lsp-test megaparsec - process stm tasty tasty-ant-xml tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun temporary text transformers - unordered-containers yaml + aeson base bytestring containers data-default directory extra + filepath ghcide hls-plugin-api hls-test-utils hspec-expectations + lens lsp-test lsp-types process text unordered-containers ]; testToolDepends = [ ghcide ]; description = "LSP server for GHC"; @@ -120947,6 +120680,9 @@ self: { ]; description = "Snake game implemetation in Haskell using SDL2"; license = lib.licenses.gpl3Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "haskell-spacegoo" = callPackage @@ -125018,29 +124754,31 @@ self: { "hcheckers" = callPackage ({ mkDerivation, aeson, array, base, binary, bits, bytes , bytestring, clock, concurrent-extra, containers, data-default - , directory, ekg, ekg-core, exceptions, fast-logger, filepath - , hashable, hashtables, heavy-logger, hsyslog, http-types - , megaparsec, microlens, monad-metrics, mtl, mwc-random, network - , optparse-applicative, psqueues, random, random-access-file - , random-shuffle, scotty, stm, stm-containers, store - , template-haskell, text, text-format-heavy, unix, unix-bytestring - , unordered-containers, vector, wai, warp, yaml + , directory, ekg, ekg-core, exceptions, fast-logger, filepath, Glob + , hashable, hashtables, heavy-logger, hsyslog, http-types, list-t + , megaparsec, microlens, modern-uri, monad-metrics, mtl, mwc-random + , network, optparse-applicative, psqueues, random + , random-access-file, random-shuffle, req, scotty, stm + , stm-containers, store, template-haskell, text, text-format-heavy + , unix, unix-bytestring, unordered-containers, vector, wai, warp + , yaml }: mkDerivation { pname = "hcheckers"; - version = "0.1.0.1"; - sha256 = "1l4cj7v4scnz5cq05294ym4gyv163ry09bpxp1vg1m1v88ww5i2w"; + version = "0.1.0.2"; + sha256 = "1v4hnqvi47kn10c1rjgsggxmajy7xnl462ghb2fs61ksbmrdi5b8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson array base binary bits bytes bytestring clock concurrent-extra containers data-default directory ekg ekg-core - exceptions fast-logger filepath hashable hashtables heavy-logger - hsyslog http-types megaparsec microlens monad-metrics mtl - mwc-random network optparse-applicative psqueues random - random-access-file random-shuffle scotty stm stm-containers store - template-haskell text text-format-heavy unix unix-bytestring - unordered-containers vector wai warp yaml + exceptions fast-logger filepath Glob hashable hashtables + heavy-logger hsyslog http-types list-t megaparsec microlens + modern-uri monad-metrics mtl mwc-random network + optparse-applicative psqueues random random-access-file + random-shuffle req scotty stm stm-containers store template-haskell + text text-format-heavy unix unix-bytestring unordered-containers + vector wai warp yaml ]; description = "Implementation of checkers (\"draughts\") board game - server application"; license = lib.licenses.bsd3; @@ -129105,6 +128843,9 @@ self: { librarySystemDepends = [ systemd ]; description = "Haskell bindings to HIDAPI"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) systemd;}; "hidden-char" = callPackage @@ -129277,8 +129018,6 @@ self: { ]; description = "Draw diagrams of dendrograms made by hierarchical-clustering"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hierarchical-env" = callPackage @@ -130909,6 +130648,26 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "hkgr_0_3" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , simple-cabal, simple-cmd-args, typed-process, xdg-basedir + }: + mkDerivation { + pname = "hkgr"; + version = "0.3"; + sha256 = "1w8ww2dkskdfs0lh6wbn5byhnrf6mwih7n5yp81fr6awdc0k1qrm"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + base bytestring directory extra filepath simple-cabal + simple-cmd-args typed-process xdg-basedir + ]; + description = "Simple Hackage release workflow for package maintainers"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "hkt" = callPackage ({ mkDerivation, base, hspec, inspection-testing, protolude, text }: @@ -131656,23 +131415,26 @@ self: { testHaskellDepends = [ base bytestring hls-test-utils text ]; description = "Integration with the Brittany code formatter"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {hls-test-utils = null;}; + }) {}; "hls-class-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint - , ghcide, hls-plugin-api, lens, lsp, shake, text, transformers + ({ mkDerivation, aeson, base, bytestring, containers, filepath, ghc + , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lens, lsp + , lsp-test, lsp-types, shake, text, transformers , unordered-containers }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.0.0"; - sha256 = "103rswyrbs35q6mmv19bnj4cp4r1n5mx6aazcabfakh1cix0fn60"; + version = "1.0.0.1"; + sha256 = "0s9pkdcgvfb9qhj9qjy6bygdyshanczcn9apq3qcw8yznl1zqilc"; libraryHaskellDepends = [ aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens lsp shake text transformers unordered-containers ]; + testHaskellDepends = [ + base bytestring filepath hls-test-utils lens lsp-test lsp-types + text + ]; description = "Class/instance management plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -131680,15 +131442,15 @@ self: { "hls-eval-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide - , hashable, hls-plugin-api, lens, lsp, lsp-types, megaparsec, mtl - , parser-combinators, pretty-simple, QuickCheck, safe-exceptions - , shake, temporary, text, time, transformers, unliftio - , unordered-containers + , hashable, hls-plugin-api, hls-test-utils, lens, lsp, lsp-test + , lsp-types, megaparsec, mtl, parser-combinators, pretty-simple + , QuickCheck, safe-exceptions, shake, temporary, text, time + , transformers, unliftio, unordered-containers }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.0.0.0"; - sha256 = "0pslyhgvs6xrwijkyf4jdh873mnsb8iijmkbc9aq3dljdy080fdg"; + version = "1.1.0.0"; + sha256 = "138l49a8y0g7yk29xdjs0jv0xmz3y8lvig45g944spj3xi8snpfx"; libraryHaskellDepends = [ aeson base containers deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-plugin-api lens lsp @@ -131696,6 +131458,10 @@ self: { QuickCheck safe-exceptions shake temporary text time transformers unliftio unordered-containers ]; + testHaskellDepends = [ + aeson base directory extra filepath hls-test-utils lens lsp-test + lsp-types text + ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -131725,24 +131491,6 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.0.0.0"; - sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; - revision = "1"; - editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92"; - libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide hls-plugin-api lsp - lsp-types shake text unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-explicit-imports-plugin_1_0_0_1" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide - , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers - }: - mkDerivation { - pname = "hls-explicit-imports-plugin"; version = "1.0.0.1"; sha256 = "1ygs667pkc3zn66yqz6ssrxifhrc906sddmcgjnkprk7zappk2nc"; libraryHaskellDepends = [ @@ -131751,21 +131499,24 @@ self: { ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-haddock-comments-plugin" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide - , hls-plugin-api, lsp-types, text, unordered-containers + ({ mkDerivation, base, bytestring, containers, filepath, ghc + , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lsp-types + , text, unordered-containers }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "1.0.0.0"; - sha256 = "1azy3rrbdi465c65f603ycj14mz1cvc9h92rrf0b0frs90hs66r3"; + version = "1.0.0.1"; + sha256 = "1qny8y52myd3ic893wxapbqhfdcdbil8acky91lfcylr9141154i"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types text unordered-containers ]; + testHaskellDepends = [ + base bytestring filepath hls-test-utils text + ]; description = "Haddock comments plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -131779,8 +131530,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.0.1"; - sha256 = "0hnfh6x8l20nrj54hpkkq2yj8xkgw15xcba27hagapam2yxi1xga"; + version = "1.0.0.2"; + sha256 = "1qi654azf4l24sc7zaimbxm7z59xfvdvn33fsa5d8y7910w17d73"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc ghc-exactprint ghcide @@ -131799,25 +131550,6 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "1.0.0.0"; - sha256 = "03pj0irgf9p84jn5kfd4cfyqk4xyfdf9pfrwqhb0c1ipnm4l7wal"; - libraryHaskellDepends = [ - aeson base containers data-default dependent-map dependent-sum Diff - dlist hashable hslogger lens lsp opentelemetry process regex-tdfa - shake text unix unordered-containers - ]; - description = "Haskell Language Server API for plugin communication"; - license = lib.licenses.asl20; - }) {}; - - "hls-plugin-api_1_1_0_0" = callPackage - ({ mkDerivation, aeson, base, containers, data-default - , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger - , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix - , unordered-containers - }: - mkDerivation { - pname = "hls-plugin-api"; version = "1.1.0.0"; sha256 = "1i18a5gxa409882zpviy4paldaq43j4z1zmgr9mag2mn64vplrxy"; libraryHaskellDepends = [ @@ -131827,7 +131559,6 @@ self: { ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-retrie-plugin" = callPackage @@ -131837,24 +131568,6 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.0.0"; - sha256 = "1m4r6nxbq1lvjkl6g1i0lbxdx4zimw6g478alnqv8n208q6fiw26"; - libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - hls-plugin-api lsp lsp-types retrie safe-exceptions shake text - transformers unordered-containers - ]; - description = "Retrie integration plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-retrie-plugin_1_0_0_2" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, directory, extra - , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie - , safe-exceptions, shake, text, transformers, unordered-containers - }: - mkDerivation { - pname = "hls-retrie-plugin"; version = "1.0.0.2"; sha256 = "0jw1q0dk5jl80wbyvi1a6vszj9x3s7d2bnsbnyycbh4zgl33agwb"; libraryHaskellDepends = [ @@ -131864,64 +131577,99 @@ self: { ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-splice-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, dlist, extra, foldl, ghc - , ghc-exactprint, ghcide, hls-plugin-api, lens, lsp, retrie, shake - , syb, text, transformers, unliftio-core, unordered-containers + ({ mkDerivation, aeson, base, containers, directory, dlist, extra + , filepath, foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api + , hls-test-utils, lens, lsp, retrie, shake, syb, text, transformers + , unliftio-core, unordered-containers }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.0.0"; - sha256 = "1xm9ji64g89fn4b81gd5g0ijv88b2zhyn303hr3jxhydqpfcipjb"; + version = "1.0.0.1"; + sha256 = "0fyc2z1bh64plqf831f19nqkgkhryklgrrql2cn25jhfg55gf95q"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api lens lsp retrie shake syb text transformers unliftio-core unordered-containers ]; + testHaskellDepends = [ + base directory extra filepath hls-test-utils text + ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; }) {}; + "hls-stylish-haskell-plugin" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, ghc + , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lsp-types + , mtl, stylish-haskell, text + }: + mkDerivation { + pname = "hls-stylish-haskell-plugin"; + version = "1.0.0.0"; + sha256 = "1f2banm7lbl2grqrm0d9dnhk5fimxqan3xlsl4hjyqgy42xqqai2"; + libraryHaskellDepends = [ + base directory filepath ghc ghc-boot-th ghcide hls-plugin-api + lsp-types mtl stylish-haskell text + ]; + testHaskellDepends = [ base bytestring hls-test-utils text ]; + description = "Integration with the Stylish Haskell code formatter"; + license = lib.licenses.asl20; + }) {}; + "hls-tactics-plugin" = callPackage - ({ mkDerivation, aeson, base, bytestring, checkers, containers - , data-default, deepseq, directory, extra, filepath, fingertree - , generic-lens, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen - , ghcide, hie-bios, hls-plugin-api, hspec, hspec-discover - , hspec-expectations, lens, lsp, lsp-test, lsp-types, megaparsec - , mtl, QuickCheck, refinery, retrie, shake, syb, tasty - , tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-rerun, text, transformers + ({ mkDerivation, aeson, base, containers, deepseq, directory, extra + , filepath, fingertree, generic-lens, ghc, ghc-boot-th + , ghc-exactprint, ghc-source-gen, ghcide, hls-plugin-api + , hls-test-utils, hspec, hspec-discover, hspec-expectations, lens + , lsp, lsp-types, mtl, QuickCheck, refinery, retrie, shake, syb + , tasty-hspec, tasty-hunit, text, transformers + , unordered-containers }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.0.0.0"; - sha256 = "0cd6d3m3w1n7x22k5xndjl9r440s5nx6q2fg3wcmdsbd3s3pg1qa"; - isLibrary = true; - isExecutable = true; + version = "1.1.0.0"; + sha256 = "13qysl6dwrn15kn310r04g1yv7jj9xhar659lrc8h230c4khn2qv"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide hls-plugin-api lens lsp mtl refinery retrie shake syb text - transformers - ]; - executableHaskellDepends = [ - base data-default ghcide hls-plugin-api shake + transformers unordered-containers ]; testHaskellDepends = [ - aeson base bytestring checkers containers data-default deepseq - directory filepath ghc ghcide hie-bios hls-plugin-api hspec - hspec-expectations lens lsp-test lsp-types megaparsec mtl - QuickCheck tasty tasty-ant-xml tasty-expected-failure tasty-golden - tasty-hunit tasty-rerun text + aeson base containers deepseq directory filepath ghc ghcide + hls-plugin-api hls-test-utils hspec hspec-expectations lens + lsp-types mtl QuickCheck tasty-hspec tasty-hunit text ]; testToolDepends = [ hspec-discover ]; description = "Wingman plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; + "hls-test-utils" = callPackage + ({ mkDerivation, aeson, async, base, blaze-markup, bytestring + , containers, data-default, directory, extra, filepath, ghcide + , hls-plugin-api, hspec, hspec-core, lens, lsp, lsp-test, lsp-types + , shake, tasty, tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-rerun, temporary, text, unordered-containers + }: + mkDerivation { + pname = "hls-test-utils"; + version = "1.0.0.0"; + sha256 = "18n7vb9fa39jkgr0gvsrjfc0nh09w2xlniifb25bn6z3qc3w0h6i"; + libraryHaskellDepends = [ + aeson async base blaze-markup bytestring containers data-default + directory extra filepath ghcide hls-plugin-api hspec hspec-core + lens lsp lsp-test lsp-types shake tasty tasty-expected-failure + tasty-golden tasty-hunit tasty-rerun temporary text + unordered-containers + ]; + description = "Utilities used in the tests of Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hlwm" = callPackage ({ mkDerivation, base, stm, transformers, unix, X11 }: mkDerivation { @@ -137839,8 +137587,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.2.5"; - sha256 = "0wyfcsc0vjyx87r5dv51frfligf4d7v0n1m7967vg4d6jkw2zxd9"; + version = "0.1.2.6"; + sha256 = "1w3jm8lsll65i57iqlspw1vzvw5rr4q9qwarq896s0vr8kz68irh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -139117,16 +138865,16 @@ self: { }) {}; "hspec-golden" = callPackage - ({ mkDerivation, base, directory, hspec, hspec-core + ({ mkDerivation, base, directory, filepath, hspec, hspec-core , optparse-applicative, silently }: mkDerivation { pname = "hspec-golden"; - version = "0.1.0.3"; - sha256 = "1d5ab34n0f1wk1q86qlb7x2b49abzzh08jh7j52nbrvnxld2j64l"; + version = "0.2.0.0"; + sha256 = "0sg9f73x2i1g6n1pjcvb1zx4nx17w5drdrrhzp2z3lsxc9yxs8nk"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base directory hspec-core ]; + libraryHaskellDepends = [ base directory filepath hspec-core ]; executableHaskellDepends = [ base directory optparse-applicative ]; testHaskellDepends = [ base directory hspec hspec-core silently ]; description = "Golden tests for hspec"; @@ -144217,8 +143965,8 @@ self: { pname = "hw-prim"; version = "0.6.3.0"; sha256 = "0gqn7s0ki9x951n5whyh0pkcbbqz4kpcn80xxpsv1c0v34946xv7"; - revision = "1"; - editedCabalFile = "1z3fcff42xq0j430q72ncjv6zc0zvzzq94ifh06m342z0x8imv83"; + revision = "2"; + editedCabalFile = "14x1bijg1d8jdh963rxrlwzlqa1p1vh0bc7hjdysk8dzbrc7fbmv"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap transformers unliftio-core vector @@ -145141,8 +144889,6 @@ self: { executableHaskellDepends = [ base containers HUnit random ]; description = "A Yahtzee game implementation in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyakko" = callPackage @@ -145553,8 +145299,6 @@ self: { ]; description = "Display instances for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyper-haskell-server" = callPackage @@ -145574,8 +145318,6 @@ self: { ]; description = "Server back-end for the HyperHaskell graphical Haskell interpreter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hyperdrive" = callPackage @@ -146847,8 +146589,6 @@ self: { ]; description = "A Haskell backend kernel for the IPython project"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-aeson" = callPackage @@ -146864,8 +146604,6 @@ self: { ]; description = "IHaskell display instances for Aeson"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-basic" = callPackage @@ -146877,8 +146615,6 @@ self: { libraryHaskellDepends = [ base ihaskell ]; description = "IHaskell display instances for basic types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-blaze" = callPackage @@ -146890,8 +146626,6 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; description = "IHaskell display instances for blaze-html types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-charts" = callPackage @@ -146908,8 +146642,6 @@ self: { ]; description = "IHaskell display instances for charts types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-diagrams" = callPackage @@ -146926,8 +146658,6 @@ self: { ]; description = "IHaskell display instances for diagram types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-display" = callPackage @@ -146939,8 +146669,6 @@ self: { libraryHaskellDepends = [ base classy-prelude ihaskell ]; description = "IHaskell display instances for basic types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-gnuplot" = callPackage @@ -146952,8 +146680,6 @@ self: { libraryHaskellDepends = [ base bytestring gnuplot ihaskell ]; description = "IHaskell display instance for Gnuplot (from gnuplot package)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-graphviz" = callPackage @@ -146965,8 +146691,6 @@ self: { libraryHaskellDepends = [ base bytestring ihaskell process ]; description = "IHaskell display instance for GraphViz (external binary)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-hatex" = callPackage @@ -146978,8 +146702,6 @@ self: { libraryHaskellDepends = [ base HaTeX ihaskell text ]; description = "IHaskell display instances for hatex"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-hvega" = callPackage @@ -146991,8 +146713,6 @@ self: { libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-inline-r" = callPackage @@ -147010,8 +146730,6 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-juicypixels" = callPackage @@ -147026,8 +146744,6 @@ self: { ]; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-magic" = callPackage @@ -147044,8 +146760,6 @@ self: { ]; description = "IHaskell display instances for bytestrings"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-parsec" = callPackage @@ -147074,8 +146788,6 @@ self: { libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ]; description = "IHaskell display instance for Plot (from plot package)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ihaskell-rlangqq" = callPackage @@ -147492,8 +147204,8 @@ self: { }: mkDerivation { pname = "imm"; - version = "2.1.0.0"; - sha256 = "01jpwxqp2c5ih9cw38w4j7x1dff0z7z1d43yx1rri83w8shpjbl3"; + version = "2.1.1.0"; + sha256 = "1w3kypakf8zqz8r44r9bx0z5v4wxvhnf446jzarawn9fg7yigcqn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -148976,6 +148688,8 @@ self: { pname = "inline-java"; version = "0.10.0"; sha256 = "0rs2rw21y0yc0h4c1rz25qblk39flkg19fwjz87s6l0ly1hvcrm5"; + revision = "1"; + editedCabalFile = "07qpgqy66zpmg1yz38y1w5gbbcc0nvidmlg2z4anj0k5rifzgdv6"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text @@ -149137,22 +148851,6 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.4.4.0"; - sha256 = "1zr7c7xpmnfwn2p84rqw69n1g91rdkh7d20awvj0s56nbdikgiyh"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_5_0" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; version = "0.4.5.0"; sha256 = "1d8bi60m97yw4vxmajclg66xhaap8nj4dli8bxni0mf4mcm0px01"; libraryHaskellDepends = [ @@ -149161,7 +148859,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -150056,8 +149753,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.4.0"; - sha256 = "0852yv0d7c3gh6ggab6wvnk7g1pad02nnpbmzw98c9zkzw2zk9wh"; + version = "0.6.2"; + sha256 = "0rfx5li74s160i64rjzl1p8gjj3aqxc1hml2n0c1jrair7l1g2iy"; libraryHaskellDepends = [ base containers QuickCheck time witherable ]; @@ -150798,16 +150495,15 @@ self: { }) {}; "ipa" = callPackage - ({ mkDerivation, attoparsec, base, hspec, text, unicode-transforms + ({ mkDerivation, attoparsec, base, hspec, template-haskell, text + , unicode-transforms }: mkDerivation { pname = "ipa"; - version = "0.3"; - sha256 = "0cm9ahqaf2kdqny6nmk9ff1h413v0iqbfsf6glrr5vkhmx60h9qm"; - revision = "2"; - editedCabalFile = "1jafvzz7vdbkcwywdhx49g2q1f0gah0bz921kia6lbi5jnyaail1"; + version = "0.3.1"; + sha256 = "1l658qnqfs63dwarmiaw7vf6v2xl8hhvzlb95w168rpa7wfkrh5n"; libraryHaskellDepends = [ - attoparsec base text unicode-transforms + attoparsec base template-haskell text unicode-transforms ]; testHaskellDepends = [ base hspec text ]; description = "Internal Phonetic Alphabet (IPA)"; @@ -151117,8 +150813,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.2.0"; - sha256 = "0gd7ww2cmnh7im0gicsj1617540kl97780860hzf8nkixn71hwqr"; + version = "1.1.2.1"; + sha256 = "1zaa8na730m96flgiyzcwq95v2ianvflsw3abvdavf7xpq4s71ld"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -152336,6 +152032,9 @@ self: { librarySystemDepends = [ wirelesstools ]; description = "Bindings for the iw C library"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) wirelesstools;}; "ix" = callPackage @@ -153333,6 +153032,8 @@ self: { pname = "jni"; version = "0.8.0"; sha256 = "0m94p2zx877snh3imwcdnwa8ajfb76cg2rjgjx3pan508ham1h5i"; + revision = "2"; + editedCabalFile = "1ql65nfmd5mhn7y2xdifx240mk5my5z8w3pn85497hzk27qllybi"; libraryHaskellDepends = [ async base bytestring choice constraints containers deepseq inline-c singletons stm text @@ -155317,6 +155018,8 @@ self: { pname = "jvm"; version = "0.6.0"; sha256 = "119davscv5mrw2mnlrklx8hbjrc7lhf5a9jphdnnxs6bywi8i2zm"; + revision = "2"; + editedCabalFile = "1p0p50w0zjf79a3p5wiwg1wfnsgvqf2n04ydpacrfwm96id667kp"; libraryHaskellDepends = [ base bytestring choice constraints distributed-closure exceptions jni singletons template-haskell text vector @@ -155342,6 +155045,8 @@ self: { pname = "jvm-batching"; version = "0.2.0"; sha256 = "19z0db10y181n4adkz23cmly0q4zp953zh6f3r7rmxcd78758pbk"; + revision = "1"; + editedCabalFile = "1ni0gnww6r18dg2pm1hmdkfzaghq5ssirpp737i1c81ya1k95m2n"; setupHaskellDepends = [ base Cabal inline-java ]; libraryHaskellDepends = [ base bytestring distributed-closure inline-java jni jvm singletons @@ -155420,6 +155125,8 @@ self: { pname = "jvm-streaming"; version = "0.4.0"; sha256 = "0k8y6kvbymmjlr3bvgcws0z2hwdznyr3b3alkwsjag49lsgp21sd"; + revision = "1"; + editedCabalFile = "01f3j02qzqi7ls876vwzl2db3621xr7psmzm3cx9pk414bhj5f56"; setupHaskellDepends = [ base Cabal inline-java jvm-batching ]; libraryHaskellDepends = [ base distributed-closure inline-java jni jvm jvm-batching @@ -157696,6 +157403,18 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "koji_0_0_2" = callPackage + ({ mkDerivation, base, haxr, mtl }: + mkDerivation { + pname = "koji"; + version = "0.0.2"; + sha256 = "1ypr552453r0b9s5xlsw0gllka2jaf9xwphlnx55fn05f17zh7qd"; + libraryHaskellDepends = [ base haxr mtl ]; + description = "Koji buildsystem XML-RPC API bindings"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "kontra-config" = callPackage ({ mkDerivation, base, bytestring, data-default, exceptions, text , transformers-base, unjson, utf8-string, yaml @@ -159488,30 +159207,6 @@ self: { ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb - , symbol, template-haskell, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "language-c-quote"; - version = "0.12.2.1"; - sha256 = "0hwv4b40wj953f39gqn8ji4ycli67c90b8xbizskd4i1x3nqbi35"; - libraryHaskellDepends = [ - array base bytestring containers exception-mtl - exception-transformers filepath haskell-src-meta mainland-pretty - mtl srcloc syb symbol template-haskell - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base bytestring HUnit mainland-pretty srcloc symbol test-framework - test-framework-hunit - ]; - description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; - license = lib.licenses.bsd3; - }) {}; - - "language-c-quote_0_13" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , exception-mtl, exception-transformers, filepath, happy - , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb , template-haskell, test-framework, test-framework-hunit }: mkDerivation { @@ -159530,7 +159225,6 @@ self: { ]; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "language-c99" = callPackage @@ -159693,8 +159387,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "9.3.0"; - sha256 = "1n9v0b6lwr528b6919y11a8d27mhsp0mm870rx0rjg9l5j4mnbvn"; + version = "10.0.0"; + sha256 = "0h2jq15niz77h2vpqyq7gblgbsrrvsr3qjw1cmjvr474zgzxmrv7"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -163560,6 +163254,9 @@ self: { librarySystemDepends = [ modbus ]; description = "Haskell bindings to the C modbus library"; license = lib.licenses.bsd2; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {modbus = null;}; "libmolude" = callPackage @@ -164000,6 +163697,9 @@ self: { libraryPkgconfigDepends = [ systemd ]; description = "Haskell bindings to libsystemd-journal"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -164024,12 +163724,17 @@ self: { pname = "libtelnet"; version = "0.1.0.1"; sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks"; + revision = "1"; + editedCabalFile = "13lg79nlwmhd5qqyr31bk7wpfl0mvr37q4ha3q83gxya03f34v5h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ libtelnet ]; description = "Bindings to libtelnet"; license = lib.licenses.gpl3Plus; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libtelnet;}; "libversion" = callPackage @@ -164167,6 +163872,9 @@ self: { executableSystemDepends = [ nvpair zfs ]; description = "Bindings to libzfs, for dealing with the Z File System and Zpools"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage @@ -165046,6 +164754,9 @@ self: { libraryHaskellDepends = [ base sbv ]; description = "Use SMT solvers to solve linear systems over integers and rationals"; license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {}; "linearmap-category" = callPackage @@ -167972,6 +167683,9 @@ self: { ]; description = "Journald back-end for logging-facade"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "logging-facade-syslog" = callPackage @@ -168941,36 +168655,6 @@ self: { }: mkDerivation { pname = "lsp"; - version = "1.1.1.0"; - sha256 = "04ndz4v1mwga13qndmnaaj145y5zqw7zv64px7ak26qvd1m26h9r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring containers data-default - dependent-map directory filepath hashable hslogger lens lsp-types - mtl network-uri random scientific sorted-list stm text time - transformers unliftio-core unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri QuickCheck quickcheck-instances - rope-utf16-splay sorted-list stm text unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - }) {}; - - "lsp_1_2_0_0" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, dependent-map, directory, filepath - , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl - , network-uri, QuickCheck, quickcheck-instances, random - , rope-utf16-splay, scientific, sorted-list, stm, text, time - , transformers, unliftio-core, unordered-containers, uuid - }: - mkDerivation { - pname = "lsp"; version = "1.2.0.0"; sha256 = "0ca8s84xlh9kmi1lx47d6z3c8c827q30spmbxi1nl37dn35ib4b6"; isLibrary = true; @@ -168989,7 +168673,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lsp-test" = callPackage @@ -169019,34 +168702,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_13_0_0" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, Glob, hspec, lens, lsp-types, mtl - , parser-combinators, process, some, text, time, transformers, unix - , unordered-containers - }: - mkDerivation { - pname = "lsp-test"; - version = "0.13.0.0"; - sha256 = "1xyxmzcd6r56jj1k11lz1g6yld5q3k6cgb0bsf45px120dsf1dpy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async base bytestring conduit - conduit-parse containers data-default Diff directory filepath Glob - lens lsp-types mtl parser-combinators process some text time - transformers unix unordered-containers - ]; - testHaskellDepends = [ - aeson base data-default directory filepath hspec lens lsp-types - text unordered-containers - ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "lsp-test_0_14_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -169084,29 +168739,6 @@ self: { }: mkDerivation { pname = "lsp-types"; - version = "1.1.0.0"; - sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54"; - revision = "1"; - editedCabalFile = "0iifws4r1h9v1mbsrmbvssvm0gmvzm9yh9h85izly0s51869bbq4"; - libraryHaskellDepends = [ - aeson base binary bytestring containers data-default deepseq - dependent-sum dependent-sum-template directory filepath hashable - hslogger lens network-uri rope-utf16-splay scientific some - template-haskell temporary text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - }) {}; - - "lsp-types_1_2_0_0" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum, dependent-sum-template - , directory, filepath, hashable, hslogger, lens, network-uri - , rope-utf16-splay, scientific, some, template-haskell, temporary - , text, unordered-containers - }: - mkDerivation { - pname = "lsp-types"; version = "1.2.0.0"; sha256 = "1axl62yafkxh414dxr5i7pwqw0s3kkqphs7b259qk33vin3qayk3"; libraryHaskellDepends = [ @@ -169117,7 +168749,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "lss" = callPackage @@ -170914,19 +170545,6 @@ self: { ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { pname = "mainland-pretty"; - version = "0.7.0.1"; - sha256 = "0cifvdpqcb1cvjazgqwaxvl2ga7kap5a6f89yw1xn8y5yw7nz1c8"; - libraryHaskellDepends = [ - base containers srcloc text transformers - ]; - description = "Pretty printing designed for printing source code"; - license = lib.licenses.bsd3; - }) {}; - - "mainland-pretty_0_7_1" = callPackage - ({ mkDerivation, base, containers, srcloc, text, transformers }: - mkDerivation { - pname = "mainland-pretty"; version = "0.7.1"; sha256 = "19z2769rik6kwvsil2if2bfq2v59jmwv74jy3fy4q3q3zy4239p1"; libraryHaskellDepends = [ @@ -170934,7 +170552,6 @@ self: { ]; description = "Pretty printing designed for printing source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "majordomo" = callPackage @@ -174961,13 +174578,20 @@ self: { }) {}; "method" = callPackage - ({ mkDerivation, base, hspec, hspec-discover, rio, transformers }: + ({ mkDerivation, base, containers, hspec, hspec-discover, rio + , template-haskell, th-abstraction, transformers + }: mkDerivation { pname = "method"; - version = "0.3.1.0"; - sha256 = "0a96av07vbh3mvyczh2jiziqb098q81jx6q0c5kgn7pmlxijw1ba"; - libraryHaskellDepends = [ base rio transformers ]; - testHaskellDepends = [ base hspec rio transformers ]; + version = "0.4.0.0"; + sha256 = "0ca7xfy5yb8d68l530q6h82843i5yvp9grr9r23s7rfbisbysfpb"; + libraryHaskellDepends = [ + base containers rio template-haskell th-abstraction transformers + ]; + testHaskellDepends = [ + base containers hspec rio template-haskell th-abstraction + transformers + ]; testToolDepends = [ hspec-discover ]; description = "rebindable methods for improving testability"; license = lib.licenses.bsd3; @@ -177088,6 +176712,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "mixed-types-num_0_5_0_0" = callPackage + ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.5.0.0"; + sha256 = "17jfrhlcc86qw0zg997hsd11dc97vrqfkylhwb5ii9ls14j5qxfl"; + libraryHaskellDepends = [ + base collect-errors hspec hspec-smallcheck mtl QuickCheck + smallcheck template-haskell + ]; + testHaskellDepends = [ + base collect-errors hspec hspec-smallcheck QuickCheck smallcheck + ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -181096,6 +180740,7 @@ self: { testSystemDepends = [ mpich ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) mpich;}; "mpi-hs-binary" = callPackage @@ -181113,6 +180758,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "mpi-hs-cereal" = callPackage @@ -181130,6 +180776,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "mpi-hs-store" = callPackage @@ -181147,6 +180794,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; + platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; }) {}; "mplayer-spot" = callPackage @@ -181167,6 +180815,9 @@ self: { executableHaskellDepends = [ base ]; description = "Save your spot when watching movies with @mplayer@"; license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {}; "mpppc" = callPackage @@ -191424,6 +191075,9 @@ self: { librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ]; description = "Oculus Rift ffi providing head tracking data"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; @@ -195510,6 +195164,24 @@ self: { broken = true; }) {}; + "pact-time" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal, clock + , Decimal, deepseq, microlens, mtl, tasty, tasty-hunit, text + , vector, vector-space + }: + mkDerivation { + pname = "pact-time"; + version = "0.2.0.0"; + sha256 = "04d8hd4hnbsjvzjjvnyabc68srhyp8k9459pp0y1sdc7z6c0qq1m"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring cereal clock Decimal deepseq + microlens mtl text vector vector-space + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Time Library for Pact"; + license = lib.licenses.bsd3; + }) {}; + "padKONTROL" = callPackage ({ mkDerivation, base, containers, hmidi, minioperational , transformers @@ -195775,8 +195447,6 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; - broken = true; }) {pam = null;}; "pan-os-syslog" = callPackage @@ -196270,8 +195940,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.1.1"; - sha256 = "10wwci7p3kphmjxlnpymbnx3cw2l3yfydm29l6k2vakz1pd7zdh0"; + version = "1.2.0"; + sha256 = "091283hcp3rin1rpg6b4lkh32svqr1gjxsa15id3qic7a7knx2r0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200672,32 +200342,36 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_12_1_1" = callPackage + "persistent_2_13_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , deepseq-generics, fast-logger, file-embed, hspec, http-api-data - , monad-logger, mtl, path-pieces, QuickCheck, resource-pool - , resourcet, scientific, shakespeare, silently, template-haskell - , text, th-lift-instances, time, transformers, unliftio - , unliftio-core, unordered-containers, vector + , lift-type, monad-logger, mtl, path-pieces, QuickCheck + , quickcheck-instances, resource-pool, resourcet, scientific + , shakespeare, silently, template-haskell, text, th-lift-instances + , time, transformers, unliftio, unliftio-core, unordered-containers + , vector }: mkDerivation { pname = "persistent"; - version = "2.12.1.1"; - sha256 = "00n463mvfnjpi7dz4i3lz379cf4gprsiv57j4jb7wh5a8xr2vfhz"; + version = "2.13.0.0"; + sha256 = "1addkfiaixk076qkdlhjmx97f8bgfmxwna9dv0h7hfvnq8v35bkf"; + revision = "2"; + editedCabalFile = "12ylw4rzrjlk2m0qfgqx481k0ifhv5i8z0vy70knjrkgx8d9sfvx"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger http-api-data monad-logger mtl - path-pieces resource-pool resourcet scientific silently + conduit containers fast-logger http-api-data lift-type monad-logger + mtl path-pieces resource-pool resourcet scientific silently template-haskell text th-lift-instances time transformers unliftio unliftio-core unordered-containers vector ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger hspec http-api-data monad-logger mtl - path-pieces QuickCheck resource-pool resourcet scientific - shakespeare silently template-haskell text th-lift-instances time - transformers unliftio unliftio-core unordered-containers vector + path-pieces QuickCheck quickcheck-instances resource-pool resourcet + scientific shakespeare silently template-haskell text + th-lift-instances time transformers unliftio unliftio-core + unordered-containers vector ]; benchmarkHaskellDepends = [ base criterion deepseq deepseq-generics file-embed template-haskell @@ -200774,6 +200448,33 @@ self: { broken = true; }) {}; + "persistent-discover" = callPackage + ({ mkDerivation, base, directory, dlist, file-embed, filepath + , hspec, hspec-discover, mtl, persistent, template-haskell + }: + mkDerivation { + pname = "persistent-discover"; + version = "0.1.0.0"; + sha256 = "1cpjbks5cmh2w3370xnmm29rk8j3xdxmry04fyi0aqyg5f91hrdi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory dlist file-embed filepath mtl persistent + template-haskell + ]; + executableHaskellDepends = [ + base directory dlist file-embed filepath mtl persistent + template-haskell + ]; + testHaskellDepends = [ + base directory dlist file-embed filepath hspec hspec-discover mtl + persistent template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Persistent module discover utilities"; + license = lib.licenses.bsd3; + }) {}; + "persistent-documentation" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover, mtl , persistent, persistent-template, template-haskell, text @@ -200890,8 +200591,8 @@ self: { }: mkDerivation { pname = "persistent-migration"; - version = "0.1.0"; - sha256 = "025hrjm95klj4b7wqlzwkcwra5yj37ilirr06hxxw6d3g668rllm"; + version = "0.2.0"; + sha256 = "0xqzgfzxv8xskyaivar6mnb9qp9s3fq0lh17sajrxa59fi7h8xjw"; libraryHaskellDepends = [ base containers fgl mtl persistent text time unordered-containers ]; @@ -200918,6 +200619,8 @@ self: { pname = "persistent-mongoDB"; version = "2.12.0.0"; sha256 = "1s49d4c4kiqcblkap96wcrp3nc0179vpzbqp4fdibljq9ylzxmzg"; + revision = "1"; + editedCabalFile = "047riy3grn68jw99095qgqxvfs5bvxmcvmnz170nrqflrlr4l4dd"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -200987,26 +200690,27 @@ self: { license = lib.licenses.mit; }) {}; - "persistent-mysql_2_12_1_0" = callPackage + "persistent-mysql_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, fast-logger, hspec, HUnit, monad-logger, mysql - , mysql-simple, persistent, persistent-qq, persistent-test - , QuickCheck, quickcheck-instances, resource-pool, resourcet, text - , time, transformers, unliftio-core + , containers, fast-logger, hspec, http-api-data, HUnit + , monad-logger, mysql, mysql-simple, path-pieces, persistent + , persistent-qq, persistent-test, QuickCheck, quickcheck-instances + , resource-pool, resourcet, text, time, transformers, unliftio-core }: mkDerivation { pname = "persistent-mysql"; - version = "2.12.1.0"; - sha256 = "08494wc935gfr3007w2x9lvqcp8y2jvapgwjxz1l0mnl120vh8hw"; + version = "2.13.0.0"; + sha256 = "1lqd1j9r973081yzvvz9c65csqjd8bzapb4dayzwbhwjq2p0sxiz"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text transformers unliftio-core ]; testHaskellDepends = [ - base bytestring containers fast-logger hspec HUnit monad-logger - mysql persistent persistent-qq persistent-test QuickCheck - quickcheck-instances resourcet text time transformers unliftio-core + aeson base bytestring containers fast-logger hspec http-api-data + HUnit monad-logger mysql path-pieces persistent persistent-qq + persistent-test QuickCheck quickcheck-instances resourcet text time + transformers unliftio-core ]; description = "Backend for the persistent library using MySQL database server"; license = lib.licenses.mit; @@ -201132,20 +200836,20 @@ self: { license = lib.licenses.mit; }) {}; - "persistent-postgresql_2_12_1_1" = callPackage + "persistent-postgresql_2_13_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , conduit, containers, fast-logger, hspec, hspec-expectations - , hspec-expectations-lifted, HUnit, monad-logger, mtl, persistent - , persistent-qq, persistent-test, postgresql-libpq - , postgresql-simple, QuickCheck, quickcheck-instances - , resource-pool, resourcet, string-conversions, text, time - , transformers, unliftio, unliftio-core, unordered-containers - , vector + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector }: mkDerivation { pname = "persistent-postgresql"; - version = "2.12.1.1"; - sha256 = "1zyh40490r3vjr5qyr8hp2ih1pjqjwbmwm1ashdm1b1n9y5ary53"; + version = "2.13.0.0"; + sha256 = "0a18h7ib01if2dspq8f3vwb02cwi74c12i0n3ax4aq6819qy12gb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201156,10 +200860,10 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers fast-logger hspec - hspec-expectations hspec-expectations-lifted HUnit monad-logger - persistent persistent-qq persistent-test QuickCheck - quickcheck-instances resourcet text time transformers unliftio - unliftio-core unordered-containers vector + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; @@ -201248,8 +200952,8 @@ self: { }: mkDerivation { pname = "persistent-redis"; - version = "2.12.0.0"; - sha256 = "0zibmgvlpkx4knh23jnz2vam1la6w57x2cibrdn17h0zd3s872p5"; + version = "2.13.0.0"; + sha256 = "1d43rlcx0islf7gn14kpxi922zaz6k5x6s4k4xc947l2r1zx40qs"; libraryHaskellDepends = [ aeson base binary bytestring hedis http-api-data mtl path-pieces persistent scientific text time transformers utf8-string @@ -201355,7 +201059,7 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; - "persistent-sqlite_2_12_0_0" = callPackage + "persistent-sqlite_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th , monad-logger, mtl, persistent, persistent-test, QuickCheck @@ -201365,8 +201069,10 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.12.0.0"; - sha256 = "0qwh2zrg1dqrv7i752jkqgqfxwjbdvkxmdgnzhcfzhgn6bq1018m"; + version = "2.13.0.0"; + sha256 = "1xbf22cnvhjs59wqml0n5flk1fhrhjw3flm3lnhh1nik3scfny0w"; + revision = "1"; + editedCabalFile = "0y21azb1cvaxwlypprh3wqxr0w0hchf3r509vqxvywqymckqc71i"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -201479,24 +201185,26 @@ self: { broken = true; }) {}; - "persistent-test_2_12_0_0" = callPackage + "persistent-test_2_13_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit - , containers, exceptions, hspec, hspec-expectations, HUnit - , monad-control, monad-logger, mtl, path-pieces, persistent + , containers, exceptions, hspec, hspec-expectations, http-api-data + , HUnit, monad-control, monad-logger, mtl, path-pieces, persistent , QuickCheck, quickcheck-instances, random, resourcet, text, time , transformers, transformers-base, unliftio, unliftio-core , unordered-containers }: mkDerivation { pname = "persistent-test"; - version = "2.12.0.0"; - sha256 = "0vn6f8wmax68qg27ifw2sfr3d0zk12p6gaax5xshwmb5ypamrc50"; + version = "2.13.0.0"; + sha256 = "1fyahnnx9f3dg36kqviah5l9410d0x819dz3afxapcq27myccdw7"; + revision = "1"; + editedCabalFile = "16yzpsy11bcglipgcy0x8mcxlx7w00gfvnw5fhjkbj99lxdwwgm0"; libraryHaskellDepends = [ aeson base blaze-html bytestring conduit containers exceptions - hspec hspec-expectations HUnit monad-control monad-logger mtl - path-pieces persistent QuickCheck quickcheck-instances random - resourcet text time transformers transformers-base unliftio - unliftio-core unordered-containers + hspec hspec-expectations http-api-data HUnit monad-control + monad-logger mtl path-pieces persistent QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers ]; description = "Tests for Persistent"; license = lib.licenses.mit; @@ -201902,8 +201610,8 @@ self: { ({ mkDerivation, base, containers, gu, pgf, pretty }: mkDerivation { pname = "pgf2"; - version = "1.2.1"; - sha256 = "10nbwhdirhlsh68f14z8y75wlbs9f9xcn8cbgkf47m74x71jqqb3"; + version = "1.3.0"; + sha256 = "1sd21p6f9m9l6xnf853v7lxj6j6sbsrd7i09y0w0lsysp86p8h7m"; libraryHaskellDepends = [ base containers pretty ]; librarySystemDepends = [ gu pgf ]; description = "Bindings to the C version of the PGF runtime"; @@ -202306,8 +202014,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.5.1.0"; - sha256 = "1pqc16llr1ar7z6lfbniinxx7q09qpamajmbl3d9njhk4pwdl6b8"; + version = "0.6.1.0"; + sha256 = "0pa55mkw70f20bw90qc8lballa89zgk6b185038i4p3piipsymrn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202461,6 +202169,38 @@ self: { license = lib.licenses.mit; }) {}; + "phonetic-languages-simplified-generalized-examples-common" = callPackage + ({ mkDerivation, base, heaps, phonetic-languages-phonetics-basics + , subG + }: + mkDerivation { + pname = "phonetic-languages-simplified-generalized-examples-common"; + version = "0.1.0.1"; + sha256 = "07rqfnz2rkx6rwfgrv97yiww2d1086av60pri5qcp5l44xwlqdy5"; + libraryHaskellDepends = [ + base heaps phonetic-languages-phonetics-basics subG + ]; + description = "Some common code for phonetic languages generalized functionality"; + license = lib.licenses.mit; + }) {}; + + "phonetic-languages-simplified-generalized-properties-array" = callPackage + ({ mkDerivation, base, phonetic-languages-phonetics-basics + , phonetic-languages-rhythmicity + , phonetic-languages-simplified-base + }: + mkDerivation { + pname = "phonetic-languages-simplified-generalized-properties-array"; + version = "0.1.0.2"; + sha256 = "1hm9yz0ibfrzmmm70qff0bsghiscigp9843i9nhk41yfxlrmbsp3"; + libraryHaskellDepends = [ + base phonetic-languages-phonetics-basics + phonetic-languages-rhythmicity phonetic-languages-simplified-base + ]; + description = "Generalization of the functionality of the phonetic-languages-simplified-properties-array"; + license = lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-lists-examples" = callPackage ({ mkDerivation, base, heaps, mmsyn2, parallel , phonetic-languages-constraints, phonetic-languages-permutations @@ -203103,6 +202843,7 @@ self: { ]; description = "Back up the notes you've saved to Pinboard"; license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ bdesham ]; }) {}; "pinch" = callPackage @@ -203392,6 +203133,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes_4_3_16" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.16"; + sha256 = "163lx5sf68zx5kik5h1fjsyckwr9shdsn5k2dsjq3mhg077nxqgl"; + libraryHaskellDepends = [ + base exceptions mmorph mtl transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -204719,6 +204484,9 @@ self: { ]; description = "Haskell game engine like fantasy console"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "pkcs1" = callPackage @@ -205419,8 +205187,6 @@ self: { ]; description = "Diagrams based plotting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "plotserver-api" = callPackage @@ -207585,6 +207351,9 @@ self: { ]; description = "posix bindings"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) systemd;}; @@ -213379,26 +213148,25 @@ self: { "publish" = callPackage ({ mkDerivation, base, bytestring, chronologique, core-data - , core-program, core-text, deepseq, directory, filepath, hinotify - , hspec, megaparsec, pandoc, pandoc-types, template-haskell, text + , core-program, core-text, deepseq, directory, filepath, hspec + , megaparsec, pandoc, pandoc-types, template-haskell, text , typed-process, unix, unordered-containers }: mkDerivation { pname = "publish"; - version = "2.1.5"; - sha256 = "1ncz9bijln0xmkmy5x6lv4w6xiqr08crgqiyb8cchc88dqacddhi"; + version = "2.1.6"; + sha256 = "1clb9sxrsskklzany9q5600v77qywdszgzxjxrvsihrirf0akry2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring chronologique core-data core-program core-text - deepseq directory filepath hinotify megaparsec pandoc pandoc-types + deepseq directory filepath megaparsec pandoc pandoc-types template-haskell text typed-process unix unordered-containers ]; testHaskellDepends = [ base bytestring chronologique core-data core-program core-text - deepseq directory filepath hinotify hspec megaparsec pandoc - pandoc-types template-haskell text typed-process unix - unordered-containers + deepseq directory filepath hspec megaparsec pandoc pandoc-types + template-haskell text typed-process unix unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; license = lib.licenses.mit; @@ -214267,8 +214035,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.0"; - sha256 = "1zmcpbd20m7pc1bc0dwkhy33vbakdwc478dmzpr4l80kck0mpmy6"; + version = "2.1.0.1"; + sha256 = "19mdq0piyvqvw2nfcb164narj6d9wgp1as75ri2w21i5qmm1jhi8"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -218293,8 +218061,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "11.1.0"; - sha256 = "1q915fq9bjwridd67rsmavxcbkgp3xxq9ps09z6mi62608c26987"; + version = "11.1.1"; + sha256 = "0cfxdi2h6aqa6zylg1hgn563fpi72zqfqzl9gsipm7jz1532j2a3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220277,23 +220045,11 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "ref-fd"; - version = "0.4.0.2"; - sha256 = "1camr7cv1fglicyp2ivv7qv1yidj36zxcglfvmw7giqdj7r7j5w8"; - libraryHaskellDepends = [ base stm transformers ]; - description = "A type class for monads with references using functional dependencies"; - license = lib.licenses.bsd3; - }) {}; - - "ref-fd_0_5" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "ref-fd"; version = "0.5"; sha256 = "1r34xyyx0fyl1fc64n1hhk0m2s1l808kjb18dmj8w0y91w4ms6qj"; libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using functional dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ref-mtl" = callPackage @@ -220313,23 +220069,11 @@ self: { ({ mkDerivation, base, stm, transformers }: mkDerivation { pname = "ref-tf"; - version = "0.4.0.2"; - sha256 = "0pq9pm8jsx9w1q81pf5pvc361ad8dbyklw94jq47drr2i0dc7n20"; - libraryHaskellDepends = [ base stm transformers ]; - description = "A type class for monads with references using type families"; - license = lib.licenses.bsd3; - }) {}; - - "ref-tf_0_5" = callPackage - ({ mkDerivation, base, stm, transformers }: - mkDerivation { - pname = "ref-tf"; version = "0.5"; sha256 = "06lf3267b68syiqcwvgw8a7yi0ki3khnh4i9s8z7zjrjnj6h9r4v"; libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using type families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "refact" = callPackage @@ -220670,6 +220414,9 @@ self: { ]; description = "Functional Reactive Web Apps with Reflex"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; maintainers = with lib.maintainers; [ maralorn ]; }) {}; @@ -223807,8 +223554,8 @@ self: { }: mkDerivation { pname = "request"; - version = "0.2.0.0"; - sha256 = "023bldkfjqbwmd6mh4vb2k7z5vi8lfkhf5an057h04dzhpgb3r9l"; + version = "0.2.1.0"; + sha256 = "1a2zx0gb03mv6g4sw0r6pxkvih8ca5w9w44k6d3n7b5b7s8yznhk"; libraryHaskellDepends = [ base bytestring case-insensitive http-client http-client-tls http-types @@ -229207,49 +228954,6 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.0.3"; - sha256 = "1gd8k4dx25bgqrw16dwvq9lnk7gpvpci01kvnn3s08ylkiq2qax9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - executableHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - testHaskellDepends = [ - aeson ansi-terminal async base brick bytestring colour containers - directory exceptions filepath free haskell-src-exts lens - lifted-async microlens microlens-th monad-control monad-logger mtl - optparse-applicative pretty-show process safe safe-exceptions stm - string-interpolate template-haskell text time transformers - transformers-base unix unliftio-core vector vty - ]; - description = "Yet another test framework for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich_0_1_0_5" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, brick - , bytestring, colour, containers, directory, exceptions, filepath - , free, haskell-src-exts, lens, lifted-async, microlens - , microlens-th, monad-control, monad-logger, mtl - , optparse-applicative, pretty-show, process, safe, safe-exceptions - , stm, string-interpolate, template-haskell, text, time - , transformers, transformers-base, unix, unliftio-core, vector, vty - }: - mkDerivation { - pname = "sandwich"; version = "0.1.0.5"; sha256 = "1np5c81jbv2k6sszrg7wwf2ymbnpn2pak8fji1phk79sdr04qmfh"; isLibrary = true; @@ -229280,30 +228984,23 @@ self: { ]; description = "Yet another test framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-quickcheck" = callPackage - ({ mkDerivation, base, free, monad-control, QuickCheck - , safe-exceptions, sandwich, string-interpolate, time + ({ mkDerivation, base, brick, free, monad-control, QuickCheck + , safe-exceptions, sandwich, string-interpolate, text, time }: mkDerivation { pname = "sandwich-quickcheck"; - version = "0.1.0.4"; - sha256 = "0sljlpnhv5wpda1w9nh5da2psmg9snias8k9dr62y9khymn3aya7"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.5"; + sha256 = "03z8g5q3yxfpazbwi56ji9554z3l2ac776mzz06xsb7cha3kf7lw"; libraryHaskellDepends = [ - base free monad-control QuickCheck safe-exceptions sandwich - string-interpolate time - ]; - executableHaskellDepends = [ - base free monad-control QuickCheck safe-exceptions sandwich - string-interpolate time + base brick free monad-control QuickCheck safe-exceptions sandwich + string-interpolate text time ]; testHaskellDepends = [ - base free monad-control QuickCheck safe-exceptions sandwich - string-interpolate time + base brick free monad-control QuickCheck safe-exceptions sandwich + string-interpolate text time ]; description = "Sandwich integration with QuickCheck"; license = lib.licenses.bsd3; @@ -229316,36 +229013,6 @@ self: { }: mkDerivation { pname = "sandwich-slack"; - version = "0.1.0.3"; - sha256 = "1g8ymxy4q08jxlfbd7ar6n30wm1mcm942vr5627bpx63m83yld1y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers lens lens-aeson monad-logger mtl - safe safe-exceptions sandwich stm string-interpolate text time - vector wreq - ]; - executableHaskellDepends = [ - aeson base bytestring containers lens lens-aeson monad-logger mtl - safe safe-exceptions sandwich stm string-interpolate text time - vector wreq - ]; - testHaskellDepends = [ - aeson base bytestring containers lens lens-aeson monad-logger mtl - safe safe-exceptions sandwich stm string-interpolate text time - vector wreq - ]; - description = "Sandwich integration with Slack"; - license = lib.licenses.bsd3; - }) {}; - - "sandwich-slack_0_1_0_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, lens - , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich - , stm, string-interpolate, text, time, vector, wreq - }: - mkDerivation { - pname = "sandwich-slack"; version = "0.1.0.4"; sha256 = "1l296q3lxafj3gd7pr6n6qrvcb4zdkncsj2z6ra6q0qfw465jaqk"; isLibrary = true; @@ -229367,7 +229034,6 @@ self: { ]; description = "Sandwich integration with Slack"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sandwich-webdriver" = callPackage @@ -229728,6 +229394,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "sbv_7_13" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, deepseq, directory, doctest, filepath, generic-deriving + , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, z3 + }: + mkDerivation { + pname = "sbv"; + version = "7.13"; + sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time + ]; + testHaskellDepends = [ + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + testSystemDepends = [ z3 ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) z3;}; + "sbv" = callPackage ({ mkDerivation, array, async, base, bench-show, bytestring , containers, deepseq, directory, doctest, filepath, gauge, Glob @@ -229757,6 +229454,9 @@ self: { ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {inherit (pkgs) z3;}; "sbvPlugin" = callPackage @@ -233977,19 +233677,19 @@ self: { "servant-benchmark" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, hspec, http-media, http-types, QuickCheck - , servant, text, yaml + , servant, text, utf8-string, yaml }: mkDerivation { pname = "servant-benchmark"; - version = "0.1.1.1"; - sha256 = "1rsj819kg17p31ky5ad28hydrkh39nsfwkq3f9zdkqm2j924idhx"; + version = "0.1.2.0"; + sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml ]; testHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive hspec - http-media http-types QuickCheck servant text yaml + http-media http-types QuickCheck servant text utf8-string yaml ]; description = "Generate benchmark files from a Servant API"; license = lib.licenses.bsd3; @@ -244539,17 +244239,15 @@ self: { "sockets-and-pipes" = callPackage ({ mkDerivation, aeson, ascii, async, base, blaze-html, bytestring - , containers, network, safe-exceptions, stm, text, time + , containers, network, pipes, safe-exceptions, stm, text, time }: mkDerivation { pname = "sockets-and-pipes"; - version = "0.1"; - sha256 = "02xc2kddcz93d9yqdchml0yh9gypcx64315baj766adgf8np42nv"; - revision = "4"; - editedCabalFile = "1lv2zpyblqryr59ii3zvwi5f06vxsgnla1xa14rardhncs36fa8r"; + version = "0.2"; + sha256 = "13xc6f525la66k76y515r0dwjqh583zl7z1k4z1w6hraim6kg95v"; libraryHaskellDepends = [ aeson ascii async base blaze-html bytestring containers network - safe-exceptions stm text time + pipes safe-exceptions stm text time ]; description = "Support for the Sockets and Pipes book"; license = lib.licenses.asl20; @@ -244920,23 +244618,30 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, array, base, containers, deepseq, directory - , filepath, hedgehog, hspec, hspec-hedgehog, mtl - , neat-interpolation, process, template-haskell, temporary, text - , type-errors-pretty, vector + ({ mkDerivation, array, base, bytestring, containers, criterion + , deepseq, directory, filepath, hedgehog, hspec, hspec-hedgehog + , mtl, neat-interpolation, process, template-haskell, temporary + , text, text-short, type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "2.1.0"; - sha256 = "1szkv27my46xgwqanhb6wkgncll08yznpl0p2m1wq5cifxir2m7h"; + version = "3.0.0"; + sha256 = "0zwz28w8fmz8lfwd5bzhysc43y5gfsa1px2xhlkxg5psy0j1935q"; libraryHaskellDepends = [ - array base containers deepseq directory filepath mtl process - template-haskell temporary text type-errors-pretty vector + array base bytestring containers deepseq directory filepath mtl + process template-haskell temporary text text-short + type-errors-pretty vector ]; testHaskellDepends = [ - array base containers deepseq directory filepath hedgehog hspec - hspec-hedgehog mtl neat-interpolation process template-haskell - temporary text type-errors-pretty vector + array base bytestring containers deepseq directory filepath + hedgehog hspec hspec-hedgehog mtl neat-interpolation process + template-haskell temporary text text-short type-errors-pretty + vector + ]; + benchmarkHaskellDepends = [ + array base bytestring containers criterion deepseq directory + filepath mtl process template-haskell temporary text text-short + type-errors-pretty vector ]; description = "Souffle Datalog bindings for Haskell"; license = lib.licenses.mit; @@ -245290,6 +244995,8 @@ self: { pname = "sparkle"; version = "0.7.4"; sha256 = "174rs21fgj43rq3nshzgff6mydi93n26nkcq9cadq0bzcasc2n3q"; + revision = "1"; + editedCabalFile = "1jwg12rmsa1il8y53ip535bjf02z7jnrnws1qi9y0xfpqblzmw6r"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal inline-java jvm-streaming ]; @@ -246226,6 +245933,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "splitmix-distributions" = callPackage + ({ mkDerivation, base, containers, erf, hspec, mtl, splitmix + , transformers + }: + mkDerivation { + pname = "splitmix-distributions"; + version = "0.7.0.0"; + sha256 = "1zidzdfyk0rc5hijai99i2k4vh1nlqp42l2m3z92d2qmqkk8nzdl"; + libraryHaskellDepends = [ + base containers erf mtl splitmix transformers + ]; + testHaskellDepends = [ base erf hspec mtl splitmix transformers ]; + description = "Random samplers for some common distributions, based on splitmix"; + license = lib.licenses.bsd3; + }) {}; + "splitter" = callPackage ({ mkDerivation, base, directory, filepath, parsec, range }: mkDerivation { @@ -246856,6 +246579,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "squeather_0_8_0_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hedgehog + , lifted-base, temporary, text + }: + mkDerivation { + pname = "squeather"; + version = "0.8.0.0"; + sha256 = "1pjiq97gq8rjp4v7cx2bhj7zcwkswc593fxdwqajssi1i39679r6"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring directory filepath hedgehog lifted-base temporary + text + ]; + description = "Use databases with the version 3 series of the SQLite C library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "squeeze" = callPackage ({ mkDerivation, base, Cabal, data-default, directory, extra , factory, filepath, mtl, QuickCheck, random, toolshed @@ -246934,23 +246675,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; - version = "0.5.1.2"; - sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6"; - libraryHaskellDepends = [ base ]; - description = "Data types for managing source code locations"; - license = lib.licenses.bsd3; - }) {}; - - "srcloc_0_6" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "srcloc"; version = "0.6"; sha256 = "1vcp9vgfi5rscy09l4qaq0pp426b6qcdpzs6kpbzg0k5x81kcsbb"; libraryHaskellDepends = [ base ]; description = "Data types for managing source code locations"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "srec" = callPackage @@ -250897,8 +250626,8 @@ self: { }: mkDerivation { pname = "streamly-archive"; - version = "0.0.1"; - sha256 = "055jcqndkzg14c2fvkncn9034bw60n8s8yjkkjx7kqrj9p0kp01a"; + version = "0.0.2"; + sha256 = "00cd5ssa5hi4pvc5li24z68f1k50h02frn4668gcrv8lr5kh6s50"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring streamly ]; librarySystemDepends = [ archive ]; @@ -250909,8 +250638,6 @@ self: { testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {archive = null;}; "streamly-binary" = callPackage @@ -251000,8 +250727,8 @@ self: { }: mkDerivation { pname = "streamly-lmdb"; - version = "0.2.0"; - sha256 = "1mkcnn7y4rwc8m0qvcqyw20jd7ax3nm455228fwp3yaslgw4mcvy"; + version = "0.2.1"; + sha256 = "08rj29i3vb4ahgrd2zhyi2sl1lk95s7vk020xx9mwzi8sbn0ay05"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -251011,8 +250738,6 @@ self: { testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) lmdb;}; "streamly-posix" = callPackage @@ -252109,25 +251834,6 @@ self: { }: mkDerivation { pname = "structs"; - version = "0.1.5"; - sha256 = "1qsj5w6g0lcvbrm0zs37f1yk3im1swhnb4j1mbpr3fyc3zswwbjf"; - libraryHaskellDepends = [ - base deepseq ghc-prim primitive template-haskell th-abstraction - ]; - testHaskellDepends = [ - base primitive QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Strict GC'd imperative object-oriented programming with cheap pointers"; - license = lib.licenses.bsd3; - }) {}; - - "structs_0_1_6" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , th-abstraction - }: - mkDerivation { - pname = "structs"; version = "0.1.6"; sha256 = "0wzbhsvix46aans0hdm11pvsigk1lxpdaha2sxslx0ip1xsdg0gk"; libraryHaskellDepends = [ @@ -252138,7 +251844,6 @@ self: { ]; description = "Strict GC'd imperative object-oriented programming with cheap pointers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "structural-induction" = callPackage @@ -255127,6 +254832,9 @@ self: { ]; description = "Control synthesizer effects via ALSA/MIDI"; license = "GPL"; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "synthesizer-core" = callPackage @@ -256015,6 +255723,9 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -257438,6 +257149,21 @@ self: { license = lib.licenses.mpl20; }) {}; + "tasty-inspection-testing" = callPackage + ({ mkDerivation, base, ghc, inspection-testing, tasty + , template-haskell + }: + mkDerivation { + pname = "tasty-inspection-testing"; + version = "0.1"; + sha256 = "18awafrclxg8lfw8gg4ndzfwwpaz8qmad23fi24rhpdj9c7xdyhw"; + libraryHaskellDepends = [ + base ghc inspection-testing tasty template-haskell + ]; + description = "Inspection testing support for tasty"; + license = lib.licenses.mit; + }) {}; + "tasty-integrate" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , deepseq, directory, either, haskell-src-exts @@ -259548,6 +259274,9 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; vte_291 = pkgs.vte;}; @@ -263259,6 +262988,26 @@ self: { broken = true; }) {}; + "tikzsd" = callPackage + ({ mkDerivation, array, base, containers, lens, mtl, parsec + , transformers + }: + mkDerivation { + pname = "tikzsd"; + version = "1.0.0"; + sha256 = "1y2pxbmm22dmrvgsqv2gvy3nf8vh3ln5pinrfsbim8qk1qfayina"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers lens mtl parsec transformers + ]; + executableHaskellDepends = [ + array base containers lens mtl parsec transformers + ]; + description = "A program for generating LaTeX code of string diagrams"; + license = lib.licenses.mit; + }) {}; + "tile" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -264559,16 +264308,18 @@ self: { "tlex" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , hspec, hspec-discover, QuickCheck, tlex-core + , enummapset-th, hspec, hspec-discover, QuickCheck, tlex-core }: mkDerivation { pname = "tlex"; - version = "0.2.0.0"; - sha256 = "0ad2zxlwrkpz2lgqp9lyj4aaq0nicj8vxfys0hn63cv23arwr0cc"; + version = "0.3.0.0"; + sha256 = "1sbs6zxa6x2isxvynlqjf8rgy0y1syr6svvgb22bj43qsg3p3vnx"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base containers tlex-core ]; + libraryHaskellDepends = [ + base containers enummapset-th tlex-core + ]; testHaskellDepends = [ - base containers doctest hspec QuickCheck tlex-core + base containers doctest enummapset-th hspec QuickCheck tlex-core ]; testToolDepends = [ hspec-discover ]; description = "A lexer generator"; @@ -264577,20 +264328,21 @@ self: { "tlex-core" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, containers - , doctest, hashable, hspec, hspec-discover, QuickCheck - , transformers, unordered-containers + , doctest, enummapset-th, hashable, hspec, hspec-discover + , QuickCheck, transformers, unordered-containers }: mkDerivation { pname = "tlex-core"; - version = "0.2.1.0"; - sha256 = "1qjzxsz7rl1fmfp1yzc2cdxjwz9nwjrxz6d18023cz41v1jympzq"; + version = "0.3.0.0"; + sha256 = "0nmxy35xxz6d2i7hcci68cwv9fm1ffsg00n9minaqgkwcyrk2qba"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - array base containers hashable transformers unordered-containers + array base containers enummapset-th hashable transformers + unordered-containers ]; testHaskellDepends = [ - array base containers doctest hashable hspec QuickCheck - transformers unordered-containers + array base containers doctest enummapset-th hashable hspec + QuickCheck transformers unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "A lexer generator"; @@ -264599,20 +264351,20 @@ self: { "tlex-debug" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest - , hspec, hspec-discover, QuickCheck, tlex, tlex-core + , enummapset-th, hspec, hspec-discover, QuickCheck, tlex, tlex-core , unordered-containers }: mkDerivation { pname = "tlex-debug"; - version = "0.2.0.0"; - sha256 = "0qj1wcdg9spf7vfwmpkqp5z74qzh9xkb4m6gv0v015krr8qvwc01"; + version = "0.3.0.0"; + sha256 = "012554saxmnqfm1rvgjgzn7aakvp1ai95xpavr6b3h1pqy63md6s"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base containers tlex tlex-core unordered-containers + base containers enummapset-th tlex tlex-core unordered-containers ]; testHaskellDepends = [ - base containers doctest hspec QuickCheck tlex tlex-core - unordered-containers + base containers doctest enummapset-th hspec QuickCheck tlex + tlex-core unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Debug utilities for Tlex"; @@ -264621,16 +264373,20 @@ self: { "tlex-encoding" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, charset, containers - , doctest, hspec, hspec-discover, QuickCheck, tlex, tlex-core + , doctest, enummapset-th, hspec, hspec-discover, QuickCheck, tlex + , tlex-core }: mkDerivation { pname = "tlex-encoding"; - version = "0.2.0.0"; - sha256 = "0krisx0fh85dccgcw6y1b3b1q2brwqz75hqg6r7w39rn0w7b5xm7"; + version = "0.3.0.0"; + sha256 = "1ip1zfjfn5jw817i4q8cav98d261jq7h00qaxfsmkcv7kqiqzbac"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base charset containers tlex tlex-core ]; + libraryHaskellDepends = [ + base charset containers enummapset-th tlex tlex-core + ]; testHaskellDepends = [ - base charset containers doctest hspec QuickCheck tlex tlex-core + base charset containers doctest enummapset-th hspec QuickCheck tlex + tlex-core ]; testToolDepends = [ hspec-discover ]; description = "Encoding plugin for Tlex"; @@ -264639,20 +264395,21 @@ self: { "tlex-th" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, containers - , doctest, ghc-prim, hspec, hspec-discover, QuickCheck - , template-haskell, tlex, tlex-core + , doctest, enummapset-th, ghc-prim, hspec, hspec-discover + , QuickCheck, template-haskell, tlex, tlex-core }: mkDerivation { pname = "tlex-th"; - version = "0.2.0.1"; - sha256 = "19hlj81rxnki90imiz4zjklfl4ffbpkkd9iycq4wbj92i9vw4n8v"; + version = "0.3.0.0"; + sha256 = "1fhp2md3v2n51irivgdij5zdql1lx8iay9yvsrmj9nhvlfjq2b4g"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - array base containers ghc-prim template-haskell tlex tlex-core + array base containers enummapset-th ghc-prim template-haskell tlex + tlex-core ]; testHaskellDepends = [ - array base containers doctest ghc-prim hspec QuickCheck - template-haskell tlex tlex-core + array base containers doctest enummapset-th ghc-prim hspec + QuickCheck template-haskell tlex tlex-core ]; testToolDepends = [ hspec-discover ]; description = "TemplateHaskell plugin for Tlex"; @@ -267814,8 +267571,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "trivial-constraint"; - version = "0.6.0.0"; - sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5"; + version = "0.7.0.0"; + sha256 = "0kyjifqfjf4lmrba4fb65m82s8qqv2nld9lj0qvh2qxc8bfw4hj7"; libraryHaskellDepends = [ base ]; description = "Constraints that any type, resp. no type fulfills"; license = lib.licenses.gpl3Only; @@ -272135,6 +271892,53 @@ self: { license = lib.licenses.bsd3; }) {}; + "uniform-algebras" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "uniform-algebras"; + version = "0.1.0"; + sha256 = "19grz10hagzi8x9am59i6jifm1zjf31698k8r4l7bbhyww4w6p91"; + libraryHaskellDepends = [ base ]; + description = "Pointless functions and a simplistic zero and monoid"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniform-error" = callPackage + ({ mkDerivation, base, monads-tf, safe, uniform-strings }: + mkDerivation { + pname = "uniform-error"; + version = "0.1.0"; + sha256 = "1ap8wrnh08yvv9hwd92mp1g5fz4g7l0aij1h0hfl3j7ijd028pmx"; + libraryHaskellDepends = [ base monads-tf safe uniform-strings ]; + description = "Handling errors in the uniform framework"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniform-fileio" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, exceptions + , filepath, HTF, monads-tf, path, path-io, pipes, pureMD5 + , quickcheck-text, safe, test-invariant, text, uniform-algebras + , uniform-error, uniform-strings, uniform-time, unix, zlib + }: + mkDerivation { + pname = "uniform-fileio"; + version = "0.1.0"; + sha256 = "0rxhjn4qv2dbdycdfqblymyfj3wax586ar77zwdgkyld7v7s12ya"; + libraryHaskellDepends = [ + base bytestring deepseq directory exceptions filepath monads-tf + path path-io pipes pureMD5 safe text uniform-algebras uniform-error + uniform-strings uniform-time unix zlib + ]; + testHaskellDepends = [ + base bytestring deepseq directory exceptions filepath HTF monads-tf + path path-io pipes pureMD5 quickcheck-text safe test-invariant text + uniform-algebras uniform-error uniform-strings uniform-time unix + zlib + ]; + description = "Uniform file handling operations"; + license = lib.licenses.gpl2Only; + }) {}; + "uniform-io" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal , data-default-class, interruptible, iproute, monad-control @@ -272172,6 +271976,55 @@ self: { license = lib.licenses.bsd3; }) {}; + "uniform-strings" = callPackage + ({ mkDerivation, base, bytestring, MissingH, monads-tf, network-uri + , pretty-show, safe, snap-core, split, text, text-icu + , uniform-algebras + }: + mkDerivation { + pname = "uniform-strings"; + version = "0.1.0"; + sha256 = "17w04fxx81gk02xl7ca64amc0hb06i77fbanhykp3qd70nd2k8ix"; + libraryHaskellDepends = [ + base bytestring MissingH monads-tf network-uri pretty-show safe + snap-core split text text-icu uniform-algebras + ]; + description = "Manipulate and convert strings of characters uniformly and consistently"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniform-time" = callPackage + ({ mkDerivation, base, convertible, monads-tf, time + , uniform-algebras, uniform-error, uniform-strings + }: + mkDerivation { + pname = "uniform-time"; + version = "0.1.0"; + sha256 = "08p40xl4zzswhax3i6j4ps0zy2m9qsbcpj4b00xvizc3g9fxnzsh"; + libraryHaskellDepends = [ + base convertible monads-tf time uniform-algebras uniform-error + uniform-strings + ]; + description = "Time in the uniform framework"; + license = lib.licenses.gpl2Only; + }) {}; + + "uniformBase" = callPackage + ({ mkDerivation, base, uniform-algebras, uniform-error + , uniform-fileio, uniform-strings, uniform-time + }: + mkDerivation { + pname = "uniformBase"; + version = "0.1.0"; + sha256 = "1ya87jzfmzldd66rwxrccidkrpknqws5rslq9zdsjcdngn2w0sa9"; + libraryHaskellDepends = [ + base uniform-algebras uniform-error uniform-fileio uniform-strings + uniform-time + ]; + description = "A uniform base to build apps on"; + license = lib.licenses.gpl2Only; + }) {}; + "union" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, lens , profunctors, tagged, vinyl @@ -273151,6 +273004,32 @@ self: { license = lib.licenses.mit; }) {}; + "unliftio_0_2_15" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.2.15"; + sha256 = "08yclgvk6slaisqc08b8bblh4fl77qicj0w90l46q419ya3drixd"; + libraryHaskellDepends = [ + async base bytestring deepseq directory filepath process stm time + transformers unix unliftio-core + ]; + testHaskellDepends = [ + async base bytestring containers deepseq directory filepath hspec + process QuickCheck stm time transformers unix unliftio-core + ]; + benchmarkHaskellDepends = [ + async base bytestring deepseq directory filepath gauge process stm + time transformers unix unliftio-core + ]; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -275034,8 +274913,8 @@ self: { }: mkDerivation { pname = "uuid"; - version = "1.3.14"; - sha256 = "1msj296faldr9fiwjqi9ixx3xl638mg6ffk7axic14wf8b9zw73a"; + version = "1.3.15"; + sha256 = "0r05h16gd7fgfpq9iz43jcn9jzrgfa0gk4cv1xy0p4rli66rb1gq"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -275145,18 +275024,19 @@ self: { "uuid-types" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder , hashable, QuickCheck, random, tasty, tasty-hunit - , tasty-quickcheck, text + , tasty-quickcheck, template-haskell, text }: mkDerivation { pname = "uuid-types"; - version = "1.0.4"; - sha256 = "01pc93z6in6g717mxkhl111qc842fz1c2z7ml6n5jhm7lg52ran2"; + version = "1.0.5"; + sha256 = "1pd7xd6inkmmwjscf7pmiwqjks9y0gi1p8ahqbapvh34gadvhs5d"; libraryHaskellDepends = [ - base binary bytestring deepseq hashable random text + base binary bytestring deepseq hashable random template-haskell + text ]; testHaskellDepends = [ base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit - tasty-quickcheck + tasty-quickcheck template-haskell ]; description = "Type definitions for Universally Unique Identifiers"; license = lib.licenses.bsd3; @@ -278106,6 +277986,9 @@ self: { executableSystemDepends = [ quat vrpn ]; description = "Bindings to VRPN"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {quat = null; inherit (pkgs) vrpn;}; "vt-utils" = callPackage @@ -278290,7 +278173,7 @@ self: { libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = lib.licenses.bsd3; - platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -278325,6 +278208,9 @@ self: { testHaskellDepends = [ base doctest ]; description = "Utils for the vulkan package"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "waargonaut" = callPackage @@ -279800,8 +279686,8 @@ self: { }: mkDerivation { pname = "wai-middleware-validation"; - version = "0.1.0.0"; - sha256 = "0cbp32j31xkmniml56gnh278g94zhhfc8xlp842n8lll5hh13bf4"; + version = "0.1.0.2"; + sha256 = "1qrkfy31slmlbiw9gkz96yd9q6mrw72rjyjl0a5pnjif5ps12vpq"; libraryHaskellDepends = [ aeson base bytestring containers filepath http-types insert-ordered-containers lens openapi3 text wai @@ -281851,6 +281737,9 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) webkitgtk;}; "webkitgtk3" = callPackage @@ -282985,29 +282874,13 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec - , template-haskell, text - }: - mkDerivation { - pname = "witch"; - version = "0.2.0.2"; - sha256 = "13y5zbs9lwniamwq2cm45rsc7xp11ny2m7x3f965qd6az66ds396"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text - ]; - testHaskellDepends = [ base bytestring containers hspec text ]; - description = "Convert values from one type into another"; - license = lib.licenses.isc; - }) {}; - - "witch_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck , template-haskell, text }: mkDerivation { pname = "witch"; - version = "0.2.1.0"; - sha256 = "0zvq9axjmqksk4fqq42qgbj4whx27p4m40cgvdqmq4vpj4csvswl"; + version = "0.2.1.1"; + sha256 = "0z3c7ni1sd4mqv2v35sj2qls9bdkkk3sclpclxll420b7qbicf1r"; libraryHaskellDepends = [ base bytestring containers template-haskell text ]; @@ -283016,7 +282889,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "with-index" = callPackage @@ -285390,6 +285262,7 @@ self: { executableSystemDepends = [ xgboost ]; description = "XGBoost library for Haskell"; license = lib.licenses.mit; + platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) xgboost;}; "xhaskell-library" = callPackage @@ -286793,6 +286666,9 @@ self: { ]; description = "Third party extensions for xmonad with wacky dependencies"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "xmonad-screenshot" = callPackage @@ -286870,6 +286746,9 @@ self: { ]; description = "XMonad volume controls"; license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "xmonad-wallpaper" = callPackage @@ -289956,8 +289835,6 @@ self: { ]; description = "Simple display of media types, served by yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yesod-newsfeed" = callPackage @@ -290094,6 +289971,28 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-persistent_1_6_0_7" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.6.0.7"; + sha256 = "102xmp7n08sk1g5rv31jpln2v9kqf1zsqsnmi83mnhmgggcbj1k4"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + description = "Some helpers for using Persistent from Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate @@ -290875,8 +290774,6 @@ self: { ]; description = "Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-contrib" = callPackage @@ -290927,8 +290824,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-dynamic-configuration" = callPackage @@ -290945,8 +290840,6 @@ self: { ]; description = "Dynamic configuration support for Yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-emacs-colours" = callPackage @@ -290958,8 +290851,6 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-frontend-pango" = callPackage @@ -290979,8 +290870,6 @@ self: { ]; description = "Pango frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-frontend-vty" = callPackage @@ -290998,8 +290887,6 @@ self: { ]; description = "Vty frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-fuzzy-open" = callPackage @@ -291018,8 +290905,6 @@ self: { ]; description = "Fuzzy open plugin for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-gtk" = callPackage @@ -291047,8 +290932,6 @@ self: { ]; description = "Yi editor incremental reader"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-keymap-cua" = callPackage @@ -291064,8 +290947,6 @@ self: { ]; description = "Cua keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-keymap-emacs" = callPackage @@ -291083,8 +290964,6 @@ self: { ]; description = "Emacs keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-keymap-vim" = callPackage @@ -291111,8 +290990,6 @@ self: { ]; description = "Vim keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-language" = callPackage @@ -291140,8 +291017,6 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-misc-modes" = callPackage @@ -291159,8 +291034,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-mode-haskell" = callPackage @@ -291178,8 +291051,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-mode-javascript" = callPackage @@ -291198,8 +291069,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-monokai" = callPackage @@ -291252,8 +291121,6 @@ self: { ]; description = "Snippet support for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-solarized" = callPackage diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 1537cd6466cdb..b0d036e0e3e81 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -196,6 +196,16 @@ rec { appendPatch = drv: x: appendPatches drv [x]; appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; }); + /* Set a specific build target instead of compiling all targets in the package. + * For example, imagine we have a .cabal file with a library, and 2 executables "dev" and "server". + * We can build only "server" and not wait on the compilation of "dev" by using setBuildTarget as follows: + * + * setBuildTarget (callCabal2nix "thePackageName" thePackageSrc {}) "server" + * + */ + setBuildTargets = drv: xs: overrideCabal drv (drv: { buildTarget = lib.concatStringsSep " " xs; }); + setBuildTarget = drv: x: setBuildTargets drv [x]; + doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 2641892672af5..5d178e3b5a1b1 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -249,7 +249,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # a cabal flag with '--flag=myflag'. developPackage = { root - , name ? builtins.baseNameOf root + , name ? if builtins.typeOf root == "path" then builtins.baseNameOf root else "" , source-overrides ? {} , overrides ? self: super: {} , modifier ? drv: drv diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 86123d8a70f4b..1882d68f23437 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -11,6 +11,10 @@ self: super: { ldgallery-compiler = self.callPackage ../../tools/graphics/ldgallery/compiler { }; + # Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated + # from the latest master instead of the current version on Hackage. + cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { }; + # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; diff --git a/pkgs/development/haskell-modules/patches/hnix-ref-tf-0.5-support.patch b/pkgs/development/haskell-modules/patches/hnix-ref-tf-0.5-support.patch new file mode 100644 index 0000000000000..5a4d0446e7136 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hnix-ref-tf-0.5-support.patch @@ -0,0 +1,34 @@ +diff '--color=auto' '--color=never' -r --unified hnix-0.12.0.1/hnix.cabal hnix-patched/hnix.cabal +--- hnix-0.12.0.1/hnix.cabal 2001-09-09 03:46:40.000000000 +0200 ++++ hnix-patched/hnix.cabal 2021-05-05 12:07:38.388267353 +0200 +@@ -430,7 +430,7 @@ + , parser-combinators >= 1.0.1 && < 1.3 + , prettyprinter >= 1.7.0 && < 1.8 + , process >= 1.6.3 && < 1.7 +- , ref-tf >= 0.4.0 && < 0.5 ++ , ref-tf >= 0.5 + , regex-tdfa >= 1.2.3 && < 1.4 + , scientific >= 0.3.6 && < 0.4 + , semialign >= 1 && < 1.2 +diff '--color=auto' '--color=never' -r --unified hnix-0.12.0.1/src/Nix/Fresh.hs hnix-patched/src/Nix/Fresh.hs +--- hnix-0.12.0.1/src/Nix/Fresh.hs 2001-09-09 03:46:40.000000000 +0200 ++++ hnix-patched/src/Nix/Fresh.hs 2021-05-05 12:07:45.841267497 +0200 +@@ -65,18 +65,3 @@ + + runFreshIdT :: Functor m => Var m i -> FreshIdT i m a -> m a + runFreshIdT i m = runReaderT (unFreshIdT m) i +- +--- Orphan instance needed by Infer.hs and Lint.hs +- +--- Since there's no forking, it's automatically atomic. +-instance MonadAtomicRef (ST s) where +- atomicModifyRef r f = do +- v <- readRef r +- let (a, b) = f v +- writeRef r a +- return b +- atomicModifyRef' r f = do +- v <- readRef r +- let (a, b) = f v +- writeRef r $! a +- return b diff --git a/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch b/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch new file mode 100644 index 0000000000000..33c276926f4bd --- /dev/null +++ b/pkgs/development/haskell-modules/patches/jsaddle-webkit2gtk.patch @@ -0,0 +1,65 @@ +From 09f44aa3271390c14f92a3f196ab2ba475b4907f Mon Sep 17 00:00:00 2001 +From: Malte Brandy <malte.brandy@maralorn.de> +Date: Fri, 14 Aug 2020 17:52:28 +0200 +Subject: [PATCH 1/2] jsaddle-webkit2gtk: Bump haskell-gi-base upper bound + +--- + jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal b/jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal +index 93d0b77..60c2312 100644 +--- a/jsaddle-webkit2gtk.cabal ++++ b/jsaddle-webkit2gtk.cabal +@@ -35,7 +35,7 @@ library + gi-gtk >=3.0.17 && <3.1, + gi-webkit2 >=4.0.14 && <4.1, + gi-javascriptcore >=4.0.14 && <4.1, +- haskell-gi-base >=0.20 && <0.24, ++ haskell-gi-base >=0.20 && <0.26, + haskell-gi-overloading >=0.0 && < 2.0, + jsaddle >=0.9.4.0 && <0.10, + text >=1.2.1.3 && <1.3, + +From f8427480ca827b2bee1d9b33dfa6118e14fe2924 Mon Sep 17 00:00:00 2001 +From: Malte Brandy <malte.brandy@maralorn.de> +Date: Fri, 14 Aug 2020 18:10:26 +0200 +Subject: [PATCH 2/2] Locally define noAdjustment and noCancellable + +Those two convenience definitions disappeared from gi-gio and gi-gtk in +newer versions. +--- + .../src/Language/Javascript/JSaddle/WebKitGTK.hs | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs b/jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs +index 898dac2..5249477 100644 +--- a/src/Language/Javascript/JSaddle/WebKitGTK.hs ++++ b/src/Language/Javascript/JSaddle/WebKitGTK.hs +@@ -55,11 +55,11 @@ import GI.GLib (timeoutAdd, idleAdd, pattern PRIORITY_HIGH, pattern PRIORITY_DEF + import qualified GI.Gtk as Gtk (main, init) + import GI.Gtk + (windowSetPosition, windowSetDefaultSize, windowNew, +- scrolledWindowNew, noAdjustment, containerAdd, ++ scrolledWindowNew, Adjustment, containerAdd, + WindowType(..), WindowPosition(..), widgetDestroy, + widgetGetToplevel, widgetShowAll, onWidgetDestroy, + mainQuit) +-import GI.Gio (noCancellable) ++import GI.Gio (Cancellable) + import GI.JavaScriptCore (valueToString) + import GI.WebKit2 + (scriptDialogPromptSetText, scriptDialogPromptGetDefaultText, +@@ -82,6 +82,12 @@ import Language.Javascript.JSaddle (JSM, Results, Batch) + import Language.Javascript.JSaddle.Run (runJavaScript) + import Language.Javascript.JSaddle.Run.Files (initState, runBatch, ghcjsHelpers) + ++noAdjustment :: Maybe Adjustment ++noAdjustment = Nothing ++ ++noCancellable :: Maybe Cancellable ++noCancellable = Nothing ++ + quitWebView :: WebView -> IO () + quitWebView wv = postGUIAsync $ do w <- widgetGetToplevel wv --TODO: Shouldn't this be postGUISync? + widgetDestroy w diff --git a/pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch b/pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch new file mode 100644 index 0000000000000..39c1f98298b3a --- /dev/null +++ b/pkgs/development/haskell-modules/patches/phonetic-languages-phonetics-basics-haddock.patch @@ -0,0 +1,46 @@ +diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs +--- phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-04-30 17:45:52.000000000 +0200 ++++ phonetic-languages-phonetics-basics-0.5.1.0/Data/Phonetic/Languages/SpecificationsRead.hs 2021-05-08 18:16:15.054951952 +0200 +@@ -1,11 +1,11 @@ +--- | +--- Module : Data.Phonetic.Languages.SpecificationsRead +--- Copyright : (c) OleksandrZhabenko 2021 +--- License : MIT +--- Stability : Experimental +--- Maintainer : olexandr543@yahoo.com +--- +-{-| Provides functions to read data specifications for other modules from textual files. ++{-| ++Module : Data.Phonetic.Languages.SpecificationsRead ++Copyright : (c) OleksandrZhabenko 2021 ++License : MIT ++Stability : Experimental ++Maintainer : olexandr543@yahoo.com ++ ++Provides functions to read data specifications for other modules from textual files. + -} + + module Data.Phonetic.Languages.SpecificationsRead where +diff -ru phonetic-languages-phonetics-basics-0.5.1.0/Main.hs phonetic-languages-phonetics-basics-0.5.1.0/Main.hs +--- phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-04-30 17:45:52.000000000 +0200 ++++ phonetic-languages-phonetics-basics-0.5.1.0/Main.hs 2021-05-08 18:14:06.344145599 +0200 +@@ -1,11 +1,11 @@ +--- | +--- Module : Main +--- Copyright : (c) OleksandrZhabenko 2020-2021 +--- License : MIT +--- Stability : Experimental +--- Maintainer : olexandr543@yahoo.com +--- +-{-| Can be used to calculate the durations of the approximations of the phonemes ++{-| ++Module : Main ++Copyright : (c) OleksandrZhabenko 2020-2021 ++License : MIT ++Stability : Experimental ++Maintainer : olexandr543@yahoo.com ++ ++Can be used to calculate the durations of the approximations of the phonemes + using some prepared text with its correct (at least mostly) pronunciation. + The prepared text is located in the same directory and contains lines -the + phonetic language word and its duration in seconds separated with whitespace. diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 0e566aa2e6e4d..fdcd40fc99b0e 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,5 +1,5 @@ { lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper -, withLLVM ? false +, withLLVM ? !(stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isPowerPC) , postBuild ? "" , ghcLibdir ? null # only used by ghcjs, when resolving plugins }: diff --git a/pkgs/development/idris-modules/data.nix b/pkgs/development/idris-modules/data.nix deleted file mode 100644 index 0517edec2d240..0000000000000 --- a/pkgs/development/idris-modules/data.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ build-idris-package -, fetchFromGitHub -, contrib -, lib -}: -build-idris-package { - name = "data"; - version = "2018-03-19"; - - idrisDeps = [ contrib ]; - - src = fetchFromGitHub { - owner = "jdevuyst"; - repo = "idris-data"; - rev = "105b78ac13235edc596287367a675d7cd04ce5d5"; - sha256 = "17wz4jddan39984qibx2x7nv2zkqznv0fpab20nrm4zgy17v77ii"; - }; - - meta = { - description = "Functional data structures in Idris"; - homepage = "https://github.com/jdevuyst/idris-data"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.brainrape ]; - }; -} diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 7011a513c1012..d6fb1ac78bd6d 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -75,8 +75,6 @@ cube = callPackage ./cube.nix {}; - data = callPackage ./data.nix {}; - derive = callPackage ./derive.nix {}; descncrunch = callPackage ./descncrunch.nix {}; diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index 943db9e87a0fd..2e06b0368255a 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -12,8 +12,11 @@ build-idris-package rec { idrisDeps = [ effects ]; - extraBuildInputs = [ + nativeBuildInputs = [ pkg-config + ]; + + extraBuildInputs = [ SDL2 SDL2_gfx ]; @@ -24,7 +27,7 @@ build-idris-package rec { owner = "steshaw"; repo = "idris-sdl2"; rev = version; - sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; + sha256 = "1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a"; }; meta = { diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index ecac643f1ea96..2b14c9b489d29 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -11,12 +11,16 @@ stdenv.mkDerivation { sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf"; }; + # -Wnarrowing is enabled by default in recent GCC versions, + # causing compilation to fail. + NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre zlib sqlite ]; meta = with lib; { description = "Programming language with macros and syntax at once"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 9ae373ff7a81e..abfa74bb67d36 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { "-Wno-error=class-memaccess" "-Wno-error=restrict" "-Wno-error=format-truncation" + # Needed with GCC 10 + "-Wno-error=maybe-uninitialized" ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); patchPhase = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix deleted file mode 100644 index 4892e0b8abef0..0000000000000 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }: - -stdenv.mkDerivation { - pname = "spidermonkey"; - version = "1.8.5"; - - src = fetchurl { - url = "mirror://mozilla/js/js185-1.0.0.tar.gz"; - sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"; - }; - - propagatedBuildInputs = [ nspr ]; - - nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213; - buildInputs = [ perl python2 zip ]; - - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - export LIBXUL_DIST=$out - ${lib.optionalString stdenv.isAarch32 "autoreconf --verbose --force"} - ''; - - patches = [ - (fetchpatch { - name = "gcc6.patch"; - url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch"; - sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99"; - }) - ] ++ lib.optionals stdenv.isAarch32 [ - # Explained below in configureFlags for ARM - ./1.8.5-findvanilla.patch - # Fix for hard float flags. - ./1.8.5-arm-flags.patch - ]; - - patchFlags = [ "-p3" ]; - - # fixes build on gcc8 - postPatch = '' - substituteInPlace ./methodjit/MethodJIT.cpp \ - --replace 'asm volatile' 'asm' - ''; - - # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in - # "make check". Disabling tracejit makes it work, but then it needs the - # patch findvanilla.patch do disable a checker about allocator safety. In case - # of polkit, which is what matters most, it does not override the allocator - # so the failure of that test does not matter much. - configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ - lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [ - "--with-cpu-arch=armv5t" - "--disable-tracejit" ]; - - # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 - preBuild = '' - touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl} - ${if stdenv.isAarch32 then "rm -r jit-test/tests/jaeger/bug563000" else ""} - ''; - - enableParallelBuilding = true; - - doCheck = true; - - preCheck = '' - rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 - ''; - - meta = with lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; - # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - broken = stdenv.isAarch64; # 2018-08-21, broken since 2017-03-08 - }; -} - diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index f144f847bcf03..5743a18c0fd0c 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,23 +1,27 @@ { lib, stdenv , fetchurl , gtk3 +, meson +, ninja , pkg-config , gobject-introspection -, gnome3 +, gnome , dbus -, xvfb_run +, xvfb-run }: stdenv.mkDerivation rec { pname = "amtk"; - version = "5.2.0"; + version = "5.3.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2"; + sha256 = "12v3nj1bb7507ndprjggq0hpz8k719b4bwvl8sm43p3ibmn27anm"; }; nativeBuildInputs = [ + meson + ninja pkg-config dbus gobject-introspection @@ -30,12 +34,15 @@ stdenv.mkDerivation rec { doCheck = stdenv.isLinux; checkPhase = '' export NO_AT_BRIDGE=1 - ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - make check + meson test --print-errorlogs ''; - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Amtk"; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 136ffb79804ae..79c1715c61d75 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { - sha256 = "sha256-Q9PzqJC/+uhcbxAC6c+VD8wf0X8/XlXcO4XTnQni4yM="; + sha256 = "sha256-IS/soe5Lx1C+/UWnNcv+8AwMmu5FHvURbpkTMMGrEFs="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 1cd9fb2c8b769..64c0b031e47de 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lethalman matthewbauer ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 6fa4a6e0a4ab6..96c6b36239837 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,20 +1,40 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext -, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt -, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection -, pcre, itstool, gperf, vala, lmdb, libsoup +{ lib +, stdenv +, substituteAll +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gettext +, xmlto +, docbook-xsl-nons +, docbook_xml_dtd_45 +, libxslt +, libstemmer +, glib +, xapian +, libxml2 +, libyaml +, gobject-introspection +, pcre +, itstool +, gperf +, vala +, lmdb +, curl }: stdenv.mkDerivation rec { pname = "appstream"; - version = "0.14.0"; + version = "0.14.3"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = "ximion"; - repo = "appstream"; - rev = "v${version}"; - sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q="; + owner = "ximion"; + repo = "appstream"; + rev = "v${version}"; + sha256 = "sha256-wCQR+4/F5lVqWHHcH/WS4irBGRivz3c1imasyLDIZIs="; }; patches = [ @@ -26,12 +46,30 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkg-config gettext - libxslt xmlto docbook_xsl docbook_xml_dtd_45 - gobject-introspection itstool vala + meson + ninja + pkg-config + gettext + libxslt + xmlto + docbook-xsl-nons + docbook_xml_dtd_45 + gobject-introspection + itstool + vala ]; - buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ]; + buildInputs = [ + libstemmer + pcre + glib + xapian + libxml2 + libyaml + gperf + lmdb + curl + ]; mesonFlags = [ "-Dapidocs=false" @@ -41,14 +79,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software metadata handling library"; - homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; + homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides specifications for meta-information which is shipped by upstream projects and can be consumed by other software. ''; - license = licenses.lgpl21Plus; - platforms = platforms.unix; + license = licenses.lgpl21Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index a915723e2ca7a..67e621ad85979 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -6,7 +6,7 @@ , gst-plugins-good ? null , gst-plugins-bad ? null , libnotify ? null -, gnome3 ? null +, gnome ? null , gtk3 ? null , enableUsb ? true , enablePacketSocket ? true @@ -26,7 +26,7 @@ in assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableViewer -> enableGstPlugin; assert enableViewer -> libnotify != null; - assert enableViewer -> gnome3 != null; + assert enableViewer -> gnome != null; assert enableViewer -> gtk3 != null; assert enableViewer -> gstreamerAtLeastVersion1; @@ -56,7 +56,7 @@ in ++ lib.optional enableUsb libusb1 ++ lib.optional enablePacketSocket audit ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; + ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome.adwaita-icon-theme ]; preAutoreconf = "./autogen.sh"; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 1e5a1d3fd64c8..7989cfd857776 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -11,7 +11,7 @@ , glib , libxml2 -, gnome3 # To pass updateScript +, gnome # To pass updateScript }: stdenv.mkDerivation rec { @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "No test data file provided" passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 7e1181cf3bdf1..4e85c7a92a640 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -14,23 +14,25 @@ , libX11 , libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case , libXi +, libXext -, gnome3 # To pass updateScript +, gnome # To pass updateScript }: stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.38.0"; + version = "2.40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU="; + sha256 = "0miqn8531czy9ffpxnsxsnk12w3d6sqjda3qyix8kns2xsjf6rlz"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ]; - buildInputs = [ libX11 libXtst libXi ]; + # libXext is a transitive dependency of libXi + buildInputs = [ libX11 libXtst libXi libXext ]; # In atspi-2.pc dbus-1 glib-2.0 propagatedBuildInputs = [ dbus glib ]; @@ -43,8 +45,9 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 53eb4459770dc..7961211dc63e9 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib -, fixDarwinDylibNames, gobject-introspection, gnome3 +, fixDarwinDylibNames, gobject-introspection, gnome }: let @@ -34,8 +34,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index e9c63eb650f73..b357ed0472592 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }: +{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome }: stdenv.mkDerivation rec { pname = "atkmm"; @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index dd54ba79db721..a52d1be566e68 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,6 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv, writeShellScriptBin, libevent +, nixosTests , gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false @@ -77,6 +78,11 @@ stdenv.mkDerivation rec { ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc */ + passthru.tests = { + smoke-test = nixosTests.avahi; + smoke-test-resolved = nixosTests.avahi-with-resolved; + }; + meta = with lib; { description = "mDNS/DNS-SD implementation"; homepage = "http://avahi.org"; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 95d54993e0699..faee853808ccb 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -3,7 +3,7 @@ , autoconf , automake , libtool -, gnome3 +, gnome , which , fetchgit , libgtop @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { automake dbus docbook_xsl - gnome3.gnome-common + gnome.gnome-common gobject-introspection gtk-doc libtool diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 0f8a61bed244b..76a3b96533cd9 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.5.1"; + version = "4.5.3"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0d1wf0jv9lb0s6r49i9gz5nrx8jzpkx558hywll7idma9d0mr61p"; + sha256 = "sha256-N5hcQUuqtngo5R6iUvq8X6KebfkvxUSy0WDRtCVwPDQ="; }; nativeBuildInputs = [ antlr3_4 cmake ]; diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index b698cf7b404d2..5236c92527e24 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.5.1"; + version = "4.5.10"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1a500ncgznwha0j3c27ak3p4jh5jm6fnnb531k7c0a4i91745agj"; + sha256 = "sha256-8qlCTkiRKMDODKMsa52pskBJ7pjqCDYkUJDb/5gFoKg="; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix new file mode 100644 index 0000000000000..2beeb71e5e354 --- /dev/null +++ b/pkgs/development/libraries/cairomm/1.16.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchurl +, boost +, meson +, ninja +, pkg-config +, cairo +, fontconfig +, libsigcxx30 +}: + +stdenv.mkDerivation rec { + pname = "cairomm"; + version = "1.16.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz"; + sha256 = "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + boost # for tests + fontconfig + ]; + + propagatedBuildInputs = [ + cairo + libsigcxx30 + ]; + + mesonFlags = [ + "-Dbuild-tests=true" + "-Dboost-shared=true" + ]; + + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; + + doCheck = true; + + meta = with lib; { + description = "A 2D graphics library with support for multiple output devices"; + longDescription = '' + Cairo is a 2D graphics library with support for multiple output + devices. Currently supported output targets include the X + Window System, Quartz, Win32, image buffers, PostScript, PDF, + and SVG file output. Experimental backends include OpenGL + (through glitz), XCB, BeOS, OS/2, and DirectFB. + + Cairo is designed to produce consistent output on all output + media while taking advantage of display hardware acceleration + when available (e.g., through the X Render Extension). + ''; + homepage = "https://www.cairographics.org/"; + license = with licenses; [ lgpl2Plus mpl10 ]; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 166d4e12c2525..e4752c7748be9 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: +{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lethalman ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 0dfb8c7b9df0b..7573da66c0d8c 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, meson, ninja -, gobject-introspection, clutter, gtk3, gnome3 }: +, gobject-introspection, clutter, gtk3, gnome }: let pname = "clutter-gtk"; @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { description = "Clutter-GTK"; homepage = "http://www.clutter-project.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lethalman ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 002db004dc190..aacb8581c8fcf 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib -, gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon +, gobject-introspection, gtk3, gnome, libinput, libgudev, libxkbcommon }: let @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { #doCheck = true; # no tests possible without a display passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; homepage = "http://www.clutter-project.org/"; - maintainers = with lib.maintainers; [ lethalman ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 8fd1520728794..75ec2a2acc7f7 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl -, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 +, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome , mesa, automake, autoconf , gstreamerSupport ? true, gst_all_1 }: @@ -59,8 +59,9 @@ in stdenv.mkDerivation rec { #doCheck = true; # all tests fail (no idea why) passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 69380c2eeeb4c..634c2cf44cf41 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = "http://ctpl.tuxfamily.org/"; description = "Template engine library written in C"; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index fd7df4d5ba379..e9543fd95f93d 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { description = "Simple interprocess messaging system"; homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; license = licenses.gpl2Plus; # most is also under AFL-2.1 - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 6834a605f1a55..550940f5a1e78 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -9,7 +9,7 @@ , glib , bash-completion , dbus -, gnome3 +, gnome , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_42 @@ -19,14 +19,14 @@ let in stdenv.mkDerivation rec { pname = "dconf"; - version = "0.38.0"; + version = "0.40.0"; outputs = [ "out" "lib" "dev" ] ++ lib.optional (!isCross) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5"; + sha256 = "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg"; }; nativeBuildInputs = [ @@ -61,8 +61,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 3d46028ec4388..a023d164d8c3a 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/dee"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar worldofpeace ]; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index c930adbe9b2dd..6cd651e66ebb8 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,11 +1,10 @@ { fetchurl , lib, stdenv , pkg-config -, fetchpatch , meson , ninja , glib -, gnome3 +, gnome , nspr , gettext , gobject-introspection @@ -18,6 +17,7 @@ , dbus , libgee , evolution-data-server +, libgdata , libsecret , db , python3 @@ -34,29 +34,15 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.14.0"; + version = "0.15.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; + sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg"; }; - patches = [ - # Fix tests with e-d-s linked with libphonenumber support - # https://gitlab.gnome.org/GNOME/folks/merge_requests/40 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/folks/commit/6d443480a137f6a6ff345b21bf3cb31066eefbcd.patch"; - sha256 = "D/Y2g12TT0qrcH+iJ2umu4Hmp0EJ3Hoedh0H3aWI+HY="; - }) - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - ]; - nativeBuildInputs = [ gettext gobject-introspection @@ -75,6 +61,7 @@ stdenv.mkDerivation rec { db dbus-glib evolution-data-server + libgdata # required for some backends transitively libsecret libsoup libxml2 @@ -100,7 +87,17 @@ stdenv.mkDerivation rec { ])) ]; - doCheck = true; + mesonFlags = [ + "-Ddocs=true" + "-Dtelepathy_backend=${lib.boolToString telepathySupport}" + # For some reason, the tests are getting stuck on 31/32, + # even though the one missing test finishes just fine on next run, + # when tests are permuted differently. And another test that + # previously passed will be stuck instead. + "-Dtests=false" + ]; + + doCheck = false; # Prevents e-d-s add-contacts-stress-test from timing out checkPhase = '' @@ -116,7 +113,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index a7f8fa89c1669..5eb180731f315 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -118,6 +118,6 @@ stdenv.mkDerivation rec { homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like platforms = platforms.all; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; teams.freedesktop.members ++ [ ]; }; } diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 46a7118cefe43..15daa7e5a9592 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstrm"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "farsightsec"; repo = "fstrm"; rev = "v${version}"; - sha256 = "0b6x9wgyn92vykkmd3ynhnpbdl77zb4wf4rm7p0h8p9pwq953hdm"; + sha256 = "sha256-/WFP2g3Vuf/qaY8pprY8XFAlpEE+0SJUlFNWfa+7ZlE="; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0ad9f607dfea6..efc533c55041b 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -12,7 +12,7 @@ , vala , glib , zlib -, gnome3 +, gnome , nixosTests }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 92c0ec293cb25..da3a0d31f41e4 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -15,18 +15,18 @@ , makeWrapper , libxslt , vala -, gnome3 +, gnome , python3 , shared-mime-info }: stdenv.mkDerivation rec { pname = "gcr"; - version = "3.38.1"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk="; + sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U="; }; postPatch = '' @@ -82,8 +82,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 2d8e60d06a735..fd2d62a032c3e 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -7,16 +7,15 @@ , pkg-config , gettext , python3 -, libxml2 , libxslt , docbook-xsl-nons , docbook_xml_dtd_43 -, gtk-doc +, gi-docgen , glib , libtiff , libjpeg , libpng -, gnome3 +, gnome , gobject-introspection , doCheck ? false , makeWrapper @@ -25,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.42.2"; + version = "2.42.6"; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"; + sha256 = "0zz7pmw2z46g7mr1yjxbsdldd5pd03xbjc58inj8rxfqgrdvg9n4"; }; patches = [ @@ -45,14 +44,15 @@ stdenv.mkDerivation rec { pkg-config gettext python3 - libxml2 - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 - gtk-doc gobject-introspection makeWrapper glib + gi-docgen + + # for man pages + libxslt + docbook-xsl-nons + docbook_xml_dtd_43 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ @@ -75,19 +75,26 @@ stdenv.mkDerivation rec { substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests" ''; + preInstall = '' + PATH=$PATH:$out/bin # for install script + ''; + postInstall = - # meson erroneously installs loaders with .dylib extension on Darwin. - # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. - lib.optionalString stdenv.isDarwin '' + '' + # All except one utility seem to be only useful during building. + moveToOutput "bin" "$dev" + moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" + + # So that devhelp can find this. + mkdir -p "$devdoc/share/devhelp" + mv "$out/share/doc" "$devdoc/share/devhelp/books" + '' + lib.optionalString stdenv.isDarwin '' + # meson erroneously installs loaders with .dylib extension on Darwin. + # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. for f in $out/${passthru.moduleDir}/*.dylib; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so done - '' - # All except one utility seem to be only useful during building. - + '' - moveToOutput "bin" "$dev" - moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache @@ -100,10 +107,6 @@ stdenv.mkDerivation rec { done ''; - preInstall = '' - PATH=$PATH:$out/bin # for install script - ''; - # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit doCheck; @@ -112,8 +115,9 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index f924571deae1c..5b73e3d7a1394 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome, intltool }: stdenv.mkDerivation rec { pname = "gdl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 gtk3 ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gdl"; }; }; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 2093328f5793a..11f4f070c08f5 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , vala @@ -35,14 +36,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.28"; + version = "0.4.30"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-HRENhXfVTMo7NCOTFb03xXzLJ91DVWVQdKLSs/2JeQA="; + sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; }; nativeBuildInputs = [ @@ -103,8 +104,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-lm"; postPatch = '' - chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh - patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh tools/xml_insert.sh + chmod +x tests/opencl/opencl_test.sh + patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh ''; # tests fail to connect to the com.apple.fonts daemon in sandboxed mode diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index f401c25aa3942..458e0d59a0d5d 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: +{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 071e749b40028..c46a42049bceb 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "gexiv2"; @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index e3550b82a965e..7f4625b665121 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts -, gnome3, libsoup, json-glib, gobject-introspection +, gnome, libsoup, json-glib, gobject-introspection , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }: stdenv.mkDerivation rec { @@ -35,8 +35,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 52b53a15b4105..342d498f1547f 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -1,10 +1,10 @@ { fetchurl -, fetchpatch -, lib, stdenv +, lib +, stdenv , meson , ninja , pkg-config -, gnome3 +, gnome , gtk3 , atk , gobject-introspection @@ -16,27 +16,36 @@ , libxml2 , dbus , gdk-pixbuf +, harfbuzz , makeWrapper , which -, xvfb_run +, xvfb-run , nixosTests }: let testDeps = [ gobject-introspection # for Gio and cairo typelibs - gtk3 atk pango.out gdk-pixbuf + gtk3 atk pango.out gdk-pixbuf harfbuzz ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.66.2"; + version = "1.68.1"; + + outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "vX9fixcSd8wLue4XVLAkC2Lwana4sYyWjPRxs0qzTlk="; + sha256 = "0w2cbfpmc6alz7z8ycchhlkn586av5y8zk2xmgwzq10i0k13xyig"; }; - outputs = [ "out" "dev" "installedTests" ]; + patches = [ + # Hard-code various paths + ./fix-paths.patch + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + ]; nativeBuildInputs = [ meson @@ -56,7 +65,7 @@ in stdenv.mkDerivation rec { ]; checkInputs = [ - xvfb_run + xvfb-run ] ++ testDeps; propagatedBuildInputs = [ @@ -68,14 +77,6 @@ in stdenv.mkDerivation rec { "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; - patches = [ - # Hard-code various paths - ./fix-paths.patch - - # Allow installing installed tests to a separate output. - ./installed-tests-path.patch - ]; - doCheck = true; postPatch = '' @@ -91,6 +92,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so + ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so ''; @@ -122,7 +124,7 @@ in stdenv.mkDerivation rec { installed-tests = nixosTests.installed-tests.gjs; }; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gjs"; }; }; diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 38ef25770aa93..37c15225869f9 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.3.3"; + version = "3.3.4"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-NfEPXjpVnFvh3Y70RZm8nDG0QwJbefF9wYNUq0BZTN4="; + sha256 = "sha256-BP4wxjgm0x0E68tNz5eudkVUyBnXkQlP7LY3ppZunhw="; }; propagatedBuildInputs = [ libGL ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 5858973416625..690279fcf2138 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -12,19 +12,19 @@ , gnutls , p11-kit , libproxy -, gnome3 +, gnome , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.66.0"; + version = "2.68.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5"; + sha256 = "0c1vylxly8k7g454g02spi44ybjidlwg461vp713zxd94k8qnpfh"; }; patches = [ @@ -74,8 +74,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; tests = { diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ce64bef95adba..170cddf3100ce 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 -, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 +, libiconv, zlib, libffi, pcre, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null , buildPackages @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.66.8"; + version = "2.68.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-l7yH3ZE2VYmvXLv+oldIM66nobcYQP02Xs0oUsdrnIs="; + sha256 = "sha256-JBZUuWvTa4iqoSgU78SEO1eOVdR0QBA3J5Waw0aUQzM="; }; patches = optionals stdenv.isDarwin [ @@ -184,14 +184,14 @@ stdenv.mkDerivation rec { makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas"; getSchemaPath = pkg: makeSchemaPath pkg pkg.name; inherit flattenInclude; - updateScript = gnome3.updateScript { packageName = "glib"; }; + updateScript = gnome.updateScript { packageName = "glib"; }; }; meta = with lib; { description = "C library of programming buildings blocks"; homepage = "https://www.gtk.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lovek323 raskin worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); platforms = platforms.unix; longDescription = '' diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix new file mode 100644 index 0000000000000..660e3b3b9bd73 --- /dev/null +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, gnum4 +, glib +, libsigcxx30 +, gnome +, Cocoa +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "glibmm"; + version = "2.68.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-wfOFcxkdzu2FoFYAiIz0z0aVlB8zlxW9Z9UcJBb083U="; + }; + + nativeBuildInputs = [ + meson + pkg-config + ninja + gnum4 + glib # for glib-compile-schemas + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + Cocoa + ]; + + propagatedBuildInputs = [ + glib + libsigcxx30 + ]; + + doCheck = false; # fails. one test needs the net, another /etc/fstab + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "glibmm_2_68"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "C++ interface to the GLib library"; + homepage = "https://gtkmm.org/"; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index a9abfbd17764c..9c4488a04a97a 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin, meson, ninja }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome, darwin, meson, ninja }: stdenv.mkDerivation rec { pname = "glibmm"; @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { doCheck = false; # fails. one test needs the net, another /etc/fstab passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index c8e77148c6d80..0b3d6689cb0b9 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "gnome-menus"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobject-introspection ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index ab71b2ccf9a9f..2d349181deeda 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -20,7 +20,7 @@ , libsoup , docbook-xsl-nons , docbook_xml_dtd_412 -, gnome3 +, gnome , gcr , libkrb5 , gvfs @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.38.1"; + version = "3.40.0"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4="; + sha256 = "sha256-GuUWypfmfbovpDKnj6wSBuNeKJIfIyipY+01u/p4znU="; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dfedora=false" # not useful in NixOS or for NixOS users. "-Dgtk_doc=true" - "-Dlastfm=true" "-Dman=true" "-Dmedia_server=true" ]; @@ -90,7 +89,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index a2206c19b1b43..e8fd3ca7e2c2f 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -4,7 +4,7 @@ , meson , ninja , gettext -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch index d4160b51d68c3..f74a7af1cff43 100644 --- a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch +++ b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch @@ -1,8 +1,10 @@ +diff --git a/gir/cairo-1.0.gir.in b/gir/cairo-1.0.gir.in +index e4c9fb3d..3351b184 100644 --- a/gir/cairo-1.0.gir.in +++ b/gir/cairo-1.0.gir.in -@@ -5,7 +5,7 @@ - xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> +@@ -6,7 +6,7 @@ <package name="@CAIRO_GIR_PACKAGE@"/> + <c:include name="cairo-gobject.h"/> <namespace name="cairo" version="1.0" - shared-library="@CAIRO_SHARED_LIBRARY@" + shared-library="@cairoLib@/@CAIRO_SHARED_LIBRARY@" diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch index 775c298553013..c02330adf6d1a 100644 --- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch +++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch @@ -40,7 +40,7 @@ def _get_option_parser(): parser = optparse.OptionParser('%prog [options] sources', version='%prog ' + giscanner.__version__) -@@ -205,6 +238,10 @@ match the namespace prefix.""") +@@ -214,6 +247,10 @@ match the namespace prefix.""") parser.add_option("", "--filelist", action="store", dest="filelist", default=[], help="file containing headers and sources to be scanned") @@ -66,7 +66,7 @@ # This is a what we do for non-la files. We assume that we are on an # ELF-like system where ldd exists and the soname extracted with ldd is # a filename that can be opened with dlopen(). -@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): +@@ -108,7 +114,8 @@ def _resolve_non_libtool(options, binary, libraries): output = output.decode("utf-8", "replace") shlibs = resolve_from_ldd_output(libraries, output) @@ -76,7 +76,7 @@ def sanitize_shlib_path(lib): -@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): +@@ -117,19 +124,18 @@ def sanitize_shlib_path(lib): # In case we get relative paths on macOS (like @rpath) then we fall # back to the basename as well: # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 @@ -101,7 +101,7 @@ if len(patterns) == 0: return [] -@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output): +@@ -141,8 +147,11 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split(): @@ -117,7 +117,7 @@ shlibs.append(m.group()) --- a/giscanner/utils.py +++ b/giscanner/utils.py -@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): +@@ -113,16 +113,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None @@ -129,8 +129,7 @@ - if libdir is None: - return dlbasename - return libdir + '/' + dlbasename -- # From the comments in extract_libtool(), older libtools had -- # a path rather than the raw dlname +- # Older libtools had a path rather than the raw dlname - return os.path.basename(dlname) + dlbasename = os.path.basename(dlname) + libdir = _extract_libdir_field(la_file) @@ -139,7 +138,7 @@ + return libdir + '/' + dlbasename - def extract_libtool(la_file): + # Returns arguments for invoking libtool, if applicable, otherwise None --- a/tests/scanner/test_shlibs.py +++ b/tests/scanner/test_shlibs.py @@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index ae65f5aed280c..e6a1ad979b91f 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -14,7 +14,7 @@ , python3 , cctools , cairo -, gnome3 +, gnome , substituteAll , nixStoreDir ? builtins.storeDir , x11Support ? true @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.66.1"; + version = "1.68.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"; + sha256 = "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj"; }; patches = [ @@ -112,8 +112,9 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 64b5be2e2d335..3a48fa5248421 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, glib, gtk3, lasem -, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }: +, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome }: stdenv.mkDerivation rec { pname = "goffice"; @@ -24,8 +24,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 4b5effefa57cf..d11ecc6a29a57 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -7,7 +7,7 @@ , python3 , sqlite , gdk-pixbuf -, gnome3 +, gnome , gobject-introspection }: @@ -48,8 +48,9 @@ stdenv.mkDerivation rec { doCheck = stdenv.isx86_64; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index c9fd5b2634298..1bc763349a869 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }: +{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 cairo glib ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index 632e434631c9c..4e706f409870d 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome }: stdenv.mkDerivation rec { pname = "goocanvasmm"; @@ -16,9 +16,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "goocanvasmm2"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 57cad44976536..b1b27a3d29809 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "A thin layer of graphic data types"; homepage = "https://ebassi.github.com/graphene"; license = licenses.mit; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index b80e6256e4673..13ec503fae0e6 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -10,7 +10,7 @@ , librest , libarchive , libsoup -, gnome3 +, gnome , libxml2 , lua5_3 , liboauth @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.12"; + version = "0.3.13"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6"; + sha256 = "HEMF1nNkqTBUODbMGYLzDpRpc7j/avPv4x2HcJq1IPg="; }; patches = [ @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index fbab49273e82b..1b8c46394da3a 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: +, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: let pname = "grilo"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 318d07dfacc88..e9814a43b2443 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,16 +7,16 @@ , ninja , python3 # just for passthru -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i"; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index 92123dbc3ea55..912054eb85c35 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -54,7 +54,7 @@ unwrapped = stdenv.mkDerivation rec { description = "D-Bus service which performs user authentication on behalf of its clients"; homepage = "https://gitlab.com/accounts-sso/gsignond"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index a05069f205feb..6141528a9fe6b 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index 8bce32f976ab6..977bc1489420c 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index 3bf3ab1946433..bc496e8ac2ccd 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index b73559f8a532a..bd87d4f72bb5d 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index 2a3e846d38d68..bcd39ce22733f 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome }: stdenv.mkDerivation rec { pname = "gsound"; @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib libcanberra ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 890fcb9811819..f591246eaf814 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -8,7 +8,7 @@ , icu , vala , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 440caba254761..6a76c07fec7b8 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -11,7 +11,7 @@ , libsoup , gtk3 , glib -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 40b10d0983ad2..faf38a1a05fb6 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , gettext @@ -103,6 +104,15 @@ stdenv.mkDerivation rec { patches = [ # Use pkgconfig to inject the includedirs ./fix_pkgconfig_includedir.patch + ] ++ lib.optionals stdenv.isDarwin [ + # Fix “error: cannot initialize a parameter of type 'unsigned long *' with an rvalue of type 'typename std::remove_reference<decltype(*(&opencv_dilate_erode_type))>::type *' (aka 'volatile unsigned long *')” on Darwin. + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/640a65bf966df065d41a511e2d76d1f26a2e770c.patch"; + sha256 = "E5pig+qEfR58Jticr6ydFxZOhM3ZJ8zgrf5K4BdiB/Y="; + includes = [ + "ext/opencv/gstcvdilateerode.cpp" + ]; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 2c683a84da4d3..7123aa0d3ac1f 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome }: stdenv.mkDerivation rec { pname = "gstreamermm"; version = "1.10.0"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - versionPolicy = "none"; # Unpredictable version stability + updateScript = gnome.updateScript { + packageName = "gst_all_1.gstreamermm"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 9f7d305052480..f9b5d5f68b569 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -29,7 +29,7 @@ , libxkbcommon , libxml2 , gmp -, gnome3 +, gnome , gsettings-desktop-schemas , sassc , trackerSupport ? stdenv.isLinux @@ -206,7 +206,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtk+"; attrPath = "gtk3"; }; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 50b322c9dbaf9..8791d24ad361a 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -5,9 +5,7 @@ , pkg-config , gettext , graphene -, docbook-xsl-nons -, docbook_xml_dtd_43 -, gtk-doc +, gi-docgen , meson , ninja , python3 @@ -30,7 +28,7 @@ , libsoup , ffmpeg , gmp -, gnome3 +, gnome , gsettings-desktop-schemas , gst_all_1 , sassc @@ -45,7 +43,6 @@ , wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux -, withGtkDoc ? stdenv.isLinux , cups , AppKit , Cocoa @@ -64,9 +61,9 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.0.3"; + version = "4.2.1"; - outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; + outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; setupHooks = [ @@ -76,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "18mJNyV5C1C9mjuyeIVtnVQ7RLa5uVHXtg573swTGJA="; + sha256 = "AjFpd13kPwof3gZvvBnXhUXqanViwZFavem4rkpzCeY="; }; nativeBuildInputs = [ @@ -88,21 +85,17 @@ stdenv.mkDerivation rec { pkg-config python3 sassc - ] ++ setupHooks ++ lib.optionals withGtkDoc [ - pandoc - docbook_xml_dtd_43 - docbook-xsl-nons - gtk-doc - # For xmllint - libxml2 - ]; + gi-docgen + ] ++ setupHooks; buildInputs = [ libxkbcommon epoxy json-glib isocodes + ] ++ lib.optionals (!stdenv.isDarwin) [ vulkan-headers + ] ++ [ librest libsoup ffmpeg @@ -141,18 +134,27 @@ stdenv.mkDerivation rec { glib graphene pango - vulkan-loader # TODO: Possibly not used on Darwin - + ] ++ lib.optionals (!stdenv.isDarwin) [ + vulkan-loader + ] ++ [ # Required for GSettings schemas at runtime. # Will be picked up by wrapGAppsHook. gsettings-desktop-schemas ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString withGtkDoc}" - "-Dtests=false" - "-Dtracker3=${lib.boolToString trackerSupport}" - "-Dbroadway_backend=${lib.boolToString broadwaySupport}" + # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found + "-Dgtk_doc=${lib.boolToString x11Support}" + "-Dbuild-tests=false" + "-Dtracker=${if trackerSupport then "enabled" else "disabled"}" + "-Dbroadway-backend=${lib.boolToString broadwaySupport}" + ] ++ lib.optionals (!cupsSupport) [ + "-Dprint-cups=disabled" + ] ++ lib.optionals stdenv.isDarwin [ + "-Dvulkan=disabled" + "-Dmedia-gstreamer=disabled" # requires gstreamer-gl + ] ++ lib.optionals (!x11Support) [ + "-Dx11-backend=false" ]; doCheck = false; # needs X11 @@ -171,20 +173,12 @@ stdenv.mkDerivation rec { gdk/gen-gdk-gresources-xml.py gtk/gen-gtk-gresources-xml.py gtk/gentypefuncs.py - docs/reference/gtk/gtk-markdown-to-docbook ) chmod +x ''${files[@]} patchShebangs ''${files[@]} ''; - postBuild = lib.optionalString withGtkDoc '' - # Meson not building `custom_target`s passed to `custom_files` argument of `gnome.gtkdoc` function - # as part of the `install` target. We have to build the docs manually first. - # https://github.com/mesonbuild/meson/issues/2831 - ninja g{t,d,s}k4-doc - ''; - preInstall = '' OLD_PATH="$PATH" PATH="$PATH:$dev/bin" # so the install script finds gtk4-update-icon-cache @@ -202,6 +196,13 @@ stdenv.mkDerivation rec { for f in $dev/bin/gtk4-encode-symbolic-svg; do wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" done + + '' + lib.optionalString x11Support '' + # So that DevHelp can find this. + # TODO: Remove this with DevHelp 41. + mkdir -p "$devdoc/share/devhelp/books" + mv "$out/share/doc/"* "$devdoc/share/devhelp/books" + rmdir -p --ignore-fail-on-non-empty "$out/share/doc" ''; # Wrap demos @@ -215,7 +216,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtk"; attrPath = "gtk4"; }; @@ -235,7 +236,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin lethalman worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index a3aa18b058a21..eaf8a94d137ea 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg +{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 521f4ca15f301..cf26e22da5bc3 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ raskin vcunat ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 950e1a976a622..1e5932c3854e7 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome }: stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.3"; + version = "3.24.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YEl8T381TDvSVXSF8CVPi3tM9L68n+4L4mp3dE6s1DU="; + sha256 = "sha256-m+txw+kM/Pt5A5a1Hj9ecWmWZ1Hv1PPvlpcRS+O+Z0M="; }; outputs = [ "out" "dev" ]; @@ -22,9 +22,10 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}3"; + versionPolicy = "odd-unstable"; }; }; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix new file mode 100644 index 0000000000000..50839568462fc --- /dev/null +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -0,0 +1,91 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, python3 +, gtk4 +, glibmm_2_68 +, cairomm_1_16 +, pangomm_2_48 +, epoxy +, gnome +, makeFontsConf +, xvfb-run +}: + +stdenv.mkDerivation rec { + pname = "gtkmm"; + version = "4.0.1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-iXPZvHhI4CyyBR4F8+46S6/+L+tK9KVIfw4xMu7AOIQ="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; + + buildInputs = [ + epoxy + ]; + + propagatedBuildInputs = [ + glibmm_2_68 + gtk4 + cairomm_1_16 + pangomm_2_48 + ]; + + checkInputs = [ + xvfb-run + ]; + + # Tests require fontconfig. + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ ]; + }; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + xvfb-run -s '-screen 0 800x600x24' \ + meson test --print-errorlogs + + runHook postCheck + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "${pname}4"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "C++ interface to the GTK graphical user interface library"; + longDescription = '' + gtkmm is the official C++ interface for the popular GUI library + GTK. Highlights include typesafe callbacks, and a + comprehensive set of widgets that are easily extensible via + inheritance. You can create user interfaces either in code or + with the Glade User Interface designer, using libglademm. + There's extensive documentation, including API reference and a + tutorial. + ''; + homepage = "https://gtkmm.org/"; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 84a20154b13c2..dce589dd6474f 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala -, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb_run, shared-mime-info }: +, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }: stdenv.mkDerivation rec { pname = "gtksourceview"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; - checkInputs = [ xvfb_run dbus ]; + checkInputs = [ xvfb-run dbus ]; buildInputs = [ atk cairo glib pango libxml2 gettext ]; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 9ead894e0d25f..eb92586ce84a2 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -1,32 +1,42 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala -, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info -, meson, ninja }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, atk +, cairo +, glib +, gtk3 +, pango +, fribidi +, vala +, libxml2 +, perl +, gettext +, gnome +, gobject-introspection +, dbus +, xvfb-run +, shared-mime-info +}: stdenv.mkDerivation rec { pname = "gtksourceview"; version = "4.8.1"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE="; }; - propagatedBuildInputs = [ - # Required by gtksourceview-4.0.pc - gtk3 - # Used by gtk_source_language_manager_guess_language - shared-mime-info - ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ]; - - checkInputs = [ xvfb_run dbus ]; - - buildInputs = [ atk cairo glib pango fribidi libxml2 ]; - patches = [ + # By default, the library loads syntaxes from XDG_DATA_DIRS and user directory + # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). + # Since this is not generally true with Nix, let’s add $out/share unconditionally. ./4.x-nix_share_path.patch # fixes intermittent "gtksourceview-gresources.h: no such file" errors @@ -37,27 +47,63 @@ stdenv.mkDerivation rec { }) ]; - enableParallelBuilding = true; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + perl + gobject-introspection + vala + ]; + + buildInputs = [ + atk + cairo + glib + pango + fribidi + libxml2 + ]; + + propagatedBuildInputs = [ + # Required by gtksourceview-4.0.pc + gtk3 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + checkInputs = [ + xvfb-run + dbus + ]; doCheck = stdenv.isLinux; + checkPhase = '' + runHook preCheck + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test --no-rebuild --print-errorlogs + + runHook postCheck ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceview"; attrPath = "gtksourceview4"; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { + description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; - platforms = with platforms; linux ++ darwin; - license = licenses.lgpl21; + platforms = platforms.unix; + license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix new file mode 100644 index 0000000000000..fd4a420012c32 --- /dev/null +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, glib +, pcre2 +, gtk4 +, pango +, fribidi +, vala +, libxml2 +, perl +, gettext +, gnome +, gobject-introspection +, dbus +, xvfb-run +, shared-mime-info +}: + +stdenv.mkDerivation rec { + pname = "gtksourceview"; + version = "5.0.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1hyrmh9r1zd5kjh5ch9d7bhk2kphbqhm7ijfxfkcdln8q0rnd0k4"; + }; + + patches = [ + # By default, the library loads syntaxes from XDG_DATA_DIRS and user directory + # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). + # Since this is not generally true with Nix, let’s add $out/share unconditionally. + ./4.x-nix_share_path.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + perl + gobject-introspection + vala + ]; + + buildInputs = [ + glib + pcre2 + pango + fribidi + libxml2 + ]; + + propagatedBuildInputs = [ + # Required by gtksourceview-5.0.pc + gtk4 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + checkInputs = [ + xvfb-run + dbus + ]; + + doCheck = stdenv.isLinux; + + checkPhase = '' + runHook preCheck + + XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \ + xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + meson test --no-rebuild --print-errorlogs + + runHook postCheck + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gtksourceview"; + attrPath = "gtksourceview5"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Source code editing widget for GTK"; + homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + platforms = platforms.unix; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 5e80f91abc1b3..3011a126c10de 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 7ee6b656ead13..fc4439e223eef 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceviewmm"; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 9bf39d94aed3b..8d800f9794023 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -8,7 +8,7 @@ , docbook_xml_dtd_412 , glib , libxml2 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -43,8 +43,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index e11d86f82e193..f9efe352a84b4 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -8,7 +8,7 @@ , docbook_xml_dtd_412 , libxml2 , gst_all_1 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -48,8 +48,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 233eb7e3c85f9..6eb44b9172abd 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -10,7 +10,7 @@ , docbook_xml_dtd_412 , glib , gupnp -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -49,8 +49,9 @@ stdenv.mkDerivation rec { #doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index d6465d71c50f4..bd8151d603e9b 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -14,7 +14,7 @@ , libsoup , libxml2 , libuuid -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 2c9bac002fd35..547c35e66ecab 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -23,7 +23,7 @@ , samba , libmtp , gnomeSupport ? false -, gnome3 +, gnome , gcr , glib-networking , gnome-online-accounts @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.46.2"; + version = "1.48.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2D+hYChmcMA+uJAkBgbYr6fqajqBjorRfu7Y2XZIe9c="; + sha256 = "1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj"; }; postPatch = '' @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas # TODO: a ligther version of libsoup to have FTP/HTTP support? ] ++ lib.optionals gnomeSupport [ - gnome3.libsoup + gnome.libsoup gcr glib-networking # TLS support gnome-online-accounts @@ -117,8 +117,9 @@ stdenv.mkDerivation rec { doInstallCheck = doCheck; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -126,6 +127,6 @@ stdenv.mkDerivation rec { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ] ++ teams.gnome.members; + maintainers = [ ] ++ teams.gnome.members; }; } diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 8dab59e99472a..29e12cc8541d0 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -77,15 +77,17 @@ stdenv.mkDerivation rec { "-DIGRAPH_USE_INTERNAL_GMP=OFF" "-DIGRAPH_GLPK_SUPPORT=ON" "-DIGRAPH_GRAPHML_SUPPORT=ON" - "-DIGRAPH_ENABLE_LTO=ON" + "-DIGRAPH_ENABLE_LTO=AUTO" "-DIGRAPH_ENABLE_TLS=ON" "-DBUILD_SHARED_LIBS=ON" ]; doCheck = true; - preCheck = '' - # needed to find libigraph.so + # needed to find libigraph, and liblas on darwin + preCheck = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [ blas ]}:$PWD/src" + '' else '' export LD_LIBRARY_PATH="$PWD/src" ''; diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 715e5621458e7..78e2ebae96acf 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.5.1"; + version = "21.2.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "0l5m7r8585ycifbbi5i0bs63c9sb8rsmk43ik97mhfl1ivswf1mv"; + sha256 = "sha256-LusgmvlWOMEQjy47IpA9IYcl/cUTSMmvxSwvV/ihs2g="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index ed086dac90fba..afbb7aaed96f4 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -11,7 +11,7 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -46,8 +46,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 1ec9c3da41e20..b43bcd07ca6b6 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; version = "3.38.0"; @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 663abb1528046..fb481c19d05f7 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome , gtk-doc, gtk2, python2Packages, lua, gobject-introspection }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - autoconf automake libtool gnome3.gnome-common gtk-doc gtk2 + autoconf automake libtool gnome.gnome-common gtk-doc gtk2 python pygtk lua gobject-introspection ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index e291ec56bb210..78755a87919d7 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ - gnome3.gnome-common gtk-doc gtk3 + gnome.gnome-common gtk-doc gtk3 libX11 libXext libXrender gobject-introspection ]; diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/development/libraries/kronosnet/default.nix index c74ff6716feec..cc282d9abc9c8 100644 --- a/pkgs/development/libraries/kronosnet/default.nix +++ b/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lP5W+4b9McU2Uqibh2SucIu2y4KluO3B1RpAJKgYq/M="; + sha256 = "14i4fl3g60gn5ay3dbwjcay3dnmnqr16zcp3g0wv9a3hjwh1if28"; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index 22f0436edca96..9c49429ece458 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf -, libxml2, cairo, pango, gnome3 }: +, libxml2, cairo, pango, gnome }: stdenv.mkDerivation rec { pname = "lasem"; @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 486326f15f868..f3b9cad0720b2 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -10,7 +10,7 @@ , vala , gobject-introspection , gtk4 -, xvfb_run +, xvfb-run }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - xvfb_run + xvfb-run ]; doCheck = true; diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 584ea93293ef4..9b1654420e749 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc +{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc , docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted , cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key , libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; sgdisk = "${gptfdisk}/bin/sgdisk"; }) + + # fix build with glib 2.68 (g_memdup is deprecated) + # https://github.com/storaged-project/libblockdev/pull/623 + (fetchpatch { + url = "https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940.patch"; + sha256 = "jxq4BLeyTMeNvBvY8k8QXIvYSJ2Gah0J75pq6FpG7PM="; + }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 22a062acd6efd..20609509b66d8 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3 +{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: stdenv.mkDerivation rec { @@ -24,8 +24,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index b864c279d37a0..a6f2e05d73614 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-vJ4OyU9HYQvF1SWmniNGAuHQ7K/TfiK8C4celK5hjiA="; + hash = "sha256-nsIyosn8dBf217UmjXSKLTM2RhIQHCSvPlrvlqo5KLc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index e7a6e6c983720..37ac9bf7f171d 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pellegre/libcrafter"; description = "High level C++ network packet sniffing and crafting library"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.lethalman ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index 5fdd60abe1153..e816846842f1e 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: stdenv.mkDerivation rec { pname = "libcryptui"; @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index d6ecb6e9747e0..d62614c56c765 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }: +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb-run, glib, gtk3, gnome }: stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.38.0"; + version = "3.40.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1"; + sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv"; }; - nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; + nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ]; buildInputs = [ glib gtk3 ]; mesonFlags = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 5b2914c141f3f..c7a7673dc1b35 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.5"; + version = "3.14.6"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "sha256-PSrYoz5ID88pYs/4rP2kz0NpI0pK6wcnx62HokE0g20="; + sha256 = "sha256-zDMxJyL/T3cXrqgMT15yZlCozgyOt5nNreottuuiGHk="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index ee8dfb6e94f79..9755d0977c85f 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome }: let avahiWithGtk = avahi.override { gtk3Support = true; }; @@ -32,8 +32,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index fc24fe41c4d33..28235d65d98ad 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -12,7 +12,7 @@ , json-glib , isocodes , openssl -, gnome3 +, gnome , gobject-introspection , vala , libgee @@ -71,9 +71,10 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libgda6"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 307cc14a6efef..b3f6e1a7cdd99 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -7,7 +7,7 @@ , libxml2 , gtk3 , openssl -, gnome3 +, gnome , gobject-introspection , vala , libgee @@ -84,8 +84,9 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index 44a0e8bc21213..ad5e0cbecd6e8 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3 +{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome , mysqlSupport ? false , postgresSupport ? false }: @@ -24,8 +24,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index fdaace2dc4f02..f85dbea54d9d0 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -12,7 +12,7 @@ , gcr , gnome-online-accounts , gobject-introspection -, gnome3 +, gnome , p11-kit , openssl , uhttpmock @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; # Stable version has not been updated for a long time. }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GData API library"; homepage = "https://wiki.gnome.org/Projects/libgdata"; - maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members; + maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 407b99b5a57bb..1a40d1f17b413 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.3"; + version = "0.20.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh"; + sha256 = "03nyf8n7i7f67fsh220g52slmihdk1lv4iwspm7xmkgrj3rink2j"; }; doCheck = true; @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index e058c7ed5af3d..7ae7bff50efa5 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome , webkitgtk, libsoup, libxml2, libarchive }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index fe36a9d663f39..56259814d8a51 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2 +{ lib, stdenv, fetchurl, gnome, meson, ninja, pkg-config, vala, libssh2 , gtk-doc, gobject-introspection, libgit2, glib, python3 }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index cf8f5ab487864..b00e7b3245182 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3, +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome, libstartup_notification, libgtop, perlPackages, autoreconfHook, intltool, docbook_xsl, xauth }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 gnome2.GConf libstartup_notification - gnome3.libgnome-keyring libgtop gnome2.libglade + gnome.libgnome-keyring libgtop gnome2.libglade ] ++ (with perlPackages; [ perl XMLParser ]); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 62228b8837a8a..957c213425249 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = pname; }; - }; - nativeBuildInputs = [ file intltool @@ -29,6 +25,13 @@ stdenv.mkDerivation rec { glib ]; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { description = "Keyboard management library"; maintainers = teams.gnome.members; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index b8c7c7bc49774..8c5ea73af0b93 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: let version = "0.7.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 77fa161b773a9..1ccc5d7789671 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 -, perl, gdk-pixbuf, libiconv, libintl, gnome3 }: +, perl, gdk-pixbuf, libiconv, libintl, gnome }: stdenv.mkDerivation rec { pname = "libgsf"; @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs ./tests/"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index af4fe04a0b420..98b0dc89fee83 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -5,7 +5,7 @@ , perl , gettext , gobject-introspection -, gnome3 +, gnome , gtk-doc }: @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index feeae05bf5262..a35cf51679ce9 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -1,31 +1,46 @@ { lib, stdenv , fetchurl , pkg-config +, meson +, ninja , udev , glib , gobject-introspection -, gnome3 +, gnome +, vala }: stdenv.mkDerivation rec { pname = "libgudev"; - version = "234"; + version = "236"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv"; + sha256 = "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5"; }; - nativeBuildInputs = [ pkg-config gobject-introspection ]; - buildInputs = [ udev glib ]; + nativeBuildInputs = [ + pkg-config + gobject-introspection + meson + ninja + vala + ]; - # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway. - configureFlags = [ "--disable-umockdev" ]; + buildInputs = [ + udev + glib + ]; + + mesonFlags = [ + # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway + "-Dtests=disabled" + ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 9351d3f707fae..fbab67e086520 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -1,24 +1,57 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, libxml2 +, glib +, gtk3 +, gettext +, libsoup +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gobject-introspection +, python3 +, tzdata +, geocode-glib +, vala +, gnome +}: stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.36.1"; + version = "40.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna"; }; - nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; - buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + vala + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + gobject-introspection + python3 + python3.pkgs.pygobject3 + ]; - postPatch = '' - chmod +x meson/meson_post_install.py - patchShebangs meson/meson_post_install.py - ''; + buildInputs = [ + glib + gtk3 + libsoup + libxml2 + geocode-glib + ]; mesonFlags = [ "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" @@ -26,9 +59,16 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; + postPatch = '' + chmod +x meson/meson_post_install.py + patchShebangs meson/meson_post_install.py + patchShebangs data/gen_locations_variant.py + ''; + passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index be088496f2e1e..fc871f174eb54 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 +, libarchive, freetype, libjpeg, libtiff, gnome, lcms2 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index ff2093255cf07..7597aee697a8b 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3 -, dbus, xvfb_run, libxml2 +, gtk3, gnome +, dbus, xvfb-run, libxml2 , hicolor-icon-theme }: @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meson ninja pkg-config gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ]; - checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; + buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ]; + checkInputs = [ dbus xvfb-run hicolor-icon-theme ]; mesonFlags = [ "-Dgtk_doc=true" diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 4532edfd884b6..891bd04ea5439 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , meson , ninja @@ -6,35 +7,45 @@ , gobject-introspection , vala , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , gtk3 +, enableGlade ? false , glade , dbus -, xvfb_run +, xvfb-run , libxml2 , gdk-pixbuf , librsvg , hicolor-icon-theme , at-spi2-atk , at-spi2-core +, gnome +, libhandy +, runCommand }: stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.2.0"; + version = "1.2.2"; - outputs = [ "out" "dev" "devdoc" "glade" ]; + outputs = [ + "out" + "dev" + "devdoc" + ] ++ lib.optionals enableGlade [ + "glade" + ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-OfWQriCRDnb+HAYHsuvliXUPRWENau7Fww4u5gKiCyU="; + sha256 = "sha256-R//Shl0CvRyleVIt6t1+L5U2Lx8gJGL9XuriuBZosEg="; }; nativeBuildInputs = [ docbook_xml_dtd_43 - docbook_xsl + docbook-xsl-nons gobject-introspection gtk-doc libxml2 @@ -46,14 +57,15 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf - glade gtk3 libxml2 + ] ++ lib.optionals enableGlade [ + glade ]; checkInputs = [ dbus - xvfb_run + xvfb-run at-spi2-atk at-spi2-core librsvg @@ -62,6 +74,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + "-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}" ]; # Uses define_variable in pkg-config, but we still need it to use the glade output @@ -79,6 +92,23 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + } // lib.optionalAttrs (!enableGlade) { + glade = + let + libhandyWithGlade = libhandy.override { + enableGlade = true; + }; + in runCommand "${libhandy.name}-glade" {} '' + cp -r "${libhandyWithGlade.glade}" "$out" + chmod -R +w "$out" + sed -e "s#${libhandyWithGlade.out}#${libhandy.out}#g" -e "s#${libhandyWithGlade.glade}#$out#g" -i $(find "$out" -type f) + ''; + }; + meta = with lib; { changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}"; description = "Building blocks for modern adaptive GNOME apps"; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 648eb89a514ae..975ad22581318 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch -, gnome3, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: +, gnome, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: let pname = "libhttpseverywhere"; @@ -34,8 +34,9 @@ in stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/development/libraries/libjwt/default.nix index 9c7d624e7f6e4..a81b60c425ecb 100644 --- a/pkgs/development/libraries/libjwt/default.nix +++ b/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "1c69slf9k56gh0xcg6269v712ysm6wckracms4grdsc72xg6x7h2"; + sha256 = "sha256-hS10Ecq0VVuYLDrBu4x+Y2mz6eeJV1SvnqttgbiQbi0="; }; buildInputs = [ jansson openssl ]; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 76dd4eb20c1a0..645b521b81720 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -11,7 +11,7 @@ , glib , libgudev , libevdev -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -49,8 +49,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 05ae1af2e2576..1c15519aaff92 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmaxminddb"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-UjcHbSUKX3wpfjMcNaQz7qrw3CBeBw5Ns1PJuhDzQKI="; + sha256 = "sha256-diCsGHxZHOIbzXvzUjdqPFapM+aEVYofa+9L1PP5gmc="; }; meta = with lib; { diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 28c8ae6db9405..ee1b306c3e51c 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome, fetchpatch }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index f95d39a02da8e..edadff523f3a6 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.12.0"; + version = "2.12.1"; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1mq9as98q4wyka404f8xwfc44cn5j4bsk0fch5pf07v81sagc1q9"; + sha256 = "sha256-Relj14uG+dp9r5xWEbw/eAmlUJJ/kRwlPclcWGQxoJg="; }; patches = [ diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix index fc68149c14c3e..524f948703f39 100644 --- a/pkgs/development/libraries/libndp/default.nix +++ b/pkgs/development/libraries/libndp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = "http://libndp.org/"; description = "Library for Neighbor Discovery Protocol"; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 29b371642280b..b108a5c5eea54 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -8,7 +8,7 @@ , glib , gdk-pixbuf , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index a8ef9e2f9bb2d..55c884d215fdc 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome , glib, gtk3, gobject-introspection, python3, ncurses }: stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.28.0"; + version = "1.30.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2"; + sha256 = "18xrk1c1ixlhkmykcfiafrl2am470ws687xqvjlq40zwkcp5dx8b"; }; nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ]; @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 478e01f3575bf..a7da64f787a35 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "3.120.2"; + version = "3.120.3"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "0wh5w7bx789ynnzr27xi0csql4jaxq80csawg6znabw3ld54wb86"; + sha256 = "02hiyhnjdz3zqnzks9bi7my62a85k9k9vfgmh9fy19snsbkd6l80"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index f27b58a02bb65..f51db1d6c6ded 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -12,11 +12,12 @@ }: stdenv.mkDerivation rec { - name = "libpst-0.6.75"; + pname = "libpst"; + version = "0.6.76"; src = fetchurl { - url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; + url = "http://www.five-ten-sg.com/libpst/packages/${pname}-${version}.tar.gz"; + sha256 = "0hhbbb8ddsgjhv9y1xd8s9ixlhdnjmhw12v06jwx4j6vpgp1na9x"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index 7b1ff8235aace..0c885f0764b55 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, libsoup +, gobject-introspection +, gnome +}: stdenv.mkDerivation rec { pname = "rest"; @@ -9,23 +17,34 @@ stdenv.mkDerivation rec { sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; }; - nativeBuildInputs = [ pkg-config gobject-introspection ]; - buildInputs = [ glib libsoup ]; + nativeBuildInputs = [ + pkg-config + gobject-introspection + ]; - configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; + buildInputs = [ + glib + libsoup + ]; + + configureFlags = [ + # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. + "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" + ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "librest"; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { description = "Helper library for RESTful services"; homepage = "https://wiki.gnome.org/Projects/Librest"; - license = licenses.lgpl21; - platforms = platforms.linux; + license = licenses.lgpl21Only; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index efdbf5934630b..02cd9accbaf0a 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,47 +1,79 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2 -, bzip2, libintl, darwin, rustc, cargo, gnome3 -, vala, gobject-introspection }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gdk-pixbuf +, pango +, cairo +, libxml2 +, bzip2 +, libintl +, ApplicationServices +, Foundation +, libobjc +, rustc +, cargo +, gnome +, vala +, gobject-introspection +, nixosTests +}: -let - pname = "librsvg"; - version = "2.50.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv"; - }; + pname = "librsvg"; + version = "2.50.5"; outputs = [ "out" "dev" "installedTests" ]; - buildInputs = [ libxml2 bzip2 pango libintl ] - ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0wlj5g1jgp93sj3rr6qspj282whz13ahnv8ca99d7zilq9s1aw1j"; + }; - NIX_LDFLAGS = if stdenv.isDarwin then "-lobjc" else null; + nativeBuildInputs = [ + pkg-config + rustc + cargo + vala + gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Foundation + ]; - propagatedBuildInputs = [ glib gdk-pixbuf cairo ]; + buildInputs = [ + libxml2 + bzip2 + pango + libintl + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + ]; - nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices - ]); + propagatedBuildInputs = [ + glib + gdk-pixbuf + cairo + ]; configureFlags = [ "--enable-introspection" + ] ++ lib.optionals (!stdenv.isDarwin) [ + # Vapi does not build on MacOS. + # https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004 "--enable-vala" + ] ++ [ "--enable-installed-tests" "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic"; makeFlags = [ - "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG" - "installed_testdir=$(installedTests)/libexec/installed-tests/RSVG" + "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG" + "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/RSVG" ]; - NIX_CFLAGS_COMPILE - = lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; + doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the @@ -63,8 +95,6 @@ stdenv.mkDerivation rec { -i gdk-pixbuf-loader/librsvg.thumbnailer.in ''; - doCheck = false; # fails 20 of 145 tests, very likely to be buggy - # Merge gdkpixbuf and librsvg loaders postInstall = '' mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp @@ -73,8 +103,13 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; + }; + + tests = { + installedTests = nixosTests.installed-tests.librsvg; }; }; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 6c28b7d16c162..18f00a0933c35 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala -, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }: +, gtk-doc, gnome, gjs, libintl, dbus, xvfb-run }: stdenv.mkDerivation rec { pname = "libsecret"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installCheckInputs = [ - python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs + python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb-run dbus gjs ]; # needs to run after install because typelibs point to absolute paths @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30 versionPolicy = "none"; diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix new file mode 100644 index 0000000000000..edb74c807bfa2 --- /dev/null +++ b/pkgs/development/libraries/libsigcxx/3.0.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, gnome +}: + +stdenv.mkDerivation rec { + pname = "libsigc++"; + version = "3.0.6"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "tw7c9GEWUcVKQm4QmxcZbh+hfaCQWSpQAOLRNMA6xc4="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "libsigcxx30"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; + description = "A typesafe callback system for standard C++"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index c933d92f32550..cbc2c8a617b4e 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gnum4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gnome }: stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.1"; + version = "2.10.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9"; + sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths="; }; - nativeBuildInputs = [ pkg-config gnum4 ]; + nativeBuildInputs = [ pkg-config meson ninja ]; doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libsigcxx"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index ae7a6775de553..f20f80c284290 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "A library for managing single signon credentials which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; license = licenses.lgpl21; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 089fbe4b35121..c7dede355df61 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.17"; + version = "0.7.19"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-LPOS+yDwNpyO9tkFoIy4SCQymytOGB26Pfyd/EFEYnc="; + sha256 = "sha256-AN4cgpMBqTtK04CU89Yqd1ZfWyPrCociPd3XKdVONMU="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 47fcdd41f8abd..fc805b2db9ec4 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome3, libsysprof-capture +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala , libpsl, python3, brotli }: @@ -46,8 +46,9 @@ stdenv.mkDerivation rec { passthru = { propagatedUserEnvPackages = [ glib-networking.out ]; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index c67be246928c6..953800cdd576e 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.2"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "0x1kkccy81rcqbhlw88sw7lykp7398vmrvp6f9yy42k9bl4yxn2q"; + sha256 = "sha256-q5FiBlncbhdXDgRm7wgxcd4rkxqje/1ls9kPGqmomP0="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index f6fb9a13e4cd0..c27fce32ec005 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchgit , pkg-config , glib @@ -14,16 +15,24 @@ stdenv.mkDerivation { pname = "libunity"; - version = "unstable-2019-03-19"; + version = "unstable-2021-02-01"; outputs = [ "out" "dev" "py" ]; + # Obtained from https://git.launchpad.net/ubuntu/+source/libunity/log/ src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/libunity"; - rev = "import/7.1.4+19.04.20190319-0ubuntu1"; - sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj"; + rev = "import/7.1.4+19.04.20190319-5"; + sha256 = "LHUs6kl1srS6Xektx+jmm4SXLR47VuQ9IhYbBxf2Wc8="; }; + patches = [ + # Fix builf with latest Vala + # https://code.launchpad.net/~jtojnar/libunity/libunity + # Did not send upstream because Ubuntu is stuck on Vala 0.48. + ./fix-vala.patch + ]; + nativeBuildInputs = [ autoreconfHook gobject-introspection @@ -43,11 +52,6 @@ stdenv.mkDerivation { libdbusmenu ]; - patches = [ - # See: https://gitlab.gnome.org/GNOME/vala/issues/766 - ./fix-vala.patch - ]; - preConfigure = '' intltoolize ''; @@ -61,6 +65,6 @@ stdenv.mkDerivation { homepage = "https://launchpad.net/libunity"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/development/libraries/libunity/fix-vala.patch index ec34229b44431..555c2ad7bcb0d 100644 --- a/pkgs/development/libraries/libunity/fix-vala.patch +++ b/pkgs/development/libraries/libunity/fix-vala.patch @@ -1,36 +1,12 @@ -diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala ---- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500 -+++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400 -@@ -51,7 +51,7 @@ - */ - public abstract int category_index_for_scope_id (string scope_id); +--- a/protocol/protocol-icon.vala 2013-08-27 12:53:57 +0000 ++++ b/protocol/protocol-icon.vala 2021-04-13 22:34:41 +0000 +@@ -185,7 +185,7 @@ + } -- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) -+ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false) - { - Object (dbus_path: dbus_path_, id: id_, is_master: true, - merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints); -diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala ---- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500 -+++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400 -@@ -61,7 +61,7 @@ - internal CategorySet _categories; - internal FilterSet _filters; - -- public DeprecatedScopeBase (string dbus_path_, string id_) -+ protected DeprecatedScopeBase (string dbus_path_, string id_) + /* Added to GIcon interface in 2.37 */ +- private Variant serialize () ++ private Variant? serialize () { - Object (dbus_path: dbus_path_, id: id_); - } -diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala ---- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500 -+++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400 -@@ -63,7 +63,7 @@ - */ - public abstract class GridRenderer: PreviewRenderer - { -- public GridRenderer() -+ protected GridRenderer() - { - Object(); - } + Variant? ret = null; + return ret; + diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index a61094d17fe86..5e1c0c671d904 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,21 +1,47 @@ -{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala -, libcap_ng, libvirt, libxml2 +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, gettext +, gtk-doc +, docbook-xsl-nons +, vala +, libcap_ng +, libvirt +, libxml2 }: stdenv.mkDerivation rec { - name = "libvirt-glib-3.0.0"; + name = "libvirt-glib-4.0.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz"; + url = "https://libvirt.org/sources/glib/${name}.tar.xz"; + sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0="; }; - nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ]; - buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gtk-doc + docbook-xsl-nons + vala + gobject-introspection + ]; + + buildInputs = [ + libcap_ng + libvirt + libxml2 + gobject-introspection + ]; - enableParallelBuilding = true; strictDeps = true; meta = with lib; { diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 3792b826f5942..425a1bab35504 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -16,7 +16,7 @@ , libstartup_notification , gettext , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -60,9 +60,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}${lib.versions.major version}"; + versionPolicy = "odd-unstable"; }; }; @@ -70,6 +71,6 @@ stdenv.mkDerivation rec { description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.worldofpeace ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index 4397f65ac4b67..9e7886eb68d1d 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.8.0"; + version = "1.10.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-pvAKfQkcvU21f+fuO0wSxjUJIdZU7XmBKACibIiEgdI="; + sha256 = "sha256-JBXicNReNZXtQFK8EF9zN0TcLTZ34S/0qDHlAphBCE0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index 849ebcf3c863c..7f1b583284b06 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "14c5rgx87nhzasr0j7mcfr1w7ifz0gmdiqy2xq59di5xvcdrpxpv"; + sha256 = "0k0km5d4xs6z98nqczvdkqwhhc5izqs82ciifx2l5wcbcdxb4r0k"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 19282ddc822d6..67c5a0794ed5f 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 glibmm ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index d16f34039f193..8acb5e858df8b 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 0b8143b691173..3b0e811097e7a 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.20"; + name = "matio-1.5.21"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "sha256-XR9yofUav2qc0j6qgS+xe4YQlwWQlfSMdoxINcWqJZg="; + sha256 = "sha256-IYCRd+VYOefJTa2nRO5Vwd6n11fdqriWBXdtUBIvsGU="; }; meta = with lib; { diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index a43d99503a3fe..7ce2675e3017f 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , meson , python3 , ninja @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 49af2593e51ef..d2cbee14c3a09 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -1,15 +1,13 @@ { stdenv, lib, fetchurl, perl, gfortran , openssh, hwloc, autoconf, automake, libtool -# device options are ch3 or ch4 -, device ? "ch4" -# backend option are libfabric or ucx -, ch4backend ? "libfabric" -, ucx, libfabric +# either libfabric or ucx work for ch4backend on linux. On darwin, neither of +# these libraries currently build so this argument is ignored on Darwin. +, ch4backend # Process manager to build , withPm ? "hydra:gforker" } : -assert (ch4backend == "ucx" || ch4backend == "libfabric"); +assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; @@ -45,8 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ perl gfortran openssh hwloc ] - ++ lib.optional (ch4backend == "ucx") ucx - ++ lib.optional (ch4backend == "libfabric") libfabric; + ++ lib.optional (!stdenv.isDarwin) ch4backend; doCheck = true; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index 9470b812586a3..f2d3a55955303 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "https://ebassi.github.io/mutest/mutest.md.html"; description = "A BDD testing framework for C, inspired by Mocha"; license = licenses.mit; - maintainers = with maintainers; [ jtojnar worldofpeace ]; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e6e2190a1a60a..962204268d7f2 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -18,7 +18,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.63"; + version = "3.64"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0892xbjcaw6g4rd2rs4qa37nbda248cjrgxa4faaw0licbpjyb8q"; + sha256 = "09hivz4qf3dw7m21lshw34l0yncinwn4ax5w3rpkm71f2wkm85yk"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 9ba581e3a401c..79bc2421dc997 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome3, gtk3, gobject-introspection, pkg-config, lib, stdenv }: +{ cairo, fetchzip, glib, gnome, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobject-introspection - gnome3.gnome-common gtk3 gnome3.libsoup + gnome.gnome-common gtk3 gnome.libsoup ]; meta = with lib; { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 0369cedebf4cc..f4dba00d3518d 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , cairo , harfbuzz @@ -10,7 +9,7 @@ , gobject-introspection , darwin , fribidi -, gnome3 +, gnome , gi-docgen , makeFontsConf , freefont_ttf @@ -22,23 +21,15 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.48.3"; + version = "1.48.4"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin"; + sha256 = "0ym3cvajy2asapj8xbhfpy05rak79afrhi32hiss0w900vxi72a1"; }; - patches = [ - # Install developer documentation. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/pango/commit/a2f35860115e8cd44f07d5158e2df059e8163a08.patch"; - sha256 = "hN7O4DBk4A+TmBl6DGx6RHni5qRBg6akdjv9o3iWKDQ="; - }) - ]; - nativeBuildInputs = [ meson ninja glib # for glib-mkenum @@ -88,8 +79,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix new file mode 100644 index 0000000000000..3c25d113d727f --- /dev/null +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -0,0 +1,65 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, python3 +, pango +, glibmm_2_68 +, cairomm_1_16 +, gnome +, ApplicationServices +}: + +stdenv.mkDerivation rec { + pname = "pangomm"; + version= "2.48.0"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-ng7UdMM/jCACyp4rYcoNHz2OQJ4J6Z9NjBnur8z1W3g="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ] ++ lib.optional stdenv.isDarwin [ + ApplicationServices + ]; + + propagatedBuildInputs = [ + pango + glibmm_2_68 + cairomm_1_16 + ]; + + doCheck = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "${pname}_2_48"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "C++ interface to the Pango text rendering library"; + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK widget toolkit. + Pango forms the core of text and font handling for GTK. + ''; + homepage = "https://www.pango.org/"; + license = licenses.lgpl21Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 3eb5f39c3825a..afb79c7eafed4 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome3 +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome , ApplicationServices }: stdenv.mkDerivation rec { @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index 87e2ae9631c50..d6cbe7cc4dd02 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -1,38 +1,44 @@ { lib , stdenv , fetchurl +, autoreconfHook , boost -, fastjet , gfortran , lhapdf -, python2 -, root +, ncurses +, python +, swig , yoda , zlib +, withPython ? false }: stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - version = "2.3.1pre-2402"; + version = "2.3.1pre-2411"; src = fetchurl { - url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"; - sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; + urls = [ + "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz" + "https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz" + ]; + sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb"; }; + nativeBuildInputs = lib.optional withPython autoreconfHook; + buildInputs = [ boost - fastjet gfortran gfortran.cc.lib lhapdf - python2 - root yoda - ]; + ] ++ lib.optional withPython python + ++ lib.optional (withPython && python.isPy3k) ncurses; + propagatedBuildInputs = [ zlib - ]; + ] ++ lib.optional withPython swig; preConfigure = '' substituteInPlace ./fastnlotoolkit/Makefile.in \ @@ -41,7 +47,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-yoda=${yoda}" - ]; + ] ++ lib.optional withPython "--enable-pyext"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 133853e2362a0..b3e740f39c46c 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -42,7 +42,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.26"; + version = "0.3.27"; outputs = [ "out" @@ -60,7 +60,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-s9+70XXMN4K3yDVwIu+L15gL6rFlpRNVQpeekZQOEec="; + sha256 = "sha256-GfcMODQWtcahBvXnZ98/PKIm4pkqLaz09oOy7zQR4IA="; }; patches = [ diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 7e8e95ef1eacc..7f0ad5acdceb2 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -116,6 +116,6 @@ stdenv.mkDerivation rec { description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); }; } diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index fd2a8ab92cfab..5a41fb0c341d0 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -10,7 +10,7 @@ let mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "poppler-${suffix}-${version}"; version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! @@ -63,4 +63,17 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; }; -} +} // lib.optionalAttrs stdenv.isDarwin { + patches = [ + # Fix build due to improperly used volatile in poppler-glib. + # https://gitlab.freedesktop.org/poppler/poppler/merge_requests/836 + (fetchpatch { + url = "https://gitlab.freedesktop.org/poppler/poppler/commit/47de887d7658cfd68df44b3acf710971054f957b.patch"; + sha256 = "uvYibBn2fOEqdotxK0Wpf8KhGYZXrpHdmS4jjlRNCj8="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/poppler/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5.patch"; + sha256 = "WDUYXX6v5zk7tusz7DGBP58yFzgEvoBlNSLbfk7+QTc="; + }) + ]; +}) diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/development/libraries/presage/default.nix new file mode 100644 index 0000000000000..df15e73f73cf9 --- /dev/null +++ b/pkgs/development/libraries/presage/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, dbus +, doxygen +, fontconfig +, gettext +, graphviz +, help2man +, pkg-config +, sqlite +, tinyxml +, cppunit +}: + +stdenv.mkDerivation rec { + pname = "presage"; + version = "0.9.1"; + + src = fetchurl { + url = "mirror://sourceforge/presage/presage/${version}/presage-${version}.tar.gz"; + sha256 = "0rm3b3zaf6bd7hia0lr1wyvi1rrvxkn7hg05r5r1saj0a3ingmay"; + }; + + patches = [ + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/presage/gcc6.patch"; + sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj"; + }) + ./fixed-cppunit-detection.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + doxygen + fontconfig + gettext + graphviz + help2man + pkg-config + ]; + + preBuild = '' + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + ''; + + buildInputs = [ + dbus + sqlite + tinyxml + ]; + + checkInputs = [ + cppunit + ]; + + doCheck = true; + + checkTarget = "check"; + + meta = with lib; { + description = "An intelligent predictive text entry system"; + homepage = "https://presage.sourceforge.io/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/libraries/presage/fixed-cppunit-detection.patch b/pkgs/development/libraries/presage/fixed-cppunit-detection.patch new file mode 100644 index 0000000000000..27238d2956d18 --- /dev/null +++ b/pkgs/development/libraries/presage/fixed-cppunit-detection.patch @@ -0,0 +1,46 @@ +From 5624aa156c551ab2b81bb86279844397ed690653 Mon Sep 17 00:00:00 2001 +From: Matteo Vescovi <matteo.vescovi@yahoo.co.uk> +Date: Sun, 21 Jan 2018 17:17:12 +0000 +Subject: [PATCH] Fixed cppunit detection. + +--- + configure.ac | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a02e9f1..1538a51 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -204,10 +204,16 @@ AM_CONDITIONAL([USE_SQLITE], [test "x$use_sqlite" = "xyes"]) + dnl ================== + dnl Checks for CppUnit + dnl ================== +-AM_PATH_CPPUNIT([1.9.6], +- [], +- [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])]) +-AM_CONDITIONAL([HAVE_CPPUNIT], [test "$CPPUNIT_LIBS"]) ++PKG_CHECK_MODULES([CPPUNIT], ++ [cppunit >= 1.9], ++ [have_cppunit=yes], ++ [AM_PATH_CPPUNIT([1.9], ++ [have_cppunit=yes], ++ [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])]) ++ ]) ++AC_SUBST([CPPUNIT_CFLAGS]) ++AC_SUBST([CPPUNIT_LIBS]) ++AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$have_cppunit" = "xyes"]) + + + dnl ============================ +@@ -592,7 +598,7 @@ then + else + build_demo_application="no" + fi +-if test "$CPPUNIT_LIBS" ++if test "x$have_cppunit" = "xyes" + then + build_unit_tests="yes" + else +-- +2.31.1 + diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index f739c1bc275e0..e3bb938f5f8f0 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { description = "QPlatformTheme for a better Qt application inclusion in GNOME"; homepage = "https://github.com/FedoraQt/QGnomePlatform"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 63e893ea69ff9..fcb6297f51914 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -98,6 +98,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 3e3790ed1a4c9..02b170e0eb172 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -111,6 +111,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index f969254b59524..9712914c9ec21 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -135,6 +135,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 522456cfa40d3..b8995e6a2c484 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome}: let pname = "rarian"; version = "0.8.1"; @@ -15,12 +15,6 @@ in stdenv.mkDerivation rec { ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - meta = with lib; { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; homepage = "https://rarian.freedesktop.org/"; diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index b6ec4842e077c..0f16a519169f8 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -2,6 +2,7 @@ , substituteAll , pkg-config , fetchurl +, fetchpatch , python3Packages , gettext , itstool @@ -51,6 +52,13 @@ in stdenv.mkDerivation rec { src = ./fix-paths.patch; utillinux = util-linux; }) + + # Fix build with Glib 2.68 + # https://github.com/brailcom/speechd/pull/462 + (fetchpatch { + url = "https://github.com/brailcom/speechd/commit/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch"; + sha256 = "8Q7tUdKKBBtgXZZnj59OcJOkrCNeBR9gkBjhKlpW0hQ="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 2c89e3f433ab4..c0ee2c1d3506d 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let version = "3.34.0"; pname = "template-glib"; @@ -21,8 +21,9 @@ stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 84d50faf54e25..f561efb473c59 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -3,7 +3,7 @@ , meson , ninja , amtk -, gnome3 +, gnome , gobject-introspection , gtk3 , gtksourceview4 @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "5.0.1"; + version = "6.00.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sSdJZ2CfUkSEs4d1+p7LKWxtZhaqvQUvKGM5oomRKAQ="; + sha256 = "0qvs7s86gqyyrzi0r5fbrj8zczlgv8xhdjswgbgc1afwjnl9fqx8"; }; nativeBuildInputs = [ @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { # correctly installed or GVfs metadata are not supported on this platform. In # the latter case, you should configure Tepl with --disable-gvfs-metadata. - passthru.updateScript = gnome3.updateScript { packageName = pname; }; + passthru.updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index c93ec8dccf9be..08c989b799b6e 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; @@ -10,8 +10,9 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 5b4c1d195ecea..c571e2238447f 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -20,7 +20,7 @@ , exempi , giflib , glib -, gnome3 +, gnome , gst_all_1 , icu , json-glib @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.0.4"; + version = "3.1.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-E877xx1S93RvPTfQQdjFvBM2pA/13ZK1Nw6GUMJqiY4="; + sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg="; }; nativeBuildInputs = [ @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index ab769312c36f4..0ee5e0fa56721 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , gettext , meson , ninja @@ -17,7 +18,7 @@ , sqlite , libxslt , libstemmer -, gnome3 +, gnome , icu , libuuid , libsoup @@ -27,15 +28,15 @@ , substituteAll }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "tracker"; - version = "3.0.3"; + version = "3.1.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM="; + sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc="; }; patches = [ @@ -43,6 +44,17 @@ stdenv.mkDerivation (rec { src = ./fix-paths.patch; inherit asciidoc; }) + + # Add missing build target dependencies to fix parallel building of docs. + # TODO: Upstream this. + ./fix-docs.patch + + # Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands + # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/tracker/merge_requests/401.patch"; + sha256 = "QEf+ciGkkCzanmtGO0aig6nAxd+NxjvuNi4RbNOwZEA="; + }) ]; nativeBuildInputs = [ @@ -74,22 +86,23 @@ stdenv.mkDerivation (rec { libstemmer ]; - checkInputs = [ - python3.pkgs.pygobject3 + checkInputs = with python3.pkgs; [ + pygobject3 + tappy ]; mesonFlags = [ "-Ddocs=true" ]; - # https://gitlab.gnome.org/GNOME/tracker/-/issues/292#note_1075369 - doCheck = !stdenv.isi686; + doCheck = true; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate patchShebangs tests/functional-tests/test-runner.sh.in patchShebangs tests/functional-tests/*.py + patchShebangs examples/python/endpoint.py ''; preCheck = '' @@ -120,7 +133,7 @@ stdenv.mkDerivation (rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; @@ -134,8 +147,3 @@ stdenv.mkDerivation (rec { platforms = platforms.linux; }; } - // { - # TMP: fatal error: libtracker-sparql/tracker-sparql-enum-types.h: No such file or directory - enableParallelBuilding = false; - } -) diff --git a/pkgs/development/libraries/tracker/fix-docs.patch b/pkgs/development/libraries/tracker/fix-docs.patch new file mode 100644 index 0000000000000..a6ff84cda3e58 --- /dev/null +++ b/pkgs/development/libraries/tracker/fix-docs.patch @@ -0,0 +1,28 @@ +diff --git a/docs/reference/libtracker-sparql/examples/meson.build b/docs/reference/libtracker-sparql/examples/meson.build +index 1cb1d9f3f..313c72345 100644 +--- a/docs/reference/libtracker-sparql/examples/meson.build ++++ b/docs/reference/libtracker-sparql/examples/meson.build +@@ -1,20 +1,20 @@ + executable( + 'readonly-example', + 'readonly-example.c', +- dependencies: tracker_sparql_dep, ++ dependencies: [tracker_common_dep, tracker_sparql_dep], + build_by_default: true + ) + + executable( + 'writeonly-example', + 'writeonly-example.c', +- dependencies: tracker_sparql_dep, ++ dependencies: [tracker_common_dep, tracker_sparql_dep], + build_by_default: true + ) + + executable( + 'writeonly-with-blank-nodes-example', + 'writeonly-with-blank-nodes-example.c', +- dependencies: tracker_sparql_dep, ++ dependencies: [tracker_common_dep, tracker_sparql_dep], + build_by_default: true + ) diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index d27adb2a061df..2dac161bb4a41 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv -, docbook_xsl +{ stdenv +, lib +, docbook-xsl-nons , fetchurl +, fetchpatch , glib , gobject-introspection , gtk-doc @@ -19,21 +21,23 @@ stdenv.mkDerivation rec { pname = "umockdev"; version = "0.15.4"; - outputs = [ "bin" "out" "dev" "doc" ]; + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg"; }; - mesonFlags = [ - "-Dgtk_doc=true" + patches = [ + # Fix build with Vala 0.52 + (fetchpatch { + url = "https://github.com/martinpitt/umockdev/commit/a236f0b55fbb6ff50a6429da9d404703d6637d94.patch"; + sha256 = "sZs9Ove1r7te/a9vmWUmFetLVhyzhHmx7ijhkK/2S5o="; + }) ]; - buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ - docbook_xsl + docbook-xsl-nons gobject-introspection gtk-doc meson @@ -42,20 +46,27 @@ stdenv.mkDerivation rec { vala ]; - checkInputs = [ python3 which usbutils ]; + buildInputs = [ + glib + systemd + libgudev + ]; + + checkInputs = [ + python3 + which + usbutils + ]; - enableParallelBuilding = true; + mesonFlags = [ + "-Dgtk_doc=true" + ]; doCheck = true; - postInstall = '' - mkdir -p $doc/share/doc/umockdev/ - mv docs/reference $doc/share/doc/umockdev/ - ''; - meta = with lib; { description = "Mock hardware devices for creating unit tests"; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; platforms = with platforms; linux; }; diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 4a9e4d8a66c90..55ef86c88a0e6 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { the system's terminfo database. ''; license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; + maintainers = with maintainers; [ astsmtl antono ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index a17b164445f32..c3631cccbe01c 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -6,11 +6,12 @@ , pkg-config , meson , ninja -, gnome3 +, gnome , glib , gtk3 , gobject-introspection , vala +, python3 , libxml2 , gnutls , gperf @@ -24,18 +25,25 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.62.2"; + version = "0.64.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A="; + sha256 = "sha256-EvtBqf+OA8XxcRtGVgkQpLmzECrsPp52Cc7vTfqYqio="; }; - passthru = { - updateScript = gnome3.updateScript { packageName = pname; }; - }; + patches = [ + # VTE needs a small patch to work with musl: + # https://gitlab.gnome.org/GNOME/vte/issues/72 + # Taken from https://git.alpinelinux.org/aports/tree/community/vte3 + (fetchpatch { + name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; + sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; + }) + ]; nativeBuildInputs = [ gettext @@ -46,6 +54,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala + python3 ]; buildInputs = [ @@ -64,22 +73,20 @@ stdenv.mkDerivation rec { pango ]; - patches = - # VTE needs a small patch to work with musl: - # https://gitlab.gnome.org/GNOME/vte/issues/72 - lib.optional - stdenv.hostPlatform.isMusl - (fetchpatch { - name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; - url = "https://gitlab.gnome.org/GNOME/vte/uploads/c334f767f5d605e0f30ecaa2a0e4d226/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; - sha256 = "1ii9db9i5l3fy2alxz7bjfsgjs3lappnlx339dvxbi2141zknf5r"; - }); - postPatch = '' patchShebangs perf/* patchShebangs src/box_drawing_generate.sh + patchShebangs src/parser-seq.py + patchShebangs src/modes.py ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "odd-unstable"; + }; + }; + meta = with lib; { homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; @@ -91,8 +98,8 @@ stdenv.mkDerivation rec { character set conversion, as well as emulating any terminal known to the system's terminfo database. ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ] ++ teams.gnome.members; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ astsmtl antono ] ++ teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 84a9e2a1db779..f4b716ee6d4e8 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -57,8 +57,6 @@ assert enableGeoLocation -> geoclue2 != null; -with lib; - stdenv.mkDerivation rec { pname = "webkitgtk"; version = "2.32.0"; @@ -72,7 +70,7 @@ stdenv.mkDerivation rec { sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx"; }; - patches = optionals stdenv.isLinux [ + patches = lib.optionals stdenv.isLinux [ (substituteAll { src = ./fix-bubblewrap-paths.patch; inherit (builtins) storeDir; @@ -85,7 +83,7 @@ stdenv.mkDerivation rec { # pick up the wrong gettext. TODO: Find a better solution for # this, maybe make cmake not look up executables in # CMAKE_PREFIX_PATH. - cmakeFlags+=" -DCMAKE_IGNORE_PATH=${getBin gettext}/bin" + cmakeFlags+=" -DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin" ''; nativeBuildInputs = [ @@ -118,7 +116,9 @@ stdenv.mkDerivation rec { libgcrypt libidn libintl + ] ++ lib.optionals stdenv.isLinux [ libmanette + ] ++ [ libnotify libpthreadstubs libsecret @@ -138,16 +138,16 @@ stdenv.mkDerivation rec { libXdmcp libXt libXtst - ]) ++ optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.isDarwin [ libedit readline - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ bubblewrap libseccomp systemd wayland xdg-dbus-proxy - ] ++ optional enableGeoLocation geoclue2; + ] ++ lib.optional enableGeoLocation geoclue2; propagatedBuildInputs = [ gtk3 @@ -159,27 +159,34 @@ stdenv.mkDerivation rec { "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" - ] ++ optionals stdenv.isDarwin [ - "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + ] ++ lib.optionals stdenv.isDarwin [ + "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" "-DENABLE_MINIBROWSER=OFF" - "-DENABLE_OPENGL=OFF" "-DENABLE_QUARTZ_TARGET=ON" "-DENABLE_VIDEO=ON" "-DENABLE_WEBGL=OFF" "-DENABLE_WEB_AUDIO=OFF" "-DENABLE_X11_TARGET=OFF" - "-DUSE_ACCELERATE=0" + "-DUSE_APPLE_ICU=OFF" + "-DUSE_OPENGL_OR_ES=OFF" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ lib.optionals (!stdenv.isLinux) [ + "-DUSE_SYSTEMD=OFF" + ] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; postPatch = '' patchShebangs . + '' + lib.optionalString stdenv.isDarwin '' + # It needs malloc_good_size. + sed 22i'#include <malloc/malloc.h>' -i Source/WTF/wtf/FastMalloc.h + # <CommonCrypto/CommonRandom.h> needs CCCryptorStatus. + sed 43i'#include <CommonCrypto/CommonCryptor.h>' -i Source/WTF/wtf/RandomDevice.cpp ''; requiredSystemFeatures = [ "big-parallel" ]; - meta = { + meta = with lib; { description = "Web content rendering engine, GTK port"; homepage = "https://webkitgtk.org/"; license = licenses.bsd2; diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 469da2523d99a..b6064c42b5c96 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -14,7 +14,7 @@ let mkEnable = mkFlag "enable-" "disable-"; mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optLz4 = shouldUsePkg lz4; optSnappy = shouldUsePkg snappy; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index be96001c46fb2..93a308a658da4 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -5,7 +5,7 @@ , libxml2 , xdg-desktop-portal , gtk3 -, gnome3 +, gnome , glib , wrapGAppsHook , gsettings-desktop-schemas @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gsettings-desktop-schemas + gsettings-desktop-schemas # settings exposed by settings portal gtk3 - gnome3.gnome-desktop - gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc) + gnome.gnome-desktop + gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; meta = with lib; { diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index d84023bf9e9c4..8915299a7349b 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , aalib , alsaLib , ffmpeg @@ -16,6 +15,7 @@ , libtheora , libv4l , libvorbis +, ncurses , perl , pkg-config , speex @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { libtheora libv4l libvorbis + ncurses perl speex vcdimager @@ -64,18 +65,10 @@ stdenv.mkDerivation rec { libxcb ]); - patches = [ - # splitting path plugin - (fetchpatch { - name = "0001-fix-XINE_PLUGIN_PATH-splitting.patch"; - url = "https://sourceforge.net/p/xine/mailman/attachment/32394053-5e27-6558-f0c9-49e0da0bc3cc%40gmx.de/1/"; - sha256 = "sha256-LJedxrD8JWITDo9pnS9BCmy7wiPTyJyoQ1puX49tOls="; - }) - ]; + enableParallelBuilding = true; NIX_LDFLAGS = "-lxcb-shm"; - enableParallelBuilding = true; meta = with lib; { homepage = "http://www.xinehq.de/"; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 039ecc610f414..de1953622e93b 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "zeitgeist"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py"; @@ -29,14 +29,14 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ig3d3j1n0ghaxsgfww6g2hhcdwx8cljwwfmp9jk1nrvkxd6rnmv"; + sha256 = "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp"; }; patches = [ - # Fix build with gettext 0.20 + # Fix build with Vala 0.52 (fetchpatch { - url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/b5c00e80189fd59a059a95c4e276728a2492cb89.patch"; - sha256 = "1r7f7j3l2p6xlzxajihgx8bzbc2sxcb9spc9pi26rz9bwmngdyq7"; + url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/64ac3a6f94cd299e5e14945dc31b48f009dec152.patch"; + sha256 = "Dw1kNE3JoFdmgcQ0eFoFLYvmxlPjXNj56Jkn2meINz4="; }) ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; - maintainers = with maintainers; [ lethalman worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix index 7f49430c15c3d..17bedd5e7d326 100644 --- a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix +++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix @@ -6,9 +6,8 @@ mkDerivation { version = "0.16.1.0"; src = fetchgit { url = "https://github.com/hercules-ci/optparse-applicative.git"; - sha256 = "0v0r11jaav95im82if976256kncp0ji7nfdrlpbgmwxnkj1hxl48"; - rev = "f9d1242f9889d2e09ff852db9dc2d231d9a3e8d8"; - fetchSubmodules = true; + sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp"; + rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e"; }; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix new file mode 100644 index 0000000000000..690ed3e45e717 --- /dev/null +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchurl, unzip, autoPatchelfHook }: + +with lib; + +let + archPostfix = optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; +in stdenv.mkDerivation rec { + pname = "msp-debug-stack-bin"; + version = "3.15.1.1"; + src = fetchurl { + url = "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPDS/3_15_1_001/export/MSP430_DLL_Developer_Package_Rev_3_15_1_1.zip"; + sha256 = "1m1ssrwbhqvqwbp3m4hnjyxnz3f9d4acz9vl1av3fbnhvxr0d2hb"; + }; + sourceRoot = "."; + + libname = + if stdenv.hostPlatform.isWindows then "MSP430${archPostfix}.dll" + else "libmsp430${archPostfix}${stdenv.hostPlatform.extensions.sharedLibrary}"; + + nativeBuildInputs = [ unzip autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc ]; + + installPhase = '' + install -Dm0755 $libname $out/lib/''${libname//_64/} + install -Dm0644 -t $out/include Inc/*.h + ''; + + meta = { + description = "Unfree binary release of the TI MSP430 FET debug driver"; + homepage = https://www.ti.com/tool/MSPDS; + license = licenses.unfree; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aerialx ]; + }; +} diff --git a/pkgs/development/misc/msp430/mspds/bsl430.patch b/pkgs/development/misc/msp430/mspds/bsl430.patch new file mode 100644 index 0000000000000..6c57fb040e267 --- /dev/null +++ b/pkgs/development/misc/msp430/mspds/bsl430.patch @@ -0,0 +1,51 @@ +diff -ruN a/Makefile b/Makefile +--- a/Makefile 2020-06-03 16:10:18.000000000 -0700 ++++ b/Makefile 2020-07-21 18:03:12.464121056 -0700 +@@ -42,7 +42,7 @@ + + PLATFORM := $(shell uname -s) + ifeq ($(PLATFORM),Linux) +- CXX:= g++ ++ CXX?= g++ + + STATICOUTPUT := linux64 + +@@ -68,7 +68,7 @@ + + HIDOBJ := $(LIBTHIRD)/hid-libusb.o + else +- CXX:= clang++ ++ CXX?= clang++ + + OUTPUT := libmsp430.dylib + STATICOUTPUT := mac64 +@@ -134,7 +134,7 @@ + $(CXX) -c -o $@ $< $(USE_PCH) $(CXXFLAGS) $(INCLUDES) $(DEFINES) + + $(BSLLIB): +- $(MAKE) -C ./ThirdParty/BSL430_DLL ++ $(MAKE) -C ./ThirdParty/BSL430_DLL OUTPUT=../../$(BSLLIB) + + install: + cp $(OUTPUT) /usr/local/lib/ +diff -ruN a/ThirdParty/BSL430_DLL/Makefile b/ThirdParty/BSL430_DLL/Makefile +--- a/ThirdParty/BSL430_DLL/Makefile 2019-11-18 13:16:00.000000000 -0800 ++++ b/ThirdParty/BSL430_DLL/Makefile 2020-07-21 18:02:55.987782494 -0700 +@@ -36,7 +36,7 @@ + + PLATFORM := $(shell uname -s) + ifeq ($(PLATFORM),Linux) +- CXX:= g++ ++ CXX?= g++ + + ifdef BIT32 + CXXFLAGS += -m32 +@@ -47,7 +47,7 @@ + INCLUDES += -I$(BOOST_DIR) + endif + else +- CXX:= clang++ ++ CXX?= clang++ + + ifdef BOOST_DIR + INCLUDES += -I$(BOOST_DIR)/include diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/development/misc/msp430/mspds/default.nix new file mode 100644 index 0000000000000..2481b50bfbef6 --- /dev/null +++ b/pkgs/development/misc/msp430/mspds/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, lib +, fetchurl, unzip +, boost, pugixml +, hidapi +, libusb1 ? null +}: + +with lib; +assert stdenv.isLinux -> libusb1 != null; + +let + hidapiDriver = optionalString stdenv.isLinux "-libusb"; + +in stdenv.mkDerivation { + pname = "msp-debug-stack"; + version = "3.15.1.1"; + + src = fetchurl { + url = "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPDS/3_15_1_001/export/MSPDebugStack_OS_Package_3_15_1_1.zip"; + sha256 = "1j5sljqwc20zrb50mrji4mnmw5i680qc7n0lb0pakrrxqjc9m9g3"; + }; + sourceRoot = "."; + + enableParallelBuilding = true; + libName = "libmsp430${stdenv.hostPlatform.extensions.sharedLibrary}"; + makeFlags = [ "OUTPUT=$(libName)" "HIDOBJ=" ]; + NIX_LDFLAGS = [ "-lpugixml" "-lhidapi${hidapiDriver}" ]; + NIX_CFLAGS_COMPILE = [ "-I${hidapi}/include/hidapi" ]; + + patches = [ ./bsl430.patch ]; + + preBuild = '' + rm ThirdParty/src/pugixml.cpp + rm ThirdParty/include/pugi{config,xml}.hpp + '' + optionalString stdenv.isDarwin '' + makeFlagsArray+=(OUTNAME="-install_name ") + ''; + + installPhase = '' + install -Dm0755 -t $out/lib $libName + install -Dm0644 -t $out/include DLL430_v3/include/*.h + ''; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ boost hidapi pugixml ] + ++ optional stdenv.isLinux libusb1; + + meta = { + description = "TI MSP430 FET debug driver"; + homepage = https://www.ti.com/tool/MSPDS; + license = licenses.bsd3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ aerialx ]; + }; +} diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index bf348d68041a3..fc3be7421adb2 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -4,34 +4,50 @@ , libxml2 , libxslt , itstool -, gnome3 +, gnome , pkg-config +, meson +, ninja +, python3 }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "3.38.0"; + version = "40.0"; + + format = "other"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30"; + url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6"; }; nativeBuildInputs = [ pkg-config + meson + ninja + ]; + + propagatedBuildInputs = [ + libxml2 # xmllint required by yelp-check. + libxslt # xsltproc required by yelp-build and yelp-check. ]; buildInputs = [ - libxml2 - libxslt - itstool - gnome3.yelp-xsl + itstool # build script checks for its presence but I am not sure if anything uses it + gnome.yelp-xsl ]; + pythonPath = [ + python3.pkgs.lxml + ]; + + strictDeps = false; # TODO: Meson cannot find xmllint oherwise. Maybe add it to machine file? + doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index 2f85221e539c6..de6ade61518a7 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -1,4 +1,4 @@ -{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re }: +{ lib, menhir, easy-format, fetchurl, buildDunePackage, which, re, nixosTests }: buildDunePackage rec { pname = "atd"; @@ -18,6 +18,10 @@ buildDunePackage rec { doCheck = true; + passthru.tests = { + smoke-test = nixosTests.atd; + }; + meta = with lib; { homepage = "https://github.com/mjambon/atd"; description = "Syntax for cross-language type definitions"; diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix index da114a4d348fa..caf3b515aabb6 100644 --- a/pkgs/development/php-packages/phpcbf/default.nix +++ b/pkgs/development/php-packages/phpcbf/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, lib, php, makeWrapper }: let pname = "phpcbf"; - version = "3.5.8"; + version = "3.6.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "15ci30yvw3p9zlmzsk9s4mxzb3wax3gl9p55slhf1bzwn1xxwyb0"; + sha256 = "04wb1imm4934mpy2hxcmqh4cn7md1vwmfii39p6mby809325b5z1"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix index d2053dbe9cb73..87433066ea99b 100644 --- a/pkgs/development/php-packages/phpcs/default.nix +++ b/pkgs/development/php-packages/phpcs/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpcs"; - version = "3.5.8"; + version = "3.6.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "037mdnpbgd9xaj556pf14h02a4a6f5zzdg58p2z1sivxcygf8aka"; + sha256 = "0sdi78hrwd3r5p1b38qmp89m41kfszh2qn4n5zhq2dmhsjdhjziz"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index 012f31c266b21..d997b120d3bfc 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -5,6 +5,7 @@ , markdown , docutils , pygments +, pyyaml }: buildPythonPackage rec { @@ -16,7 +17,7 @@ buildPythonPackage rec { sha256 = "e309d79dde0935576ce1def6752f2127a12e2c2ea2ae8b0c69f99ff8bc12181d"; }; - checkInputs = [ markdown docutils pygments ]; + checkInputs = [ markdown docutils pygments pyyaml ]; propagatedBuildInputs = [ python-markdown-math ]; meta = { diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 5d0ee6f7c42ed..7e18131eebf64 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.8.0"; + version = "3.11.0"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-AjUpxdY/5IoWMBtufP3OVnMpUwpxgpCNWoydH1w+t+Y="; + sha256 = "sha256-FgE0/OnqUuzpC5jCM4Q1g49F3fg1Mdstr7nys7G1MOs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch b/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch new file mode 100644 index 0000000000000..0d319eb2a0d4b --- /dev/null +++ b/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch @@ -0,0 +1,498 @@ +From 17b5be250cb5ecf95cf4f77c8c930450d876efa6 Mon Sep 17 00:00:00 2001 +From: dzen <benoit.calvez@polyconseil.fr> +Date: Thu, 12 Mar 2020 08:32:29 +0100 +Subject: [PATCH 1/3] Moves to pamqp 3.0 + +--- + aioamqp/channel.py | 114 +++++++++++++++++++------------------- + aioamqp/frame.py | 1 - + aioamqp/protocol.py | 22 ++++---- + aioamqp/tests/testcase.py | 2 +- + 4 files changed, 69 insertions(+), 70 deletions(-) + +diff --git a/aioamqp/channel.py b/aioamqp/channel.py +index 7f0f402..ea164c4 100644 +--- a/aioamqp/channel.py ++++ b/aioamqp/channel.py +@@ -9,7 +9,7 @@ + from itertools import count + import warnings + +-import pamqp.specification ++import pamqp.commands + + from . import frame as amqp_frame + from . import exceptions +@@ -78,35 +78,35 @@ def connection_closed(self, server_code=None, server_reason=None, exception=None + + async def dispatch_frame(self, frame): + methods = { +- pamqp.specification.Channel.OpenOk.name: self.open_ok, +- pamqp.specification.Channel.FlowOk.name: self.flow_ok, +- pamqp.specification.Channel.CloseOk.name: self.close_ok, +- pamqp.specification.Channel.Close.name: self.server_channel_close, +- +- pamqp.specification.Exchange.DeclareOk.name: self.exchange_declare_ok, +- pamqp.specification.Exchange.BindOk.name: self.exchange_bind_ok, +- pamqp.specification.Exchange.UnbindOk.name: self.exchange_unbind_ok, +- pamqp.specification.Exchange.DeleteOk.name: self.exchange_delete_ok, +- +- pamqp.specification.Queue.DeclareOk.name: self.queue_declare_ok, +- pamqp.specification.Queue.DeleteOk.name: self.queue_delete_ok, +- pamqp.specification.Queue.BindOk.name: self.queue_bind_ok, +- pamqp.specification.Queue.UnbindOk.name: self.queue_unbind_ok, +- pamqp.specification.Queue.PurgeOk.name: self.queue_purge_ok, +- +- pamqp.specification.Basic.QosOk.name: self.basic_qos_ok, +- pamqp.specification.Basic.ConsumeOk.name: self.basic_consume_ok, +- pamqp.specification.Basic.CancelOk.name: self.basic_cancel_ok, +- pamqp.specification.Basic.GetOk.name: self.basic_get_ok, +- pamqp.specification.Basic.GetEmpty.name: self.basic_get_empty, +- pamqp.specification.Basic.Deliver.name: self.basic_deliver, +- pamqp.specification.Basic.Cancel.name: self.server_basic_cancel, +- pamqp.specification.Basic.Ack.name: self.basic_server_ack, +- pamqp.specification.Basic.Nack.name: self.basic_server_nack, +- pamqp.specification.Basic.RecoverOk.name: self.basic_recover_ok, +- pamqp.specification.Basic.Return.name: self.basic_return, +- +- pamqp.specification.Confirm.SelectOk.name: self.confirm_select_ok, ++ pamqp.commands.Channel.OpenOk.name: self.open_ok, ++ pamqp.commands.Channel.FlowOk.name: self.flow_ok, ++ pamqp.commands.Channel.CloseOk.name: self.close_ok, ++ pamqp.commands.Channel.Close.name: self.server_channel_close, ++ ++ pamqp.commands.Exchange.DeclareOk.name: self.exchange_declare_ok, ++ pamqp.commands.Exchange.BindOk.name: self.exchange_bind_ok, ++ pamqp.commands.Exchange.UnbindOk.name: self.exchange_unbind_ok, ++ pamqp.commands.Exchange.DeleteOk.name: self.exchange_delete_ok, ++ ++ pamqp.commands.Queue.DeclareOk.name: self.queue_declare_ok, ++ pamqp.commands.Queue.DeleteOk.name: self.queue_delete_ok, ++ pamqp.commands.Queue.BindOk.name: self.queue_bind_ok, ++ pamqp.commands.Queue.UnbindOk.name: self.queue_unbind_ok, ++ pamqp.commands.Queue.PurgeOk.name: self.queue_purge_ok, ++ ++ pamqp.commands.Basic.QosOk.name: self.basic_qos_ok, ++ pamqp.commands.Basic.ConsumeOk.name: self.basic_consume_ok, ++ pamqp.commands.Basic.CancelOk.name: self.basic_cancel_ok, ++ pamqp.commands.Basic.GetOk.name: self.basic_get_ok, ++ pamqp.commands.Basic.GetEmpty.name: self.basic_get_empty, ++ pamqp.commands.Basic.Deliver.name: self.basic_deliver, ++ pamqp.commands.Basic.Cancel.name: self.server_basic_cancel, ++ pamqp.commands.Basic.Ack.name: self.basic_server_ack, ++ pamqp.commands.Basic.Nack.name: self.basic_server_nack, ++ pamqp.commands.Basic.RecoverOk.name: self.basic_recover_ok, ++ pamqp.commands.Basic.Return.name: self.basic_return, ++ ++ pamqp.commands.Confirm.SelectOk.name: self.confirm_select_ok, + } + + if frame.name not in methods: +@@ -144,7 +144,7 @@ async def _write_frame_awaiting_response(self, waiter_id, channel_id, request, + + async def open(self): + """Open the channel on the server.""" +- request = pamqp.specification.Channel.Open() ++ request = pamqp.commands.Channel.Open() + return (await self._write_frame_awaiting_response( + 'open', self.channel_id, request, no_wait=False, check_open=False)) + +@@ -159,7 +159,7 @@ async def close(self, reply_code=0, reply_text="Normal Shutdown"): + if not self.is_open: + raise exceptions.ChannelClosed("channel already closed or closing") + self.close_event.set() +- request = pamqp.specification.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) ++ request = pamqp.commands.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) + return (await self._write_frame_awaiting_response( + 'close', self.channel_id, request, no_wait=False, check_open=False)) + +@@ -169,7 +169,7 @@ async def close_ok(self, frame): + self.protocol.release_channel_id(self.channel_id) + + async def _send_channel_close_ok(self): +- request = pamqp.specification.Channel.CloseOk() ++ request = pamqp.commands.Channel.CloseOk() + await self._write_frame(self.channel_id, request) + + async def server_channel_close(self, frame): +@@ -183,7 +183,7 @@ async def server_channel_close(self, frame): + self.connection_closed(results['reply_code'], results['reply_text']) + + async def flow(self, active): +- request = pamqp.specification.Channel.Flow(active) ++ request = pamqp.commands.Channel.Flow(active) + return (await self._write_frame_awaiting_response( + 'flow', self.channel_id, request, no_wait=False, + check_open=False)) +@@ -201,7 +201,7 @@ async def flow_ok(self, frame): + + async def exchange_declare(self, exchange_name, type_name, passive=False, durable=False, + auto_delete=False, no_wait=False, arguments=None): +- request = pamqp.specification.Exchange.Declare( ++ request = pamqp.commands.Exchange.Declare( + exchange=exchange_name, + exchange_type=type_name, + passive=passive, +@@ -222,7 +222,7 @@ async def exchange_declare_ok(self, frame): + return future + + async def exchange_delete(self, exchange_name, if_unused=False, no_wait=False): +- request = pamqp.specification.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) ++ request = pamqp.commands.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) + return await self._write_frame_awaiting_response( + 'exchange_delete', self.channel_id, request, no_wait) + +@@ -235,7 +235,7 @@ async def exchange_bind(self, exchange_destination, exchange_source, routing_key + no_wait=False, arguments=None): + if arguments is None: + arguments = {} +- request = pamqp.specification.Exchange.Bind( ++ request = pamqp.commands.Exchange.Bind( + destination=exchange_destination, + source=exchange_source, + routing_key=routing_key, +@@ -255,7 +255,7 @@ async def exchange_unbind(self, exchange_destination, exchange_source, routing_k + if arguments is None: + arguments = {} + +- request = pamqp.specification.Exchange.Unbind( ++ request = pamqp.commands.Exchange.Unbind( + destination=exchange_destination, + source=exchange_source, + routing_key=routing_key, +@@ -297,7 +297,7 @@ async def queue_declare(self, queue_name=None, passive=False, durable=False, + + if not queue_name: + queue_name = 'aioamqp.gen-' + str(uuid.uuid4()) +- request = pamqp.specification.Queue.Declare( ++ request = pamqp.commands.Queue.Declare( + queue=queue_name, + passive=passive, + durable=durable, +@@ -327,7 +327,7 @@ async def queue_delete(self, queue_name, if_unused=False, if_empty=False, no_wai + if_empty: bool, the queue is deleted if it has no messages. Raise if not. + no_wait: bool, if set, the server will not respond to the method + """ +- request = pamqp.specification.Queue.Delete( ++ request = pamqp.commands.Queue.Delete( + queue=queue_name, + if_unused=if_unused, + if_empty=if_empty, +@@ -346,7 +346,7 @@ async def queue_bind(self, queue_name, exchange_name, routing_key, no_wait=False + if arguments is None: + arguments = {} + +- request = pamqp.specification.Queue.Bind( ++ request = pamqp.commands.Queue.Bind( + queue=queue_name, + exchange=exchange_name, + routing_key=routing_key, +@@ -367,7 +367,7 @@ async def queue_unbind(self, queue_name, exchange_name, routing_key, arguments=N + if arguments is None: + arguments = {} + +- request = pamqp.specification.Queue.Unbind( ++ request = pamqp.commands.Queue.Unbind( + queue=queue_name, + exchange=exchange_name, + routing_key=routing_key, +@@ -383,7 +383,7 @@ async def queue_unbind_ok(self, frame): + logger.debug("Queue unbound") + + async def queue_purge(self, queue_name, no_wait=False): +- request = pamqp.specification.Queue.Purge( ++ request = pamqp.commands.Queue.Purge( + queue=queue_name, nowait=no_wait + ) + return (await self._write_frame_awaiting_response( +@@ -406,7 +406,7 @@ async def basic_publish(self, payload, exchange_name, routing_key, + if properties is None: + properties = {} + +- method_request = pamqp.specification.Basic.Publish( ++ method_request = pamqp.commands.Basic.Publish( + exchange=exchange_name, + routing_key=routing_key, + mandatory=mandatory, +@@ -417,7 +417,7 @@ async def basic_publish(self, payload, exchange_name, routing_key, + + header_request = pamqp.header.ContentHeader( + body_size=len(payload), +- properties=pamqp.specification.Basic.Properties(**properties) ++ properties=pamqp.commands.Basic.Properties(**properties) + ) + await self._write_frame(self.channel_id, header_request, drain=False) + +@@ -446,7 +446,7 @@ async def basic_qos(self, prefetch_size=0, prefetch_count=0, connection_global=F + settings should apply per-consumer channel; and global=true to mean + that the QoS settings should apply per-channel. + """ +- request = pamqp.specification.Basic.Qos( ++ request = pamqp.commands.Basic.Qos( + prefetch_size, prefetch_count, connection_global + ) + return (await self._write_frame_awaiting_response( +@@ -490,7 +490,7 @@ async def basic_consume(self, callback, queue_name='', consumer_tag='', no_local + if arguments is None: + arguments = {} + +- request = pamqp.specification.Basic.Consume( ++ request = pamqp.commands.Basic.Consume( + queue=queue_name, + consumer_tag=consumer_tag, + no_local=no_local, +@@ -561,7 +561,7 @@ async def server_basic_cancel(self, frame): + callback, error) + + async def basic_cancel(self, consumer_tag, no_wait=False): +- request = pamqp.specification.Basic.Cancel(consumer_tag, no_wait) ++ request = pamqp.commands.Basic.Cancel(consumer_tag, no_wait) + return (await self._write_frame_awaiting_response( + 'basic_cancel', self.channel_id, request, no_wait=no_wait) + ) +@@ -575,7 +575,7 @@ async def basic_cancel_ok(self, frame): + logger.debug("Cancel ok") + + async def basic_get(self, queue_name='', no_ack=False): +- request = pamqp.specification.Basic.Get(queue=queue_name, no_ack=no_ack) ++ request = pamqp.commands.Basic.Get(queue=queue_name, no_ack=no_ack) + return (await self._write_frame_awaiting_response( + 'basic_get', self.channel_id, request, no_wait=False) + ) +@@ -606,11 +606,11 @@ async def basic_get_empty(self, frame): + future.set_exception(exceptions.EmptyQueue) + + async def basic_client_ack(self, delivery_tag, multiple=False): +- request = pamqp.specification.Basic.Ack(delivery_tag, multiple) ++ request = pamqp.commands.Basic.Ack(delivery_tag, multiple) + await self._write_frame(self.channel_id, request) + + async def basic_client_nack(self, delivery_tag, multiple=False, requeue=True): +- request = pamqp.specification.Basic.Nack(delivery_tag, multiple, requeue) ++ request = pamqp.commands.Basic.Nack(delivery_tag, multiple, requeue) + await self._write_frame(self.channel_id, request) + + async def basic_server_ack(self, frame): +@@ -620,15 +620,15 @@ async def basic_server_ack(self, frame): + fut.set_result(True) + + async def basic_reject(self, delivery_tag, requeue=False): +- request = pamqp.specification.Basic.Reject(delivery_tag, requeue) ++ request = pamqp.commands.Basic.Reject(delivery_tag, requeue) + await self._write_frame(self.channel_id, request) + + async def basic_recover_async(self, requeue=True): +- request = pamqp.specification.Basic.RecoverAsync(requeue) ++ request = pamqp.commands.Basic.RecoverAsync(requeue) + await self._write_frame(self.channel_id, request) + + async def basic_recover(self, requeue=True): +- request = pamqp.specification.Basic.Recover(requeue) ++ request = pamqp.commands.Basic.Recover(requeue) + return (await self._write_frame_awaiting_response( + 'basic_recover', self.channel_id, request, no_wait=False) + ) +@@ -681,7 +681,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma + delivery_tag = next(self.delivery_tag_iter) # pylint: disable=stop-iteration-return + fut = self._set_waiter('basic_server_ack_{}'.format(delivery_tag)) + +- method_request = pamqp.specification.Basic.Publish( ++ method_request = pamqp.commands.Basic.Publish( + exchange=exchange_name, + routing_key=routing_key, + mandatory=mandatory, +@@ -689,7 +689,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma + ) + await self._write_frame(self.channel_id, method_request, drain=False) + +- properties = pamqp.specification.Basic.Properties(**properties) ++ properties = pamqp.commands.Basic.Properties(**properties) + header_request = pamqp.header.ContentHeader( + body_size=len(payload), properties=properties + ) +@@ -710,7 +710,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma + async def confirm_select(self, *, no_wait=False): + if self.publisher_confirms: + raise ValueError('publisher confirms already enabled') +- request = pamqp.specification.Confirm.Select(nowait=no_wait) ++ request = pamqp.commands.Confirm.Select(nowait=no_wait) + + return (await self._write_frame_awaiting_response( + 'confirm_select', self.channel_id, request, no_wait) +diff --git a/aioamqp/frame.py b/aioamqp/frame.py +index d70cfd7..af27ab5 100644 +--- a/aioamqp/frame.py ++++ b/aioamqp/frame.py +@@ -42,7 +42,6 @@ + import socket + + import pamqp.encode +-import pamqp.specification + import pamqp.frame + + from . import exceptions +diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py +index e111dea..f0b928d 100644 +--- a/aioamqp/protocol.py ++++ b/aioamqp/protocol.py +@@ -5,9 +5,9 @@ + import asyncio + import logging + ++import pamqp.commands + import pamqp.frame + import pamqp.heartbeat +-import pamqp.specification + + from . import channel as amqp_channel + from . import constants as amqp_constants +@@ -159,7 +159,7 @@ async def close(self, no_wait=False, timeout=None): + """Close connection (and all channels)""" + await self.ensure_open() + self.state = CLOSING +- request = pamqp.specification.Connection.Close( ++ request = pamqp.commands.Connection.Close( + reply_code=0, + reply_text='', + class_id=0, +@@ -254,11 +254,11 @@ async def dispatch_frame(self, frame_channel=None, frame=None): + """Dispatch the received frame to the corresponding handler""" + + method_dispatch = { +- pamqp.specification.Connection.Close.name: self.server_close, +- pamqp.specification.Connection.CloseOk.name: self.close_ok, +- pamqp.specification.Connection.Tune.name: self.tune, +- pamqp.specification.Connection.Start.name: self.start, +- pamqp.specification.Connection.OpenOk.name: self.open_ok, ++ pamqp.commands.Connection.Close.name: self.server_close, ++ pamqp.commands.Connection.CloseOk.name: self.close_ok, ++ pamqp.commands.Connection.Tune.name: self.tune, ++ pamqp.commands.Connection.Start.name: self.start, ++ pamqp.commands.Connection.OpenOk.name: self.open_ok, + } + if frame_channel is None and frame is None: + frame_channel, frame = await self.get_frame() +@@ -395,7 +395,7 @@ async def start_ok(self, client_properties, mechanism, auth, locale): + def credentials(): + return '\0{LOGIN}\0{PASSWORD}'.format(**auth) + +- request = pamqp.specification.Connection.StartOk( ++ request = pamqp.commands.Connection.StartOk( + client_properties=client_properties, + mechanism=mechanism, + locale=locale, +@@ -417,7 +417,7 @@ async def server_close(self, frame): + self._stream_writer.close() + + async def _close_ok(self): +- request = pamqp.specification.Connection.CloseOk() ++ request = pamqp.commands.Connection.CloseOk() + await self._write_frame(0, request) + + async def tune(self, frame): +@@ -426,7 +426,7 @@ async def tune(self, frame): + self.server_heartbeat = frame.heartbeat + + async def tune_ok(self, channel_max, frame_max, heartbeat): +- request = pamqp.specification.Connection.TuneOk( ++ request = pamqp.commands.Connection.TuneOk( + channel_max, frame_max, heartbeat + ) + await self._write_frame(0, request) +@@ -436,7 +436,7 @@ async def secure_ok(self, login_response): + + async def open(self, virtual_host, capabilities='', insist=False): + """Open connection to virtual host.""" +- request = pamqp.specification.Connection.Open( ++ request = pamqp.commands.Connection.Open( + virtual_host, capabilities, insist + ) + await self._write_frame(0, request) +diff --git a/aioamqp/tests/testcase.py b/aioamqp/tests/testcase.py +index 120104b..d6d702b 100644 +--- a/aioamqp/tests/testcase.py ++++ b/aioamqp/tests/testcase.py +@@ -147,7 +147,7 @@ def server_version(self, amqp=None): + if amqp is None: + amqp = self.amqp + +- server_version = tuple(int(x) for x in amqp.server_properties['version'].decode().split('.')) ++ server_version = tuple(int(x) for x in amqp.server_properties['version'].split('.')) + return server_version + + async def check_exchange_exists(self, exchange_name): + +From c900f6d5e8ef273000d221d0e46ab81ed4aed2a2 Mon Sep 17 00:00:00 2001 +From: dzen <benoit.calvez@polyconseil.fr> +Date: Wed, 25 Mar 2020 11:02:04 +0100 +Subject: [PATCH 2/3] fix pamqp version for tests on travis + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index a740243..2277b28 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,7 +25,7 @@ + 'aioamqp', + ], + install_requires=[ +- 'pamqp>=2.2.0,<3', ++ 'pamqp>=3.0.0', # TODO(bcalvez): for tests purpose, until 3.0 is released + ], + classifiers=[ + "Development Status :: 4 - Beta", + +From 836340e8d881a93b0111b9aed6f2bb2926f38de6 Mon Sep 17 00:00:00 2001 +From: dzen <benoit.calvez@polyconseil.fr> +Date: Wed, 25 Mar 2020 11:37:45 +0100 +Subject: [PATCH 3/3] pamqp 3.0 is no more compatible with 3.5 + +--- + .travis.yml | 1 - + setup.cfg | 2 +- + setup.py | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 1069e7c..46d6fea 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -1,7 +1,6 @@ + language: python + dist: bionic + python: +-- 3.5 + - 3.6 + - 3.7-dev + - 3.8 +diff --git a/setup.cfg b/setup.cfg +index 0ab7d0b..d0ba16e 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,2 +1,2 @@ + [bdist_wheel] +-python-tag = py35.py36.py37.py38 ++python-tag = py36.py37.py38 +diff --git a/setup.py b/setup.py +index 2277b28..c413078 100644 +--- a/setup.py ++++ b/setup.py +@@ -27,6 +27,7 @@ + install_requires=[ + 'pamqp==3.0.0a6', # TODO(bcalvez): for tests purpose, until 3.0 is released + ], ++ python_requires=">=3.6", + classifiers=[ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", +@@ -34,7 +35,6 @@ + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", +- "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 5be5b6a1dd08b..a2882ce1288b0 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { sha256 = "1gpfsrc2vi6w33c9zsycd2qn589pr7a222rb41r85m915283zy48"; }; + patches = [ ./compat-pamqp-3.patch ]; + propagatedBuildInputs = [ pamqp ]; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 7b0bfe80684a1..4e75f56a8dabc 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp, attrs }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp, python-socks, attrs }: buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.9"; + version = "0.6.0"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "1mn2ng66951mri49f99zh3660j83kvqhr6dpx90s9fkjwk83hmjy"; + sha256 = "04w010bvi719ifpc3sshav95k10hf9nq8czn9yglkj206yxcypdr"; }; - propagatedBuildInputs = [ aiohttp attrs ]; + propagatedBuildInputs = [ aiohttp attrs python-socks ]; # Checks needs internet access doCheck = false; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index b495bf4df4637..7b7bce8ac420b 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -1,15 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp }: +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +}: buildPythonPackage rec { pname = "aiohue"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "35696d04d6eb0328b7031ea3c0a3cfe5d83dfcf62f920522e4767d165c6bc529"; + sha256 = "1xinllv2cvxl9fxi15nayzw9lfzijb3m7i49gkkr46qr8xvsavyk"; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; + + pythonImportsCheck = [ + "aiohue" + "aiohue.discovery" + ]; + + # has no tests + doCheck = false; meta = with lib; { description = "asyncio package to talk to Philips Hue"; diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index 803f642406c81..3432931f93561 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -4,6 +4,7 @@ , pymysql , pytest , isPy27 +, fetchpatch }: buildPythonPackage rec { @@ -18,6 +19,14 @@ buildPythonPackage rec { sha256 = "1qvy3phbsxp55161dnppjfx2m1kn82v0irc3xzqw0adfd81vaiad"; }; + patches = [ + (fetchpatch { + # vendor functions previously provided by pymysql.util + url = "https://github.com/aio-libs/aiomysql/pull/554/commits/919b997a9de7f53d721af76762fba425e306531e.patch"; + sha256 = "V1VYyqr6RwTXoVoGVyMuJst6uqTuuHbpMOpLoVZO1XA="; + }) + ]; + propagatedBuildInputs = [ pymysql ]; diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix new file mode 100644 index 0000000000000..cb9cd327e8ce4 --- /dev/null +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -0,0 +1,42 @@ +{ lib +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, psycopg2 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiopg"; + version = "1.2.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "v${version}"; + sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4"; + }; + + propagatedBuildInputs = [ + async-timeout + psycopg2 + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "psycopg2-binary" "psycopg2" + ''; + + # Tests requires a PostgreSQL Docker instance + doCheck = false; + + pythonImportsCheck = [ "aiopg" ]; + + meta = with lib; { + description = "Python library for accessing a PostgreSQL database"; + homepage = "https://aiopg.readthedocs.io/"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix new file mode 100644 index 0000000000000..489ca5d6f6fb4 --- /dev/null +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -0,0 +1,66 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytest-asyncio +, pytest-timeout +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "aiopvpc"; + version = "2.0.2"; + disabled = pythonOlder "3.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "azogue"; + repo = pname; + rev = "v${version}"; + sha256 = "1ajs4kbdlfn4h7f3d6lwkp4yl1rl7zyvj997nhsz93jjwxbajkpv"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pytz + async-timeout + ]; + + checkInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/azogue/aiopvpc/pull/10 + (fetchpatch { + name = "use-peotry-core.patch"; + url = "https://github.com/azogue/aiopvpc/commit/4bc2740ffd485a60acf579b4f3eb5ee6a353245c.patch"; + sha256 = "0ynj7pqq3akdvdrvqcwnnslay3mn1q92qhk8fg95ppflzscixli6"; + }) + ]; + + postPatch = '' + substituteInPlace pytest.ini --replace \ + " --cov --cov-report term --cov-report html" "" + ''; + + pythonImportsCheck = [ "aiopvpc" ]; + + meta = with lib; { + description = "Python module to download Spanish electricity hourly prices (PVPC)"; + homepage = "https://github.com/azogue/aiopvpc"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix new file mode 100644 index 0000000000000..8ab0e7a7c0cc4 --- /dev/null +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, docopt +, fetchFromGitHub +, hypothesis +, passlib +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pyyaml +, transitions +, websockets +}: + +buildPythonPackage rec { + pname = "amqtt"; + version = "0.10.0-alpha.3"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Yakifo"; + repo = pname; + rev = "v${version}"; + sha256 = "0wz85ykjgi2174qcdgpakmc4m0p96v62az7pvc9hyallq1v1k4n6"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + docopt + passlib + pyyaml + transitions + websockets + ]; + + checkInputs = [ + hypothesis + pytest-asyncio + pytestCheckHook + ]; + + disabledTestPaths = [ + # Test are not ported from hbmqtt yet + "tests/test_cli.py" + "tests/test_client.py" + ]; + + disabledTests = [ + # Requires network access + "test_connect_tcp" + ]; + + pythonImportsCheck = [ "amqtt" ]; + + meta = with lib; { + description = "Python MQTT client and broker implementation"; + homepage = "https://amqtt.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index c11833ba57932..fa92bc44891ae 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Powerful and Lightweight Python Tree Data Structure"; homepage = "https://github.com/c0fec0de/anytree"; license = licenses.asl20; - maintainers = [ maintainers.worldofpeace ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 9271adeb617f9..f6d59c633cd9f 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; homepage = "https://asyncssh.readthedocs.io/en/latest"; license = licenses.epl20; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix new file mode 100644 index 0000000000000..63e096bdc0f23 --- /dev/null +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, typing-extensions +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asyncstdlib"; + version = "3.9.1"; + disabled = pythonOlder "3.7"; + format = "flit"; + + src = fetchFromGitHub { + owner = "maxfischer2781"; + repo = pname; + rev = "v${version}"; + sha256 = "13ranr7zi61w52vfrxwkf32bbhk88j0r5c5z2x2h5vw268001lk2"; + }; + + propagatedBuildInputs = [ + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "asyncstdlib" ]; + + meta = with lib; { + description = "Python library that extends the Python asyncio standard library"; + homepage = "https://asyncstdlib.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 617d5562b43a5..31d615f5314be 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -1,30 +1,28 @@ { lib , buildPythonPackage -, fetchPypi -, isPy3k -, certifi -, chardet +, fetchFromGitHub , deprecated -, idna , oauthlib , requests , requests_oauthlib , six -, urllib3 -, pytestrunner -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "atlassian-python-api"; version = "3.8.0"; - src = fetchPypi { - inherit pname version; - sha256 = "7ef384a91a790c807336e2bd6b7554284691aadd6d7413d199baf752dd84c53e"; + src = fetchFromGitHub { + owner = "atlassian-api"; + repo = pname; + rev = version; + sha256 = "sha256-J0/CtfBtOdWReKQS/VvOL/3r+j4zJfnv/ICIXepKUvc="; }; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ + pytestCheckHook + ]; propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ]; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 491663b56cd09..737989ac3183c 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.6"; + version = "1.5.7"; src = fetchPypi { inherit pname version; - sha256 = "5454e6e9a3d02aae38f866eec0d9a7de4ab9f93c10a273fb0340f3d6d09f7514"; + sha256 = "276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0"; }; propagatedBuildInputs = [ pycodestyle toml ]; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index b4a3e7acaec0f..47ed0fe5fd68a 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,17 +1,48 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, isPy27, pytestCheckHook -, requests, arrow, logfury, tqdm }: +{ lib +, arrow +, buildPythonPackage +, fetchPypi +, importlib-metadata +, isPy27 +, logfury +, pytestCheckHook +, pytest-lazy-fixture +, pytest-mock +, pythonOlder +, requests +, setuptools-scm +, tqdm +}: buildPythonPackage rec { pname = "b2sdk"; - version = "1.6.0"; - + version = "1.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-6fjreuMUC056ljddfAidfBbJkvEDndB/dIkx1bF7efs="; + sha256 = "sha256-8X5XLh9SxZI1P7/2ZjOy8ipcEzTcriJfGI7KlMXncv4="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + arrow + logfury + requests + tqdm + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + pytest-lazy-fixture + pytest-mock + ]; + postPatch = '' substituteInPlace setup.py \ --replace 'setuptools_scm<6.0' 'setuptools_scm' @@ -19,16 +50,16 @@ buildPythonPackage rec { --replace 'arrow>=0.8.0,<1.0.0' 'arrow' ''; - pythonImportsCheck = [ "b2sdk" ]; - - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ requests arrow logfury tqdm ]; + disabledTests = [ + # Test requires an API key + "test_raw_api" + "test_files_headers" + ]; - # requires unpackaged dependencies like liccheck - doCheck = false; + pythonImportsCheck = [ "b2sdk" ]; meta = with lib; { - description = "Client library and utilities for access to B2 Cloud Storage (backblaze)."; + description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/backports-zoneinfo/default.nix b/pkgs/development/python-modules/backports-zoneinfo/default.nix new file mode 100644 index 0000000000000..a9bc0b55955ba --- /dev/null +++ b/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, pythonOlder +, importlib-resources +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "backports-zoneinfo"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "pganssle"; + repo = "zoneinfo"; + rev = version; + sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24="; + }; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ + importlib-resources + ]; + + pythonImportsCheck = [ "backports.zoneinfo" ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + + # unfortunately /etc/zoneinfo doesn't exist in sandbox, and many tests fail + doCheck = false; + + meta = with lib; { + description = "Backport of the standard library module zoneinfo"; + homepage = "https://github.com/pganssle/zoneinfo"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix index d4dcb54c5cd14..af129f4aa5dcb 100644 --- a/pkgs/development/python-modules/blist/default.nix +++ b/pkgs/development/python-modules/blist/default.nix @@ -22,6 +22,12 @@ buildPythonPackage rec { url = "https://github.com/DanielStutzbach/blist/commit/2dc1ec28ed68611fcec9ac1c68070c782d6b4b4e.patch"; sha256 = "0ma0z6ga80w3wzh3sidwd8ckfbgx4j1y7cc29q6j9ddrvxpf276y"; }) + + # Fixes compatibility for Python 3.9 https://github.com/DanielStutzbach/blist/pull/91 + (fetchpatch { + url = "https://github.com/DanielStutzbach/blist/pull/91/commits/e63514f805e42dc6a5708e629e4153d91bc90bff.patch"; + sha256 = "1prx8znk7008v4ky7q2lx0pi6hzqd4kxgfdwbsr4zylwbrdqvsga"; + }) ]; meta = with lib; { diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 55e66545538fb..64fe3c455ee59 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -3,12 +3,15 @@ , fetchPypi , curtsies , greenlet -, mock +, jedi , pygments +, pyxdg , requests , substituteAll , urwid -, which }: +, watchdog +, which +}: buildPythonPackage rec { pname = "bpython"; @@ -24,17 +27,22 @@ buildPythonPackage rec { which = "${which}/bin/which"; })]; - propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; + propagatedBuildInputs = [ + curtsies + greenlet + pygments + pyxdg + requests + urwid + ]; postInstall = '' substituteInPlace "$out/share/applications/org.bpython-interpreter.bpython.desktop" \ --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" ''; - checkInputs = [ mock ]; - - # tests fail: https://github.com/bpython/bpython/issues/712 - doCheck = false; + checkInputs = [ jedi watchdog ]; + pythonImportsCheck = [ "bpython" ]; meta = with lib; { description = "A fancy curses interface to the Python interactive interpreter"; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 242849e2c79ec..5237f2ae733d6 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, buildbot, setuptoolsTrial, mock, twisted, - future, coreutils }: + future, coreutils, nixosTests }: buildPythonPackage (rec { pname = "buildbot-worker"; @@ -19,6 +19,10 @@ buildPythonPackage (rec { --replace /usr/bin/tail "${coreutils}/bin/tail" ''; + passthru.tests = { + smoke-test = nixosTests.buildbot; + }; + meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Worker Daemon"; diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix new file mode 100644 index 0000000000000..3c4466648633f --- /dev/null +++ b/pkgs/development/python-modules/castepxbin/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, pymatgen +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "castepxbin"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "zhubonan"; + repo = "castepxbin"; + rev = "v${version}"; + sha256 = "16wnd1mwhl204d1s3har2fhyhyjg86sypg00bj812dxk8zixxszf"; + }; + + propagatedBuildInputs = [ + numpy + scipy + pymatgen + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A collection of readers for CASTEP binary outputs"; + homepage = "https://github.com/zhubonan/castepxbin"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 7b4f7064b16a1..12e541d9007a5 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-J514zgmIcHpwySChFBXGKR4552wS9z5x8Berk/irHSU="; + sha256 = "sha256-Z5ZIA0ib+N7La6Z0Taf6DovCF6fXnEDppPQt6Vgwl0c="; }; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index e99f321df37f3..70aa31a0d8bf4 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -7,6 +7,7 @@ , click , enum-compat , hypothesis +, inquirer , jmespath , mock , mypy-extensions @@ -35,6 +36,7 @@ buildPythonPackage rec { botocore click enum-compat + inquirer jmespath mypy-extensions pip diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index 9be85ff4b3cda..07b9652e7753f 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + "RequestsCaBundleTest" + ]; disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index cf388409c578a..3df013e7599af 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , attrs , isodate , dateutil @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "csvw"; - version = "1.10.2"; - disabled = isPy27; + version = "1.11.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cldf"; repo = "csvw"; rev = "v${version}"; - sha256 = "0z0qxlsfxwz1qapxb4d0mz3wkj99d7zi9yrg1cbd2xp7giagb6d4"; + sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index dc32bcdf74c93..7b34884e26e28 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,22 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing ? null}: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, blessings, mock, nose, pyte, cwcwidth, typing ? null}: buildPythonPackage rec { pname = "curtsies"; - version = "0.3.0"; + version = "0.3.5"; src = fetchPypi { inherit pname version; - sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9"; + sha256 = "1g8dwafx4vx06isjkn28r3cwb0hw1bv67lgygaz34yk66lrzz1x5"; }; - patches = [ - # Fix dependency on typing. Remove with the next release - (fetchpatch { - url = "https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch"; - sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs"; - }) - ]; - - propagatedBuildInputs = [ blessings wcwidth ] + propagatedBuildInputs = [ blessings cwcwidth ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ mock pyte nose ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 1d060c41bb216..359ee96f60a97 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -9,7 +9,7 @@ , osqp , scipy , scs -, useOpenmp ? true +, useOpenmp ? (!stdenv.isDarwin) # Check inputs , pytestCheckHook }: diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix new file mode 100644 index 0000000000000..a17a8a936aa06 --- /dev/null +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi, cython, pytestCheckHook }: + +buildPythonPackage rec { + pname = "cwcwidth"; + version = "0.1.4"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "1azrphpkcyggg38xvkfb9dpc4xmmm90p02kf8dkqd4d6j5w96aj8"; + }; + + nativeBuildInputs = [ cython ]; + + checkInputs = [ pytestCheckHook ]; + # Hack needed to make pytest + cython work + # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 + preCheck = '' + export HOME=$(mktemp -d) + cp -r $TMP/$sourceRoot/tests $HOME + pushd $HOME + ''; + postCheck = "popd"; + + pythonImportsCheck = [ "cwcwidth" ]; + + meta = with lib; { + description = "Python bindings for wc(s)width"; + homepage = "https://github.com/sebastinas/cwcwidth"; + changelog = "https://github.com/sebastinas/cwcwidth/blob/main/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix index 580d698d8dabe..1cc5ad19bda24 100644 --- a/pkgs/development/python-modules/cxxfilt/default.nix +++ b/pkgs/development/python-modules/cxxfilt/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , gcc-unwrapped @@ -12,9 +13,11 @@ buildPythonPackage rec { sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b"; }; - postPatch = '' + postPatch = let + libstdcpp = "${lib.getLib gcc-unwrapped}/lib/libstdc++${stdenv.hostPlatform.extensions.sharedLibrary}"; + in '' substituteInPlace cxxfilt/__init__.py \ - --replace "find_any_library('stdc++', 'c++')" '"${lib.getLib gcc-unwrapped}/lib/libstdc++.so"' + --replace "find_any_library('stdc++', 'c++')" '"${libstdcpp}"' ''; # no tests diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index ca25e05bb1ed3..d091785db112b 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -8,7 +8,7 @@ , setuptools-scm , scipy , scikitlearn -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -21,13 +21,9 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; - checkPhase = '' - py.test dask_glm - ''; - meta = with lib; { homepage = "https://github.com/dask/dask-glm/"; description = "Generalized Linear Models with Dask"; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index a38350f0f6acb..e3ab607dcac08 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -2,41 +2,32 @@ , buildPythonPackage , fetchPypi , dask -, numpy, toolz # dask[array] , scipy , pims -, pytest -, pytest-flake8 , scikitimage +, pytestCheckHook }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "dask-image"; src = fetchPypi { inherit pname version; - sha256 = "0bf7ea8dcd9d795505b498bd632394720c048f50761e23c574d9a6bacfb27cbb"; + sha256 = "1zzxrvbm52xn7azkn74pjinlk0jkpdcyl3r5vxxy5lmjnmzlrrpy"; }; - nativeBuildInputs = [ pytest-flake8 ]; - propagatedBuildInputs = [ dask numpy toolz scipy pims ]; - checkInputs = [ - pytest - scikitimage - ]; + propagatedBuildInputs = [ dask scipy pims ]; - # ignore errors from newer versions of flake8 prePatch = '' - substituteInPlace setup.cfg \ - --replace "docs/conf.py,versioneer.py" \ - "docs/conf.py,versioneer.py,dask_image/ndfilters/_utils.py" + substituteInPlace setup.cfg --replace "--flake8" "" ''; - # scikit.external is not exported - checkPhase = '' - pytest --ignore=tests/test_dask_image/ - ''; + checkInputs = [ + pytestCheckHook + scikitimage + ]; + pythonImportsCheck = [ "dask_image" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 517056866bb43..b02c9a71a6bdd 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ dask dask-glm @@ -39,7 +43,6 @@ buildPythonPackage rec { scipy six toolz - setuptools-scm ]; # has non-standard build from source, and pypi doesn't include tests diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 1c6d37681a683..55ba3ad6ba7fc 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , bokeh , buildPythonPackage , fetchpatch @@ -77,9 +78,7 @@ buildPythonPackage rec { "-m 'not network'" ]; - disabledTests = [ - "test_annotation_pack_unpack" - "test_annotations_blockwise_unpack" + disabledTests = lib.optionals stdenv.isDarwin [ # this test requires features of python3Packages.psutil that are # blocked in sandboxed-builds "test_auto_blocksize_csv" diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index f5a7c52ef8e50..3a1da0697c0d5 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -4,7 +4,8 @@ , sqlalchemy , aiocontextvars , isPy27 -, pytest +, pytestCheckHook +, pymysql , asyncpg , aiomysql , aiosqlite @@ -12,33 +13,37 @@ buildPythonPackage rec { pname = "databases"; - version = "0.2.6"; + version = "0.4.3"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0cdb4vln4zdmqbbcj7711b81b2l64jg1miihqcg8gpi35v404h2q"; + sha256 = "0aq88k7d9036cy6qvlfv9p2dxd6p6fic3j0az43gn6k1ardhdsgf"; }; propagatedBuildInputs = [ - sqlalchemy aiocontextvars + sqlalchemy ]; checkInputs = [ - pytest - asyncpg aiomysql aiosqlite + asyncpg + pymysql + pytestCheckHook ]; - # big chunk to tests depend on existing posgresql and mysql databases - # some tests are better than no tests - checkPhase = '' - pytest --ignore=tests/test_integration.py --ignore=tests/test_databases.py - ''; + disabledTestPaths = [ + # ModuleNotFoundError: No module named 'aiopg' + "tests/test_connection_options.py" + # circular dependency on starlette + "tests/test_integration.py" + # TEST_DATABASE_URLS is not set. + "tests/test_databases.py" + ]; meta = with lib; { description = "Async database support for Python"; diff --git a/pkgs/development/python-modules/debut/default.nix b/pkgs/development/python-modules/debut/default.nix deleted file mode 100644 index 02eece2fc242a..0000000000000 --- a/pkgs/development/python-modules/debut/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, chardet -, attrs -, pytestCheckHook -}: -buildPythonPackage rec { - pname = "debut"; - version = "0.9.9"; - - src = fetchPypi { - inherit pname version; - sha256 = "a3a71e475295f4cf4292440c9c7303ebca0309d395536d2a7f86a5f4d7465dc1"; - }; - - dontConfigure = true; - - propagatedBuildInputs = [ - chardet - attrs - ]; - - checkInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "debut" - ]; - - meta = with lib; { - description = "Python library to parse Debian deb822-style control and copyright files "; - homepage = "https://github.com/nexB/debut"; - license = with licenses; [ asl20 bsd3 mit ]; - maintainers = teams.determinatesystems.members; - }; -} diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index b02e1e498b9d0..02b4ba4771422 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -1,33 +1,51 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests, netifaces -, pytestCheckHook, testtools, requests-mock }: +{ lib +, asyncstdlib +, attrs +, buildPythonPackage +, defusedxml +, fetchFromGitHub +, httpx +, netifaces +, pytest-asyncio +, pytestCheckHook +, pytest-httpx +, pytest-timeout +, pythonOlder +}: buildPythonPackage rec { pname = "denonavr"; - version = "0.9.10"; - disabled = isPy27; + version = "0.10.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "scarface-4711"; - repo = "denonavr"; + repo = pname; rev = version; - sha256 = "sha256-3ap8F3ayBTpaR98md+gT0+hkIWlFBNxStTGWT5AL//A="; + sha256 = "sha256-jcbjExcyZSE+qVPuYiMmuneugDMBoYz4apY/lz4JnMI="; }; propagatedBuildInputs = [ - requests + asyncstdlib + attrs + defusedxml + httpx netifaces ]; checkInputs = [ + pytest-asyncio pytestCheckHook - testtools - requests-mock + pytest-httpx + pytest-timeout ]; + pythonImportsCheck = [ "denonavr" ]; + meta = with lib; { + description = "Automation Library for Denon AVR receivers"; homepage = "https://github.com/scarface-4711/denonavr"; - description = "Automation Library for Denon AVR receivers."; - license = licenses.mit; + license = with licenses; [ mit ]; maintainers = with maintainers; [ colemickens ]; }; } diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index 4981440c7ccd5..808c2916ddd9e 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -10,7 +10,7 @@ , gsettings-desktop-schemas , fetchurl , dbus -, xvfb_run +, xvfb-run , wrapGAppsHook # , fetchPypi }: @@ -33,7 +33,7 @@ buildPythonPackage { ./nix-support.patch ]; - nativeBuildInputs = [ gobject-introspection dbus xvfb_run wrapGAppsHook ]; # for setup hooks + nativeBuildInputs = [ gobject-introspection dbus xvfb-run wrapGAppsHook ]; # for setup hooks propagatedBuildInputs = [ at-spi2-core gtk3 pygobject3 pyatspi pycairo ]; strictDeps = false; # issue 56943 diff --git a/pkgs/development/python-modules/drf-nested-routers/default.nix b/pkgs/development/python-modules/drf-nested-routers/default.nix index d265838526da9..db0212e456977 100644 --- a/pkgs/development/python-modules/drf-nested-routers/default.nix +++ b/pkgs/development/python-modules/drf-nested-routers/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "drf-nested-routers"; - version = "0.92.5"; + version = "0.93.3"; src = fetchFromGitHub { owner = "alanjds"; repo = "drf-nested-routers"; rev = "v${version}"; - sha256 = "1l1jza8xz6xcm3gwxh1k6pc8fs95cq3v751gxj497y1a83d26j8i"; + sha256 = "1gmw6gwiqzfysx8qn7aan7xgkizxy64db94z30pm3bvn6jxv08si"; }; propagatedBuildInputs = [ django djangorestframework setuptools ]; diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 32f531e4ff595..89db1ccad28dd 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { setuptools ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "events>=0.3,<0.4" "events>=0.3,<0.5" + ''; + pythonImportsCheck = [ "eve" ]; # tests call a running mongodb instance diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 0cccedd54a91a..bf9ae2284f7dd 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -3,8 +3,8 @@ lxml, tzlocal, python-dateutil, pygments, requests-kerberos, defusedxml, cached-property, isodate, requests_ntlm, dnspython, psutil, requests-mock, pyyaml, - oauthlib, requests_oauthlib, - flake8, + oauthlib, requests_oauthlib, tzdata, + flake8, backports-zoneinfo }: buildPythonPackage rec { @@ -24,9 +24,11 @@ buildPythonPackage rec { flake8 ]; propagatedBuildInputs = [ - lxml tzlocal python-dateutil pygments requests-kerberos + lxml tzlocal tzdata python-dateutil pygments requests-kerberos defusedxml cached-property isodate requests_ntlm dnspython oauthlib requests_oauthlib + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 8e54cb6897cca..ad157fbda4c03 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.4.2"; + version = "1.5.0"; # no tests on PyPI src = fetchFromGitHub { owner = "kbr"; repo = pname; rev = version; - sha256 = "02w1hwbfwbh5xlq433myzv6ms7jqxg8kn3d6znq4ic22zprzf5r2"; + sha256 = "sha256-Iw7R+39rpoCTrRD74kBihF7AMcJWxy2xdPhKLznWdlo="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index d2d6a78436ac4..08125bfc71a36 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -28,6 +28,12 @@ buildPythonPackage rec { ./update-django-tagging.patch ]; + postPatch = '' + # https://github.com/graphite-project/graphite-web/pull/2701 + substituteInPlace setup.py \ + --replace "'scandir'" "'scandir; python_version < \"3.5\"'" + ''; + propagatedBuildInputs = [ django memcached diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index bb31baa78880f..15a1ddbf0614b 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -46,11 +46,11 @@ buildPythonPackage rec { To run gtimelog successfully on a system that does not have full GNOME 3 installed, the following NixOS options should be set: - programs.dconf.enable = true; - - services.gnome3.gnome-keyring.enable = true; + - services.gnome.gnome-keyring.enable = true; In addition, the following packages should be added to the environment: - - gnome3.adwaita-icon-theme - - gnome3.dconf + - gnome.adwaita-icon-theme + - gnome.dconf ''; homepage = "https://gtimelog.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix new file mode 100644 index 0000000000000..a034eddd56517 --- /dev/null +++ b/pkgs/development/python-modules/hdate/default.nix @@ -0,0 +1,63 @@ +{ lib +, astral +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "hdate"; + version = "0.10.2"; + disabled = pythonOlder "3.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "py-libhdate"; + repo = "py-libhdate"; + rev = "v${version}"; + sha256 = "07b0c7q8w6flj4q72v58d3wymsxfp5qz8z97qhhc2977mjx5fsxd"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + astral + pytz + ]; + + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Version was not updated for the release + (fetchpatch { + name = "update-version.patch"; + url = "https://github.com/py-libhdate/py-libhdate/commit/b8186a891b29fed99def5ce0985ee0ae1e0dd77e.patch"; + sha256 = "1pmhgh57x9390ff5gyisng0l6b79sd6dxmf172hpk1gr03c3hv98"; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace "^2020.5" ">=2020.5" + ''; + + pytestFlagsArray = [ + "tests" + ]; + + pythonImportsCheck = [ "hdate" ]; + + meta = with lib; { + description = "Python module for Jewish/Hebrew date and Zmanim"; + homepage = "https://github.com/py-libhdate/py-libhdate"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index b7bd002c36786..46db97a9aedd3 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.3.0"; + version = "10.3.1"; src = fetchPypi { inherit pname version; - sha256 = "5d7f73fc1c357134ae9b4a3ed2d844ab8e75a4ca1303679a9e150e87617e7bc7"; + sha256 = "03xwnadpvgna70n6pfxb7xdrszppdqrx5qmkbr1v0jzbh5rnzi6b"; }; doCheck = false; @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enables the “changeset evolution” feature of Mercurial core"; homepage = "https://www.mercurial-scm.org/doc/evolution/"; - maintainers = with maintainers; [ xavierzwirtz ]; + maintainers = with maintainers; [ xavierzwirtz lukegb ]; license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 790e7aa08fc23..2b9165dee24eb 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, xcbuild +, cython +, libusb1 +, udev +, darwin +}: buildPythonPackage rec { pname = "hidapi"; @@ -9,18 +18,17 @@ buildPythonPackage rec { sha256 = "a1170b18050bc57fae3840a51084e8252fd319c0fc6043d68c8501deb0e25846"; }; - propagatedBuildInputs = - lib.optionals stdenv.isLinux [ libusb1 udev ] ++ - lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++ - [ cython ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; + + propagatedBuildInputs = [ cython ] + ++ lib.optionals stdenv.isLinux [ libusb1 udev ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]); # Fix the USB backend library lookup postPatch = lib.optionalString stdenv.isLinux '' libusb=${libusb1.dev}/include/libusb-1.0 test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace 'macos_sdk_path =' 'macos_sdk_path = "" #' ''; pythonImportsCheck = [ "hid" ]; @@ -30,7 +38,7 @@ buildPythonPackage rec { homepage = "https://github.com/trezor/cython-hidapi"; # license can actually be either bsd3 or gpl3 # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt - license = licenses.bsd3; + license = with licenses; [ bsd3 gpl3Only ]; maintainers = with maintainers; [ np prusnak ]; }; } diff --git a/pkgs/development/python-modules/humblewx/default.nix b/pkgs/development/python-modules/humblewx/default.nix new file mode 100644 index 0000000000000..7fd0b0e8dd90d --- /dev/null +++ b/pkgs/development/python-modules/humblewx/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, wxPython_4_0 +, python3 +}: + +buildPythonPackage rec { + pname = "humblewx"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "thetimelineproj"; + repo = pname; + rev = version; + sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210"; + }; + + # timeline is not compatible with wxPython_4_1. reported upstream + propagatedBuildInputs = [ wxPython_4_0 ]; + + checkPhase = '' + runHook preCheck + for i in examples/*; do + ${python3.interpreter} $i + done + runHook postCheck + ''; + + # Unable to access the X Display, is $DISPLAY set properly? + # would have to use nixos module tests, but it is not worth it + doCheck = false; + + pythonImportsCheck = [ "humblewx" ]; + + meta = { + homepage = "https://github.com/thetimelineproj/humblewx"; + description = "Library that simplifies creating user interfaces with wxPython"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ davidak ]; + }; +} diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 86b43465fb648..cc0b569d9b23f 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -6,6 +6,8 @@ , numpy , scikitlearn , scipy +, matplotlib +, seaborn }: buildPythonPackage rec { @@ -28,8 +30,12 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook pytestcov ]; - pytestFlagsArray = [ "--ignore=docs" ]; + checkInputs = [ pytestCheckHook pytestcov matplotlib seaborn ]; + disabledTestPaths = [ + "docs" + "benchmarks" + "examples" + ]; meta = with lib; { homepage = "https://github.com/neurodata/hyppo"; diff --git a/pkgs/development/python-modules/i2c-tools/default.nix b/pkgs/development/python-modules/i2c-tools/default.nix new file mode 100644 index 0000000000000..60af11e241984 --- /dev/null +++ b/pkgs/development/python-modules/i2c-tools/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, i2c-tools +}: + +buildPythonPackage rec { + inherit (i2c-tools) pname version src; + + buildInputs = [ i2c-tools ]; + + preConfigure = "cd py-smbus"; + + meta = with lib; { + inherit (i2c-tools.meta) homepage platforms; + + description = "wrapper for i2c-tools' smbus stuff"; + # from py-smbus/smbusmodule.c + license = [ licenses.gpl2Only ]; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index db59ba70bb26a..bb186d6594c0e 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -1,29 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch , isPy3k +, fetchPypi +, substituteAll +, ffmpeg +, python }: buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.2"; + version = "0.4.3"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "13b05b17a941a9f4a90b16910b1ffac159448cff051a153da8ba4b4343ffa195"; + sha256 = "f826260a3207b872f1a4ba87ec0c8e02c00afba4fd03348a59049bdd8215841e"; }; - patches = [ (fetchpatch { - # Fixes compatibility with python3.9 - # Should be included in the next release after 0.4.2 - url = "https://github.com/imageio/imageio-ffmpeg/pull/43/commits/b90c39fe3d29418d67d953588ed9fdf4d848f811.patch"; - sha256 = "0d9kf4w6ldwag3s2dr9zjin6wrj66fnl4fn8379ci4q4qfsqgx3f"; - })]; - disabled = !isPy3k; + patches = [ + (substituteAll { + src = ./ffmpeg-path.patch; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; + }) + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} << EOF + from imageio_ffmpeg import get_ffmpeg_version + assert get_ffmpeg_version() == '${ffmpeg.version}' + EOF + + runHook postCheck + ''; - # No test infrastructure in repository. - doCheck = false; + pythonImportsCheck = [ "imageio_ffmpeg" ]; meta = with lib; { description = "FFMPEG wrapper for Python"; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch new file mode 100644 index 0000000000000..d193ec199f9b7 --- /dev/null +++ b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch @@ -0,0 +1,39 @@ +diff --git a/imageio_ffmpeg/_utils.py b/imageio_ffmpeg/_utils.py +index 1399cfd..c0eb9be 100644 +--- a/imageio_ffmpeg/_utils.py ++++ b/imageio_ffmpeg/_utils.py +@@ -23,33 +23,7 @@ def get_ffmpeg_exe(): + if exe: + return exe + +- plat = get_platform() +- +- # 2. Try from here +- bin_dir = resource_filename("imageio_ffmpeg", "binaries") +- exe = os.path.join(bin_dir, FNAME_PER_PLATFORM.get(plat, "")) +- if exe and os.path.isfile(exe) and _is_valid_exe(exe): +- return exe +- +- # 3. Try binary from conda package +- # (installed e.g. via `conda install ffmpeg -c conda-forge`) +- if plat.startswith("win"): +- exe = os.path.join(sys.prefix, "Library", "bin", "ffmpeg.exe") +- else: +- exe = os.path.join(sys.prefix, "bin", "ffmpeg") +- if exe and os.path.isfile(exe) and _is_valid_exe(exe): +- return exe +- +- # 4. Try system ffmpeg command +- exe = "ffmpeg" +- if _is_valid_exe(exe): +- return exe +- +- # Nothing was found +- raise RuntimeError( +- "No ffmpeg exe could be found. Install ffmpeg on your system, " +- "or set the IMAGEIO_FFMPEG_EXE environment variable." +- ) ++ return '@ffmpeg@' + + + def _popen_kwargs(prevent_sigint=False): diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 2b334fd121ce1..1672e798f3040 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,17 +1,12 @@ { lib , buildPythonPackage , isPy27 -, pathlib , fetchPypi -, pillow -, psutil , imageio-ffmpeg -, pytest , numpy -, isPy3k -, ffmpeg_3 -, futures ? null -, enum34 +, pillow +, psutil +, pytestCheckHook }: buildPythonPackage rec { @@ -24,26 +19,21 @@ buildPythonPackage rec { inherit pname version; }; - checkInputs = [ pytest psutil ] ++ lib.optionals isPy3k [ - imageio-ffmpeg ffmpeg_3 - ]; - propagatedBuildInputs = [ numpy pillow ]; + propagatedBuildInputs = [ + imageio-ffmpeg + numpy + pillow + ]; + + checkInputs = [ + psutil + pytestCheckHook + ]; - checkPhase = '' + preCheck = '' export IMAGEIO_USERDIR="$TMP" export IMAGEIO_NO_INTERNET="true" export HOME="$(mktemp -d)" - py.test - ''; - - # For some reason, importing imageio also imports xml on Nix, see - # https://github.com/imageio/imageio/issues/395 - - # Also, there are tests that test the downloading of ffmpeg if it's not installed. - # "Uncomment" those by renaming. - postPatch = '' - substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"," - substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed' ''; meta = with lib; { @@ -51,5 +41,4 @@ buildPythonPackage rec { homepage = "http://imageio.github.io/"; license = licenses.bsd2; }; - } diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix deleted file mode 100644 index b250dfc6c7f69..0000000000000 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, html5lib -, six -, beautifulsoup4 -, pkgs -}: - -buildPythonPackage rec { - version = "0.1.0"; - pname = "infoqscraper"; - - src = pkgs.fetchFromGitHub { - owner = "cykl"; - repo = pname; - rev = "v${version}"; - sha256 = "07mxp4mla7fwfc032f3mxrhjarnhkjqdxxibf9ba87c93z3dq8jj"; - }; - - # requires network - doCheck = false; - - buildInputs = [ html5lib ]; - propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; - - meta = with lib; { - description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; - homepage = "https://github.com/cykl/infoqscraper/wiki"; - license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; - }; - -} diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 44c8c7bfd061f..2d25eb645bad9 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchPypi, ipywidgets, matplotlib }: +{ lib +, buildPythonPackage +, fetchPypi +, ipywidgets +, matplotlib +, jupyter-packaging +}: buildPythonPackage rec { pname = "ipympl"; @@ -9,7 +15,7 @@ buildPythonPackage rec { sha256 = "f0f1f356d8cb9d4fb51bb86dbbf837c190145316cb72f66081872ebc4d6db0a1"; }; - propagatedBuildInputs = [ ipywidgets matplotlib ]; + propagatedBuildInputs = [ ipywidgets matplotlib jupyter-packaging ]; # There are no unit tests in repository doCheck = false; diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index efc1152678f31..f9f71a587ab92 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -2,14 +2,17 @@ buildPythonPackage rec { pname = "jq"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "77e747c6ad10ce65479f5f9064ab036483bf307bf71fdd7d6235ef895fcc506e"; + sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r"; }; - patches = [ ./jq-py-setup.patch ]; + patches = [ + # Removes vendoring + ./jq-py-setup.patch + ]; buildInputs = [ jq ]; diff --git a/pkgs/development/python-modules/jq/jq-py-setup.patch b/pkgs/development/python-modules/jq/jq-py-setup.patch index df5245a0c3b57..cf8713796751f 100644 --- a/pkgs/development/python-modules/jq/jq-py-setup.patch +++ b/pkgs/development/python-modules/jq/jq-py-setup.patch @@ -1,17 +1,17 @@ -From 968ddf2bd773e800e46737fced743bd00af9aa0d Mon Sep 17 00:00:00 2001 -From: William Kral <william.kral@gmail.com> -Date: Tue, 8 Sep 2020 22:04:24 -0700 -Subject: [PATCH] Vastly simplify setup.py for distro compatibility +From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001 +From: "Robert T. McGibbon" <rmcgibbo@gmail.com> +Date: Fri, 7 May 2021 19:14:20 -0400 +Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility --- - setup.py | 101 ++----------------------------------------------------- - 1 file changed, 2 insertions(+), 99 deletions(-) + setup.py | 98 +------------------------------------------------------- + 1 file changed, 1 insertion(+), 97 deletions(-) diff --git a/setup.py b/setup.py -index cb63f60..87380ed 100644 +index 663792c..3ebcabe 100644 --- a/setup.py +++ b/setup.py -@@ -1,114 +1,19 @@ +@@ -1,113 +1,19 @@ #!/usr/bin/env python import os @@ -79,8 +79,7 @@ index cb63f60..87380ed 100644 - tarball_path=jq_lib_tarball_path, - lib_dir=jq_lib_dir, - commands=[ -- ["autoreconf", "-i"], -- ["./configure", "CFLAGS=-fPIC", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], +- ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], - ["make"], - ]) - @@ -93,7 +92,7 @@ index cb63f60..87380ed 100644 - - macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET") - if macosx_deployment_target: -- os.environ['MACOSX_DEPLOYMENT_TARGET'] = macosx_deployment_target +- os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target) - - def run_command(args): - print("Executing: %s" % ' '.join(args)) @@ -127,21 +126,19 @@ index cb63f60..87380ed 100644 ) setup( -@@ -120,8 +25,7 @@ setup( - url='http://github.com/mwilliamson/jq.py', +@@ -120,7 +26,6 @@ setup( python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', license='BSD 2-Clause', -- ext_modules = [jq_extension], + ext_modules = [jq_extension], - cmdclass={"build_ext": jq_build_ext}, -+ ext_modules=[jq_extension], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', -@@ -137,4 +41,3 @@ setup( - 'Programming Language :: Python :: 3.8', +@@ -137,4 +42,3 @@ setup( + 'Programming Language :: Python :: 3.9', ], ) - -- -2.28.0 +2.29.3 diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index eedfcfbcb6e98..e3de451cfe1fa 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -1,39 +1,52 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, GitPython +, jupyter-packaging +, jupyter_client +, jupyterlab , markdown-it-py +, mdit-py-plugins , nbformat -, pytest +, notebook +, pytestCheckHook , pyyaml , toml }: buildPythonPackage rec { pname = "jupytext"; - version = "1.11.0"; + version = "1.11.2"; + format = "pyproject"; - disabled = isPy27; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "9062d001baaa32430fbb94a2c9394ac906db0a58da94e7aa4e414b73fd7d51bc"; + src = fetchFromGitHub { + owner = "mwouts"; + repo = pname; + rev = "v${version}"; + hash = "sha256-S2SKAC2oT4VIVMMDbu/Puo87noAgnQs1hh88JphutA8="; }; + buildInputs = [ jupyter-packaging jupyterlab ]; propagatedBuildInputs = [ markdown-it-py + mdit-py-plugins nbformat pyyaml toml ]; checkInputs = [ - pytest + pytestCheckHook + GitPython + jupyter_client + notebook ]; - - # requires test notebooks which are not shipped with the pypi release - # also, pypi no longer includes tests - doCheck = false; - checkPhase = '' - pytest - ''; + # pre-commit tests require a Git repository. + pytestFlagsArray = [ "--ignore-glob='tests/test_pre_commit_*.py'" ]; + pythonImportsCheck = [ "jupytext" "jupytext.cli" ]; meta = with lib; { description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts"; diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 6c173661084c2..abba8354399a2 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -1,11 +1,11 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , scikitlearn , numpy , scipy , jinja2 -, pytest +, pytestCheckHook , networkx , matplotlib , python-igraph @@ -17,9 +17,11 @@ buildPythonPackage rec { pname = "kmapper"; version = "2.0.0"; - src = fetchPypi { - inherit pname version; - sha256 = "3708d889f96f6bbe89c52000dd9378ca4c35638180ff894b64ebbdfcfe62aab2"; + src = fetchFromGitHub { + owner = "scikit-tda"; + repo = "kepler-mapper"; + rev = "v${version}"; + sha256 = "0djm27si2bn18khrbb7rwhflc5ma6g9smhikhk5i1apwn5avm6l4"; }; propagatedBuildInputs = [ @@ -30,7 +32,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook networkx matplotlib python-igraph @@ -38,10 +40,6 @@ buildPythonPackage rec { ipywidgets ]; - checkPhase = '' - pytest test --ignore test/test_drawing.py - ''; - meta = with lib; { description = "Python implementation of Mapper algorithm for Topological Data Analysis"; homepage = "https://kepler-mapper.scikit-tda.org/"; diff --git a/pkgs/development/python-modules/ldaptor/19.nix b/pkgs/development/python-modules/ldaptor/19.nix new file mode 100644 index 0000000000000..cca696f1dff09 --- /dev/null +++ b/pkgs/development/python-modules/ldaptor/19.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, twisted +, passlib +, pyopenssl +, pyparsing +, service-identity +, zope_interface +, isPy3k +, python +}: + +buildPythonPackage rec { + pname = "ldaptor"; + version = "19.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "64c7b870c77e34e4f5f9cfdf330b9702e89b4dd0f64275704f86c1468312c755"; + }; + + propagatedBuildInputs = [ + twisted passlib pyopenssl pyparsing service-identity zope_interface + ]; + + disabled = isPy3k; + + doCheck = false; + + meta = { + description = "A Pure-Python Twisted library for LDAP"; + homepage = "https://github.com/twisted/ldaptor"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/liblarch/default.nix b/pkgs/development/python-modules/liblarch/default.nix index 5ff8d25d54b51..957d37f2176ac 100644 --- a/pkgs/development/python-modules/liblarch/default.nix +++ b/pkgs/development/python-modules/liblarch/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , python , pygobject3 -, xvfb_run +, xvfb-run , gobject-introspection , gtk3 , pythonOlder @@ -32,7 +32,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck - ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ + ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \ ${python.interpreter} nix_run_setup test runHook postCheck ''; diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix new file mode 100644 index 0000000000000..b9511bd5f35b7 --- /dev/null +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, uc-micro-py +}: + +buildPythonPackage rec { + pname = "linkify-it-py"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tsutsu3"; + repo = pname; + rev = "v${version}"; + hash = "sha256-gd51no6VqvIiW9fbCdp30zHG/us6by7FLHV2ul/XJAM="; + }; + + propagatedBuildInputs = [ uc-micro-py ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "linkify_it" ]; + + meta = with lib; { + description = "Links recognition library with full unicode support"; + homepage = "https://github.com/tsutsu3/linkify-it-py"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index ecf5990e74bc4..4b2decb9550c9 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -2,40 +2,61 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, installShellFiles , docopt , hidapi , pyusb , smbus-cffi +, i2c-tools +, pytestCheckHook }: buildPythonPackage rec { pname = "liquidctl"; - version = "1.5.1"; + version = "1.6.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1l6cvm8vs2gkmg4qwg5m5vqjql1gah2vd9vs7pcj2v5hf0cm5v9x"; + sha256 = "sha256-FYpr1mYzPc0rOE75fUNjxe/57EWl+zcbIbkqFseDhzI="; }; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = [ docopt hidapi pyusb smbus-cffi + i2c-tools ]; - # does not contain tests - doCheck = false; + outputs = [ "out" "man" ]; + + postInstall = '' + installManPage liquidctl.8 + installShellCompletion extra/completions/liquidctl.bash + + mkdir -p $out/lib/udev/rules.d + cp extra/linux/71-liquidctl.rules $out/lib/udev/rules.d/. + ''; + + checkInputs = [ pytestCheckHook ]; + + postBuild = '' + # needed for pythonImportsCheck + export XDG_RUNTIME_DIR=$TMPDIR + ''; + pythonImportsCheck = [ "liquidctl" ]; meta = with lib; { description = "Cross-platform CLI and Python drivers for AIO liquid coolers and other devices"; homepage = "https://github.com/liquidctl/liquidctl"; changelog = "https://github.com/liquidctl/liquidctl/blob/master/CHANGELOG.md"; - license = licenses.gpl3; - maintainers = with maintainers; [ arturcygan ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ arturcygan evils ]; }; } diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix index 0960a824817a7..0fcf15fe94741 100644 --- a/pkgs/development/python-modules/localzone/default.nix +++ b/pkgs/development/python-modules/localzone/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "localzone"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "ags-slc"; repo = pname; rev = "v${version}"; - sha256 = "1vzn1vm3zf86l7qncbmghjrwyvla9dc2v8abn8jajbl47gm7r5f7"; + sha256 = "1cbiv21yryjqy46av9hbjccks95sxznrx8nypd3yzihf1vkjiq5a"; }; propagatedBuildInputs = [ dnspython sphinx ]; diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index c7a8a3e17f3e7..322c4ac533d22 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,41 +1,36 @@ { lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pythonOlder , attrs -, coverage +, linkify-it-py , psutil , pytest-benchmark +, pytest-regressions +, typing-extensions }: buildPythonPackage rec { pname = "markdown-it-py"; - version = "0.6.2"; + version = "1.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "executablebooks"; - repo = "markdown-it-py"; + repo = pname; rev = "v${version}"; - sha256 = "1g9p8pdnvjya436lii63r5gjajhmbhmyh9ngbjqf9dqny05nagz1"; + hash = "sha256-GA7P2I8N+i2ISsVgx58zyhrfKMcZ7pL4X9T/trbsr1Y="; }; - propagatedBuildInputs = [ attrs ]; + propagatedBuildInputs = [ attrs linkify-it-py ] + ++ lib.optional (pythonOlder "3.8") typing-extensions; checkInputs = [ - coverage - pytest-benchmark psutil + pytest-benchmark + pytest-regressions pytestCheckHook ]; - - disabledTests = [ - # Requires the unpackaged pytest-regressions fixture plugin - "test_amsmath" - "test_container" - "test_deflist" - "test_dollarmath" - "test_spec" - "test_texmath" - ]; + pytestImportsCheck = [ "markdown_it" ]; meta = with lib; { description = "Markdown parser done right"; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 69774b58eb695..9f10510d243b3 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchFromGitHub , git +, poetry-core , attrs , future , aiohttp +, aiohttp-socks , aiofiles , h11 , h2 @@ -16,27 +18,37 @@ , peewee , cachetools , atomicwrites +, pytestCheckHook +, faker +, aioresponses +, hypothesis +, pytest-aiohttp +, pytest-benchmark }: buildPythonPackage rec { pname = "matrix-nio"; - version = "0.15.2"; + version = "0.18.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "190xw3cvk4amr9pl8ip2i7k3xdjd0231kn2zl6chny5axx22p1dv"; + sha256 = "1rn5lz81y4bvgjhxzd57qhr0lmkm5xljl4bj9w10lnm4f7ls0xdi"; }; nativeBuildInputs = [ git + poetry-core + pytestCheckHook ]; propagatedBuildInputs = [ attrs future aiohttp + aiohttp-socks aiofiles h11 h2 @@ -50,7 +62,20 @@ buildPythonPackage rec { atomicwrites ]; - doCheck = false; + checkInputs = [ + faker + aioresponses + hypothesis + pytest-aiohttp + pytest-benchmark + ]; + + disabledTests = [ + # touches network + "test_connect_wrapper" + # time dependent and flaky + "test_transfer_monitor_callbacks" + ]; meta = with lib; { description = "A Python Matrix client library, designed according to sans I/O principles"; diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 1ea14c35510cb..cf61eb2fa3866 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "5.1.4"; + version = "5.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "1k8hjv965svbm95m7jaawlhdbxqpkjchlwvjwn1n7z90dfgn5kih"; + sha256 = "sha256-RlqzeixaHgyIl/7mMRkZAEsqJEP79Bz1bDGAU8PIetU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix new file mode 100644 index 0000000000000..9c5705dbc4083 --- /dev/null +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, markdown-it-py +, pytest-regressions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mdit-py-plugins"; + version = "0.2.8"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MXQjaVDuguGbmby6BQnrTdpq6Mih3HabXuyFxf9jB18="; + }; + + propagatedBuildInputs = [ markdown-it-py ]; + + checkInputs = [ pytestCheckHook pytest-regressions ]; + pythonImportsCheck = [ "mdit_py_plugins" ]; + + meta = with lib; { + description = "Collection of core plugins for markdown-it-py"; + homepage = "https://github.com/executablebooks/mdit-py-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 40e3b6ce09532..b17b56b8f9ee9 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -1,21 +1,45 @@ -{ lib, isPy27, buildPythonPackage, fetchPypi, scikitlearn }: +{ lib +, isPy27 +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, scikitlearn +, pytestCheckHook +, pytest-randomly +}: buildPythonPackage rec { pname = "mlrose"; version = "1.3.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "cec83253bf6da67a7fb32b2c9ae13e9dbc6cfbcaae2aa3107993e69e9788f15e"; + src = fetchFromGitHub { + owner = "gkhayes"; + repo = "mlrose"; + rev = "v${version}"; + sha256 = "1dn43k3rcypj58ymcj849b37w66jz7fphw8842v6mlbij3x0rxfl"; }; + patches = [ + # Fixes compatibility with scikit-learn 0.24.1 + (fetchpatch { + url = "https://github.com/gkhayes/mlrose/pull/55/commits/19caf8616fc194402678aa67917db334ad02852a.patch"; + sha256 = "1nivz3bn21nd21bxbcl16a6jmy7y5j8ilz90cjmd0xq4v7flsahf"; + }) + ]; + propagatedBuildInputs = [ scikitlearn ]; + checkInputs = [ pytest-randomly pytestCheckHook ]; postPatch = '' - sed -i 's,sklearn,scikit-learn,g' setup.py + substituteInPlace setup.py --replace sklearn scikit-learn ''; + pythonImportsCheck = [ "mlrose" ]; + + # Fix random seed during tests + pytestFlagsArray = [ "--randomly-seed 0" ]; + meta = with lib; { description = "Machine Learning, Randomized Optimization and SEarch"; homepage = "https://github.com/gkhayes/mlrose"; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index a2398ce750dd0..4690f9f8820f1 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -1,22 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 -, nose -, numpy -, six -, ruamel_yaml +, pythonOlder , msgpack -, coverage -, coveralls +, pytestCheckHook +, numpy +, pydantic , pymongo -, lsof +, ruamel_yaml +, tqdm }: buildPythonPackage rec { pname = "monty"; version = "2021.3.3"; - disabled = isPy27; # uses type annotations + disabled = pythonOlder "3.5"; # uses type annotations # No tests in Pypi src = fetchFromGitHub { @@ -26,15 +24,18 @@ buildPythonPackage rec { sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l"; }; - checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo]; - propagatedBuildInputs = [ six ruamel_yaml ]; + propagatedBuildInputs = [ + ruamel_yaml + tqdm + msgpack + ]; - # test suite tries to decode bytes, but msgpack now returns a str - # https://github.com/materialsvirtuallab/monty/pull/121 - postPatch = '' - substituteInPlace tests/test_serialization.py \ - --replace ".decode('utf-8')" "" - ''; + checkInputs = [ + pytestCheckHook + numpy + pydantic + pymongo + ]; preCheck = '' substituteInPlace tests/test_os.py \ diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 3df0527589a1a..735d74b5237be 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "582e92e3b9fa68084dca6ecfd8db866ddc75cd9043de267c79d6b6277dd27f55"; + sha256 = "sha256-RnrwK7lKh6G2lbUb+GdmfoKKzA3Twd5fpUP2kALbSfo="; }; propagatedBuildInputs = [ @@ -22,15 +22,15 @@ buildPythonPackage rec { ]; # Tests assume Network Connectivity: - # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73 + # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73 doCheck = false; + pythonImportsCheck = [ "msal" ]; + meta = with lib; { description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect"; homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 0a73e99391e20..8743329917e72 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -17,14 +17,28 @@ buildPythonPackage rec { sha256 = "9e0d70a1fa6f452584de1cb853ae6c11f41233549f7839cfb879f99410f6ad46"; }; - # package has no tests + propagatedBuildInputs = [ + oauthlib + pyjwt + requests + requests_oauthlib + six + ]; + + postPatch = '' + # https://github.com/mediawiki-utilities/python-mwoauth/pull/43 + substituteInPlace setup.py --replace "PyJWT>=1.0.1,<2.0.0" "PyJWT>=1.0.1" + ''; + + # PyPI source has no tests included + # https://github.com/mediawiki-utilities/python-mwoauth/issues/44 doCheck = false; - propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ]; + pythonImportsCheck = [ "mwoauth" ]; meta = with lib; { - description = "A library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the OAuth Extension installed."; - homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; + description = "Python library to perform OAuth handshakes with a MediaWiki installation"; + homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/myjwt/default.nix b/pkgs/development/python-modules/myjwt/default.nix index d80e66e07bf03..0fecd439e3f53 100644 --- a/pkgs/development/python-modules/myjwt/default.nix +++ b/pkgs/development/python-modules/myjwt/default.nix @@ -1,33 +1,31 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub , click , colorama , cryptography , exrex +, fetchFromGitHub , pyopenssl , pyperclip +, pytest-mock +, pytestCheckHook , questionary , requests -, pytestCheckHook -, pytest-mock , requests-mock }: buildPythonPackage rec { pname = "myjwt"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mBouamama"; repo = "MyJWT"; rev = version; - sha256 = "1n3lvdrzp6wbbcygjwa7xar2jnhjnrz7a9khmn2phhkkngxm5rc4"; + sha256 = "sha256-kZkqFeaQPd56BVaYmCWAbVu1xwbPAIlQC3u5/x3dh7A="; }; - patches = [ ./pinning.patch ]; - propagatedBuildInputs = [ click colorama @@ -40,15 +38,20 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook pytest-mock + pytestCheckHook requests-mock ]; + postPatch = '' + # Remove all version pinning (E.g., tornado==5.1.1 -> tornado) + sed -i -e "s/==[0-9.]*//" requirements.txt + ''; + pythonImportsCheck = [ "myjwt" ]; meta = with lib; { - description = "CLI tool for testing vulnerabilities on Json Web Token(JWT)"; + description = "CLI tool for testing vulnerabilities of JSON Web Tokens (JWT)"; homepage = "https://github.com/mBouamama/MyJWT"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/myjwt/pinning.patch b/pkgs/development/python-modules/myjwt/pinning.patch deleted file mode 100644 index abae9d0e2ecb5..0000000000000 --- a/pkgs/development/python-modules/myjwt/pinning.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index 3017e02..2b465db 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,8 +1,8 @@ --click==7.1.2 --colorama==0.4.4 --cryptography==3.3.1 --exrex==0.10.5 --pyOpenSSL==20.0.1 --pyperclip==1.8.1 --questionary==1.9.0 --requests==2.25.1 -+click -+colorama -+cryptography -+exrex -+pyOpenSSL -+pyperclip -+questionary -+requests diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 908ecff8c177d..8a290a7b859b7 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -8,12 +8,15 @@ , tls-parser , cacert , pytestCheckHook +, pythonOlder }: let - zlibStatic = pkgsStatic.zlib.override { + zlibStatic = (pkgsStatic.zlib.override { splitStaticOutput = false; - }; + }).overrideAttrs (oldAttrs: { + NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE} -fPIC"; + }); nasslOpensslArgs = { static = true; enableSSL2 = true; @@ -67,13 +70,14 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "3.1.0"; + version = "4.0.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "1x1v0fpb6gcc2r0k2rsy0mc3v25s3qbva78apvi46n08c2l309ci"; + hash = "sha256-6lk2YfI9km10YbJAn38fvo9qa4iXcByL+udCsDe+kvU="; }; postPatch = let @@ -86,7 +90,7 @@ buildPythonPackage rec { ${opensslLegacyStatic.out}/lib/libcrypto.a \ deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include - ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps + ln -s ${opensslLegacyStatic.bin} deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ cp ${opensslStatic.out}/lib/libssl.a \ @@ -108,18 +112,21 @@ buildPythonPackage rec { invoke package.wheel ''; + doCheck = true; + + pythonImportsCheck = [ "nassl" ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - # Skip online tests - pytest -k 'not Online' - ''; + disabledTests = [ + "Online" + ]; meta = with lib; { homepage = "https://github.com/nabla-c0d3/nassl"; description = "Low-level OpenSSL wrapper for Python 3.7+"; platforms = with platforms; linux ++ darwin; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 489b6bddf5626..dd17a3f6c10fd 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -1,23 +1,24 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: +{ lib, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, pytestCheckHook }: buildPythonPackage rec { pname = "netdisco"; - version = "2.8.2"; + version = "2.8.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dcaabf83b204282aacfb213b18799eb7af2d5a6defe529487bbd0548036392fe"; + sha256 = "sha256-4WS9PiErB6U7QuejTvbrOmnHetbE5S4zaUyhLCbyihM="; }; - propagatedBuildInputs = [ requests zeroconf netifaces ]; + propagatedBuildInputs = [ requests zeroconf ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ + "netdisco" + "netdisco.discovery" + ]; meta = with lib; { description = "Python library to scan local network for services and devices"; diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 1e38a087bce4c..d42e27a29329e 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -3,11 +3,12 @@ , pythonOlder , fetchFromGitHub , setuptools -, setuptools_scm +, setuptools-scm , pyvcd , jinja2 , importlib-resources , importlib-metadata +, git # for tests , pytestCheckHook @@ -30,7 +31,7 @@ buildPythonPackage rec { sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm git ]; propagatedBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 839582e87f0d2..25e81c89c2553 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,20 +14,18 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.13.0"; + version = "14.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5202adcd96ddbbccbc267da02f2d14e977300c81291aaa77be4fd9f2e27cfa37"; + sha256 = "1zfcl3dq9ladqg7fnpx6kgxf1ckjzlc8v3j6wa8w6iwglm40ax4r"; }; propagatedBuildInputs = [ jupyterhub ]; - pytestFlagsArray = [ "oauthenticator/tests" ]; - checkInputs = [ google-api-python-client google-auth-oauthlib @@ -38,6 +36,20 @@ buildPythonPackage rec { requests-mock ]; + postPatch = '' + # The constraint was removed. No longer needed for > 14.0.0 + # https://github.com/jupyterhub/oauthenticator/pull/431 + substituteInPlace test-requirements.txt --replace "pyjwt>=1.7,<2.0" "pyjwt" + ''; + + disabledTests = [ + # Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 + "test_azuread" + "test_mediawiki" + ]; + + pythonImportsCheck = [ "oauthenticator" ]; + meta = with lib; { description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; homepage = "https://github.com/jupyterhub/oauthenticator"; diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix index d018a924d898d..33d027f1beede 100644 --- a/pkgs/development/python-modules/ofxparse/default.nix +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , six , beautifulsoup4 , lxml @@ -8,11 +8,15 @@ buildPythonPackage rec { pname = "ofxparse"; - version = "0.20"; + version = "unstable-2020-02-05"; - src = fetchPypi { - inherit pname version; - sha256 = "0zn3grc6xhgzcc81qc3dxkkwk731cjjqqhb46smw12lk09cdnigb"; + # The newer changes haven't been released yet and ledger-autosync + # depends on them: + src = fetchFromGitHub { + owner = "jseutter"; + repo = "ofxparse"; + rev = "3236cfd96434feb6bc79a8b66f3400f18e2ad3c4"; + sha256 = "1rkp174102q7hwjrg3na0qnfd612xb3r360b9blkbprjhzxy7gr7"; }; propagatedBuildInputs = [ six beautifulsoup4 lxml ]; diff --git a/pkgs/development/python-modules/ondilo/default.nix b/pkgs/development/python-modules/ondilo/default.nix index 7010bd473aba9..271243ab791e1 100644 --- a/pkgs/development/python-modules/ondilo/default.nix +++ b/pkgs/development/python-modules/ondilo/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ondilo"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "JeromeHXP"; repo = pname; rev = version; - sha256 = "0k7c9nacf7pxvfik3hkv9vvvda2sx5jrf6zwq7r077x7fw5l8d2b"; + sha256 = "sha256-MI6K+41I/IVi+GRBdmRIHbljULDFLAwpo3W8tdxCOBM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 35655b207a59a..985d4e199e182 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,16 +1,16 @@ { lib , fetchFromGitHub }: rec { - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - sha256 = "sha256-gw6Qt9BntPcF3zw19PXftDbhoCeBr8hwrujy51rb5Fc="; + sha256 = "sha256-ptB0jP0kp1Liynkfz0B0OMw6xNQG1s8IvxhgNAdEytM="; }; meta = with lib; { homepage = "https://openrazer.github.io/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ roelvandijk evanjs ]; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/pathy/default.nix b/pkgs/development/python-modules/pathy/default.nix new file mode 100644 index 0000000000000..714e6945df5f2 --- /dev/null +++ b/pkgs/development/python-modules/pathy/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, typer +, dataclasses +, smart_open +, pytest +, mock +, google-cloud-storage +}: + +buildPythonPackage rec { + pname = "pathy"; + version = "0.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M="; + }; + + propagatedBuildInputs = [ smart_open typer google-cloud-storage ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "smart-open>=2.2.0,<4.0.0" "smart-open>=2.2.0" + ''; + + checkInputs = [ pytestCheckHook mock ]; + + # Exclude tests that require provider credentials + pytestFlagsArray = [ + "--ignore=pathy/_tests/test_clients.py" + "--ignore=pathy/_tests/test_gcs.py" + "--ignore=pathy/_tests/test_s3.py" + ]; + + meta = with lib; { + description = "A Path interface for local and cloud bucket storage"; + homepage = "https://github.com/justindujardin/pathy"; + license = licenses.asl20; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 6f5d8e2622797..fd057d24d31e5 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.13.3"; + version = "3.14.4"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "1r67hxb9m6v0xbnbqfnsw6dahmdr94pf81b4x51jfw6x9sa4izi4"; + sha256 = "0x85swpaffysc05kka0mab87cnilzw1lpacfhcx5ayabh0i2qsh6"; }; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index a03452d786280..958d3b7655926 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.19.2"; + version = "1.19.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RMu008kS8toWfKAr+YoAQPfpMmDk7xFMKNXWFSAS6gc="; + sha256 = "sha256-fJxtV1QbDyFT4jqNdZzrPXy5MIkY+6atnpL44OWpC8g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index d0cbf5bafe413..c49d6bae313c7 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, psycopg2 +, click +, configobj +, sqlparse +}: buildPythonPackage rec { pname = "pgspecial"; @@ -9,13 +17,16 @@ buildPythonPackage rec { sha256 = "b68feb0005f57861573d3fbb82c5c777950decfbb2d1624af57aec825db02c02"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ click sqlparse psycopg2 ]; + propagatedBuildInputs = [ + click + sqlparse + psycopg2 + ]; - checkPhase = '' - find tests -name \*.pyc -delete - py.test tests - ''; + checkInputs = [ + configobj + pytestCheckHook + ]; meta = with lib; { description = "Meta-commands handler for Postgres Database"; diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index ef32507321648..0851f5c71ef74 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, gevent , nose , mock , twisted @@ -16,7 +17,7 @@ buildPythonPackage rec { sha256 = "f023d6ac581086b124190cb3dc81dd581a149d216fa4540ac34f9be1e3970b89"; }; - checkInputs = [ nose mock twisted tornado ]; + checkInputs = [ nose mock twisted tornado gevent ]; meta = with lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index 3aed634dfb1a1..d7b2ff8d6b366 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -1,19 +1,20 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k , olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2 -, tk, libX11, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy +, pytestCheckHook }@args: import ../pillow/generic.nix (rec { pname = "Pillow-SIMD"; - version = "7.0.0.post3"; + version = "8.1.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "uploadcare"; repo = "pillow-simd"; - rev = "v${version}"; - sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; + rev = version; + sha256 = "1z0c1qpx7l1bhj71ww7za7kl29j5wdraqr2pdhv4dp1q74kgrr0m"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 48f15181ce00e..51da889621f7a 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,45 +1,36 @@ -{ lib, fetchPypi, buildPythonPackage, pip, pytest, click, six -, setuptools_scm, git, glibcLocales, mock }: +{ lib +, fetchPypi +, pythonOlder +, buildPythonPackage +, pip +, pytest +, pytest-xdist +, click +, setuptools-scm +, git +, glibcLocales +, mock +, pep517 +}: buildPythonPackage rec { pname = "pip-tools"; - version = "6.0.1"; + version = "6.1.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3b0c7b95e8d3dfb011bb42cb38f356fcf5d0630480462b59c4d0a112b8d90281"; + sha256 = "sha256-QAv3finMpIwxq8IQBCkyu1LcwTjvTqTVLF20KaqK5u4="; }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ pytest git glibcLocales mock ]; - propagatedBuildInputs = [ pip click six setuptools_scm ]; - - disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) [ - # Depend on network tests: - "test_allow_unsafe_option" #paramaterized, but all fail - "test_annotate_option" #paramaterized, but all fail - "test_editable_package_vcs" - "test_editable_top_level_deps_preserved" # can't figure out how to select only one parameter to ignore - "test_filter_pip_markers" - "test_filter_pip_markes" - "test_generate_hashes_all_platforms" - "test_generate_hashes_verbose" - "test_generate_hashes_with_editable" - "test_generate_hashes_with_url" - "test_generate_hashes_without_interfering_with_each_other" - "test_get_file_hash_without_interfering_with_each_other" - "test_get_hashes_local_repository_cache_miss" - "test_realistic_complex_sub_dependencies" - "test_stdin" - "test_upgrade_packages_option" - "test_url_package" - "test_editable_package" - "test_locally_available_editable_package_is_not_archived_in_cache_dir" - ]; + checkInputs = [ pytest git glibcLocales mock pytest-xdist ]; + propagatedBuildInputs = [ pip click setuptools-scm pep517 ]; checkPhase = '' export HOME=$(mktemp -d) VIRTUAL_ENV=1 - py.test -k "${disabledTests}" + py.test -m "not network" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 52c371154111d..dc832809c28f9 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "4.5.1"; + version = "4.5.2"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "sha256-WrjIN6+7ybprnjCv57BdKaQYoQ+HgGVr/XytXcbAmwg="; + sha256 = "sha256-9rdpisEuLUO7oO7+7SQb4fXqRG30rf4R7bSFY+QpMhM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 8f260ad8ccb9c..518840d415a92 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -1,19 +1,41 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numpy, scipy, cython, networkx, joblib, nose, pyyaml }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, numpy +, scipy +, cython +, networkx +, joblib +, pandas +, nose +, pyyaml +}: + buildPythonPackage rec { pname = "pomegranate"; - version = "0.11.2"; + version = "0.13.5"; src = fetchFromGitHub { repo = pname; owner = "jmschrei"; rev = "v${version}"; - sha256 = "070ciwww1lhjmfwd5n1kcwgxwbgdfvmhjs4l156bnf08z9dlrafl"; + sha256 = "1hbxchp3daykkf1fa79a9mh34p78bygqcf1nv4qwkql3gw0pd6l7"; }; + patches = lib.optionals (lib.versionOlder version "13.6") [ + # Fix compatibility with recent joblib release, will be part of the next + # pomegranate release after 0.13.5 + (fetchpatch { + url = "https://github.com/jmschrei/pomegranate/commit/42d14bebc44ffd4a778b2a6430aa845591b7c3b7.patch"; + sha256 = "0f9cx0fj9xkr3hch7jyrn76zjypilh5bqw734caaw6g2m49lvbff"; + }) + ]; + propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; - checkInputs = [ nose ]; + checkInputs = [ pandas nose ]; # as of 0.13.5, it depends explicitly on nose, rather than pytest. meta = with lib; { description = "Probabilistic and graphical models for Python, implemented in cython for speed"; diff --git a/pkgs/development/python-modules/privacyidea/default.nix b/pkgs/development/python-modules/privacyidea/default.nix index c28a00901682d..11ff6f71af632 100644 --- a/pkgs/development/python-modules/privacyidea/default.nix +++ b/pkgs/development/python-modules/privacyidea/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests , cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script -, defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow +, defusedxml, croniter, flask_migrate, pyjwt1, configobj, sqlsoup, pillow , python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel , ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2 -, pydash +, pydash, ecdsa , mock, pytestCheckHook, responses, testfixtures }: @@ -29,10 +29,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography pyrad pymysql python-dateutil flask-versioned flask_script - defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow + defusedxml croniter flask_migrate pyjwt1 configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 - pydash + pydash ecdsa ]; passthru.tests = { inherit (nixosTests) privacyidea; }; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 6b05f383ec6f0..378e37ec69df6 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.3.4"; + version = "21.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+qi5M2I3VlmQKY8ghw4T3RZ4pFhoR8paf/Kr8QdS81Y="; + sha256 = "11dw8hij1vzqawlv5l1ax6i2zw6p4ccn4ww3v6q1kdmrwk46vi7r"; }; patches = [ @@ -17,7 +17,12 @@ buildPythonPackage rec { }) ]; + pythonImportsCheck = [ + "pulsectl" + ]; + checkInputs = [ pulseaudio ]; + checkPhase = '' ${python.interpreter} -m unittest pulsectl.tests.all ''; diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix index 68c9d9180dc8f..43cab7db6756f 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -1,6 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi -, requests, websocket_client, python_magic -, pytest, mock }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, websocket_client +, python_magic +, cryptography +, pytestCheckHook +}: buildPythonPackage rec { pname = "pushbullet.py"; @@ -11,13 +17,17 @@ buildPythonPackage rec { sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; - propagatedBuildInputs = [ requests websocket_client python_magic ]; + propagatedBuildInputs = [ cryptography requests websocket_client python_magic ]; - checkInputs = [ pytest mock ]; - - checkPhase = '' - PUSHBULLET_API_KEY="" py.test -k "not test_e2e and not test_auth" + preCheck = '' + export PUSHBULLET_API_KEY="" ''; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + "test_auth_fail" + "test_auth_success" + "test_decryption" + ]; meta = with lib; { description = "A simple python client for pushbullet.com"; diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index e65812cb3133e..6253d95111835 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -1,4 +1,13 @@ -{ aiohttp, async-timeout, buildPythonPackage, fetchPypi, isPy3k, lib }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, aiohttp +, async-timeout +, aresponses +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyaftership"; @@ -6,16 +15,17 @@ buildPythonPackage rec { disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "28b62c323d06492399b60d8135a58d6feaa1d60837eddc14e57ea2b69d356c0a"; + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "0jyzgwaijkp80whi58a0hgjzmnlczmd9vwn11z2m0j01kbdwznn5"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; - # No tests - doCheck = false; - pythonImportsCheck = [ "pyaftership.tracker" ]; + checkInputs = [ pytestCheckHook aresponses pytest-asyncio ]; + pythonImportsCheck = [ "pyaftership" ]; meta = with lib; { description = "Python wrapper package for the AfterShip API"; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 5ae00417b6c0b..b566edef64d1d 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,13 +1,13 @@ -{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: +{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome }: buildPythonPackage rec { pname = "pyatspi"; - version = "2.38.0"; + version = "2.38.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0="; + sha256 = "0lc1p6p296c9q3lffi03v902jlsj34i7yyl3rcyaq94wwbljg7z4"; }; nativeBuildInputs = [ pkg-config ]; @@ -20,9 +20,10 @@ buildPythonPackage rec { disabled = !isPy3k; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index 7517de597544f..391be3c17bd4d 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { description = "Python library for the BrowserID Protocol"; homepage = "https://github.com/mozilla/PyBrowserID"; license = licenses.mpl20; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pychannels/default.nix b/pkgs/development/python-modules/pychannels/default.nix index 0c5e290334da1..8923e5c9c69e2 100644 --- a/pkgs/development/python-modules/pychannels/default.nix +++ b/pkgs/development/python-modules/pychannels/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pychannels"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "fancybits"; repo = pname; rev = version; - sha256 = "0dqc0vhf6c5r3g7nfbpa668x6z2zxrznk6h907s6sxkq4sbqnhqf"; + sha256 = "sha256-E+VL4mJ2KxS5bJZc3Va+wvyVjT55LJz+1wHkxDRa85s="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix index c9eb0f0353f6d..7f5703585c43f 100644 --- a/pkgs/development/python-modules/pyclimacell/default.nix +++ b/pkgs/development/python-modules/pyclimacell/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyclimacell"; - version = "0.18.0"; + version = "0.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "raman325"; repo = pname; rev = "v${version}"; - sha256 = "0pxlh3lwd1az6v7vbaz9kv6ngqxf34iddp7vr0d0p8apbvinwrha"; + sha256 = "sha256-jWHjnebg4Aar48gid7bB7XYXOQtSqbmVmASsZd0YoPc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index b750bd30b0a41..614393cf2d598 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, matplotlib, numpy, pytest, seaborn }: buildPythonPackage rec { pname = "pycm"; @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ matplotlib numpy seaborn ]; checkPhase = '' pytest Test/ diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index 7e09a21e3627b..29d6df409a603 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -30,7 +30,11 @@ buildPythonPackage rec { mock ]; - checkPhase = "nosetests"; + postPatch = '' + substituteInPlace setup.py --replace "xlrd<2" "xlrd<3" + ''; + + checkPhase = "nosetests --exclude test_issue_151"; meta = { description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt"; diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix index 36980ddbadfea..7c80aab59cda9 100644 --- a/pkgs/development/python-modules/pyflume/default.nix +++ b/pkgs/development/python-modules/pyflume/default.nix @@ -22,6 +22,13 @@ buildPythonPackage rec { sha256 = "1dm560hh6fl1waiwsq8m31apmvvwhc3y95bfdb7449bs8k96dmxq"; }; + prePatch = '' + substituteInPlace setup.py --replace 'pyjwt==2.0.1' 'pyjwt>=2.0.1' + substituteInPlace setup.py --replace 'ratelimit==2.2.1' 'ratelimit>=2.2.1' + substituteInPlace setup.py --replace 'pytz==2019.2' 'pytz>=2019.2' + substituteInPlace setup.py --replace 'requests==2.24.0' 'requests>=2.24.0' + ''; + propagatedBuildInputs = [ pyjwt ratelimit @@ -34,6 +41,15 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/ChrisMandich/PyFlume/issues/18 + substituteInPlace setup.py \ + --replace "pyjwt==2.0.1" "pyjwt>=2.0.1" \ + --replace "ratelimit==2.2.1" "ratelimit>=2.2.1" \ + --replace "pytz==2019.2" "pytz>=2019.2" \ + --replace "requests==2.24.0" "requests>=2.24.0" + ''; + pythonImportsCheck = [ "pyflume" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 130be6d44c369..804b33c2f7914 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -2,12 +2,17 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, setuptools-scm , gmt , numpy , netcdf4 , pandas , packaging , xarray +, pytest-mpl +, ipython +, ghostscript +, pytestCheckHook }: buildPythonPackage rec { @@ -28,12 +33,14 @@ buildPythonPackage rec { --replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")" ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ]; - doCheck = false; # requires network access - - postBuild = "export HOME=$TMP"; - + doCheck = false; # the *entire* test suite requires network access + checkInputs = [ pytestCheckHook pytest-mpl ghostscript ipython ]; + postBuild = '' + export HOME=$TMP + ''; pythonImportsCheck = [ "pygmt" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix index ccad57eba1edf..ce9410eaf8b59 100644 --- a/pkgs/development/python-modules/pygobject/3.36.nix +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: +pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }: buildPythonPackage rec { pname = "pygobject"; @@ -23,13 +23,6 @@ buildPythonPackage rec { ++ lib.optionals stdenv.isDarwin [ which ncurses ]; propagatedBuildInputs = [ pycairo cairo ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "python3.pkgs.${pname}3"; - }; - }; - meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 8c26ec6174b26..373577dc46751 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,37 +1,66 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: +{ lib +, stdenv +, fetchurl +, buildPythonPackage +, pkg-config +, glib +, gobject-introspection +, pycairo +, cairo +, which +, ncurses +, meson +, ninja +, isPy3k +, gnome +}: buildPythonPackage rec { pname = "pygobject"; - version = "3.38.0"; + version = "3.40.1"; - disabled = ! isPy3k; + outputs = [ "out" "dev" ]; + + disabled = !isPy3k; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU="; + sha256 = "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0"; }; - outputs = [ "out" "dev" ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + gobject-introspection + ]; + + buildInputs = [ + glib + gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + ncurses + ]; - nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ]; - buildInputs = [ glib gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ which ncurses ]; - propagatedBuildInputs = [ pycairo cairo ]; + propagatedBuildInputs = [ + pycairo + cairo + ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}3"; + versionPolicy = "odd-unstable"; }; }; meta = with lib; { homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; - license = licenses.gpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix new file mode 100644 index 0000000000000..6a35445fca168 --- /dev/null +++ b/pkgs/development/python-modules/pyialarm/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, dicttoxml +, fetchFromGitHub +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "pyialarm"; + version = "1.5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "RyuzakiKK"; + repo = pname; + rev = "v${version}"; + sha256 = "0vpscc2h13mmwscvjpm0bfd80x94mzh4d204v6n421mdz3ddhjqp"; + }; + + propagatedBuildInputs = [ + dicttoxml + xmltodict + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pyialarm" ]; + + meta = with lib; { + description = "Python library to interface with Antifurto365 iAlarm systems"; + homepage = "https://github.com/RyuzakiKK/pyialarm"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyjwt/1.nix b/pkgs/development/python-modules/pyjwt/1.nix new file mode 100644 index 0000000000000..285e5e2e7600d --- /dev/null +++ b/pkgs/development/python-modules/pyjwt/1.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "PyJWT"; + version = "1.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest" + + # drop coverage + sed -i '/pytest-cov/d' setup.py + sed -i '/--cov/d' setup.cfg + ''; + + propagatedBuildInputs = [ + cryptography + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "JSON Web Token implementation in Python"; + homepage = "https://github.com/jpadilla/pyjwt"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index c33f2b068087a..4617869988f65 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -1,28 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi -, cryptography, ecdsa -, pytestrunner, pytestcov, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, ecdsa +, pytest-cov +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "PyJWT"; - version = "2.0.1"; + pname = "pyjwt"; + version = "2.1.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "a5c70a06e1f33d81ef25eecd50d50bd30e34de1ca8b2b9fa3fe0daaabcf69bf7"; + pname = "PyJWT"; + inherit version; + sha256 = "sha256-+6ROeJi7yhYKKytQH0koJPyDgkhdOm8Rul0MGTfOYTA="; }; - propagatedBuildInputs = [ cryptography ecdsa ]; + propagatedBuildInputs = [ + cryptography + ecdsa + ]; - checkInputs = [ pytestrunner pytestcov pytest ]; + checkInputs = [ + pytest-cov + pytestCheckHook + ]; - postPatch = '' - substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest" - ''; - - # ecdsa changed internal behavior - checkPhase = '' - pytest tests -k 'not ec_verify_should_return_false_if_signature_invalid' - ''; + pythonImportsCheck = [ "jwt" ]; meta = with lib; { description = "JSON Web Token implementation in Python"; diff --git a/pkgs/development/python-modules/pykerberos/default.nix b/pkgs/development/python-modules/pykerberos/default.nix index 13d7a4fd24831..fd4c0088b08c1 100644 --- a/pkgs/development/python-modules/pykerberos/default.nix +++ b/pkgs/development/python-modules/pykerberos/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pykerberos"; - version = "1.2.1"; + version = "1.2.3.dev0"; src = fetchPypi { inherit pname version; - sha256 = "0v47p840myqgc7hr4lir72xshcfpa0w8j9n077h3njpqyn6wlbag"; + sha256 = "17zjiw6rqgfic32px86qls1i3z7anp15dgb3sprbdvywy98alryn"; }; nativeBuildInputs = [ krb5 ]; # for krb5-config @@ -15,6 +15,7 @@ buildPythonPackage rec { # there are no tests doCheck = false; + pythonImportsCheck = [ "kerberos" ]; meta = with lib; { description = "High-level interface to Kerberos"; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index b16ea62717a52..5a0a53005bb16 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pylast"; - version = "4.2.0"; + version = "4.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-w/mkAUUgj7L7Xv+nz1pI1TYKfihH3S3MbxaNQ4VtoH0="; + sha256 = "sha256-R1enQk6luuBiobMPDn5x1SXx7zUI/5c8dPtyWkmG/18="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 54b2f65ad975c..9d8b36c5ef815 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.4.2"; + version = "2.4.3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "0535y4sdi521a9s7di8ld0i8aav0afbxmx0956v6sjpyqmqdm6hr"; + sha256 = "1mybq9jynypxbaxj921s3sx8dph8n3hmipmv4nla1g9h07g9g02z"; }; propagatedBuildInputs = [ @@ -42,9 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Pylint plugin to analyze Django applications"; homepage = "https://github.com/PyCQA/pylint-django"; - license = licenses.gpl2; - maintainers = with maintainers; [ - kamadorueda - ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index b1e81140a906f..d983e2bc14cc2 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchPypi , buildPythonPackage , Mako @@ -12,14 +13,18 @@ , opencl-headers , ocl-icd , pybind11 +, mesa_drivers }: -buildPythonPackage rec { +let + os-specific-buildInputs = + if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; +in buildPythonPackage rec { pname = "pyopencl"; version = "2021.1.4"; checkInputs = [ pytest ]; - buildInputs = [ opencl-headers ocl-icd pybind11 ]; + buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix index 9b778f9e216ce..45bc2a55e599d 100644 --- a/pkgs/development/python-modules/pystray/default.nix +++ b/pkgs/development/python-modules/pystray/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub -, pillow, xlib, six, xvfb_run, sphinx }: +, pillow, xlib, six, xvfb-run, sphinx }: buildPythonPackage rec { pname = "pystray"; @@ -14,7 +14,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sphinx ]; propagatedBuildInputs = [ pillow xlib six ]; - checkInputs = [ xvfb_run ]; + checkInputs = [ xvfb-run ]; checkPhase = '' rm tests/icon_tests.py # test needs user input diff --git a/pkgs/development/python-modules/pysvg-py3/default.nix b/pkgs/development/python-modules/pysvg-py3/default.nix new file mode 100644 index 0000000000000..6f9ba796132e9 --- /dev/null +++ b/pkgs/development/python-modules/pysvg-py3/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, python +}: + +buildPythonPackage rec { + pname = "pysvg-py3"; + version = "0.2.2-post3"; + + src = fetchFromGitHub { + owner = "alorence"; + repo = pname; + rev = version; + sha256 = "1slync0knpcjgl4xpym8w4249iy6vmrwbarpnbjzn9xca8g1h2f0"; + }; + + checkPhase = '' + runHook preCheck + mkdir testoutput + ${python.interpreter} sample/tutorial.py + runHook postCheck + ''; + + pythonImportsCheck = [ "pysvg" ]; + + meta = { + homepage = "https://github.com/alorence/pysvg-py3"; + description = "Creating SVG with Python"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ davidak ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index 68b67f061bb14..22b57f9e7706d 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -31,6 +31,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { + broken = true; # unmaintained and incompatible with pytest>=6.0 homepage = "https://github.com/kensho-technologies/pytest-annotate"; description = "Generate PyAnnotate annotations from your pytest tests"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pytest-ordering/default.nix b/pkgs/development/python-modules/pytest-ordering/default.nix index 6cd1ed227976f..c5e8a786b5eff 100644 --- a/pkgs/development/python-modules/pytest-ordering/default.nix +++ b/pkgs/development/python-modules/pytest-ordering/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { homepage = "https://github.com/ftobia/pytest-ordering"; description = "Pytest plugin to run your tests in a specific order"; license = licenses.mit; + broken = true; # See https://github.com/NixOS/nixpkgs/pull/122264 maintainers = with maintainers; [ eadwu ]; }; } diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix new file mode 100644 index 0000000000000..90b72c886eac7 --- /dev/null +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, pythonOlder +, matplotlib +, numpy +, pandas +, pillow +, pytest +, pytest-datadir +, pytestCheckHook +, pyyaml +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pytest-regressions"; + version = "2.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "15a71f77cb266dd4ca94331abe4c339ad056b2b2175e47442711c98cf6d65716"; + }; + + patches = [ + # Make pytest-regressions compatible with NumPy 1.20. + # Should be part of the next release. + (fetchpatch { + url = "https://github.com/ESSS/pytest-regressions/commit/ffad2c7fd1d110f420f4e3ca3d39d90cae18a972.patch"; + sha256 = "sha256-bUna7MnMV6u9oEaZMsFnr4gE28rz/c0O2+Hyk291+l0="; + }) + ]; + + nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ pytest ]; + propagatedBuildInputs = [ numpy pandas pillow pytest-datadir pyyaml ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + checkInputs = [ pytestCheckHook matplotlib ]; + pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" ]; + + meta = with lib; { + description = "Pytest fixtures to write regression tests"; + longDescription = '' + pytest-regressions makes it simple to test general data, images, + files, and numeric tables by saving expected data in a data + directory (courtesy of pytest-datadir) that can be used to verify + that future runs produce the same data. + ''; + homepage = "https://github.com/ESSS/pytest-regressions"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index aea47c7b9e726..a750f02505ac5 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest, requests-mock, tox -, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }: +, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted, ujson }: buildPythonPackage rec { version = "0.7.9"; @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; # Tries to test multiple interpreters with tox checkInputs = [ pytest requests-mock tox ]; - propagatedBuildInputs = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ]; + propagatedBuildInputs = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ujson ]; meta = { description = "Binance Exchange API python implementation for automated trading"; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 1d9025a035f2f..2374c6797f2e5 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -24,20 +24,19 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.5.2"; + version = "0.5.6"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lk7egCyj+vSsaXmxuWxlQuom8n3JEs/RIWwCuwTOXeI="; + sha256 = "sha256-tmGt50xBDV++/pqyXsuxHdrwv+XbkjvtrzsYBzQh7zE="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace 'croniter = "^0"' 'croniter = "*"' \ - --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' \ - --replace 'zeroconf = "^0.28"' 'zeroconf = "*"' + --replace 'defusedxml = "^0.6"' 'defusedxml = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 7a53e73b2b88f..49113dfad5efd 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , redis -, pytest +, pytestCheckHook , process-tests , pkgs , withDjango ? false, django_redis @@ -17,15 +17,20 @@ buildPythonPackage rec { sha256 = "4265a476e39d476a8acf5c2766485c44c75f3a1bd6cf73bb195f3079153b8374"; }; - checkInputs = [ pytest process-tests pkgs.redis ]; + propagatedBuildInputs = [ + redis + ] ++ lib.optional withDjango django_redis; - checkPhase = '' - pytest tests/ - ''; - - propagatedBuildInputs = [ redis ] - ++ lib.optional withDjango django_redis; + checkInputs = [ + pytestCheckHook + process-tests + pkgs.redis + ]; + disabledTests = [ + # https://github.com/ionelmc/python-redis-lock/issues/86 + "test_no_overlap2" + ]; meta = with lib; { homepage = "https://github.com/ionelmc/python-redis-lock"; diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index 05d804bc67704..b494d2e442e62 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -24,7 +24,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "snap7" - "snap7.six" "snap7.util" ]; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix new file mode 100644 index 0000000000000..dcf2688082754 --- /dev/null +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, trio, curio, async-timeout, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "python-socks"; + version = "1.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1n6xb18jy41ybgkmamakg6psp3qididd45qknxiggngaiibz43kx"; + }; + + disabled = pythonOlder "3.6.1"; + + propagatedBuildInputs = [ trio curio async-timeout ]; + + meta = with lib; { + description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; + homepage = "https://github.com/romis2012/python-socks"; + license = licenses.asl20; + maintainers = with maintainers; [ mjlbach ]; + }; +} diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index 6f83f587f5880..2690f8ea7ebe5 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -8,30 +8,33 @@ buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.11115"; + version = "3.0.12118"; src = fetchPypi { inherit pname version; - sha256 = "a4d3bdddfce84a8fb1b2d5447193a0239c55c16ca246e5194d48efd59c4e236b"; + hash = "sha256-Vm8vfDA/aACFHKzAFt8cbu7AlK1j4KSdh9udaYCU8fs="; }; - propagatedBuildInputs = [ - setuptools - ]; - patches = [ + # Patch path for VLC (substituteAll { src = ./vlc-paths.patch; libvlcPath="${libvlc}/lib/libvlc.so.5"; }) ]; + propagatedBuildInputs = [ + setuptools + ]; + doCheck = false; # no tests + pythonImportsCheck = [ "vlc" ]; + meta = with lib; { - homepage = "https://wiki.videolan.org/PythonBinding"; - maintainers = with maintainers; [ tbenst ]; description = "Python bindings for VLC, the cross-platform multimedia player and framework"; + homepage = "https://wiki.videolan.org/PythonBinding"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tbenst ]; }; } diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 310170d040d48..618dfef4171cd 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { preBuild = '' export CC=${stdenv.cc.targetPrefix}cc + substituteInPlace pyvex_c/Makefile --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar' ''; # No tests are available on PyPI, GitHub release has tests diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index a020517dcce2a..e750f234faf50 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -6,7 +6,7 @@ , pytest , pythonOlder , qt5 -, xvfb_run +, xvfb-run }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest - xvfb_run + xvfb-run ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix index 87f6b9756ed30..a72b46037753e 100644 --- a/pkgs/development/python-modules/pyxnat/default.nix +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -5,6 +5,7 @@ , nose , lxml , requests +, six }: buildPythonPackage rec { @@ -17,7 +18,11 @@ buildPythonPackage rec { sha256 = "22524120d744b50d25ef6bfc7052637e4ead9e2afac92563231ec89848f5adf5"; }; - propagatedBuildInputs = [ lxml requests ]; + propagatedBuildInputs = [ + lxml + requests + six + ]; # future is not used, and pathlib is installed part of python38+ # w/o an external package diff --git a/pkgs/development/python-modules/rfc3339-validator/default.nix b/pkgs/development/python-modules/rfc3339-validator/default.nix index f51a232550ba6..07bc719698ab6 100644 --- a/pkgs/development/python-modules/rfc3339-validator/default.nix +++ b/pkgs/development/python-modules/rfc3339-validator/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , pytestCheckHook , hypothesis @@ -17,6 +18,15 @@ buildPythonPackage rec { sha256 = "7a578aa0740e9ee2b48356fe1f347139190c4c72e27f303b3617054efd15df32"; }; + patches = [ + # Fixes test failure on darwin. Filed upstream: https://github.com/naimetti/rfc3339-validator/pull/3. + # Not yet merged. + (fetchpatch { + url = "https://github.com/rmcgibbo/rfc3339-validator/commit/4b6bb62c30bd158d3b4663690dcba1084ac31770.patch"; + sha256 = "0h9k82hhmp2xfzn49n3i47ws3rpm9lvfs2rjrds7hgx5blivpwl6"; + }) + ]; + propagatedBuildInputs = [ six ]; checkInputs = [ pytestCheckHook hypothesis strict-rfc3339 ]; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 52bef42f270f5..d292eaa522314 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -6,7 +6,7 @@ , colorama , dataclasses , ipywidgets -, poetry +, poetry-core , pygments , typing-extensions , pytestCheckHook @@ -14,27 +14,33 @@ buildPythonPackage rec { pname = "rich"; - version = "9.13.0"; + version = "10.1.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; - # tests not included in pypi tarball src = fetchFromGitHub { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "0si3rzhg8wfxw4aakkp8sr6nbzfa54rl0w92macd1338q90ha4ly"; + sha256 = "sha256-HH+k9uiK34yoqu83rknCIe2DpoqJRHkcqABuj8zjzqs="; }; - format = "pyproject"; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ CommonMark colorama ipywidgets pygments typing-extensions - ] ++ lib.optional (pythonOlder "3.7") dataclasses; + ] ++ lib.optional (pythonOlder "3.7") [ + dataclasses + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "rich" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 9c438bde75622..459037d6191e9 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -1,31 +1,42 @@ -{ buildPythonPackage +{ lib +, amqtt +, buildPythonPackage , fetchFromGitHub -, hbmqtt -, lib , paho-mqtt -, poetry +, poetry-core , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "roombapy"; - version = "1.6.2-1"; + version = "1.6.3"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pschmitt"; repo = "roombapy"; rev = version; - sha256 = "14k7bys479xwpa4alpdwphzmxm3x8kc48nfqnshn1wj94vyxc425"; + sha256 = "sha256-GkDfIC2jx4Mpguk/Wu45pZw0czhabJwTz58WYSLCOV8="; }; - format = "pyproject"; + nativeBuildInputs = [ poetry-core ]; - nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ paho-mqtt ]; - checkInputs = [ hbmqtt pytest-asyncio pytestCheckHook ]; - pytestFlagsArray = [ "tests/" "--ignore=tests/test_discovery.py" ]; + checkInputs = [ + amqtt + pytest-asyncio + pytestCheckHook + ]; + + disabledTestPaths = [ + # Requires network access + "tests/test_discovery.py" + ]; + pythonImportsCheck = [ "roombapy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/rst2ansi/default.nix b/pkgs/development/python-modules/rst2ansi/default.nix new file mode 100644 index 0000000000000..e161f56d31776 --- /dev/null +++ b/pkgs/development/python-modules/rst2ansi/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, docutils, }: + +buildPythonPackage rec { + pname = "rst2ansi"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Gxf7mmKNQPV5M60aOqlSNGREvgaUaVCOc+lQYNoz/m8="; + }; + + propagatedBuildInputs = [ docutils ]; + + meta = with lib; { + description = "A rst converter to ansi-decorated console output"; + homepage = "https://github.com/Snaipe/python-rst-to-ansi"; + license = licenses.mit; + maintainers = with maintainers; [ vojta001 ]; + }; +} diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 69b928aad0898..9244a94d2357a 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -1,33 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, pythonAtLeast +, fetchFromGitHub +, colorcet +, cryptography , flask , flask-compress , flask-cors , flask-sockets +, gevent , imageio , numpy -, scipy , pillow -, gevent -, wget +, pyopenssl +, scipy , six -, colorcet , unidecode , urllib3 +, wget +, deepdiff +, pytestCheckHook +, pytestcov +, websocket_client }: buildPythonPackage rec { pname = "runway-python"; version = "0.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740"; + src = fetchFromGitHub { + owner = "runwayml"; + repo = "model-sdk"; + rev = version; + sha256 = "1ww2wai1qnly8i7g42vhkkbs4yp7wi9x4fjdxsg9fl3izjra0zs2"; }; propagatedBuildInputs = [ colorcet + cryptography flask flask-compress flask-cors @@ -36,6 +46,7 @@ buildPythonPackage rec { imageio numpy pillow + pyopenssl scipy six unidecode @@ -43,13 +54,30 @@ buildPythonPackage rec { wget ]; - # tests are not packaged in the released tarball - doCheck = false; - pythonImportsCheck = [ "runway" ]; + checkInputs = [ + deepdiff + pytestCheckHook + pytestcov + websocket_client + ]; + + disabledTests = [ + # these tests require network + "test_file_deserialization_remote" + "test_file_deserialization_absolute_directory" + "test_file_deserialization_remote_directory" + ] ++ lib.optionals (pythonAtLeast "3.9") [ + # AttributeError: module 'base64' has no attribute 'decodestring + # https://github.com/runwayml/model-sdk/issues/99 + "test_image_serialize_and_deserialize" + "test_segmentation_serialize_and_deserialize_colormap" + "test_segmentation_serialize_and_deserialize_labelmap" + ]; + meta = { description = "Helper library for creating Runway models"; homepage = "https://github.com/runwayml/model-sdk"; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 7580647f5a12c..06802a8a2ce15 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -1,8 +1,17 @@ { lib , fetchFromGitHub , buildPythonPackage -, pyusb +, cython +, git +, pkgconfig +, pytest-runner +, setuptools-scm +, future , numpy +, pyusb +, mock +, pytestCheckHook +, zipp }: ## Usage @@ -18,19 +27,35 @@ buildPythonPackage rec { owner = "ap--"; repo = "python-seabreeze"; rev = "v${version}"; - sha256 = "1lna3w1vsci35dhyi7qjvbb99gxvzk23k195c7by7kkrps844q1j"; + sha256 = "1hm9aalpb9sdp8s7ckn75xvyiacp5678pv9maybm5nz0z2h29ibq"; + leaveDotGit = true; }; + nativeBuildInputs = [ + cython + git + pkgconfig + pytest-runner + setuptools-scm + ]; + + propagatedBuildInputs = [ + future + numpy + pyusb + ]; + postInstall = '' mkdir -p $out/etc/udev/rules.d - cp misc/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules + cp os_support/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules ''; - # underlying c libraries are tested and fail - # (c libs are used with anaconda, which we don't care about as we use the alternative path, being that of pyusb). - doCheck = false; - - propagatedBuildInputs = [ pyusb numpy ]; + # few backends enabled, but still some tests + checkInputs = [ + pytestCheckHook + mock + zipp + ]; setupPyBuildFlags = [ "--without-cseabreeze" ]; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 664f84933ed79..370d254898098 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -6,6 +6,7 @@ , geckodriver , urllib3 , xorg +, nixosTests }: @@ -47,6 +48,10 @@ buildPythonPackage rec { cp -v x_ignore_nofocus.so selenium/webdriver/firefox/${if stdenv.is64bit then "amd64" else "x86"}/ ''; + passthru.tests = { + testing-bitwarden = nixosTests.bitwarden; + }; + meta = with lib; { description = "The selenium package is used to automate web browser interaction from Python"; homepage = "http://www.seleniumhq.org"; diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index cd89c1c8aae85..af92f345950be 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -1,10 +1,8 @@ { lib , fetchFromGitHub , buildPythonPackage +, authlib , requests -, pyopenssl -, cryptography -, idna , mock , isPy27 , nose @@ -24,21 +22,20 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + authlib requests - pyopenssl - cryptography - idna ]; checkInputs = [ nose pytz responses - ] ++ lib.optionals isPy27 [ mock ]; + ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "mock==1.0.1" "mock" + checkPhase = '' + runHook preCheck + nosetests -v + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index f648905251e23..f28708bdf03b9 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.7.0"; + version = "1.7.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-fy7sRKS7ih4JmjOW/noL8qJ1xWVpQLbBbObHnMwT3Bc="; + sha256 = "sha256-mvg23FdHJZeIZRcm8GLWmm9DDTBt29jmsUHB/smVSec="; }; patches = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index fdf984563ea0f..237f36e201b6f 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -1,5 +1,6 @@ -{ buildPythonPackage -, isPy27 +{ lib +, buildPythonPackage +, pythonOlder , asn1crypto , azure-storage-blob , boto3 @@ -10,7 +11,6 @@ , idna , ijson , isPy3k -, lib , oscrypto , pyarrow , pyasn1-modules @@ -25,20 +25,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.4.1"; - disabled = isPy27; + version = "2.4.3"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5c9180e61202a7beb1df83231688423091ca0a04ee559d2a78ff77f9c727baae"; + sha256 = "sha256-+jAfUwaofWM5Ef1kk4AEAbBM/UES8/ZzLd4QJfkEQsM="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \ - --replace 'pytz<2021.0' 'pytz' - ''; - propagatedBuildInputs = [ azure-storage-blob asn1crypto @@ -55,16 +49,26 @@ buildPythonPackage rec { pytz requests six - ] ++ lib.optionals (!isPy3k) [ pyarrow pyasn1-modules urllib3 ]; - # tests require encrypted secrets, see + postPatch = '' + # https://github.com/snowflakedb/snowflake-connector-python/issues/705 + substituteInPlace setup.py \ + --replace "idna>=2.5,<3" "idna" \ + --replace "chardet>=3.0.2,<4" "chardet" + ''; + + # Tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; - pythonImportsCheck = [ "snowflake" "snowflake.connector" ]; + + pythonImportsCheck = [ + "snowflake" + "snowflake.connector" + ]; meta = with lib; { description = "Snowflake Connector for Python"; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 077ac0e6a3bc6..672af9f0f7ea2 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -7,6 +7,7 @@ , blis , catalogue , cymem +, jinja2 , jsonschema , murmurhash , numpy @@ -16,8 +17,12 @@ , requests , setuptools , srsly +, spacy-legacy , thinc , wasabi +, packaging +, pathy +, pydantic }: buildPythonPackage rec { @@ -33,6 +38,7 @@ buildPythonPackage rec { blis catalogue cymem + jinja2 jsonschema murmurhash numpy @@ -41,8 +47,12 @@ buildPythonPackage rec { requests setuptools srsly + spacy-legacy thinc wasabi + packaging + pathy + pydantic ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ @@ -60,7 +70,8 @@ buildPythonPackage rec { --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \ - --replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8" + --replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8" \ + --replace "pydantic>=1.7.1,<1.8.0" "pydantic>=1.7.1,<1.8.3" ''; pythonImportsCheck = [ "spacy" ]; diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix new file mode 100644 index 0000000000000..f8b011d83ccf0 --- /dev/null +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "spacy-legacy"; + version = "3.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Uy94rjFllSj622RTzd6UJaQmIniCw4gpeq/X57QcIpA="; + }; + + # checkInputs = [ pytestCheckHook spacy ]; + doCheck = false; + pythonImportsCheck = [ "spacy_legacy" ]; + + meta = with lib; { + description = "A Path interface for local and cloud bucket storage"; + homepage = "https://github.com/justindujardin/pathy"; + license = licenses.asl20; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 7d4629be50c77..379dbdd0b3da9 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, colorama , sphinx , livereload }: @@ -14,10 +15,15 @@ buildPythonPackage rec { sha256 = "de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05"; }; - propagatedBuildInputs = [ sphinx livereload ]; + propagatedBuildInputs = [ + colorama + sphinx + livereload + ]; # No tests included. doCheck = false; + pythonImportsCheck = [ "sphinx_autobuild" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/spidev/default.nix b/pkgs/development/python-modules/spidev/default.nix index 0d0fd582363ef..90ca839bc1e06 100644 --- a/pkgs/development/python-modules/spidev/default.nix +++ b/pkgs/development/python-modules/spidev/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { description = "Python bindings for Linux SPI access through spidev"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 991f85c900ecc..5680b4bd36b34 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -6,39 +6,44 @@ , typing-extensions , faker , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "sslyze"; - version = "3.1.0"; + version = "4.1.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "02p0lgpkfq88dys0dqw0z8bpg9g8pds2lvs9awd9f2w5cb1pwr83"; + hash = "sha256-oSTKNiECczlPAbv5Azc023PcquFbnlC5O+8tVgNcUW0="; }; patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<3.3" "cryptography>=2.6,<4.0" + --replace "cryptography>=2.6,<3.5" "cryptography>=2.6,<4.0" ''; checkInputs = [ pytestCheckHook ]; - checkPhase = '' - # Most of the tests are online; hence, applicable tests are listed - # explicitly here - pytest \ - tests/test_main.py \ - tests/test_scanner.py \ - tests/cli_tests/test_console_output.py \ - tests/cli_tests/test_json_output.py \ - tests/cli_tests/test_server_string_parser.py \ - tests/plugins_tests/test_scan_commands.py \ - tests/plugins_tests/certificate_info/test_certificate_utils.py \ - -k "not (TestScanner and test_client_certificate_missing)" - ''; + # Most of the tests are online; hence, applicable tests are listed + # explicitly here + pytestFlagsArray = [ + "tests/test_main.py" + "tests/test_scanner.py" + "tests/cli_tests/test_console_output.py" + "tests/cli_tests/test_json_output.py" + "tests/cli_tests/test_server_string_parser.py" + "tests/plugins_tests/test_scan_commands.py" + "tests/plugins_tests/certificate_info/test_certificate_utils.py" + ]; + + disabledTests = [ + "test_error_client_certificate_needed" + ]; + pythonImportsCheck = [ "sslyze" ]; propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; @@ -47,7 +52,7 @@ buildPythonPackage rec { homepage = "https://github.com/nabla-c0d3/sslyze"; description = "Fast and powerful SSL/TLS scanning library"; platforms = platforms.linux ++ platforms.darwin; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 80eefc0a639ef..fba544789a81c 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -8,7 +8,6 @@ , pandas , tables , git -, ffmpeg_3 , scikitimage , matplotlib , qdarkstyle @@ -59,7 +58,6 @@ buildPythonPackage rec { pandas tables git - ffmpeg_3 scikitimage matplotlib qdarkstyle @@ -79,7 +77,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/portugueslab/stytra"; description = "A modular package to control stimulation and track behaviour"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ tbenst ]; }; } diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index 9ba073df92284..cc47eafd1afa3 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -1,37 +1,44 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib, buildPythonPackage, fetchFromGitHub +, pythonOlder , h5py , matplotlib , numpy , phonopy , pymatgen -, pytest , scipy , seekpath , spglib +, castepxbin +, pytestCheckHook }: buildPythonPackage rec { pname = "sumo"; - version = "2.2.1"; + version = "2.2.4"; + + disabled = pythonOlder "3.6"; # No tests in Pypi tarball src = fetchFromGitHub { owner = "SMTG-UCL"; repo = "sumo"; rev = "v${version}"; - sha256 = "0r88f5w33h9b0mv7shlqc4przwvas5ycgndvl91wqjnm3b2s3ix0"; + sha256 = "051353gsxmh4qnabshfnc00mmzdbh1fgk1xdfnsfgcnijxgw25bb"; }; - propagatedBuildInputs = [ numpy scipy spglib pymatgen h5py matplotlib seekpath phonopy ]; - - checkInputs = [ pytest ]; - - checkPhase = '' - pytest . - ''; + propagatedBuildInputs = [ + spglib + numpy + scipy + h5py + pymatgen + phonopy + matplotlib + seekpath + castepxbin + ]; - # tests have type annotations, can only run on 3.5+ - doCheck = (!isPy27); + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Toolkit for plotting and analysis of ab initio solid-state calculation data"; diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index dd071b5cf08fb..ff2b588e47029 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "surepy"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "benleb"; repo = pname; rev = "v${version}"; - sha256 = "1adsnjya142bxdhfxqsi2qa35ylvdcibigs1wafjlxazlxs3mg0j"; + sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU="; }; nativeBuildInputs = [ poetry-core ]; @@ -43,11 +43,6 @@ buildPythonPackage rec { rich ]; - postPatch = '' - # halo is out-dated, https://github.com/benleb/surepy/pull/7 - substituteInPlace pyproject.toml --replace "^0.0.30" "^0.0.31" - ''; - # Project has no tests doCheck = false; pythonImportsCheck = [ "surepy" ]; diff --git a/pkgs/development/python-modules/tappy/default.nix b/pkgs/development/python-modules/tappy/default.nix new file mode 100644 index 0000000000000..9e0b83bc925d6 --- /dev/null +++ b/pkgs/development/python-modules/tappy/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tap.py"; + version = "3.0"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-9e7u6/1k5T0yZhdSu0wohYmjuru5bbPzkaTsKfE1nHA="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "tap" ]; + + meta = with lib; { + homepage = "https://github.com/python-tap/tappy"; + description = "A set of tools for working with the Test Anything Protocol (TAP) in Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch b/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch new file mode 100644 index 0000000000000..c9cb8b4a52812 --- /dev/null +++ b/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch @@ -0,0 +1,40 @@ +From d944d8fa6cb6d1667f3e4c4e0cff4c4b2a7c0a30 Mon Sep 17 00:00:00 2001 +From: Cole Helbling <cole.e.helbling@outlook.com> +Date: Fri, 7 May 2021 11:00:46 -0700 +Subject: [PATCH] Replace `debut` with `debian-inspector` + +--- + requirements.in | 2 +- + tern/analyze/common.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/requirements.in b/requirements.in +index edd90ab..5135841 100644 +--- a/requirements.in ++++ b/requirements.in +@@ -12,6 +12,6 @@ requests + stevedore + pbr + dockerfile-parse +-debut ++debian-inspector + regex + GitPython +diff --git a/tern/analyze/common.py b/tern/analyze/common.py +index 6962404..0f5e77d 100644 +--- a/tern/analyze/common.py ++++ b/tern/analyze/common.py +@@ -19,8 +19,8 @@ from tern.utils import cache + from tern.utils import constants + from tern.utils import general + from tern.utils import rootfs +-from debut import debcon +-from debut import copyright as debut_copyright ++from debian_inspector import debcon ++from debian_inspector import copyright as debut_copyright + + # global logger + logger = logging.getLogger(constants.logger_name) +-- +2.31.1 + diff --git a/pkgs/development/python-modules/tern/default.nix b/pkgs/development/python-modules/tern/default.nix index 6247087dd670c..7eb889c873a85 100644 --- a/pkgs/development/python-modules/tern/default.nix +++ b/pkgs/development/python-modules/tern/default.nix @@ -7,7 +7,7 @@ , requests , stevedore , pbr -, debut +, debian-inspector , regex , GitPython , prettytable @@ -22,6 +22,14 @@ buildPythonPackage rec { sha256 = "606c62944991b2cbcccf3f5353be693305d6d7d318c3865b9ecca49dbeab2727"; }; + patches = [ + # debut was renamed to debian-inspector + # https://github.com/tern-tools/tern/pull/962 + # NOTE: Has to be in-tree because the upstream patch doesn't apply cleanly + # to the PyPi source. + ./0001-Replace-debut-with-debian-inspector.patch + ]; + preBuild = '' cp requirements.{in,txt} ''; @@ -36,7 +44,7 @@ buildPythonPackage rec { dockerfile-parse requests stevedore - debut + debian-inspector regex GitPython prettytable diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 13f23edaad152..ed601a2620c8e 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -26,6 +26,12 @@ buildPythonPackage rec { tox ]; + # these tests require network access, but disabledTestPaths doesn't work. + # the file needs to be `import`ed by another python test file, so it + # can't simply be removed. + preCheck = '' + echo > src/tld/tests/test_commands.py + ''; pythonImportsCheck = [ "tld" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix index 5b6bfe6a0e28f..ad35fe501282d 100644 --- a/pkgs/development/python-modules/tls-parser/default.nix +++ b/pkgs/development/python-modules/tls-parser/default.nix @@ -1,5 +1,5 @@ { lib -, isPy27 +, pythonOlder , fetchFromGitHub , buildPythonPackage , pytestCheckHook @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tls-parser"; version = "1.2.2"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; @@ -19,6 +19,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "tls_parser" ]; + meta = with lib; { homepage = "https://github.com/nabla-c0d3/tls_parser"; description = "Small library to parse TLS records"; diff --git a/pkgs/development/python-modules/uc-micro-py/default.nix b/pkgs/development/python-modules/uc-micro-py/default.nix new file mode 100644 index 0000000000000..9b20e2251165c --- /dev/null +++ b/pkgs/development/python-modules/uc-micro-py/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "uc-micro-py"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tsutsu3"; + repo = "uc.micro-py"; + rev = "v${version}"; + hash = "sha256-23mKwoRGjtxpCOC26V8bAN5QEHLDOoSqPeTlUuIrxZ0="; + }; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "uc_micro" ]; + + meta = with lib; { + description = "Micro subset of unicode data files for linkify-it-py"; + homepage = "https://github.com/tsutsu3/uc.micro-py"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix index 96b27127cc608..b5ff5be20616b 100644 --- a/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -1,19 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core }: buildPythonPackage rec { pname = "unpaddedbase64"; - version = "1.1.0"; + version = "2.1.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "0if3fjfxga0bwdq47v77fs9hrcqpmwdxry2i2a7pdqsp95258nxd"; + sha256 = "1n6har8pxv0mqb96lanzihp1xf76aa17jw3977drb1fgz947pnmz"; }; + nativeBuildInputs = [ + poetry-core + ]; + meta = with lib; { homepage = "https://github.com/matrix-org/python-unpaddedbase64"; description = "Unpadded Base64"; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index d687ffd2d0b92..6aa8599653b10 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -6,38 +6,43 @@ , msgpack , mecab-python3 , jieba -, pytest -, pythonOlder +, pytestCheckHook +, isPy27 , fetchFromGitHub }: buildPythonPackage rec { pname = "wordfreq"; - version = "2.3.2"; - disabled = pythonOlder "3"; + version = "2.5"; + disabled = isPy27; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; - # upstream don't tag by version rev = "v${version}"; - sha256 = "078657iiksrqzcc2wvwhiilf3xxq5vlinsv0kz03qzqr1qyvbmas"; + sha256 = "09wzraddbdw3781pk2sxlz8knax9jrcl24ymz54wx6sk0gvq95i7"; }; - propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; + propagatedBuildInputs = [ + regex + langcodes + ftfy + msgpack + mecab-python3 + jieba + ]; - # patch to relax version requirements for regex - # dependency to prevent break in upgrade postPatch = '' substituteInPlace setup.py --replace "regex ==" "regex >=" ''; - checkInputs = [ pytest ]; - - checkPhase = '' - # These languages require additional dictionaries - pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related' - ''; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # These languages require additional dictionaries that aren't packaged + "test_languages" + "test_japanese" + "test_korean" + ]; meta = with lib; { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 7dbbd89e781bc..e28deaf07d64f 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb_run +{ lib, buildPythonPackage, fetchPypi, isPy3k, python3, xvfb-run , wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gtk3, numpy }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { disabled = !isPy3k; nativeBuildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 numpy ]; - checkInputs = [ xvfb_run ]; + checkInputs = [ xvfb-run ]; checkPhase = '' xvfb-run -s '-screen 0 800x600x24' ${python3.interpreter} nix_run_setup test diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 5105cbfff0218..80a503fbb8a45 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.29.0"; + version = "0.30.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eu+7ZYtFKx/X5REkNk+TjG9eQtbqiT+iVXvqjAbFQK8="; + sha256 = "sha256-elpjZq4FpI2wTf1ciILumKE/LQ4fxtCaXxvQo9HRCcc="; }; propagatedBuildInputs = [ ifaddr ]; @@ -25,6 +25,7 @@ buildPythonPackage rec { disabledTests = [ # disable tests that expect some sort of networking in the build container + "test_close_multiple_times" "test_launch_and_close" "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 1e96a64a5e286..a10c3628ff830 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }: +{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran }: { name, buildInputs ? [], requireX ? false, ... } @ attrs: stdenv.mkDerivation ({ buildInputs = buildInputs ++ [R gettext] ++ - lib.optionals requireX [util-linux xvfb_run] ++ + lib.optionals requireX [util-linux xvfb-run] ++ lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = @@ -29,7 +29,7 @@ stdenv.mkDerivation ({ rCommand = if requireX then # Unfortunately, xvfb-run has a race condition even with -a option, so that # we acquire a lock explicitly. - "flock ${xvfb_run} xvfb-run -a -e xvfb-error R" + "flock ${xvfb-run} xvfb-run -a -e xvfb-error R" else "R"; diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index e95fb1573dd23..356224c023098 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -11,6 +11,6 @@ bundlerApp { description = "A Ruby language server"; homepage = "https://solargraph.org/"; license = licenses.mit; - maintainers = with maintainers; [ worldofpeace nicknovitski angristan ]; + maintainers = with maintainers; [ nicknovitski angristan ]; }; } diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index abcd947fa3180..fb0cf4217abcb 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.2"; + version = "2.5.3"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-/Pl9qDzFSL67lBEyHPqy3QfNCXzR510SgM0U8f55Dqg="; + sha256 = "sha256-+bVbl6cuWrG+75AN5a1SUI8AXJq8ThnOpITPf6S2uEI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 64efad50817f9..62476cacbb2de 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.150.0"; + version = "0.150.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-75QSM2v4xDCkDnxW6Qb2ZGiWClOSDCd0jSrUdupMXxY="; + sha256 = "sha256-waQdS0HJVW2WFQFklmZJC0jr09JrDP5Fl7SxVS0dsgU="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index c2f0236ed0b49..78f8bbeb683e6 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -25,6 +25,6 @@ mkDerivation rec { description = "Tool that visualizes massif data generated by valgrind"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ lethalman zraexy ]; + maintainers = with maintainers; [ zraexy ]; }; } diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 9f4efe396c611..7a9206af0938d 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.28.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1d746016iyswb9kw7gprg32vj5rcfa2y9j11r2hsp61hsjfvmg8c"; + sha256 = "0bx6y1y6cfqz77m23w4ab1j2i7s83kv301razv9rkkyxpnpb16hi"; }; - vendorSha256 = "0whd0b9rll0s42hrr2fqp412d5frzmrnqnynpq75wda5rqzmaf8r"; + vendorSha256 = "0rfbjhi78qcaghn9xw658xcxl2x4ln4gnnyi9hsf3wz4cbybird7"; doCheck = false; diff --git a/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch b/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch new file mode 100644 index 0000000000000..bfb636bf562a3 --- /dev/null +++ b/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch @@ -0,0 +1,27 @@ +From e54c17899118ea940c36bc17a48d8ff759243f16 Mon Sep 17 00:00:00 2001 +From: Uri Baghin <uri@canva.com> +Date: Sat, 8 May 2021 09:49:18 +1000 +Subject: [PATCH] Fix darwin build. + +--- + src/itimer.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/itimer.cpp b/src/itimer.cpp +index 08c46d1..52628ef 100644 +--- a/src/itimer.cpp ++++ b/src/itimer.cpp +@@ -52,8 +52,8 @@ Error ITimer::start(Arguments& args) { + + OS::installSignalHandler(SIGPROF, signalHandler); + +- long sec = _interval / 1000000000; +- long usec = (_interval % 1000000000) / 1000; ++ time_t sec = _interval / 1000000000; ++ suseconds_t usec = (_interval % 1000000000) / 1000; + struct itimerval tv = {{sec, usec}, {sec, usec}}; + + if (setitimer(ITIMER_PROF, &tv, NULL) != 0) { +-- +2.31.1 + diff --git a/pkgs/development/tools/async-profiler/default.nix b/pkgs/development/tools/async-profiler/default.nix index d271528de7efa..66177d3a34f37 100644 --- a/pkgs/development/tools/async-profiler/default.nix +++ b/pkgs/development/tools/async-profiler/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + patches = [ + # https://github.com/jvm-profiling-tools/async-profiler/pull/428 + ./0001-Fix-darwin-build.patch + ]; + fixupPhase = '' substituteInPlace $out/bin/async-profiler \ --replace 'JATTACH=$SCRIPT_DIR/build/jattach' \ diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 446d54f90ca47..fd1cc241195a0 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,21 +1,41 @@ { fetchFromGitHub, lib, python3Packages }: +let + python3Packages2 = python3Packages.override { + overrides = self: super: { + arrow = self.callPackage ../../python-modules/arrow/2.nix { }; + }; + }; +in +let + python3Packages = python3Packages2; # two separate let … in to avoid infinite recursion +in python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "2.1.0"; + version = "2.4.0"; - src = fetchFromGitHub { - owner = "Backblaze"; - repo = "B2_Command_Line_Tool"; - rev = "v${version}"; - sha256 = "1kkpvxqgh5pw4kr8lh5gy9d7960hv9zvajbjiqhj6xgykwbpbgmq"; + src = python3Packages.fetchPypi { + inherit version; + pname = "b2"; + sha256 = "sha256-nNQDdSjUolj3PjWRn1fPBAEtPlgeent2PxzHqwH1Z6s="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'setuptools_scm<6.0' 'setuptools_scm' + ''; + propagatedBuildInputs = with python3Packages; [ b2sdk class-registry phx-class-registry setuptools + docutils + rst2ansi + ]; + + nativeBuildInputs = with python3Packages; [ + setuptools-scm ]; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index ab73b8cd8f316..b676213d09c05 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bD04wqmtBgdNlPGXz7/4kYQ97r9EthFfGExxOjt8u7k="; + sha256 = "sha256-w2YCqFkZLsTddj9OPOIdFPgXcXapCGWkc5RaH7RHg24="; }; vendorSha256 = "sha256-IkW13y51NhKflAeHLu8k7DxRqYVnfMHSnfFuT6H/flo="; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index c2b10d823a303..b9070a4276484 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,70 +3,12 @@ tree }: let - version = "3.14.4"; + version = "3.15.1"; # Dependencies should match the ones in: # https://github.com/erlang/rebar3/blob/${version}/rebar.lock # `sha256` could also be taken from https://hex.pm - Checksum - - bbmustache = fetchHex { - pkg = "bbmustache"; - version = "1.10.0"; - sha256 = "1vp27jqnq65a8iqp7j4z8nw9ad29dhky5agmg8aj75dvshzzmvs3"; - }; - certifi = fetchHex { - pkg = "certifi"; - version = "2.5.3"; - sha256 = "040w1scglvqhcvc1ifdnlcyrbwr0smi00w4xi8h03c99775nllgd"; - }; - cf = fetchHex { - pkg = "cf"; - version = "0.3.1"; - sha256 = "0wknz4xkqkhgvlx4vx5619p8m65v7g87lfgsvfy04jrsgm28spii"; - }; - cth_readable = fetchHex { - pkg = "cth_readable"; - version = "1.5.0"; - sha256 = "0z58b6frqdnhyzrmbdf6x78l3izbbh5z5i3am8hqc253r7xwv0dx"; - }; - erlware_commons = fetchHex { - pkg = "erlware_commons"; - version = "1.4.0"; - sha256 = "1rp2vkgzqm6sax7fc13rh9x6qzxsgg718dnv7l0kmarvyifcyphq"; - }; - eunit_formatters = fetchHex { - pkg = "eunit_formatters"; - version = "0.5.0"; - sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; - }; - getopt = fetchHex { - pkg = "getopt"; - version = "1.0.1"; - sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; - }; - parse_trans = fetchHex { - pkg = "parse_trans"; - version = "3.3.1"; - sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; - }; - - providers = fetchHex { - pkg = "providers"; - version = "1.8.1"; - sha256 = "183b9128l4af60rs40agqh6kc6db33j4027ad6jajxn4x6nlamz4"; - }; - - relx = fetchHex { - pkg = "relx"; - version = "4.3.0"; - sha256 = "0h044arh41sr92r1nlg176shavlv7pvw17alwklhszgwlr4hk3kk"; - }; - - ssl_verify_fun = fetchHex { - pkg = "ssl_verify_fun"; - version = "1.1.6"; - sha256 = "1026l1z1jh25z8bfrhaw0ryk5gprhrpnirq877zqhg253x3x5c5x"; - }; + deps = import ./rebar-deps.nix { inherit fetchHex; }; in stdenv.mkDerivation rec { pname = "rebar3"; @@ -78,7 +20,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = pname; rev = version; - sha256 = "09bnqwli93sq1pcz4h88ks7qg7k8yrjy9fd46yyp8xdl7i4irwy2"; + sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g"; }; bootstrapper = ./rebar3-nix-bootstrap; @@ -89,17 +31,9 @@ stdenv.mkDerivation rec { mkdir -p _checkouts mkdir -p _build/default/lib/ - cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache - cp --no-preserve=mode -R ${certifi} _checkouts/certifi - cp --no-preserve=mode -R ${cf} _checkouts/cf - cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable - cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons - cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters - cp --no-preserve=mode -R ${getopt} _checkouts/getopt - cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans - cp --no-preserve=mode -R ${providers} _checkouts/providers - cp --no-preserve=mode -R ${relx} _checkouts/relx - cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun + ${toString (lib.mapAttrsToList (k: v: '' + cp -R --no-preserve=mode ${v} _checkouts/${k} + '') deps)} # Bootstrap script expects the dependencies in _build/default/lib # TODO: Make it accept checkouts? diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix new file mode 100644 index 0000000000000..60dfc0b5b83fe --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -0,0 +1,58 @@ +{ fetchHex }: +{ + ssl_verify_fun = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.6"; + sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; + }; + relx = fetchHex { + pkg = "relx"; + version = "4.4.0"; + sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + parse_trans = fetchHex { + pkg = "parse_trans"; + version = "3.3.1"; + sha256 = "sha256-B82Vd4hfVjYtQU6MTE5r3xDUOodnq7ktJMvoskxUiIs="; + }; + getopt = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + eunit_formatters = fetchHex { + pkg = "eunit_formatters"; + version = "0.5.0"; + sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k="; + }; + erlware_commons = fetchHex { + pkg = "erlware_commons"; + version = "1.4.0"; + sha256 = "sha256-GF7PXPQ7qzoBPds2FM57un9seoJ5BOZOV9pU/N/c4uY="; + }; + cth_readable = fetchHex { + pkg = "cth_readable"; + version = "1.5.1"; + sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA="; + }; + cf = fetchHex { + pkg = "cf"; + version = "0.3.1"; + sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI="; + }; + certifi = fetchHex { + pkg = "certifi"; + version = "2.5.3"; + sha256 = "sha256-7VFqyzkpsQEgip1wAGLVIPOVPaO2uRjYZhBv+pgOHBA="; + }; + bbmustache = fetchHex { + pkg = "bbmustache"; + version = "1.10.0"; + sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; + }; +} diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 4c6cbbbe6b04c..833f2f84b058c 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-iFxRZq/8TW7Df+aAc5IN+FAXU4kvbDiHWiFOlWMmCY0="; + sha256 = "sha256-pxPqBUOsXbP9giaV5NS3a6Z6auN4vUTIrIKcNh8xURU="; }; - vendorSha256 = "sha256-LvaSs1y1CEP+cJc0vqTh/8MezmtuFAbfMgqloAjLZl8="; + vendorSha256 = "sha256-y8DRrthaUzMKxFbdbASvqsRMT+jex7jMJA6g7YF/VxI="; doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index db1f2aeabc741..0b6c979244108 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, lib, buildGoModule, - makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }: + makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep, + nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; version = "3.29.0"; @@ -30,6 +31,10 @@ buildGoModule rec { --prefix PATH : '${lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; + passthru.tests = { + smoke-test = nixosTests.buildkite-agents; + }; + meta = with lib; { description = "Build runner for buildkite.com"; longDescription = '' diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index ccb8b4eba656a..bc464c2024e48 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,4 +1,4 @@ -{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: +{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }: let inherit (haskell.lib) overrideCabal addBuildDepends; inherit (lib) makeBinPath; @@ -16,8 +16,16 @@ let makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins} ''; }); -in pkg // { - meta = pkg.meta // { +in pkg.overrideAttrs (o: { + meta = o.meta // { position = toString ./default.nix + ":1"; }; - } + passthru = o.passthru // { + # Does not test the package, but evaluation of the related NixOS module. + tests.nixos-minimal-config = nixos { + boot.loader.grub.enable = false; + fileSystems."/".device = "bogus"; + services.hercules-ci-agent.enable = true; + }; + }; + }) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5373b2d359bad..67074d4354359 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.277.3"; + version = "2.277.4"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1awixb55bkpqcvf2s59aph3kxdd70g9x1a5s5kly33kwrplcf8iy"; + sha256 = "19z72d0rkxpvl03aqz102in9ln08r9831lj3ymsgmglk8c37ici6"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 32ab88bf41281..ebd6064ee915f 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.3.2"; + version = "4.3.4"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-sc/W4N+pd1bhLiyQLqm0j2o/RviT8iKzBZcD0GRDqqE="; + sha256 = "sha256-tWk4AW2F1v+5C7Gj9I6c4JVfaQDXEVMdPoaKafa7OgE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 83256efd5faf9..fee73f7e98ce7 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.59.0"; + version = "1.60.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-mkFKYWPUEHVtQi9eUPxvWYxNCfVrKdjo2bH2DEwL1d0="; + sha256 = "sha256-HhJOjTuPuQT8CYRf4yaR+d/MyTWlM1y+FiEU7S5rEs0="; }; meta = with lib; { diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index d031145a9977f..b536dc9406703 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 +{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome , python2Packages }: python2Packages.buildPythonApplication rec { @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [ libxml2Python ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index e74a6b9c3c6a4..a735bdb5fed4d 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -8,7 +8,7 @@ , docbook-xsl-nons , libxslt , gettext -, gnome3 +, gnome , withDblatex ? false, dblatex }: @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 65dce6d2cdf13..cc1c250d94dbb 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.11.15"; + version = "0.11.19"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "1j6qli26i2hwkjqcigz7vyx6hg9daq4vlqigv7ddslw3h8hnp0md"; + sha256 = "1cg1qjjsbqr9xbgh8m48vkcb52vf64ycd5x86px60apr068y9df9"; }; vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index d77772c32db6f..3e5c7b0438fd3 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -15,7 +15,7 @@ , libxml2 , docbook-xsl-nons , docbook_xml_dtd_42 -, gnome3 +, gnome , gdk-pixbuf , libxslt , gsettings-desktop-schemas @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 gsettings-desktop-schemas gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index a65a9276add43..6f86900edf527 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-St8QgUZUU7THM9H8i7Z+bgKu9LhXhUqH/B14LGmDCn0="; + sha256 = "sha256-RdXViEEJR8yud2coSmAUfIe1mTCHiZHALrcGRslNfEg="; }; vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; diff --git a/pkgs/development/tools/haskell/hyper-haskell/default.nix b/pkgs/development/tools/haskell/hyper-haskell/default.nix index 6b1399046166e..2b3fb76903e50 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/default.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/default.nix @@ -1,35 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, jshon, electron_3 +{ lib, stdenvNoCC, fetchFromGitHub, jshon, electron_10 , runtimeShell, hyper-haskell-server, extra-packages ? [] }: let binPath = lib.makeBinPath ([ hyper-haskell-server ] ++ extra-packages); - electron = electron_3; -in stdenv.mkDerivation rec { + electron = electron_10; +in stdenvNoCC.mkDerivation rec { pname = "hyper-haskell"; - version = "0.1.0.2"; + version = "0.2.3.0"; src = fetchFromGitHub { owner = "HeinrichApfelmus"; repo = "hyper-haskell"; rev = "v${version}"; - sha256 = "1k38h7qx12z7463z8466pji0nwfkp4qkg7q83kns2mzmwmw5jnmb"; + sha256 = "1nmkry4wh6a2dy98fcs81mq2p7zhxp1k0f4m3szr6fm3j1zwrd43"; }; propagatedBuildInputs = extra-packages; - buildCommand = '' + dontBuild = true; + + installPhase = '' mkdir -p $out/bin $out/share/hyper-haskell/worksheets $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/mime/packages # Electron app - cp -R $src/app $out + cp -R app $out # Desktop Launcher - cp $src/resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop - cp $src/resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg - cp $src/resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml + cp resources/hyper-haskell.desktop $out/share/applications/hyper-haskell.desktop + cp resources/icons/icon.svg $out/share/icons/hicolor/scalable/apps/hyper-haskell.svg + cp resources/shared-mime-info.xml $out/share/mime/packages/hyper-haskell.xml # install example worksheets with backend set to nix - for worksheet in "$src/worksheets/"*.hhs; do + for worksheet in "worksheets/"*.hhs; do ${jshon}/bin/jshon -e settings -s nix -i packageTool -p < $worksheet > $out/share/hyper-haskell/worksheets/`basename $worksheet` done diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 875d5a8a4a8d5..4a84823141089 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -2,9 +2,8 @@ let ihaskellEnv = ghcWithPackages (self: [ self.ihaskell - (haskell.lib.doJailbreak self.ihaskell-blaze) - (haskell.lib.doJailbreak self.ihaskell-diagrams) - (haskell.lib.doJailbreak self.ihaskell-display) + self.ihaskell-blaze + self.ihaskell-diagrams ] ++ packages self); ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index e471489e70958..7753556a4ea59 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.5.2"; + version = "2.5.5"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c8v9O3ufTZ7/rWwLNoak0ITlEVlOg9MvheRjQIxPwKc="; + sha256 = "sha256-lNC8TwX462Lnt/uiKWt9hNa81g3tdenvvuNQJNkj7hM="; }; - vendorSha256 = "sha256-kJtJ2ut+yhgNoPIY5i3dKmQV0g+8RvcGnxCyay7wy2A="; + vendorSha256 = "sha256-uStmUhiZuUguxUx2L8ifSNnbMCs7Jk+6tq7qZdACjag="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 3b9cc67bc2c39..8c01aea284ebd 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.21"; + version = "0.2.22"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XDxG7F+oBatlb4ROBryt2Fop402riKmYoqZLJrUzBUQ="; + sha256 = "sha256-a+yw7QSLNX3hO2GnFCifYMbPWYwtleUZS1AqPsxw9t8="; }; - vendorSha256 = "sha256-PwVDMSl36m+6ISJQvyrkCjaL3xp5VkaZtfxyMpNn+KI="; + vendorSha256 = "sha256-6jD+gY/TmO/Ot507IlTLNdWv7G4BHYlk/E9rVoRD65A="; doCheck = false; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 5c130a99c9267..73126752b98e6 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -7,7 +7,7 @@ , gtk3 , python3 , wrapGAppsHook -, gnome3 +, gnome , libwnck3 , gobject-introspection , gettext @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3 libwnck3 ]; @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "dfeet"; versionPolicy = "none"; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 7ace6f857c8bd..739615a841c7d 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.5"; + version = "6.6.6"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww"; + sha256 = "sha256-dYB4r/+Y1MBRxYeFx62j7Rl3+rt3+Il/9le3HMYtTV0="; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index b78c111ccbf8d..06487845fb3d1 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome }: stdenv.mkDerivation rec { pname = "gob2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib bison flex ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 96ce9d4059147..ab196ebc5b34f 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -14,7 +14,7 @@ , libgsf , gcab , bzip2 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix index 7f73fb9a1bc3c..b1d59c9450acc 100644 --- a/pkgs/development/tools/misc/nimlsp/default.nix +++ b/pkgs/development/tools/misc/nimlsp/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "nimlsp"; - version = "0.2.6"; + version = "0.3.2"; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${version}"; - sha256 = "13kw3zjh0iqymwqxwhyj8jz6hgswwahf1rjd6iad7c6gcwrrg6yl"; + sha256 = "1lm823nvpp3bj9527jd8n1jxh6y8p8ngkfkj91p94m7ffai6jazq"; }; nativeBuildInputs = [ nim ]; diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 01f2ced1f4bb8..0a2bbc30fb520 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Source code search and cross reference engine"; homepage = "https://opengrok.github.io/OpenGrok/"; license = licenses.cddl; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 58c0f2ed28b1d..7894dfe797d6f 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , pkg-config -, gnome3 +, gnome , gtk3 , libxml2 , intltool @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "nemiver"; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index a9443eeadf6e2..2d33dedbdd25a 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = sysprof.meta // { description = "Static library for Sysprof capture data generation"; + license = lib.licenses.bsd2Patent; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 9e749adea2091..6ceda016045bd 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -5,6 +5,7 @@ , gettext , glib , gtk3 +, json-glib , itstool , libdazzle , libxml2 @@ -15,18 +16,18 @@ , shared-mime-info , systemd , wrapGAppsHook -, gnome3 +, gnome }: stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.38.1"; + version = "3.40.1"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0"; + sha256 = "0dvlzjwi3a4g37cpyhqpf41f5hypf0gim1jw9wqlv30flbb00l62"; }; nativeBuildInputs = [ @@ -39,17 +40,27 @@ stdenv.mkDerivation rec { pkg-config shared-mime-info wrapGAppsHook - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme + ]; + + buildInputs = [ + glib + gtk3 + json-glib + pango + polkit + systemd + libdazzle ]; - buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ]; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; @@ -65,6 +76,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index ed8da83e30a59..0bd33f19f8e99 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -1,37 +1,38 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool -, base, bower-json, bytestring, Cabal, containers, cryptonite -, dhall, directory, either, extra, fetchgit, file-embed, filepath -, foldl, fsnotify, generic-lens, Glob, hpack, hspec, hspec-discover +, base, bower-json, bytestring, containers, cryptonite, dhall +, directory, either, extra, fetchgit, file-embed, filepath, foldl +, fsnotify, generic-lens, Glob, hspec, hspec-discover , hspec-megaparsec, http-client, http-conduit, http-types , lens-family-core, lib, megaparsec, mtl, network-uri, open-browser , optparse-applicative, prettyprinter, process, QuickCheck, retry -, rio, rio-orphans, safe, semver-range, stm, stringsearch -, tar, template-haskell, temporary, text, time, transformers -, turtle, unliftio, unordered-containers, utf8-string, versions -, with-utf8, zlib +, rio, rio-orphans, safe, semver-range, stm, stringsearch, tar +, template-haskell, temporary, text, time, transformers, turtle +, unliftio, unordered-containers, utf8-string, versions, with-utf8 +, zlib }: mkDerivation { pname = "spago"; - version = "0.20.1"; + version = "0.20.2"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "1j2yi6zz9m0k0298wllin39h244v8b2rx87yxxgdbjg77kn96vxg"; - rev = "41ad739614f4f2c2356ac921308f9475a5a918f4"; + sha256 = "11jh3bszvl8zfi4xcabpx43jply28dxdywd6fadxspaa05jdxxn2"; + rev = "0f38c9153e46f30e9d87963e181f5c1a595f4b64"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async-pool base bower-json - bytestring Cabal containers cryptonite dhall directory either - file-embed filepath foldl fsnotify generic-lens Glob http-client - http-conduit http-types lens-family-core megaparsec mtl network-uri - open-browser optparse-applicative prettyprinter process retry rio - rio-orphans safe semver-range stm stringsearch tar template-haskell - temporary text time transformers turtle unliftio - unordered-containers utf8-string versions with-utf8 zlib + bytestring containers cryptonite dhall directory either file-embed + filepath foldl fsnotify generic-lens Glob http-client http-conduit + http-types lens-family-core megaparsec mtl network-uri open-browser + optparse-applicative prettyprinter process retry rio rio-orphans + safe semver-range stm stringsearch tar template-haskell temporary + text time transformers turtle unliftio unordered-containers + utf8-string versions with-utf8 zlib ]; - libraryToolDepends = [ hpack ]; executableHaskellDepends = [ ansi-terminal base text turtle with-utf8 ]; @@ -40,7 +41,6 @@ mkDerivation { process QuickCheck temporary text turtle versions ]; testToolDepends = [ hspec-discover ]; - prePatch = "hpack"; homepage = "https://github.com/purescript/spago#readme"; license = lib.licenses.bsd3; } diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh index 74bc010506625..12595885df3c9 100755 --- a/pkgs/development/tools/purescript/spago/update.sh +++ b/pkgs/development/tools/purescript/spago/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p cabal2nix curl jq +#!nix-shell -i bash -p cabal2nix curl jq haskellPackages.cabal2nix-unstable -I nixpkgs=. # # This script will update the spago derivation to the latest version using # cabal2nix. @@ -25,7 +25,10 @@ new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/relea echo "Updating spago from old version $old_version to new version $new_version." echo "Running cabal2nix and outputting to ${spago_derivation_file}..." -cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" > "$spago_derivation_file" +echo "# This has been automatically generated by the script" > "$spago_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$spago_derivation_file" + +cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" >> "$spago_derivation_file" # TODO: This should ideally also automatically update the docsSearchVersion # from pkgs/development/haskell/configuration-nix.nix. diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ae1ac3e39f3e9..ca8359a32a8c2 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core +{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index ced5d7cd583cc..80ce649d6c175 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "rust-fuzz"; repo = "cargo-fuzz"; rev = version; - sha256 = "sha256-kBbwE4ToUud5BDDlGoey2qpp2imzO6t3FcIbV3NTFa8="; + sha256 = "sha256-txlHXboQi3Z8AMIJJBZsBrCA7xggF0zGDpKqcD8UxMo="; }; - cargoSha256 = "sha256-zqRlB2Kck4icMKzhaeeakEnn6O7zhoKPa5ZWbGooWIg="; + cargoSha256 = "sha256-eEfry6Q2YiIkNEHu6C8p17pUTF43eS1/iTP2oATZ/F8="; doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index b59e5a4d33d76..017fb7d484d4d 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.7.2"; + version = "7.8.0"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ocibNgH2xw0BrJRmHCAahO6hPLmlDmwjjzo7mMWp9FU="; + sha256 = "sha256-ZbVBwSg3roIMA+5LVP3omtTgbAJ7HAdJDXyAybWuRLw="; }; - cargoSha256 = "sha256-6ztMEfVOlsyUtIeH+Qd/l7khC7XOHKc4bWsDd27RNu8="; + cargoSha256 = "sha256-6aoi/CLla/yKa5RuVgn8RJ9AK1j1wtZeBn+6tpXrJvA="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 3ad4b54b47a06..c4d0d605cf65e 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.40"; + version = "2.1.44"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "sha256-8Is+RBfcXKbGSFzYoolLHs30rxlNI//xVGEOhxP2TV8="; + sha256 = "sha256-EmxJg2QDpGZ5TbMy9y6P11LdMucBdvewkRewuUzccGM="; }; - cargoSha256 = "sha256-iUomr9viCdZk4nV75/OP8vHtJpMbmy+pq1IbaA2lLmE="; + cargoSha256 = "sha256-kKQnpEashpIwrXubuZIpU+tzxFaUjr6jaVunYPqaHnM="; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index c90492c6aeca4..9b426882fe542 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - sha256 = "0a4yikkqppawii1q0kzsxwfp1aid688wa0lixjwfsl279lr69css"; + sha256 = "10mv18hsyz5kd001i6cgk0xag4yk7rhxvs09acp2s68qni1v8vx2"; }; - cargoSha256 = "08k60gd23yanfraxpbw9hi7jbqgsxz9mv1ci6q9piis5742zlj9s"; + cargoSha256 = "02455sk8n900j8qr79mrchk7m0gb4chhw0saa280p86vn56flvs0"; meta = { description = "one CLI to format the code tree"; diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix index 4cad79f9a85f7..7a5ab2ae41907 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/vala-language-server/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "Code Intelligence for Vala & Genie"; homepage = "https://github.com/benwaffle/vala-language-server"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ andreasfelix worldofpeace ]; + maintainers = with maintainers; [ andreasfelix ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index a45ced8a49222..3c91880e16ed0 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , glib , meson @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "vala-lint-unstable"; - version = "2020-08-18"; + version = "2021-02-17"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "fc5dd9e95bc61540b404d5bc070c0629903baad9"; - sha256 = "n6pp6vYGaRF8B3phWp/e9KnpKGf0Op+xGVdT6HHe0rM="; + rev = "5b06cc2341ae7e9f7f8c35c542ef78c36e864c30"; + sha256 = "KwJ5sCp9ZrrxIqc6qi2+ZdHBt1esNOO1+uDkS+d9mW8="; }; nativeBuildInputs = [ @@ -34,8 +35,7 @@ stdenv.mkDerivation rec { glib ]; - # See https://github.com/vala-lang/vala-lint/issues/133 - doCheck = false; + doCheck = true; meta = with lib; { homepage = "https://github.com/vala-lang/vala-lint"; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 70c634fc9bd1b..b97a4438c05d8 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TNytKq2LqLWxNrqesOJbNQUTirvPkxLMqJmtbmFq+0Y="; + sha256 = "sha256:0qbsybs91v9vnkxj4kpwqhzk4hgpkq36wnixxjajg038x7slds4i"; }; vendorSha256 = null; diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index 5344c1b833ca0..ed94b56e695fc 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -11,7 +11,7 @@ , webkitgtk , makeWrapper , wrapGAppsHook -, gnome3 +, gnome , gdk-pixbuf }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { webkitgtk glib-networking gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index b65c342aaa79f..a8ae0c31ee8ef 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.211"; + version = "0.0.212"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-iR8vEXLRdhLggFvu4Vhb8WW2Wo6qzAMQWC7qUMlWGd8="; + sha256 = "sha256-4BL+IhwmKiPN5G/5ut0RJcCXWy4IKPichx2dD3/TRic="; }; preBuild = '' diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 847943d83bcf6..f62e9027af108 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Web micro-framework written in Vala"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 5cb28b3f3bd63..9533af21b15d1 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A free, open-source game of ancient warfare -- data files"; homepage = "https://play0ad.com/"; license = licenses.cc-by-sa-30; + maintainers = with maintainers; [ chvp ]; platforms = platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index bb3b7c0138aff..feaf4347329c4 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -2,7 +2,7 @@ , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 -, gloox, nvidia-texture-tools, zeroad-data +, gloox, nvidia-texture-tools , withEditor ? true, wxGTK }: @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { "-I${fmt.dev}/include" ]; + patches = [ ./rootdir_env.patch ]; + configurePhase = '' # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} @@ -62,7 +64,6 @@ stdenv.mkDerivation rec { ${lib.optionalString withEditor "--enable-atlas"} \ --bindir="$out"/bin \ --libdir="$out"/lib/0ad \ - --datadir="$out"/share/0ad/data \ --without-tests \ -j $NIX_BUILD_CORES popd @@ -85,11 +86,6 @@ stdenv.mkDerivation rec { # Copy l10n data. install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/* - # Link in game data from package - ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config - ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods - ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools - # Copy libraries. install -Dm644 -t $out/lib/0ad binaries/system/*.so @@ -105,6 +101,7 @@ stdenv.mkDerivation rec { gpl2 lgpl21 mit cc-by-sa-30 licenses.zlib # otherwise masked by pkgs.zlib ]; + maintainers = with maintainers; [ chvp ]; platforms = subtractLists platforms.i686 platforms.linux; }; } diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/games/0ad/rootdir_env.patch new file mode 100644 index 0000000000000..95463c7e2df46 --- /dev/null +++ b/pkgs/games/0ad/rootdir_env.patch @@ -0,0 +1,39 @@ +diff --git a/source/ps/GameSetup/Paths.cpp b/source/ps/GameSetup/Paths.cpp +index 474364e..bf084b4 100644 +--- a/source/ps/GameSetup/Paths.cpp ++++ b/source/ps/GameSetup/Paths.cpp +@@ -155,32 +155,8 @@ Paths::Paths(const CmdLineArgs& args) + + /*static*/ OsPath Paths::Root(const OsPath& argv0) + { +-#if OS_ANDROID +- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus +-#else +- +- // get full path to executable +- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation +- if(pathname.empty()) // failed, use argv[0] instead +- { +- errno = 0; +- pathname = wrealpath(argv0); +- if(pathname.empty()) +- WARN_IF_ERR(StatusFromErrno()); +- } +- +- // make sure it's valid +- if(!FileExists(pathname)) +- { +- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8()); +- WARN_IF_ERR(StatusFromErrno()); +- } +- +- for(size_t i = 0; i < 2; i++) // remove "system/name.exe" +- pathname = pathname.Parent(); +- return pathname; +- +-#endif ++ UNUSED2(argv0); ++ return OsPath(getenv("ZEROAD_ROOTDIR")); + } + + /*static*/ OsPath Paths::RootData(const OsPath& argv0) diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 6562a60a5be48..347ccd8df63b1 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -7,12 +7,12 @@ let self = stdenv.mkDerivation rec { outputs = [ "out" "icons" ]; pname = "alephone"; - version = "1.3.1"; + version = "1.4"; src = fetchurl { - url = let date = "20200904"; + url = let date = "20210408"; in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - sha256 = "13ck3mp9qd5pkiq6zwvr744bwvmnqkgj5vpf325sz1mcvnv7l8lh"; + sha256 = "sha256-tMwATUhUpo8W2oSWxGSZcAHVkj1PWEvUR/rpMZwWCWA="; }; nativeBuildInputs = [ pkg-config icoutils ]; diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/games/alephone/infinity/default.nix index 5db83c579e4ee..f6002469a0964 100644 --- a/pkgs/games/alephone/infinity/default.nix +++ b/pkgs/games/alephone/infinity/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20200904"; + version = "20210408"; icon = alephone.icons + "/marathon-infinity.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "1n2zfiqjbakkk9dpnzfndqyvq3aml2kjrr2b1wm8g1n44nbc8clq"; + sha256 = "sha256-j9iwSrI7cjqnuRQX+qn8sWXQ6E+DQ19l7OzAL9KHcJU="; }; meta = { diff --git a/pkgs/games/colobot/default.nix b/pkgs/games/colobot/default.nix index 25b91d80f2729..b26244ccc5fde 100644 --- a/pkgs/games/colobot/default.nix +++ b/pkgs/games/colobot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng , glew, gettext, libsndfile, libvorbis, libogg, physfs, openal , xmlstarlet, doxygen, python3, callPackage }: @@ -18,6 +18,15 @@ stdenv.mkDerivation rec { sha256 = "0viq5s4zqs33an7rdmc3anf74ml7mwwcwf60alhvp9hj5jr547s2"; }; + patches = [ + # Fix issue with newer compilers, like used in nixpkgs + # https://github.com/colobot/colobot/pull/1291 + (fetchpatch { + url = "https://github.com/colobot/colobot/commit/fc2bd68876ac6302dbc8e91e8ffa33592db14b21.patch"; + sha256 = "sha256-PKe8jeyHpTT86tprSafQhNqTYBrSonz+r2fL1lVJdfo="; + }) + ]; + nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ]; buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ]; diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 0cd16e433dfa4..44c48af5c29ef 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "cutemaze"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2"; - sha256 = "0pw31j2i3ifndikhz9w684ia00r8zvcgnb66ign9w4lgs1zjgcrw"; + sha256 = "sha256-h7+H2E37ZVSnlPa6ID+lNEvFtU5PfdMSlBjqBumojoU="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 74411d63d3ebf..f0e4121d8f2c3 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection -, python3Packages, gnome3 }: +, python3Packages, gnome }: buildPythonApplication { pname = "gscrabble"; @@ -19,7 +19,7 @@ buildPythonApplication { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - gnome3.adwaita-icon-theme gtk3 gobject-introspection + gnome.adwaita-icon-theme gtk3 gobject-introspection ]; propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index b15bb43a45176..fc187afbe8067 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchbzr, intltool +{ lib, stdenv, fetchbzr, gettext , gtk2, wrapGAppsHook, autoreconfHook, pkg-config , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "gweled"; - version = "unstable-2018-02-15"; + version = "unstable-2021-02-11"; src = fetchbzr { url = "lp:gweled"; - rev = "94"; - sha256 = "01c38y4df5a06wqbsmsn8ysxx7hav9yvw6zdwbc9m5m55z7vmdb8"; + rev = "108"; + sha256 = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; }; doCheck = false; - nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkg-config ]; + postPatch = '' + substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])" + ''; + + nativeBuildInputs = [ wrapGAppsHook gettext autoreconfHook pkg-config ]; buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 3b5575ee76473..9062af5be3837 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -102,6 +102,6 @@ mkDerivation rec { hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; - inherit (ghc.meta) platforms; + inherit (fpc.meta) platforms; }; } diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index c97ea55882b06..5f79b86956cc2 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib , fetchFromGitHub }: let @@ -13,7 +13,7 @@ let }; path-env = buildEnv { name = "megaglest-path-env"; - paths = [ bash which gnome3.zenity ]; + paths = [ bash which gnome.zenity ]; }; in stdenv.mkDerivation { diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index ddb415a6ad2f5..7ffa361da559c 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -76,9 +76,9 @@ let }; v5 = { - version = "5.3.0"; - sha256 = "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6"; - dataSha256 = "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx"; + version = "5.4.1"; + sha256 = "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8"; + dataSha256 = "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4"; }; in { diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 2e8533f7816ec..22d3c6c879ed0 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -25,7 +25,7 @@ let lua = pkgs.lua5_1; # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome3) zenity; + inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/openra/packages.nix b/pkgs/games/openra/packages.nix index c09b697771a39..2f4c83c7d5a32 100644 --- a/pkgs/games/openra/packages.nix +++ b/pkgs/games/openra/packages.nix @@ -15,7 +15,7 @@ let lua = pkgs.lua5_1; # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome3) zenity; + inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 34de043a65857..5c77e8a2c1811 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "sha256-qZGeLkKbsI+in+jme6m8dckOnvb6ZCSOs0IjoyXUAKM="; + sha256 = "sha256-D7qTWiqBX0/ozW3C4q4z9ydpU4cxIo+EimOzpulILm0="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index f17c436cccb5c..de2163d678449 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -85,7 +85,7 @@ in buildFHSUserEnv rec { targetPkgs = pkgs: with pkgs; [ steamPackages.steam # License agreement - gnome3.zenity + gnome.zenity ] ++ commonTargetPkgs pkgs; multiPkgs = pkgs: with pkgs; [ diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 35143028a2759..7998e13817d87 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -54,7 +54,12 @@ let "libsquish" # Not packaged to this date "sheenbidi" - ]; + ] + # Our system angelscript causes linking error on ARM + # ld: libangelscript.so: undefined reference to + # `CallSystemFunctionNative(asCContext*, asCScriptFunction*, void*, unsigned int*, void*, unsigned long&, void*)' + # Bundled angelscript compiles fine + ++ lib.optional stdenv.hostPlatform.isAarch64 "angelscript"; in stdenv.mkDerivation rec { @@ -100,15 +105,15 @@ stdenv.mkDerivation rec { harfbuzz mcpp wiiuse - angelscript - ]; + ] + ++ lib.optional (!stdenv.hostPlatform.isAarch64) angelscript; cmakeFlags = [ "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs - "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 + # doesn't work with our 2.35.0 on aarch64-linux + "-DUSE_SYSTEM_ANGELSCRIPT=${if !stdenv.hostPlatform.isAarch64 then "ON" else "OFF"}" "-DCHECK_ASSETS=OFF" "-DUSE_SYSTEM_WIIUSE=ON" - "-DUSE_SYSTEM_ANGELSCRIPT=ON" "-DOpenGL_GL_PREFERENCE=GLVND" ]; diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 246dbb7dd3504..dddcc3a746821 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }: +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { version = "3.2.3"; pkgName = "image-analyzer"; @@ -7,7 +7,7 @@ let pkg = import ./base.nix { }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg intltool + gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 599531950a214..8ce84ccae204a 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }: +, python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }: let pkg = import ./base.nix { version = "3.2.3"; @@ -9,7 +9,7 @@ let inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg ]; + gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 70e5d94def6f8..502e5c647237a 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, alsaLib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils -, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook +, epoxy, gdk-pixbuf, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libarchive libao xdg-utils - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index c21f67845db40..bb5e7cea4e009 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -2,6 +2,7 @@ , cairo , cmake , fetchFromGitHub +, fetchpatch , ffmpeg , gettext , libGLU, libGL @@ -46,6 +47,15 @@ stdenv.mkDerivation rec { "-DENABLE_SDL='true'" ]; + patches = [ + (fetchpatch { + # https://github.com/visualboyadvance-m/visualboyadvance-m/pull/793 + name = "fix-build-SDL-2.0.14.patch"; + url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/619a5cce683ec4b1d03f08f316ba276d8f8cd824.patch"; + sha256 = "099cbzgq4r9g83bvdra8a0swfl1vpfng120wf4q7h6vs0n102rk9"; + }) + ]; + meta = with lib; { description = "A merge of the original Visual Boy Advance forks"; license = licenses.gpl2; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 9dd973674412e..865ab6ee1f31c 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -15,7 +15,7 @@ with lib; let inherit (python3Packages) python dbus-python; - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; libOnly = prefix == "lib"; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index ea7356b32e910..c1ccc668487af 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -5,7 +5,7 @@ }: let - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optAlsaLib = shouldUsePkg alsaLib; optDb = shouldUsePkg db; diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index d8db893f7d702..b75f9c3f80087 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.0"; + version = "2.22.1"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "0khg9dlm1b02mm9w54xqc9ydj416xkikn6p08g1asiyjf4qx1pb4"; + sha256 = "sha256-cqwtVMMQwxQcC3gtTgvvkALVUZz0ZjJ1mx8D72lpzDA="; }; postInstall = '' diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 243d582bdcee7..4813e24930759 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Virtual console locking program"; license = licenses.gpl2; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix new file mode 100644 index 0000000000000..cb8ccc8c6ae49 --- /dev/null +++ b/pkgs/misc/t-rec/default.nix @@ -0,0 +1,34 @@ +{ lib, imagemagick, ffmpeg, rustPlatform, fetchFromGitHub, makeWrapper }: + +let + binPath = lib.makeBinPath [ + imagemagick + ffmpeg + ]; +in +rustPlatform.buildRustPackage rec { + pname = "t-rec"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "sassman"; + repo = "t-rec-rs"; + rev = "v${version}"; + sha256 = "InArrBqfhDrsonjmCIPTBVOA/s2vYml9Ay6cdrKLd7c="; + }; + + buildInputs = [ imagemagick ]; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" + ''; + + cargoSha256 = "4gwfrC65YlXV6Wu2ninK1TvMNUkY1GstVYPr0FK+xLU="; + + meta = with lib; { + description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; + homepage = "https://github.com/sassman/t-rec-rs"; + license = with licenses; [ gpl3Only ]; + maintainers = [ maintainers.hoverbear ]; + }; +} diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 6c59c13d12e2a..cd401907125ba 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -18,10 +18,10 @@ }: let - defaultVersion = "2021.01"; + defaultVersion = "2021.04"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "0m04glv9kn3bhs62sn675w60wkrl4m3a4hnbnnw67s3l198y21xl"; + sha256 = "06p1vymf0dl6jc2xy5w7p42mpgppa46lmpm2ishmgsycnldqnhqd"; }; buildUBoot = { version ? null diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 7eb81d54d840d..571d630244846 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-04-20"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "737c1bf1ac9becd67519f7a6832ad276feca8f08"; - sha256 = "0imngagc6p5mfx1v2maxcwzh75l1y4diyd1ymwjil51x93qkrzxi"; + rev = "bee8eccb421968d1f2628c15e9f2bfcc3d0418aa"; + sha256 = "1kfj40rfgyvzjk1ic9ax21cb8a58qhjbqh7knxgljkv7jhaclj4y"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -161,12 +161,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2021-03-03"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "8e018dee9c5e2205288bda01be0de196b04b7cf2"; - sha256 = "1ghv6zp3qajd4n9qv3mnxqhczi77qmds2b2iicbl252slvldr604"; + rev = "6c653c3f8f1c1cf7a34522c9555d5160f36d29ee"; + sha256 = "1zzdybfswlh66gw8a3imkwf7m6g13rlf6dqyg71c6bfmn3zlx2l0"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -209,12 +209,12 @@ let auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-04-24"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "6e87fa2ed6b6fe7ccd14fe4b30cc00be47afc3c6"; - sha256 = "00d3ga6rpzwcz2pcdgwrnr2xymh1hizs46zzc8jjmrj58k8sg033"; + rev = "0ec315fd4eb3779db92881d33de3c4601f95da75"; + sha256 = "12x9x1rygy59fn7n223cc04w05ig5qniwig0hcq5y8al6y49drl8"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -257,12 +257,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-04-21"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "54b4376d9a44b45f12b0f6f5bcc46f98b66782e1"; - sha256 = "0nh4rgyix8mj3wag8wpcy68avyrh5ps89a842fqdd5x6054d3apv"; + rev = "566a7ef96e6e935c6e84ddfb73e3a50a7b196638"; + sha256 = "0caglapjgnghp9j1vyk162ch66bhcpgidp2radfiayh5mnifpqv2"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-04-29"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "23c8aacf13be02b985455ef027fbd28896dd1ef8"; - sha256 = "1bwaxs8rgyr1w81rqygia9ab7l10vcvad0d3xx89x17z6szakj3x"; + rev = "71054d1cfcd88c91875882ec59627ba983bba090"; + sha256 = "111q295abqgagfqcfal920bllyb5a2wzbsm03bkdvqg7hzbdhsw2"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -497,12 +497,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-04-14"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "f76e290d6765261b0a4aee2247dfaaba77e30ab9"; - sha256 = "0xm9clynyp7h248iddpns7rqdllgvf3f34qlxn47fby2nh07galc"; + rev = "02cd0ca0fa06712b7609b87c50e5e05998b3a771"; + sha256 = "093dcv4hzxxz2ygawjka08j4s7akygh2fldn4mfzrxjyjpxqal0c"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -533,12 +533,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-04-29"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "473668eabee0592e817f9c692b0509c2743fb1c3"; - sha256 = "1r6wx6bpzfbhb8a95jw1gi2xkvx4h8i4rima2ylkrdbx86hgicjz"; + rev = "4586b97342cff6c8b630a024db30547e53ad1d62"; + sha256 = "0w1l82y5vmppmbp5lqdcn9cal62fiyi97qmpd6y0fi2fsy2c0y3x"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -726,12 +726,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-04-25"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "6ad4f8374c1c1b06146c5c866a404cd4f2b4a8f9"; - sha256 = "0nwfzsl4g8z45mj84sck7dz5yxrdgklp9l7xz3pialaz8bqsc6vm"; + rev = "b24f6df45012c2c53743777b306fdb9396dcb5e9"; + sha256 = "08xqgkivczp3yciqc3xigdfl1q4c14mfa0i27didwds73i94mqqd"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -774,12 +774,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2021-03-15"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "24da62f64e6025be12ad60b16489b561f228e619"; - sha256 = "0x5z46rzhwrdr1fzq69c6bpn3dnjjj9a64s97wn220n4xwrz1y54"; + rev = "67e70f0949e6ea7a9d0a74fd3c3f96f75547798b"; + sha256 = "14szr4dzg97xy996zd8rkandlw4xsi3pywv2gwg6m0nxl5cb2hrl"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -882,12 +882,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-04-28"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "f0e31bf12b0dc1b8c733c3bf76fdfd9679fb63be"; - sha256 = "0js6k32jqkf4nfs7vpx6pd7ix36p2599nzd4myshfsphb470zbny"; + rev = "e1842ae0020ef53c7ed8f96ab1c51378c3323476"; + sha256 = "1r01lfdk07cybhf957zzkpl6qxiwfladk72qfc525ah2bqcrhik5"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -930,24 +930,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-04-28"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "b9ec10c07d4525001de2660ae1ee25ce572fa5c7"; - sha256 = "17vivrhyn4qhvw1a4bf5wycl136whiic1srpvvvh8fs4pzsc2yn3"; + rev = "17bf89c269e59c9169f4024b0a957b2b71faf21d"; + sha256 = "0m57ia5gh987axm81qbmfbjigdnf1sbkp2grkcf7sq0m3gms10qp"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-04-28"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "2b89f3060bc0539b32ad50e2cba20de877cf960a"; - sha256 = "1hqj9gaymfkzlc0v0v0kg5ac9yn7zbv14zvwaly8bjf28q8vh5yn"; + rev = "6017dfa949fe781c8ef861081f8513e3097245c6"; + sha256 = "12i8b054fq3vi7pn8wah5y5h87br4rjc4mhdvvdlijs4kgpkd9fy"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1172,12 +1172,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-04-28"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "0cb28652b7acab25ba85a598dfeae3829234fc6e"; - sha256 = "16arlh3xq8pfsicyc76jalvd6q2ld9k4xwdndmgkr2wsdmnc9kwz"; + rev = "9d8f0dfc9e0a2f60b42e9d7b96eb485087c0178d"; + sha256 = "17nq09731rcgccasximg3qknvfzi0ca9lsrwvhjbzc5wagwrribq"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1218,6 +1218,18 @@ let meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; + diffview-nvim = buildVimPluginFrom2Nix { + pname = "diffview-nvim"; + version = "2021-05-06"; + src = fetchFromGitHub { + owner = "sindrets"; + repo = "diffview.nvim"; + rev = "dac6553c175937e8f9b795e1fb4fea9fa7caf555"; + sha256 = "0p0h1rqzg3gxbwr3d0n2al8lxv307dmfvanvcgiaq3md7xhfm4gf"; + }; + meta.homepage = "https://github.com/sindrets/diffview.nvim/"; + }; + direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; version = "2020-11-20"; @@ -1402,12 +1414,12 @@ let fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-04-18"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "609610754b52d3d32616bd70094dcce3a88db3e6"; - sha256 = "1va4iaxnb03zk880k2kilsyr498pv0g78418d0nzxa4cdmvxcp5z"; + rev = "5409f2ef04e1959b5a8d177c962a57f2f2cb78ae"; + sha256 = "125bnbyjdhdj2ynrnxwn55cpq8v73zd0idlwshyk2a93w6mrxy7b"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1487,12 +1499,12 @@ let friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-04-17"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "ee28380b2300b374251b89d73e7e5b23c573e2bc"; - sha256 = "1ap2nf84gbrqlykw1l8zx01m9hm92vw57wkkzv2cqkjcbm3whqyg"; + rev = "4e2eb2822acd45af84eaae156ad608d5e7720797"; + sha256 = "0lvmnqvbw8cnr9fb2gr3vhznqkw5z1359kcbmcp6ly9s2vr2nvgn"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1535,12 +1547,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-04-14"; + version = "2021-05-01"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "ee91c93d4cbc6f29cf82877ca39f3ce23d5c5b7b"; - sha256 = "0zpf45wp0p924x96w9i171w5mbh25rzbmp987wpv8kgfzq7dviir"; + rev = "75c7e87de1ed7ff41183d479b1a23023070bfe54"; + sha256 = "0axwgirslx6rsxda3dv2bqxyk9fnaj5yy9346hignlxzkg6z7641"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1631,24 +1643,24 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-04-18"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "866b3ed000d483b27067d9bc89dbaa57a83244e8"; - sha256 = "1jj2nbsm5g1y9pw0frh35kbj17zpxy56gqym44gv8hy2wbhzwhbf"; + rev = "0fc45c030111602b99bf4425cc3cc2a624e2db01"; + sha256 = "0mzkmkgldh63jm41pai3xv14x2cx5qprxciyhbpc22knha2xigxi"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-04-23"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "34d1c630546dc21517cd2faad82e23f02f2860d1"; - sha256 = "0ddz2z7plw320kgsddlfywsa202bl8sxr9jbvldhh0j34q5lgdja"; + rev = "4b990ccdaa8d9bd5be017d8aa8035474bc035b1d"; + sha256 = "1skyzqq6ycr81g1dd10wsdx9d4dv4zdhh1gs0gbdjkhpf36hrb0v"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -1667,12 +1679,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-04-26"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "3d378118e442690e2e15ee6a26917a5c1871f571"; - sha256 = "1ik37ppad5dzlkl237ls58hdlcm09igkklgr6zqjpili37p32z43"; + rev = "fd08f51f88b86d2527631d94b4056b790748147d"; + sha256 = "00csq7ci74kz958hbmvppdmq9cw11qmhli1pkx4hqxqq8mx9lg0k"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1691,12 +1703,12 @@ let glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-04-27"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "f3770dd754501139dd11566b8b739d828a773272"; - sha256 = "159arilpzv8pdwv4323gv85lwcz5libbk0drjkpbp2632bl9likh"; + rev = "7474d370ff5d9b4b62d8578c5c739f01b589767a"; + sha256 = "0kk5a3kskv3lb0143qdlshyd0phzivk7rdrh1234wdkcfw7llj8a"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -1751,24 +1763,24 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-04-15"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "42668ea643d56729467fb79c1a0a5e30289fe590"; - sha256 = "090jh2pwkl2mpycnii78457k2pkdj76l9x4p4yn9j662986imnhl"; + rev = "173f4d70115916cfb5f605c5a99e7c738dbb5e12"; + sha256 = "0y509alsjky51z6yzijfjh13lmj2na16wvwayzvf5nc19ls6adxk"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; - version = "2021-04-23"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "npxbr"; repo = "gruvbox.nvim"; - rev = "9dc9ea64fd2fb255a39210e227fc7146855434af"; - sha256 = "04d8knfhidxdm8lzc15hklq1mm6i5kmdkik4iln4cbhd3cg33iqy"; + rev = "9e0e0a00360c87c76d293464430662dbdf298d99"; + sha256 = "0d0yrqh4rw1ijslvip2h3c6kmpzfza9iw3dizgjl2kbl8jx958a1"; }; meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; }; @@ -2208,12 +2220,12 @@ let LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-04-28"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "86eaa396858a8da957d9f445e9d8bd4c0c304f96"; - sha256 = "0rq2f094jmz74krjszgahlx9qdhl4qghviy4qk64d9lygjjc8xln"; + rev = "e65a9b9b88df503340643d3c086ec1ee53898891"; + sha256 = "0x1hzbzjw28cisj8xzglp9qhbzzkxv3lg98imxrpswn6xynpdz4n"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2304,12 +2316,12 @@ let lightline-ale = buildVimPluginFrom2Nix { pname = "lightline-ale"; - version = "2021-01-19"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "maximbaz"; repo = "lightline-ale"; - rev = "932ea5b9287b8ddfd7b7f0218bb28de52d013140"; - sha256 = "1b3xbhd32jk43z8baj1djls294whbq2qls01l90k4ihsq97jplb9"; + rev = "98a7417ff66829b1d14cb9e4e7aa6a1a0ef25103"; + sha256 = "1ripdl58pcmylgzzj92v8myjjw22h1g9g6drld9ng1qcg1zn2br8"; }; meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; @@ -2364,12 +2376,12 @@ let lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors-nvim"; - version = "2021-04-23"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "525c57c1138ca5640547efb476758938aedba943"; - sha256 = "0dxalh12ifsghksl423bbawq096k8fcl1cgmnvaw3f2x71fngfs6"; + rev = "00b40add53f2f6bd249932d0c0cd25a42ce7a2fc"; + sha256 = "1qa1kb5abrka5iixmz81kz4v8xrs4jv620nd583rhwya2jmkbaji"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; @@ -2386,6 +2398,18 @@ let meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; + lsp-trouble-nvim = buildVimPluginFrom2Nix { + pname = "lsp-trouble-nvim"; + version = "2021-05-07"; + src = fetchFromGitHub { + owner = "folke"; + repo = "lsp-trouble.nvim"; + rev = "2b27b96c7893ac534ba0cbfc95d52c6c609a0b20"; + sha256 = "0r70wxpj594j4mglqlrxs8dv9a2mv32dhq3pgp9g69r52pv1c39i"; + }; + meta.homepage = "https://github.com/folke/lsp-trouble.nvim/"; + }; + lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions-nvim"; version = "2021-02-17"; @@ -2424,24 +2448,24 @@ let lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-04-25"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "6ba2b80b594c3ead11ab9bd1dbc94c0b4ea46c33"; - sha256 = "0xhdc18sdlbhhyd7p898n4ymyvrhjqbsj5yzb6vmjvc4d9gln1k6"; + rev = "c8b96850c9e592fc1a3113ec4973588dec559556"; + sha256 = "14000i249w25r3z4g5jvbq3firc0cghkj7grv76jisfqjvgfccs5"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-04-26"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "3a188f13ffcd026e1c29938ff2fb1a8177b8f953"; - sha256 = "06dk4xl1d4j06ccclzyg9nj3pcshypab5sv6wc5303by8l8j17j7"; + rev = "a7b6f179e42d34af66a2dee7a272125f65ee021b"; + sha256 = "1s9n77azgkw3hjkdn3s7aaq0l0jk7rzgfwv9q0adjz7b0k8a9f5j"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -2458,6 +2482,18 @@ let meta.homepage = "https://github.com/mkasa/lushtags/"; }; + markdown-preview-nvim = buildVimPluginFrom2Nix { + pname = "markdown-preview-nvim"; + version = "2021-03-10"; + src = fetchFromGitHub { + owner = "iamcco"; + repo = "markdown-preview.nvim"; + rev = "e5bfe9b89dc9c2fbd24ed0f0596c85fd0568b143"; + sha256 = "0bfkcfjqg2jqm4ss16ks1mfnlnpyg1l4l18g7pagw1dfka14y8fg"; + }; + meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; + }; + matchit-zip = buildVimPluginFrom2Nix { pname = "matchit-zip"; version = "2010-10-18"; @@ -2520,12 +2556,12 @@ let mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2021-04-09"; + version = "2021-05-01"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "7fc33a899acfbc172d8e12059c1ca18696346a89"; - sha256 = "05fhqvr9pinw6zfbjcdbm31c27wd94z7nyzp9f4vi8m1yhp4h6mk"; + rev = "84c9a59087e74d6bd7761cd4a920d9390c2a65f9"; + sha256 = "0qf4q5yh5f9kzxc96aq925ppj304hjnb4xxzjijc38jpvsmchjba"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -2868,12 +2904,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2021-04-05"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "3ae169d555afb0dd8a3be4b0bb20c38efda62e68"; - sha256 = "1kjlhlnjf69hnl7aw11d211psi18qyb4l6k49xr868h7nrc2bns2"; + rev = "1315d10e60bd93483aaac4cc5a1623d13aede504"; + sha256 = "1w80id0123rbwmkicm8n053mp1wzqwh9lxxjmmp6bp6c2x97mgzk"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2952,12 +2988,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2021-04-13"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "1b53686d5f1d1607dc67430e9243283fee3a9764"; - sha256 = "03qzbvry4mygx109mxxqqmbv9adh9ifsiwl0rsvfgp7kl6l6fzkk"; + rev = "ab475e1325ad6eaec15a3113f201a4e4a3ee2811"; + sha256 = "00zmrgb8f2i0i00xbqnidxln6bkz740q09cj7kysk5142z27435q"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -3096,48 +3132,48 @@ let nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-04-28"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "0cacd33ec635430c80fd5522bad47662d3780f55"; - sha256 = "18angbsm98zzbykdh83xkl6m8cbnrqvxg3n0v9abwi2r02wnfwqb"; + rev = "05ef9cb97e82074a65c8a3a278760d4b8f599e3c"; + sha256 = "04v5l9gdrcxsk0yy0jljlr3qy79hqqw5i7fmvfrk641z4kv24rc1"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-04-12"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "9d6649c01221680e5bb20ff9e2455280d9665de2"; - sha256 = "18a974l753d92x3jyv5j0anri99hxzfw454lkz94amabbnc010p6"; + rev = "e368305d2544339b998446972aef9050439b1156"; + sha256 = "0aaknlvjsshk8gcv69wmmyarc53f5y4h0fndwhhzij3c92zwqsyi"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-04-25"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "56316fcc87d2654903e4213817d5fba56008c81d"; - sha256 = "11z40nm53r5nq1h4q0l1gfrly2zdaqzp4li40zxzp962b80f0wxv"; + rev = "eac2f3748c8dd05f6942fea18c770f658b3fc2b9"; + sha256 = "0rczsikdvqkjd93fw7sjdsaw6nbp99zj4m0z5js43hrg8ygnmsq9"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-04-27"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "41debce12f99970f13c16dfd4fd89da64cf6abcf"; - sha256 = "1ilsrcil3d7fwkfy1xqbcim0fc2ydal38b4xrvgv07bvih9pwflp"; + rev = "14dee901aa462183632aaf346fc6ec85fa3ac85d"; + sha256 = "0aj1cfkc2fhn6ibwv08szia0fc01jmx7x448zl2kcnwyzcr1qp0v"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3168,12 +3204,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-04-19"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "99452ae6875889c12653963b68e53c4564848954"; - sha256 = "1d5hpn3mr2h3s5h2svajbxm0n49mmc5w0sip9cpzyfdpbnv1gic3"; + rev = "efe3a6614e74c5eafec89e5b256ea514c5e1ea15"; + sha256 = "00n9bh8m89jrg4jqaz34c8sp7y1h5x3v06xjir465635g66vq20h"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3192,12 +3228,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-04-23"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c6cb4fcbc91b0404ae157f1942e305d66073ca1a"; - sha256 = "07mncx8bzigbh6yy7nbsgjb3g3fm1kx73wb6p7jl6h9ay3fmgrfc"; + rev = "f0c43dca363a52acf2b8e5a62363f2def40139f8"; + sha256 = "0dmzk93d7xpiyvavsg7s3snfrcpnsyl2is87bild6vj9l13hl7pb"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3216,12 +3252,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-03-07"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "07aa4b435a832b122154a157ab6892ac4efb81fb"; - sha256 = "05cgypswm7qdl26jd6nfqahk2bmqvp482k9zjbk0an12kbzlsrz0"; + rev = "66d4a0daabf4be3abb478e9477ade28871b77f56"; + sha256 = "17zgwp8lw5npm3g28n2hqhpdc4m34ndp39rrlm1vgqkksp08lh56"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -3240,12 +3276,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-04-26"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "a23ce7882d3caf4df00e79c515c81633055bae45"; - sha256 = "0xlz3v4zzaklnkr5sx238i7d8agxbsk9zbs3br0dfjdbrvhgii02"; + rev = "4ce0b6462b33b3857e5cd9c91c9f9ac33ae0357f"; + sha256 = "0n267lvr5sgn1n135bc1bhfxjlkcf2r1ydiccbcqs4mf8kjsj4hw"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3264,12 +3300,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-04-28"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "f449589f6c56426a82adead43fe8fdabda0454fb"; - sha256 = "0l6f2596cdwbrwyacc6w60ad8616ivxcamjqcx3jizw5b6wlb475"; + rev = "6fa8c5a9459504c2a090c0028b27da951e35a354"; + sha256 = "15zqxsjp3frdihl40r4141ml4kiydxqw4arjirzqzrsrblxavd5c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3288,12 +3324,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-04-23"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "62977b6b2eeb20bd37703ebe4bc4b4c2ef006db2"; - sha256 = "0niwaq3mc7x1zaf3qx9dp43607rnhq2nvyizkxb7j1yir8a8dk4x"; + rev = "0a921bf2be74d293c8a8d6dd70122c1d01151a30"; + sha256 = "1vj331bgkyl8j19cniwwn49aal21vqsqgy17wgxa37g5igb14jrw"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3336,12 +3372,12 @@ let nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-04-29"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "58f5ba925b51cfd7edf73e1135588403151bc719"; - sha256 = "0033r4w4lh59a0ghvpk5r7ww4s46airfgi4idgizsc6w8xkrj2yy"; + rev = "5d18f3e13909e96d3a28a79404d4c558ab193d2c"; + sha256 = "0vw5s5mmid1191js5v7bc3pdmlswlaziy3ryc6h18nq8mmk8d0ap"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3360,12 +3396,12 @@ let nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-04-28"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "7e153f1a636d0dc92e013da3177bbbdf34e415a3"; - sha256 = "0djjvqx52anrsdar68l4alyiyxwfbcq6bfpdjcghyhnwmnnygb3n"; + rev = "53d0820fdacd8a5b3c20397a691b12c84a5a0aaa"; + sha256 = "190iw5449ybsaz3y9w5yy5kybr06cih4vkf75jg09lp4mx8z2anb"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3384,36 +3420,36 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-04-28"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "bbf3f87884756330793510261193b0a725fb899b"; - sha256 = "1974jpw2sjz4v8vy7y665bl6avflsv7pdqmq9ahlqf2lw59x13hy"; + rev = "25081a1d63cd1525c5bcfe65c053a0b88b009394"; + sha256 = "1ris5yfi050g5nbhll39fw75djyki0slixwrljqnqn9dfgfddwp7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-04-18"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "d5070fb1171220e8db6eef77ed994079198d6522"; - sha256 = "1x534yrbjnf4bny3bykj7jkydhkjxspmipkbb685ja4nppc2lp41"; + rev = "8a7f7c2ed73d68d081029baf0e0dd71c1ed744b7"; + sha256 = "1zg8nzg60yp359rz4zyyli8imnb3ri3mimd28n4f5sn3ydlm697c"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; nvim-treesitter-refactor = buildVimPluginFrom2Nix { pname = "nvim-treesitter-refactor"; - version = "2021-03-17"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "edf1790d9cd365785d4f86848c079704aa7e4854"; - sha256 = "12rp2mj7va5qf55jzca0rgy1xrwkyf7p3zd3xw262m9lqm4hjqqc"; + rev = "1a377fafa30920fa974e68da230161af36bf56fb"; + sha256 = "06vww83i73f4gyp3x0007qqdk06dd2i9v1v9dk12ky9d8r0pmxl6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; @@ -3432,12 +3468,12 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-04-19"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "d42bf9f52607c1cb281db570f3f47e0d84b03a02"; - sha256 = "13ndyskp3yx3nazg6xc1j3lzad588a1qdacs6ymh8vs616p5mqsf"; + rev = "3540654cacb93f66ebfb5ca770c42b7a715ed2d5"; + sha256 = "0azsnaz9bf90v9szhvidrxq37xvggvp0dzpjwpk0dc28wjx2c2zd"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3516,24 +3552,24 @@ let one-nvim = buildVimPluginFrom2Nix { pname = "one-nvim"; - version = "2021-03-20"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "Th3Whit3Wolf"; repo = "one-nvim"; - rev = "b1461ea89c940bdc5ed142327e1cd85ed2c0e877"; - sha256 = "1w5avzyrcbg60prx3239iazcjvh2mk7lk6k256a1iyxb6dnkpbas"; + rev = "75e845eacc23f544b8990b5b6d10d8edf58cacfe"; + sha256 = "0zwz2kak0hk0kam0klh3ydynlw814g56vrqdn679ca6xqwzcihy3"; }; meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2021-02-25"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "b70ed293f3c3adaea23f9fcd84ef942015664756"; - sha256 = "0wz4kmbgc9rlvbxj8s8xg1sx53w0v94r6qicq3ggs9raca51ywfg"; + rev = "bb949122420fd4ae7b29fdc467cf3a9c39d48882"; + sha256 = "1rrx97j4n1qmqfpc1shh00vw01ivhik70s50rdk9hsc7lmxnwxxh"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -3576,12 +3612,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-04-28"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "c742488c5a9b5f8b04e5a85f6ab060a592a987ff"; - sha256 = "1yl9sq5qi4rbfzvm4n4ynrlvcfvca1vy8pa69c78pyx0lr3qh7z3"; + rev = "0e263350f9c972796c49ce5e04be75a86909759b"; + sha256 = "1cjrnlglfb2w8q41fajv4j16w28287h70i41raqqh4wm3l94nahw"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3660,24 +3696,24 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-04-17"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "a141bf5c9734ac164cb0dda5e7a2b8b16273a4f6"; - sha256 = "1grhxhnh5zij2brlk2bmy3b2y8bp9j75hyajfki8dk908pplng0i"; + rev = "79f71e2bd73978dfc7d228042d5e90c8545df623"; + sha256 = "1yrf0bdfn7xqmkzzwkzcf2hbcyaf21va3nd7fr5c9f4cvin3p0vr"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-04-28"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "d4476cdac636f3e6ae35aa9eb9bda6cbf4e11900"; - sha256 = "1axdm1kxdzwlhkpd4p59z5fkpj0igjpwgcy5c99w83gad66z1kwb"; + rev = "02990e428c5eeb907e0767dc0628341c29509ed5"; + sha256 = "19r8yrx1932h0q104fcskfl85f632s7ckaqh6laakifqhidnw37k"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3937,12 +3973,12 @@ let rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2020-10-02"; + version = "2021-04-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "d83f5a8e070a1fc7e7af0aeea58e71b78956daab"; - sha256 = "0iwj01p9c2kczhx69vxrh1qd4z41ymcgfq5235b1l0rnz4d6v82y"; + rev = "f97caeb0cf973c81e5b0be83e1f0f67bb5f28cd5"; + sha256 = "1l296pzf1pz7ahq57bdgnmpsaqi0snp503dp4xlwgay9xax803mv"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -3985,12 +4021,12 @@ let rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-04-23"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "7d734e9b52fe54b6cd19435f0823d56dc2d17426"; - sha256 = "181vq3p1f136qmb0qbd77khc04vrkdw8z9851car7lxs5m83wwp2"; + rev = "2e615d4a039d2fc580479a5e512330527d151d3f"; + sha256 = "0hc0iv5p3ys98w8sv4569jh5x20vqqyysgff5nrgysl0amw6rgwd"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4093,12 +4129,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-04-21"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "93021c0623c1822502a72131e2d45617510428b9"; - sha256 = "042d7zmwmi0xhlshwwrf9bhc0j4ybksxxnrs986vm65y58c11fk3"; + rev = "925dcf5e9e91551d98323da98ae25d5aeaedf2c9"; + sha256 = "1ncx7qxvdi8cfqq41wg3sk99b4g5rihz1lzvj8fy0yv7p9dkri6k"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4165,12 +4201,12 @@ let sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-04-24"; + version = "2021-05-08"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "784de58d2bcad8b16bce972c1727fb0cb07e43b2"; - sha256 = "04wlqd902fy474mk7688y2mysy8vsm3pf36d59bxd3jlspgp6zcl"; + rev = "11c554bdb70977f508d3a3ccaf87734d7b2c2e17"; + sha256 = "0xza499wjmf1v6zvc0j2s893rhvii4llk7z4rry991bc3fcbf0md"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4346,12 +4382,12 @@ let supertab = buildVimPluginFrom2Nix { pname = "supertab"; - version = "2020-10-01"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "ervandew"; repo = "supertab"; - rev = "d80e8e2c1fa08607fa34c0ca5f1b66d8a906c5ef"; - sha256 = "0wjaq6k1sb38qmjcp47cr0avvwhphr0wiyl8qvnc8qqyjf8y803k"; + rev = "f0093ae12a9115498f887199809a6114659fc858"; + sha256 = "1r1ck62raxhwcxjv7hic7jm9b5inm1vdqc51zn4nybclys7grnss"; }; meta.homepage = "https://github.com/ervandew/supertab/"; }; @@ -4370,12 +4406,12 @@ let swift-vim = buildVimPluginFrom2Nix { pname = "swift-vim"; - version = "2020-09-04"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "bfc662d11b3a006815d0b6972c1c0c2ebbc3b16e"; - sha256 = "1qf5f9p0kfi6bq2qi9izarva6r711vzlbrbdax8nq9g0pxa1bj3f"; + rev = "74af6626f63e331b60524d20dd69c9c5d03dc90c"; + sha256 = "0cizij9lv93yg8fxnh04vfpywaxywprmkcsvwginbi20hz155q4g"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -4551,12 +4587,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-04-28"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ad30a7b085afd31c66461b61e268aa88527199bb"; - sha256 = "0191bax9mpw8q4hy126wyyyxyrb79c89m01plmzh66baiahd3sxv"; + rev = "88f7b27222ac75223ab971c5158dbcf64a326669"; + sha256 = "131gpwhfkmh7wwsqs2jhjfdlp3l93s3z4klrpg5wnak5v5rgzvsq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5080,12 +5116,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-04-28"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "30f8ada1d6021d89228092b3c51840916c75a542"; - sha256 = "0mriz1c0yfwavgmawj52n42rxzsmi3mchww5wlkvs6274am63da6"; + rev = "19360bac6372b364ae4ffaefbd523da47dbff316"; + sha256 = "07iq43ikkhdl30avpqcawknhg25mhb1vz86hb2ydyv2fjmgf5jn1"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5104,12 +5140,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2021-04-16"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "0f9995d5996adf613297896c744415cd9e6b7a80"; - sha256 = "1zwicvlrfpvgczjnzjdkjhv2b110v5xbmvj132xl8a7xsj3rzg1d"; + rev = "140238f65ef8168f2b046c52c6297cc596f8b347"; + sha256 = "062c12db6dhi3dv83iff1b940idhipimk3hsjcp1i4c3mbxxr78p"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -5176,12 +5212,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-04-26"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "916f9e10461def8c71b5359c0e0b7a08f80d5fc5"; - sha256 = "1sn631dyqni3hf5psn2jhndzckw3p5vl7i57p6i5n6n3lhzzcvj7"; + rev = "58bbc3c8751ba48d1c0ecba040ce43699272d800"; + sha256 = "0ylb8jljin1g5big1lfjrfww576fcb1wakz5shial8xgpw9w1hx1"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -5236,12 +5272,12 @@ let vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; - version = "2021-04-16"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "nathangrigg"; repo = "vim-beancount"; - rev = "dd2f56a122b698454af582cbe7eae471dbdc48f8"; - sha256 = "00wcq3wg02rjzhc83cm4gvc9fw78a7s5gds4qdn7zqf55ha2d6vi"; + rev = "2f970a0c826275f7d07fa145ba9a35c15b15232d"; + sha256 = "0fzacrlfr8fy5j1kps1mbkik0ln7lgd9c9jv74xd3mrz50hzqzby"; }; meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; @@ -5356,12 +5392,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-04-25"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "1afdd263a862bae0641f565e3f2952e1c01cec43"; - sha256 = "0c2jrz02dsdykc3xxqw1yfnllmrpwzs6ygjqcclghw5mygfc3xcg"; + rev = "236919da99a534307e5cf2b204ddf1e3c1a1816e"; + sha256 = "0vajjv8nw41n783vsfqy72z4r3m36s7wkfxs96scpga18v3xgqng"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5548,12 +5584,12 @@ let vim-crates = buildVimPluginFrom2Nix { pname = "vim-crates"; - version = "2021-04-03"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-crates"; - rev = "96a40ee5c976390c142b0074d7a4a7e54b0cfa00"; - sha256 = "0nd8w4rx1s0fnhxn0ngl3dxj94ar8vjn611684v5pbxdpj6b92fm"; + rev = "f6f13113997495654a58f27d7169532c0d125214"; + sha256 = "1acm52hlv0qhisgcy8xwck6zv29b8x40bcngg7z3invv47b1gi7k"; }; meta.homepage = "https://github.com/mhinz/vim-crates/"; }; @@ -5572,12 +5608,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2021-02-02"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "8dd7f1bf25acee493a5114e627ea90a9850c5fa8"; - sha256 = "0pjq14i7w2snlbzsqhfdn0fkribjsyngg6fcmpgacm4jvx3iviql"; + rev = "cabad5f2a247296145ab4059df98e92cdb3ffe78"; + sha256 = "0r28r46bszfid40ra86y435r0l5f9bxkpxs9jnhqbvgbwhm4c5nx"; }; meta.homepage = "https://github.com/ap/vim-css-color/"; }; @@ -5620,12 +5656,12 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-04-22"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "63bfd6d99ba17832f4740efa5e2e6ad6537d4552"; - sha256 = "0p9n1n8n0167kgq4wwwxsnair2hqqvy6vwcqchnb15hifl3cl0w3"; + rev = "13f776a6ca7fb9905a329a1ac469d3ebe22e377e"; + sha256 = "11vlafq22z2xff8dvr5j80igfxrkkyx1p84khbpgyv1cq09dwsgk"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -5666,6 +5702,18 @@ let meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; + vim-deus = buildVimPluginFrom2Nix { + pname = "vim-deus"; + version = "2021-03-28"; + src = fetchFromGitHub { + owner = "ajmwagar"; + repo = "vim-deus"; + rev = "1be965e7bc1c01e7db5e46dcd0e50d32d4eef434"; + sha256 = "1h0imrxhxw81hkh9xl75rcnx7ll5fry6hcf7flx84n6nawvfzyvm"; + }; + meta.homepage = "https://github.com/ajmwagar/vim-deus"; + }; + vim-diminactive = buildVimPluginFrom2Nix { pname = "vim-diminactive"; version = "2017-08-27"; @@ -6028,24 +6076,24 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-04-22"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "4a1938457489fe072acf2fbbe7142a3cfb0d8ad8"; - sha256 = "1va57czyrihcc2cihbbil5vqhnlzvjrb9bw7wirdrpjrd04ciaa4"; + rev = "1c63ac05e6bfe99cddcbf39dcdf84ff4660696e0"; + sha256 = "1yryf2dnkhphivnm1miakya8jq37iszgl97mjjar35819vrz7hab"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-04-26"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "30fe977b46bee7a7005fd808d14aa425149f4563"; - sha256 = "1ap1ghyi3f61zi5kc17nc7sw4dh3r7g2mlypy19hzhrfxysdxz7b"; + rev = "cabecb166bde31d9fe86caac7e51284cff575da2"; + sha256 = "13ybny4i20p6xi6rp6vzngbrjwjpikvcrhg8spj1g9n2z5wcc2xz"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -6088,12 +6136,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-04-23"; + version = "2021-05-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "8f4a23e6639ff67c0efd7242870d4beed47b5d37"; - sha256 = "0ss8qlxgidlf1ma6z3ma63lqgaynnbrj9fdbw38szwc823vdqiid"; + rev = "32b0d6266361614a6a07cfe850750e900cd50575"; + sha256 = "0pyidvyn246sm8w9mdcj0rmipqnc4b63q80l8z5y5v3zpy37v4mf"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6136,12 +6184,12 @@ let vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-03-18"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "e9058ebb9b9563ec77bc96fb19b2138f6512beef"; - sha256 = "17wpar2ais3cx1jaak9l8fck7fks2yczn7flcvgfcwvjxd9vyxgq"; + rev = "0fe3f4eb4c4477d3dd09b155e20d128d99b1da3f"; + sha256 = "0viys51afhflfz3zjg769v7zxz422a3jra079ld94mn3kqan8lra"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -6208,12 +6256,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-04-28"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "a2f964d0e22b9023e1f0233b611461d64dabcd4b"; - sha256 = "1gwb2wncdqn51ifp3pkgjz1lw2c7fzavh43639scj9mdj8rr6r12"; + rev = "efc854422b4e816f42f5281d4f30a3c33340b349"; + sha256 = "0gcy1cgpnzcgapcqnbrvk6anzp9jxm3k8xkclkwvwlmv3r212fsh"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6256,12 +6304,12 @@ let vim-gruvbox8 = buildVimPluginFrom2Nix { pname = "vim-gruvbox8"; - version = "2021-04-22"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "217a87f4f751ed0d6fe5c79b2c0963f557bf0314"; - sha256 = "1gdys8ycmmykq121ix34wva75m18nda0camiqr4aavb9hj32faj6"; + rev = "68253ac63780918b02669ec15ac5bc3aa36e4641"; + sha256 = "0k355wqh8x8c35qvll494v98gbvvly96w79d94srzarvj4h9as55"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -6678,12 +6726,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2021-04-01"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "fc059e80ff0b368a9188d6c16db052da6ac0951f"; - sha256 = "03x8hhaf5mirk38gb8j7k3fk6jjis64a4r2hnvkgg6hwf9h02f2g"; + rev = "e9e8547a57fa113945047c003d321fbbee770e03"; + sha256 = "15j7fb20rz6gndm04ac9lfwrbq9ss5pk9ilxj90rd1dmppvkdkfr"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -6906,28 +6954,40 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-04-29"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "b6898841c771df0a5231f74145e0813533d44def"; - sha256 = "0r5hg2hjcmwm6mkm7s41wij6hdlfq2g5xjvgg0bn8nhyn4048mgd"; + rev = "1f98a0656620bfc03dcb8bad87aa76a6304b3b73"; + sha256 = "177l1xbd1039mmxwk2ggbjawvnpqp362w0mnqvqs2655ib4zdbq3"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { pname = "vim-lsp-cxx-highlight"; - version = "2021-04-25"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "jackguo380"; repo = "vim-lsp-cxx-highlight"; - rev = "ce92c8e9b1ab587eb22ad017d536619b6a100d09"; - sha256 = "01h0lmxi9ly6qhywi5n7hzq881ff4kld7gzpzci81vflmi5k1gnx"; + rev = "9e42350272a413a51ce9a93b00c98682815ff7c1"; + sha256 = "1nsac8f2c0lj42a77wxcv3k6i8sbpm5ghip6nx7yz0dj7zd4xm10"; }; meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; + vim-lua = buildVimPluginFrom2Nix { + pname = "vim-lua"; + version = "2020-08-05"; + src = fetchFromGitHub { + owner = "tbastos"; + repo = "vim-lua"; + rev = "fa810f85437525bcea0fc4ff22c634935721d86d"; + sha256 = "1fkpfjpmv80lcd7jn95pzxrcbzn8avdywjknd5bn3212ahydg43m"; + }; + meta.homepage = "https://github.com/tbastos/vim-lua/"; + }; + vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; version = "2021-04-28"; @@ -7003,12 +7063,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-04-25"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "a39772e2fbd464776b0aa025ca04c2504379cf72"; - sha256 = "08sj11x507nh5fi5zx88p31wx936saqvw641rdwlk3g20b99sinj"; + rev = "5bbcdf9dbb3c956ab76adfaf8cdb294d1e794d0d"; + sha256 = "061bwk97vvzdamq3zjfvyzzi5p0m973q4dqsisrp31s75y0q0b7m"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -7063,12 +7123,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2021-02-12"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "65fa0678d8426ae2cc7a4c42a8f0d72bde2a7bbe"; - sha256 = "0r118mxm34kr8yk66x9ddg2yh44gn00iaxljfbhg43nhp8jyzjbn"; + rev = "66f7dc9c63296ea6ba408faa60bebe54a34c57f2"; + sha256 = "10ip0y9p2qf869h2yhp2zs6qc048rw1x5i0spziajca96251gvig"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -7387,12 +7447,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2021-04-16"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "5af0dcf7878a8c947ae5a69989524f0a1ba5f6da"; - sha256 = "17vb0xnzq6ic9naqg2wvjdh7s7ckz82ixv45pknxc21b6wjrfc75"; + rev = "587399591a9e9b8da9846c0d724a84a3bd1ce98e"; + sha256 = "1xghmq15i8wqfwx7gib8j54c5s3an9q4idy6c6mbywd75s4384m5"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -7507,12 +7567,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2021-02-08"; + version = "2021-04-30"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "cffcfe150bda75177920530c5f1911b52f70a065"; - sha256 = "0sgfnxi1f5mnzcbklcmq6x17r1z1kz8s7h2h94girmd4aga3gcp0"; + rev = "fc2813ef4484c7a5c080021ceaa6d1f70390d920"; + sha256 = "0fsl8w17z15sj21x5gd5ah5p5fjsnk0gzdx2n2p0jnkcb05bwzck"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -7735,12 +7795,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2021-04-26"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "c171b86845a64d9ed3f5b9b4040f1164be37f115"; - sha256 = "0jr2xif05xb4iiv18nr7xz978z246bkbabgx1djh73rpjk3683y3"; + rev = "e2c72b5cfb6a4e07e70806198c1ff491a6077fa8"; + sha256 = "1iyc8wjbr1iwch1vjzlw1x7q0vg7bnr4zwbga2rzw6lm0f8y4gkw"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -7939,12 +7999,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2021-04-22"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "6b9afcce385b1121d46f749f9cd46d05e132c1e4"; - sha256 = "04yh7cq9vi1hksksyphg8s4xz64qc6pmwnrbqapfgfsmp6jk11s5"; + rev = "6df213375c9d63faebb55f55aada2efa52458d12"; + sha256 = "0yv5v4f03hpn17dsazcr62bwf1y43j915wy9a33hv5wyicqszsyi"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -7985,6 +8045,18 @@ let meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; + vim-smali = buildVimPluginFrom2Nix { + pname = "vim-smali"; + version = "2015-11-05"; + src = fetchFromGitHub { + owner = "mzlogin"; + repo = "vim-smali"; + rev = "012c21565e6be8f1718ad634aa84730a0a84b42c"; + sha256 = "1mcdbcfiq5r21q297fxi18c3ah4193j1fnjnbjnrjh20r50wggx8"; + }; + meta.homepage = "https://github.com/mzlogin/vim-smali/"; + }; + vim-smalls = buildVimPluginFrom2Nix { pname = "vim-smalls"; version = "2015-05-02"; @@ -8131,12 +8203,12 @@ let vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-03-22"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "cee157ee4f73ddacfe1a70bb833b96f7a47a10c2"; - sha256 = "1y049vbjhsg80am0hxyrcq0d0p7qfyvb1z38nc7yd7bcgwsqc5ac"; + rev = "c622725676c179950ea4a789915efc6d53f142c3"; + sha256 = "168bdcbb13mdd40b0xq9i9chgsg6jr8h4f1jpzf05br5fxp09snk"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -8227,12 +8299,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-10-13"; + version = "2021-05-05"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "659ba4f39caa38e6913f88c9f4369c00e852160f"; - sha256 = "0fqj9l7i052mvw0wlyg30bmihzi937svk3ggsp0rc9wlr30frg2p"; + rev = "5150f1ec06f51b087a11c71b498a4c4497e71e2c"; + sha256 = "1nwcc7didjyd2iw23qhxrg0rr66z93midabkwjdnlw8mzgha7lb7"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -8648,24 +8720,24 @@ let vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2021-04-28"; + version = "2021-05-01"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "bb44d7fb1a098c2fd4a4d26bb213a805184f30b8"; - sha256 = "07hc6nqhka544pgag0dh4k59w6cfn3vk9969ckg9ls6ywjwfyz8x"; + rev = "722aaf34486ffee924ccbc34eb22553642c1c153"; + sha256 = "1vg242139r1arz4kia4bbpmvzr4v5rp7gzy063f61xbvkdjwjx4q"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2021-04-22"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "20163f6ffda855fa40a11cb999002211dc66288f"; - sha256 = "1g29z5f2w1g6znljdgwn49wp8g85m1pawvg8qjrh1kxyjv9dr8x1"; + rev = "da2934fcd36350b871ed8ccd54c8eae3a0dfc8ae"; + sha256 = "18n5mqwgkjsf67jg2r24d4w93hadg7fnqyvmqq6dd5bsmqwp9v14"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -8864,12 +8936,12 @@ let vimsence = buildVimPluginFrom2Nix { pname = "vimsence"; - version = "2021-03-17"; + version = "2021-05-01"; src = fetchFromGitHub { owner = "vimsence"; repo = "vimsence"; - rev = "ad036250a116472218430aed1817e5b6c204d0b8"; - sha256 = "0yn3w193h9h1fyaniwdj4y7b744kwj11prxcq8iyg897v8jj25bk"; + rev = "79f43e9da378f66e7c7eb1c6193de8a805d8afe3"; + sha256 = "0ymdrv74q513ghz7cfsbs9y4qgimk5wbwizwf20dbqy2pcsq6i46"; }; meta.homepage = "https://github.com/vimsence/vimsence/"; }; @@ -8888,12 +8960,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-04-29"; + version = "2021-05-03"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "0c88cc8badeeee74f9cafbf461b72769b06a15d5"; - sha256 = "1f9k0mhcaaddjdd3619m95syy4rbh5fgacya9fr1580z16vcir8p"; + rev = "4e04a862cb37105acebac8b6ac5b275dc7865815"; + sha256 = "02z5imcj7dqhkjxizcxswikabnbnfx9fnrbqcwgn0xcnf80c5azg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8901,24 +8973,24 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-04-28"; + version = "2021-05-06"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "479152f38efb0a787de661b33838aa2dc5a6da75"; - sha256 = "0ahqys0408n7c9hzc6dy70cj3rrg4nzha38iwwvcf7my2nvldbx2"; + rev = "3c6aa0fd0e1e79b0266fa1d054517656aa234c33"; + sha256 = "0b42p82m8nr5asbcrydiv4wdrw7q57pgn6iinav647zhfmz4glp3"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-04-10"; + version = "2021-04-29"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "ee3075ad30560ffba20c695124c60faef97ec4a4"; - sha256 = "19plkjvifvbfnq56vcmzl0q3hxmcbd7q5f5cxk42jp038cry26ay"; + rev = "ee0dfae33062419f2c9ef6a202b3ce415adf6e6a"; + sha256 = "079pfs0hp9x2j9c7va78fjw7afp13yirgw9ajsd98lvkzrj5sflc"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -8997,12 +9069,12 @@ let which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-04-29"; + version = "2021-05-07"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "6cf68b49d48f2e07b82aee18ad01c4115d9ce0e5"; - sha256 = "06r5hlwm1i1gim12k3i5kxrwnhjbq2xfxic5z0iax9m86szb4ja3"; + rev = "8186d5ae26fd0a6e24878a7d5c91d712dbb06e56"; + sha256 = "1fvickzwzpbsczyrnqm0h252h2k9h17yzzwy4hs8r18ixgxwmbxd"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -9118,12 +9190,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-04-20"; + version = "2021-05-04"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "c8acf70d23337047af6548dbb8337d3e3a0c0357"; - sha256 = "0l24b07l1bdiwffpj2ajks879w69cjkn1adx9ak6pv98jlmsdzi1"; + rev = "7c4d05375a09a871f618f9688c7af517d4e69b76"; + sha256 = "0ghjcphxrav9zzg199d761ai83fzpcndsvyfxskwism4y803s3lf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 3cc8620a89c30..4e87b7d36cbd0 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -20,7 +20,7 @@ , dasht , direnv , fzf -, gnome3 +, gnome , khard , languagetool , llvmPackages @@ -515,7 +515,7 @@ self: super: { vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome3.zenity ]; + propagatedBuildInputs = [ gnome.zenity ]; meta = { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; @@ -605,7 +605,7 @@ self: super: { libiconv ]; - cargoSha256 = "1c8bwvwd23d7c3bk1ky1i8xgfz10dr8nqqcvp20g8rldjl8p2r08"; + cargoSha256 = "sha256-Jy8ThtcdPV4fMGcQbJJnibwb3o5iEHNn54831OI9adc="; }; in '' @@ -615,16 +615,6 @@ self: super: { meta.platforms = lib.platforms.all; }); - vim-closer = super.vim-closer.overrideAttrs (old: { - patches = [ - # Fix duplicate tag in doc - (fetchpatch { - url = "https://github.com/rstacruz/vim-closer/commit/a504be8c7050e41b7dfc50c2362948e2cf7c5422.patch"; - sha256 = "065q30d913fm3pc7r5y53wmnb7q7bhv21qxavm65bkb91242d409"; - }) - ]; - }); - vim-codefmt = super.vim-codefmt.overrideAttrs (old: { dependencies = with self; [ vim-maktaba ]; }); diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c5e9deeb0ab7b..c1a880959a788 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -4,6 +4,7 @@ AckslD/nvim-whichkey-setup.lua@main ackyshake/Spacegray.vim@main airblade/vim-gitgutter airblade/vim-rooter +ajmwagar/vim-deus akinsho/nvim-bufferline.lua akinsho/nvim-toggleterm.lua aklt/plantuml-syntax @@ -132,6 +133,7 @@ fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim@main +folke/lsp-trouble.nvim@main folke/which-key.nvim@main freitass/todo.txt-vim frigoeu/psc-ide-vim @@ -188,6 +190,7 @@ hrsh7th/vim-vsnip-integ hsanson/vim-android hsitz/VimOrganizer iamcco/coc-spell-checker +iamcco/markdown-preview.nvim ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim @@ -277,7 +280,7 @@ keith/rspec.vim keith/swift.vim kevinhwang91/nvim-bqf@main kevinhwang91/nvim-hlslens@main -kevinhwang91/rnvimr +kevinhwang91/rnvimr@main kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold @@ -391,6 +394,7 @@ mpickering/hlint-refactor-vim ms-jpq/chadtree@chad mtikekar/vim-bsv mzlogin/vim-markdown-toc +mzlogin/vim-smali nanotech/jellybeans.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides @@ -575,6 +579,7 @@ sickill/vim-pasta SidOfc/mkdx simnalamburt/vim-mundo simrat39/rust-tools.nvim +sindrets/diffview.nvim@main SirVer/ultisnips sjl/gundo.vim sjl/splice.vim @@ -596,6 +601,7 @@ takac/vim-hardtime tami5/compe-conjure tami5/lispdocs.nvim tami5/sql.nvim +tbastos/vim-lua tbodt/deoplete-tabnine ternjs/tern_for_vim terryma/vim-expand-region diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ab8e19ca8fc39..7d53fcb31ee4f 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }: +{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -496,8 +496,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.211"; - sha256 = "1di2v1bhlhl1yi9rrmbq0r9gypiydl8xvj24yw64vsnkqs9yxbp3"; + version = "0.0.213"; + sha256 = "0fj7vvaqdldhbzm9dqh2plqlhg34jv5khd690xd87h418sv8rk95"; }; meta = with lib; { license = licenses.mit; @@ -702,9 +702,15 @@ let ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; - ms-python.python = callPackage ./python { - extractNuGet = callPackage ./python/extract-nuget.nix { }; - }; + ms-python.python = let + raw-package = callPackage ./python { + extractNuGet = callPackage ./python/extract-nuget.nix { }; + }; + in + buildEnv { + name = "vscode-extension-ms-python-python-full"; + paths = [ raw-package self.ms-toolsai.jupyter ]; + }; msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { mktplcRef = { @@ -718,6 +724,18 @@ let }; }; + ms-toolsai.jupyter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jupyter"; + publisher = "ms-toolsai"; + version = "2021.5.745244803"; + sha256 = "0gjpsp61l8daqa87mpmxcrvsvb0pc2vwg7xbkvwn0f13c1739w9p"; + }; + meta = { + license = lib.licenses.unfree; + }; + }; + naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "color-highlight"; diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 1d86f82d278f0..e9e4b9f0cfc3f 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -41,13 +41,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.9.114305"; + version = "2021.4.765268190"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "1vh0wvfvzszc58lw7dbl60knpm5l6rrsghfchhn5dvwyadx4a33h"; + sha256 = "0x7dn3vc83mph2gaxgx26bn7g71hqdpp1mpizmd4jqcrknc4d7ci"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index bb0c0b45d6e1a..1845d4a9c2bcc 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -3,8 +3,8 @@ , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders , gawk -, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) perl.meta.platforms, perl -, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) python.meta.platforms, python +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform perl, perl +, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform python, python , swig , ncurses , pam diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 4235ecb38d345..1ecf46ad22b5e 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -6,7 +6,7 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.19.0"; + version = "0.20.0"; disabled = !stdenv.isLinux; @@ -14,7 +14,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256:0k807vzznlb2icczw64ph6q28605kvghya2kd4h3c7jmap6gq1qg"; + sha256 = "1xnpz2zv445dp5h0160drv6xlvrnwfj23ngc4dp3clcd59jh1baq"; }; format = "other"; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index bbd8d35403b51..f09679ba2128d 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, lib, stdenv, kernel ? false }: stdenv.mkDerivation rec { - pname = "cryptodev-linux-1.11"; + pname = "cryptodev-linux-1.12"; name = "${pname}-${kernel.version}"; src = fetchFromGitHub { owner = "cryptodev-linux"; repo = "cryptodev-linux"; rev = pname; - sha256 = "1ky850qiyacq8p3lng7n3w6h3x2clqrz4lkv2cv3psy92mg9pvc9"; + sha256 = "sha256-vJQ10rG5FGbeEOqCUmH/pZ0P77kAW/MtUarywbtIyHw="; }; hardeningDisable = [ "pic" ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; homepage = "http://cryptodev-linux.org/"; + maintainers = with lib.maintainers; [ fortuneteller2k ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 6eaa58f353a1f..55b00ab8719ec 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.11"; + version = "0.04.12"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "0hsi5w8dmqwwdahnqvs83bam3j1cagw1ggm06d35dfwy5xknc5i4"; + sha256 = "sha256-XBSs/jZodCpI9BHgAF8+bE23gRCr2uebYiMJxxB8T5E="; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index 23bc89b7d1c92..5c05ca6082e4d 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchurl, perl, read-edid }: +{ lib +, stdenv +, fetchgit +, perl +, read-edid +}: stdenv.mkDerivation rec { pname = "i2c-tools"; version = "4.2"; - src = fetchurl { - url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz"; - sha256 = "1mmc1n8awl3winyrp1rcxg94vjsx9dc1y7gj7y88blc2f2ydmwip"; + src = fetchgit { + url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git"; + rev = "v${version}"; + sha256 = "0vqrbp10klr7ylarr6cy1q7nafiqaky4iq5my5dqy101h93vg4pg"; }; buildInputs = [ perl ]; @@ -18,6 +24,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; + outputs = [ "out" "man" ]; + postInstall = '' rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers ''; @@ -25,7 +33,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of I2C tools for Linux"; homepage = "https://i2c.wiki.kernel.org/index.php/I2C_Tools"; - license = licenses.gpl2; + # library is LGPL 2.1 or later; "most tools" GPL 2 or later + license = with licenses; [ lgpl21Plus gpl2Plus ]; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5cece836b73e7..776a422df735b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -859,7 +859,7 @@ let # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. NR_CPUS = freeform "384"; - } // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") { + } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enables support for the Allwinner Display Engine 2.0 SUN8I_DE2_CCU = whenAtLeast "4.13" yes; @@ -871,6 +871,14 @@ let # The kernel command line will override a platform-specific configuration from its device tree. # https://github.com/torvalds/linux/blob/856deb866d16e29bd65952e0289066f6078af773/kernel/dma/contiguous.c#L35-L44 CMA_SIZE_MBYTES = freeform "32"; + + # Many ARM SBCs hand off a pre-configured framebuffer. + # This always can can be replaced by the actual native driver. + # Keeping it a built-in ensures it will be used if possible. + FB_SIMPLE = yes; + + } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux") { + ARM_LPAE = yes; }; }; in diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index dc96f3b6a6211..522a74dea01a6 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "0dmlkhnn5q8fc6rkzsisir4chkzmmiq6xkjmvyvf0g7yihwz2j2f"; + sha256 = "sha256-bcynCJEzINJjCfBbDCv2gHG/EbPa3MTmx9kjg3/CPuE="; }; patches = [ ./no-reinstall-kernel-headers.patch ]; diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 5874f334fedb9..01d0fa823b9b5 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -214,6 +214,47 @@ nixBuild() { fi } +nixFlakeBuild() { + if [ -z "$buildHost" ]; then + nix build "$@" --out-link "${tmpDir}/result" + readlink -f "${tmpDir}/result" + else + local attr="$1" + shift 1 + local evalArgs=() + local buildArgs=() + while [ "$#" -gt 0 ]; do + local i="$1"; shift 1 + case "$i" in + --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) + evalArgs+=("$i") + ;; + --update-input) + local j="$1"; shift 1 + evalArgs+=("$i" "$j") + ;; + --override-input) + local j="$1"; shift 1 + local k="$1"; shift 1 + evalArgs+=("$i" "$j" "$k") + ;; + *) + buildArgs+=("$i") + ;; + esac + done + + local drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" + if [ -a "$drv" ]; then + NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" + buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" + else + echo "nix eval failed" + exit 1 + fi + fi +} + if [ -z "$action" ]; then showSyntax; fi @@ -418,10 +459,7 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '<nixpkgs/nixos>' --no-out-link -A system "${extraBuildFlags[@]}")" else - outLink=$tmpDir/result - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \ - "${extraBuildFlags[@]}" "${lockFlags[@]}" --out-link $outLink - pathToConfig="$(readlink -f $outLink)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi copyToTarget "$pathToConfig" targetHostCmd nix-env -p "$profile" --set "$pathToConfig" @@ -429,24 +467,19 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}")" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}" - pathToConfig="$(readlink -f ./result)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}")" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vm" \ - "${extraBuildFlags[@]}" "${lockFlags[@]}" - pathToConfig="$(readlink -f ./result)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vm" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm-with-bootloader ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" else - nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vmWithBootLoader" \ - "${extraBuildFlags[@]}" "${lockFlags[@]}" - pathToConfig="$(readlink -f ./result)" + pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vmWithBootLoader" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi else showSyntax diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 4745ba818a905..07113e6286251 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -10,7 +10,8 @@ let common = import ../../../development/python-modules/openrazer/common.nix { inherit lib fetchFromGitHub; }; in stdenv.mkDerivation (common // { - name = "openrazer-${common.version}-${kernel.version}"; + pname = "openrazer"; + version = "${common.version}-${kernel.version}"; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -19,6 +20,8 @@ stdenv.mkDerivation (common // { ]; installPhase = '' + runHook preInstall + binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hid" mkdir -p "$binDir" cp -v driver/*.ko "$binDir" @@ -32,9 +35,12 @@ stdenv.mkDerivation (common // { --replace /usr/bin/logger ${util-linux}/bin/logger \ --replace chgrp ${coreutils}/bin/chgrp \ --replace "PATH='/sbin:/bin:/usr/sbin:/usr/bin'" "" + + runHook postInstall ''; meta = common.meta // { description = "An entirely open source Linux driver that allows you to manage your Razer peripherals on GNU/Linux"; + broken = kernel.kernelOlder "4.19"; }; }) diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 839b3f1b78f51..5edcd263f0d93 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,5 +1,5 @@ { lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 +, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome , gobject-introspection }: python3.pkgs.buildPythonApplication rec { @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ - gtk3 glib gnome3.adwaita-icon-theme python3 + gtk3 glib gnome.adwaita-icon-theme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 68a88fb6778db..0ed6b443e043b 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc, nukeReferences }: stdenv.mkDerivation rec { - name = "rtl8812au-${kernel.version}-${version}"; - version = "5.6.4.2_35491.20200702"; + pname = "rtl8812au"; + version = "${kernel.version}-5.9.3.2.20210427"; src = fetchFromGitHub { owner = "gordboy"; - repo = "rtl8812au-5.6.4.2"; - rev = "3110ad65d0f03532bd97b1017cae67ca86dd34f6"; - sha256 = "0p0cv67dfr41npxn0c1frr0k9wiv0pdbvlzlmclgixn39xc6n5qz"; + repo = "rtl8812au-5.9.3.2"; + rev = "6ef5d8fcdb0b94b7490a9a38353877708fca2cd4"; + sha256 = "sha256-czExf4z0nf7XEJ1YnRSB3CrGV6NTmUKDiZjLmrh6Hwo="; }; nativeBuildInputs = [ bc nukeReferences ]; @@ -42,9 +42,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = "https://github.com/gordboy/rtl8812au-5.6.4.2"; - license = licenses.gpl2; + homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2"; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ danielfullmer ]; + broken = kernel.kernelOlder "4.10" || kernel.isHardened; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index bd7c646c92003..7302b363ecfe2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -51,9 +51,9 @@ , iptables , withSelinux ? false , libselinux -, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms +, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp , libseccomp -, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms +, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexectools , kexectools , bashInteractive , libmicrohttpd diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 01af8a4d5bc8c..9bfe3182d6539 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, installShellFiles }: +{ lib, stdenv, fetchurl, installShellFiles, nixosTests }: stdenv.mkDerivation rec { version = "1.12"; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { installManPage doc/beanstalkd.1 ''; + passthru.tests = { + smoke-test = nixosTests.beanstalkd; + }; + meta = with lib; { homepage = "http://kr.github.io/beanstalkd/"; description = "A simple, fast work queue"; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 2394ef258a91f..5ab10af18c03b 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -9,6 +9,7 @@ , snappy , zeromq , zlib +, nixosTests }: buildGoModule rec { @@ -54,6 +55,10 @@ buildGoModule rec { cp -r $src/static/css/ $out/share/ ''; + passthru.tests = { + smoke-test = nixosTests.blockbook-frontend; + }; + meta = with lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 02c0b4aa5e56a..087f96285059a 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { pname = "clickhouse"; version = "20.11.4.13"; + broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 + src = fetchFromGitHub { owner = "ClickHouse"; repo = "ClickHouse"; diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index ee3f02d0425ea..3e0a4e5d99406 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap"; description = "Simple server for running CGI applications over FastCGI"; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; license = licenses.mit; }; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 731d2c9e19a93..3ea0304406263 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "A free, secure, production-quality and standard-conformant FTP server"; homepage = "https://www.pureftpd.org"; license = licenses.isc; # with some parts covered by BSD3(?) - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index c7e560f9e6190..bc0bfa23d7b38 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -20,13 +20,13 @@ let optionOnOff = option: if option then "on" else "off"; in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-unBToiLSpTtnung77z65iuUqiQHwfMVgmFZMUtKU7fQ="; + sha256 = "sha256-i33pAgSOjVOoj0qGBnb8hpRMqgTCBTQmKTuZ9AkvoPg="; }; cmakeFlags = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 28b7aed5f397d..9fb25fe23b613 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.5.0"; + version = "2021.5.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -413,7 +413,7 @@ "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir "itunes" = ps: with ps; [ ]; "izone" = ps: with ps; [ ]; # missing inputs: python-izone - "jewish_calendar" = ps: with ps; [ ]; # missing inputs: hdate + "jewish_calendar" = ps: with ps; [ hdate ]; "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api "juicenet" = ps: with ps; [ ]; # missing inputs: python-juicenet "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client @@ -660,7 +660,7 @@ "pushover" = ps: with ps; [ pushover-complete ]; "pushsafer" = ps: with ps; [ ]; "pvoutput" = ps: with ps; [ jsonpath xmltodict ]; - "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc + "pvpc_hourly_pricing" = ps: with ps; [ aiopvpc ]; "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4df380e2b5a09..f535477827c2f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -105,7 +105,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.5.0"; + hassVersion = "2021.5.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -124,7 +124,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1kwx0bq2i76p9gbx5kkzkjxd88vzf2daccm0wf123693isk1nwzs"; + sha256 = "0bipjfkz4zqhy84jgrn3qxvs4nxya3j08lcsq3xa31xfz8wnpxwj"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -176,6 +176,7 @@ in with py.pkgs; buildPythonApplication rec { # test infrastructure asynctest pytest-aiohttp + pytest-mock pytest-rerunfailures pytest-xdist pytestCheckHook @@ -204,6 +205,7 @@ in with py.pkgs; buildPythonApplication rec { "calendar" "camera" "cast" + "climacell" "climate" "cloud" "comfoconnect" @@ -216,6 +218,7 @@ in with py.pkgs; buildPythonApplication rec { "deconz" "default_config" "demo" + "denonavr" "derivative" "device_automation" "device_sun_light_trigger" @@ -237,6 +240,7 @@ in with py.pkgs; buildPythonApplication rec { "folder" "folder_watcher" "freebox" + "fritz" "fritzbox" "fritzbox_callmonitor" "frontend" @@ -272,6 +276,7 @@ in with py.pkgs; buildPythonApplication rec { "intent" "intent_script" "ipp" + "jewish_calendar" "kmtronic" "knx" "kodi" @@ -319,6 +324,7 @@ in with py.pkgs; buildPythonApplication rec { "prometheus" "proximity" "push" + "pvpc_hourly_pricing" "python_script" "random" "recorder" @@ -327,6 +333,7 @@ in with py.pkgs; buildPythonApplication rec { "rituals_perfume_genie" "rmvtransport" "roku" + "roomba" "rss_feed_template" "ruckus_unleashed" "safe_mode" @@ -355,6 +362,7 @@ in with py.pkgs; buildPythonApplication rec { "stream" "subaru" "sun" + "surepetcare" "switch" "system_health" "system_log" @@ -382,6 +390,7 @@ in with py.pkgs; buildPythonApplication rec { "wled" "workday" "worldclock" + "xiaomi_miio" "yeelight" "zeroconf" "zha" diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 46e1d7643d52d..8556b55b58630 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx +, nixosTests , proxySupport ? true , sslSupport ? true, openssl , http2Support ? true, nghttp2 @@ -85,6 +86,9 @@ stdenv.mkDerivation rec { passthru = { inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5; + tests = { + acme-integration = nixosTests.acme; + }; }; meta = with lib; { diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index da1b4e456b76a..773136a0201c5 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Provide Zeroconf support via DNS-SD using Avahi"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index c79a9fe3fd270..9e40bb648ea50 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.6.1"; + version = "3.6.3"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "sha256-avyjp4KH7l6OZxnMVDv1U/MIWcadqyPPtnLYzEYkqlA="; + sha256 = "sha256-P4ArWpxjOjBi9EiDp/ord17GfUOFwpiTKGvSEuZljGA="; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix deleted file mode 100644 index 2881a3dc196b9..0000000000000 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5 -, coreutils, bash, makeWrapper, python3 }: - -stdenv.mkDerivation rec { - pname = "couchdb"; - version = "2.3.1"; - - - # when updating this, please consider bumping the OTP version - # in all-packages.nix - src = fetchurl { - url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "0z926hjqyhxhyr65kqxwpmp80nyfqbig6d9dy8dqflpb87n8rss3"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ erlang icu openssl spidermonkey_1_8_5 (python3.withPackages(ps: with ps; [ requests ]))]; - - patches = [ ./jsapi.patch ]; - postPatch = '' - substituteInPlace src/couch/rebar.config.script --replace '-DHAVE_CURL -I/usr/local/include' "-DHAVE_CURL -I/usr/local/include $NIX_CFLAGS_COMPILE" - - patch bin/rebar <<EOF - 1c1 - < #!/usr/bin/env escript - --- - > #!${coreutils}/bin/env escript - EOF - - ''; - - # Configure a username. The build system would use "couchdb" as - # default if none is provided. Note that it is unclear where this - # username is actually used in the build, as any choice seems to be - # working. - configurePhase = '' - ./configure -u nobody - ''; - - buildPhase = '' - make release - ''; - - installPhase = '' - mkdir -p $out - cp -r rel/couchdb/* $out - wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin - ''; - - meta = with lib; { - description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = "http://couchdb.apache.org"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix deleted file mode 100644 index 45023e800afb8..0000000000000 --- a/pkgs/servers/http/couchdb/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man -, sphinx, which, file, pkg-config, getopt }: - -stdenv.mkDerivation rec { - pname = "couchdb"; - version = "1.7.1"; - - src = fetchurl { - url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i"; - }; - - nativeBuildInputs = [ help2man which file pkg-config sphinx ]; - buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ]; - - postInstall = '' - substituteInPlace $out/bin/couchdb --replace getopt "${getopt}/bin/getopt" - ''; - - /* - Versions of SpiderMonkey after the js185-1.0.0 release remove the optional - enforcement of preventing anonymous functions in a statement context. This - will most likely break your existing JavaScript code as well as render all - example code invalid. - - If you wish to ignore this error pass --enable-js-trunk to ./configure. - */ - configureFlags = [ - "--enable-js-trunk" - ]; - - meta = with lib; { - description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = "http://couchdb.apache.org"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/servers/http/couchdb/jsapi.patch b/pkgs/servers/http/couchdb/jsapi.patch deleted file mode 100644 index bb7d4ca610c7d..0000000000000 --- a/pkgs/servers/http/couchdb/jsapi.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ru couch_js/http.c couch_js-patched/http.c ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c 2017-02-10 10:52:33.025854045 +0100 -@@ -15,7 +15,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/stat.h> --#include <jsapi.h> -+#include <js/jsapi.h> - #include "config.h" - #include "utf8.h" - #include "util.h" -diff -ru couch_js/main.c couch_js-patched/main.c ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c 2017-02-10 10:52:33.001854154 +0100 -@@ -20,7 +20,7 @@ - #include <unistd.h> - #endif - --#include <jsapi.h> -+#include <js/jsapi.h> - #include "config.h" - #include "http.h" - #include "utf8.h" -diff -ru couch_js/utf8.c couch_js-patched/utf8.c ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c 2017-02-10 10:52:33.009854117 +0100 -@@ -10,7 +10,7 @@ - // License for the specific language governing permissions and limitations under - // the License. - --#include <jsapi.h> -+#include <js/jsapi.h> - #include "config.h" - - static int -diff -ru couch_js/util.c couch_js-patched/util.c ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c 2017-02-10 10:52:33.017854081 +0100 -@@ -13,7 +13,7 @@ - #include <stdlib.h> - #include <string.h> - --#include <jsapi.h> -+#include <js/jsapi.h> - - #include "help.h" - #include "util.h" -diff -ru couch_js/util.h couch_js-patched/util.h ---- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h 2016-09-12 11:28:51.000000000 +0200 -+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h 2017-02-10 10:52:32.988854212 +0100 -@@ -13,7 +13,7 @@ - #ifndef COUCHJS_UTIL_H - #define COUCHJS_UTIL_H - --#include <jsapi.h> -+#include <js/jsapi.h> - - typedef struct { - int no_eval; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 663193789a5b4..e13c0b4e92234 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -145,6 +145,7 @@ stdenv.mkDerivation { tests = { inherit (nixosTests) nginx nginx-auth nginx-etag nginx-pubhtml nginx-sandbox nginx-sso; variants = lib.recurseIntoAttrs nixosTests.nginx-variants; + acme-integration = nixosTests.acme; }; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 0c91226d0c88d..6a839351da42b 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.17.865"; + version = "0.17.1027"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-kjrch++WncedVkRm05RifUGEYlc5NFAss/E6fgPZWyQ="; + sha256 = "sha256:1kmi4f1ghx82rfd8y4laggg8cs9apnhcdkakfi0mah7hqcnqmhm3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 3726facd58351..3138a68a9bcff 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "12.0.4"; + version = "13.0.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-7DKKpuKPoSKIpfvhCvLzuyepbmixgq0+o+83FKi6Dwc="; + sha256 = "sha256-jpjAPldmJkyXGsokw9MO1u0VysYBXeQ8MamEPWvBGvs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index 60c2027e552fb..9bd998cd85057 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lidarr"; - version = "0.7.2.1878"; + version = "0.8.1.2135"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz"; - sha256 = "0kv0x3vvv4rp3i5k5985zp95mm8ca7gpm7kr82l11v3hm3n6yvqn"; + sha256 = "sha256-eJX6t19D2slX68fXSMd/Vix3XSgCVylK+Wd8VH9jsuI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b54ad76e8f7d5..69bfa34e58694 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.32.2"; + version = "1.33.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Biwj/zORBsU8XvpMMlSjR3Nqx0q1LqaSX/vX+UDeXI8="; + sha256 = "sha256-kH5HhkfUL+WzcX/0pK0dV1bI34TpmgRpx3m/UchdAEE="; }; patches = [ diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index b4dfc4791b766..532f7734acbba 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.40.0"; + version = "0.42.1"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-sBITCHyji55OnopNlDCNypSf/j8LKtarSGPYz5fQZys="; + sha256 = "1bndqs689rc7pf1l08rlph8h3f86kr1c7i96szs4wkycfy9w8vsv"; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,8 +18,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp navidrome $out/bin + + runHook postInstall ''; postFixup = '' @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; homepage = "https://www.navidrome.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ aciceri ]; }; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index d7612d30764a0..12ad703751210 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.54.1"; + version = "1.59.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-nZSNn1vLk3y6s4ie1AkSkGmKUiIrcBr3yKW5uAEtRt0="; + sha256 = "sha256-2i9rmk9aAnjTJY+w/NKJOaLX+tpkt3vG07iLCsSGzdU="; }; vendorSha256 = null; @@ -22,5 +22,7 @@ buildGoModule rec { description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; maintainers = [ maintainers.yorickvp ]; + changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 68168618c558e..6f29d336da126 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.22.2.4282-a97b03fad"; + version = "1.23.0.4482-62106842a"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "01krx6vhk24wm2hikxkfv8m53y8b4yqnkii4j9zf48f1a9hlj2zp"; + sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "04wzv15pnd4sn6cy62m8prvsxpxj4sg3q9ahwsrn2cj31vgayg0i"; + sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 47edb29723e35..fb5792c6e42b4 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -9,14 +9,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-bTh+Z5w5ZkL2iPteStqVcoFDGZIbpVjuXn20TZsfgtY="; - arm64-linux_hash = "sha256-aIzVSIRuGNiIFJPToXCQwYsbICKuPtwKATnQhkxvJuA="; - x64-osx_hash = "sha256-FxRSAJvRQya2x1kei6yRceGcyQ2mCaFveyeMGw0Jqw4="; + x64-linux_hash = "sha256-5W4X1E7794hFVPo4+s826CNIrw6Z/n0cDjj6pmsj2Dk="; + arm64-linux_hash = "sha256-gqCgToAVIS+IEulFY4mo2Mtcb3nyFpzDBqVEewREQcs="; + x64-osx_hash = "sha256-MFpIzSYAvAWVHMdEd+aP67s3po+yb3qWzSd/Ko++5Jc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "3.0.2.4552"; + version = "3.1.1.4954"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index cc192a18a6188..ff0bbd6b97dc0 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -1,46 +1,24 @@ -{ lib, stdenv, buildEnv, fetchurl, perl, perlPackages, makeWrapper }: +{ lib, stdenv, autoreconfHook, buildEnv, fetchFromGitHub, perl, perlPackages, makeWrapper, gnupg, openssl }: -# This package isn't extremely useful as it is, but is getting close. -# After running: -# -# nix-build . -A rt -# -# I created a config file named myconfig.pm with: -# -# use utf8; -# Set($rtname, '127.0.0.1'); -# # These dirs need to be pre-created: -# Set($MasonSessionDir, '/home/grahamc/foo/sessiondir/'); -# Set($MasonDataDir, '/home/grahamc/foo/localstate/'); -# Set($WebPort, 8080); -# -# Set($DatabaseType, "SQLite"); -# Set( $DatabaseName, '/home/grahamc/projects/foo/my.db' ); -# -# 1; -# -# and ran -# -# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-setup-database --action init -# -# Then: -# -# RT_SITE_CONFIG=$(pwd)/myconfig.pm ./result/bin/rt-server -# -# Make sure to check out result/etc/RT_Config.pm -# -# Good luck. stdenv.mkDerivation rec { pname = "rt"; + version = "5.0.1"; - version = "4.4.4"; - - src = fetchurl { - url = "https://download.bestpractical.com/pub/rt/release/${pname}-${version}.tar.gz"; - sha256 = "1108jhz1gvalcfnbzgpbk7fkxzxkkc7m74a3bnwyjzldlyj1dhrl"; + src = fetchFromGitHub { + repo = pname; + rev = "${pname}-${version}"; + owner = "bestpractical"; + sha256 = "1qqh6w094x7dljz001va802v4s6mixs9lkhs2cs47lf5ph3vwq2q"; }; - patches = [ ./override-generated.patch ]; + patches = [ + ./dont-check-users_groups.patch # needed for "make testdeps" to work in the build + ./override-generated.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; buildInputs = [ makeWrapper @@ -48,28 +26,102 @@ stdenv.mkDerivation rec { (buildEnv { name = "rt-perl-deps"; paths = with perlPackages; (requiredPerlModules [ - ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI - CSSMinifierXS CSSSquish ConvertColor CryptEksblowfish - CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID - DataICal DataPagePageset DateExtract DateManip - DateTimeFormatNatural DevelGlobalDestruction EmailAddress - EmailAddressList FCGI FCGIProcManager FileShareDir FileWhich - GD GDGraph GnuPGInterface GraphViz HTMLFormatTextWithLinks - HTMLFormatTextWithLinksAndTables HTMLMason - HTMLMasonPSGIHandler HTMLQuoted HTMLRewriteAttributes - HTMLScrubber IPCRun IPCRun3 JSON JavaScriptMinifierXS LWP - LWPProtocolHttps LocaleMaketextFuzzy LocaleMaketextLexicon - LogDispatch MIMETools MIMETypes MailTools ModuleRefresh - ModuleVersionsReport MozillaCA NetCIDR NetIP PerlIOeol Plack - RegexpCommon RegexpCommonnetCIDR RegexpIPv6 RoleBasic - ScopeUpper Starlet SymbolGlobalName TermReadKey - TextPasswordPronounceable TextQuoted TextTemplate - TextWikiFormat TextWrapper TimeParseDate TreeSimple - UNIVERSALrequire XMLRSS + ApacheSession + BusinessHours + CGIEmulatePSGI + CGIPSGI + CSSMinifierXS + CSSSquish + ConvertColor + CryptEksblowfish + CryptSSLeay + CryptX509 + DBDPg + DBIxSearchBuilder + DataGUID + DataICal + DataPage + DataPagePageset + DateExtract + DateManip + DateTimeFormatNatural + DevelGlobalDestruction + EmailAddress + EmailAddressList + EncodeDetect + EncodeHanExtra + FCGI + FCGIProcManager + FileShareDir + FileWhich + GD + GDGraph + GnuPGInterface + GraphViz + HTMLFormatExternal + HTMLFormatTextWithLinks + HTMLFormatTextWithLinksAndTables + HTMLGumbo + HTMLMason + HTMLMasonPSGIHandler + HTMLQuoted + HTMLRewriteAttributes + HTMLScrubber + IPCRun + IPCRun3 + JSON + JavaScriptMinifierXS + LWP + LWPProtocolHttps + LocaleMaketextFuzzy + LocaleMaketextLexicon + LogDispatch + MIMETools + MIMETypes + MailTools + ModulePath + ModuleRefresh + ModuleVersionsReport + Moose + MooseXNonMoose + MooseXRoleParameterized + MozillaCA + NetCIDR + NetIP + PathDispatcher + PerlIOeol + Plack + PodParser + RegexpCommon + RegexpCommonnetCIDR + RegexpIPv6 + RoleBasic + ScopeUpper + Starlet + Starman + StringShellQuote + SymbolGlobalName + TermReadKey + TextPasswordPronounceable + TextQuoted + TextTemplate + TextWikiFormat + TextWordDiff + TextWrapper + TimeParseDate + TreeSimple + UNIVERSALrequire + WebMachine + XMLRSS + perlldap ]); }) ]; + preAutoreconf = '' + substituteInPlace configure.ac \ + --replace "rt-3.9.EXPORTED" "rt-${version}" + ''; preConfigure = '' configureFlags="$configureFlags --with-web-user=$UID" configureFlags="$configureFlags --with-web-group=$(id -g)" @@ -82,18 +134,27 @@ stdenv.mkDerivation rec { "--enable-graphviz" "--enable-gd" "--enable-gpg" - "--with-db-type=SQLite" + "--enable-smime" + "--with-db-type=Pg" ]; buildPhase = '' - make testdeps | grep -i missing | sort + make testdeps ''; - preFixup = '' - for i in $(find $out/bin -type f; find $out/sbin -type f); do - wrapProgram $i \ - --prefix PERL5LIB ':' $PERL5LIB + postFixup = '' + for i in $(find $out/bin -type f); do + wrapProgram $i --prefix PERL5LIB ':' $PERL5LIB \ + --prefix PATH ":" "${lib.makeBinPath [ openssl gnupg ]}" done + + rm -r $out/var + mkdir -p $out/var/data + ln -s /var/log/rt $out/var/log + ln -s /run/rt/mason_data $out/var/mason_data + ln -s /var/lib/rt/shredder $out/var/data/RT-Shredder + ln -s /var/lib/rt/smime $out/var/data/smime + ln -s /var/lib/rt/gpg $out/var/data/gpg ''; meta = { diff --git a/pkgs/servers/rt/dont-check-users_groups.patch b/pkgs/servers/rt/dont-check-users_groups.patch new file mode 100644 index 0000000000000..43e40e8f1778f --- /dev/null +++ b/pkgs/servers/rt/dont-check-users_groups.patch @@ -0,0 +1,12 @@ +diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in +index e51feb197..d75b1bc4e 100644 +--- a/sbin/rt-test-dependencies.in ++++ b/sbin/rt-test-dependencies.in +@@ -423,6 +423,7 @@ sub check_perl_version { + } + + sub check_users_groups { ++ return 0; + section("users / groups"); + + my $fails = 0; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index c81c7f30b31f9..6737119d88120 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -14,7 +14,7 @@ let mkWith = mkFlag "with-" "without-"; mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null; + shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optPam = shouldUsePkg pam; optLibidn = shouldUsePkg libidn; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 85ed2808d7872..f713ab39cb969 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.15"; + version = "0.23.16"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-xZ2SgYSEamh+Z64VKvIemqJLH/WjJHFji5qIameF5hM="; + sha256 = "sha256-Kx3vTbwYfILxn7n4upyVZo0V6S2lTStlezku9bfwGVw="; }; dontBuild = true; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index e70d43a1505e0..db588b3abe01f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.5.8"; + version = "10.5.10"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"; + sha256 = "1fxsq2xgcb8j81z043bifpmxblj6nb3wqjm9rgsnpwmazkwk5zx5"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 3c13388c4602d..165b92162407e 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, buildEnv -, asio, boost, check, openssl, scons +, asio, boost, check, openssl, cmake }: let @@ -10,50 +10,33 @@ let in stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.7"; + version = "26.4.8"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil"; + sha256 = "0rx710dfijiykpi41rhxx8vafk07bffv2nbl3d4ggc32rzv88369"; fetchSubmodules = true; }; - buildInputs = [ asio boost check openssl scons ]; - - postPatch = '' - substituteInPlace SConstruct \ - --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'" - ''; + buildInputs = [ asio boost check openssl cmake ]; preConfigure = '' - export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include" - export LIBPATH="${galeraLibs}/lib" + # make sure bundled asio cannot be used, but leave behind license, because it gets installed + rm -r asio/{asio,asio.hpp} ''; - sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0"; - - enableParallelBuilding = true; - - installPhase = '' - # copied with modifications from scripts/packages/freebsd.sh - GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}" - install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} - install -m 555 "garb/garbd" "$out/bin/garbd" - install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" - install -m 444 "scripts/packages/README" "$out/share/doc/galera/" - install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/" - install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR" - install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2" - install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio" + postInstall = '' + # for backwards compatibility + ln -s . $out/lib/galera ''; meta = with lib; { description = "Galera 3 wsrep provider library"; homepage = "https://galeracluster.com/"; - license = licenses.lgpl2; - maintainers = with maintainers; [ izorkin ]; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ ajs124 izorkin ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index ae56fed52bd34..d377b00a300b4 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.3"; + version = "0.3.3"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "1pl3mnkmfqykhq55q36kvvnvn9fgsk72pfa7nii3hywzad0bj0ar"; + sha256 = "sha256-8CgNMI7zOeDxrnmQNDM61Bgpw+N0sc7HR9c+YsQTO5I="; }; - vendorSha256 = "0jrc6y5chkj25bnpzn6blvfb0vd09h6fdcz75g54605z8nqd397p"; + vendorSha256 = "sha256-qOHuZGMr0CPwy/DuuWYCDSe24Y6ivg1uQJGXCuKGV/M="; outputs = [ "out" "static" ]; diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix index 13ad9d69ad6b0..649b76f871c10 100644 --- a/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/pkgs/servers/web-apps/rss-bridge/default.nix @@ -1,17 +1,17 @@ -{ config, lib, pkgs, fetchFromGitHub, stdenv, ... }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2020-11-10"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "00cp61lqvhi7b7j0rglsqg3l7cg8s9b8vq098bgvg5dygyi44hyv"; + sha256 = "0dkw8xq710q0wclyr003357gk0vgb5pmpcx75k13pv56c3mrg9vm"; }; - patchPhase = '' + postPatch = '' substituteInPlace lib/rssbridge.php \ --replace "define('PATH_CACHE', PATH_ROOT . 'cache/');" "define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/');" \ --replace "define('FILE_CONFIG', PATH_ROOT . 'config.ini.php');" "define('FILE_CONFIG', getenv('RSSBRIDGE_DATA') . '/config.ini.php');" \ diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6ab9f8ed8dd1f..1e6b9888ba2ff 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -833,6 +833,12 @@ self: super: ''; }); + xorgdocs = super.xorgdocs.overrideAttrs (attrs: { + # This makes the man pages discoverable by the default man, + # since it looks for packages in $PATH + postInstall = "mkdir $out/bin"; + }); + xwd = super.xwd.overrideAttrs (attrs: { buildInputs = with self; attrs.buildInputs ++ [libXt]; }); diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index b2677715d514b..61b2fe3032b24 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -233,7 +233,7 @@ let sed -e "s|sed |${gnused}/bin/sed |" \ -i "$out/share/fish/functions/alias.fish" \ "$out/share/fish/functions/prompt_pwd.fish" - sed -i "s|nroff |${groff}/bin/nroff |" \ + sed -i "s|nroff|${groff}/bin/nroff|" \ "$out/share/fish/functions/__fish_print_help.fish" sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \ -i "$out/share/fish/functions/fish_default_key_bindings.fish" diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index bcf091f8e7693..d5c197d5da6e5 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "The fastest shell plugin manager"; homepage = "https://github.com/getantibody/antibody"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne worldofpeace ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b24fc539c93d1..89656dde29289 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -22,8 +22,7 @@ with pkgs; cc-wrapper-libcxx-9 = callPackage ./cc-wrapper { stdenv = llvmPackages_9.libcxxStdenv; }; stdenv-inputs = callPackage ./stdenv-inputs { }; - haskell-shellFor = callPackage ./haskell-shellFor { }; - haskell-documentationTarball = callPackage ./haskell-documentationTarball { }; + haskell = callPackage ./haskell { }; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix new file mode 100644 index 0000000000000..eb389f4051f87 --- /dev/null +++ b/pkgs/test/haskell/default.nix @@ -0,0 +1,7 @@ +{ lib, callPackage }: + +lib.recurseIntoAttrs { + shellFor = callPackage ./shellFor { }; + documentationTarball = callPackage ./documentationTarball { }; + setBuildTarget = callPackage ./setBuildTarget { }; +} diff --git a/pkgs/test/haskell-documentationTarball/default.nix b/pkgs/test/haskell/documentationTarball/default.nix index aec3dc41f2683..aec3dc41f2683 100644 --- a/pkgs/test/haskell-documentationTarball/default.nix +++ b/pkgs/test/haskell/documentationTarball/default.nix diff --git a/pkgs/test/haskell/setBuildTarget/Bar.hs b/pkgs/test/haskell/setBuildTarget/Bar.hs new file mode 100644 index 0000000000000..010014082c7d0 --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/Bar.hs @@ -0,0 +1,4 @@ +module Main where + +main :: IO () +main = putStrLn "Hello, Bar!" diff --git a/pkgs/test/haskell/setBuildTarget/Foo.hs b/pkgs/test/haskell/setBuildTarget/Foo.hs new file mode 100644 index 0000000000000..fec7bb11fe6c1 --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/Foo.hs @@ -0,0 +1,4 @@ +module Main where + +main :: IO () +main = putStrLn "Hello, Foo!" diff --git a/pkgs/test/haskell/setBuildTarget/Setup.hs b/pkgs/test/haskell/setBuildTarget/Setup.hs new file mode 100644 index 0000000000000..9a994af677b0d --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix new file mode 100644 index 0000000000000..b1335e2a74cf9 --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -0,0 +1,38 @@ +{ pkgs, haskellPackages }: + +let + # This can be regenerated by running `cabal2nix .` in the current directory. + pkgDef = + { mkDerivation, base, lib }: + mkDerivation { + pname = "haskell-setBuildTarget"; + version = "0.1.0.0"; + src = ./.; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + license = lib.licenses.bsd3; + }; + + drv = haskellPackages.callPackage pkgDef {}; + + test = target: excluded: + let only = pkgs.haskell.lib.setBuildTarget drv target; + in '' + if [[ ! -f "${only}/bin/${target}" ]]; then + echo "${target} was not built" + exit 1 + fi + + if [[ -f "${only}/bin/${excluded}" ]]; then + echo "${excluded} was built, when it should not have been" + exit 1 + fi + ''; + +in pkgs.runCommand "test haskell.lib.setBuildTarget" {} '' + ${test "foo" "bar"} + ${test "bar" "foo"} + touch "$out" +'' + diff --git a/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal b/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal new file mode 100644 index 0000000000000..7395e139451cc --- /dev/null +++ b/pkgs/test/haskell/setBuildTarget/haskell-setBuildTarget.cabal @@ -0,0 +1,16 @@ +cabal-version: >=1.10 +name: haskell-setBuildTarget +version: 0.1.0.0 +author: Isaac Shapira +maintainer: fresheyeball@protonmail.com +build-type: Simple + +executable foo + main-is: Foo.hs + build-depends: base + default-language: Haskell2010 + +executable bar + main-is: Bar.hs + build-depends: base + default-language: Haskell2010 diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 9d13e1112cc16..37ad2e90d89ee 100644 --- a/pkgs/test/haskell-shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -1,22 +1,22 @@ -{ lib, haskellPackages, cabal-install }: +{ lib, writeText, haskellPackages, cabal-install }: (haskellPackages.shellFor { - packages = p: [ p.database-id-class p.constraints ]; + packages = p: [ p.constraints p.linear ]; nativeBuildInputs = [ cabal-install ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; unpackPhase = '' sourceRoot=$(pwd)/scratch mkdir -p "$sourceRoot" cd "$sourceRoot" - tar -xf ${haskellPackages.database-id-class.src} tar -xf ${haskellPackages.constraints.src} - cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project + tar -xf ${haskellPackages.linear.src} + cp ${writeText "cabal.project" "packages: constraints* linear*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.cabal touch $HOME/.cabal/config - cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES" + cabal v2-build --offline --verbose constraints linear --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' touch $out diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index cf9bbd9bb9880..66464ae0b532c 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, libxslt, - gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: + gobject-introspection, gtk3, wrapGAppsHook, gnome }: python3Packages.buildPythonApplication rec { pname = "wpgtk"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook gtk3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libxslt ]; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 207c052686f86..991b9be223894 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs"; description = "A tool to help manage well known user directories like the desktop folder and the music folder"; license = licenses.gpl2; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 63ca45452e650..2f8532448f345 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute2, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "1iqwzqgg26vsg7lwmgmga9y3ap9q8r5xyx799bj8kawnr8n6s4jd"; + sha256 = "sha256-xiLAvxly4WbMb6DAXPsXJgQqVmTlX9cbqFECJQ+r0Jk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index bd8b74f8bc88b..c27b18ac6d5d0 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fioctl"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "0gmh32h9j6wpkdxxg7vj158lsaxq30x7hjsc9gwpip3bff278hw4"; + sha256 = "1mm62piih7x2886wpgqd8ks22vpmrjgxs4alskiqz61bgshks9vw"; }; vendorSha256 = "170z5a1iwwcpz890nficqnz7rr7yzdxr5jx9pa7s31z17lr8kbz9"; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index f89e02c8593b9..ac4d2799e49b6 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0fb0bw16idj810si32fxqx1nl057bdsjk3pvkgzpf7j96v2lkw71"; + sha256 = "1xb6s78q0fba45595d868vmbxdb41060jbygypfa5hvvcz8d8ayk"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0gnnp8whcx6ada8a4xs8kxrbza97zivk57r9qzv0q5arg4xslagr"; + sha256 = "19ywvp7nm91rc32r7dzb6yf3ss74m3s01fh2xqnmdg382jjlzdby"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "336.0.0"; + version = "339.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 3d662a456aadb..5e00e487e23e8 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , meson , ninja , gobject-introspection @@ -15,30 +15,22 @@ , vala , gettext , perl -, gnome3 +, gnome , gdk-pixbuf , zlib }: stdenv.mkDerivation rec { pname = "gtk-vnc"; - version = "1.0.0"; + version = "1.2.0"; outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8"; + sha256 = "0jmr6igyzcj2wmx5v5ywaazvdz3hx6a6rys26yb4l4s71l281bvs"; }; - patches = [ - # Fix undeclared gio-unix-2.0 in example program. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk-vnc/commit/8588bc1c8321152ddc5086ca9b2c03a7f511e0d0.patch"; - sha256 = "0i1iapsbngl1mhnz22dd73mnzk68qc4n51pqdhnm18zqc8pawvh4"; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -62,7 +54,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 417e01a325d37..f0deb99c44fb4 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.13"; + version = "4.14"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { - url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0w2r80wf86jijgfxbkv06lgfhz4p2aaidsqd96bx3q1382nrbzcf"; + url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; + sha256 = "1x9gv70j333w254jgg1n0kvxpwv6vww0v0i862pglq48xhdaa7hy"; }; postPatch = '' diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 16ecff07b7345..8996ef5069f3d 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -46,7 +46,8 @@ python3Packages.buildPythonApplication rec { --replace "cryptography==3.2.1" "cryptography" \ --replace "pyOpenSSL==19.1.0" "pyOpenSSL" \ --replace "PyYAML==5.3.1" "PyYAML" \ - --replace "six==1.14.0" "six" + --replace "six==1.14.0" "six" \ + --replace "arrow==0.17.0" "arrow" ''; meta = with lib; { diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index 4813f86ea641d..1fb902a8c8035 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -1,6 +1,7 @@ { buildGoPackage , fetchFromGitHub , lib +, nixosTests }: let @@ -17,6 +18,10 @@ in buildGoPackage { sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2"; }; + passthru.tests = { + smoke-test = nixosTests.acme; + }; + meta = { homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index f91b0487bb855..927c4ea033a1e 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5TOKYxH1Tnsd1t2yoUflFUSW0QGS9l5+0JtS2Fo6vL0="; + sha256 = "sha256-Ub3rIiOJUh3vNCC+82rCSzKSovMnRW2jo8HbI02ouws="; }; - vendorSha256 = "sha256-zVe1bTTLOHxfdbb6VcztOCWMbCbzT6igNpvPytktMWs="; + vendorSha256 = "sha256-xL0wqKFMQksaLkTAxV72SWh0PPTbOqWcd6deJ9RVeEA="; excludedPackages = "misc"; @@ -19,6 +19,14 @@ buildGoModule rec { buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}") ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/trivy --help + $out/bin/trivy --version | grep "v${version}" + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/aquasecurity/trivy"; changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}"; diff --git a/pkgs/tools/archivers/quickbms/default.nix b/pkgs/tools/archivers/quickbms/default.nix new file mode 100644 index 0000000000000..7846f18a1740c --- /dev/null +++ b/pkgs/tools/archivers/quickbms/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchzip, bzip2, lzo, openssl, zlib }: + +stdenv.mkDerivation rec { + version = "0.11.0"; + pname = "quickbms"; + + src = fetchzip { + url = "https://aluigi.altervista.org/papers/quickbms-src-${version}.zip"; + hash = "sha256-uQKTE36pLO8uhrX794utqaDGUeyqRz6zLCQFA7DYkNc="; + }; + + buildInputs = [ bzip2 lzo openssl zlib ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Universal script based file extractor and reimporter"; + homepage = "https://aluigi.altervista.org/quickbms.htm"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samuelgrf ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 312dc62d575e2..03ea3302d262a 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }: +{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme + makeWrapper alsaLib gtk3 gdk-pixbuf gnome.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 4a2030d74455c..2bedd2abacddd 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook -, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio +, gnome, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper gsettings-desktop-schemas ]; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index c2ed78823317b..cb4f5874bac10 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-Lr2c24hZU8A/Cd8xGA7rfqga67ghz0XJ/cs/z/hSlPU="; + sha256 = "sha256-ooaKsNhUIxubAlGt6fUAkbD+PDMfkq+6lnK4G9lp4C8="; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 71ce9060b255c..b932b8e66c6fe 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , bluez-tools , cinnamon -, gnome3 +, gnome , gobject-introspection , intltool , pavucontrol @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools cinnamon.xapps - gnome3.gnome-bluetooth + gnome.gnome-bluetooth python3Packages.python util-linux ]; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index b30a8763706b7..7b3aa397fc351 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 , obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 -, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook +, gnome, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ] + gnome.adwaita-icon-theme iproute2 libappindicator networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 8ab82b672265f..a28499f77328e 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages +, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages, nixosTests , fuseSupport ? false, fuse3 ? null }: assert fuseSupport -> fuse3 != null; @@ -39,6 +39,10 @@ stdenv.mkDerivation { installFlags = [ "PREFIX=${placeholder "out"}" ]; + passthru.tests = { + smoke-test = nixosTests.bcachefs; + }; + meta = with lib; { description = "Tool for managing bcachefs filesystems"; homepage = "https://bcachefs.org/"; diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index bbad83f017688..7ba27208fe880 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }: +{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils +, python3Packages, util-linux, nixosTests }: let @@ -55,7 +56,7 @@ let in -runCommand "bees-service" { +(runCommand "bees-service" { inherit bash bees coreutils; utillinux = util-linux; # needs to be a valid shell variable name btrfsProgs = btrfs-progs; # needs to be a valid shell variable name @@ -64,4 +65,8 @@ runCommand "bees-service" { substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper chmod +x "$out"/bin/bees-service-wrapper ln -s ${bees}/bin/beesd "$out"/bin/beesd -'' +'').overrideAttrs (old: { + passthru.tests = { + smoke-test = nixosTests.bees; + }; +}) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index b145d1802a1c5..ee7f86760707c 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.34.1"; + version = "0.35.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "16ns04g4cvp6lfhkifgib5rxpbcxy8ghhavi3mv1cvxawpmdrxnq"; + sha256 = "sha256-GJ21Cqd/W/PocmN1p4OeeUdswhH7fSmAMiNTs0X3564="; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 071538d1703ad..b7cfefe70cbf9 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210504"; + version = "1.1.0-dev-20210506"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-q9xWe1gGX7SV/tAUHu/uBB709aqegIsNLTPM5zljgYY="; + sha256 = "sha256-VB9AL2h+e+92lhsfdYHbSgv5AIrgEPJsa74VGncDHGo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index b50716188e957..37b398ef1c629 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.6"; + version = "2.9.7"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "sha256-0i/oUVrxbc0FDQmgvHEn7Cn0eVznMqDGw+r4OTVrwRo="; + sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/tools/graphics/snapdragon-profiler/default.nix new file mode 100644 index 0000000000000..96fada91093a3 --- /dev/null +++ b/pkgs/tools/graphics/snapdragon-profiler/default.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, icoutils +, mono6 +, jre +, androidenv +, gtk-sharp-2_0 +, gtk2 +, libcxx +, libcxxabi +, coreutils +, requireFile +, archive ? requireFile { + name = "snapdragonprofiler_external_linux.tar.gz"; + message = '' + This nix expression requires that "snapdragonprofiler_external_linux.tar.gz" is + already part of the store. To get this archive, you need to download it from: + https://developer.qualcomm.com/software/snapdragon-profiler + and add it to the nix store with nix-store --add-fixed sha256 <FILE>. + ''; + sha256 = "c6731c417ca39fa9b0f190bd80c99b1603cf97d23becab9e47db6beafd6206b7"; + } +}: + +stdenv.mkDerivation rec { + pname = "snapdragon-profiler"; + version = "v2021.2"; + + src = archive; + + nativeBuildInputs = [ + makeWrapper + icoutils + copyDesktopItems + ]; + + buildInputs = [ + mono6 + gtk-sharp-2_0 + gtk2 + libcxx + libcxxabi + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib/snapdragon-profiler} + mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48}/apps + + mv *.so $out/lib + cp -r * $out/lib/snapdragon-profiler + makeWrapper "${mono6}/bin/mono" $out/bin/snapdragon-profiler \ + --add-flags "$out/lib/snapdragon-profiler/SnapdragonProfiler.exe" \ + --suffix PATH : ${lib.makeBinPath [ jre androidenv.androidPkgs_9_0.platform-tools coreutils ]} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ + --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') \ + --run "cd $out/lib/snapdragon-profiler" # Fixes themes not loading correctly + + wrestool -x -t 14 SnapdragonProfiler.exe > snapdragon-profiler.ico + icotool -x -i 1 -o $out/share/icons/hicolor/16x16/apps/snapdragon-profiler.png snapdragon-profiler.ico + icotool -x -i 2 -o $out/share/icons/hicolor/32x32/apps/snapdragon-profiler.png snapdragon-profiler.ico + icotool -x -i 3 -o $out/share/icons/hicolor/48x48/apps/snapdragon-profiler.png snapdragon-profiler.ico + + runHook postInstall + ''; + + desktopItems = [(makeDesktopItem { + name = pname; + desktopName = "Snapdragon Profiler"; + exec = "$out/bin/snapdragon-profiler"; + icon = "snapdragon-profiler"; + type = "Application"; + comment = meta.description; + categories = "Development;Debugger;Graphics;3DGraphics"; + terminal = "false"; + })]; + + dontStrip = true; # Always needed on Mono + dontPatchELF = true; # Certain libraries are to be deployed to the remote device, they should not be patched + + meta = with lib; { + homepage = "https://developer.qualcomm.com/software/snapdragon-profiler"; + description = "An profiler for Android devices running Snapdragon chips"; + license = licenses.unfree; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix index 5acbaa7ffd208..7c2d004144dc4 100644 --- a/pkgs/tools/graphics/timg/default.nix +++ b/pkgs/tools/graphics/timg/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "timg"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${version}"; - sha256 = "10qhjfkbazncmj07y0a6cpmi7ki0l10qzpvi2zh8369yycqqxr8y"; + sha256 = "1zjcaxnik8imkn22g5kz6zly3yxpknrzd093sfxpgqnfw4sq8149"; }; buildInputs = [ graphicsmagick ffmpeg libexif libjpeg zlib ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index 3fe5a59175f2e..74553dcebbbb7 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx-anthy"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz"; - sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd"; + sha256 = "sha256-Hxhs2RXuFf/bhczcQ3+Zj+gI3+Z4BEfIzMIfUOUNX7M="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 6e0c48d0610c6..3d34dcbac1759 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }: stdenv.mkDerivation rec { name = "fcitx-configtool-0.4.10"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ fcitx isocodes gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ fcitx isocodes gtk3 gnome.adwaita-icon-theme ]; # Patch paths to `fcitx-remote` prePatch = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index 9e367d70799a2..9a90ab3ca7d75 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-yI6Svr1KEdHqAX3qd7t7GvD0EcWg0A2vZpuJw1U9oKQ="; + sha256 = "sha256-duL9FgXPCr4/rMuguw8cf3EIdK6MW/alUNeh1yduY68="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index b24dac6886d93..40465d55e400d 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.4"; + version = "5.0.6"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-qt"; rev = version; - sha256 = "sha256-PZbnxt30Tv7i+Q6G9UpGgWDs65rn0MZVe1ybhz4vN9I="; + sha256 = "sha256-Y7X4pkBSf5FMpf1mdyLvr1QWhqz3yC4iOGXDvvvV9Yw="; }; preConfigure = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 8fbd9254486a5..acb2d41e0456f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-kPTysHTC+j8BMnzsddRa4Tg54idejApTqmLrP20pu5M="; + sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index d446a2cf0af63..8e682aefcc39d 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://micans.org/apparix"; description = "Add directory bookmarks, distant listing, and distant editing to the command line"; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 609899bbe30f4..1b1fefc0a7cfb 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.29.1"; + version = "2.29.4"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi"; + sha256 = "sha256-caNY6PrsqBrYwC61MxNsf8B9E8it1Ls1d+hdbf8u+o8="; }; nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index b71740c325a50..c3bdbca7a591f 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, pkg-config, python3, bluez -, alsaSupport ? stdenv.isLinux, alsaLib ? null -, systemdSupport ? stdenv.isLinux, systemd ? null }: - -assert alsaSupport -> alsaLib != null; -assert systemdSupport -> systemd != null; +, tcl, acl, kmod, coreutils, shadow, util-linux, udev +, alsaSupport ? stdenv.isLinux, alsaLib +, systemdSupport ? stdenv.isLinux, systemd +}: stdenv.mkDerivation rec { - name = "brltty-6.1"; + pname = "brltty"; + version = "6.3"; src = fetchurl { - url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"; + url = "https://brltty.app/archive/${pname}-${version}.tar.gz"; + sha256 = "14psxwlvgyi2fj1zh8rfykyjcjaya8xa7yg574bxd8y8n49n8hvb"; }; - nativeBuildInputs = [ pkg-config python3.pkgs.cython ]; + nativeBuildInputs = [ pkg-config python3.pkgs.cython tcl ]; buildInputs = [ bluez ] ++ lib.optional alsaSupport alsaLib ++ lib.optional systemdSupport systemd; @@ -26,17 +26,70 @@ stdenv.mkDerivation rec { It drives the braille display, and provides complete screen review functionality. Some speech capability has also been incorporated. ''; - homepage = "http://www.brltty.com/"; - license = lib.licenses.gpl2; + homepage = "https://brltty.app"; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.bramd ]; platforms = lib.platforms.all; }; - makeFlags = [ "PYTHON_PREFIX=$(out)" ]; - - preConfigurePhases = [ "preConfigure" ]; + makeFlags = [ + "PYTHON_PREFIX=$(out)" + "SYSTEMD_UNITS_DIRECTORY=$(out)/lib/systemd/system" + "SYSTEMD_USERS_DIRECTORY=$(out)/lib/sysusers.d" + "SYSTEMD_FILES_DIRECTORY=$(out)/lib/tmpfiles.d" + "UDEV_LIBRARY_DIRECTORY=$(out)/lib/udev" + "UDEV_RULES_TYPE=all" + "POLKIT_POLICY_DIR=$(out)/share/polkit-1/actions" + "POLKIT_RULE_DIR=$(out)/share/polkit-1/rules.d" + ]; + configureFlags = [ + "--with-writable-directory=/run/brltty" + "--with-updatable-directory=/var/lib/brltty" + "--with-api-socket-path=/var/lib/BrlAPI" + ]; + installFlags = [ "install-systemd" "install-udev" "install-polkit" ]; preConfigure = '' substituteInPlace configure --replace /sbin/ldconfig ldconfig + + # Some script needs a working tclsh shebang + patchShebangs . + + # Skip impure operations + substituteInPlace Programs/Makefile.in \ + --replace install-writable-directory "" \ + --replace install-apisoc-directory "" \ + --replace install-api-key "" + ''; + + postInstall = '' + # Rewrite absolute paths + substituteInPlace $out/bin/brltty-mkuser \ + --replace '/sbin/nologin' '${shadow}/bin/nologin' + ( + cd $out/lib + substituteInPlace systemd/system/brltty@.service \ + --replace '/usr/lib' "$out/lib" \ + --replace '/sbin/modprobe' '${kmod}/bin/modprobe' + # Ensure the systemd-wrapper script uses the correct path to the brltty binary + sed "/^Environment=\"BRLTTY_EXECUTABLE_ARGUMENTS.*/a Environment=\"BRLTTY_EXECUTABLE_PATH=$out/bin/brltty\"" -i systemd/system/brltty@.service + substituteInPlace systemd/system/brltty-device@.service \ + --replace '/usr/bin/true' '${coreutils}/bin/true' + substituteInPlace udev/rules.d/90-brltty-uinput.rules \ + --replace '/usr/bin/setfacl' '${acl}/bin/setfacl' + substituteInPlace tmpfiles.d/brltty.conf \ + --replace "$out/etc" '/etc' + + # Remove unused commands from udev rules + sed '/initctl/d' -i udev/rules.d/90-brltty-device.rules + # Remove pulse-access group from systemd unit and sysusers + substituteInPlace systemd/system/brltty@.service \ + --replace 'SupplementaryGroups=pulse-access' '# SupplementaryGroups=pulse-access' + substituteInPlace sysusers.d/brltty.conf \ + --replace 'm brltty pulse-access' '# m brltty pulse-access' + ) + substituteInPlace $out/libexec/brltty/systemd-wrapper \ + --replace 'logger' "${util-linux}/bin/logger" \ + --replace 'udevadm' "${udev}/bin/udevadm" ''; } diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 3e18d3f4b54ee..939c9f744f49e 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cloc"; - version = "1.88"; + version = "1.90"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = version; - sha256 = "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw"; + rev = "v${version}"; + sha256 = "0ic9q6qqw5f1wafp9lpmhr0miasbdb9zr59c0jlymnzffdmnliyc"; }; setSourceRoot = '' diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 9ef68a590c275..e6793813b2beb 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,21 +1,14 @@ { lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: stdenv.mkDerivation rec { - version = "0.4.7"; + version = "0.4.8"; pname = "dateutils"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; - sha256 = "16jr9yjk8wgzfh22hr3z6mp4jm3fkacyibds4jj5xx5yymbm8wj9"; + sha256 = "0061f36axskm7yq9cp64x5a5phil8d3zgcd668nfmqzk9ji58w1z"; }; - patches = [ - (fetchpatch { - url = "https://bitbucket.org/hroptatyr/dateutils/commits/6813ed94534f2311fbe9164748919e39d60b0190/raw"; - sha256 = "1zs3iizb172ha56g03rr8kzd8zx6qypiqsc11jw758mliwxk5rgc"; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ tzdata ]; # needed for datezone enableParallelBuilding = true; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 41f2bede99952..b7d0f2c3aad98 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = "0.5.1"; - sha256 = "sha256-e6Rzzz5S+Um2ZBuUkfAJQA4V+zqCqsUHB0f1t/dTU2w="; + rev = "0.5.2"; + sha256 = "sha256-kul0sjbwbCwadvrccG3KwL/fKWACFUg74QGvgfWE4FQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index ea60887ebfab4..b75f31c617203 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.123"; + version = "1.0.124"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; - sha256 = "0a53dhfwa74vdhqd6kbl7zlm7iic37c6wkdclppf0syxxi3q2njy"; + sha256 = "sha256-dwDphksp8WaybFQVPtjCdbRvS5pgRou2B+AZpkwWzY8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 570535f80e4ae..b5fe5074d7e5c 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index d2b84b2853396..77273f8fd2f0c 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0483glwi155ca1wnffwhmwn17d7kwk4hjwmckb8zs197rfqmb55v"; + sha256 = "1md52xzlrzf99s5q2152s1b7yql2h02ss451g68ky207xz660aj1"; }; postPatch = '' diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index d60e68a0e320b..eaddc8790e94b 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "sha256-gwFX5c5y4bL+KhPDnvCbDco1ORYyqZYFsetMrmOATZU="; + sha256 = "sha256-6/mcGq6qKYmcBcNndYYJB3rnHr6ZVpEcVjJBz7NEJEw="; }; - cargoSha256 = "sha256-gWCiaAgb7hBenbp1kogCoB6vctYfDZccRW9li2yxJaU="; + cargoSha256 = "sha256-W6YmFsTlU3LD3tvhLuA/3k/269gR2RLLOo86BQC5x98="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index dd28ddfaff556..bc7d3f6db42ab 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gh-ost"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "github"; repo = "gh-ost"; rev = "v${version}"; - sha256 = "0laj5nmf10qn01mqn0flipmhankgvrcfbdl3bc76wa14qkkg722m"; + sha256 = "sha256-srJXzY4TTHZDYKq8OPqin4zRoYlmaJKhHXDzO/GjBV8="; }; goPackagePath = "github.com/github/gh-ost"; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 3b63d7c02039e..9bbbe1493f763 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 +{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome3.adwaita-icon-theme ]; + buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ]; nativeBuildInputs = [ intltool gettext pkg-config wrapGAppsHook ]; preFixup = '' diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 2dffada9fe74d..e52ae44a83f9f 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome3 }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }: stdenv.mkDerivation rec { version="1.1.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; - buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ]; + buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 1a972daf6104a..b8b40d83022c1 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -3,6 +3,8 @@ , removeReferencesTo , zlib ? null , enableShared ? !stdenv.hostPlatform.isStatic +, javaSupport ? false +, jdk }: let inherit (lib) optional optionals; in @@ -17,11 +19,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + buildInputs = optional javaSupport jdk; + nativeBuildInputs = [ removeReferencesTo ]; propagatedBuildInputs = optional (zlib != null) zlib; - configureFlags = optional enableShared "--enable-shared"; + configureFlags = [] + ++ optional enableShared "--enable-shared" + ++ optional javaSupport "--enable-java"; patches = [ ./bin-mv.patch diff --git a/pkgs/tools/misc/ipbt/default.nix b/pkgs/tools/misc/ipbt/default.nix index 8ee6bb5addb97..25dad59c9fef9 100644 --- a/pkgs/tools/misc/ipbt/default.nix +++ b/pkgs/tools/misc/ipbt/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl, ncurses }: stdenv.mkDerivation rec { - version = "20190601.d1519e0"; + version = "20210215.5a9cb02"; pname = "ipbt"; src = fetchurl { url = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/ipbt-${version}.tar.gz"; - sha256 = "1aj8pajdd81vq2qw6vzfm27i0aj8vfz9m7k3sda30pnsrizm06d5"; + sha256 = "0w6blpv22jjivzr58y440zv6djvi5iccdmj4y2md52fbpjngmsha"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index 56795e7c93f31..10b9cea73d762 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome }: stdenv.mkDerivation rec { pname = "kodi-cli"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -a kodi-cli $out/bin wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]} cp -a playlist_to_kodi $out/bin - wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} + wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome.zenity jq youtube-dl ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index ed45c2682039a..8c242a5c83e6b 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -1,49 +1,30 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gengetopt, m4, gnupg +, git, perl, autoconf, automake, help2man, boehmgc }: stdenv.mkDerivation rec { pname = "mmv"; - version = "1.01b"; - - src = fetchurl { - url = "mirror://debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz"; - sha256 = "0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "rrthomas"; + repo = "mmv"; + rev = "v${version}"; + sha256 = "sha256-MmxDk3PBtvK/thrh6x67M+nMdCDlOQQHkREqLmzF2Mk="; + fetchSubmodules = true; }; - hardeningDisable = [ "format" ]; - - patches = [ - # Use Debian patched version, as upstream is no longer maintained and it - # contains a _lot_ of fixes. - (fetchurl { - url = "mirror://debian/pool/main/m/mmv/mmv_${version}-15.diff.gz"; - sha256 = "9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13"; - }) - ]; - - postPatch = '' - sed -i \ - -e 's/^\s*LDFLAGS\s*=\s*-s\s*-N/LDFLAGS = -s/' \ - -e "s|/usr/bin|$out/bin|" \ - -e "s|/usr/man|$out/share/man|" \ - Makefile + preConfigure = '' + ./bootstrap ''; - preInstall = '' - mkdir -p "$out/bin" "$out/share/man/man1" - ''; - - postInstall = '' - for variant in mcp mad mln - do - ln -s mmv "$out/bin/$variant" - ln -s mmv.1 "$out/share/man/man1/$variant.1" - done - ''; + nativeBuildInputs = [ gengetopt m4 git gnupg perl autoconf automake help2man pkg-config ]; + buildInputs = [ boehmgc ]; meta = { - homepage = "http://linux.maruhn.com/sec/mmv.html"; + homepage = "https://github.com/rrthomas/mmv"; description = "Utility for wildcard renaming, copying, etc"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ siraben ]; }; } diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index 4b28f49acaa25..c5419b27fece3 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://launchpad.net/pastebinit"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; - maintainers = with maintainers; [ lethalman raboof ]; + maintainers = with maintainers; [ raboof ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index f31de57fdfe75..b0a3d2d8cadef 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Q/W+1NvbuSu+QfezJpyeI5r4VlzdAAbOlSfFIT8knJs="; + sha256 = "sha256-c85XF1Glg6A7utPfXOv4LBesJy9+ErE2B+DO243mMhg="; }; - vendorSha256 = "sha256-oXt2nZ9lcAiI9ZQtKuQrXOXDfqx3Ucvh/K6g7SScd2Q="; + vendorSha256 = "sha256-n98cjXsgg2w3shbZPnk3g7mBbzV5Tc3jd9ZtiRk1KUM="; doCheck = false; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index 0205209d4910f..5f2a8852e3194 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { }) ]; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.conf \ + --subst-var-by PREFIX $out + ''; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib bzip2 ]; @@ -34,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.routino.org/"; description = "OpenStreetMap Routing Software"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 67548e305d7b9..1d78759761d61 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1hnbpj4k08356k2rmsairbfnxwfxs5lv59nxcj6hy5wf162h2hzb"; + sha256 = "0krskxbmlglkipqzjwgm2nmq118m8l0djgh0f8l6n2w3bjblhyfx"; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index b39f631f95bfd..a615330a4a8f1 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -88,7 +88,7 @@ systemd util-linux ] ++ lib.optional enableRDW networkmanager - ++ lib.optional (lib.any (lib.meta.platformMatch stdenv.hostPlatform) x86_energy_perf_policy.meta.platforms) x86_energy_perf_policy + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform x86_energy_perf_policy) x86_energy_perf_policy ); in '' diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 05750b962f00f..aad76062e3648 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeWrapper, xorgserver, getopt , xauth, util-linux, which, fontsConf, gawk, coreutils }: let - xvfb_run = fetchurl { + xvfb-run = fetchurl { name = "xvfb-run"; # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin - cp ${xvfb_run} $out/bin/xvfb-run + cp ${xvfb-run} $out/bin/xvfb-run chmod a+x $out/bin/xvfb-run patchShebangs $out/bin/xvfb-run diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index f0b6a8ba98ccd..9aaa211777682 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.6.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-spESDjX7scihVQrr/f6KMCI9VfdTxxPWP7FcJ965FYk="; + sha256 = "sha256-armEkYiRQ2RvKFUtNlnMejkNSLJOEQpFzUPduNJatMo="; }; - cargoSha256 = "0rm31sfcj2d85w1l4hhfmva3j828dfhiv5br1mnpaqaa01zzs1q1"; + cargoSha256 = "sha256-68UfDlQ1KuGZwcuSNeOCwULxS+Ei16lEydrO4CssD3Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 1eb445cfd3e07..7604885eccd04 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.2.0"; + version = "0.2.1"; src = let @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-4h1Lx+Et1AfX75Cn0YUhV4MkEtzP6ICqAHVKex3PBpg="; - aarch64-linux = "sha256-i7gzv8GdDgikPT1tMia4xltEYiIZ/VNRbAiGF2o8oKA="; - x86_64-darwin = "sha256-tleIY1loPE61n59Qc9CJeropRUvTBbcIA8xmB1SaMt8="; + x86_64-linux = "sha256-DDrsgZlnDF+WlBKyDi1McqcXEe5mAxoq5WW60p5qFQ8="; + aarch64-linux = "sha256-z9puhWmWf6G2C9PItKD4KL742UjVyVE/TDIu0gpOKd4="; + x86_64-darwin = "sha256-hDZPKi5R0seLbkHe7V4Vm+FarI6HrSZJF9JBJBa9O2Y="; }; dontConfigure = true; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 9cad36c68a632..61e529dc8729d 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I4qpcHsN8WGt7YLNXO08BJypilhMSVmZjqECDjlEqXU="; + sha256 = "sha256-XG/nci8Sj0vfa/SFPpJwl1Zmt/23LfKxocejplZtS0E="; }; - vendorSha256 = "sha256-Nfzk7p52msGxTPDbs4g9KuRPFxp4Npt0QXkdVOZvipc="; + vendorSha256 = "sha256-WR1CpjEMHRkpd0/iqrOm0oVXvyQO+r6GyeP0L0zx8aA="; doCheck = false; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 09edbaf751615..e57409fe558fa 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.1.1"; + version = "9.1.2"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MiTc8uT4FUHqEgE37kZ0pc7y1aK6u+4LqYQ8l1j2jA4="; + sha256 = "sha256-7v8vz0n35ATWdmMcM2U7z1sONbmsaWQahHsramivm88="; }; - vendorSha256 = "sha256-UGFFzpbBeL4YS3VSjCa31E2fiqND8j3E4FjRflg1NFc="; + vendorSha256 = "sha256-IAyiD4v2UEGlWj8oZ0E3YhqyThJTjwjWjOzQKuj6Q9s="; doCheck = false; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index a32e98ca18ac0..9c6aa52f60700 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-uv1boI9iaBeobo/58Di4oslh1eGLuK9HR5EwQQeWn+0="; + sha256 = "sha256-kzB6HIZK1XRxnjg5FvUWESalrYppJiiXVI8DBsDpLu8="; }; - cargoSha256 = "sha256-31OD/sv4br9cdBNqNGr4McypSGkBbKs7b7H1u7mFt3o="; + cargoSha256 = "sha256-2XftJ/T8wSaHXVgqbWY6EAmaVBXEzM+J6TSOJ0QFR3g="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 655cf1183022f..c1861e33c0815 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -10,7 +10,7 @@ , gettext , gupnp-av , gtksourceview4 -, gnome3 +, gnome , wrapGAppsHook }: @@ -38,12 +38,13 @@ stdenv.mkDerivation rec { gtk3 gupnp-av gtksourceview4 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 05b04cf9484bb..aea0faddf5d7f 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, iptables, libuuid, pkg-config , which, iproute2, gnused, coreutils, gawk, makeWrapper +, nixosTests }: let @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { done ''; + passthru.tests = { + bittorrent-integration = nixosTests.bittorrent; + }; + meta = with lib; { homepage = "http://miniupnp.free.fr/"; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index f6c45fc074d46..633c932def83d 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -5,7 +5,7 @@ , gettext , pkg-config , networkmanager -, gnome3 +, gnome , libnotify , libsecret , polkit @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { glib glib-networking libappindicator-gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ @@ -72,9 +72,10 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanagerapplet"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index c2de2ed8adb9e..ca200a76d3b64 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus -, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala +, gnome, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager"; }; @@ -106,7 +106,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz ]); platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index 20388f242ea4b..f97bac13cf7f1 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -11,7 +11,7 @@ , ppp , libsecret , withGnome ? true -, gnome3 +, gnome , fetchpatch , libnma }: @@ -69,9 +69,10 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-fortisslvpn"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index 87069d3c3c808..e56d9411b3933 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkg-config, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome3, fetchpatch, libnma, glib }: +, withGnome ? true, gnome, fetchpatch, libnma, glib }: let pname = "NetworkManager-iodine"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-iodine"; }; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 3d97493322551..50fc66a8d68b2 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -7,7 +7,7 @@ , pkg-config , vala , networkmanager -, gnome3 +, gnome , isocodes , libxml2 , docbook_xsl @@ -75,8 +75,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index 462eb3793d8f7..c03a698514a8f 100644 --- a/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -13,7 +13,7 @@ , file , gtk3 , withGnome ? true -, gnome3 +, gnome , kmod , fetchpatch }: @@ -66,9 +66,10 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-openconnect"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index 4a9e508fcdc7d..06df79e470525 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, libnma }: +, gtk3, withGnome ? true, gnome, kmod, libnma }: let pname = "NetworkManager-openvpn"; @@ -31,9 +31,10 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-openvpn"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index d00c0e3e55f8a..f486623443807 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -4,7 +4,7 @@ , fetchpatch , file , glib -, gnome3 +, gnome , gtk3 , intltool , libnma @@ -50,7 +50,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-sstp"; }; diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index c4cb79b4c8c34..cebcec35a314f 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM -, gtk3, gnome3, libsecret, libnma }: +, gtk3, gnome, libsecret, libnma }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix index 6ac71efc26038..70e7104696ee3 100644 --- a/pkgs/tools/networking/networkmanager/vpnc/default.nix +++ b/pkgs/tools/networking/networkmanager/vpnc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkg-config, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }: +, gtk3, withGnome ? true, gnome, glib, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -35,9 +35,10 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-vpnc"; + versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index 55babb4ca2dc6..21ad012f3fb9b 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -22,6 +22,7 @@ , withKerberos ? true , libkrb5 , libfido2 +, nixosTests , withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl , linkOpenssl ? true }: @@ -111,6 +112,10 @@ stdenv.mkDerivation rec { "sysconfdir=\${out}/etc/ssh" ]; + passthru.tests = { + borgbackup-integration = nixosTests.borgbackup; + }; + meta = { description = "An implementation of the SSH protocol${extraDesc}"; homepage = "https://www.openssh.com/"; diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index addb72359297c..74347ff839570 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; license = licenses.asl20; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index a5486252a8af1..3d50b11f8e1ae 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; license = lib.licenses.gpl2; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index ed181d2484ead..92696a8d75f1e 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,18 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm +, openssl, sqlite, file, xz, pcre, bash-completion, zstd, zchunk, libmodulemd +}: stdenv.mkDerivation rec { pname = "createrepo_c"; - version = "0.11.1"; + version = "0.17.1"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "createrepo_c"; rev = version; - sha256 = "0cmysc7gdd2czagl4drfh9gin6aa2847vgi30a3p0cfqvczf9cm6"; + sha256 = "G2xioH9XWntHFmUfTN2s2mdtIqgTTLKr5jZflwpaC8Q="; }; patches = [ + # Use the output directory to install the bash completions. ./fix-bash-completion-path.patch + # Use the output directory to install the python modules. ./fix-python-install-path.patch ]; @@ -23,15 +27,15 @@ stdenv.mkDerivation rec { --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}" ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config rpm ]; - buildInputs = [ bzip2 expat glib curl libxml2 python3 rpm openssl sqlite file xz pcre bash-completion ]; + buildInputs = [ bzip2 expat glib curl libxml2 python3 openssl sqlite file xz pcre bash-completion zstd zchunk libmodulemd ]; meta = with lib; { description = "C implementation of createrepo"; - homepage = "http://rpm-software-management.github.io/createrepo_c/"; - license = licenses.gpl2; - platforms = platforms.linux; + homepage = "https://rpm-software-management.github.io/createrepo_c/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch index e184cc8facc05..2539ec5d338dc 100644 --- a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch +++ b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch @@ -1,11 +1,11 @@ ---- createrepo_c-0.10.0-src.orig/CMakeLists.txt 2017-03-19 11:01:02.703173617 +0100 -+++ createrepo_c-0.10.0-src/CMakeLists.txt 2017-03-19 11:02:38.617448248 +0100 -@@ -100,7 +100,7 @@ - - pkg_check_modules(BASHCOMP bash-completion) - if (BASHCOMP_FOUND) -- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) -+ SET(BASHCOMP_DIR "@BASHCOMP_DIR@") - message("Bash completion directory: ${BASHCOMP_DIR}") - INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c) - INSTALL(CODE " +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ OPTION(ENABLE_BASHCOMP "Install Bash autocompletions?" ON) + IF (ENABLE_BASHCOMP) + pkg_check_modules(BASHCOMP bash-completion) + IF (BASHCOMP_FOUND) +- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) ++ SET(BASHCOMP_DIR "@BASHCOMP_DIR@") + message("Bash completion directory: ${BASHCOMP_DIR}") + INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c) + INSTALL(CODE " diff --git a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch index a247c6d9fe479..b8739622e3c08 100644 --- a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch +++ b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch @@ -1,11 +1,11 @@ ---- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt 2017-03-19 10:50:33.796342953 +0100 -+++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt 2017-03-19 10:53:51.207580073 +0100 -@@ -19,7 +19,7 @@ - FIND_PACKAGE(PythonInterp 3.0 REQUIRED) - endif() - +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -14,7 +14,7 @@ if (NOT SKBUILD) + FIND_PACKAGE(PythonLibs 3 REQUIRED) + endif (NOT SKBUILD) + -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) - + MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 446761cca1dd5..ae9a8714b852b 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ gcc9Stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.61.1"; + version = "0.62.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-ad0Q/8FEaSqsuA6tVC5SB4bTrGJY/8Xb8S8zrsDIyVc="; + sha256 = "sha256-Se15VmBbzt/NASjrA25RdpHDVIG/GOSqn6ibpBe752g="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ac61a64180dcd..4dfdb7075a5b1 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -21,7 +21,7 @@ common = , storeDir , stateDir , confDir - , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp + , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? stdenv.hostPlatform.isStatic , pname, version, suffix ? "", src diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix index 0c7620124d153..df1d50c60fadc 100644 --- a/pkgs/tools/security/crunch/default.nix +++ b/pkgs/tools/security/crunch/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = platforms.unix; license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ lethalman lnl7 ]; + maintainers = with maintainers; [ lnl7 ]; }; } diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 0f2dee26ffced..48625e48355bc 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.24.3"; + version = "3.24.4"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-G7oyyvrn+19N0C0V5MBwls+dQNzHh+DJmMTmsln8rC4="; + sha256 = "sha256-j1HTWC/YDER2LPJ1ELoxA5ZOxrdQOnDiHNOc7aVgWlk="; }; vendorSha256 = "sha256-UaR/xYGMI+C9aID85aPSfVzmTWXj4KcjfOJ6TTJ8KoY="; diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/tools/security/expliot/default.nix index c46dcb0189928..02a9ea5ee74f2 100644 --- a/pkgs/tools/security/expliot/default.nix +++ b/pkgs/tools/security/expliot/default.nix @@ -22,14 +22,14 @@ buildPythonApplication rec { pname = "expliot"; - version = "0.9.7"; + version = "0.9.8"; disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "expliot_framework"; repo = pname; rev = version; - sha256 = "sha256-k43PvH9BXcvxe7O5iCGzLuxv/WkB9YelH/d/1S7BpU0="; + sha256 = "sha256-7Cuj3YKKwDxP2KKueJR9ZO5Bduv+lw0Y87Rw4b0jbGY="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index e8ddf6bb0bc51..def3a953a0452 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-E7HGE+ZVUF6AK+4qVsO2t+/B8hRMd14/bZW2WXA6p6E="; + sha256 = "sha256-zwQDPOpctnAj6J6mQ4N7O1KJiAIu6osB/IlnM0D/hZA="; }; - vendorSha256 = "sha256-VBxGapvC2QE/0slsAiCBzmwOSMeGepZU0pYVDepSrwg="; + vendorSha256 = "sha256-Cb7RomQ/+O9xgUlCudoj7zLd2vrs58d00/vk/EboJ6Q="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 72917bfd0ef1f..cf6c965452d19 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.42" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.43" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index a28b4f766885c..b6735820ad73d 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 57fda58cdde0909e975394b34a8daa39c97f7e1c - ref: refs/tags/6.0.42 + revision: 08fd394933eadca2b90e4de4ecce7f478af1f161 + ref: refs/tags/6.0.43 specs: - metasploit-framework (6.0.42) + metasploit-framework (6.0.43) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -23,6 +23,7 @@ GIT faye-websocket filesize hrr_rb_ssh (= 0.3.0.pre2) + http-cookie irb jsobfu json @@ -30,7 +31,7 @@ GIT metasploit-concern (~> 3.0.0) metasploit-credential (~> 4.0.0) metasploit-model (~> 3.1.0) - metasploit-payloads (= 2.0.44) + metasploit-payloads (= 2.0.45) metasploit_data_models (~> 4.1.0) metasploit_payloads-mettle (= 1.0.9) mqtt @@ -92,26 +93,26 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (5.2.5) - actionview (= 5.2.5) - activesupport (= 5.2.5) + actionpack (5.2.6) + actionview (= 5.2.6) + activesupport (= 5.2.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.5) - activesupport (= 5.2.5) + actionview (5.2.6) + activesupport (= 5.2.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.5) - activesupport (= 5.2.5) - activerecord (5.2.5) - activemodel (= 5.2.5) - activesupport (= 5.2.5) + activemodel (5.2.6) + activesupport (= 5.2.6) + activerecord (5.2.6) + activemodel (= 5.2.6) + activesupport (= 5.2.6) arel (>= 9.0) - activesupport (5.2.5) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -123,7 +124,7 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.449.0) + aws-partitions (1.452.0) aws-sdk-core (3.114.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -138,7 +139,7 @@ GEM aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.94.0) + aws-sdk-s3 (1.94.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -152,9 +153,11 @@ GEM concurrent-ruby (1.0.5) cookiejar (0.3.3) crass (1.0.6) - daemons (1.3.1) + daemons (1.4.0) dnsruby (1.61.5) simpleidn (~> 0.1) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -184,6 +187,8 @@ GEM hashery (2.1.2) hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) + http-cookie (1.0.3) + domain_name (~> 0.5) http_parser.rb (0.6.0) i18n (1.8.10) concurrent-ruby (~> 1.0) @@ -216,7 +221,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.44) + metasploit-payloads (2.0.45) metasploit_data_models (4.1.4) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -263,7 +268,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.2.2) + puma (5.3.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -276,9 +281,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.5) - actionpack (= 5.2.5) - activesupport (= 5.2.5) + railties (5.2.6) + actionpack (= 5.2.6) + activesupport (= 5.2.6) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index fcd37ad4bb260..f5622bcfeef50 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.42"; + version = "6.0.43"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-L4P6QUERoH0JnaTpzrA0UWUYqRepBS97fSexKa8JZQU="; + sha256 = "sha256-dj+8DodQnCJjwhxTD/TjccJvSA8KSjiwiX65V6CIpuQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 2aa5d4fa83665..13d391390ddc1 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m"; + sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i"; + sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b"; + sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj"; + sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj"; + sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; addressable = { groups = ["default"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18d990l9mraf8j1akfn1f4l3y6n7shhnr9x5naj6pzv5z3y3dzf4"; + sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55"; type = "gem"; }; - version = "1.449.0"; + version = "1.452.0"; }; aws-sdk-core = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "119f1nf2q1k7xg7h2agm7g8i87abfdkad0l78hhk6y4f3v02niv9"; + sha256 = "0803g2c1hhdk6fbliww12in4czsxj47fip9dpl35hbqsnrpjc4y9"; type = "gem"; }; - version = "1.94.0"; + version = "1.94.1"; }; aws-sigv4 = { groups = ["default"]; @@ -264,10 +264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + sha256 = "1fki1aipqafqlg8xy25ykk0ql1dciy9kk6lcp5gzgkh9ccmaxzf3"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; dnsruby = { groups = ["default"]; @@ -279,6 +279,16 @@ }; version = "1.61.5"; }; + domain_name = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; ed25519 = { groups = ["default"]; platforms = []; @@ -419,6 +429,16 @@ }; version = "0.3.0.pre2"; }; + http-cookie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; "http_parser.rb" = { groups = ["default"]; platforms = []; @@ -534,12 +554,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "57fda58cdde0909e975394b34a8daa39c97f7e1c"; - sha256 = "01b516pjkc97gmxjy1d92ylihrai6jqcxsd4kl4pv80i850zm0rg"; + rev = "08fd394933eadca2b90e4de4ecce7f478af1f161"; + sha256 = "1r56i2h5gfbyi6q3hjha1x46zhkiwgs0ylqwq9ij572hhw7bqgvn"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.42"; + version = "6.0.43"; }; metasploit-model = { groups = ["default"]; @@ -556,10 +576,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z0cgg4fghcpj3pvjyqnnzll5zvhwpv68dvpz2y0zgij14cvfg7y"; + sha256 = "09w5r7g19n845h9ii66h8cx9ikgv69d59ry67183h7c76mhzvm9c"; type = "gem"; }; - version = "2.0.44"; + version = "2.0.45"; }; metasploit_data_models = { groups = ["default"]; @@ -826,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k"; + sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1"; type = "gem"; }; - version = "5.2.2"; + version = "5.3.0"; }; racc = { groups = ["default"]; @@ -896,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9"; + sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; rake = { groups = ["default"]; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 8c5083ee8af66..f5d9185dc9869 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: +{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome }: python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = '' wrapProgram "$out/bin/onioncircuits" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share" + --prefix XDG_DATA_DIRS : "$out/share:${gnome.adwaita-icon-theme}/share" ''; meta = with lib; { diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 0d7c3d2863cff..e8d080a132cf7 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YUrvdleH332fWDgq8AwUdXkFC7m9ap+OVuQhKlxZfII="; + sha256 = "sha256-pQuCVDXO9sXqCayoSAuxnzUBURJN+W2MZlzC/nV0wUc="; }; - vendorSha256 = "sha256-CzJ83MsBetrzbBT+fmz8F8MjdrManJAd4xpykh/2938="; + vendorSha256 = "sha256-W3RXjjR90nfidkUldKNK0QAmI78SvtgHrZTWMzpqtMs="; # tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 29c1d6376fe02..d96573325b824 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ berbiche ]; platforms = platforms.unix; + mainProgram = "btm"; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index c96f92bedfef9..5eb39c7f6d85b 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -87,6 +87,6 @@ in stdenv.mkDerivation rec { homepage = "https://www.netdata.cloud/"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 9efb3475a480e..be6e8f2676379 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -26,6 +26,6 @@ buildGoModule rec { description = "Netdata orchestrator for data collection modules written in go"; homepage = "https://github.com/netdata/go.d.plugin"; license = licenses.gpl3; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 388d9b9227321..6511d2dcdbb39 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "alecthomas"; repo = pname; rev = "v${version}"; - sha256 = "0zzk4wcjgxa9lsx8kwpmxvcw67f2fr7ai37jxmdahnws0ai2c2f7"; + sha256 = "sha256-+4UaQrJh3PBf68rlW1lOEyEVw3vWxfc+Casa5+H8F9A="; leaveDotGit = true; }; diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index bf825a55059ef..5bc99724e3faf 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -9,6 +9,7 @@ , wrapGAppsHook , libxml2 , libgda +, libhandy , libsoup , json-glib , gspell @@ -16,17 +17,17 @@ , libdazzle , gtk3 , gtksourceview4 -, gnome3 +, gnome , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.38.0"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "0d48nc11z0m91scy21ah56ysxns82zvswx8lglvlkig1vqvblgpc"; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { libdazzle gtksourceview4 libgda + libhandy libsoup json-glib gettext @@ -59,7 +61,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 1c3d5929636a6..32fba9a8e1f35 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -143,7 +143,7 @@ core = stdenv.mkDerivation rec { description = "Basic binaries for TeX Live"; homepage = "http://www.tug.org/texlive"; license = lib.licenses.gpl2; - maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ]; + maintainers = with maintainers; [ veprbl lovek323 raskin jwiegley ]; platforms = platforms.all; }; }; @@ -185,6 +185,12 @@ core-big = stdenv.mkDerivation { #TODO: upmendex mkdir -p "$path" && cd "$path" "../../../$path/configure" $configureFlags $extraConfig + + if [[ "$path" =~ "libs/pplib" ]]; then + # TODO: revert for texlive 2022 + # ../../../texk/web2c/luatexdir/luamd5/md5lib.c:197:10: fatal error: 'utilsha.h' file not found + make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + fi ) done ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 56f6be15e49d3..44460e8f91178 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -121,6 +121,8 @@ mapAliases ({ conntrack_tools = conntrack-tools; # added 2018-05 cool-old-term = cool-retro-term; # added 2015-01-31 coprthr = throw "coprthr has been removed."; # added 2019-12-08 + couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 + couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03 corebird = throw "corebird was deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement."; coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 @@ -195,6 +197,7 @@ mapAliases ({ exfat-utils = exfat; # 2015-09-11 facette = throw "facette has been removed."; # added 2020-01-06 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + fastnlo = fastnlo_toolkit; # added 2021-04-24 fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = ffado; # added 2018-05-01 @@ -297,6 +300,7 @@ mapAliases ({ gtk_doc = gtk-doc; # added 2018-02-25 guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 + gnome3 = gnome; # added 2021-05-07 guileLint = guile-lint; # added 2017-09-27 guile_lib = guile-lib; # added 2017-09-24 guile_ncurses = guile-ncurses; # added 2017-09-24 @@ -745,6 +749,7 @@ mapAliases ({ speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 + spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03 spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16 spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 @@ -863,6 +868,7 @@ mapAliases ({ xlibs = xorg; # added 2015-09 xpraGtk3 = xpra; # added 2018-09-13 xv = xxv; # added 2020-02-22 + xvfb_run = xvfb-run; # added 2021-05-07 yacc = bison; # moved from top-level 2021-03-14 youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; @@ -967,6 +973,12 @@ mapAliases ({ posix_man_pages = man-pages-posix; # Added 2021-04-15 + /* Cleanup before 21.11, Added 2021-05-07 */ + avian = throw '' + The package doesn't compile anymore on NixOS and both development + & maintenance is abandoned by upstream. + ''; + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8e77bcf6d4d2..4ef75bee469be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -637,6 +637,8 @@ in wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; + wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = gtk4; }; + wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -792,7 +794,7 @@ in aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { - inherit (gnome3) zenity; + inherit (gnome) zenity; inherit (plasma5Packages) kdialog; }; @@ -3536,7 +3538,7 @@ in libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - inherit (gnome3) gnome-common; + inherit (gnome) gnome-common; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -4157,6 +4159,8 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Security; }; + timeline = callPackage ../applications/office/timeline/default.nix { }; + tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; @@ -5472,7 +5476,9 @@ in hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { }; - hdfview = callPackage ../tools/misc/hdfview { }; + hdfview = callPackage ../tools/misc/hdfview { + hdf5 = hdf5_1_10; + }; hecate = callPackage ../applications/editors/hecate { }; @@ -5953,6 +5959,8 @@ in kpcli = callPackage ../tools/security/kpcli { }; + kratos = callPackage ../applications/misc/kratos { }; + krename = libsForQt5.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; @@ -6374,7 +6382,7 @@ in libite = callPackage ../development/libraries/libite { }; liblangtag = callPackage ../development/libraries/liblangtag { - inherit (gnome3) gnome-common; + inherit (gnome) gnome-common; }; liblouis = callPackage ../development/libraries/liblouis { }; @@ -7131,7 +7139,12 @@ in nzbget = callPackage ../tools/networking/nzbget { }; - nzbhydra2 = callPackage ../servers/nzbhydra2 { }; + nzbhydra2 = callPackage ../servers/nzbhydra2 { + # You need Java (at least 8, at most 15) + # https://github.com/theotherp/nzbhydra2/issues/697 + # https://github.com/theotherp/nzbhydra2/#how-to-run + jre = openjdk11; + }; oapi-codegen = callPackage ../tools/networking/oapi-codegen { }; @@ -7449,6 +7462,8 @@ in pitivi = callPackage ../applications/video/pitivi { }; + prism = callPackage ../applications/video/prism { }; + pulumi-bin = callPackage ../tools/admin/pulumi { }; p0f = callPackage ../tools/security/p0f { }; @@ -7854,6 +7869,8 @@ in qnial = callPackage ../development/interpreters/qnial { }; + quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; + ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; @@ -8456,6 +8473,8 @@ in snapcast = callPackage ../applications/audio/snapcast { }; + snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { }; + sng = callPackage ../tools/graphics/sng { libpng = libpng12; }; @@ -8665,9 +8684,7 @@ in stunnel = callPackage ../tools/networking/stunnel { }; - stutter = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.stutter) (drv: { - preCheck = "export PATH=dist/build/stutter:$PATH"; - }); + stutter = haskell.lib.justStaticExecutables haskellPackages.stutter; strongswan = callPackage ../tools/networking/strongswan { }; strongswanTNC = strongswan.override { enableTNC = true; }; @@ -9758,7 +9775,7 @@ in xxv = callPackage ../tools/misc/xxv {}; - xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; + xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; }; xvkbd = callPackage ../tools/X11/xvkbd {}; @@ -10131,11 +10148,6 @@ in avra = callPackage ../development/compilers/avra { }; - avian = callPackage ../development/compilers/avian { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - bigloo = callPackage ../development/compilers/bigloo { }; binaryen = callPackage ../development/compilers/binaryen { }; @@ -11653,7 +11665,9 @@ in urn = callPackage ../development/compilers/urn { }; - urweb = callPackage ../development/compilers/urweb { }; + urweb = callPackage ../development/compilers/urweb { + icu = icu67; + }; vlang = callPackage ../development/compilers/vlang { }; @@ -11666,6 +11680,7 @@ in vala_0_46 vala_0_48 vala_0_50 + vala_0_52 vala; vyper = with python3Packages; toPythonApplication vyper; @@ -12194,7 +12209,6 @@ in sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; @@ -12300,6 +12314,9 @@ in newlib = newlibCross; }; + mspds = callPackage ../development/misc/msp430/mspds { }; + mspds-bin = callPackage ../development/misc/msp430/mspds/binary.nix { }; + mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; @@ -13271,6 +13288,8 @@ in ninja = callPackage ../development/tools/build-managers/ninja { }; + nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; + gn = callPackage ../development/tools/build-managers/gn { }; nixbang = callPackage ../development/tools/misc/nixbang { @@ -14854,6 +14873,10 @@ in glibmm = callPackage ../development/libraries/glibmm { }; + glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + glib-networking = callPackage ../development/libraries/glib-networking {}; glib-testing = callPackage ../development/libraries/glib-testing { }; @@ -14874,6 +14897,8 @@ in cairomm = callPackage ../development/libraries/cairomm { }; + cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { }; + pango = callPackage ../development/libraries/pango { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; }; @@ -14886,6 +14911,10 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + pangomm_2_48 = callPackage ../development/libraries/pangomm/2.48.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + gdata-sharp = callPackage ../development/libraries/gdata-sharp { }; gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; @@ -14926,6 +14955,7 @@ in gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; + gtkmm4 = callPackage ../development/libraries/gtkmm/4.x.nix { }; gtk_engines = callPackage ../development/libraries/gtk-engines { }; @@ -14965,6 +14995,8 @@ in gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { }; + gtksourceview5 = callPackage ../development/libraries/gtksourceview/5.x.nix { }; + gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { }; gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; @@ -15661,7 +15693,7 @@ in libgig = callPackage ../development/libraries/libgig { }; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome3.libgnome-keyring; + libgnome-keyring3 = gnome.libgnome-keyring; libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; @@ -16163,7 +16195,7 @@ in libopusenc = callPackage ../development/libraries/libopusenc { }; libosinfo = callPackage ../development/libraries/libosinfo { - inherit (gnome3) libsoup; + inherit (gnome) libsoup; }; libosip = callPackage ../development/libraries/osip {}; @@ -16234,7 +16266,10 @@ in libroxml = callPackage ../development/libraries/libroxml { }; - librsvg = callPackage ../development/libraries/librsvg { }; + librsvg = callPackage ../development/libraries/librsvg { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; + }; librsync = callPackage ../development/libraries/librsync { }; @@ -16252,6 +16287,8 @@ in libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; + libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { }; + libsigsegv = callPackage ../development/libraries/libsigsegv { }; libslirp = callPackage ../development/libraries/libslirp { }; @@ -16711,7 +16748,9 @@ in libmpc = callPackage ../development/libraries/libmpc { }; - mpich = callPackage ../development/libraries/mpich { }; + mpich = callPackage ../development/libraries/mpich { + ch4backend = libfabric; + }; mstpd = callPackage ../os-specific/linux/mstpd { }; @@ -17104,6 +17143,8 @@ in portmidi = callPackage ../development/libraries/portmidi {}; + presage = callPackage ../development/libraries/presage { }; + prime-server = callPackage ../development/libraries/prime-server { }; primesieve = callPackage ../development/libraries/science/math/primesieve { }; @@ -17632,6 +17673,8 @@ in sphinx = with python3Packages; toPythonApplication sphinx; + sphinx-autobuild = with python3Packages; toPythonApplication sphinx-autobuild; + sphinx-serve = with python3Packages; toPythonApplication sphinx-serve; sphinxbase = callPackage ../development/libraries/sphinxbase { }; @@ -18569,15 +18612,6 @@ in clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; - couchdb = callPackage ../servers/http/couchdb { - sphinx = python27Packages.sphinx; - erlang = erlangR19; - }; - - couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { - erlang = erlangR21; - }; - couchdb3 = callPackage ../servers/http/couchdb/3.nix { erlang = erlangR22; }; @@ -21469,7 +21503,7 @@ in kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (gnome3) adwaita-icon-theme; + inherit (gnome) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; @@ -22232,7 +22266,7 @@ in awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; - inherit (gnome3) baobab; + inherit (gnome) baobab; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -22293,7 +22327,7 @@ in (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { - inherit (gnome3) zenity; + inherit (gnome) zenity; libxkbcommon = libxkbcommon_7; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { @@ -22837,7 +22871,7 @@ in pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; - inherit (gnome3) empathy; + inherit (gnome) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; @@ -22851,7 +22885,7 @@ in epgstation = callPackage ../applications/video/epgstation { }; - inherit (gnome3) epiphany; + inherit (gnome) epiphany; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; @@ -22906,8 +22940,8 @@ in keeweb = callPackage ../applications/misc/keeweb { }; - inherit (gnome3) evince; - evolution-data-server = gnome3.evolution-data-server; + inherit (gnome) evince; + evolution-data-server = gnome.evolution-data-server; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; @@ -23185,7 +23219,7 @@ in gtimelog = with python3Packages; toPythonApplication gtimelog; - inherit (gnome3) gucharmap; + inherit (gnome) gucharmap; guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; @@ -23461,7 +23495,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - inherit (gnome3) gitg; + inherit (gnome) gitg; gmrun = callPackage ../applications/misc/gmrun {}; @@ -23594,7 +23628,7 @@ in celluloid = callPackage ../applications/video/celluloid { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-autoar; + inherit (gnome) gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; @@ -23802,14 +23836,7 @@ in pinboard = with python3Packages; toPythonApplication pinboard; - pinboard-notes-backup = haskell.lib.overrideCabal - (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" - haskellPackages.pinboard-notes-backup) - (drv: { - postInstall = '' - install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 - '' + (drv.postInstall or ""); - }); + pinboard-notes-backup = haskell.lib.justStaticExecutables haskellPackages.pinboard-notes-backup; pixelnuke = callPackage ../applications/graphics/pixelnuke { }; @@ -24027,7 +24054,7 @@ in }); imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }); inherit (nodePackages) imapnotify; @@ -24506,7 +24533,7 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { @@ -24656,6 +24683,8 @@ in mikmod = callPackage ../applications/audio/mikmod { }; + miniaudicle = callPackage ../applications/audio/miniaudicle { }; + minicom = callPackage ../tools/misc/minicom { }; minimodem = callPackage ../applications/radio/minimodem { }; @@ -24719,7 +24748,6 @@ in monotone = callPackage ../applications/version-management/monotone { lua = lua5; - botan = botan.override (x: { openssl = null; }); }; monotoneViz = callPackage ../applications/version-management/monotone-viz { @@ -25934,7 +25962,7 @@ in shutter = callPackage ../applications/graphics/shutter { }; - simple-scan = gnome3.simple-scan; + simple-scan = gnome.simple-scan; siproxd = callPackage ../applications/networking/siproxd { }; @@ -26207,7 +26235,7 @@ in surf-display = callPackage ../desktops/surf-display { }; surge = callPackage ../applications/audio/surge { - inherit (gnome3) zenity; + inherit (gnome) zenity; git = gitMinimal; }; @@ -26261,9 +26289,7 @@ in # customConfig = builtins.readFile ./tabbed.config.h; }; - taffybar = callPackage ../applications/window-managers/taffybar { - inherit (haskellPackages) ghcWithPackages; - }; + taffybar = callPackage ../applications/window-managers/taffybar {}; tagainijisho = callPackage ../applications/office/tagainijisho {}; @@ -26517,6 +26543,8 @@ in lavalauncher = callPackage ../applications/misc/lavalauncher { }; + t-rec = callPackage ../misc/t-rec { }; + ulauncher = callPackage ../applications/misc/ulauncher { }; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; @@ -27340,7 +27368,7 @@ in yeetgif = callPackage ../applications/graphics/yeetgif { }; - inherit (gnome3) yelp; + inherit (gnome) yelp; yelp-tools = callPackage ../development/misc/yelp-tools { }; @@ -27537,7 +27565,7 @@ in autoreconfHook = buildPackages.autoreconfHook269; }; - ethabi = callPackage ../applications/blockchains/ethabi.nix { }; + ethabi = callPackage ../applications/blockchains/ethabi { }; pycoin = with python3Packages; toPythonApplication pycoin; @@ -28354,7 +28382,7 @@ in protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit steam-run; inherit winetricks; - inherit (gnome3) zenity; + inherit (gnome) zenity; }; sdlpop = callPackage ../games/sdlpop { }; @@ -28626,45 +28654,46 @@ in gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); - gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); + gnome = recurseIntoAttrs (callPackage ../desktops/gnome { }); gnomeExtensions = recurseIntoAttrs { - appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; - arcmenu = callPackage ../desktops/gnome-3/extensions/arcmenu { }; - caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; - clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; - clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { }; - dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; - dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; - disable-unredirect = callPackage ../desktops/gnome-3/extensions/disable-unredirect { }; - draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; - drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; - dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { }; - easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; - emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; - freon = callPackage ../desktops/gnome-3/extensions/freon { }; - fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { }; - gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; - icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; - impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; - material-shell = callPackage ../desktops/gnome-3/extensions/material-shell { }; - mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; - night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; - no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; - noannoyance = callPackage ../desktops/gnome-3/extensions/noannoyance { }; - paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { }; - pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; - remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; - sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { }; - system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { }; - taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; - tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { }; - timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; - topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; - unite = callPackage ../desktops/gnome-3/extensions/unite { }; - window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; - window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; - workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; + appindicator = callPackage ../desktops/gnome/extensions/appindicator { }; + arcmenu = callPackage ../desktops/gnome/extensions/arcmenu { }; + caffeine = callPackage ../desktops/gnome/extensions/caffeine { }; + clipboard-indicator = callPackage ../desktops/gnome/extensions/clipboard-indicator { }; + clock-override = callPackage ../desktops/gnome/extensions/clock-override { }; + dash-to-dock = callPackage ../desktops/gnome/extensions/dash-to-dock { }; + dash-to-panel = callPackage ../desktops/gnome/extensions/dash-to-panel { }; + disable-unredirect = callPackage ../desktops/gnome/extensions/disable-unredirect { }; + draw-on-your-screen = callPackage ../desktops/gnome/extensions/draw-on-your-screen { }; + drop-down-terminal = callPackage ../desktops/gnome/extensions/drop-down-terminal { }; + dynamic-panel-transparency = callPackage ../desktops/gnome/extensions/dynamic-panel-transparency { }; + easyScreenCast = callPackage ../desktops/gnome/extensions/EasyScreenCast { }; + emoji-selector = callPackage ../desktops/gnome/extensions/emoji-selector { }; + freon = callPackage ../desktops/gnome/extensions/freon { }; + fuzzy-app-search = callPackage ../desktops/gnome/extensions/fuzzy-app-search { }; + gsconnect = callPackage ../desktops/gnome/extensions/gsconnect { }; + hot-edge = callPackage ../desktops/gnome/extensions/hot-edge { }; + icon-hider = callPackage ../desktops/gnome/extensions/icon-hider { }; + impatience = callPackage ../desktops/gnome/extensions/impatience { }; + material-shell = callPackage ../desktops/gnome/extensions/material-shell { }; + mpris-indicator-button = callPackage ../desktops/gnome/extensions/mpris-indicator-button { }; + night-theme-switcher = callPackage ../desktops/gnome/extensions/night-theme-switcher { }; + no-title-bar = callPackage ../desktops/gnome/extensions/no-title-bar { }; + noannoyance = callPackage ../desktops/gnome/extensions/noannoyance { }; + paperwm = callPackage ../desktops/gnome/extensions/paperwm { }; + pidgin-im-integration = callPackage ../desktops/gnome/extensions/pidgin-im-integration { }; + remove-dropdown-arrows = callPackage ../desktops/gnome/extensions/remove-dropdown-arrows { }; + sound-output-device-chooser = callPackage ../desktops/gnome/extensions/sound-output-device-chooser { }; + system-monitor = callPackage ../desktops/gnome/extensions/system-monitor { }; + taskwhisperer = callPackage ../desktops/gnome/extensions/taskwhisperer { }; + tilingnome = callPackage ../desktops/gnome/extensions/tilingnome { }; + timepp = callPackage ../desktops/gnome/extensions/timepp { }; + topicons-plus = callPackage ../desktops/gnome/extensions/topicons-plus { }; + unite = callPackage ../desktops/gnome/extensions/unite { }; + window-corner-preview = callPackage ../desktops/gnome/extensions/window-corner-preview { }; + window-is-ready-remover = callPackage ../desktops/gnome/extensions/window-is-ready-remover { }; + workspace-matrix = callPackage ../desktops/gnome/extensions/workspace-matrix { }; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; @@ -28673,9 +28702,9 @@ in arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 }; - gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { }; + gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; - gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { }; + gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; hhexen = callPackage ../games/hhexen { }; @@ -28711,7 +28740,7 @@ in latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - gnome-themes-extra = gnome3.gnome-themes-extra; + gnome-themes-extra = gnome.gnome-themes-extra; rox-filer = callPackage ../desktops/rox/rox-filer { gtk = gtk2; @@ -29684,7 +29713,7 @@ in fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { }; - fastnlo = callPackage ../development/libraries/physics/fastnlo { }; + fastnlo_toolkit = callPackage ../development/libraries/physics/fastnlo_toolkit { }; geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; @@ -30820,7 +30849,7 @@ in }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome3) zenity; + inherit (gnome) zenity; }; wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; @@ -31085,7 +31114,7 @@ in chrome-export = callPackage ../tools/misc/chrome-export {}; - chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; + chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell {}; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 2cd2965fc6128..6da0598c6ace8 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -70,9 +70,11 @@ let tlc = callPackage ../development/coq-modules/tlc {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST { - compcert = compcert.override { version = "3.7"; }; - }; + VST = callPackage ../development/coq-modules/VST (with lib.versions; + lib.switch coq.coq-version [ + { case = "8.11"; out = { compcert = compcert.override { coqPackages = self; version = "3.7"; }; }; } + { case = range "8.12" "8.13"; out = { compcert = compcert.override { coqPackages = self; }; }; } + ] {}); filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index da70103ad6bd8..af4125d67131f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -76,13 +76,17 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { - bootPkgs = packages.ghc8102Binary; + # aarch64 ghc8102Binary exceeds max output size on hydra + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc884; # no binary yet + bootPkgs = packages.ghc8104; # no binary yet inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e7c83018327f5..10a6de27deb10 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -174,6 +174,22 @@ let propagatedBuildInputs = [ AlgorithmDiff ]; }; + AlienBaseModuleBuild = buildPerlModule { + pname = "Alien-Base-ModuleBuild"; + version = "1.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.15.tar.gz"; + sha256 = "13c9432cf41b34cb14df2454a03e540e2bd5dc9eb9c82824b6ad0f4c67793afd"; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ AlienBuild ArchiveExtract CaptureTiny Filechdir PathTiny ShellConfigGenerate ShellGuess SortVersions URI ]; + meta = { + homepage = https://metacpan.org/pod/Alien::Base::ModuleBuild; + description = "A Module::Build subclass for building Alien:: modules and their libraries"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlienBuild = buildPerlPackage { pname = "Alien-Build"; version = "2.37"; @@ -204,6 +220,21 @@ let }; }; + AlienLibGumbo = buildPerlModule { + pname = "Alien-LibGumbo"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RU/RUZ/Alien-LibGumbo-0.05.tar.gz"; + sha256 = "0fbe916ab11f680e5c28cd1ac800372323e2a0e06affc6c8b36279fc64d76517"; + }; + buildInputs = [ AlienBaseModuleBuild ]; + propagatedBuildInputs = [ AlienBuild FileShareDir PathClass ]; + meta = { + description = "Gumbo parser library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AlienLibxml2 = buildPerlPackage { pname = "Alien-Libxml2"; version = "0.17"; @@ -4606,6 +4637,19 @@ let }; }; + CryptX509 = buildPerlPackage { + pname = "Crypt-X509"; + version = "0.53"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-X509-0.53.tar.gz"; + sha256 = "d2ff614f9457dc87ab277b81bced3532c3ed309b73b9a61aaefbe9488c9e660f"; + }; + propagatedBuildInputs = [ ConvertASN1 ]; + meta = { + description = "Parse a X.509 certificate"; + }; + }; + CwdGuard = buildPerlModule { pname = "Cwd-Guard"; version = "0.05"; @@ -9204,7 +9248,7 @@ let propagatedBuildInputs = [ Readonly Gtk3 ]; checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; checkPhase = '' - ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ + ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \ make test ''; meta = { @@ -9471,6 +9515,21 @@ let }; }; + HTMLFormatExternal = buildPerlPackage { + pname = "HTML-FormatExternal"; + version = "26"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRYDE/HTML-FormatExternal-26.tar.gz"; + sha256 = "3c59f233d0b10686a85aed0c994011cec68626da0128dea90b5c4fdc1746cfc3"; + }; + propagatedBuildInputs = [ IPCRun URI constant-defer ]; + meta = { + homepage = http://user42.tuxfamily.org/html-formatexternal/index.html; + description = "HTML to text formatting using external programs"; + license = lib.licenses.gpl3Plus; + }; + }; + HTMLFormatTextWithLinks = buildPerlModule { pname = "HTML-FormatText-WithLinks"; version = "0.15"; @@ -9546,6 +9605,20 @@ let }; }; + HTMLGumbo = buildPerlModule { + pname = "HTML-Gumbo"; + version = "0.18"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RU/RUZ/HTML-Gumbo-0.18.tar.gz"; + sha256 = "bf50b61c24656cc3fc958602d80a9c7d017247af38d8dbfa0e9dec5b75425d5f"; + }; + propagatedBuildInputs = [ AlienLibGumbo ]; + meta = { + description = "HTML5 parser based on gumbo C library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTMLMason = buildPerlPackage { pname = "HTML-Mason"; version = "1.59"; @@ -9909,6 +9982,21 @@ let propagatedBuildInputs = [ XMLDOM ]; }; + HTTPHeadersActionPack = buildPerlPackage { + pname = "HTTP-Headers-ActionPack"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTTP-Headers-ActionPack-0.09.tar.gz"; + sha256 = "c78111ab857e48c69824903d4b6ce8293feffc6b5d670db550a767f853acc7da"; + }; + buildInputs = [ TestFatal TestWarnings ]; + propagatedBuildInputs = [ HTTPDate HTTPMessage ModuleRuntime SubExporter URI ]; + meta = { + description = "HTTP Action, Adventure and Excitement"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + HTTPHeaderParserXS = buildPerlPackage { pname = "HTTP-HeaderParser-XS"; version = "0.20"; @@ -14049,6 +14137,21 @@ let }; }; + MooXTypeTiny = buildPerlPackage { + pname = "MooX-TypeTiny"; + version = "0.002003"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HAARG/MooX-TypeTiny-0.002003.tar.gz"; + sha256 = "d81e26ff6f8db10261f0087f96dc54367dcb49a9f3de8d53238f834ece19624b"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ Moo TypeTiny ]; + meta = { + description = "Optimized type checks for Moo + Type::Tiny"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooseAutobox = buildPerlModule { pname = "Moose-Autobox"; version = "0.16"; @@ -16485,6 +16588,22 @@ let }; }; + PathDispatcher = buildPerlPackage { + pname = "Path-Dispatcher"; + version = "1.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/Path-Dispatcher-1.08.tar.gz"; + sha256 = "79a9f61c27408b4fd1ed234dac246974ddeafa7fe635a18fe41ec7783130ae2a"; + }; + buildInputs = [ ModuleBuildTiny TestFatal ]; + propagatedBuildInputs = [ Moo MooXTypeTiny TryTiny TypeTiny ]; + meta = { + homepage = https://github.com/karenetheridge/Path-Dispatcher; + description = "Flexible and extensible dispatch"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PathIteratorRule = buildPerlPackage { pname = "Path-Iterator-Rule"; version = "1.014"; @@ -19064,6 +19183,36 @@ let }; }; + ShellConfigGenerate = buildPerlPackage { + pname = "Shell-Config-Generate"; + version = "0.34"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Config-Generate-0.34.tar.gz"; + sha256 = "84f451f22215dd68e9c18aa3f7ddb03a82007d166cfada003d0f166f571e0562"; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ ShellGuess ]; + meta = { + homepage = https://metacpan.org/pod/Shell::Config::Generate; + description = "Portably generate config for any shell"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ShellGuess = buildPerlPackage { + pname = "Shell-Guess"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Guess-0.09.tar.gz"; + sha256 = "4069fa2637e443118ed956d710231d166823d23b2a64eb87b8a46872e865a12b"; + }; + meta = { + homepage = https://metacpan.org/pod/Shell::Guess; + description = "Make an educated guess about the shell in use"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + StringToIdentifierEN = buildPerlPackage { pname = "String-ToIdentifier-EN"; version = "0.12"; @@ -22215,6 +22364,21 @@ let propagatedBuildInputs = [ URI ]; }; + TextWordDiff = buildPerlPackage { + pname = "Text-WordDiff"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TI/TIMK/Text-WordDiff-0.09.tar.gz"; + sha256 = "fee699ca763adca2f4e18f4a8a836fd2102bc2820af708f8eb43356d5ae0d50e"; + }; + propagatedBuildInputs = [ AlgorithmDiff HTMLParser ]; + meta = { + homepage = https://metacpan.org/release/Text-WordDiff; + description = "Track changes between documents"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextWrapI18N = buildPerlPackage { pname = "Text-WrapI18N"; version = "0.06"; @@ -23851,6 +24015,22 @@ let }; }; + WebMachine = buildPerlPackage { + pname = "Web-Machine"; + version = "0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Web-Machine-0.17.tar.gz"; + sha256 = "f139d2b3114c549e91847daaab8b75cb699e57daf5bbf0dbd13293f33fe5e22a"; + }; + buildInputs = [ NetHTTP TestFailWarnings TestFatal ]; + propagatedBuildInputs = [ HTTPHeadersActionPack HTTPMessage HashMultiValue IOHandleUtil ModuleRuntime Plack SubExporter TryTiny ]; + meta = { + homepage = http://metacpan.org/release/Web-Machine; + description = "A Perl port of Webmachine"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + WebServiceLinode = buildPerlModule { pname = "WebService-Linode"; version = "0.29"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37ae756d9da76..620b2238ae61a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -311,10 +311,14 @@ in { aionotion = callPackage ../development/python-modules/aionotion { }; + aiopg = callPackage ../development/python-modules/aiopg { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aiopulse = callPackage ../development/python-modules/aiopulse { }; + aiopvpc = callPackage ../development/python-modules/aiopvpc { }; + aiopylgtv = callPackage ../development/python-modules/aiopylgtv { }; aiorecollect = callPackage ../development/python-modules/aiorecollect { }; @@ -383,6 +387,8 @@ in { amqplib = callPackage ../development/python-modules/amqplib { }; + amqtt = callPackage ../development/python-modules/amqtt { }; + android-backup = callPackage ../development/python-modules/android-backup { }; androidtv = callPackage ../development/python-modules/androidtv { }; @@ -555,6 +561,8 @@ in { asyncssh = callPackage ../development/python-modules/asyncssh { }; + asyncstdlib = callPackage ../development/python-modules/asyncstdlib { }; + async_stagger = callPackage ../development/python-modules/async_stagger { }; asynctest = callPackage ../development/python-modules/asynctest { }; @@ -927,6 +935,8 @@ in { backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { }; + bacpypes = callPackage ../development/python-modules/bacpypes { }; banal = callPackage ../development/python-modules/banal { }; @@ -1235,6 +1245,8 @@ in { cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; + castepxbin = callPackage ../development/python-modules/castepxbin { }; + casttube = callPackage ../development/python-modules/casttube { }; catalogue = callPackage ../development/python-modules/catalogue { }; @@ -1619,6 +1631,8 @@ in { cvxpy = callPackage ../development/python-modules/cvxpy { }; + cwcwidth = callPackage ../development/python-modules/cwcwidth { }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze { }; cx_oracle = callPackage ../development/python-modules/cx_oracle { }; @@ -1731,8 +1745,6 @@ in { debugpy = callPackage ../development/python-modules/debugpy { }; - debut = callPackage ../development/python-modules/debut { }; - decorator = callPackage ../development/python-modules/decorator { }; decopatch = callPackage ../development/python-modules/decopatch { }; @@ -2303,6 +2315,11 @@ in { fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { + withPython = true; + inherit python; + }); + fastpair = callPackage ../development/python-modules/fastpair { }; fastparquet = callPackage ../development/python-modules/fastparquet { }; @@ -2333,6 +2350,7 @@ in { fenics = callPackage ../development/libraries/science/math/fenics { pytest = self.pytest_4; + hdf5 = pkgs.hdf5_1_10; }; ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; @@ -2985,6 +3003,8 @@ in { hachoir = callPackage ../development/python-modules/hachoir { }; + hdate = callPackage ../development/python-modules/hdate { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; halo = callPackage ../development/python-modules/halo { }; @@ -3131,6 +3151,8 @@ in { humanize = callPackage ../development/python-modules/humanize { }; + humblewx = callPackage ../development/python-modules/humblewx { }; + hupper = callPackage ../development/python-modules/hupper { }; hvac = callPackage ../development/python-modules/hvac { }; @@ -3168,6 +3190,10 @@ in { hyppo = callPackage ../development/python-modules/hyppo { }; + i2c-tools = callPackage ../development/python-modules/i2c-tools { + inherit (pkgs) i2c-tools; + }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; i3-py = callPackage ../development/python-modules/i3-py { }; @@ -3268,8 +3294,6 @@ in { influxgraph = callPackage ../development/python-modules/influxgraph { }; - infoqscraper = callPackage ../development/python-modules/infoqscraper { }; - inform = callPackage ../development/python-modules/inform { }; iniconfig = callPackage ../development/python-modules/iniconfig { }; @@ -3877,6 +3901,8 @@ in { line_profiler = callPackage ../development/python-modules/line_profiler { }; + linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; + linode-api = callPackage ../development/python-modules/linode-api { }; linode = callPackage ../development/python-modules/linode { }; @@ -4097,6 +4123,8 @@ in { md2gemini = callPackage ../development/python-modules/md2gemini { }; + mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; @@ -4816,6 +4844,8 @@ in { pathvalidate = callPackage ../development/python-modules/pathvalidate { }; + pathy = callPackage ../development/python-modules/pathy/default.nix { }; + patiencediff = callPackage ../development/python-modules/patiencediff { }; patool = callPackage ../development/python-modules/patool { }; @@ -5151,7 +5181,9 @@ in { prison = callPackage ../development/python-modules/prison { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + privacyidea = callPackage ../development/python-modules/privacyidea { }; + + pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { }; proboscis = callPackage ../development/python-modules/proboscis { }; @@ -5623,6 +5655,8 @@ in { pyi2cflash = callPackage ../development/python-modules/pyi2cflash { }; + pyialarm = callPackage ../development/python-modules/pyialarm { }; + pyicloud = callPackage ../development/python-modules/pyicloud { }; PyICU = callPackage ../development/python-modules/pyicu { }; @@ -5855,7 +5889,9 @@ in { phonemizer = callPackage ../development/python-modules/phonemizer { }; - pyopencl = callPackage ../development/python-modules/pyopencl { }; + pyopencl = callPackage ../development/python-modules/pyopencl { + mesa_drivers = pkgs.mesa.drivers; + }; pyopengl = callPackage ../development/python-modules/pyopengl { }; @@ -6188,6 +6224,8 @@ in { py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; + pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { }; + pysvn = callPackage ../development/python-modules/pysvn { inherit (pkgs) bash subversion apr aprutil expat neon openssl; }; @@ -6376,6 +6414,8 @@ in { pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; + pytest-regressions = callPackage ../development/python-modules/pytest-regressions { }; + pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; @@ -6636,6 +6676,8 @@ in { python-socketio_4 = callPackage ../development/python-modules/python-socketio/4.nix { }; + python-socks = callPackage ../development/python-modules/python-socks { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -7158,6 +7200,8 @@ in { rsa = callPackage ../development/python-modules/rsa { }; + rst2ansi = callPackage ../development/python-modules/rst2ansi { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; Rtree = callPackage ../development/python-modules/Rtree { @@ -7600,6 +7644,8 @@ in { spacy = callPackage ../development/python-modules/spacy { }; + spacy-legacy = callPackage ../development/python-modules/spacy/legacy.nix { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; spake2 = callPackage ../development/python-modules/spake2 { }; @@ -7894,6 +7940,8 @@ in { tailer = callPackage ../development/python-modules/tailer { }; + tappy = callPackage ../development/python-modules/tappy { }; + tasklib = callPackage ../development/python-modules/tasklib { }; taskw = callPackage ../development/python-modules/taskw { }; @@ -8287,6 +8335,8 @@ in { uarray = callPackage ../development/python-modules/uarray { }; + uc-micro-py = callPackage ../development/python-modules/uc-micro-py { }; + ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 81bdcdb93dbaa..9eae7555ea45f 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -383,7 +383,9 @@ with self; with super; { prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; - privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + + ldaptor = callPackage ../development/python-modules/ldaptor/19.nix { }; progressbar231 = callPackage ../development/python-modules/progressbar231 { }; @@ -433,6 +435,8 @@ with self; with super; { pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { }; + pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { }; + pykickstart = callPackage ../development/python-modules/pykickstart { }; pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix new file mode 100644 index 0000000000000..a4ce43859ce1f --- /dev/null +++ b/pkgs/top-level/release-haskell.nix @@ -0,0 +1,271 @@ +/* + To debug this expression you can use `hydra-eval-jobs` from + `pkgs.hydra-unstable` which prints the jobset description + to `stdout`: + + $ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix +*/ +{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }: + +let + + releaseLib = import ./release-lib.nix { + inherit supportedSystems; + }; + + inherit (releaseLib) + pkgs + packagePlatforms + mapTestOn + aggregate + ; + + inherit (pkgs) lib; + + # helper function which traverses a (nested) set + # of derivations produced by mapTestOn and flattens + # it to a list of derivations suitable to be passed + # to `releaseTools.aggregate` as constituents. + accumulateDerivations = jobList: + lib.concatMap ( + attrs: + if lib.isDerivation attrs + then [ attrs ] + else if lib.isAttrs attrs + then accumulateDerivations (lib.attrValues attrs) + else [] + ) jobList; + + # names of all subsets of `pkgs.haskell.packages` + compilerNames = lib.mapAttrs (name: _: name) pkgs.haskell.packages; + + # list of all compilers to test specific packages on + all = with compilerNames; [ + ghc884 + ghc8104 + ghc901 + ]; + + # packagePlatforms applied to `haskell.packages.*` + compilerPlatforms = lib.mapAttrs + (_: v: packagePlatforms v) + pkgs.haskell.packages; + + # This function lets you specify specific packages + # which are to be tested on a list of specific GHC + # versions and returns a job set for all specified + # combinations. See `jobs` below for an example. + versionedCompilerJobs = config: mapTestOn { + haskell.packages = + (lib.mapAttrs ( + ghc: jobs: + lib.filterAttrs ( + jobName: platforms: + lib.elem ghc (config."${jobName}" or []) + ) jobs + ) compilerPlatforms); + }; + + # hydra jobs for `pkgs` of which we import a subset of + pkgsPlatforms = packagePlatforms pkgs; + + # names of packages in an attribute set that are maintained + maintainedPkgNames = set: builtins.attrNames + (lib.filterAttrs ( + _: v: builtins.length (v.meta.maintainers or []) > 0 + ) set); + + recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {}; + + jobs = recursiveUpdateMany [ + (mapTestOn { + haskellPackages = packagePlatforms pkgs.haskellPackages; + haskell.compiler = packagePlatforms pkgs.haskell.compiler; + + tests = let + testPlatforms = packagePlatforms pkgs.tests; + in { + haskell = testPlatforms.haskell; + writers = testPlatforms.writers; + }; + + # top-level packages that depend on haskellPackages + inherit (pkgsPlatforms) + agda + arion + bench + bustle + blucontrol + cabal-install + cabal2nix + cachix + carp + cedille + client-ip-echo + darcs + dconf2nix + dhall + dhall-bash + dhall-docs + dhall-lsp-server + dhall-json + dhall-nix + dhall-text + diagrams-builder + elm2nix + fffuu + futhark + ghcid + git-annex + git-brunch + gitit + glirc + hadolint + haskell-ci + haskell-language-server + hasura-graphql-engine + hci + hercules-ci-agent + hinit + hedgewars + hledger + hledger-iadd + hledger-interest + hledger-ui + hledger-web + hlint + hpack + hyper-haskell + hyper-haskell-server-with-packages + icepeak + idris + ihaskell + jl + koka + krank + lambdabot + ldgallery + madlang + matterhorn + mueval + neuron-notes + niv + nix-delegate + nix-deploy + nix-diff + nix-linter + nix-output-monitor + nix-script + nix-tree + nixfmt + nota + ormolu + pandoc + pakcs + petrinizer + place-cursor-at + pinboard-notes-backup + pretty-simple + shake + shellcheck + sourceAndTags + spacecookie + spago + splot + stack + stack2nix + stutter + stylish-haskell + taffybar + tamarin-prover + taskell + termonad-with-packages + tldr-hs + tweet-hs + update-nix-fetchgit + uqm + uuagc + vaultenv + wstunnel + xmobar + xmonad-with-packages + yi + zsh-git-prompt + ; + + elmPackages.elm = pkgsPlatforms.elmPackages.elm; + }) + (versionedCompilerJobs { + # Packages which should be checked on more than the + # default GHC version. This list can be used to test + # the state of the package set with newer compilers + # and to confirm that critical packages for the + # package sets (like Cabal, jailbreak-cabal) are + # working as expected. + cabal-install = all; + Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ]; + funcmp = all; + haskell-language-server = all; + hoogle = all; + hsdns = all; + jailbreak-cabal = all; + language-nix = all; + nix-paths = all; + titlecase = all; + }) + { + mergeable = pkgs.releaseTools.aggregate { + name = "haskell-updates-mergeable"; + meta = { + description = '' + Critical haskell packages that should work at all times, + serves as minimum requirement for an update merge + ''; + maintainers = lib.teams.haskell.members; + }; + constituents = accumulateDerivations [ + # haskell specific tests + jobs.tests.haskell + jobs.tests.writers # writeHaskell{,Bin} + # important top-level packages + jobs.cabal-install + jobs.cabal2nix + jobs.cachix + jobs.darcs + jobs.haskell-language-server + jobs.hledger + jobs.hledger-ui + jobs.hpack + jobs.niv + jobs.pandoc + jobs.stack + jobs.stylish-haskell + # important haskell (library) packages + jobs.haskellPackages.cabal-plan + jobs.haskellPackages.distribution-nixpkgs + jobs.haskellPackages.hackage-db + jobs.haskellPackages.policeman + jobs.haskellPackages.xmonad + jobs.haskellPackages.xmonad-contrib + # haskell packages maintained by @peti + # imported from the old hydra jobset + jobs.haskellPackages.hopenssl + jobs.haskellPackages.hsemail + jobs.haskellPackages.hsyslog + ]; + }; + maintained = pkgs.releaseTools.aggregate { + name = "maintained-haskell-packages"; + meta = { + description = "Aggregate jobset of all haskell packages with a maintainer"; + maintainers = lib.teams.haskell.members; + }; + constituents = accumulateDerivations + (builtins.map + (name: jobs.haskellPackages."${name}") + (maintainedPkgNames pkgs.haskellPackages)); + }; + } + ]; + +in jobs |