diff options
Diffstat (limited to 'pkgs')
974 files changed, 17922 insertions, 13950 deletions
diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index 9e18904ff6596..815b956da8e12 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config , glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook -, libX11, libXtst, libXfixes, libXcursor +, xorg }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 gsettings-desktop-schemas - libX11 libXtst libXfixes libXcursor + xorg.libX11 xorg.libXtst xorg.libXfixes xorg.libXcursor ]; passthru = { diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index e44b68f966ddf..44a6025761362 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h/hXHQfLiDkVKYZFsjyq2+w1Pnn3lR6H+r+fXYkP5ZY="; + sha256 = "sha256-rMaJzePtT7K0X9o9/yT1hfKIo07W2CLEZKqHwfCLQBE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index eafbfec966482..08ef2d0830887 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 +{ lib, stdenv, fetchFromGitHub, makeWrapper, pkg-config, alsa-lib, dbus, libjack2 , python3Packages , meson, ninja }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index 90c92d8f421d5..d4203282b6430 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -1,20 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, lv2 }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, lv2 }: stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "5.0"; + version = "11.0"; src = fetchFromGitHub { owner = "hannesbraun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sLkcEEYez0Z3pkhMCC7raiwe/m9Tk/lFmOuybZvFqSk="; + sha256 = "sha256-IMVcspdWotNbdIZ2IpsNhI0k3+ZdXHEHVxrgOMoROEQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ lv2 ]; - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/lv2" ]; - meta = with lib; { description = "Airwindows plugins (ported to LV2)"; homepage = "https://github.com/hannesbraun/airwindows-lv2"; diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index 7b209994103ec..acd8bf1f74f0b 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchgit -, automake , alsa-lib , ladspaH , libjack2 diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 4752ca174f162..dd67368e70830 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.3.8"; + version = "4.4"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-mJIzlY1m/r56e7iw5Hm+u2EbpHn5JqOMaRjpbCe8HHw="; + sha256 = "sha256-5xZTJc3NMhSnmrhls7EC+F5gPoHNmGih9Zwi5Hdg5V8="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix index 3b12aeb886841..4662002c95e89 100644 --- a/pkgs/applications/audio/blanket/default.nix +++ b/pkgs/applications/audio/blanket/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , meson , ninja diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 72f13bdb09bfb..ebf72588df0d1 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -1,6 +1,4 @@ { lib -, a2jmidid -, coreutils , libjack2 , fetchpatch , fetchFromGitHub @@ -8,7 +6,6 @@ , pkg-config , pulseaudioFull , qtbase -, makeWrapper , mkDerivation , python3 }: diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 4e0b9a6aceba9..e1f6d25c2d7bd 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.09"; + version = "22.10"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - sha256 = "sha256-dwxKhX926oGlxlplUzhTiX9cvx58FyO2oIShiQ1SXCs="; + sha256 = "sha256-qr6akeSN0y6cDVZ8Y6SNuJ8OnAuwrlJL1pqhPPJ+/EQ="; }; prePatch = '' diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 291c3875cea8d..82259d563ce90 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KcwEuiy58wjTr+RWPmpMaPgM0olzxiWp9MMYiKwmIcI="; + sha256 = "sha256-SN+9Q5v0bv+kQcYLBJmSCd9WIGSeQuOZze8LVwF20EA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index ecd6685e21712..53c1340ba2a20 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -1,18 +1,21 @@ -{ - lib, stdenv, fetchFromGitHub, docbook_xsl, - docbook_xml_dtd_45, python, pygments, - libxslt +{ lib +, stdenv +, fetchFromGitHub +, docbook_xsl +, docbook_xml_dtd_45 +, python3 +, libxslt }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "csound-manual"; - version = "unstable-2019-02-22"; + version = "6.17.0"; src = fetchFromGitHub { owner = "csound"; repo = "manual"; - rev = "3b0bdc83f9245261b4b85a57c3ed636d5d924a4f"; - sha256 = "074byjhaxraapyg54dxgg7hi1d4978aa9c1rmyi50p970nsxnacn"; + rev = version; + sha256 = "sha256-8X9Egn/MIwlNDEKUmEEz4Dnw6rGa37jRjYsVEt8ziW8="; }; prePatch = '' @@ -21,9 +24,7 @@ stdenv.mkDerivation { "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" ''; - nativeBuildInputs = [ libxslt.bin ]; - - buildInputs = [ docbook_xsl python pygments ]; + nativeBuildInputs = [ libxslt.bin docbook_xsl python3 python3.pkgs.pygments ]; buildPhase = '' make XSL_BASE_PATH=${docbook_xsl}/share/xml/docbook-xsl html-dist @@ -34,11 +35,11 @@ stdenv.mkDerivation { cp -r ./html $out/share/doc/csound ''; - meta = { + meta = with lib; { description = "The Csound Canonical Reference Manual"; homepage = "https://github.com/csound/manual"; - license = lib.licenses.fdl12Plus; - maintainers = [ lib.maintainers.hlolli ]; + license = licenses.fdl12Plus; + maintainers = with maintainers; [ hlolli ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 4ee5ab82e6e46..87f2920c200b5 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.11"; + version = "2.5.12"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-ldn6st3/iIABjEfAwodOnPrI97DygWbnYmvMktlOgrk="; + sha256 = "sha256-pq9zO4opCh9GEEtuQjrxKdNvOasDlcGGUsQD4je7Wyw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 5fd4eb2fb7d37..720bc1613b1db 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.41.1"; + version = "2.50.6"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-I5No9J7TLOf++B+lx1RfGY8LBoDAApq/EV8016wH9Hc="; + sha256 = "sha256-Q/vrm3WPsjkE3Xf/XEirsJPFXHNSW/Ve3Jbi/5nIrx8="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 954a2265312e4..d0cff6c44fb65 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsa-lib +{ lib, stdenv, fetchsvn, cmake, pkg-config, fftwFloat, alsa-lib , zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2 , includeDemo ? true }: diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index a0defad0da0c7..81a97d5a054e6 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, makeWrapper, pkg-config, python3, raul, serd, sord, sratom +, lv2, pkg-config, python3, raul, serd, sord, sratom , wafHook , suil }: diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 655fc6a9608ca..935e3a9503836 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, gnome, ladspa-sdk, libxcb, lv2, xcbutilwm +, boost, cairo, fftw, ladspa-sdk, libxcb, lv2, xcbutilwm , zita-convolver, zita-resampler }: diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index ce12b239e5acc..76c5de75ef544 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , mkDerivation -, fetchurl , fetchFromGitHub , chromaprint , cmake diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index ab7e33ea3e37a..2c4f8eaa5a99c 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-MPD"; - version = "3.2.0"; + version = "3.3.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-oZvKr61lyu7CmXP2A/xtYng1FIUPyveVJMqUuv6UnaM="; + sha256 = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; }; - propagatedBuildInputs = [mopidy]; + propagatedBuildInputs = [ mopidy ]; # no tests implemented doCheck = false; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 3037bfcf80816..2a56b6aa3ccf2 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-q4jOfcU2sNKISgO9vX2Rao2JljiYzWwB3WWMIvy8rII="; + sha256 = "sha256-xJzj387exWDvNias50fELvoAxgIoxDHVVRoAD4FJHUw="; }; - cargoSha256 = "sha256-f8yo60Gi2OdJMNxssMhladh82/ZeZ0ZWV7WmTcQ8jYo="; + cargoSha256 = "sha256-6QOD8IhrnjyaOEYVYt2DA3dI6Wcu1tCXnIp+Ruc+EEo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/applications/audio/new-session-manager/default.nix index 287b593d3eb80..5f23b9be651cc 100644 --- a/pkgs/applications/audio/new-session-manager/default.nix +++ b/pkgs/applications/audio/new-session-manager/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "new-session-manager"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxaudio"; repo = "new-session-manager"; rev = "v${version}"; - sha256 = "sha256-QVykRYXToeVXr7pYQy2afgEAlXrQnm68+xEUZhd+FkY="; + sha256 = "sha256-5G2GlBuKjC/r1SMm78JKia7bMA97YcvUR5l6zBucemw="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/applications/audio/oxefmsynth/default.nix b/pkgs/applications/audio/oxefmsynth/default.nix index 0e3e801d18caf..59ed1ce21f5f6 100644 --- a/pkgs/applications/audio/oxefmsynth/default.nix +++ b/pkgs/applications/audio/oxefmsynth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, unzip, fetchzip, libX11 }: +{ stdenv, lib, fetchFromGitHub, fetchzip, libX11 }: let diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index f9e54bbbd566e..d57c56a2adb71 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,4 @@ { fetchurl -, fetchpatch , lib , stdenv , pkg-config diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index aeb58911623b4..fc4c08a63aa3d 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , puredata diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 26c62f3e30bfb..308d5b65f3e5a 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, curl, gnugrep, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }: +{ lib, stdenv, curl, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }: let versionForFile = v: builtins.replaceStrings ["."] [""] v; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index ebf4429b24131..b7364a3f30412 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.51"; + version = "1.53"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-kTYtn68gPwEHZjJl/Vmr5lTtxyEB6r3EGQlVSlBpCZg="; + sha256 = "sha256-zW/uNJr2cip1JbFLKyB6TD75p1v9/dQu9kmtKXckc2c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index 487f86cf660f6..cb190cabf54d5 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchgit -, automake , autoreconfHook , lv2 , pkg-config diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 41e71cec2ff81..1f5bb36a51443 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-VRuNhS53okKsCHgKEsJgkpIe9yXFY6d2ghd0nsUQLLM="; + hash = "sha256-R+nmjIIDLoGOoCkDvJqejE1DaweHSAV8M2RvdwN5qAQ="; }; mixFodDeps = beamPackages.fetchMixDeps { diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/applications/audio/tagger/default.nix new file mode 100644 index 0000000000000..b7708299d30c0 --- /dev/null +++ b/pkgs/applications/audio/tagger/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, jsoncpp +, taglib +, curl +, curlpp +, glib +, gtk4 +, libadwaita +, wrapGAppsHook4 +, desktop-file-utils +, chromaprint # fpcalc +}: + +stdenv.mkDerivation rec { + pname = "tagger"; + version = "2022.10.3"; + + src = fetchFromGitHub { + owner = "nlogozzo"; + repo = "NickvisionTagger"; + rev = version; + hash = "sha256-dyp2XzTnDs08tTTbCnjWh061UXnH4Q0Gnt0jofgVm2U="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + jsoncpp + taglib + curl + curlpp + ]; + + # Don't install compiled binary + postPatch = '' + sed -i '/fpcalc/d' meson.build + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ chromaprint ]}" + ) + ''; + + meta = with lib; { + description = "An easy-to-use music tag (metadata) editor"; + homepage = "https://github.com/nlogozzo/NickvisionTagger"; + mainProgram = "org.nickvision.tagger"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix index c0b2c64822f4b..56ff4c0e1911d 100644 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ladspa-sdk, pkgs, ... }: +{ lib, stdenv, ladspa-sdk, pkgs, ... }: stdenv.mkDerivation rec { pname = "tap-plugins"; diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/applications/audio/vocproc/default.nix index 46957000507bd..bb402f425daa2 100644 --- a/pkgs/applications/audio/vocproc/default.nix +++ b/pkgs/applications/audio/vocproc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, pkg-config, lvtk, lv2, fftw, lv2-cpp-tools, gtkmm2 }: +{ lib, stdenv, fetchzip, pkg-config, lv2, fftw, lv2-cpp-tools, gtkmm2 }: stdenv.mkDerivation rec { pname = "vocproc"; diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 0609438b05349..9500c63a7af31 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -4,7 +4,6 @@ , SDL2 , alsa-lib , libaudec -, bash , bash-completion , breeze-icons , carla diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index e85cb9d28dabc..019aefcff3ff9 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.47.0"; + version = "2.48.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-KmNiyWF74hHLLu+uQDiFAMJJvyU/rgyrBhh6O6iMVIg="; + hash = "sha256-U5QOr76OMTABVb5kteB0FP3igwpXqh9q5XL7aY92UqI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/masari/default.nix b/pkgs/applications/blockchains/masari/default.nix index 175cd7a31bd82..7cc0b2a593ea1 100644 --- a/pkgs/applications/blockchains/masari/default.nix +++ b/pkgs/applications/blockchains/masari/default.nix @@ -1,25 +1,35 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost -, lmdb, miniupnpc, readline }: +, lmdb, miniupnpc, readline, git, zeromq, libsodium, rapidjson, cppzmq }: stdenv.mkDerivation rec { pname = "masari"; - version = "0.1.4.0"; + version = "unstable-2022-10-09"; src = fetchFromGitHub { owner = "masari-project"; repo = "masari"; - rev = "v${version}"; - sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3"; + rev = "ff71f52220858b84a4403dab9a14339bcad57826"; + sha256 = "sha256-GunNFqZNgpLfyAA9BiBC98axgTQuK76z3BUl5T0iJqs="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; + postPatch = '' + # remove vendored libraries + rm -r external/{miniupnpc,rapidjson} + ''; + + nativeBuildInputs = [ cmake pkg-config git ]; + + buildInputs = [ + boost miniupnpc openssl unbound + zeromq readline libsodium + rapidjson cppzmq + ]; meta = with lib; { description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; homepage = "https://www.getmasari.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthewcroughan ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index b8b10185e0c5b..caac322020eb5 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index a1b9f8348b6a1..7aeb483b5cbf5 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , rustPlatform , cmake -, llvmPackages , openssl , pkg-config , stdenv diff --git a/pkgs/applications/blockchains/oxen/default.nix b/pkgs/applications/blockchains/oxen/default.nix index 773071c0499ea..53c3a156d5e12 100644 --- a/pkgs/applications/blockchains/oxen/default.nix +++ b/pkgs/applications/blockchains/oxen/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch -, cmake, pkg-config +{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, pkg-config , boost, openssl, unbound , pcsclite, readline, libsodium, hidapi , rapidjson diff --git a/pkgs/applications/blockchains/teos/add-cargo-lock.patch b/pkgs/applications/blockchains/teos/add-cargo-lock.patch new file mode 100644 index 0000000000000..04a49ab12144d --- /dev/null +++ b/pkgs/applications/blockchains/teos/add-cargo-lock.patch @@ -0,0 +1,3905 @@ +--- a/Cargo.lock 2022-09-26 16:57:09.795022563 +0200 ++++ b/Cargo.lock 2022-09-29 10:21:19.312000000 +0200 +@@ -0,0 +1,3902 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "aead" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "ahash" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" ++dependencies = [ ++ "getrandom 0.2.7", ++ "once_cell", ++ "version_check", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.65" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" ++ ++[[package]] ++name = "ascii-canvas" ++version = "3.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" ++dependencies = [ ++ "term", ++] ++ ++[[package]] ++name = "assert-json-diff" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" ++dependencies = [ ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "async-channel" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" ++dependencies = [ ++ "concurrent-queue", ++ "event-listener", ++ "futures-core", ++] ++ ++[[package]] ++name = "async-executor" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" ++dependencies = [ ++ "async-task", ++ "concurrent-queue", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++ "slab", ++] ++ ++[[package]] ++name = "async-global-executor" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0da5b41ee986eed3f524c380e6d64965aea573882a8907682ad100f7859305ca" ++dependencies = [ ++ "async-channel", ++ "async-executor", ++ "async-io", ++ "async-lock", ++ "blocking", ++ "futures-lite", ++ "once_cell", ++] ++ ++[[package]] ++name = "async-io" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" ++dependencies = [ ++ "autocfg", ++ "concurrent-queue", ++ "futures-lite", ++ "libc", ++ "log", ++ "once_cell", ++ "parking", ++ "polling", ++ "slab", ++ "socket2 0.4.7", ++ "waker-fn", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "async-lock" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" ++dependencies = [ ++ "event-listener", ++] ++ ++[[package]] ++name = "async-object-pool" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aeb901c30ebc2fc4ab46395bbfbdba9542c16559d853645d75190c3056caf3bc" ++dependencies = [ ++ "async-std", ++] ++ ++[[package]] ++name = "async-process" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" ++dependencies = [ ++ "async-io", ++ "autocfg", ++ "blocking", ++ "cfg-if 1.0.0", ++ "event-listener", ++ "futures-lite", ++ "libc", ++ "once_cell", ++ "signal-hook", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "async-std" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" ++dependencies = [ ++ "async-channel", ++ "async-global-executor", ++ "async-io", ++ "async-lock", ++ "async-process", ++ "crossbeam-utils", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-lite", ++ "gloo-timers", ++ "kv-log-macro", ++ "log", ++ "memchr", ++ "once_cell", ++ "pin-project-lite 0.2.9", ++ "pin-utils", ++ "slab", ++ "wasm-bindgen-futures", ++] ++ ++[[package]] ++name = "async-stream" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" ++dependencies = [ ++ "async-stream-impl", ++ "futures-core", ++] ++ ++[[package]] ++name = "async-stream-impl" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "async-task" ++version = "4.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" ++ ++[[package]] ++name = "async-trait" ++version = "0.1.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "atomic-waker" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++ ++[[package]] ++name = "backoff" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" ++dependencies = [ ++ "futures-core", ++ "getrandom 0.2.7", ++ "instant", ++ "pin-project-lite 0.2.9", ++ "rand 0.8.5", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "base32" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "base64-compat" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a8d4d2746f89841e49230dd26917df1876050f95abafafbe34f47cb534b88d7" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "basic-cookies" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38" ++dependencies = [ ++ "lalrpop", ++ "lalrpop-util", ++ "regex", ++] ++ ++[[package]] ++name = "bech32" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" ++ ++[[package]] ++name = "bit-set" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" ++dependencies = [ ++ "bit-vec", ++] ++ ++[[package]] ++name = "bit-vec" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" ++ ++[[package]] ++name = "bitcoin" ++version = "0.28.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05bba324e6baf655b882df672453dbbc527bc938cadd27750ae510aaccc3a66a" ++dependencies = [ ++ "base64-compat", ++ "bech32", ++ "bitcoin_hashes", ++ "secp256k1", ++ "serde", ++] ++ ++[[package]] ++name = "bitcoin_hashes" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "006cc91e1a1d99819bc5b8214be3555c1f0611b169f527a1fdc54ed1f2b745b0" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "bitcoincore-rpc" ++version = "0.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd0e67dbf7a9971e7f4276f6089e9e814ce0f624a03216b7d92d00351ae7fb3e" ++dependencies = [ ++ "bitcoincore-rpc-json", ++ "jsonrpc", ++ "log", ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "bitcoincore-rpc-json" ++version = "0.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e2ae16202721ba8c3409045681fac790a5ddc791f05731a2df22c0c6bffc0f1" ++dependencies = [ ++ "bitcoin", ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[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-buffer" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "block-padding" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" ++ ++[[package]] ++name = "blocking" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" ++dependencies = [ ++ "async-channel", ++ "async-task", ++ "atomic-waker", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++] ++ ++[[package]] ++name = "bstr" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "buf_redux" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" ++dependencies = [ ++ "memchr", ++ "safemem", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++ ++[[package]] ++name = "bytes" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" ++ ++[[package]] ++name = "bytes" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" ++ ++[[package]] ++name = "cache-padded" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" ++ ++[[package]] ++name = "castaway" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" ++ ++[[package]] ++name = "cc" ++version = "1.0.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chacha20" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f08493fa7707effc63254c66c6ea908675912493cd67952eda23c09fae2610b1" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cipher", ++ "cpufeatures", ++ "zeroize", ++] ++ ++[[package]] ++name = "chacha20poly1305" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6547abe025f4027edacd9edaa357aded014eecec42a5070d9b885c3c334aba2" ++dependencies = [ ++ "aead", ++ "chacha20", ++ "cipher", ++ "poly1305", ++ "zeroize", ++] ++ ++[[package]] ++name = "chrono" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" ++dependencies = [ ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "chunked_transfer" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" ++ ++[[package]] ++name = "cipher" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "clap" ++version = "2.34.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "cln-plugin" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2043841c090a404cb81b145c8ad3c66bae122ba722387fc322b93c157d596433" ++dependencies = [ ++ "anyhow", ++ "bytes 1.2.1", ++ "cln-rpc", ++ "futures", ++ "log", ++ "serde", ++ "serde_json", ++ "tokio 1.21.2", ++ "tokio-stream", ++ "tokio-util 0.6.10", ++] ++ ++[[package]] ++name = "cln-rpc" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18fb71ceca239c83a06fb494028b4a6b7b38ad4dd9c0410b7ea6013b90e15045" ++dependencies = [ ++ "anyhow", ++ "bytes 1.2.1", ++ "futures-util", ++ "hex", ++ "log", ++ "native-tls", ++ "serde", ++ "serde_json", ++ "tokio 1.21.2", ++ "tokio-util 0.6.10", ++] ++ ++[[package]] ++name = "colored" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" ++dependencies = [ ++ "atty", ++ "lazy_static", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "concurrent-queue" ++version = "1.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" ++dependencies = [ ++ "cache-padded", ++] ++ ++[[package]] ++name = "convert_case" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" ++ ++[[package]] ++name = "core-foundation" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" ++ ++[[package]] ++name = "cpufeatures" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "crunchy" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" ++ ++[[package]] ++name = "crypto-common" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" ++dependencies = [ ++ "generic-array", ++ "typenum", ++] ++ ++[[package]] ++name = "crypto-mac" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" ++dependencies = [ ++ "generic-array", ++ "subtle", ++] ++ ++[[package]] ++name = "ctor" ++version = "0.1.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "curl" ++version = "0.4.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" ++dependencies = [ ++ "curl-sys", ++ "libc", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "socket2 0.4.7", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "curl-sys" ++version = "0.4.56+curl-7.83.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f" ++dependencies = [ ++ "cc", ++ "libc", ++ "libnghttp2-sys", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "curve25519-dalek" ++version = "3.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" ++dependencies = [ ++ "byteorder", ++ "digest 0.9.0", ++ "rand_core 0.5.1", ++ "subtle", ++ "zeroize", ++] ++ ++[[package]] ++name = "data-encoding" ++version = "2.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" ++ ++[[package]] ++name = "der-oid-macro" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c73af209b6a5dc8ca7cbaba720732304792cddc933cfea3d74509c2b1ef2f436" ++dependencies = [ ++ "num-bigint", ++ "num-traits", ++ "syn", ++] ++ ++[[package]] ++name = "der-parser" ++version = "6.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4cddf120f700b411b2b02ebeb7f04dc0b7c8835909a6c2f52bf72ed0dd3433b2" ++dependencies = [ ++ "der-oid-macro", ++ "nom", ++ "num-bigint", ++ "num-traits", ++ "rusticata-macros", ++] ++ ++[[package]] ++name = "derive_more" ++version = "0.99.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" ++dependencies = [ ++ "convert_case", ++ "proc-macro2", ++ "quote", ++ "rustc_version", ++ "syn", ++] ++ ++[[package]] ++name = "diff" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" ++ ++[[package]] ++name = "digest" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "digest" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" ++dependencies = [ ++ "block-buffer 0.10.3", ++ "crypto-common", ++] ++ ++[[package]] ++name = "dirs-next" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "dirs-sys-next", ++] ++ ++[[package]] ++name = "dirs-sys-next" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "ed25519" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" ++dependencies = [ ++ "signature", ++] ++ ++[[package]] ++name = "ed25519-dalek" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" ++dependencies = [ ++ "curve25519-dalek", ++ "ed25519", ++ "rand 0.7.3", ++ "serde", ++ "sha2", ++ "zeroize", ++] ++ ++[[package]] ++name = "either" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" ++ ++[[package]] ++name = "ena" ++version = "0.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "encoding_rs" ++version = "0.8.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "event-listener" ++version = "2.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" ++ ++[[package]] ++name = "fallible-iterator" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" ++ ++[[package]] ++name = "fallible-streaming-iterator" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" ++ ++[[package]] ++name = "fastrand" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "fixedbitset" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "form_urlencoded" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" ++dependencies = [ ++ "percent-encoding", ++] ++ ++[[package]] ++name = "fuchsia-cprng" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "futures" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" ++ ++[[package]] ++name = "futures-executor" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" ++ ++[[package]] ++name = "futures-lite" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" ++dependencies = [ ++ "fastrand", ++ "futures-core", ++ "futures-io", ++ "memchr", ++ "parking", ++ "pin-project-lite 0.2.9", ++ "waker-fn", ++] ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-project-lite 0.2.9", ++ "pin-utils", ++ "slab", ++] ++ ++[[package]] ++name = "generic-array" ++version = "0.14.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" ++dependencies = [ ++ "typenum", ++ "version_check", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "globset" ++version = "0.4.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" ++dependencies = [ ++ "aho-corasick", ++ "bstr", ++ "fnv", ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "gloo-timers" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "h2" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" ++dependencies = [ ++ "bytes 0.5.6", ++ "fnv", ++ "futures-core", ++ "futures-sink", ++ "futures-util", ++ "http", ++ "indexmap", ++ "slab", ++ "tokio 0.2.25", ++ "tokio-util 0.3.1", ++ "tracing", ++ "tracing-futures", ++] ++ ++[[package]] ++name = "h2" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" ++dependencies = [ ++ "bytes 1.2.1", ++ "fnv", ++ "futures-core", ++ "futures-sink", ++ "futures-util", ++ "http", ++ "indexmap", ++ "slab", ++ "tokio 1.21.2", ++ "tokio-util 0.7.4", ++ "tracing", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" ++dependencies = [ ++ "ahash", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++ ++[[package]] ++name = "hashlink" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" ++dependencies = [ ++ "hashbrown 0.11.2", ++] ++ ++[[package]] ++name = "headers" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" ++dependencies = [ ++ "base64", ++ "bitflags", ++ "bytes 1.2.1", ++ "headers-core", ++ "http", ++ "httpdate 1.0.2", ++ "mime", ++ "sha1", ++] ++ ++[[package]] ++name = "headers-core" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" ++dependencies = [ ++ "http", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "hmac" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" ++dependencies = [ ++ "crypto-mac", ++ "digest 0.9.0", ++] ++ ++[[package]] ++name = "home" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "http" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" ++dependencies = [ ++ "bytes 1.2.1", ++ "fnv", ++ "itoa 1.0.3", ++] ++ ++[[package]] ++name = "http-body" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" ++dependencies = [ ++ "bytes 0.5.6", ++ "http", ++] ++ ++[[package]] ++name = "http-body" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" ++dependencies = [ ++ "bytes 1.2.1", ++ "http", ++ "pin-project-lite 0.2.9", ++] ++ ++[[package]] ++name = "httparse" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" ++ ++[[package]] ++name = "httpdate" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" ++ ++[[package]] ++name = "httpdate" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" ++ ++[[package]] ++name = "httpmock" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c159c4fc205e6c1a9b325cb7ec135d13b5f47188ce175dabb76ec847f331d9bd" ++dependencies = [ ++ "assert-json-diff", ++ "async-object-pool", ++ "async-trait", ++ "base64", ++ "basic-cookies", ++ "crossbeam-utils", ++ "form_urlencoded", ++ "futures-util", ++ "hyper 0.14.20", ++ "isahc", ++ "lazy_static", ++ "levenshtein", ++ "log", ++ "regex", ++ "serde", ++ "serde_json", ++ "serde_regex", ++ "similar", ++ "tokio 1.21.2", ++ "url", ++] ++ ++[[package]] ++name = "hyper" ++version = "0.13.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" ++dependencies = [ ++ "bytes 0.5.6", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "h2 0.2.7", ++ "http", ++ "http-body 0.3.1", ++ "httparse", ++ "httpdate 0.3.2", ++ "itoa 0.4.8", ++ "pin-project", ++ "socket2 0.3.19", ++ "tokio 0.2.25", ++ "tower-service", ++ "tracing", ++ "want", ++] ++ ++[[package]] ++name = "hyper" ++version = "0.14.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" ++dependencies = [ ++ "bytes 1.2.1", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "h2 0.3.14", ++ "http", ++ "http-body 0.4.5", ++ "httparse", ++ "httpdate 1.0.2", ++ "itoa 1.0.3", ++ "pin-project-lite 0.2.9", ++ "socket2 0.4.7", ++ "tokio 1.21.2", ++ "tower-service", ++ "tracing", ++ "want", ++] ++ ++[[package]] ++name = "hyper-timeout" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" ++dependencies = [ ++ "hyper 0.14.20", ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++ "tokio-io-timeout", ++] ++ ++[[package]] ++name = "hyper-tls" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" ++dependencies = [ ++ "bytes 1.2.1", ++ "hyper 0.14.20", ++ "native-tls", ++ "tokio 1.21.2", ++ "tokio-native-tls", ++] ++ ++[[package]] ++name = "idna" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" ++dependencies = [ ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" ++dependencies = [ ++ "autocfg", ++ "hashbrown 0.12.3", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "ipnet" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" ++ ++[[package]] ++name = "isahc" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" ++dependencies = [ ++ "async-channel", ++ "castaway", ++ "crossbeam-utils", ++ "curl", ++ "curl-sys", ++ "encoding_rs", ++ "event-listener", ++ "futures-lite", ++ "http", ++ "log", ++ "mime", ++ "once_cell", ++ "polling", ++ "slab", ++ "sluice", ++ "tracing", ++ "tracing-futures", ++ "url", ++ "waker-fn", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "itoa" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "jsonrpc" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f8423b78fc94d12ef1a4a9d13c348c9a78766dda0cc18817adf0faf77e670c8" ++dependencies = [ ++ "base64-compat", ++ "serde", ++ "serde_derive", ++ "serde_json", ++] ++ ++[[package]] ++name = "jsonrpc-core" ++version = "17.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e" ++dependencies = [ ++ "futures", ++ "futures-executor", ++ "futures-util", ++ "log", ++ "serde", ++ "serde_derive", ++ "serde_json", ++] ++ ++[[package]] ++name = "jsonrpc-http-server" ++version = "17.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "522a047cac0958097ee71d047dd71cb84979fd2fa21c7a68fbe12736bef870a2" ++dependencies = [ ++ "futures", ++ "hyper 0.13.10", ++ "jsonrpc-core", ++ "jsonrpc-server-utils", ++ "log", ++ "net2", ++ "parking_lot 0.11.2", ++ "unicase", ++] ++ ++[[package]] ++name = "jsonrpc-server-utils" ++version = "17.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bce68fa279a2822b3619369cd024f8a4f8e5ce485468834f8679a3c7919aae2d" ++dependencies = [ ++ "bytes 0.5.6", ++ "futures", ++ "globset", ++ "jsonrpc-core", ++ "lazy_static", ++ "log", ++ "tokio 0.2.25", ++ "tokio-util 0.3.1", ++ "unicase", ++] ++ ++[[package]] ++name = "keccak" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "kv-log-macro" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "lalrpop" ++version = "0.19.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823" ++dependencies = [ ++ "ascii-canvas", ++ "atty", ++ "bit-set", ++ "diff", ++ "ena", ++ "itertools", ++ "lalrpop-util", ++ "petgraph", ++ "pico-args", ++ "regex", ++ "regex-syntax", ++ "string_cache", ++ "term", ++ "tiny-keccak", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "lalrpop-util" ++version = "0.19.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4" ++dependencies = [ ++ "regex", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "levenshtein" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" ++ ++[[package]] ++name = "libc" ++version = "0.2.133" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" ++ ++[[package]] ++name = "libnghttp2-sys" ++version = "0.1.7+1.45.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "libsqlite3-sys" ++version = "0.23.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cafc7c74096c336d9d27145f7ebd4f4b6f95ba16aa5a282387267e6925cb58" ++dependencies = [ ++ "cc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "lightning" ++version = "0.0.108" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d885bf509066af86ae85354c8959028ad6192c22a2657ef8271e94029d30f9d0" ++dependencies = [ ++ "bitcoin", ++] ++ ++[[package]] ++name = "lightning-block-sync" ++version = "0.0.108" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8f1ed50f41785af19f5cd1225b668e87ef0d59bb84e6f8ef2542933e6082a2c" ++dependencies = [ ++ "bitcoin", ++ "chunked_transfer", ++ "futures", ++ "lightning", ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "lightning-net-tokio" ++version = "0.0.108" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f0170619152c4d6b947d5ed0de427b85691482a293e0cae52d4336a2220a776" ++dependencies = [ ++ "bitcoin", ++ "lightning", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "lock_api" ++version = "0.4.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" ++dependencies = [ ++ "autocfg", ++ "scopeguard", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "value-bag", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++ ++[[package]] ++name = "mime" ++version = "0.3.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" ++ ++[[package]] ++name = "mime_guess" ++version = "2.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" ++dependencies = [ ++ "mime", ++ "unicase", ++] ++ ++[[package]] ++name = "minimal-lexical" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" ++ ++[[package]] ++name = "mio" ++version = "0.6.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", ++] ++ ++[[package]] ++name = "mio" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" ++dependencies = [ ++ "libc", ++ "log", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++ "windows-sys", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" ++dependencies = [ ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", ++] ++ ++[[package]] ++name = "multimap" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" ++ ++[[package]] ++name = "multipart" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" ++dependencies = [ ++ "buf_redux", ++ "httparse", ++ "log", ++ "mime", ++ "mime_guess", ++ "quick-error", ++ "rand 0.8.5", ++ "safemem", ++ "tempfile", ++ "twoway", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" ++dependencies = [ ++ "lazy_static", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "new_debug_unreachable" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" ++ ++[[package]] ++name = "nom" ++version = "7.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" ++dependencies = [ ++ "memchr", ++ "minimal-lexical", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "num_threads" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "oid-registry" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fe554cb2393bc784fd678c82c84cc0599c31ceadc7f03a594911f822cb8d1815" ++dependencies = [ ++ "der-parser", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" ++ ++[[package]] ++name = "openssl" ++version = "0.10.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" ++dependencies = [ ++ "bitflags", ++ "cfg-if 1.0.0", ++ "foreign-types", ++ "libc", ++ "once_cell", ++ "openssl-macros", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" ++ ++[[package]] ++name = "openssl-src" ++version = "111.22.0+1.1.1q" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.76" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "openssl-src", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "parking" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" ++ ++[[package]] ++name = "parking_lot" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" ++dependencies = [ ++ "instant", ++ "lock_api", ++ "parking_lot_core 0.8.5", ++] ++ ++[[package]] ++name = "parking_lot" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" ++dependencies = [ ++ "lock_api", ++ "parking_lot_core 0.9.3", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "instant", ++ "libc", ++ "redox_syscall", ++ "smallvec", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "parking_lot_core" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "redox_syscall", ++ "smallvec", ++ "windows-sys", ++] ++ ++[[package]] ++name = "pem" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" ++dependencies = [ ++ "base64", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" ++ ++[[package]] ++name = "petgraph" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" ++dependencies = [ ++ "fixedbitset", ++ "indexmap", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" ++dependencies = [ ++ "siphasher", ++] ++ ++[[package]] ++name = "pico-args" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" ++ ++[[package]] ++name = "pin-project" ++version = "1.0.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" ++dependencies = [ ++ "pin-project-internal", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.0.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" ++ ++[[package]] ++name = "pin-utils" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" ++ ++[[package]] ++name = "polling" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011" ++dependencies = [ ++ "autocfg", ++ "cfg-if 1.0.0", ++ "libc", ++ "log", ++ "wepoll-ffi", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "poly1305" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" ++dependencies = [ ++ "cpufeatures", ++ "opaque-debug", ++ "universal-hash", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" ++ ++[[package]] ++name = "precomputed-hash" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" ++ ++[[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.46" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "prost" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" ++dependencies = [ ++ "bytes 1.2.1", ++ "prost-derive 0.8.0", ++] ++ ++[[package]] ++name = "prost" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" ++dependencies = [ ++ "bytes 1.2.1", ++ "prost-derive 0.9.0", ++] ++ ++[[package]] ++name = "prost-build" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" ++dependencies = [ ++ "bytes 1.2.1", ++ "heck", ++ "itertools", ++ "lazy_static", ++ "log", ++ "multimap", ++ "petgraph", ++ "prost 0.9.0", ++ "prost-types", ++ "regex", ++ "tempfile", ++ "which", ++] ++ ++[[package]] ++name = "prost-derive" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" ++dependencies = [ ++ "anyhow", ++ "itertools", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "prost-derive" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" ++dependencies = [ ++ "anyhow", ++ "itertools", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "prost-types" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" ++dependencies = [ ++ "bytes 1.2.1", ++ "prost 0.9.0", ++] ++ ++[[package]] ++name = "quick-error" ++version = "1.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" ++ ++[[package]] ++name = "quote" ++version = "1.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" ++dependencies = [ ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.3.1", ++ "rdrand", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom 0.1.16", ++ "libc", ++ "rand_chacha 0.2.2", ++ "rand_core 0.5.1", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" ++dependencies = [ ++ "libc", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.4", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.6.4", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" ++dependencies = [ ++ "rand_core 0.4.2", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom 0.1.16", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" ++dependencies = [ ++ "getrandom 0.2.7", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rcgen" ++version = "0.8.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5911d1403f4143c9d56a702069d593e8d0f3fab880a85e103604d0893ea31ba7" ++dependencies = [ ++ "chrono", ++ "pem", ++ "ring", ++ "x509-parser", ++ "yasna", ++] ++ ++[[package]] ++name = "rdrand" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" ++dependencies = [ ++ "rand_core 0.3.1", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "redox_users" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" ++dependencies = [ ++ "getrandom 0.2.7", ++ "redox_syscall", ++ "thiserror", ++] ++ ++[[package]] ++name = "regex" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "reqwest" ++version = "0.11.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" ++dependencies = [ ++ "base64", ++ "bytes 1.2.1", ++ "encoding_rs", ++ "futures-core", ++ "futures-util", ++ "h2 0.3.14", ++ "http", ++ "http-body 0.4.5", ++ "hyper 0.14.20", ++ "hyper-tls", ++ "ipnet", ++ "js-sys", ++ "log", ++ "mime", ++ "native-tls", ++ "once_cell", ++ "percent-encoding", ++ "pin-project-lite 0.2.9", ++ "serde", ++ "serde_json", ++ "serde_urlencoded", ++ "tokio 1.21.2", ++ "tokio-native-tls", ++ "tokio-socks", ++ "tower-service", ++ "url", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++ "winreg", ++] ++ ++[[package]] ++name = "ring" ++version = "0.16.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" ++dependencies = [ ++ "cc", ++ "libc", ++ "once_cell", ++ "spin", ++ "untrusted", ++ "web-sys", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "rusqlite" ++version = "0.26.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ba4d3462c8b2e4d7f4fcfcf2b296dc6b65404fbbc7b63daa37fd485c149daf7" ++dependencies = [ ++ "bitflags", ++ "fallible-iterator", ++ "fallible-streaming-iterator", ++ "hashlink", ++ "libsqlite3-sys", ++ "memchr", ++ "smallvec", ++] ++ ++[[package]] ++name = "rustc_version" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "rusticata-macros" ++version = "4.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" ++dependencies = [ ++ "nom", ++] ++ ++[[package]] ++name = "rustls" ++version = "0.19.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" ++dependencies = [ ++ "base64", ++ "log", ++ "ring", ++ "sct", ++ "webpki", ++] ++ ++[[package]] ++name = "rustls-pemfile" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" ++dependencies = [ ++ "base64", ++] ++ ++[[package]] ++name = "rustversion" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" ++ ++[[package]] ++name = "ryu" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" ++ ++[[package]] ++name = "safemem" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" ++ ++[[package]] ++name = "schannel" ++version = "0.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" ++dependencies = [ ++ "lazy_static", ++ "windows-sys", ++] ++ ++[[package]] ++name = "scoped-tls" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "sct" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" ++dependencies = [ ++ "ring", ++ "untrusted", ++] ++ ++[[package]] ++name = "secp256k1" ++version = "0.22.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0" ++dependencies = [ ++ "secp256k1-sys", ++ "serde", ++] ++ ++[[package]] ++name = "secp256k1-sys" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "152e20a0fd0519390fc43ab404663af8a0b794273d2a91d60ad4a39f13ffe110" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "security-framework" ++version = "2.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" ++dependencies = [ ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "semver" ++version = "1.0.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" ++ ++[[package]] ++name = "serde" ++version = "1.0.145" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.145" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.85" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" ++dependencies = [ ++ "indexmap", ++ "itoa 1.0.3", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "serde_regex" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf" ++dependencies = [ ++ "regex", ++ "serde", ++] ++ ++[[package]] ++name = "serde_urlencoded" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" ++dependencies = [ ++ "form_urlencoded", ++ "itoa 1.0.3", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "sha-1" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cpufeatures", ++ "digest 0.10.5", ++] ++ ++[[package]] ++name = "sha1" ++version = "0.10.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cpufeatures", ++ "digest 0.10.5", ++] ++ ++[[package]] ++name = "sha2" ++version = "0.9.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" ++dependencies = [ ++ "block-buffer 0.9.0", ++ "cfg-if 1.0.0", ++ "cpufeatures", ++ "digest 0.9.0", ++ "opaque-debug", ++] ++ ++[[package]] ++name = "sha3" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" ++dependencies = [ ++ "block-buffer 0.9.0", ++ "digest 0.9.0", ++ "keccak", ++ "opaque-debug", ++] ++ ++[[package]] ++name = "signal-hook" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" ++dependencies = [ ++ "libc", ++ "signal-hook-registry", ++] ++ ++[[package]] ++name = "signal-hook-registry" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "signature" ++version = "1.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "deb766570a2825fa972bceff0d195727876a9cdf2460ab2e52d455dc2de47fd9" ++ ++[[package]] ++name = "similar" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803" ++ ++[[package]] ++name = "simple_logger" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48047e77b528151aaf841a10a9025f9459da80ba820e425ff7eb005708a76dc7" ++dependencies = [ ++ "atty", ++ "colored", ++ "log", ++ "time", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "siphasher" ++version = "0.3.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" ++ ++[[package]] ++name = "slab" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "sluice" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" ++dependencies = [ ++ "async-channel", ++ "futures-core", ++ "futures-io", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" ++ ++[[package]] ++name = "socket2" ++version = "0.3.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "socket2" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" ++dependencies = [ ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "spin" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" ++ ++[[package]] ++name = "string_cache" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" ++dependencies = [ ++ "new_debug_unreachable", ++ "once_cell", ++ "parking_lot 0.12.1", ++ "phf_shared", ++ "precomputed-hash", ++] ++ ++[[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.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" ++dependencies = [ ++ "clap", ++ "lazy_static", ++ "structopt-derive", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.4.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "subtle" ++version = "2.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" ++ ++[[package]] ++name = "syn" ++version = "1.0.101" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "tempdir" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" ++dependencies = [ ++ "rand 0.4.6", ++ "remove_dir_all", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "fastrand", ++ "libc", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "teos" ++version = "0.1.2" ++dependencies = [ ++ "bitcoin", ++ "bitcoincore-rpc", ++ "hex", ++ "home", ++ "jsonrpc-http-server", ++ "lightning", ++ "lightning-block-sync", ++ "lightning-net-tokio", ++ "log", ++ "prost 0.9.0", ++ "rand 0.8.5", ++ "rcgen", ++ "rusqlite", ++ "serde", ++ "serde_json", ++ "simple_logger", ++ "structopt", ++ "tempdir", ++ "teos-common", ++ "tokio 1.21.2", ++ "tokio-stream", ++ "toml", ++ "tonic 0.6.2", ++ "tonic-build", ++ "torut", ++ "triggered", ++ "warp", ++] ++ ++[[package]] ++name = "teos-common" ++version = "0.1.2" ++dependencies = [ ++ "bitcoin", ++ "chacha20poly1305", ++ "hex", ++ "lightning", ++ "prost 0.9.0", ++ "rand 0.8.5", ++ "rusqlite", ++ "serde", ++ "serde_json", ++ "tonic 0.6.2", ++ "tonic-build", ++] ++ ++[[package]] ++name = "term" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" ++dependencies = [ ++ "dirs-next", ++ "rustversion", ++ "winapi 0.3.9", ++] ++ ++[[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.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "time" ++version = "0.3.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" ++dependencies = [ ++ "itoa 1.0.3", ++ "libc", ++ "num_threads", ++ "time-macros", ++] ++ ++[[package]] ++name = "time-macros" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" ++ ++[[package]] ++name = "tiny-keccak" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" ++dependencies = [ ++ "crunchy", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] ++name = "tokio" ++version = "0.2.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" ++dependencies = [ ++ "bytes 0.5.6", ++ "fnv", ++ "futures-core", ++ "iovec", ++ "lazy_static", ++ "memchr", ++ "mio 0.6.23", ++ "num_cpus", ++ "pin-project-lite 0.1.12", ++ "slab", ++] ++ ++[[package]] ++name = "tokio" ++version = "1.21.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" ++dependencies = [ ++ "autocfg", ++ "bytes 1.2.1", ++ "libc", ++ "memchr", ++ "mio 0.8.4", ++ "num_cpus", ++ "pin-project-lite 0.2.9", ++ "signal-hook-registry", ++ "socket2 0.4.7", ++ "tokio-macros", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "tokio-io-timeout" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" ++dependencies = [ ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-macros" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tokio-native-tls" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" ++dependencies = [ ++ "native-tls", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-rustls" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" ++dependencies = [ ++ "rustls", ++ "tokio 1.21.2", ++ "webpki", ++] ++ ++[[package]] ++name = "tokio-socks" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" ++dependencies = [ ++ "either", ++ "futures-util", ++ "thiserror", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-stream" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af" ++dependencies = [ ++ "futures-core", ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-tungstenite" ++version = "0.17.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" ++dependencies = [ ++ "futures-util", ++ "log", ++ "tokio 1.21.2", ++ "tungstenite", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" ++dependencies = [ ++ "bytes 0.5.6", ++ "futures-core", ++ "futures-sink", ++ "log", ++ "pin-project-lite 0.1.12", ++ "tokio 0.2.25", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.6.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" ++dependencies = [ ++ "bytes 1.2.1", ++ "futures-core", ++ "futures-sink", ++ "log", ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" ++dependencies = [ ++ "bytes 1.2.1", ++ "futures-core", ++ "futures-sink", ++ "pin-project-lite 0.2.9", ++ "tokio 1.21.2", ++ "tracing", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "tonic" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c" ++dependencies = [ ++ "async-stream", ++ "async-trait", ++ "base64", ++ "bytes 1.2.1", ++ "futures-core", ++ "futures-util", ++ "h2 0.3.14", ++ "http", ++ "http-body 0.4.5", ++ "hyper 0.14.20", ++ "hyper-timeout", ++ "percent-encoding", ++ "pin-project", ++ "prost 0.8.0", ++ "prost-derive 0.8.0", ++ "tokio 1.21.2", ++ "tokio-rustls", ++ "tokio-stream", ++ "tokio-util 0.6.10", ++ "tower", ++ "tower-layer", ++ "tower-service", ++ "tracing", ++ "tracing-futures", ++] ++ ++[[package]] ++name = "tonic" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" ++dependencies = [ ++ "async-stream", ++ "async-trait", ++ "base64", ++ "bytes 1.2.1", ++ "futures-core", ++ "futures-util", ++ "h2 0.3.14", ++ "http", ++ "http-body 0.4.5", ++ "hyper 0.14.20", ++ "hyper-timeout", ++ "percent-encoding", ++ "pin-project", ++ "prost 0.9.0", ++ "prost-derive 0.9.0", ++ "tokio 1.21.2", ++ "tokio-rustls", ++ "tokio-stream", ++ "tokio-util 0.6.10", ++ "tower", ++ "tower-layer", ++ "tower-service", ++ "tracing", ++ "tracing-futures", ++] ++ ++[[package]] ++name = "tonic-build" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" ++dependencies = [ ++ "proc-macro2", ++ "prost-build", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "torut" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99febc413f26cf855b3a309c5872edff5c31e0ffe9c2fce5681868761df36f69" ++dependencies = [ ++ "base32", ++ "base64", ++ "derive_more", ++ "ed25519-dalek", ++ "hex", ++ "hmac", ++ "rand 0.7.3", ++ "serde", ++ "serde_derive", ++ "sha2", ++ "sha3", ++ "tokio 1.21.2", ++] ++ ++[[package]] ++name = "tower" ++version = "0.4.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" ++dependencies = [ ++ "futures-core", ++ "futures-util", ++ "indexmap", ++ "pin-project", ++ "pin-project-lite 0.2.9", ++ "rand 0.8.5", ++ "slab", ++ "tokio 1.21.2", ++ "tokio-util 0.7.4", ++ "tower-layer", ++ "tower-service", ++ "tracing", ++] ++ ++[[package]] ++name = "tower-layer" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" ++ ++[[package]] ++name = "tower-service" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" ++ ++[[package]] ++name = "tracing" ++version = "0.1.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "log", ++ "pin-project-lite 0.2.9", ++ "tracing-attributes", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-attributes" ++version = "0.1.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" ++dependencies = [ ++ "once_cell", ++] ++ ++[[package]] ++name = "tracing-futures" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" ++dependencies = [ ++ "pin-project", ++ "tracing", ++] ++ ++[[package]] ++name = "triggered" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ce148eae0d1a376c1b94ae651fc3261d9cb8294788b962b7382066376503a2d1" ++ ++[[package]] ++name = "try-lock" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" ++ ++[[package]] ++name = "tungstenite" ++version = "0.17.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" ++dependencies = [ ++ "base64", ++ "byteorder", ++ "bytes 1.2.1", ++ "http", ++ "httparse", ++ "log", ++ "rand 0.8.5", ++ "sha-1", ++ "thiserror", ++ "url", ++ "utf-8", ++] ++ ++[[package]] ++name = "twoway" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" ++ ++[[package]] ++name = "unicase" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" ++dependencies = [ ++ "version_check", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" ++dependencies = [ ++ "tinyvec", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" ++ ++[[package]] ++name = "universal-hash" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" ++dependencies = [ ++ "generic-array", ++ "subtle", ++] ++ ++[[package]] ++name = "untrusted" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" ++ ++[[package]] ++name = "url" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" ++dependencies = [ ++ "form_urlencoded", ++ "idna", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "utf-8" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" ++ ++[[package]] ++name = "value-bag" ++version = "1.0.0-alpha.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" ++dependencies = [ ++ "ctor", ++ "version_check", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" ++ ++[[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.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++ ++[[package]] ++name = "waker-fn" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" ++ ++[[package]] ++name = "want" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" ++dependencies = [ ++ "log", ++ "try-lock", ++] ++ ++[[package]] ++name = "warp" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" ++dependencies = [ ++ "bytes 1.2.1", ++ "futures-channel", ++ "futures-util", ++ "headers", ++ "http", ++ "hyper 0.14.20", ++ "log", ++ "mime", ++ "mime_guess", ++ "multipart", ++ "percent-encoding", ++ "pin-project", ++ "rustls-pemfile", ++ "scoped-tls", ++ "serde", ++ "serde_json", ++ "serde_urlencoded", ++ "tokio 1.21.2", ++ "tokio-stream", ++ "tokio-tungstenite", ++ "tokio-util 0.7.4", ++ "tower-service", ++ "tracing", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" ++dependencies = [ ++ "bumpalo", ++ "log", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-futures" ++version = "0.4.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" ++ ++[[package]] ++name = "watchtower-plugin" ++version = "0.1.2" ++dependencies = [ ++ "backoff", ++ "bitcoin", ++ "cln-plugin", ++ "hex", ++ "home", ++ "httpmock", ++ "log", ++ "reqwest", ++ "rusqlite", ++ "serde", ++ "serde_json", ++ "tempdir", ++ "teos-common", ++ "tokio 1.21.2", ++ "tonic 0.5.2", ++] ++ ++[[package]] ++name = "web-sys" ++version = "0.3.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "webpki" ++version = "0.21.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" ++dependencies = [ ++ "ring", ++ "untrusted", ++] ++ ++[[package]] ++name = "wepoll-ffi" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "which" ++version = "4.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" ++dependencies = [ ++ "either", ++ "libc", ++ "once_cell", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++ ++[[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-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++ ++[[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" ++ ++[[package]] ++name = "windows-sys" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" ++dependencies = [ ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.36.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" ++ ++[[package]] ++name = "winreg" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "x509-parser" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffc90836a84cb72e6934137b1504d0cae304ef5d83904beb0c8d773bbfe256ed" ++dependencies = [ ++ "base64", ++ "chrono", ++ "data-encoding", ++ "der-parser", ++ "lazy_static", ++ "nom", ++ "oid-registry", ++ "ring", ++ "rusticata-macros", ++ "thiserror", ++] ++ ++[[package]] ++name = "yasna" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e262a29d0e61ccf2b6190d7050d4b237535fc76ce4c1210d9caa316f71dffa75" ++dependencies = [ ++ "chrono", ++] ++ ++[[package]] ++name = "zeroize" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" ++dependencies = [ ++ "zeroize_derive", ++] ++ ++[[package]] ++name = "zeroize_derive" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix new file mode 100644 index 0000000000000..197246770d0dc --- /dev/null +++ b/pkgs/applications/blockchains/teos/default.nix @@ -0,0 +1,80 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, llvmPackages +, openssl +, perl +, protobuf +, rustfmt +, Security +, SystemConfiguration +}: + +let + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "talaia-labs"; + repo = "rust-teos"; + rev = "v${version}"; + hash = "sha256-N+srREYsADMTqz3uDXpeCuXrZZ62FopXO7DClGfyk9U="; + }; + + common.meta = with lib; { + homepage = "https://github.com/talaia-labs/rust-teos"; + license = licenses.mit; + maintainers = with maintainers; [ seberm ]; + platforms = platforms.unix; + }; + + cargoPatches = [ ./add-cargo-lock.patch ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + + nativeBuildInputs = [ + perl # used by openssl-sys to configure + protobuf + rustfmt + llvmPackages.clang + ]; + + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; +in +{ + teos = rustPlatform.buildRustPackage { + pname = "teos"; + cargoSha256 = "sha256-7VYYYSMJ2JP1KuA8sD0X3wInubH/jbA/sgzsTsomyEc="; + buildAndTestSubdir = "teos"; + + inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH; + + meta = common.meta // { + description = "A Lightning watchtower compliant with BOLT13, written in Rust"; + }; + + cargoTestFlags = [ + "--workspace" + ]; + }; + + teos-watchtower-plugin = rustPlatform.buildRustPackage { + pname = "teos-watchtower-plugin"; + cargoSha256 = "sha256-xL+DiEfgBYJQ1UJm7LAr1/f34pkU8FRl4Seic8MFAlM="; + buildAndTestSubdir = "watchtower-plugin"; + + inherit version src cargoPatches buildInputs nativeBuildInputs LIBCLANG_PATH; + + meta = common.meta // { + description = "A Lightning watchtower plugin for clightning"; + }; + + # The test is skipped due to following error: + # thread 'retrier::tests::test_manage_retry_unreachable' panicked at 'assertion failed: + # wt_client.lock().unwrap().towers.get(&tower_id).unwrap().status.is_unreachable()', watchtower-plugin/src/retrier.rs:518:9 + checkFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--skip=retrier::tests::test_manage_retry_unreachable" ]; + }; +} diff --git a/pkgs/os-specific/linux/greetd/default.nix b/pkgs/applications/display-managers/greetd/default.nix index 744b43f6f8aa4..744b43f6f8aa4 100644 --- a/pkgs/os-specific/linux/greetd/default.nix +++ b/pkgs/applications/display-managers/greetd/default.nix diff --git a/pkgs/os-specific/linux/dlm/default.nix b/pkgs/applications/display-managers/greetd/dlm.nix index 3b6f4773a29cf..3b6f4773a29cf 100644 --- a/pkgs/os-specific/linux/dlm/default.nix +++ b/pkgs/applications/display-managers/greetd/dlm.nix diff --git a/pkgs/os-specific/linux/gtkgreet/default.nix b/pkgs/applications/display-managers/greetd/gtkgreet.nix index 7ab7c01475bd7..e0ebbb3bc4c26 100644 --- a/pkgs/os-specific/linux/gtkgreet/default.nix +++ b/pkgs/applications/display-managers/greetd/gtkgreet.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation rec { "-Dlayershell=enabled" ]; + # G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+. + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + meta = with lib; { description = "GTK based greeter for greetd, to be run under cage or similar"; homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet"; diff --git a/pkgs/os-specific/linux/tuigreet/default.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix index 8660c4a1a49cf..8660c4a1a49cf 100644 --- a/pkgs/os-specific/linux/tuigreet/default.nix +++ b/pkgs/applications/display-managers/greetd/tuigreet.nix diff --git a/pkgs/os-specific/linux/wlgreet/default.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix index 932aa47fd7146..932aa47fd7146 100644 --- a/pkgs/os-specific/linux/wlgreet/default.nix +++ b/pkgs/applications/display-managers/greetd/wlgreet.nix diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index e84f305526b49..cd406686df86e 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter -, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs -, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: +, dbus, pcre, libepoxy, xorg, at-spi2-core, libxklavier, libxkbcommon +, gtk3, vala, cmake, libgee, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: stdenv.mkDerivation { pname = "lightdm-enso-os-greeter"; @@ -30,15 +30,15 @@ stdenv.mkDerivation { pcre libepoxy libgee - libX11 + xorg.libX11 lightdm - libXdmcp + xorg.libXdmcp gdk-pixbuf clutter-gtk libxklavier at-spi2-core libxkbcommon - libpthreadstubs + xorg.libpthreadstubs librsvg ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix index 6482d46d387ef..c43d0d7765443 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix @@ -1,7 +1,6 @@ { trivialBuild , lib , fetchFromGitHub -, curl , plz , cl-lib , ts diff --git a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix index 5eaee9bbfdfe5..7809dcd735660 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix @@ -1,5 +1,4 @@ -{ lib -, trivialBuild +{ trivialBuild , fetchFromGitHub , emacs , popup diff --git a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix index 503554412b5b3..b8bbe7db577bb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , emacs , trivialBuild diff --git a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix index 6251fd6932a70..d5283da41dff6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , trivialBuild , emacs diff --git a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix index 1dcf27e64ebc6..735e18f6b68ab 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix @@ -1,5 +1,4 @@ -{ lib -, trivialBuild +{ trivialBuild , fetchFromGitHub , emacs }: diff --git a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix index d02283f25ad8c..bd6a2996d6e1b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix @@ -1,5 +1,4 @@ -{ lib -, trivialBuild +{ trivialBuild , fetchFromGitHub , emacs }: diff --git a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix index 7b57d69d55953..e6e645a3b3a1c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , trivialBuild , emacs diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index ece5c95f05ab0..ba9e941f38968 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,7 +1,6 @@ { symlinkJoin , makeWrapper , geany -, lndir , vte }: diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 7cfde3a91f399..54625d75e5c53 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -2,92 +2,113 @@ , lib , ctags , cmark -, appstream-glib , desktop-file-utils +, editorconfig-core-c , fetchurl +, fetchpatch , flatpak , gnome , libgit2-glib , gi-docgen , gobject-introspection -, glade -, gspell -, gtk3 -, gtksourceview4 +, enchant +, icu +, gtk4 +, gtksourceview5 , json-glib , jsonrpc-glib -, libdazzle -, libhandy +, libadwaita +, libpanel , libpeas -, libportal-gtk3 +, libportal-gtk4 , libxml2 , meson , ninja , ostree -, pcre +, d-spy , pcre2 , pkg-config , python3 , sysprof , template-glib , vala -, vte -, webkitgtk -, wrapGAppsHook +, vte-gtk4 +, webkitgtk_5_0 +, wrapGAppsHook4 , dbus , xvfb-run }: stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "42.1"; + version = "43.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XU1RtwKGW0gBcgHwxgfiSifXIDGo9ciNT86HW1VFZwo="; + sha256 = "dzIhF6ERsnR7zOitYFeKZ5wgIeSGkRz29OY0FjKKuzM="; }; + patches = [ + # The test environment hardcodes `GI_TYPELIB_PATH` environment variable to direct dependencies of libide & co. + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2ce510b0ec0518c29427a29b386bb2ac1a121edf + # https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/2964f7c2a0729f2f456cdca29a0f5b7525baf7c1 + # + # But Nix does not have a fallback path for typelibs like /usr/lib on FHS distros and relies solely + # on `GI_TYPELIB_PATH` environment variable. So, when Ide started to depend on Vte, which + # depends on Pango, among others, GIrepository was unable to find these indirect dependencies + # and crashed with: + # + # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) + ./fix-finding-test-typelibs.patch + ]; + nativeBuildInputs = [ - appstream-glib desktop-file-utils - gi-docgen + (gi-docgen.overrideAttrs (attrs: { + patches = attrs.patches ++ [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/f4ff4787cce962b705fb2588b31f2988c5063c13.patch"; + sha256 = "11VGFFb2PLVxnX/qUQdLPLfhGQWx4sf4apBP7R2JWjA="; + }) + ]; + })) gobject-introspection meson ninja pkg-config python3 python3.pkgs.wrapPython - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ ctags cmark + editorconfig-core-c flatpak - gnome.devhelp - glade libgit2-glib libpeas - libportal-gtk3 - vte - gspell - gtk3 - gtksourceview4 + libportal-gtk4 + vte-gtk4 + enchant + icu + gtk4 + gtksourceview5 json-glib jsonrpc-glib - libdazzle - libhandy + libadwaita + libpanel libxml2 ostree - pcre + d-spy pcre2 python3 sysprof template-glib vala - webkitgtk + webkitgtk_5_0 ]; checkInputs = [ @@ -110,6 +131,8 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build-aux/meson/post_install.py + substituteInPlace build-aux/meson/post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; checkPhase = '' diff --git a/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch b/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch new file mode 100644 index 0000000000000..1c6c663c69a77 --- /dev/null +++ b/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index c9a44e418..cd9e466d6 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -35,7 +35,7 @@ foreach test_typelib_dep: test_typelib_deps + test_gi_typelib_path += [join_paths(test_typelib_dep.get_variable('libdir'), 'girepository-1.0')] + endforeach + test_env = [ +- 'GI_TYPELIB_PATH=@0@'.format(':'.join(test_gi_typelib_path)), ++ 'GI_TYPELIB_PATH=@0@:@1@'.format(':'.join(test_gi_typelib_path), run_command('sh', ['-c', 'echo "$GI_TYPELIB_PATH"']).stdout().strip()), + 'G_TEST_SRCDIR=@0@/tests'.format(meson.current_source_dir()), + 'G_TEST_BUILDDIR=@0@/tests'.format(meson.current_build_dir()), + 'G_DEBUG=gc-friendly', diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index fe8666fd741bd..3a4760265d12b 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -15,18 +15,18 @@ , gnome , glib , pkg-config -, intltool +, gettext , itstool , libxml2 }: stdenv.mkDerivation rec { - version = "3.40.0"; + version = "3.41.2"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "xad/55vUDjeOooyPRaZjJ/vIzFw7W48PCcAhfufMCpA="; + sha256 = "8xDwoUUEmfDP92y5+cXWaZGpUGH6s9bmcMSlZHOF1jM="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsHook itstool - intltool + gettext ]; buildInputs = [ diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index ea0a1e2f24768..063833ceaa15c 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, gnome }: +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix new file mode 100644 index 0000000000000..3a7463f89f831 --- /dev/null +++ b/pkgs/applications/editors/imhex/default.nix @@ -0,0 +1,92 @@ +{ lib +, gcc12Stdenv +, cmake +, llvm +, fetchFromGitHub +, mbedtls +, gtk3 +, pkg-config +, capstone +, dbus +, libGLU +, glfw3 +, file +, perl +, python3 +, jansson +, curl +, fmt_8 +, nlohmann_json +, xlibsWrapper +, yara +}: + +let + # when bumping the version, check if imhex has gotten support for the capstone version in nixpkgs + version = "1.19.3"; + + patterns_src = fetchFromGitHub { + owner = "WerWolv"; + repo = "ImHex-Patterns"; + rev = "ImHex-v${version}"; + hash = "sha256-mukGPN2TugJZLLuZ5FTvZ4DxUsMGfVNhBFAPnBRC0qs="; + }; + +in +gcc12Stdenv.mkDerivation rec { + pname = "imhex"; + inherit version; + + src = fetchFromGitHub { + fetchSubmodules = true; + owner = "WerWolv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-SFv5ulyjm5Yf+3Gpx+A74so2YClCJx1sx0LE5fh5eG4="; + }; + + nativeBuildInputs = [ cmake llvm python3 perl pkg-config xlibsWrapper ]; + + buildInputs = [ + capstone + curl + dbus + file + fmt_8 + glfw3 + gtk3 + jansson + libGLU + mbedtls + nlohmann_json + yara + ]; + + cmakeFlags = [ + "-DIMHEX_OFFLINE_BUILD=ON" + # see comment at the top about our version of capstone + "-DUSE_SYSTEM_CAPSTONE=OFF" + "-DUSE_SYSTEM_CURL=ON" + "-DUSE_SYSTEM_FMT=ON" + "-DUSE_SYSTEM_LLVM=ON" + "-DUSE_SYSTEM_NLOHMANN_JSON=ON" + "-DUSE_SYSTEM_YARA=ON" + ]; + + # for reasons unknown, the built-in plugin isn't found unless made available under $out/bin + postInstall = '' + ln -s $out/share/imhex/plugins $out/bin/ + + for d in ${patterns_src}/{constants,encodings,includes,magic,patterns}; do + cp -r $d $out/share/imhex/ + done + ''; + + meta = with lib; { + description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM"; + homepage = "https://github.com/WerWolv/ImHex"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ luis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 47dabbf0cbb93..c795cc30b3901 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -86,6 +86,22 @@ let }; }); + buildGateway = { pname, version, src, license, description, wmClass, ... }: + (mkJetBrainsProduct { + inherit pname version src wmClass jdk; + product = "Gateway"; + meta = with lib; { + homepage = "https://www.jetbrains.com/remote-development/gateway/"; + inherit description license platforms; + longDescription = '' + JetBrains Gateway is a lightweight launcher that connects a remote + server with your local machine, downloads necessary components on the + backend, and opens your project in JetBrains Client. + ''; + maintainers = with maintainers; [ kouyk ]; + }; + }); + buildGoland = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { inherit pname version src wmClass jdk; @@ -167,7 +183,7 @@ let with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ''; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dritter ]; }; }); @@ -301,6 +317,19 @@ in update-channel = products.datagrip.update-channel; }; + gateway = buildGateway rec { + pname = "gateway"; + version = products.gateway.version; + description = "Your single entry point to all remote development environments"; + license = lib.licenses.unfree; + src = fetchurl { + url = products.gateway.url; + sha256 = products.gateway.sha256; + }; + wmClass = "jetbrains-gateway"; + update-channel = products.gateway.update-channel; + }; + goland = buildGoland rec { pname = "goland"; version = products.goland.version; diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index 3f77f3fae5b15..fde3e52632e8e 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -80,6 +80,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default JDK_HOME "$jdk" \ --set-default ANDROID_JAVA_HOME "$jdk" \ --set-default JAVA_HOME "$jdk" \ + --set-default JETBRAINSCLIENT_JDK "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ${hiName}_VM_OPTIONS ${vmoptsFile} diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 77baa60a0c97d..5505c0c61c8f8 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -18,6 +18,15 @@ "version-major-minor": "2022.1.1", "build_number": "222.4345.5" }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", + "version": "2022.3 EAP", + "sha256": "4868baed9350065c1db760f07a09badd1473132af640cc19330e20c8a0940d7d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.tar.gz", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" + }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", @@ -128,6 +137,15 @@ "version-major-minor": "2022.1.1", "build_number": "222.4345.5" }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", + "version": "2022.3 EAP", + "sha256": "2db71a052501db41d5cfe142f1a6e3178fe02830f0da127d00fbf93a4629c61b", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.dmg", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" + }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", @@ -238,6 +256,15 @@ "version-major-minor": "2022.1.1", "build_number": "222.4345.5" }, + "gateway": { + "update-channel": "Gateway EAP", + "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", + "version": "2022.3 EAP", + "sha256": "513d3a271c5ff20fdc5c22f6e28eb21cfbb283d01ade2d11f33bb7eb79317410", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21-aarch64.dmg", + "version-major-minor": "2022.3", + "build_number": "223.6646.21" + }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index 8a6dc4e00730c..c5265aa255c20 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , callPackage , runCommand , makeWrapper diff --git a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix index 7ede04427b5bd..fc6254f27e8de 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix @@ -1,4 +1,4 @@ -{ lib, octave, python3Packages }: +{ lib, python3Packages }: with python3Packages; diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix index 0675ceaba9621..5587c2c0243c3 100644 --- a/pkgs/applications/editors/nano/nanorc/default.nix +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts -, coreutils, git, gnused, nix, nixfmt }: +{ lib, stdenv, fetchFromGitHub, writeScript, common-updater-scripts +, coreutils, git, gnused, nix }: let owner = "scopatz"; diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix index f6013202bafb1..b9d0ab4ec23ef 100644 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/pkgs/applications/editors/neovim/neovim-qt.nix @@ -1,5 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper -, msgpack, neovim, python3Packages, qtbase, qtsvg }: +{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages, qtbase, qtsvg }: mkDerivation rec { pname = "neovim-qt-unwrapped"; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 4f204fd7dbcc6..0502e79cb5d18 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,7 +1,5 @@ { stdenv, symlinkJoin, lib, makeWrapper , writeText -, bundlerEnv, ruby -, nodejs , nodePackages , python3 , python3Packages diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 7525b41508cfa..409f99e37afa2 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,6 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, makeWrapper -, boost, xercesc, hunspell, zlib, pcre16 -, qtbase, qttools, qtwebengine, qtxmlpatterns +, boost, xercesc, qtbase, qttools, qtwebengine, qtxmlpatterns , python3Packages }: diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index c2579f6a2a993..4d7bc488f0ed6 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -11,6 +11,10 @@ "date": "2020-03-27", "new": "vim-gist" }, + "lua-dev-nvim": { + "date": "2022-10-14", + "new": "neodev-nvim" + }, "nvim-bufferline-lua": { "date": "2021-08-22", "new": "bufferline-nvim" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 57ea7b9e5fdc6..5d4c76cdae62e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -161,12 +161,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-10-10"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "b7bf04eaeae846168efd86ef0136394a2d128b72"; - sha256 = "00krndb2crrcvcp8vb60wqz75pjj3121335mykaqhhq0jhc67xw2"; + rev = "ebb1f3a20b83a950938c59200434a4e66b69612d"; + sha256 = "0f25qsfpk5m92cc70pjjsbh1ph11aybw2rfraxwdrcywwdr61w7w"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -233,12 +233,12 @@ final: prev: QFEnter = buildVimPluginFrom2Nix { pname = "QFEnter"; - version = "2020-10-09"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "yssl"; repo = "QFEnter"; - rev = "df0a75b287c210f98ae353a12bbfdaf73d858beb"; - sha256 = "0gdp7nmjlp8ng2rp2v66d8bincnkwrqqpbggb079f0f9szrqlp54"; + rev = "fd5d378f97ee4847ce4fcb58b3719864228607da"; + sha256 = "009lpb3hygcw09535bajnd18xq6hbz19pdbwx9l9cykwaniciahi"; }; meta.homepage = "https://github.com/yssl/QFEnter/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-10-06"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "23bf2d69967491b1dc43f37c809f2711cc879fd2"; - sha256 = "0zl8sf9sy2i3fp3wbpw9rvm5wjkak897i5yl699jfxxv0gal5sgv"; + rev = "17d16277a214cc67710694c83c6c0c5aa1e13bb0"; + sha256 = "1kanm1qx3sbvnhsmnikxx9wyvbsm8i6bhzw36bd7697ydfr2y4v3"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-10-11"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "1ed769feb2a13061be69563cc42d686ac44fc441"; - sha256 = "0naxqvxm8dwi7hbphbl04kaphhxpq1x2f3n9whdhj7rbnq7m6r9h"; + rev = "5cd5e2b531bcbd5057f95915eb991475c810d92e"; + sha256 = "0sklk058747brv3fcvxanp87wa87lb9zkkr8bggrjc3g3i9yp6hm"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-10-08"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "bbdfc56c5a00f4f31936a057fed99807c0a52f0c"; - sha256 = "04ma4nz47ld6a4x0d5pn7a70kx0a8p2ynyb2gg8mb1x09593q95m"; + rev = "c2487319c083bc1da3aecf21e054c6cf1bbda9b3"; + sha256 = "07l7xjzp4pn2lnkrq1rbl89bblf50plpx4wv1r7wli1mfginrkba"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -534,12 +534,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-10-04"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f085227504076dff5224cbf10cb1bf83286188a9"; - sha256 = "00n3vagkgy31r47a1ivy0zxm3a13z3d80l6ay7l49srh10rfh3c1"; + rev = "e4b20544082ba019d8095cbc24ffab43b15e8fc0"; + sha256 = "0cm259fvym6swcj9q6viap84xg364x05xc8a432a452ca5xrfgp2"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -666,12 +666,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-10-05"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "8d92822df7fb5549bbc0cc65056e960341433cdf"; - sha256 = "0af6fn9iym0kgldbla1h13dds8sd8pd441f20bpszfbmr4djfskh"; + rev = "eae766d218671754f3a48adc6b3ad7bf2bac0696"; + sha256 = "0nkqkkk8ahxfvc5f8da9zb1v258lik9514kfv50phz4vj4s76vbh"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -798,12 +798,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-10-03"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "61424a6211431a42458bc755b3e7e982e671c438"; - sha256 = "1xg7wm3prq2vj0jg2knb96lc7mlh7l6fw6c23s0i9vqrbz4b8jr2"; + rev = "517b457630d84aff875287d8249791df95ff91ab"; + sha256 = "15lrc820ccdmvbqskqwkqcjn8ryi7j6qc5z3df1d0jp3brisrj3d"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -990,12 +990,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-10-10"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "e74e0ebf3fac929c81fb9d918228ef03afc8d470"; - sha256 = "1abpkiry3ffmwj51yldiaw3ix1scr6jjx714am1d4wz7kbl4228g"; + rev = "06133a0e91be23ac9e0cf619b869cf02aa758341"; + sha256 = "03mi152kkl3zycwqldqghpp31fpjypyklw4b53i6kyjmk3jf6k3a"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1074,12 +1074,12 @@ final: prev: clever-f-vim = buildVimPluginFrom2Nix { pname = "clever-f.vim"; - version = "2022-09-20"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "rhysd"; repo = "clever-f.vim"; - rev = "e852984d2bb6671034851fa70442d7799c1d7856"; - sha256 = "1952kywl33r9vm14rzrvin6ndr4napgk0k41xc35ka3mci12lhya"; + rev = "6a3ac5e3688598af9411ab741737f98c47370c22"; + sha256 = "1gbyk5089njmgxdc5nfm2sc3nvx3f91s7rw0mbh960dlwlhnsacs"; }; meta.homepage = "https://github.com/rhysd/clever-f.vim/"; }; @@ -1278,12 +1278,12 @@ final: prev: cmp-fuzzy-path = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-path"; - version = "2022-08-30"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-path"; - rev = "857097778bc772f9d6f885e50eeb05f39632d2bb"; - sha256 = "1gwscb808m2qvryslmh5a1ndq1xaigsng82c2wk4fsqvz751zg79"; + rev = "2c0f893eee7c773871fc4ddf400b6339ab7914a6"; + sha256 = "0m6wlns0zi07fmn9szx055chm8r83yigyjd2ykphw3z110b02wqv"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; @@ -1362,12 +1362,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-05-16"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "affe808a5c56b71630f17aa7c38e15c59fd648a8"; - sha256 = "1v88bw8ri8w4s8yn7jw5anyiwyw8swwzrjf843zqzai18kh9mlnp"; + rev = "3cf38d9c957e95c397b66f91967758b31be4abe6"; + sha256 = "0l0cqrarrp3rj3pmjivjgh8f1cd3grrkz6pnzpwpwxj9amv6k6p2"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1386,12 +1386,12 @@ final: prev: cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-signature-help"; - version = "2022-08-20"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-signature-help"; - rev = "3dd40097196bdffe5f868d5dddcc0aa146ae41eb"; - sha256 = "0kfa0pw5yx961inirqwi0fjvgdbmsgw16703mw2w9km8313x17zw"; + rev = "d2768cb1b83de649d57d967085fe73c5e01f8fd7"; + sha256 = "13imcdv0yws084z2x2lmdj17zy4ngf126i7djknnwp2jfkca1120"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; @@ -1722,12 +1722,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-10-07"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d0fa7acd233d76585daf9ce0b74ad1112591e271"; - sha256 = "04qs3gcx2qjagawr577sadz6bkwlr40532i9f7p7jfkbd7ybgzm2"; + rev = "9075f7b5aae247c15cadafeb5e6e6e115ddba245"; + sha256 = "1qfdsgsc7lrp0rz3l4af4rf1i63afv41xzdmq7c603n1wq8ssjrl"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1806,12 +1806,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-10-10"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "250bbc5a04b6e80ff1c212e89a80e976cda9e433"; - sha256 = "18x9a1fmial78f28mkaqsajzazjj9zd4yq44fghw1ynaa36gjmwh"; + rev = "ad7ffa8ed2279f1c8a90212c7d3851f9b783a3d6"; + sha256 = "1gy2caam9g1zhnplj6d943p62n4kqgasi4wwgq1ry7gzlm2gi5v0"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1878,12 +1878,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-10-10"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "b565df009e92aad6ca8b338562b2f375fb1fea96"; - sha256 = "0855y7vhhfzv3ppmg5834k593jg4b2qlkpg45fsf4xkks3g2s168"; + rev = "356f876ef4ef194503b2e23d27af9f55c5faff32"; + sha256 = "03kbf8vrb7ws18k6w2d4zrbj0318qr82xgqxw9yfqsb4wzx8b5jx"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -1998,36 +1998,36 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-09-18"; + version = "2022-10-12"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "af9da6457790b651871b687b8f47d130cde083fc"; - sha256 = "1dknx2c7q5kg1w8ld0wxk97632s406m1cfq6nw4n0cv4pzs2qx1b"; + rev = "8ba151a20bc1d7a5c72e592e51bfc925d5bbb837"; + sha256 = "0wr703fg7vvygx8iyym8jqqqm51nwffkz8aldma7ahkc5vwi2v0s"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-10-11"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "80ec4396170f63041d8d7e8d2df3c54eb45300f7"; - sha256 = "13h2nib9amjjsx35gsxfcvyx674m04wrsp4fia06ksa40h8hadkm"; + rev = "bc5b5e764cb418e8ffded8362a66f82763f725d4"; + sha256 = "1mpixcnzph42xmhm504dyp527zksacp741ywxknm7bbjdki38wgq"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-10-11"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "adfb5c498f9d6d7f3b74baaae228ab6dcf923ecb"; - sha256 = "19l9g3j0pn3l4rndx38fpi82ypgbm0087gwyczj6dbvszld3ln78"; + rev = "845e955fc29afcf1ab875af29ec5867d06751bb4"; + sha256 = "1a60q1s8ljxbjg8zrljz7gms9r7dxmz06mbq9ni7zda3d25385p9"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2046,12 +2046,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-10-11"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "550149d751f8d62ad646d38ef57b87f4d960bceb"; - sha256 = "1y5achbd4vkq0fhsh9hvgnb4qh42k3mskii7x6vrnr3vr3gvy0ff"; + rev = "35c4e030dbd12de4630536658bd818d66c2d0725"; + sha256 = "1rdkd56ab5ipq3lpb2hrv1iaxizm5cr8hzrdkqqqxph55l76gmm7"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2564,12 +2564,12 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2022-08-29"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "d2d7a57fb030c82b8b0d6712d9c35dfb49d9aa3c"; - sha256 = "1zm116xd7b79piaiia9fn56h7ivnmy0dip02q3n61fmn1sqijggr"; + rev = "6bf54a83cd40448f1ba5171358f0d6f48bd970fd"; + sha256 = "1pqpg3if707w42mdzskbn5rjwiwsbqvp3f2y6mx778b796ikw4d1"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -2867,12 +2867,12 @@ final: prev: flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2022-09-23"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "dd43846edca345075a60d2f749bcca71cd47a17f"; - sha256 = "1da1pfkm0jg9570smg0l2hc059jjaxpzvz8jbkx6i2m56gq9lmnh"; + rev = "be110f9814a45788d10537fd59b3c76d956bb7ad"; + sha256 = "1innhwy2izcw2w7qhp6x7s3q07zy0zxfwqmlqskgl6c75r4akqyn"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -2951,12 +2951,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-10-06"; + version = "2022-10-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "6cd7469403fd06a3840a1065728d1affe1c23ec8"; - sha256 = "0qilmi6xg37xq29kfk6nnchz1jm18qrbvgcfzq028pmdbnakg7r5"; + rev = "fd16b4d9dc58119eeee57e9915864c4480d591fd"; + sha256 = "18fzpij4c11jvxhsjp65cmmc7nna4p3whjsx8a0a263kahh8npfp"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3059,12 +3059,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-10-08"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "c81874db259eef85ae21794b2f29e953519c692c"; - sha256 = "1k6h1n4rpi47ggqvmxrw9bhis5mkd2fnqvyirvr4yz2sgivljmwn"; + rev = "025d8c5ef8495aef838ac8e6be47f8da1bd9cc2c"; + sha256 = "142c8bnlnvidsm9bhblchz757pjpif26zj0iss08yk5g1yjxzvhk"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3215,12 +3215,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-10-10"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "9d18976c10413e52d76d41a771f042704786ce2e"; - sha256 = "1fzmg74i9q6xal0k1s1ikgbc37s0q1z79af5vhlfll5f2c5dkpsk"; + rev = "bf20b5d820a7c8d25b45fd76fe8bee25fc2c7258"; + sha256 = "0zp1b3dnys7qf3r4gdf4shbbh7y5m4i75zcgbqzlbjg367wnnw8h"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3538,12 +3538,12 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-10-01"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "86f4f2f7c1cebdbeb9a9bd498810a0154e80dbab"; - sha256 = "0gzxnh13l1ys8jbcnkgfrjz901qf8wvyslqyldyzm3ryis823acg"; + rev = "27ddd47803233cc809a4a0dc8b035fe3b8e2ef30"; + sha256 = "0gg9f3a7ylk2pgmhymxc54i9nrcclxjbvkc5635rgmgsp3rypp02"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3921,6 +3921,18 @@ final: prev: meta.homepage = "https://github.com/latex-box-team/latex-box/"; }; + lazy-lsp-nvim = buildVimPluginFrom2Nix { + pname = "lazy-lsp.nvim"; + version = "2022-10-10"; + src = fetchFromGitHub { + owner = "dundalek"; + repo = "lazy-lsp.nvim"; + rev = "c405a63b2424fec42bb67da53fc06b4a82a56963"; + sha256 = "12b1pr23hl1avw4i44r47zkrw1h61qwz305l7gsngj3p69z4722r"; + }; + meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; + }; + lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; version = "2022-06-14"; @@ -3935,12 +3947,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-09-07"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "1940d8746157cc4c7cc12f540db8ed4506408773"; - sha256 = "1f00ajmm6x9jj6anqyd6lpq59c3zgni0n8a4vvfbgi7c6shdhnqc"; + rev = "eef5e8cd2be99012f02d3d55ea013690df247912"; + sha256 = "142263hjwrlp9fva4yjn2sddz7761nx7p161mchv7wdgjilcxpd1"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3971,24 +3983,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-10-10"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "517f142dea3d62c956fd00ab78385b83b14932a9"; - sha256 = "09j9frsxqxbzvk2fpyfz1ian9q5gzm1zj13kq64fwldzxamjsjji"; + rev = "a9d3232b178fddabb6660dc19abf40e05d6841b0"; + sha256 = "0ip1cylfsdcfjswg7f3lkwnxqab5x1mdhmik7krhis9c2x5harg2"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2022-10-10"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "9d8e43e25174033a1066f12b7d656d93c7527db7"; - sha256 = "17drk65qrxnmnywg8p3251581hfy01drzj669v92brn1varp1a6d"; + rev = "edeeb1a50c3936d971681af36c3385d18db3230c"; + sha256 = "0ds7mv79k5npa1h64kzxhikkp24j7k6qb1qyb3fsxsc7pjspgqyd"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4223,24 +4235,24 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-07-30"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "d346001fe1754da8f6ca9ce1059ba80c183643fe"; - sha256 = "023hz8al9y7dszfz4cvhl2pdzsbx4qpjjrkqxcqafj8q7w7knhq3"; + rev = "c28f62b9eb78afc398e070b650c59e1fb8668b66"; + sha256 = "06mn4np083am7l3dspf7j8nfkin5k86pdg3gymyqzf6mj8vs90y8"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; live-command-nvim = buildVimPluginFrom2Nix { pname = "live-command.nvim"; - version = "2022-10-10"; + version = "2022-10-12"; src = fetchFromGitHub { owner = "smjonas"; repo = "live-command.nvim"; - rev = "b3639c1bc78dbd396b47ef1dcf624dabc01238be"; - sha256 = "0bkffrsha1mhsnd0w45js5d0kx097k21lyg7bwj4a40icgkgyfpk"; + rev = "86615b33811cfdfa9ff47c32ac98952ff112437d"; + sha256 = "0a48769716q9sxf29lh5a7s2hwvvb393xw8wnwmwdpl86ksic9pw"; }; meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; @@ -4271,24 +4283,24 @@ final: prev: lsp-inlayhints-nvim = buildVimPluginFrom2Nix { pname = "lsp-inlayhints.nvim"; - version = "2022-09-06"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "lvimuser"; repo = "lsp-inlayhints.nvim"; - rev = "9bcd6fe25417b7808fe039ab63d4224f2071d24a"; - sha256 = "1dla9mlvqsm0mvmcdz734sjimrq24af9pbirgsf17fsqsyrlf9hg"; + rev = "439b4811276a149e3fccb226cc9a43ff2fb0e33b"; + sha256 = "08yhjc5zqvjv8m254d7vrhz3nhm8dr4xckhmd9q0sazp8pjd5b8h"; }; meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; lsp-overloads-nvim = buildVimPluginFrom2Nix { pname = "lsp-overloads.nvim"; - version = "2022-08-12"; + version = "2022-10-12"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "1258bfa3e21f5665b7a2c6c9b921a2ad8d8d8373"; - sha256 = "146pykcnpf9b8c4mqvs1q4wnp5jqg8i21as3gvjygwm5b71lxbky"; + rev = "ad00f4e4e00cd8b2dd355587a9428330ca40de2b"; + sha256 = "1b0j8h9jvnkhxzdg4bx4fhm9k5dgr5jvjqhdsrs6l7199hl5p4jq"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -4390,14 +4402,14 @@ final: prev: lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-10-11"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "folke"; - repo = "lua-dev.nvim"; - rev = "34858064f55295557a377b88aebccc9965869cf8"; - sha256 = "1dvwzsa3002yaff0rcjkfzgzv3r96192kh0b9skg53z44nyvawcw"; + repo = "neodev.nvim"; + rev = "b1a8ba8226d7701401752728652818ba51dd29e5"; + sha256 = "0bs5kpgin6zmczk5h8dpfm3yy60612yyq5vi6cvh2x6c66frvmx5"; }; - meta.homepage = "https://github.com/folke/lua-dev.nvim/"; + meta.homepage = "https://github.com/folke/neodev.nvim/"; }; lualine-lsp-progress = buildVimPluginFrom2Nix { @@ -4426,12 +4438,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-10-10"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "08511f9a8dc3ef01c31a245429bfaef993e2f1f6"; - sha256 = "04100gf6rgl3d7vxsxvf0xgn0y2ypyjh22qznx18hm0c7mdsl1qz"; + rev = "663d54482b11bca1ce94f56993b9f6ab485a13dc"; + sha256 = "11dca07m9msyqqdbjrb4136hi77m8vh0jqpf2w0kjs6d9m63g0ab"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4535,12 +4547,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-10-10"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "9f7bdfd90d5bdb466fd297f691db6c58316c3bb7"; - sha256 = "11yn7jwy8vy6rzmavh420x3dn7y9lzb0dn5nkrky2rr38s6wyd5h"; + rev = "1a911c2e710b6b3a4b673ab2f47911faa06f5286"; + sha256 = "1n5plkqywsmrr2ji1f0mvgc3yjd984xdm2vkniyq04rhyw5mshz8"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4967,12 +4979,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-10-09"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "9a9891a3247b2c15b752efca749f1175b9013235"; - sha256 = "01iibvgf5lf23zivd94dfcjiz2b0rmqcz7yddfqf8drq1pi3bxjw"; + rev = "278e989435b5859ae8b3bcb8d718cd57ba106412"; + sha256 = "18bvgydb2qxfhli9kcblm7dypczss0kgb4gzgmgnbv295lcg2z6l"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5075,12 +5087,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-10-07"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "60f3a2bc2bd22b98af5770b940762f77ca17cfee"; - sha256 = "0vcv0j5zvz4mmaczkkspl5l5fv8x36fdlvm9sf3s85hsz0gh03xp"; + rev = "fe74a1b890701eb5f196e9639b2147d5f126d9ae"; + sha256 = "03427xhx5c1ri7b3wrbgkqk3dv31dxnxjvqrg9h698r0lfb844a9"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5147,12 +5159,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-09-27"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "59c3dbcec362eff7794f1cb576d56fd8a3f2c8bb"; - sha256 = "1dkwgqx576xc8fryhi61q7mka93vv28hfsw340k594jkqc3da9i2"; + rev = "15f3b5837a8d07f45cbe16753fbf13630bc167a3"; + sha256 = "08zjhp1199yq5byrgksgaw55p3q74xr5j4ja24af08x8ifkr3bsj"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5195,12 +5207,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-10-09"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "87f908da660c321439a0dd98a8e51cd85227f57b"; - sha256 = "0byzbwhclppby3ryqis29d6wpdgshk7qi9sp1pp8kkfjv2fg3xb3"; + rev = "27adc00728261a4368206105b4bc1b4a6fb196f8"; + sha256 = "0m4ydgvifvibglaqzriyfxx9dk6vxzmdhk10xpzwxkfvqd6xckb7"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5255,24 +5267,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-10-04"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "4715f6092443f0b8fb9a3bcb0cfd03202bb03477"; - sha256 = "1ddqwifszbdl8yzi0sj8dh20cb4hg6rk3s6qjy4l4sgslzxgsnk9"; + rev = "c59bdcfde011b88bfb71b5c4351684cf67bf5f9f"; + sha256 = "0y8n8qpy3swvmd29cs4yf3krkjhlx324ncya0hzciqk5j9j3j9vh"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-10-10"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "17e81c1c1f21f8f6d11a4141a490a0b37974a52b"; - sha256 = "0l8lkrcbyvlkjv18fvi6jk13s9dj5in8h9f0izx1xpk6cdarx7cb"; + rev = "643c67a296711ff40f1a4d1bec232fa20b179b90"; + sha256 = "0wvbh0avz80g29ph52aqkxgnkykg58x5jcvn57zb0rb7dbbpcf56"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5387,12 +5399,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-10-11"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "53bd5749011c0830d54d9b22a37259651d5916df"; - sha256 = "1fbhbb0aakjs7zwdllzpcydz41nanxyw271ix18h9j47a4x12lq6"; + rev = "3347dd3c59b6c62288d861ddb92b9ba1227257a8"; + sha256 = "1ca9mpxq7cqi36mqz0cgyhl9w1dwcalwh6v4kj377g1vqslyl5ay"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5483,12 +5495,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-10-09"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6b12294a57001d994022df8acbe2ef7327d30587"; - sha256 = "16v6cy2za9v48jrm4mipfnxv5ry0h60k85342xrzxwanhnkagi5v"; + rev = "e71da68e59eec1df258acac20dad206366506438"; + sha256 = "10vs85nmh3kk549p72mp712h4y8vyjhhkpi2ni2m6hlgld17zsyw"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5639,12 +5651,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-10-04"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "0422245fdef57aa4eddba3d99aee1afaaf425da7"; - sha256 = "0h43bqf5n0l8f1jyzp7splsvcdran9j4arafpvli4pkfd9qx3h38"; + rev = "faf7ec2df507e16082afc4ef6b18813863f68dd8"; + sha256 = "01sp8pgrqwdlzqkzdjbjmwp204hg3dil0yv21785dd4v68sa4h3c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5723,12 +5735,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-10-09"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0a8064eda0c7a4475c4a8ceb39199e975308797b"; - sha256 = "163ppl8fdybx2bkaimbxxidn6vgqgz6dz6qs45ng9f9ys1wxg5nr"; + rev = "35a731bddaf20be0a2a0492cfa489ae6130a4eb6"; + sha256 = "0rmn31nq7mg40j2hmq585ndcfdb11r3ij1wpg3b301c209q97clg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5783,12 +5795,12 @@ final: prev: nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-09-23"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "73fd2494b181cdad5dca2be23bfefd6e34621fd2"; - sha256 = "161s8b67n4n80y3drqk3azhjr6m17nr5m3ns3b49p7xypfigqpwn"; + rev = "3e0b9a134838c7356d743f84a272c92410c47d8d"; + sha256 = "19xwirhaw8y9blll37xwk13cn74cw6cl1j76773nkxgx5m5cynpg"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -5807,12 +5819,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-10-10"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "56f65a9474e9ce294a89eb325fccf4391646bfd4"; - sha256 = "1dr3yv8b3zv50yls8xwf6k75xk7l8y78cbbs7zvjmwri31sw5w4f"; + rev = "af935fd8329ba67d96afa1b2650af84251f1dc0a"; + sha256 = "1kj77gkbg9pmhhglbajpfzrk2py9d5bs8bwdcmbdz1kscdiah84a"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5855,12 +5867,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-09-30"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "ee5ed2100b953c315d9fa2bfd08e93d6548253e0"; - sha256 = "0k8x58f12y565283h2rjw8mdlnhv39awldc4d9aqm0ny8vh4mj1h"; + rev = "88bb84058c24f4ffe5ffecae9ca2dcb36a5dba4c"; + sha256 = "1bi0hhl59xvmgbi8pcn6jp37p8665h3w8kx1if8dr2rjijrf6ay1"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -5891,12 +5903,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-10-06"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "faf9ffe92d871dd18b4d26b52fcc6b36d315f335"; - sha256 = "1miwnazlrgjw547lnh1ksv1p9qmiwrqfw5x7f6z6f18ilhly1k1q"; + rev = "81f672ad6525b5d8cc27bc6ff84636cc12664485"; + sha256 = "10xrnl3aqgz85knlf8ypxcq0zk9k4rby2pcfvh0kiyc46shqcwlr"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -5915,36 +5927,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-10-10"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "b01e7beaa6f0dbbf5df775cf4ecc829a23f0be54"; - sha256 = "0bmzwgycrp6wcn8kd2h1kwl0ysazmzd36fvi12x2c99yxnassxvi"; + rev = "c995ce087875ec5d4df51520b1e9cb09a4b51725"; + sha256 = "0pc4xw41p2086kqrqa1ir3ysvvbacxlh5whv14ci0x5hyrc90in1"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-10-10"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "6840b3740da5497730136c875e8f89cad314657b"; - sha256 = "1yl9gjdv059xjnzfcqd1mh4icdxr6dyay694gi3g9jbg3pi3djg8"; + rev = "addc129a4f272aba0834bd0a7b6bd4ad5d8c801b"; + sha256 = "08v6p29kmfyhkmk5nmqsi5xxp3mz788chxn3kqg3m6rwc6wkj809"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-10-06"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "c46a8a0a60412a8fe43aa6bd3a01845c46de6bf2"; - sha256 = "0p90akdva7zjfb2yc6gybx1i7yr82rbg6943xz74c8wgynppasbr"; + rev = "2466e8007290b6228183171965b6ce1a2f111995"; + sha256 = "0sql2fdswvix0c8xkcckiqxgwm95qda7akvl3kdlckrsw3g1fjwb"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -5975,12 +5987,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-10-06"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "80a38f9408102693539f54eef3e6a57d44c6147d"; - sha256 = "1gnv82ph7irmaf17mmgm9a18gnysming6sfvbirx13d23y61xb1x"; + rev = "7a440caa17f770e4f1621bad27bd13d0dade0b86"; + sha256 = "16bxg9avvar3hw02la8lm3b0xfvf43h0yx3lp2cc2fx26hw8lkcl"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5999,12 +6011,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2022-08-26"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "4d3a68c41a53add8804f471fcc49bb398fe8de08"; - sha256 = "1q3j91fylhq9l3q0b9c7g4qwb6g2v5w99g2wmf3h8sid0iwsm2yg"; + rev = "2941f0064874b33e93d3a794a8a4e99f5f6ece56"; + sha256 = "1hq2cv39wmpaak9c0gkjif4xp6sz21k5fygkk5lpxxbsdbm74v1g"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -6071,12 +6083,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-09-05"; + version = "2022-10-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "6d8f8b756ae22122926476f8f79fdbc19a860333"; - sha256 = "0y6qvm959qy4cb5hb6zbgd26v3r0z4y7dk2hinhkcxl09jchcwwy"; + rev = "43bf18bc2ace969fe6c3ed0e92975bac4d35965f"; + sha256 = "1kcjx6r04nsfbi8bhinf069r8jm3rvi7gsc258a77wh486xn0s7g"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -6107,12 +6119,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-10-09"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "d91f88be51fa7cde8b5d6f529c057338aad18383"; - sha256 = "0d4340gjbsvbdvymw0a7kpqwvzrn946nnsaav9i0z6rallrk583n"; + rev = "6c2a9e7df5ce5aea968ede01d1c479b3aa382604"; + sha256 = "164l12s9lbqhr0mq34dpiwsrnyvm3s6mhqpnplbfzafjykcrlrms"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -6167,12 +6179,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-10-10"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "81f50f9ab0f4b556b4bd10c8c8cdf8a76ab01213"; - sha256 = "179nq72hlcb4g5dgm8psl3il075km80ijz5kz5yzb43kllkaadls"; + rev = "0f2fa536de5a09f4fdbe65037c0d297135053836"; + sha256 = "1sywfmfi8z87g7hmdlqyhrhyfpjwafrfrqpivzsvb978abzddwxy"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6227,12 +6239,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-10-04"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "017570f58c6316982ecc6ddfe6fefd28b55a4092"; - sha256 = "0bbvdraxslg8k2m2ldglmspaawrrrp3plglzri7hm8scnw7mz58n"; + rev = "5f489c0af519526ea69db35e72f9b30f36f622da"; + sha256 = "0n23cynn2ivkgcdnspfzbb878lkgasxndpzmc0zzda4k3w6fhsq8"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6661,12 +6673,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-10-03"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "29af8cd89822d4eeadbd3410bcb0c6ae1ce83307"; - sha256 = "06xilrcsya49p59bnyg1958ipa2avzjavnih9md0h89ks3k93rs7"; + rev = "a87a7c57dc4c133166fb98bc7c2eded9826ff402"; + sha256 = "18sg4zphyrsjwdyy63zlkckzq8spn8b7yfbz4c27y3q63qayqpnp"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -7541,12 +7553,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-09-23"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "b1bc53e0da3d26f0003ffb9602115ce258411aa5"; - sha256 = "15ck17lrzz2ai1z5ar9m7n8yn1zm7wrhjljvrykng7w0651fz2ci"; + rev = "6b4e22777bfa6a31787a4ac8e086b062ef241ede"; + sha256 = "04mrq2dzvksryhfh93xzafcq5ipmywirynczblki91420m2128wn"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -7878,12 +7890,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2022-10-02"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "8df75dbb9ddd78a378b9661f25f0b193f38f06dd"; - sha256 = "149rq2w65gqi3972bwsp243qkflkyj2aqc4gc561kj9rkspqh82x"; + rev = "61240662fd9ffa4a546db57abcc50b97f6fab27b"; + sha256 = "0a2wzkahq3dm6yszrl3arl0p6yd6ymi5kqhzdcgkk4vb7j0ff9k4"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -7927,12 +7939,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-10-10"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "23c0038166800d373f3ec41e56768212aa3aaa2f"; - sha256 = "1zz54cq4ls4kb74pjxpy1afzckw5m3q92r1gr83l36i7yn5w0h61"; + rev = "e6307e12ebe8487d17ec87fe14c3972c21466139"; + sha256 = "1z3ysxi9f7zxc0vyc978z5ply2krzi31cmkxbldxbri800bzgds7"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -7987,12 +7999,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2022-09-05"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "929315ea5f146f1ce0e784c76c943ece6f36d786"; - sha256 = "07nyhg5mmy1fhf6v4480wb8gq3dh7g9fz9l5ksv4v94sdp5pgzvz"; + rev = "ed65f84abc4a1e5d8f368d7e02601fc0357ea15e"; + sha256 = "0mikpfp8pi8b58q217g3b3r62vc9q28jx34q8xzardhj42gqk4wj"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8107,12 +8119,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-10-06"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "b60eb8f5f5257778645d9472d666853e1b86cc66"; - sha256 = "00zp7w77glgzdncr95d5k7k8cd3b46m3kpsn77ya96yhb25g8i7w"; + rev = "8a52703b9303e206dd8dcf9b07f510f3d3ae87d5"; + sha256 = "11cf98bbf8526x0w8mkm3096l2wk9y6zj3hwwccs1dfw9v3jfm5c"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -8515,12 +8527,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-09-29"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "46dd87223757619a0a7fb0b075e2cf7d23ea899d"; - sha256 = "0xcv66ic68hgiw5cqdfbnimqdya7hg3zbrrzafgvfx6v468kgy96"; + rev = "0ed7b8bb2ed68d65a5ba55317896680b31d315b0"; + sha256 = "0x8xjfmchvmx5naq83mk3q2h1bda8bl2b691grsc20pfpdqilz2k"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -8959,12 +8971,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2022-08-05"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "e56e5285ecaf5d0df1a383c432bccdbc0d464b2f"; - sha256 = "0hqdh0m6h8wsvidfkm2c091j2rxq8ds8dria42z5ghx3ajhfgj6d"; + rev = "f002d6d256a11c14a9de40c45a8ecb75b2292f8a"; + sha256 = "1f5v7msmdkpsgg7yhcg2b4ysfg97w2hhrwqbahq64j3y616426ir"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -9024,7 +9036,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; + sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -9163,36 +9175,36 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-09-25"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "b100acc9c8fc0afc391a2b5a06254e74d08c0454"; - sha256 = "12rqr45h03rya03z7y8vw6zk58kp6hw0csnw3gp0nk9l3d2gfvx2"; + rev = "69c419194ee708a58a297d567bdcfd3dcf606574"; + sha256 = "0qng34n5sm01qs4pyfsx1nl7lhjhxkzcz7bx5747c041hb1ia3jm"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2022-06-19"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "22ef15e7103b78850473b57ef48233aaec8d9f64"; - sha256 = "1ibr1db06b9bxa7jnspix6wmf1z8fl3g5rrxskgfhfpdb2blwihm"; + rev = "59f2c6450e04f79714a7ceb1fffb4b6372129363"; + sha256 = "0bd1hliz04rwn15mh6g0agfvas4lvismgwdglwbr3csmys8blz3m"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-09-28"; + version = "2022-10-12"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "29ffd51107bff410f9fa667575541e253f4099a1"; - sha256 = "0ibknwr8lc58aggblndr7zm5qjb6nspxcmqad2b8whaxs9176a3h"; + rev = "6a2b841d2f0b82386c637ce4e9954ae12c7eaee8"; + sha256 = "1s1kz89k8iklf8sbgy4p52h7y2x90141jwgzwhhhqlp7h9ar9mmw"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -9487,12 +9499,12 @@ final: prev: vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2022-09-19"; + version = "2022-10-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "cc564695076d89b3d1e06b2693fca788cfbc5910"; - sha256 = "13m3jf4qb6gl79x46g0g6pwx869y8f7ja4vgiksn1j7gfkcd9d5q"; + rev = "291ef1f8c8996ca7715df1032a35a27b12d7b5cf"; + sha256 = "0fy40dh98z5rmhja6czaxwv48lfpph71vbqsfz55119686zgmc5p"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -10557,12 +10569,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-10-09"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "23728ad8c5becd2641ac7fb7e995b36295d2544e"; - sha256 = "026blks2bljynrw1xg8wmxz1ikr0f819ih0635bxwp8ah9dkfqzc"; + rev = "1dced335b0dff1bd50aaa2192317b645bc54aca7"; + sha256 = "1wndkj8knyr1bbdvk6lavr1p4595ny6vk4dgnmw6kbwaqchm5k7s"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11254,12 +11266,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2022-04-30"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "38282d58387cff48ac203f6912c05e4c8686141b"; - sha256 = "15szf3fjlnws0g5l3d2p3w74d5m9299l5k5gx91p0n9431xjb569"; + rev = "bc8a81d3592dab86334f27d1d43c080ebf680d42"; + sha256 = "061md5vjkqb4n9cbjg5dypq1y3p8gr106v4yqvrwwsdjwzsafzn3"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -11350,12 +11362,12 @@ final: prev: vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2022-05-17"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "497de735715fce546a95bc2f94f4a930b4ca42bc"; - sha256 = "1maljd92450fbpyppsi67lm5gs1984f30a9gi106z014fxhgwb7z"; + rev = "7a3985a39cc5a63f037f64a20a15175310826b7e"; + sha256 = "1inal1wmin8fia4b5h3ppyqsvakhhwgdg1y1p6hd0c29c954q0w2"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -11866,12 +11878,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-10-10"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "9a7f3968c92c6589d3a12aa5448e8374c8d68a42"; - sha256 = "15bqw0l78s8v2l44j4h64lvs7456h5l0dy46kxas095jrjg9aqnw"; + rev = "b47c2e37237875185d170f32cac67af5ab72f22d"; + sha256 = "07y85ah7hqlr9phpd4j6shhsd1q0h1fgb9863hykc3xkg04n401x"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12251,12 +12263,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2022-08-25"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "afb45a55b452b9238159047ce7c6e161bd4a9907"; - sha256 = "0pd6gg0kj12dsfqlv0g48pyppygj8j555aj8x3xh7151vfvrh3zh"; + rev = "bd4c38be5b4882991494cf77c0601a55bc45eebf"; + sha256 = "17yqy79p5i54wkg1wmb32v84s05rfaywx7qzayzs5q485zap4813"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -12287,12 +12299,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-10-10"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "58daf4b1927c4c4fa5377f7527a2d13d06a044f7"; - sha256 = "1k91q2i7pv1yx1mdcwhagwvpi294zbwngvd63xv1wfkwkyi32jcj"; + rev = "9b68ba0bc30d0ddf54ea789496d39c656c8745e1"; + sha256 = "0x6fm977fxm4a05mr3xw9z4rid99zq5s89xl15wq8h8m5j9jx9nk"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -12455,12 +12467,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-10-07"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "b2caf50a6e3c021c92b236abff70bbb467bce24f"; - sha256 = "0dccl6rqvkj7vlx25s7ja5p0nsxzryabd1hpj16r9dnsvklzs1wq"; + rev = "7de8a71e5d6e39a05e259f9ad4dba5e0aee8bbba"; + sha256 = "0ak5v459sw7ryvs6rf5nvwwcsws5qq22jn0cgly7b9z3s861h3c5"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -12743,12 +12755,12 @@ final: prev: vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc.vim"; - version = "2022-02-22"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "3ba46c01109bc590c6740c1133f53584751924b2"; - sha256 = "05m34kbpi6y4rkcrxz785jikj37y5q44k0wfjdhklr49fgw08vra"; + rev = "f396529d7868b43d88978eb347bb203353991184"; + sha256 = "1jn9z0c98hmza5nyjbhyjfdljq9rf8ypjn3q0qq82xxs9xzg9y6w"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -12779,12 +12791,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-10-09"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "90c8b7de334ee778c99eaafee41105808e363f81"; - sha256 = "0hgasj2sr5kh4c70rwgzn2cfpw8vc61m82jjhis15a6bdl2jqw4a"; + rev = "2e309e74c16700cfc5e2c32541e29b95f0a5bdd3"; + sha256 = "1mzyv9xami4y1mjj1hs2vwgfkam9gsvgv1rilb3rkihbzpk89aw0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12792,12 +12804,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-10-03"; + version = "2022-10-13"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "06ae45a2aa9fdee5d479b2ccd1be145d225852e2"; - sha256 = "086qima9v821raw2mbm3wxkfj5l58mwwlbgjnnx5sz9msw7qg7dc"; + rev = "c16a808450da15e456d0b7055ac867886381df54"; + sha256 = "0vnrd0328bisvpy4jlf19mcyl1j2lssssgkf5gwspq6ryd3fiz60"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13141,12 +13153,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-10-11"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "e4ff2a69844f02ef3ee88ca5c5766eb4c7cf0c0c"; - sha256 = "1xb161q8zmb52x1y8v6fvc5snlf47jxwnyams46xq2q2k8x4sjl6"; + rev = "d5f8176232d91c50265f01674d99bf0ab4e79273"; + sha256 = "1i00c70rq62m9dnh4pg7xc852hapl0f162rr255i79amrp7fsvfy"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -13165,12 +13177,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-10-11"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "5375b996a54214d43065017ea06092929d670e9b"; - sha256 = "0dcqxaz2fa2dp1bpq6schdzr4mhm3nckcmaaa9bn213xxa9dv1in"; + rev = "3b8e0f2b664cc234c784ae27ea5d76d1c7d806e9"; + sha256 = "1rk1zgfpm0ikhijs5qh938rkk61b87hcj5cxrcs1kvxlip691lli"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f04511f9a2138..15b7b54e4f0f4 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -522,6 +522,10 @@ self: super: { ''; }; + lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs (old: { + dependencies = with self; [ nvim-lspconfig ]; + }); + lean-nvim = super.lean-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-lspconfig plenary-nvim ]; }); diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 8c90a7ed19b2b..ddecb6489e296 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -328,6 +328,7 @@ https://github.com/udalov/kotlin-vim/,, https://github.com/qnighy/lalrpop.vim/,, https://github.com/sk1418/last256/,, https://github.com/latex-box-team/latex-box/,, +https://github.com/dundalek/lazy-lsp.nvim/,HEAD, https://github.com/kdheepak/lazygit.nvim/,, https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 71c0f3bb55e3b..d140d7d569f2a 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -2,7 +2,6 @@ , unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper , atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap -, writeShellScriptBin # Populate passthru.tests , tests diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 1ae65c1cbf4b4..4c154ebf9cbef 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0ar8gpklaa0aa3k1934jyg2vh65hzncx0awl1f0wz8n4fjasfrpc"; - x86_64-darwin = "0jkpzyg2pk2d88w2ffrp2lr0qadss7ccycx4vpmjmw62d3sap8n1"; - aarch64-linux = "1g7lzqghagz63pljg4wy34z706j70vjmk49cl8v27jbnsgnva56a"; - aarch64-darwin = "132ml95xlyv5c343bfv0gpgr8rmk85xspsy9baninlmhnmy7mivv"; - armv7l-linux = "04anb6r7hkk3y3vahx32nxj5dz2i66rrnl0561xkcjr4cqvxykiw"; + x86_64-linux = "0hj6rpg65ivnnvzfjm16vjpjzzqbabpw5ldrr78x7ddrr06h02z6"; + x86_64-darwin = "01gskihfp5s0j4dw8nxmfsp0sav1zqlmylmvwhi1y2qqq4y9c3w9"; + aarch64-linux = "07n1svlkd2ji4b6yvhci6qvx429xipp8y418cqq3173gw8v59lws"; + aarch64-darwin = "0gr94l7lk54fhhhqbiv23hd7d25xilqlwla2dbs5c171nj9pz325"; + armv7l-linux = "0nxnjrzwfvma9zl4x11r45qwqq8mk91cxg47mg33qgr22lvbgz63"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.71.2"; + version = "1.72.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 49c5cf0004402..5d49c3730165b 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ajls31iqvrcnydwdn2fhajz76j60vsqhn343237jgwfbvaklvav"; - x86_64-darwin = "100p494k1gfzhd86nj9hvh0w73i4wjn2vy6jdpb66rrmswy2hr40"; - aarch64-linux = "066g825s79hmwl5yl7yl0yf6vzr3nagb44bcqw1zp1iqv54f40c6"; - aarch64-darwin = "02aln53zcjp689ivq3ypid2gk9pwbqs24n1ay0hibvrpkx3v4y8k"; - armv7l-linux = "1qvz1233k31baw09p45x67cfadsgm1jnnfc4r8yvrh75iplcspgl"; + x86_64-linux = "1qchwn6dccmq81bmz4zpv5pc6g2gyd7avi9hi1dd099jcxl9xgc8"; + x86_64-darwin = "099s32kbv64s90jy1yrafwmn49f80x4qzq3kwpwpkp6vfsclvnvw"; + aarch64-linux = "1a1rp0gki86dw03lhlnn5l378jd6z7v736x17qsbyc3qfm5schil"; + aarch64-darwin = "153jp14zjzrdw4nwfg9mja0vy9m376dfxf2d6iwb7gl6byvqa1jj"; + armv7l-linux = "1g5dxcly41bxdnfvmybwxrlf2qm3lkb3k0i538wfwxzy8k73i5h5"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.71.2.22258"; + version = "1.72.2.22286"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/applications/emulators/basiliskii/default.nix index ec7076db46787..f32abac9a6b85 100644 --- a/pkgs/applications/emulators/basiliskii/default.nix +++ b/pkgs/applications/emulators/basiliskii/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2 }: stdenv.mkDerivation { pname = "basiliskii"; - version = "unstable-2022-04-05"; + version = "unstable-2022-09-30"; src = fetchFromGitHub { owner = "kanjitalk755"; repo = "macemu"; - rev = "d4baa318e49a29d7ea5fc71a637191d6c470546f"; - sha256 = "jBKTC2fIPJ6mSkMABNxcd2ujXJ+duCXw291iz5ZmiVg="; + rev = "2fa17a0783cf36ae60b77b5ed930cda4dc1824af"; + sha256 = "+jkns6H2YjlewbUzgoteGSQYWJL+OWVu178aM+BtABM="; }; sourceRoot = "source/BasiliskII/src/Unix"; patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; diff --git a/pkgs/applications/emulators/maiko/default.nix b/pkgs/applications/emulators/maiko/default.nix index e78b680d617a8..27f2a38f77a0c 100644 --- a/pkgs/applications/emulators/maiko/default.nix +++ b/pkgs/applications/emulators/maiko/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libX11 }: +{ lib, stdenv, fetchFromGitHub, cmake, xorg }: stdenv.mkDerivation rec { pname = "maiko"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libX11 ]; + buildInputs = [ xorg.libX11 ]; installPhase = '' runHook preInstall find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://interlisp.org/"; license = licenses.mit; maintainers = with maintainers; [ ehmry ]; - inherit (libX11.meta) platforms; + inherit (xorg.libX11.meta) platforms; }; } diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index 4424bedc6f23c..ce0ea6d6de8b8 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -3,12 +3,14 @@ , fetchFromGitHub , SDL2 , cmake -, libepoxy -, ffmpeg_4 +, copyDesktopItems +, ffmpeg , imagemagick , libedit , libelf +, libepoxy , libzip +, lua , makeDesktopItem , minizip , pkg-config @@ -18,31 +20,33 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mgba"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; - rev = version; - hash = "sha256-0ZtoyyoD+YjplJlPFpZgIg5119j/6X8ZaSZP+UpX5K0="; + rev = finalAttrs.version; + hash = "sha256-2thc2v3aD8t1PrREZIjzRuYfP7b3BA7uFb6R95zxsZI="; }; nativeBuildInputs = [ cmake + copyDesktopItems pkg-config wrapQtAppsHook ]; buildInputs = [ SDL2 - libepoxy - ffmpeg_4 + ffmpeg imagemagick libedit libelf + libepoxy libzip + lua minizip qtbase qtmultimedia @@ -79,9 +83,9 @@ stdenv.mkDerivation rec { runners, and a modern feature set for emulators that older emulators may not support. ''; + changelog = "https://github.com/mgba-emu/mgba/blob/${finalAttrs.version}/CHANGES"; license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; platforms = platforms.linux; }; -} -# TODO: use desktopItem functions +}) diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index c861c695598e4..1603639378402 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }: +{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, xcbutil, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { pname = "xfe"; - version = "1.42"; + version = "1.44"; src = fetchurl { - url = "mirror://sourceforge/xfe/xfe-${version}.tar.gz"; - sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; + url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; + sha256 = "594c14d185bdfc7e3132aefda7cf4e233625258ca9a1939359944a2c07c030b6"; }; nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ fox gettext xlibsWrapper gcc file libpng ]; + buildInputs = [ fox gettext xlibsWrapper xcbutil gcc file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index a702eb54c1354..db7278c23bd3b 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -20,7 +20,6 @@ , Cocoa , unixODBC , poppler -, hdf4 , hdf5 , netcdf , sqlite diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index b1259a543c734..ee6403271ce5c 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { homepage = "https://xmlgraphics.apache.org/batik"; license = licenses.asl20; platforms = platforms.unix; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; installPhase = '' diff --git a/pkgs/applications/graphics/ciano/default.nix b/pkgs/applications/graphics/ciano/default.nix index dcaabed6b19c7..7b96dc1f793d5 100644 --- a/pkgs/applications/graphics/ciano/default.nix +++ b/pkgs/applications/graphics/ciano/default.nix @@ -3,14 +3,9 @@ , fetchFromGitHub , desktop-file-utils , ffmpeg -, gobject-introspection , granite , gtk , imagemagick -, libgee -, libhandy -, libsecret -, libsoup , meson , ninja , pkg-config diff --git a/pkgs/applications/graphics/cyan/default.nix b/pkgs/applications/graphics/cyan/default.nix new file mode 100644 index 0000000000000..2e59c6716b71b --- /dev/null +++ b/pkgs/applications/graphics/cyan/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, qt5 +, cmake +, pkg-config +, imagemagick +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "cyan"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "rodlie"; + repo = pname; + rev = version; + hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + ]; + + buildInputs = [ imagemagick ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Image viewer and converter, designed for prepress (print) work"; + homepage = "https://github.com/rodlie/cyan"; + mainProgram = "Cyan"; + license = licenses.cecill21; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index fda56c0d8cb7a..c82f4f4d5f80f 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -4,11 +4,7 @@ , stdenv , python3 , libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, libxcb +, xorg , libxkbcommon , AppKit , IOKit @@ -31,11 +27,11 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ libGL - libX11 - libXcursor - libXi - libXrandr - libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 17537083aaed7..0cc93bbbe8ab7 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -2,7 +2,6 @@ , stdenv , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , ninja , GitPython diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 774e377ca031c..ef731caf1a20e 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , at-spi2-core , babl @@ -7,22 +8,19 @@ , dleyna-renderer , gdk-pixbuf , gegl -, geocode-glib +, geocode-glib_2 , gettext , gexiv2 -, gfbgraph , glib , gnome-online-accounts , gnome , gobject-introspection -, grilo -, grilo-plugins , gsettings-desktop-schemas , gtk3 , itstool , libdazzle +, libportal-gtk3 , libhandy -, libgdata , libxml2 , meson , ninja @@ -36,13 +34,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "42.0"; + version = "43.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JcsoFCUZnex7BF8T8y+PlgNMsMuLlNlvnf+vT1vmhVE="; + sha256 = "x6x0WNUz8p2VUBHHS3YiTXnqMbzBLp1tDOe2w3BNCOE="; }; patches = [ @@ -73,18 +71,15 @@ stdenv.mkDerivation rec { dleyna-renderer gdk-pixbuf gegl - geocode-glib + geocode-glib_2 gexiv2 - gfbgraph glib gnome-online-accounts - grilo - grilo-plugins gsettings-desktop-schemas gtk3 libdazzle + libportal-gtk3 libhandy - libgdata tracker tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 06cab430bc3f1..018d6bf0b7b92 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "501"; + version = "502a"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-dmQD3CAAAhE6IOfT38PHUIlHdDFdk6HZ6ZEZmKw7+WM="; + hash = "sha256-GmYjf2r5dyxkPWTmypChKbkeifCMFKi1lzRhPNe7Ckw="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ python3Packages.buildPythonPackage rec { pyopenssl pyside2 pysocks + python-dateutil python3Packages.mpv pyyaml qtpy @@ -51,7 +52,11 @@ python3Packages.buildPythonPackage rec { twisted ]; - checkInputs = with python3Packages; [ nose mock httmock ]; + checkInputs = with python3Packages; [ + nose + mock + httmock + ]; # most tests are failing, presumably because we are not using test.py checkPhase = '' diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index bc608c6735ffc..9c854d9ffbf38 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, fetchpatch , vala , pkg-config , python3 diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index af1bc78ac32da..5988627d401c9 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -4,12 +4,9 @@ , wrapQtAppsHook , qtmultimedia , qttools -, qtscript , qtdeclarative , qtnetworkauth , qtbase -, autogen -, automake , makeWrapper , catch2 , nodejs diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 21ba5d513751b..a9b0001847181 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -6,11 +6,9 @@ , openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages - , version , kde-channel , sha256 - , callPackage }: diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index fb47a304f2240..86aed684db01a 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, patchelf, fetchurl, p7zip +{ lib, stdenv, fetchurl, p7zip , nss, nspr, libusb1 , qtbase, qtmultimedia, qtserialport , autoPatchelfHook, wrapQtAppsHook diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 5615044b90e7b..1f25332e85269 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -6,8 +6,7 @@ , stdenv , withSixel ? false , libsixel -, libX11 -, libXrandr +, xorg , AppKit , withSki ? true }: @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optional withSixel libsixel - ++ lib.optionals stdenv.isLinux [ libX11 libXrandr ] + ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ]) ++ lib.optional stdenv.isDarwin AppKit; buildNoDefaultFeatures = !withSki; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1087bba9705e8..b1c4f2258f0b0 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchurl +{ lib, fetchFromGitLab, fetchurl , boost, cmake, ffmpeg, qtbase, qtx11extras , qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper , mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 587a078e0660a..962f6dc97acd0 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: +{lib, stdenv, fetchFromGitHub, flex, bison, cmake, zlib}: stdenv.mkDerivation { version = "2018-08-15"; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 52e38b23c1ff2..767b749ef736c 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,7 +1,6 @@ { mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects -, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil -}: +, extra-cmake-modules, poppler, kimageformats, libarchive}: mkDerivation rec { pname = "photoqt"; diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix index 97a3684682d44..58a52aee4943c 100644 --- a/pkgs/applications/graphics/pikopixel/default.nix +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -1,7 +1,6 @@ { lib , fetchurl , gnustep -, gcc , llvmPackages_9 }: diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index deed3d3b88829..8e4c4805750bd 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a4eb306823974..251dfdef32f43 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -6,11 +6,11 @@ , libexif , libgphoto2 , libwebp -, libsoup +, libsoup_3 , libxml2 , vala , sqlite -, webkitgtk +, webkitgtk_4_1 , pkg-config , gnome , gst_all_1 @@ -30,7 +30,6 @@ , wrapGAppsHook , gobject-introspection , itstool -, libgdata , libchamplain , libsecret , gsettings-desktop-schemas @@ -41,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.16"; + version = "0.31.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo="; + sha256 = "sha256-OwSPxs6ZsjLR4OqbjbB0CDyGyI07bWMTaiz4IXqkXBk="; }; nativeBuildInputs = [ @@ -66,10 +65,10 @@ stdenv.mkDerivation rec { libexif libgphoto2 libwebp - libsoup + libsoup_3 libxml2 sqlite - webkitgtk + webkitgtk_4_1 gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-plugins-base @@ -87,7 +86,6 @@ stdenv.mkDerivation rec { librest gcr gnome.adwaita-icon-theme - libgdata libchamplain libsecret ]; diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix index d8f1ae76a887d..cb57f87fc6622 100644 --- a/pkgs/applications/graphics/veusz/default.nix +++ b/pkgs/applications/graphics/veusz/default.nix @@ -1,6 +1,5 @@ { python3Packages , qtbase -, ghostscript , wrapQtAppsHook , lib }: diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/applications/graphics/vimiv-qt/default.nix index 8e0caff1d1759..1b0b2a1516f0b 100644 --- a/pkgs/applications/graphics/vimiv-qt/default.nix +++ b/pkgs/applications/graphics/vimiv-qt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3 , qt5 diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index e656d36a1c9b4..94c948c1c4ea7 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, substituteAll, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools, diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 508f7e79f55e5..b708cb1bd5905 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,5 +1,4 @@ -{ mkDerivation, lib, config -, extra-cmake-modules, kdoctools +{ mkDerivation, lib, extra-cmake-modules, kdoctools , breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n , kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons , libarchive, libzip diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index c7ef5c4615cee..24f93ee0af753 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, fetchpatch, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kholidays, kidentitymanagement, kmime, pimcommon, qttools, diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index 63639800d5f6a..51203271b1ff4 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -1,5 +1,4 @@ { mkDerivation -, fetchFromGitHub , lib , extra-cmake-modules , kdoctools diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index 6080ad5db34bf..1a800525255cd 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, fetchpatch, + mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, kcrash, kdbusaddons, ki18n, kontactinterface, kparts, diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix index 02ab1bd52c205..045c9a3c8d6e3 100644 --- a/pkgs/applications/kde/kalzium.nix +++ b/pkgs/applications/kde/kalzium.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }: +{ mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, qtscript, kparts, kplotting, kunitconversion }: mkDerivation { pname = "kalzium"; diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix index 7251648be09d5..447b2d009b604 100644 --- a/pkgs/applications/kde/kapptemplate.nix +++ b/pkgs/applications/kde/kapptemplate.nix @@ -1,6 +1,5 @@ { lib , mkDerivation -, fetchurl , cmake , extra-cmake-modules , qtbase diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index 60aad7d2a9551..157ca73ecfc13 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -1,6 +1,5 @@ { mkDerivation , extra-cmake-modules -, fetchpatch , kcmutils , kconfigwidgets , kdbusaddons diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix index 5bcb9fb110000..c9a5a61e2812f 100644 --- a/pkgs/applications/kde/kolf.nix +++ b/pkgs/applications/kde/kolf.nix @@ -2,7 +2,7 @@ , mkDerivation , extra-cmake-modules , kdoctools -, libkdegames, kconfig, kio, ktextwidgets +, libkdegames, kio, ktextwidgets }: mkDerivation { diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index eace8660c2eb0..097661d580216 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -2,7 +2,6 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2, - fetchpatch }: mkDerivation { diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix index b14e50f32bcc7..6fe8c55004c2d 100644 --- a/pkgs/applications/kde/libkmahjongg.nix +++ b/pkgs/applications/kde/libkmahjongg.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kwidgetsaddons diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 5e4f448235485..3b27f5b96e30f 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -5,15 +5,15 @@ , atk , cairo , desktop-file-utils -, evolution-data-server +, evolution-data-server-gtk4 , evolution -, gcr +, gcr_4 , gettext , glib , gnome , gpgme , gtk3 -, gtksourceview3 +, gtksourceview4 , gtkspell3 , libcryptui , libxml2 @@ -42,6 +42,20 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; }) + + # Port to Gcr 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/14 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/cd44b476f4ffbf37c5d5f5b996ecd711db925576.patch"; + sha256 = "wJ1035NxgeTwUa0LoNcB6TSLxffoXBR3WbGAGkfggYY="; + }) + + # Port to GtkSourceView 4 + # https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/15 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/0ba7f05cba7feaf2ae2c220596aead5dfc676675.patch"; + sha256 = "5uvHTPzQloEq8SVt3EnZ+8mziBdXsDmu/e92/RtyFzE="; + }) ]; nativeBuildInputs = [ @@ -58,13 +72,13 @@ stdenv.mkDerivation rec { buildInputs = [ atk cairo - evolution-data-server - gcr + evolution-data-server-gtk4 + gcr_4 glib evolution gpgme gtk3 - gtksourceview3 + gtksourceview4 gtkspell3 libcryptui sqlite diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix index d41685821cd7c..cdf6ca3e6f803 100644 --- a/pkgs/applications/misc/authenticator/default.nix +++ b/pkgs/applications/misc/authenticator/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , appstream-glib , clang , desktop-file-utils diff --git a/pkgs/applications/misc/bfcal/default.nix b/pkgs/applications/misc/bfcal/default.nix new file mode 100644 index 0000000000000..695f5bc69b0ca --- /dev/null +++ b/pkgs/applications/misc/bfcal/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchFromSourcehut +, meson +, ninja +, pkg-config +, wrapQtAppsHook +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "bfcal"; + version = "1.0.1"; + + src = fetchFromSourcehut { + owner = "~bitfehler"; + repo = "bfcal"; + rev = "v${version}"; + sha256 = "sha256-5xyBU+0XUNFUGgvw7U8YE64zncw6SvPmbJhc1LY2u/g="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + ]; + + meta = with lib; { + description = "Quickly display a calendar"; + homepage = "https://git.sr.ht/~bitfehler/bfcal"; + license = licenses.gpl3Plus; + platforms = qtbase.meta.platforms; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index da230acbbe685..ada160015bfa2 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "calibre"; - version = "6.6.1"; + version = "6.7.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-jJMHliPTRqiI4Wx5N9qbSryoARcGBisSq6awXIaTk5g="; + hash = "sha256-R1poU9qhqf1DYZJ9tkupJrPR99pn5nTpkS6vkMzrwCg="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index a6efda32d8381..19a2e7aae2a02 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -8,7 +8,6 @@ , libXfixes , libXtst , qtx11extras -, git , knotifications , qtwayland , wayland diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 76a5808963f97..95d3a2aa93336 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav, jq }: +{ lib, stdenv, fetchFromGitHub, python3Packages, libspnav, jq }: let diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 506f26096626d..517b24597a898 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -1,78 +1,78 @@ -{ buildPythonPackage +{ lib , fetchFromGitHub -, databricks-cli -, scipy -, path -, pathspec -, pydantic -, protobuf -, tqdm -, mlflow -, azure-identity -, ruamel-yaml -, emoji -, cookiecutter -, retry -, azure-mgmt-datafactory -, azure-mgmt-subscription -, pytestCheckHook -, pytest-asyncio -, pytest-timeout -, pytest-mock -, lib , git +, python3 }: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "dbx"; - version = "0.6.8"; + version = "0.7.6"; + format = "setuptools"; src = fetchFromGitHub { owner = "databrickslabs"; repo = "dbx"; rev = "v${version}"; - sha256 = "sha256-Ou+VdHFVQzmsxJiyaeDd/+FqHvJZeNGB+OXyoagJwtk="; + hash = "sha256-P/cniy0xYaDoUbKdvV7KCubCpmOAhYp3cg2VBRA+a6I="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + click + cookiecutter + cryptography databricks-cli - scipy - path + jinja2 + mlflow pathspec pydantic - protobuf - tqdm - mlflow - azure-identity - ruamel-yaml - emoji - cookiecutter + pyyaml + requests retry - azure-mgmt-datafactory - azure-mgmt-subscription - ]; + rich + typer + watchdog + ] ++ typer.optional-dependencies.all; checkInputs = [ - pytestCheckHook + git + ] ++ (with python3.pkgs; [ pytest-asyncio - pytest-timeout pytest-mock - git - ]; + pytest-timeout + pytestCheckHook + ]); + + postPatch = '' + substituteInPlace setup.py \ + --replace "mlflow-skinny>=1.28.0,<=2.0.0" "mlflow" \ + --replace "rich==12.5.1" "rich" + ''; preCheck = '' - export HOME=$TMPDIR + export HOME=$(mktemp -d) + export PATH="$PATH:$out/bin" ''; + pytestFlagsArray = [ + "tests/unit" + ]; + disabledTests = [ - # fails because of dbfs CLI wrong call + # Fails because of dbfs CLI wrong call "test_dbfs_unknown_user" "test_dbfs_no_root" + # Requires pylint, prospector, pydocstyle + "test_python_basic_sanity_check" + ]; + + pythonImportsCheck = [ + "dbx" ]; meta = with lib; { - homepage = "https://github.com/databrickslabs/dbx"; description = "CLI tool for advanced Databricks jobs management"; + homepage = "https://github.com/databrickslabs/dbx"; license = licenses.databricks-dbx; maintainers = with maintainers; [ GuillaumeDesforges ]; }; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index a6545db64cad0..452c1edc99f81 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, qtbase, fetchpatch, wrapQtAppsHook +{ lib, stdenv, fetchFromGitHub, python3Packages, wrapQtAppsHook , secp256k1 }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/applications/misc/endeavour/default.nix index 582a0772a6804..3c48efe66c474 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/applications/misc/endeavour/default.nix @@ -5,8 +5,7 @@ , meson , ninja , pkg-config -, python3 -, wrapGAppsHook +, wrapGAppsHook4 , gettext , gnome , glib @@ -17,24 +16,24 @@ , gnome-online-accounts , gsettings-desktop-schemas , libportal-gtk4 -, evolution-data-server +, evolution-data-server-gtk4 , libical , librest , json-glib , itstool -, unstableGitUpdater +, gitUpdater }: stdenv.mkDerivation rec { - pname = "gnome-todo"; - version = "unstable-2022-06-12"; + pname = "endeavour"; + version = "42.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "gnome-todo"; - rev = "ad4e15f0b58860caf8c6d497795b83b594a9c3e5"; - sha256 = "HRufLoZou9ssQ/qoDG8anhOAtl8IYvFpyjq/XJlsotQ="; + owner = "World"; + repo = "Endeavour"; + rev = "v${version}"; + sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ="; }; patches = [ @@ -45,6 +44,20 @@ stdenv.mkDerivation rec { extraPrefix = ""; name = "gnome-todo_meson-build.patch"; }) + + # build: Fix building with -Werror=format-security + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch"; + sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo="; + }) + + # build: Use GNOME module post_install() + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/135 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/a8daa1d8acd0a5da7aef54d6e16d8a585c71e555.patch"; + sha256 = "sha256-zUTQ36eUMOY9ODAgwSKUhSlB9Cj0Yu/60KjFFW5fx2I="; + }) ]; nativeBuildInputs = [ @@ -52,8 +65,7 @@ stdenv.mkDerivation rec { ninja pkg-config gettext - python3 - wrapGAppsHook + wrapGAppsHook4 itstool ]; @@ -69,26 +81,22 @@ stdenv.mkDerivation rec { # Plug-ins libportal-gtk4 # background - evolution-data-server # eds + evolution-data-server-gtk4 # eds libical librest # todoist json-glib # todoist ]; - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py - patchShebangs build-aux/meson/meson_post_install.py - ''; - passthru = { - updateScript = unstableGitUpdater { - url = "https://gitlab.gnome.org/GNOME/gnome-todo.git"; + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; }; }; meta = with lib; { description = "Personal task manager for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Todo"; + homepage = "https://gitlab.gnome.org/World/Endeavour"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index dcb5d6c9f3260..ead8475e4346e 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.23.2"; + version = "1.23.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/jkzwFBBwkfymxmD6bXj0ZAlN4RV+UERg2kRtDyIV94="; + sha256 = "sha256-CoZN0cLXSujZRSGFX3dsNGuvgupa4t1VrEoW+Zu41yw="; }; propagatedBuildInputs = [ requests yt-dlp ]; @@ -22,6 +22,8 @@ buildPythonApplication rec { "--ignore=test/test_ytdl.py" ]; + pythonImportsCheck = [ "gallery_dl" ]; + meta = with lib; { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 137682c397744..4fe60064cd59f 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, fetchpatch, pkg-config, exiv2, libxml2, gtk3 +{ fetchFromGitHub, lib, stdenv, pkg-config, exiv2, libxml2, gtk3 , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 56b721f37b860..58a18f59b5b6c 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "22.1"; + version = "22.2"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-Its8w+4IAPlNnOYewrTItYWw/7IcAfCK1EnAzun4ScI="; + sha256 = "sha256-7T7UmS650VvYN29vQxemzsaxF5wPFF+yCNCTyXY7nmY="; }; dontUnpack = true; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 1619f7f433422..c196a107f0068 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, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 2973ac81539c1..d7177906287ef 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.5"; + version = "11.6"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-bA5C+BFqeOS0oFgz/qlYOFMsuh3L/U6QJbzOcRQkNhY="; + hash = "sha256-kwEltkLcMCZlUJyE+nyy70WboVO1FgMw0cH1hxLVtKQ="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 10dd5bd545c31..d9e0204be322b 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkgs -, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive +, glib, gtk3, gtksourceview3, gtkspell3, poppler, texlive , pkg-config, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 2f6df287197f1..695706cefc5b8 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3, fetchpatch }: +{ lib, fetchFromGitHub, python3 }: let diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index f55752a229238..b9f78afda4bb3 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, undaemonize, unwrapped ? callPackage ./runtime.nix {} }: +{ lib, stdenv, writeScript, callPackage, buildFHSUserEnv, unwrapped ? callPackage ./runtime.nix {} }: buildFHSUserEnv rec { name = "houdini-${unwrapped.version}"; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index 6d78dd559c26f..a68ec733ab714 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -4,12 +4,8 @@ , stdenv , pkg-config , fontconfig -, libXcursor -, libXi -, libXrandr -, libxcb +, xorg , libGL -, libX11 , openssl , AppKit , ApplicationServices @@ -42,10 +38,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ fontconfig - libXcursor - libXi - libXrandr - libxcb + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit @@ -64,7 +60,7 @@ rustPlatform.buildRustPackage rec { postFixup = lib.optionalString stdenv.isLinux '' patchelf $out/bin/inlyne \ - --add-rpath ${lib.makeLibraryPath [ libGL libX11 ]} + --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]} ''; meta = with lib; { diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 15ef5d3b4c602..99e7850cbbea8 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,30 +1,29 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.3.1) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) colorator (1.1.0) - concurrent-ruby (1.1.8) - em-websocket (0.5.2) + concurrent-ruby (1.1.10) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.0) + ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.14.0) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) - i18n (1.8.10) + http_parser.rb (0.8.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (4.2.0) + jekyll (4.2.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -39,14 +38,14 @@ GEM rouge (~> 3.0) safe_yaml (~> 1.0) terminal-table (~> 2.0) - jekyll-avatar (0.7.0) + jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (2.1.0) + jekyll-sass-converter (2.2.0) sassc (> 2.0.1, < 3.0) - jekyll-seo-tag (2.7.1) + jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) @@ -56,38 +55,37 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.1) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.5.1) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.5.0) - minitest (5.14.4) - nokogiri (1.11.2) - mini_portile2 (~> 2.5.0) + mini_portile2 (2.8.0) + minitest (5.16.3) + nokogiri (1.13.8) + mini_portile2 (~> 2.8.0) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - racc (1.5.2) - rb-fsevent (0.10.4) + public_suffix (5.0.0) + racc (1.6.0) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.4) - rouge (3.26.0) + rexml (3.2.5) + rouge (3.30.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (1.7.0) - zeitwerk (2.4.2) + unicode-display_width (1.8.0) PLATFORMS ruby @@ -101,4 +99,4 @@ DEPENDENCIES jemoji BUNDLED WITH - 2.1.4 + 2.3.22 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index fadbf8e32ba81..54cf7534fabf5 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0khgrb7zn611xjnmygv5wdxh7wq645f613wldn5397q5w3l9lc"; + sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; type = "gem"; }; - version = "6.1.3.1"; + version = "7.0.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.1"; }; colorator = { groups = ["default"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.10"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb"; + sha256 = "1a66b0kjk6jx7pai9gc7i27zd0a128gy73nmas98gjz6wjyr4spm"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.3"; }; eventmachine = { groups = ["default"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.5"; }; forwardable-extended = { groups = ["default"]; @@ -98,20 +98,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "080sn9z1a64gv04p318jz10y6lv6qd3avip08rrcmq9k4ihai0f1"; + sha256 = "180kjksi0sdlqb0aq0bhal96ifwqm25hzb3w709ij55j51qls7ca"; type = "gem"; }; - version = "2.14.0"; + version = "2.14.3"; }; "http_parser.rb" = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + sha256 = "1gj4fmls0mf52dlr928gaq0c0cb0m3aqa9kaa6l0ikl2zbqk42as"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "1.8.10"; + version = "1.12.0"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq"; + sha256 = "0dpvkd7i9szkps2acxbdqajn4qc9sqxxy80f3rf5dra1vj7yrhpp"; type = "gem"; }; - version = "4.2.0"; + version = "4.2.2"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -141,10 +141,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; + sha256 = "0jzxmfcljfvjz21wls2w5mr2m5qp0mq9c80j009s4m6yq9vn4wza"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; jekyll-mentions = { dependencies = ["html-pipeline" "jekyll"]; @@ -163,10 +163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04ncr44wrilz26ayqwlg7379yjnkb29mvx4j04i62b7czmdrc9dv"; + sha256 = "077xkkkb592vg8kxdia9jwsaz1bc70lkpf4hdvazjqphn5hlz2bi"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; jekyll-seo-tag = { dependencies = ["jekyll"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fsi75hymk2wswy216fs224p5ycrzjw1kshw1bsl5czhv42wr2w3"; + sha256 = "0638mqhqynghnlnaz0xi1kvnv53wkggaq94flfzlxwandn8x2biz"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.0"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -218,10 +218,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar"; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; + sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; type = "gem"; }; - version = "3.5.1"; + version = "3.7.1"; }; mercenary = { groups = ["default"]; @@ -270,20 +270,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.5.0"; + version = "2.8.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "5.14.4"; + version = "5.16.3"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -291,10 +291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; + sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; type = "gem"; }; - version = "1.11.2"; + version = "1.13.8"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -312,30 +312,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.6"; + version = "5.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; rb-fsevent = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; type = "gem"; }; - version = "0.10.4"; + version = "0.11.2"; }; rb-inotify = { dependencies = ["ffi"]; @@ -353,20 +353,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; + sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; type = "gem"; }; - version = "3.26.0"; + version = "3.30.0"; }; safe_yaml = { groups = ["default"]; @@ -406,29 +406,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; - type = "gem"; - }; - version = "1.7.0"; - }; - zeitwerk = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; type = "gem"; }; - version = "2.4.2"; + version = "1.8.0"; }; } diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 7ea488659f26c..510e06ab53bf9 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -36,6 +36,8 @@ in bundlerApp { wrapProgram $out/bin/jekyll --prefix PATH : ${rubyWrapper}/bin ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "A blog-aware, static site generator, written in Ruby"; longDescription = '' diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index b3d3b9ca4993d..3d1a021307361 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,44 +1,43 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.3.1) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - classifier-reborn (2.2.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + classifier-reborn (2.3.0) fast-stemmer (~> 1.0) + matrix (~> 0.4) coderay (1.1.3) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) colorator (1.1.0) - concurrent-ruby (1.1.8) - em-websocket (0.5.2) + concurrent-ruby (1.1.10) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (1.3.0) - faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday-net_http (1.0.1) + execjs (2.8.1) + faraday (2.6.0) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.1) fast-stemmer (1.0.2) - ffi (1.15.0) + ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.14.0) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) - i18n (1.8.10) + http_parser.rb (0.8.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (4.2.0) + jekyll (4.2.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -53,12 +52,12 @@ GEM rouge (~> 3.0) safe_yaml (~> 1.0) terminal-table (~> 2.0) - jekyll-avatar (0.7.0) + jekyll-avatar (0.8.0) jekyll (>= 3.0, < 5.0) jekyll-coffeescript (2.0.0) coffee-script (~> 2.2) coffee-script-source (~> 1.12) - jekyll-feed (0.15.1) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) @@ -66,13 +65,13 @@ GEM html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-polyglot (1.4.0) + jekyll-polyglot (1.5.1) jekyll (>= 3.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (2.1.0) + jekyll-sass-converter (2.2.0) sassc (> 2.0.1, < 3.0) - jekyll-seo-tag (2.7.1) + jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) @@ -82,7 +81,7 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.1) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -92,47 +91,50 @@ GEM liquid (4.0.3) liquid-c (4.0.0) liquid (>= 3.0.0) - listen (3.5.1) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + matrix (0.4.2) mercenary (0.4.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0225) - mini_portile2 (2.5.0) - minitest (5.14.4) - multipart-post (2.1.1) - nokogiri (1.11.2) - mini_portile2 (~> 2.5.0) + mime-types-data (3.2022.0105) + mini_portile2 (2.8.0) + minitest (5.16.3) + nokogiri (1.13.8) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - octokit (4.20.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - racc (1.5.2) - rb-fsevent (0.10.4) + psych (4.0.6) + stringio + public_suffix (5.0.0) + racc (1.6.0) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.3.0) - rexml (3.2.4) - rouge (3.26.0) - ruby2_keywords (0.0.4) + rdoc (6.4.0) + psych (>= 4.0.0) + rexml (3.2.5) + rouge (3.30.0) + ruby2_keywords (0.0.5) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) + stringio (3.0.2) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) tomlrb (1.3.0) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (1.7.0) - yajl-ruby (1.4.1) - zeitwerk (2.4.2) + unicode-display_width (1.8.0) + yajl-ruby (1.4.3) PLATFORMS ruby @@ -159,4 +161,4 @@ DEPENDENCIES yajl-ruby (~> 1.4) BUNDLED WITH - 2.1.4 + 2.3.22 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 7a6814aaa32db..08e93427769cc 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l0khgrb7zn611xjnmygv5wdxh7wq645f613wldn5397q5w3l9lc"; + sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; type = "gem"; }; - version = "6.1.3.1"; + version = "7.0.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,13 +16,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.1"; }; classifier-reborn = { - dependencies = ["fast-stemmer"]; + dependencies = ["fast-stemmer" "matrix"]; groups = ["default"]; platforms = [{ engine = "maglev"; @@ -39,10 +39,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04nxmm5b7j7r0ij9pcpdr7xqpig559gfzrw042ycxcfyav2pv6ij"; + sha256 = "077n3vs2sbl0nnvmi1mvlfpi1qkn1p5m3ac8bpacifa2vqi668z2"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; coderay = { groups = ["default"]; @@ -90,10 +90,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.10"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -101,10 +101,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb"; + sha256 = "1a66b0kjk6jx7pai9gc7i27zd0a128gy73nmas98gjz6wjyr4spm"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.3"; }; eventmachine = { groups = ["default"]; @@ -121,31 +121,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; + sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.1"; }; faraday = { - dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; type = "gem"; }; - version = "1.3.0"; + version = "2.6.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq"; type = "gem"; }; - version = "1.0.1"; + version = "3.0.1"; }; fast-stemmer = { groups = ["default"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.5"; }; forwardable-extended = { groups = ["default"]; @@ -205,20 +205,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "080sn9z1a64gv04p318jz10y6lv6qd3avip08rrcmq9k4ihai0f1"; + sha256 = "180kjksi0sdlqb0aq0bhal96ifwqm25hzb3w709ij55j51qls7ca"; type = "gem"; }; - version = "2.14.0"; + version = "2.14.3"; }; "http_parser.rb" = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + sha256 = "1gj4fmls0mf52dlr928gaq0c0cb0m3aqa9kaa6l0ikl2zbqk42as"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -226,10 +226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "1.8.10"; + version = "1.12.0"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -237,10 +237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq"; + sha256 = "0dpvkd7i9szkps2acxbdqajn4qc9sqxxy80f3rf5dra1vj7yrhpp"; type = "gem"; }; - version = "4.2.0"; + version = "4.2.2"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -248,10 +248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; + sha256 = "0jzxmfcljfvjz21wls2w5mr2m5qp0mq9c80j009s4m6yq9vn4wza"; type = "gem"; }; - version = "0.7.0"; + version = "0.8.0"; }; jekyll-coffeescript = { dependencies = ["coffee-script" "coffee-script-source"]; @@ -270,10 +270,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zxqkrnix0xiw98531h5ga6h69jhzlx2jh9qhvcl67p8nq3sgza9"; + sha256 = "1hzwmjrxi57x68i7jx5rxi8qlcbqcbg3di55wywrp53pr0bap6k8"; type = "gem"; }; - version = "0.15.1"; + version = "0.17.0"; }; jekyll-gist = { dependencies = ["octokit"]; @@ -313,10 +313,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0klf363dsdsi90rsnc9047b3hbg88gagkq2sqzmmg5r1nhy7hyyr"; + sha256 = "0lx24z2smi6isbdx0afjy68wla579alvljmq8z137b9f7ja2ww0y"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.1"; }; jekyll-redirect-from = { dependencies = ["jekyll"]; @@ -335,10 +335,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04ncr44wrilz26ayqwlg7379yjnkb29mvx4j04i62b7czmdrc9dv"; + sha256 = "077xkkkb592vg8kxdia9jwsaz1bc70lkpf4hdvazjqphn5hlz2bi"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; jekyll-seo-tag = { dependencies = ["jekyll"]; @@ -346,10 +346,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fsi75hymk2wswy216fs224p5ycrzjw1kshw1bsl5czhv42wr2w3"; + sha256 = "0638mqhqynghnlnaz0xi1kvnv53wkggaq94flfzlxwandn8x2biz"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.0"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -390,10 +390,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar"; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; type = "gem"; }; - version = "2.3.1"; + version = "2.4.0"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -468,10 +468,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj"; + sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; type = "gem"; }; - version = "3.5.1"; + version = "3.7.1"; + }; + matrix = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "mswin"; + } { + engine = "rbx"; + } { + engine = "ruby"; + }]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + type = "gem"; + }; + version = "0.4.2"; }; mercenary = { groups = ["default"]; @@ -489,50 +511,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; type = "gem"; }; - version = "3.3.1"; + version = "3.4.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "3.2021.0225"; + version = "3.2022.0105"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.5.0"; + version = "2.8.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; - type = "gem"; - }; - version = "5.14.4"; - }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "2.1.1"; + version = "5.16.3"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -540,10 +552,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; + sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; type = "gem"; }; - version = "1.11.2"; + version = "1.13.8"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -551,10 +563,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; + sha256 = "15lvy06h276jryxg19258b2yqaykf0567sp0n16yipywhbp94860"; type = "gem"; }; - version = "4.20.0"; + version = "4.25.1"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -567,35 +579,46 @@ }; version = "0.16.2"; }; - public_suffix = { + psych = { + dependencies = ["stringio"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "0xmq609h7j0xjr7jwayg8kmvcpp347cp0wnyq7jgpn58vk1ja17p"; type = "gem"; }; version = "4.0.6"; }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + type = "gem"; + }; + version = "5.0.0"; + }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; rb-fsevent = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; type = "gem"; }; - version = "0.10.4"; + version = "0.11.2"; }; rb-inotify = { dependencies = ["ffi"]; @@ -609,44 +632,45 @@ version = "0.10.1"; }; rdoc = { + dependencies = ["psych"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rz1492df18161qwzswm86gav0dnqz715kxzw5yfnv0ka43d4zc4"; + sha256 = "1bxzcvxvrmb1ngxz0bgz1va4q9c4w8m6gc8lmdhi6gnvaaf98gsy"; type = "gem"; }; - version = "6.3.0"; + version = "6.4.0"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; + sha256 = "1dnfkrk8xx2m8r3r9m2p5xcq57viznyc09k7r3i4jbm758i57lx3"; type = "gem"; }; - version = "3.26.0"; + version = "3.30.0"; }; ruby2_keywords = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; safe_yaml = { groups = ["default"]; @@ -675,10 +699,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.2"; + }; + stringio = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jns0x5lbafyqyx7pgzfs6i4ykc7p6zg7gxa6hd82w40n6z9rdvi"; + type = "gem"; + }; + version = "3.0.2"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -707,20 +741,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; yajl-ruby = { groups = ["default"]; @@ -739,19 +773,9 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; - type = "gem"; - }; - version = "1.4.1"; - }; - zeitwerk = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; + sha256 = "1lni4jbyrlph7sz8y49q84pb0sbj82lgwvnjnsiv01xf26f4v5wc"; type = "gem"; }; - version = "2.4.2"; + version = "1.4.3"; }; } diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 6b594f196c942..b001b50c40126 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub +{ lib, stdenv, runCommand, fetchzip, fetchurl, fetchFromGitHub , cmake, pkg-config, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index 54f0fe1a7d379..d1f6094753989 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -1,7 +1,6 @@ { mkDerivation , extra-cmake-modules , fetchFromGitHub -, kdoctools , kiconthemes , kio , kjobwidgets diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 8f66eb87c24fc..85b409fe5ef31 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.23"; + version = "1.2.24"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-Sr20WAJLKy/vaCw76abq8qoKWZbuVgqjlCTZom/puPU="; + sha256 = "sha256-s//GkCKvppqJ+7x8pNwVEaBsUOCKCGt+wLj9P+3N9hc="; }; dontBuild = true; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index e64feb4165555..7f13494f65f5c 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,7 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , callPackage , pkg-config -, makeWrapper , qmake , qtbase , qtwebengine diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix index 9d365cd328c8b..37f8203e047a5 100644 --- a/pkgs/applications/misc/kiwix/lib.nix +++ b/pkgs/applications/misc/kiwix/lib.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, fetchFromGitHub , meson, ninja, pkg-config , python3 , curl @@ -11,7 +11,6 @@ , gtest }: - stdenv.mkDerivation rec { pname = "kiwix-lib"; version = "10.1.1"; diff --git a/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch b/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch new file mode 100644 index 0000000000000..a639b465c92c5 --- /dev/null +++ b/pkgs/applications/misc/latte-dock/0001-Disable-autostart.patch @@ -0,0 +1,34 @@ +From ad3f083de2dca2b2c5189430d33a78acfbd9d694 Mon Sep 17 00:00:00 2001 +From: Lana Black <lanablack@amok.cc> +Date: Wed, 8 Jun 2022 12:42:31 +0000 +Subject: [PATCH] Disable autostart. + +--- + app/settings/universalsettings.cpp | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp +index c95371db..4efd3ffe 100644 +--- a/app/settings/universalsettings.cpp ++++ b/app/settings/universalsettings.cpp +@@ -74,17 +74,6 @@ UniversalSettings::~UniversalSettings() + + void UniversalSettings::load() + { +- //! check if user has set the autostart option +- bool autostartUserSet = m_universalGroup.readEntry("userConfiguredAutostart", false); +- +- if (!autostartUserSet && !autostart()) { +- //! the first time the application is running and autostart is not set, autostart is enabled +- //! and from now own it will not be recreated in the beginning +- +- setAutostart(true); +- m_universalGroup.writeEntry("userConfiguredAutostart", true); +- } +- + //! init screen scales + m_screenScalesGroup = m_universalGroup.group("ScreenScales"); + +-- +2.36.1 + diff --git a/pkgs/applications/misc/latte-dock/0001-close-user-autostart.patch b/pkgs/applications/misc/latte-dock/0001-close-user-autostart.patch deleted file mode 100644 index 63d5ecd798a60..0000000000000 --- a/pkgs/applications/misc/latte-dock/0001-close-user-autostart.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a162c54ed1fcc39434edf8666c72c305d05e79e6 Mon Sep 17 00:00:00 2001 -From: diffumist <git@diffumist.me> -Date: Mon, 4 Oct 2021 16:58:37 +0800 -Subject: [PATCH] close user config autostart - ---- - app/settings/universalsettings.cpp | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp -index e0010542..82b9e785 100644 ---- a/app/settings/universalsettings.cpp -+++ b/app/settings/universalsettings.cpp -@@ -77,9 +77,6 @@ void UniversalSettings::load() - //! check if user has set the autostart option - bool autostartUserSet = m_universalGroup.readEntry("userConfiguredAutostart", false); - -- if (!autostartUserSet && !autostart()) { -- setAutostart(true); -- } - - //! init screen scales - m_screenScalesGroup = m_universalGroup.group("ScreenScales"); --- -2.33.0 diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 695fe938a9e3e..7e48781f5c471 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,24 +1,27 @@ -{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchurl -, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash, knewstuff }: +{ mkDerivation, lib, cmake, xorg, plasma-framework, plasma-wayland-protocols, fetchFromGitLab +, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, qtwayland, kcrash, knewstuff, wayland }: mkDerivation rec { pname = "latte-dock"; - version = "0.10.4"; - - src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "XRop+MNcbeCcbnL2LM1i67QvMudW3CjWYEPLkT/qbGM="; - name = "${pname}-${version}.tar.xz"; + version = "unstable-2022-09-06"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "plasma"; + repo = "latte-dock"; + rev = "cd36798a61a37652eb549d7dfcdf06d2028eddc4"; + sha256 = "sha256-X2PzI2XJje4DpPh7gTtYnMIwerR1IDY53HImvEtFmF4="; }; - buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; + buildInputs = [ plasma-framework plasma-wayland-protocols qtwayland xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland ]; nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem qtx11extras kcrash knewstuff ]; patches = [ - ./0001-close-user-autostart.patch + ./0001-Disable-autostart.patch ]; + fixupPhase = '' mkdir -p $out/etc/xdg/autostart cp $out/share/applications/org.kde.latte-dock.desktop $out/etc/xdg/autostart @@ -26,7 +29,7 @@ mkDerivation rec { meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; - homepage = "https://github.com/psifidotos/Latte-Dock"; + homepage = "https://invent.kde.org/plasma/latte-dock"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.ysndr ]; diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index ec978b9fc3a2b..b8cb75b057fd1 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, pkg-config, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index e828bd6502dd4..7724976ebabf5 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -14,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.7.8"; + version = "0.7.11"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - sha256 = "sha256-dRYM6alxvhaVTRJPZ/minnEDXrijk8SX2C6/EYhhpEA="; + sha256 = "sha256-Esr1OPyQCCQIOfgkl6RIn93ZaJkF0O2RM9ObIgBlPi4="; }; # No tests diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index c38ee194b4e24..2ef17f9c1cdf3 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.15.9"; + version = "1.0.0"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "1q9almr8k1i2wzksd09libgnvypj5k9j15y6cxg4rgnw32fa152n" else "sha256-Qz1Ic5FtxXIk8J/2spNZaqpPIgx3yNyXiAQllbVrGjw="; + sha256 = if stdenv.isDarwin then "sha256-KVWqdXzbQT93Dj4yesdnfFwAdYin1vfpPsj/ur1AGA0=" else "sha256-H1Cl9SBz/mwN8gezFkcV4KxI7+xVjQV2AtyLKyjVpI8="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 639ad2175b414..29cdac6b8d163 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.3"; + version = "43.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+ty6C/6uHmZyJmJk529j/lq/jw77NL4Ri1qXP7by9yQ="; + sha256 = "HKdaAMSoUSoJ5KJuszn615RNHtQayjL3D2lickQhglA="; }; patches = [ diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 775e4299cef39..de5b3c0d9fb6d 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.07.27-3"; + version = "2022.09.22-3"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-nn24SWyTm8hhj3KrIJWIeOVotV3wn3l7CQopnSCVrX4="; + sha256 = "sha256-b+XPsKeDVj3crOTxb52CxXmldkurVlNcZ/ODuJIbQ2A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/osmscout-server/default.nix b/pkgs/applications/misc/osmscout-server/default.nix index 9f057e3b019a4..c463ade398622 100644 --- a/pkgs/applications/misc/osmscout-server/default.nix +++ b/pkgs/applications/misc/osmscout-server/default.nix @@ -14,13 +14,13 @@ let in mkDerivation rec { pname = "osmscout-server"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "rinigus"; repo = "osmscout-server"; rev = version; - sha256 = "sha256-I14nQL0H2rMga+RDdAjykqmf7QIZveA6oGWu5PfZ89s="; + sha256 = "sha256-ngB3c6rUQ/+AeaJHKAFRl9lCkUobLWSnsn030brB+Bw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix new file mode 100644 index 0000000000000..19a9b18ce193f --- /dev/null +++ b/pkgs/applications/misc/pattypan/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, fetchFromGitHub +, unzip +, jre +, jdk +, ant +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, glib +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "pattypan"; + version = "22.03"; + + src = fetchFromGitHub { + owner = "yarl"; + repo = "pattypan"; + rev = "v${version}"; + sha256 = "0qmvlcqhqw5k500v2xdakk340ymgv5amhbfqxib5s4db1w32pi60"; + }; + + nativeBuildInputs = [ copyDesktopItems jdk ant makeWrapper wrapGAppsHook ]; + buildInputs = [ glib jre ]; + + buildPhase = '' + runHook preBuild + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + ant + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/java + cp pattypan.jar $out/share/java/pattypan.jar + makeWrapper ${jre}/bin/java $out/bin/pattypan \ + --add-flags "-cp $out/share/java/pattypan.jar pattypan.Launcher" + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + desktopName = "Pattypan"; + genericName = "An uploader for Wikimedia Commons"; + categories = [ "Utility" ]; + exec = "pattypan"; + name = "pattypan"; + }) + ]; + + meta = with lib; { + homepage = "https://commons.wikimedia.org/wiki/Commons:Pattypan"; + description = "An uploader for Wikimedia Commons"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ fee1-dead ]; + }; +} diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 966d8207cc0dc..3416bb348567f 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -4,7 +4,6 @@ , qmake , mkDerivation , qtsvg -, libxml2 , postgresql }: diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index f27902a8aac76..fc6b6a1e2d4a5 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -1,30 +1,22 @@ { lib , fetchFromGitHub , bash -, cairo , glib -, qt5 -, hicolor-icon-theme , gdk-pixbuf +, gettext , imagemagick -, desktop-file-utils , ninja , meson , sassc -, ibus -, usbutils -, libxcb , python3Packages , gobject-introspection , gtk3 , wrapGAppsHook -, libappindicator-gtk3 }: python3Packages.buildPythonApplication rec { name = "polychromatic"; version = "0.7.3"; - format = "other"; src = fetchFromGitHub { @@ -41,57 +33,40 @@ python3Packages.buildPythonApplication rec { --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' - substituteInPlace pylib/common.py --replace "/usr/share/polychromatic" "$out/share/polychromatic" + substituteInPlace pylib/common.py \ + --replace "/usr/share/polychromatic" "$out/share/polychromatic" ''; preConfigure = '' scripts/build-styles.sh ''; - buildInputs = [ - cairo - hicolor-icon-theme - ]; - - pythonPath = with python3Packages; [ - openrazer - pyqt5 - pyqtwebengine + nativeBuildInputs = with python3Packages; [ + gettext + gobject-introspection + meson + ninja + sassc + wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ - libxcb - colour colorama - setproctitle + colour + gtk3 openrazer - openrazer-daemon - requests - ibus - usbutils - pyqt5 - libappindicator-gtk3 - ]; - - nativeBuildInputs = with python3Packages; [ + pygobject3 pyqt5 - desktop-file-utils - qt5.wrapQtAppsHook - wrapGAppsHook - ninja - meson - sassc + pyqtwebengine + requests + setproctitle ]; - propagatedNativeBuildInputs = [ - gobject-introspection - gtk3 - gdk-pixbuf - imagemagick - ]; + dontWrapGapps = true; + dontWrapQtApps = true; makeWrapperArgs = [ - "\${qtWrapperArgs[@]}" + "\${gappsWrapperArgs[@]}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 3b61e3dbc1ad6..af7cc7e01a6f1 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,22 +1,26 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo -, qtbase, qtmultimedia, qttools, qtwebengine }: +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo +, qtmultimedia, qttools, qtwebengine, wrapQtAppsHook }: -mkDerivation { +stdenv.mkDerivation rec { pname = "qolibri"; - version = "2019-07-22"; + version = "2.1.4"; src = fetchFromGitHub { owner = "ludios"; repo = "qolibri"; - rev = "b58f9838d39300cba444eba725a369181c5d746b"; - sha256 = "0kcc6dvbcmq9y7hk8mp23pydiaqz6f0clg64d1f2y04ppphmah42"; + rev = version; + sha256 = "jyLF1MKDVH0Lt8lw+O93b+LQ4J+s42O3hebthJk83hg="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; buildInputs = [ - libeb lzo qtbase qtmultimedia qttools qtwebengine + libeb lzo qtmultimedia qtwebengine ]; + postInstall = '' + install -D $src/qolibri.desktop -t $out/share/applications + ''; + meta = with lib; { homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/applications/misc/remarkable/restream/default.nix index c383baaaa9e22..9af70769e3d99 100644 --- a/pkgs/applications/misc/remarkable/restream/default.nix +++ b/pkgs/applications/misc/remarkable/restream/default.nix @@ -1,5 +1,4 @@ { lib -, bash , stdenv , lz4 , ffmpeg-full diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 624da925cc7c6..cca6c5b488720 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.20"; + version = "0.0.21"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "sha256-khQ4Q2y/MJdz5EpfTSrLBROCX2QP2+3PXRO+x+FaXro="; + sha256 = "sha256-PObuO+Aea2MS1DW3/uOS7GajtFUPolDnPgwxYehGPlA="; }; - vendorSha256 = "sha256-gu+BU2tL/xZ7D6lZ1ueO/9IB9H3NNm4mloCZaGqZskU="; + vendorSha256 = "sha256-LmKcHV0aq7NDEwaL+u8zXkbKzzdWD8zmnAGw5xShDYo="; doCheck = false; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 273b2d6046ed8..ea97f8305fee1 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }: +{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }: let version = "2.16.5.1"; diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/applications/misc/rlaunch/default.nix index 206c32987cca6..5622c94d427f8 100644 --- a/pkgs/applications/misc/rlaunch/default.nix +++ b/pkgs/applications/misc/rlaunch/default.nix @@ -1,9 +1,7 @@ { lib , fetchFromGitHub , rustPlatform -, libX11 -, libXft -, libXinerama +, xorg }: rustPlatform.buildRustPackage rec { @@ -21,7 +19,7 @@ rustPlatform.buildRustPackage rec { # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' - patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch + patchelf --set-rpath ${lib.makeLibraryPath (with xorg; [ libX11 libXft libXinerama ])} $out/bin/rlaunch ''; meta = with lib; { diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 0357681b7493e..293f214b60736 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch -, substituteAll , makeWrapper , autoreconfHook diff --git a/pkgs/applications/misc/rofi-power-menu/default.nix b/pkgs/applications/misc/rofi-power-menu/default.nix index 657796a5972a0..e02b7062f4bca 100644 --- a/pkgs/applications/misc/rofi-power-menu/default.nix +++ b/pkgs/applications/misc/rofi-power-menu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rofi }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "rofi-power-menu"; diff --git a/pkgs/applications/misc/sl1-to-photon/default.nix b/pkgs/applications/misc/sl1-to-photon/default.nix index a8a0bfb1e10aa..c924a3ec2bb54 100644 --- a/pkgs/applications/misc/sl1-to-photon/default.nix +++ b/pkgs/applications/misc/sl1-to-photon/default.nix @@ -6,7 +6,6 @@ , numpy , pyphotonfile , shiboken2 -, which }: let version = "0.1.3"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 02bf65761f019..10d4ffc77b4b2 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite , bluez diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 95937ea5f2e3c..4ccddcd70071c 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, fetchPypi , bibtool , pybtex , pymupdf diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 48b1b2d57e05e..422cf8ea76231 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bleakgrey/tootle"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; + broken = true; }; } diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix index 5ee13bb5ee3eb..9a93edb30f617 100644 --- a/pkgs/applications/misc/trenchbroom/default.nix +++ b/pkgs/applications/misc/trenchbroom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, ninja, git, pandoc, pkg-config -, libGL, libGLU, libXxf86vm, freeimage +, libGL, libGLU, freeimage , catch2, fmt, glew, miniz, tinyxml-2, xorg , qtbase, wrapQtAppsHook , copyDesktopItems, makeDesktopItem @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems pkg-config ]; buildInputs = [ - libGL libGLU libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 + libGL libGLU xorg.libXxf86vm freeimage qtbase catch2 fmt glew miniz tinyxml-2 xorg.libSM ]; QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 63a8b485df533..5890ec59acfc7 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -22,8 +22,6 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; version = "5.12.1"; - disabled = python3Packages.isPy27; - src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; sha256 = "sha256-Fd3IOCEeXGV8zGd/8SzrWRsSsZRVePnsDaX8WrBrCOQ="; @@ -31,6 +29,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ distutils_extra + gobject-introspection intltool wrapGAppsHook gdk-pixbuf @@ -40,7 +39,6 @@ python3Packages.buildPythonApplication rec { gdk-pixbuf glib gnome.adwaita-icon-theme - gobject-introspection gtk3 keybinder3 libappindicator diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 0020594bb8cda..2473129bc6dc2 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: +{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook, installShellFiles }: stdenv.mkDerivation rec { pname = "wofi"; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 27694174d7037..5b52caeaf1ad5 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { }; maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; + mainProgram = "wn"; }; } diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 294beb06c5bf8..1af9f8e249e5c 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , curl, db, libgeotiff -, libXpm, libXt, motif, pcre +, xorg, motif, pcre , perl, proj, rastermagick, shapelib }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl db libgeotiff - libXpm libXt motif pcre + xorg.libXpm xorg.libXt motif pcre perl proj rastermagick shapelib ]; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index d056dd66e8da8..ecafb9d5118cc 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,7 +2,7 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{ lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw }: +{ lib, stdenv, fetchurl, makeWrapper, xorg, pkg-config }: stdenv.mkDerivation rec { pname = "xfontsel"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ libX11 libXaw ]; + buildInputs = [ xorg.libX11 xorg.libXaw ]; # Without this, it gets Xmu as a dependency, but without rpath entry NIX_LDFLAGS = "-lXmu"; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index c5900fb9d507e..1040451efae09 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -1,5 +1,4 @@ { stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl -, donateLevel ? 0 }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 13c3f217de39d..3584d24f14944 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, meson, ninja, fetchurl, fetchpatch -, cairo +{ stdenv, lib, meson, ninja, fetchurl, cairo , girara , gtk-mac-integration , gumbo diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index b93fcc1903b33..320938eb39a66 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -31,7 +31,6 @@ , nss , openssl , pango -, procps , python3 , stdenv , systemd diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 2571e3eefd37c..6602e53eff02e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "107.0.5304.29", - "sha256": "1gid36r4hdl3wg2dbdvp847vnzggd2jga4i3pl5mdnvd3f1z0jpd", - "sha256bin64": "039b1yc5x5xgfj8sbc843lpizgmrkppcnmdzqq36zgihhj4mqkrg", + "version": "107.0.5304.36", + "sha256": "1jr5jncc44jqryhg90zc7pnp590qwqdvbc9nkd28418vs0dx98r4", + "sha256bin64": "0lczdihl955vcabr8f46ncglgis4ci8rnjga7dv7wxs4vlyxkhv8", "deps": { "gn": { "version": "2022-09-14", @@ -32,9 +32,9 @@ } }, "dev": { - "version": "108.0.5343.2", - "sha256": "1xg982z01zrv2lfr5qygn4391906m1z3ksi7k1l0i86g777f0ahg", - "sha256bin64": "0pgk3hsw1dxd6z63gpgx5ivjq49lyk608rkidp8i0acmwrvf0fqm", + "version": "108.0.5355.0", + "sha256": "185mj5sm6q2ahf0im52vkys9pcf0zxx849yrnghix3k487z959na", + "sha256bin64": "11gns3f7k1qj3asy5skrc8z3pb6var8lbqqra47c9gs1jby60d6l", "deps": { "gn": { "version": "2022-10-05", diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index d2cb55810eb0b..138af6cc511c8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libX11, bzip2, zlib +{ lib, stdenv, fetchFromGitHub, ncurses, libX11, bzip2, zlib , brotli, zstd, xz, openssl, autoreconfHook, gettext, pkg-config, libev , gpm, libidn, tre, expat , # Incompatible licenses, LGPLv3 - GPLv2 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e09bbef871b59..eeb72590df23e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ ## various stuff that can be plugged in , ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc , gnome/*.gnome-shell*/ -, browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire +, browserpass, gnome-browser-connector, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge , udev @@ -65,7 +65,7 @@ let ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native - ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell + ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix new file mode 100644 index 0000000000000..41021cfdaa7c2 --- /dev/null +++ b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchzip +}: + +stdenv.mkDerivation rec { + pname = "widevine-cdm"; + version = "4.10.2449.0"; + + src = fetchzip { + url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; + sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE="; + stripRoot = false; + }; + + installPhase = '' + install -vD libwidevinecdm.so $out/libwidevinecdm.so + ''; + + meta = with lib; { + description = "Widevine CDM"; + homepage = "https://www.widevine.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ jlamur ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index db4940093b309..72eeda8152955 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, wrapGAppsHook +{ lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook # Buildtime dependencies. , check, pkg-config, xxd diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index cb11708fbee09..98a5b1cf50f84 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -31,14 +31,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "offpunk"; - version = "1.5"; + version = "1.6"; src = fetchFromGitea { domain = "notabug.org"; owner = "ploum"; repo = "offpunk"; rev = "v${finalAttrs.version}"; - sha256 = "1zg13wajsfrl3hli6sihn47db08w037jjq9vgr6m5sjh8r1jb9iy"; + sha256 = "1pfafb96xk7vis26zhfq254waz1ic9p0zdkxwpqs84p3vsmny775"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 27dd55fc787f7..4f10e76d0e4f4 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -12,6 +12,8 @@ , qtbase ? null , qtwebengine ? null , wrapGAppsHook ? null +, enableWideVine ? false +, widevine-cdm }: let isQt6 = mkDerivationWith == null; @@ -149,6 +151,7 @@ buildPythonApplication { --add-flags '--backend ${backend}' --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" ${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''} + ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/libwidevinecdm.so"''} ) ''; @@ -157,6 +160,6 @@ buildPythonApplication { description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ]; - inherit (backendPackage.meta) platforms; + platforms = if enableWideVine then [ "x86_64-linux" ] else backendPackage.meta.platforms; }; } diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/applications/networking/cisco-packet-tracer/7.nix index 422ccd05cffcb..413ed86619673 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/7.nix @@ -1,7 +1,6 @@ { stdenv , lib , buildFHSUserEnvBubblewrap -, callPackage , copyDesktopItems , dpkg , lndir diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix index 05ced41827403..4d4f65c306617 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -3,7 +3,6 @@ , alsa-lib , autoPatchelfHook , buildFHSUserEnvBubblewrap -, callPackage , copyDesktopItems , dbus , dpkg diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 38408ed32ea7c..8ce7b0dcae00b 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.19.8"; + version = "0.20.1"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-o8lBpiR8gIo1kyOTkPOIuMnJbJsi619Zl0bAAFGYM4E="; + sha256 = "sha256-5zchElzEjrIgODRUvQTQwlBz5371iJU5VOpz12Xtbcg="; }; - vendorSha256 = "sha256-aEMRCvZBaY1uwZqKtMmZ4aiPdNmtANcnuE7eykBiTQg="; + vendorSha256 = "sha256-n2yzqNjmPDP+8/ipiuUt6BqFYF0Oh0Y0TCdKsqCcrIQ="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index ef7c3787bdc92..e255611a1b3fc 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.8.2"; + version = "1.10.2"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rDbnny/qRU31ciAXKLGLXS3FhgOpxmkLT4oatYCbt9g="; + sha256 = "sha256-/rxGAfYjV5VzYs9h8eCpz5jhmW7jPdk1XB3bXHH+oQw="; }; - vendorSha256 = "sha256-Kfv3RlH80E/9yf/rvnY5vljaRr4cH5AhgXQn54x72Ds="; + vendorSha256 = "sha256-/b764auKkZF0oMqNlXmsW9aB5gcq4WFQRFjsVhNDiB4="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index ad26d4f6cba98..0c9d90cd8aacd 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-Abp5JetsMqIXZK8BxNa22OBFCxquoLoy3npv6XxCWGo="; + sha256 = "sha256-etH/92Nhl5ZkmBeDtgFN0pLUOzgWhd3lClW4+zXYPr4="; }; - vendorSha256 = "sha256-uWPnBqT6lZSRClw2RyxHEOzue1Azj9VpPaulMA3qlug="; + vendorSha256 = "sha256-tvl0VlMUD7rVlB/OjyptYyllx6brX+ycGTp4In9yEvE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 192f37228a736..13a4d05f52716 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - sha256 = "sha256-XZASej26Mn4tq9c4nvjQNhQZWtu3L6jIgMNhyYyh5IE="; + sha256 = "sha256-g6OwUCUR/F4v62yt3cCnAcys0tYYYrYVHC8vZZF5OQ4="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 55e5c77c733ce..5ec74e95e05cb 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-oYM7T0t/U7Y/O4u3t9eDjfoxjVeNFBPJdlPs+p9PXOM="; + sha256 = "sha256-OyU97zyN7fZMZAD2BEp8TW2z2E9Rl/yeiVkQaJ1GWZk="; }; - vendorSha256 = "sha256-cyqTed3IZ5JFHYTphrOzSmcAc9xyre2LuMC3p0rfh/Y="; + vendorSha256 = "sha256-vyHT/N5lat/vqM2jK4Q+jJOtZpS52YCYGcJqfa5e0KM="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix new file mode 100644 index 0000000000000..9c1b14e6dd200 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, testers +, kubedog +}: + +buildGoModule rec { + pname = "kubedog"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "werf"; + repo = "kubedog"; + rev = "v${version}"; + hash = "sha256-mwITvv2MuqzH1aB4iTVaFfZljyqOAu7vl4cORHT/OXQ="; + }; + + vendorHash = "sha256-HBo26cPiWJPDpsjPYUEBraHB2SZsUttrlBKpB9/SS6o="; + + subPackages = [ "cmd/kubedog" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/werf/kubedog.Version=${src.rev}" + ]; + + # There are no tests. + doCheck = false; + + passthru.tests.version = testers.testVersion { + package = kubedog; + command = "kubedog version"; + version = src.rev; + }; + + meta = with lib; { + description = '' + A tool to watch and follow Kubernetes resources in CI/CD deployment + pipelines + ''; + homepage = "https://github.com/werf/kubedog"; + changelog = "https://github.com/werf/kubedog/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 66a11329d4106..a33328b2b6914 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.23.12"; + version = "1.25.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-PuSjMyve7YxxuVr3ztM6nM86gl3GpcIa+LHajzfXODU="; + sha256 = "sha256-UDulyX1PXyAe4cqtekOY1nmQnmMqVLFuHnCswFfE6v0="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 136828be50389..b109932fb2de4 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.18.5"; + version = "0.19.0"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-Ij+NNaAq3woHze7o14WT3cqKYLD99dU8C6TUsdG2U54="; + sha256 = "sha256-CQlyAgnEWeAfOn6xXeDFEGuSnaGZpGewg1tYYDCw8qE="; }; - vendorSha256 = "sha256-Iry8ZE/HwZEnro7p36KTdy3phydA+fjM4EFg8DneSuA="; + vendorSha256 = "sha256-505nUMuFteOfIurGYRGHqo9diTSEa56tmQZ3jIGtULQ="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 1fa66767931c3..20bba7d405dcf 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { inherit pname ; - version = "1.8.0"; + version = "1.8.1"; tags = lib.optionals enableGateway ["gateway"]; vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng="; @@ -24,7 +24,7 @@ buildGoModule rec { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "sha256-5459Fl7AbzuNGIOfDpVYlhvzLzfLT2Ckhr5omxZr76w="; + sha256 = "sha256-hNfgiMX3aMb8yjXjFKz73MczOeJyOI3Tna/NRSJBSzs="; }; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index d00b1b38b2eef..da602ac6864bd 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.7.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-EzPd4D+pK9mFSoJx9gEWEw9izXum2NgACiBuQ6uTYGo="; + sha256 = "sha256-VJhn3z/utbcZdJjmVzsjyqPfpKMmDXSKUcoALSmawqs="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-bpuEEoWobFPVsNZKKuOKTQGvV+/NAgaM4M63bv5y0Rk="; + vendorSha256 = "sha256-8Sk36IFk3tL/wqDnKJw/K1MtKBZuVRRFkyMl4b/XwDI="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix index 2cfbcaa6bd113..2d01d470c8714 100644 --- a/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "multus-cni"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "k8snetworkplumbingwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U5Ji+f7ckynBVMb4xsmoRZzYJx8obMO+bO9TU6GqcW0="; + sha256 = "sha256-AYSUJEoNYt4DYNcPynRBal5c5QAzRVltkjwoEM66VcY="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix index e89e35cf0f7d4..8c195ec2ffa6d 100644 --- a/pkgs/applications/networking/cluster/rancher/default.nix +++ b/pkgs/applications/networking/cluster/rancher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.6.7"; + version = "2.6.9"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-vSwGUgGREH1veF4NN+LBGRVbuTcio6bcr6HuSN97BJI="; + sha256 = "sha256-co4LVd5A0bJ4CIuCfv6WyV8XCMbPCFAAcV12WekYrw4="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 5f71f8d70cb63..e60c4f14e3064 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -10,7 +10,6 @@ , mock , netaddr , pytestCheckHook -, python3Packages , radish-bdd , semver }: diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 711080c9c0b8b..f48c0177c9ad8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -48,13 +48,13 @@ "version": "2.4.2" }, "alicloud": { - "hash": "sha256-lJsCXLSIbb/jLjNsvU0GFljlrKBR2TDDOGXDhBTaIKI=", + "hash": "sha256-k5WZpqZvoL4R1kQ0CBWK8JLkWCvfpkl1b849ZbJsPxw=", "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.187.0", + "rev": "v1.188.0", "vendorHash": null, - "version": "1.187.0" + "version": "1.188.0" }, "ansible": { "hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=", @@ -120,13 +120,13 @@ "version": "2.29.0" }, "azurerm": { - "hash": "sha256-3dJ/nXpMYEK7sB6VAnkbUfQRoCsiqXhBkU6gCYBpmHY=", + "hash": "sha256-MWbw0E5TtqHaoU9nxeMVrUCPlRE73KYxvC6A6tMrjC0=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.26.0", + "rev": "v3.27.0", "vendorHash": null, - "version": "3.26.0" + "version": "3.27.0" }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", @@ -385,13 +385,13 @@ "version": "2.2.2" }, "fastly": { - "hash": "sha256-CafrOJiDkIrRph8X+EvvBkI1T7j0qUlOnyhrylToJ7s=", + "hash": "sha256-WxFkJBi87IvO4a/8bmftMKCc/JcfoQILCtklvr9bcuc=", "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v2.3.3", + "rev": "v2.4.0", "vendorHash": null, - "version": "2.3.3" + "version": "2.4.0" }, "flexibleengine": { "hash": "sha256-2eXNumT1Hkc33bW635qYr5jxlByX+yZ8zSKRpgKWQJo=", @@ -423,13 +423,13 @@ "version": "2.2.0" }, "github": { - "hash": "sha256-NJ5HvW3LOvshzea7t0/sAsp3SqiXErXd32Ej0Qp4zsk=", + "hash": "sha256-dUL01cuP5fQdPPm6+R1XDQNups5BJC2oq8LSjJ1+tB0=", "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v5.3.0", + "rev": "v5.5.0", "vendorHash": null, - "version": "5.3.0" + "version": "5.5.0" }, "gitlab": { "hash": "sha256-eNd1o0UjG6A9OTRmcJfcPLLtWIJmdZ+viDnSZhyHpgY=", @@ -479,13 +479,13 @@ "version": "1.29.0" }, "gridscale": { - "hash": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=", + "hash": "sha256-3JB82wbZ6mosFJZ96rGOnv/f1VFhHk6WEfm2u6sop2E=", "owner": "gridscale", "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.15.0", + "rev": "v1.16.0", "vendorHash": null, - "version": "1.15.0" + "version": "1.16.0" }, "hcloud": { "hash": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=", @@ -497,13 +497,13 @@ "version": "1.35.2" }, "helm": { - "hash": "sha256-oX6pchJcgv9w5xLGe09GBzngz9+a/OZn6FTBWURgiLk=", + "hash": "sha256-s8ZOzTG3qux+4Yh1wj3ArjB1uJ32bdGhxY9iSL5LOK8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/helm", "repo": "terraform-provider-helm", - "rev": "v2.7.0", + "rev": "v2.7.1", "vendorHash": null, - "version": "2.7.0" + "version": "2.7.1" }, "heroku": { "hash": "sha256-V6jShbhVwsUTxj2tp2msIseZnckHgB7bBswqIRlrwjQ=", @@ -515,13 +515,13 @@ "version": "5.1.5" }, "hetznerdns": { - "hash": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=", + "hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=", "owner": "timohirt", "provider-source-address": "registry.terraform.io/timohirt/hetznerdns", "repo": "terraform-provider-hetznerdns", - "rev": "v2.1.0", + "rev": "v2.2.0", "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=", - "version": "2.1.0" + "version": "2.2.0" }, "htpasswd": { "hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=", @@ -543,13 +543,13 @@ "version": "3.1.0" }, "huaweicloud": { - "hash": "sha256-Hr60bx3fGpfSxQAwGckhmZ80Iw/bPKLNDXeVXV1GTdo=", + "hash": "sha256-QBRnlBR+gPMy9gtM2P93Lot4GDW94z7B4BgYs+lT5IQ=", "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.41.0", + "rev": "v1.41.1", "vendorHash": null, - "version": "1.41.0" + "version": "1.41.1" }, "huaweicloudstack": { "hash": "sha256-WSJDp+LFjVPquQVMgib/YZV35kktLH2vMCIZJWqakXs=", @@ -615,13 +615,13 @@ "version": "0.3.0" }, "keycloak": { - "hash": "sha256-5IMSUSaSoe+zqwtcL6aQ7PTtLpNiWxYp/J38Zm+Hniw=", + "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=", "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v4.0.0", + "rev": "v4.0.1", "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8=", - "version": "4.0.0" + "version": "4.0.1" }, "ksyun": { "hash": "sha256-sfvmDByxAQbbdPHb9l5tIT5dyu8eA3r63i5FZJYEYTI=", @@ -669,13 +669,13 @@ "version": "0.7.0" }, "linode": { - "hash": "sha256-FtJYpHmXkXBIcxlrUN9hOid3x4wMSk5NI2CFzmwniu4=", + "hash": "sha256-bwVHrgcxc2W5Lx1aheqkdgwfrFfk4YAhD5bqvHdcxtI=", "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.29.3", + "rev": "v1.29.4", "vendorHash": "sha256-D7WZ2Ep/W8aCCFOVgsveJKAIg/j5l9fEnnXLMobICnc=", - "version": "1.29.3" + "version": "1.29.4" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -741,13 +741,13 @@ "version": "3.3.0" }, "minio": { - "hash": "sha256-57wks4TYv7+kUPEhlj8V/X1fQ0/J/kbsuFQFlPxXwns=", + "hash": "sha256-9EpVDRX5rPJ1TIlC+gI79AC442cBzWq76ebFLKPbwmc=", "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.6.0", - "vendorHash": "sha256-0pWW7CDVwVombuKqAwzmkJmLpB1RCuV2SEoQnWppA1M=", - "version": "1.6.0" + "rev": "v1.7.0", + "vendorHash": "sha256-DDP/YAZ5CVcQWxG6+RTw8ihrk9wADAckpWx2x1I0MDE=", + "version": "1.7.0" }, "mongodbatlas": { "hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=", @@ -777,13 +777,13 @@ "version": "0.6.12" }, "newrelic": { - "hash": "sha256-2JYRvlpHqEU5VPVhZlBkMYD88L7vMjELFWDY9eJYkK8=", + "hash": "sha256-Sm5GwfILRCg0/gTNJtrDrWZY+uBXvuTYtrrtTnugP9Q=", "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.4.4", - "vendorHash": "sha256-vtpRDE6tAhJGtYDG65NvtKx/fyt0yBqJTg5s5kXls+8=", - "version": "3.4.4" + "rev": "v3.5.0", + "vendorHash": "sha256-1D66m18oWwuXgBIWstRWvjfy9iGrmO3gyVBucdPps2c=", + "version": "3.5.0" }, "nomad": { "hash": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=", @@ -1012,13 +1012,13 @@ "version": "1.2.1" }, "selectel": { - "hash": "sha256-27Sdez4coJ4Enc1zTg4lr1SzlW3r6wCjciC5ID8vo0w=", + "hash": "sha256-2PwqVzwl8UIO+334lp9zkwkr2zAdI8S/rO+6iqTLu+I=", "owner": "selectel", "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", - "rev": "v3.8.4", - "vendorHash": "sha256-kmsO9jFoR/93PkOeIo0pkS/OjE+m3QbIspobAv/9+KI=", - "version": "3.8.4" + "rev": "v3.8.5", + "vendorHash": "sha256-/7YQa84hOrOAGQSW1kVE27aM2253IB4pvA0ASAJe8VQ=", + "version": "3.8.5" }, "sentry": { "hash": "sha256-dNyUp+gXrOvMQu5tEnv2dOsXihyd19gdYakIo7+h3pY=", @@ -1075,13 +1075,13 @@ "version": "0.7.1" }, "spotinst": { - "hash": "sha256-D/HFeozi5IRj7G+pRzY/V98+oejfmQlW4y6ddob7OBI=", + "hash": "sha256-hlTeN8dQWHU4yHDUqCeBbfapDI1lbxj05FlUN+vUOuM=", "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.84.0", + "rev": "v1.85.0", "vendorHash": "sha256-BDYX/4D3R2A1w3k14mON/2KZUg2kPbwePXQQpVanqdU=", - "version": "1.84.0" + "version": "1.85.0" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", @@ -1093,13 +1093,13 @@ "version": "1.4.0" }, "statuscake": { - "hash": "sha256-wpDe+mtFh96qIbtfg+uilklvFNftQxqF9DOuudKLMm0=", + "hash": "sha256-rT+NJBPA73WCctlZnu0i952fzrGCxVF2vIIvE0SzvNI=", "owner": "StatusCakeDev", "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", - "rev": "v2.0.4", - "vendorHash": "sha256-FxTGEeJkElMovd6VGUEGss0gjorZPSPc+whqeHe4s2Y=", - "version": "2.0.4" + "rev": "v2.0.5", + "vendorHash": "sha256-wPNMrHFCUn1AScxTwgRXHSGrs+6Ebm4c+cS5EwHUeUU=", + "version": "2.0.5" }, "sumologic": { "hash": "sha256-DvEd1OdLmUEEmk0zl7jiTjdk/3Fp1Z/3KCpYRpxHTn4=", @@ -1110,14 +1110,23 @@ "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=", "version": "2.19.1" }, + "tailscale": { + "hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=", + "owner": "tailscale", + "provider-source-address": "registry.terraform.io/tailscale/tailscale", + "repo": "terraform-provider-tailscale", + "rev": "v0.13.5", + "vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4=", + "version": "0.13.5" + }, "tencentcloud": { - "hash": "sha256-SoCXh0pRqEkto2K+ZfN7ncVGDVC32zDElS+rBdOfa0g=", + "hash": "sha256-kAbLfuENWHxu51Eu+7X1X4HiWkD8KAL4awZpGRg0BaU=", "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.3", + "rev": "v1.78.4", "vendorHash": null, - "version": "1.78.3" + "version": "1.78.4" }, "tfe": { "hash": "sha256-jh5bRe/3OsdgvSpraYEc1NgvBmYb1tFuVSPQ2ZAesSY=", diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 325fb0309723f..4afadc218e710 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.178"; + version = "1.2.180"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-gmUamDV7gH30grFkG6rqDEf73wxe+FqhPi1GkNOeKuk="; + hash = "sha256-6I1Elq5tA7Vh+FaPYNVfEynTbw35WM/UuruqArGhsz4="; }; - vendorHash = "sha256-4QVLxvprm27Bv/ZFgxTtqZcSAWak1e+G8s+heW1JZnA="; + vendorHash = "sha256-rdrIJ1knarb7tEXl4BxYckHdX5oS2yvfcuRAI16ThU4="; proxyVendor = true; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index ffbf42715f532..c6b0baa9d3f67 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -1,5 +1,6 @@ { lib, stdenv , substituteAll +, autoreconfHook , pkg-config , fetchurl , python3 @@ -28,6 +29,10 @@ stdenv.mkDerivation { strictDeps = true; patches = [ + # Fix extension for Nautilus 43 + # https://github.com/dropbox/nautilus-dropbox/pull/105 + ./nautilus-43.patch + (substituteAll { src = ./fix-cli-paths.patch; inherit dropboxd; @@ -35,6 +40,7 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ + autoreconfHook pkg-config gobject-introspection gdk-pixbuf diff --git a/pkgs/applications/networking/dropbox/nautilus-43.patch b/pkgs/applications/networking/dropbox/nautilus-43.patch new file mode 100644 index 0000000000000..b4b5578431977 --- /dev/null +++ b/pkgs/applications/networking/dropbox/nautilus-43.patch @@ -0,0 +1,195 @@ +diff --git a/configure.ac b/configure.ac +index 025289c..42b49fa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h) + #AC_PROG_INTLTOOL([0.29]) + + # Dependency checks +-NAUTILUS_REQUIRED=2.16.0 ++NAUTILUS_REQUIRED=43.rc + GLIB_REQUIRED=2.14.0 + + # Used programs +@@ -26,8 +26,11 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then + AC_MSG_ERROR(you need to have pkgconfig installed !) + fi + +-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED) ++PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension-4 >= $NAUTILUS_REQUIRED) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) ++PKG_CHECK_MODULES(GTK, gtk4 >= 4.6.0) ++ ++AC_SUBST(GTK_CFLAGS) + + AC_PATH_PROG([PYTHON3], [python3]) + +@@ -84,10 +87,10 @@ AC_MSG_CHECKING([for nautilus extension directory]) + if test -n "$with_nautilus_extension_dir"; then + NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir + else +- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` ++ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension-4` + fi + if test -z "$NAUTILUS_EXTENSION_DIR"; then +- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0' ++ NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-4' + fi + + AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 15d6687..c521ec5 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,6 +13,7 @@ libnautilus_dropbox_la_CFLAGS = \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED_CFLAGS) \ + $(NAUTILUS_CFLAGS) \ ++ $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) + + if DEBUG +diff --git a/src/dropbox.c b/src/dropbox.c +index 0d59559..8162aa9 100644 +--- a/src/dropbox.c ++++ b/src/dropbox.c +@@ -27,9 +27,6 @@ + + #include <glib-object.h> + +-#include <gdk/gdk.h> +-#include <gtk/gtk.h> +- + #include "nautilus-dropbox.h" + + static GType type_list[1]; +@@ -41,9 +38,6 @@ nautilus_module_initialize (GTypeModule *module) { + nautilus_dropbox_register_type (module); + type_list[0] = NAUTILUS_TYPE_DROPBOX; + +- dropbox_use_nautilus_submenu_workaround +- = (NAUTILUS_VERSION_MAJOR < 2 || +- (NAUTILUS_VERSION_MAJOR == 2 && NAUTILUS_VERSION_MINOR <= 22)); + dropbox_use_operation_in_progress_workaround = TRUE; + } + +diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c +index c75ccbf..b9c10b4 100644 +--- a/src/nautilus-dropbox.c ++++ b/src/nautilus-dropbox.c +@@ -37,9 +37,7 @@ + #include <glib-object.h> + #include <gtk/gtk.h> + +-#include <libnautilus-extension/nautilus-extension-types.h> +-#include <libnautilus-extension/nautilus-menu-provider.h> +-#include <libnautilus-extension/nautilus-info-provider.h> ++#include <nautilus-extension.h> + + #include "g-util.h" + #include "dropbox-command-client.h" +@@ -49,7 +47,7 @@ + static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable"}; + gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL }; + +-gboolean dropbox_use_nautilus_submenu_workaround; ++ + gboolean dropbox_use_operation_in_progress_workaround; + + static GType dropbox_type = 0; +@@ -630,13 +628,6 @@ nautilus_dropbox_parse_menu(gchar **options, + g_object_set_property (G_OBJECT(item), "sensitive", &sensitive); + } + +- /* taken from nautilus-file-repairer (http://repairer.kldp.net/): +- * this code is a workaround for a bug of nautilus +- * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */ +- if (dropbox_use_nautilus_submenu_workaround) { +- toret = g_list_append(toret, item); +- } +- + g_object_unref(item); + g_string_free(new_action_string, TRUE); + ret++; +@@ -661,7 +652,6 @@ get_file_items_callback(GHashTable *response, gpointer ud) + + static GList * + nautilus_dropbox_get_file_items(NautilusMenuProvider *provider, +- GtkWidget *window, + GList *files) + { + /* +@@ -778,14 +768,13 @@ add_emblem_paths(GHashTable* emblem_paths_response) + + gchar **emblem_paths_list; + int i; +- +- GtkIconTheme *theme = gtk_icon_theme_get_default(); ++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); + + if (emblem_paths_response && + (emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path"))) { + for (i = 0; emblem_paths_list[i] != NULL; i++) { + if (emblem_paths_list[i][0]) +- gtk_icon_theme_append_search_path(theme, emblem_paths_list[i]); ++ gtk_icon_theme_add_search_path(theme, emblem_paths_list[i]); + } + } + g_hash_table_unref(emblem_paths_response); +@@ -804,15 +793,14 @@ remove_emblem_paths(GHashTable* emblem_paths_response) + goto exit; + + // We need to remove the old paths. +- GtkIconTheme * icon_theme = gtk_icon_theme_get_default(); + gchar ** paths; +- gint path_count; ++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); + +- gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count); ++ paths = gtk_icon_theme_get_search_path(theme); + + gint i, j, out = 0; + gboolean found = FALSE; +- for (i = 0; i < path_count; i++) { ++ for (i = 0; paths[i] != NULL; i++) { + gboolean keep = TRUE; + for (j = 0; emblem_paths_list[j] != NULL; j++) { + if (emblem_paths_list[j][0]) { +@@ -834,7 +822,7 @@ remove_emblem_paths(GHashTable* emblem_paths_response) + accomodate the changes */ + if (found) { + paths[out] = NULL; /* Clear the last one */ +- gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out); ++ gtk_icon_theme_set_search_path(theme, (const gchar **)paths); + } + + g_strfreev(paths); +@@ -888,13 +876,13 @@ on_disconnect(NautilusDropbox *cvs) { + + + static void +-nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderIface *iface) { ++nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderInterface *iface) { + iface->get_file_items = nautilus_dropbox_get_file_items; + return; + } + + static void +-nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderIface *iface) { ++nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderInterface *iface) { + iface->update_file_info = nautilus_dropbox_update_file_info; + iface->cancel_update = nautilus_dropbox_cancel_update; + return; +diff --git a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h +index 65734be..44faa27 100644 +--- a/src/nautilus-dropbox.h ++++ b/src/nautilus-dropbox.h +@@ -27,7 +27,7 @@ + #include <glib.h> + #include <glib-object.h> + +-#include <libnautilus-extension/nautilus-info-provider.h> ++#include <nautilus-extension.h> + + #include "dropbox-command-client.h" + #include "nautilus-dropbox-hooks.h" diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 301e0ed8622bd..34b1409a0717c 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-QDGoA22olhafL2geLf1Jxriqc4++3yxGN/ZnNyEAqjA="; + sha256 = "sha256-Q9KCzzBM0BzdmBUs8vJ4DR0e5XAHoAxrTpMvsKnuIAQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; src = finalAttrs.src; - sha256 = "sha256-21v/4VAgolk/12mj7CTu8d5CKMCovE1FQuGyMar8idY="; + sha256 = "sha256-GxRuN5ufzSB/XOb6TWLlvgg7KBNgZ+oJpOowR9Ze9OQ="; }; patches = [ diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 145fae2553a20..8d63a8b4c0734 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgs -, autoconf, automake, curl, iprange, iproute2, iptables, iputils +{ stdenv, lib, fetchFromGitHub, autoconf, automake, curl, iprange, iproute2, iptables, iputils , kmod, nettools, procps, tcpdump, traceroute, util-linux, whois # If true, just install FireQOS without FireHOL diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 110bcaa081a0b..7ce86986b7088 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.33"; + version = "3.3.35"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-dJdRGqHBPbdGrxqhOmQJSZmR+YacQCDKgu03WtrGqVA="; + hash = "sha256-CVWeTjigfIrCFa9OZRfA4QWZArA2vkA6psITRFMKr4o="; }; postPatch = '' diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 27ec34e15961f..44c9477c1c436 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -3,7 +3,7 @@ }: let - stableVersion = "2.2.31"; + stableVersion = "2.2.34"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -27,8 +27,9 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "sha256-o9j/avuapiUKIDO6aO/uWFF/5gu+xdfhL7ZSDSaQ858="; - serverSrcHash = "sha256-8r8nWNqbHUDtJ6x+/SxHxaw1isSuWF/5as3YXLB6LFw="; + guiSrcHash = "sha256-1YsVMrUYI46lJZbPjf3jnOFDr9Hp54m8DVMz9y4dvVc="; + serverSrcHash = "sha256-h4d9s+QvqN/EFV97rPRhQiyC06wkZ9C2af9gx1Z/x/8="; + in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 9d0b947e3f183..be08fe4f4c76b 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -20,6 +20,7 @@ let python = python3.override { packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; + in python.pkgs.buildPythonPackage rec { pname = "gns3-gui"; inherit version; @@ -71,6 +72,6 @@ in python.pkgs.buildPythonPackage rec { changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 814beec74773f..a07409810c015 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -19,6 +19,7 @@ let python = python3.override { packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; + in python.pkgs.buildPythonApplication { pname = "gns3-server"; inherit version; @@ -79,6 +80,6 @@ in python.pkgs.buildPythonApplication { changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index b8995aa875933..40eedd5a7d061 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.53.1"; + version = "8.54.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-nohChte0jtqIlDulxUi+S04unR4xqeg8DCuYfHwMzP4="; + sha256 = "sha256-wvuBGBWM0tTXyrruYqifn+fl7NnIwmLhm9ePqspukaU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 00b970cd68716..580af6e2e0ce0 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, libgcrypt }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, libgcrypt }: with lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index fc9c4c10b2187..541bcc72f5ac1 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,15 +29,16 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.7"; + version = "unstable-2022-09-20"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; - rev = "v${version}"; + # https://source.puri.sm/Librem5/chatty/-/tree/247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4 + rev = "247c53fd990f7472ddd1a92c2f9e1299ae3ef4e4"; fetchSubmodules = true; - hash = "sha256-W4w/00mRgjfyQmLQ81/EAN+80qk7kDkBmMPJnOU+AIc="; + hash = "sha256-9hgQC0vLmmJJxrBWTdTIrJbSSwLS23uVoJri2ieCj4E="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 516c4dcd97454..2ba3cf79a6181 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2022-10-02"; + version = "unstable-2022-10-10"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "c72f1a3fc064f61cc5c5a578d7350240e26a27af"; - hash = "sha256-6V9vLmj5ptMALFV57pMU2IGxNbFNyVcdvnrPgCEaUJ0="; + rev = "7a04cb57dff43f328de78addc234e9d21ff079a8"; + hash = "sha256-6zYXv+iAfDEFHQ4FwNVEA4+zWiDyeLvkm17f4LuaCJg="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index ce17529cd3985..f5f38124ceb61 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.8", - "desktopSrcHash": "l6IwztPEPSo3WgdUBPO4ZNgfoLts8NaqvoHekAhfVGg=", - "desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc", - "webSrcHash": "Etxlq2TEaZM9Qz4ig5H00DsshJoFH6+wtt+RL1dR2n4=", - "webYarnHash": "1q05r2shv1c3kghwksjzrh9rl25ins6r2y46ng7smdml4f9vdcc0" + "version": "1.11.10", + "desktopSrcHash": "cywTZ5OgKaFkHh3i3KLfb8HH8ZlIAOY3Xn2WHyY0fNM=", + "desktopYarnHash": "1xwnw9hbbrr72xs2d43qwhbmhfk3w4z80cipyrmdj5y248y8sz84", + "webSrcHash": "r7WZUWgPDEBS9xpc1YmmPVGch7B2ouJOFAoKdcC/55Q=", + "webYarnHash": "0s8wxf13jc9x4zykhm4abgq3a38mjya7z43kjsags1fxhilf09bc" } diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 127e94ab3e54f..50d68eeeba1c7 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , asciidoc , cmark diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 15e830b768709..f5d2479bdaa15 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -2,7 +2,7 @@ , gst_all_1, libstartup_notification, gettext, perlPackages, libxml2, nss , nspr, farstream, libXScrnSaver, avahi, dbus, dbus-glib, intltool, libidn , lib, python3, libICE, libXext, libSM, libgnt, ncurses, cyrus_sasl, openssl -, gnutls, libgcrypt, symlinkJoin, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true +, gnutls, libgcrypt, cacert, plugins, withOpenssl, withGnutls, withCyrus_sasl ? true }: # FIXME: clean the mess around choosing the SSL library (nss by default) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 1905fd1b4f36b..e68941d2a51a0 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "profanity"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - hash = "sha256-cTkNtj1mN5EuCyniFibKNzY2fxe3NKpRXt8acO/p6WY="; + hash = "sha256-A9ZgHliLb4v/3W5tm5zD0WN8mRmxLE/MUSTBXGvBCCM="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index d3fc8c67ac8d8..138e5989d0fed 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1640"; + version = "1.5.1642"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-vzEZUY9EiOPWdk60EQneMDuX4IAQh4BbBh9MO3Fj04Y="; + sha256 = "sha256-voaGYYt1CZTxiumKvIVupMxdrLKACnfxvtnYfGuya1I="; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 8c6572224c360..325d5330d62e3 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -47,8 +47,8 @@ let x86_64-darwin-version = "4.28.182"; x86_64-darwin-sha256 = "0x0zc45k0jh0hivgjymcxnnwc2lwyfq68rw39lbxp4i1ir2sbnxg"; - x86_64-linux-version = "4.28.171"; - x86_64-linux-sha256 = "sha256-rsHX/NLLGR0XZsg3Cc6GjNK6rSc9UmM2XkfjqwsJZV4="; + x86_64-linux-version = "4.28.184"; + x86_64-linux-sha256 = "sha256-qAc9rHJbM7lmqNxOcOSnqnuib5zJ0Ry3hAGri8DKIlo="; aarch64-darwin-version = "4.28.182"; aarch64-darwin-sha256 = "0bc8lhmpm0310gh1w9xkb8i1cpldchm4b4mzsr9h0mhvljxmvlyf"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 530e9377828ba..a820e4e015050 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -28,7 +28,7 @@ , tl-expected , hunspell , glibmm -, webkitgtk +, webkitgtk_4_1 , jemalloc , rnnoise , abseil-cpp @@ -93,7 +93,7 @@ env.mkDerivation rec { substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ - --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"' + --replace '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' ''; # We want to run wrapProgram manually (with additional parameters) @@ -131,7 +131,7 @@ env.mkDerivation rec { tl-expected hunspell glibmm - webkitgtk + webkitgtk_4_1 jemalloc rnnoise tg_owt diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 1d249794d4431..0d320485fe74c 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook -, xorg, gtk3, gnome2, nss, alsa-lib, udev, libnotify +, xorg, gtk3, nss, alsa-lib, udev, libnotify , wrapGAppsHook }: let diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index cc6b0d08a1031..cf68308176fa7 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -3,8 +3,6 @@ , fetchurl , makeWrapper , dpkg -, glibc -, glib , libxcb , libGL , nss diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 0bc25c0f85926..3ab70167f7ac3 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3Packages +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, lua, perl, python3Packages , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index e39f7b75bb5d9..8fcbdce972916 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ii"; - version = "1.9"; + version = "2.0"; src = fetchurl { url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; - sha256 = "sha256-hQyzI7WD0mG1G9qZk+5zMzQ1Ko5soeLwK1fBVL9WjBc="; + sha256 = "sha256-T2evzSCMB5ObiKrb8hSXpwKtCgf5tabOhh+fOf/lQls="; }; makeFlags = [ "CC:=$(CC)" ]; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 601cb127ff1f6..1342e0f7e983d 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -57,6 +57,8 @@ in buildPythonPackage { dontBuild = true; doCheck = false; + format = "other"; + installPhase = '' mkdir -p $out/share $out/bin cp main.py $out/share/matrix.py diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index a3f00ab247449..22ea41ec4343a 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.34"; + version = "2.9.35"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-oytnWzIsxLOeQvy1iSWysyMQuJ3vTnv7Ot9izOvgPHg="; + sha256 = "sha256-tRuT4freMDtFjmZuBV9WD9jQFUat8QAias5d+AN7IVo="; }; - vendorSha256 = "sha256-1/EnIPUufPwJqH24mqok5ijMenaPUldHBx8dOydECj8="; + vendorSha256 = "sha256-2MevXSjjwXDjmiMhiZyv45a3OgDrliVcvHbXGRIOu1s="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index a40e998618a15..1e47c68526add 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -11,7 +11,7 @@ , enableSpellcheck ? true # Arguments to include external libraries -, enableLibSM ? true, libSM +, enableLibSM ? true, xorg , enableGnuTLS ? true, gnutls , enableEnchant ? enableSpellcheck, enchant , enableDbus ? true, dbus, dbus-glib @@ -76,7 +76,7 @@ let { flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; } { flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; } { flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; } - { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ libSM ]; } + { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ xorg.libSM ]; } { flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; } { flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; } { flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; } diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 337aeaba1a2f4..f97bbea0023cb 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -1,32 +1,55 @@ -{ lib, stdenv, fetchurl, gnome, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution -, sqlite, gtk3, webkitgtk, libgdata, libmspack }: +{ stdenv +, lib +, fetchurl +, gnome +, cmake +, gettext +, intltool +, pkg-config +, evolution-data-server +, evolution +, gtk3 +, libsoup_3 +, libical +, json-glib +, libmspack +, webkitgtk_4_1 +}: stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.44.4"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "TxgrBaE6wbezOwj7Bm6DlcqpW6fagIiGqpGxQp1tfbM="; + sha256 = "vZe6IFzEW60SmXvuE0ii+R2LAtcUWD159PrheU2sG4A="; }; - nativeBuildInputs = [ cmake gettext intltool pkg-config ]; + nativeBuildInputs = [ + cmake + gettext + intltool + pkg-config + ]; buildInputs = [ - evolution-data-server evolution - sqlite libgdata - gtk3 webkitgtk + evolution-data-server + evolution + gtk3 + libsoup_3 + libical + json-glib libmspack + # For evolution-shell-3.0 + webkitgtk_4_1 ]; 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" ]; - passthru = { + passthru = { 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 19d6469e96a72..6cac048cfd272 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -5,7 +5,7 @@ , intltool , fetchurl , libxml2 -, webkitgtk +, webkitgtk_4_1 , highlight , pkg-config , gtk3 @@ -14,7 +14,6 @@ , libpst , gspell , evolution-data-server -, libgdata , libgweather , glib-networking , gsettings-desktop-schemas @@ -23,7 +22,6 @@ , shared-mime-info , libical , db -, gcr , sqlite , gnome , gnome-desktop @@ -34,7 +32,7 @@ , nspr , icu , libcanberra-gtk3 -, geocode-glib +, geocode-glib_2 , cmark , bogofilter , gst_all_1 @@ -46,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.44.4"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "8LFuerrTx5RaKcMi8X2rSgjWHpm9fMkbjfNQU8XBLow="; + sha256 = "4J6Sdrxrmr8NrTpOgT7qHQJfT2qvH6w7ew+IiVdCkT8="; }; nativeBuildInputs = [ @@ -68,7 +66,6 @@ stdenv.mkDerivation rec { bogofilter db evolution-data-server - gcr gdk-pixbuf glib glib-networking @@ -81,9 +78,8 @@ stdenv.mkDerivation rec { highlight icu libcanberra-gtk3 - geocode-glib + geocode-glib_2 cmark - libgdata libgweather libical libnotify @@ -97,7 +93,7 @@ stdenv.mkDerivation rec { procps shared-mime-info sqlite - webkitgtk + webkitgtk_4_1 ]; propagatedUserEnvPkgs = [ @@ -106,13 +102,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_AUTOAR=OFF" - "-DENABLE_LIBCRYPTUI=OFF" "-DENABLE_YTNEF=OFF" "-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin" "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn" "-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter" "-DWITH_OPENLDAP=${openldap}" - "-DWITH_GWEATHER4=ON" ]; requiredSystemFeatures = [ @@ -128,6 +122,7 @@ stdenv.mkDerivation rec { }; }; + PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index c039febb6d7c1..d750937c3ee13 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -2,7 +2,6 @@ , buildGoModule , fetchFromGitHub , pkg-config -, gobject-introspection , pango , cairo , gtk2 diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 8572bec3432c9..de82535cd5601 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,5 +1,5 @@ -{ coreutils, fetchFromGitHub, fetchpatch, file, gawk, gnugrep, gnused -, installShellFiles, less, lib, libiconv, makeWrapper, nano, stdenv, ruby +{ coreutils, fetchFromGitHub, file, gawk, gnugrep, gnused +, installShellFiles, lib, libiconv, makeWrapper, stdenv, ruby }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 64ebb78a12d04..3ba78c7439281 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, glib, notmuch }: let - version = "9"; + version = "10"; in stdenv.mkDerivation { pname = "notmuch-addrlookup"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "aperezdc"; repo = "notmuch-addrlookup-c"; rev ="v${version}"; - sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc"; + sha256 = "sha256-Z59MAptJw95azdK0auOuUyxBrX4PtXwnRNPkhjgI6Ro="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 49905cdbd213a..21b75cfe8846d 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. -, alsa-lib, dbus-glib, fuse, gnome, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev +, alsa-lib, dbus-glib, fuse, gsettings-desktop-schemas, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev }: let diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index c769b7de6c869..89e952945c87f 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0="; + sha256 = "sha256-0heCwXFms6Ni/F1TaS5QEK+ePlR9DXUrzVj3vA5DvCk="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 23b2727d695d6..0722561cb6f3b 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -4,7 +4,6 @@ , glib , libX11 , gst_all_1 -, sqlite , libepoxy , pango , cairo diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 20496f38e8686..8a39e31aa9c68 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -3,7 +3,7 @@ , freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon -, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core +, libsecret, libsoup, spice-protocol, spice-gtk_libsoup2, libepoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome @@ -31,7 +31,10 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsoup spice-protocol spice-gtk libepoxy at-spi2-core + libsoup spice-protocol + # https://gitlab.com/Remmina/Remmina/-/issues/2754 + spice-gtk_libsoup2 + libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz python3 ] ++ optionals withLibsecret [ libsecret ] diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index e8618c4d389a0..12087ed108bb8 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4="; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ]; buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ]; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 54ad0753c72e8..1d0b06db248fe 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "com.github.alainm23.planner"; + broken = true; # https://github.com/alainm23/planner/issues/928 }; } diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index c9b4ef1391265..e93be60741bb3 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.52"; + version = "1.12.53"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "c89zBJoiodgoUGJ1ssk3jsN8X/N7aLsfL0lPDWQAgjs="; + sha256 = "VWjkyNzqu5Ao8TYdEEVSL5Xwpx2qWelzy90tObrdTwI="; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/office/karlender/default.nix b/pkgs/applications/office/karlender/default.nix new file mode 100644 index 0000000000000..44cd2ed0051f9 --- /dev/null +++ b/pkgs/applications/office/karlender/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, pkg-config +, gtk4 +, libadwaita +, wrapGAppsHook4 +, glib +, tzdata +}: + +rustPlatform.buildRustPackage rec { + pname = "karlender"; + version = "0.6.2"; + + src = fetchFromGitLab { + owner = "loers"; + repo = "karlender"; + rev = "v${version}"; + sha256 = "sha256-YF46C+Vz7eGl4lqOQXqiQqaa6ieo1p8l6QCh4oNSJEg="; + }; + + cargoSha256 = "sha256-Kx5K2tp5PAQWac8LVrmOsk8Qf9m34SJ1vyfv7Ef2Wr0="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + glib + ]; + buildInputs = [ + gtk4 + libadwaita + ]; + + postPatch = '' + substituteInPlace src/domain/time.rs --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + ''; + + postInstall = '' + substituteInPlace target/gra-gen/data/codes.loers.Karlender.desktop \ + --replace "Exec=codes.loers.Karlender" "Exec=karlender" + substituteInPlace target/gra-gen/data/codes.loers.Karlender.appdata.xml \ + --replace "<binary>codes.loers.Karlender</binary>" "<binary>karlender</binary>" + install -Dm444 target/gra-gen/codes.loers.Karlender.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.64.png -T $out/share/icons/hicolor/64x64/apps/codes.loers.Karlender.png + install -Dm444 target/gra-gen/data/codes.loers.Karlender.128.png -T $out/share/icons/hicolor/128x128/apps/codes.loers.Karlender.png + install -Dm444 target/gra-gen/data/codes.loers.Karlender.desktop -t $out/share/applications/ + install -Dm444 target/gra-gen/data/codes.loers.Karlender.appdata.xml -t $out/share/metainfo/ + ''; + + meta = with lib; { + description = "Mobile-friendly GTK calendar application"; + homepage = "https://gitlab.com/loers/karlender"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 3f17e46023ab9..6a6ddc28449ed 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -9,7 +9,7 @@ , sqlcipher # Needed for running tests: -, qtbase, xvfb-run +, xvfb-run , python3 }: diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index d3faa478e49b7..6fa29c1dbbd78 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -61,12 +61,12 @@ let in python.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; - version = "1.9.1"; + version = "1.9.2"; # Fetch the release tarball instead of a git ref because it contains the prebuilt fontend src = fetchurl { url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-KWq3zUES8klXexNO9krlqZKZEajOhkTHF13t/3rxrPc="; + hash = "sha256-fafjVXRfzFrINzI/Ivfm1VY4YpemHkHwThBP54XoXM4="; }; format = "other"; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index f5ad715d87a64..d070d98d3f555 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchpatch, fetchurl, +{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 7b1fd1ae73a8a..6a0bb48c7ded3 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2022-09-26"; + version = "unstable-2022-10-11"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "4778c343ac78a3b3ccdaf079187b53d8cd64e235"; - sha256 = "UyltzT9B+7/hME7famQa/XgrDPaNw3apwchKgxwscOo="; + rev = "be79e537c148d961d40137a7f83d7bdcc4119dd6"; + sha256 = "GKRxb6W9PDY7nzgPTPRPmA9GBvD4zLaZwnalZan3+m0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix index 35f7b60a45a91..e93f3eaff508d 100644 --- a/pkgs/applications/plasma-mobile/angelfish.nix +++ b/pkgs/applications/plasma-mobile/angelfish.nix @@ -1,6 +1,5 @@ { lib , mkDerivation -, fetchurl , cmake , corrosion , extra-cmake-modules @@ -20,8 +19,8 @@ , srcs # These must be updated in tandem with package updates. -, cargoShaForVersion ? "22.06" -, cargoSha256 ? "ckxShWgqGaApYoGQdrRQKCKOsbwUH5QP82x3BNM4Jx8=" +, cargoShaForVersion ? "22.09" +, cargoSha256 ? "sha256-uxLvAhRV185srZZ0ZMsLRevAyMmajXERPRYotMcnLJA=" }: # Guard against incomplete updates. diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh index 41ff6d0f7d6db..eca9970052886 100644 --- a/pkgs/applications/plasma-mobile/fetch.sh +++ b/pkgs/applications/plasma-mobile/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.06/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.09/ -A '*.tar.xz' ) diff --git a/pkgs/applications/plasma-mobile/krecorder.nix b/pkgs/applications/plasma-mobile/krecorder.nix index 35d38af566c3d..191a0bddb6802 100644 --- a/pkgs/applications/plasma-mobile/krecorder.nix +++ b/pkgs/applications/plasma-mobile/krecorder.nix @@ -8,6 +8,7 @@ , kcoreaddons , ki18n , kirigami2 +, kirigami-addons , qtmultimedia , qtquickcontrols2 }: @@ -25,6 +26,7 @@ mkDerivation rec { kcoreaddons ki18n kirigami2 + kirigami-addons qtmultimedia qtquickcontrols2 ]; diff --git a/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/plasma-mobile/kweather.nix index 497061624b928..49dcb1db99f7b 100644 --- a/pkgs/applications/plasma-mobile/kweather.nix +++ b/pkgs/applications/plasma-mobile/kweather.nix @@ -6,6 +6,7 @@ , kconfig , ki18n +, kirigami-addons , kirigami2 , knotifications , kquickcharts @@ -26,6 +27,7 @@ mkDerivation rec { buildInputs = [ kconfig ki18n + kirigami-addons kirigami2 knotifications kquickcharts diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix index 1a30977aba9d5..6c453e3af7060 100644 --- a/pkgs/applications/plasma-mobile/plasma-dialer.nix +++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix @@ -9,15 +9,24 @@ , kcoreaddons , kdbusaddons , ki18n +, kio , kirigami2 , knotifications , kpeople , libphonenumber +, libselinux +, libsepol , modemmanager-qt +, pcre +, plasma-wayland-protocols , protobuf +, pulseaudio-qt , qtfeedback , qtmpris , qtquickcontrols2 +, util-linux +, wayland +, wayland-protocols }: mkDerivation rec { @@ -34,15 +43,36 @@ mkDerivation rec { kcoreaddons kdbusaddons ki18n + kio kirigami2 knotifications kpeople libphonenumber + libselinux + libsepol modemmanager-qt + pcre + plasma-wayland-protocols protobuf # Needed by libphonenumber + pulseaudio-qt qtfeedback qtmpris qtquickcontrols2 + util-linux + wayland + wayland-protocols + ]; + + postPatch = '' + substituteInPlace plasma-dialer/org.kde.phone.dialer.desktop \ + --replace "/usr/bin/" "$out/bin/" + ''; + + # Plasma gear 22.09 shipped before KWin 5.26 was made available. + # This feature requires 5.26. Otherwise plasma-dialer segfaults. + # Note that we may need to keep it disabled until it stops segfaulting outside of KWin. + cmakeFlags = [ + "-DDIALER_BUILD_SHELL_OVERLAY=OFF" ]; meta = with lib; { diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix index 039f2d674b345..d44998ebd17d6 100644 --- a/pkgs/applications/plasma-mobile/plasma-settings.nix +++ b/pkgs/applications/plasma-mobile/plasma-settings.nix @@ -10,10 +10,16 @@ , kcoreaddons , kdbusaddons , ki18n +, kirigami-addons +, kirigami2 , kitemmodels +, libselinux +, libsepol , modemmanager-qt , networkmanager-qt +, pcre , plasma-framework +, util-linux }: mkDerivation rec { @@ -30,10 +36,16 @@ mkDerivation rec { kcoreaddons kdbusaddons ki18n + kirigami-addons + kirigami2 kitemmodels + libselinux + libsepol modemmanager-qt networkmanager-qt + pcre plasma-framework + util-linux ]; meta = with lib; { diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 0e30c86df9811..6a40858cdccf9 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -4,6 +4,8 @@ , cmake , extra-cmake-modules +, c-ares +, curl , kcontacts , ki18n , kio @@ -27,6 +29,8 @@ mkDerivation rec { ]; buildInputs = [ + c-ares + curl kcontacts ki18n kio diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix index 849118e5ce65d..5bc824c441960 100644 --- a/pkgs/applications/plasma-mobile/srcs.nix +++ b/pkgs/applications/plasma-mobile/srcs.nix @@ -4,195 +4,195 @@ { alligator = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/alligator-22.06.tar.xz"; - sha256 = "1h4jawzmiikn81iajc62pkgdv0xlc2w9g80l04awfiz2546rcxmf"; - name = "alligator-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/alligator-22.09.tar.xz"; + sha256 = "0krys21df6mlyi2zxdxgqx02k1q7njliz0nsxcygxrd89ajxlslb"; + name = "alligator-22.09.tar.xz"; }; }; angelfish = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/angelfish-22.06.tar.xz"; - sha256 = "0s9kzkw0ikb4r4x04nyd568kika7wvi5gj0k6735nwjn5qyp933f"; - name = "angelfish-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/angelfish-22.09.tar.xz"; + sha256 = "1blhn84xka11zjwqimr30qv94jp5slfcmc44xcjxginl3n6hicwx"; + name = "angelfish-22.09.tar.xz"; }; }; audiotube = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/audiotube-22.06.tar.xz"; - sha256 = "0680cr90nsa5qc9qm9vpl7993zmz0r1ms0m4f63cds7k8zrwwal0"; - name = "audiotube-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/audiotube-22.09.tar.xz"; + sha256 = "1ay3qrg8lnw209kwmgm2ll5k1gbp2q694g6w837xl2wjy792vqw8"; + name = "audiotube-22.09.tar.xz"; }; }; calindori = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/calindori-22.06.tar.xz"; - sha256 = "0fcbkk1yisdd6z1qvac9x6i55wfppqpdma87a0n5smm191lkjg07"; - name = "calindori-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/calindori-22.09.tar.xz"; + sha256 = "1pwgdqznp76mhk0ikzjhy3c67qgk91kgv69ygqwzlh5hwiw5sl4n"; + name = "calindori-22.09.tar.xz"; }; }; kalk = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/kalk-22.06.tar.xz"; - sha256 = "09c3rfnljjacw55vdrgcpp18vkbbjzq6brcfs6gb0nhfgbjj6ava"; - name = "kalk-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/kalk-22.09.tar.xz"; + sha256 = "0sci3jv3asjxahcdz2vkmh90fbffx8lfj1cy5kqnpijdxcm10gfq"; + name = "kalk-22.09.tar.xz"; }; }; kasts = { - version = "22.06"; + version = "22.09.2"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/kasts-22.06.tar.xz"; - sha256 = "0hznam4gxrhz1sbykl7wr0mqa6r23mskx5qhp0lq3sxaxiy9jlrk"; - name = "kasts-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/kasts-22.09.2.tar.xz"; + sha256 = "10i0b8k1k0ki8pq8hsj979y7np75iaq49bxkyj95zzci9g73vd59"; + name = "kasts-22.09.2.tar.xz"; }; }; kclock = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/kclock-22.06.tar.xz"; - sha256 = "1rd2gxbc3p5h1xjwn59vqr5v2xdk8b0m0dx6qsmihx1qnr2k5vrj"; - name = "kclock-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/kclock-22.09.tar.xz"; + sha256 = "18b5lncgh9vc94bgrdmzigi853j4l7hqrvggk4hfcklj4pnv1bav"; + name = "kclock-22.09.tar.xz"; }; }; keysmith = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/keysmith-22.06.tar.xz"; - sha256 = "0qwfvznjp85y93y3dry5pkcqz6y63wpk2h2p5m3qiymk3qckm9yj"; - name = "keysmith-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/keysmith-22.09.tar.xz"; + sha256 = "0w3vvmp9rn6ahly2fm9n6f4glfr7d84bfvj33mrs5pn7n99h7jgy"; + name = "keysmith-22.09.tar.xz"; }; }; khealthcertificate = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/khealthcertificate-22.06.tar.xz"; - sha256 = "079j9df21hcfs62ikh2q8sjxq59qiqvinicjvghk708xf0dkl8nh"; - name = "khealthcertificate-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/khealthcertificate-22.09.tar.xz"; + sha256 = "16vkjpyxwx34pvdpnci0l6mx2bdjialiscjvbdx53xbsq9ff701k"; + name = "khealthcertificate-22.09.tar.xz"; }; }; koko = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/koko-22.06.tar.xz"; - sha256 = "0fcwls7xq0dmb2ghn8x6xq26a4qa9ashnlm8ypcyfmfr4pvxwlml"; - name = "koko-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/koko-22.09.tar.xz"; + sha256 = "1z3ysc2f1agbkmm2cxa87x5rk2nx9fjv3czlvcsn8s5ssfdws3gl"; + name = "koko-22.09.tar.xz"; }; }; kongress = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/kongress-22.06.tar.xz"; - sha256 = "1mlyqdv0y112z4c56a9746hc8x0xrcvw0qqafm7vvd7hy5idqsrb"; - name = "kongress-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/kongress-22.09.tar.xz"; + sha256 = "0pjp2s774sgw2dklqib8alm1a9fkixy3s92i2v8v00znx08zf2jz"; + name = "kongress-22.09.tar.xz"; }; }; krecorder = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/krecorder-22.06.tar.xz"; - sha256 = "148gqz5xya1pxw0mhs82dns0wmpvl8h48hrb5hly9jwdymb7143g"; - name = "krecorder-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/krecorder-22.09.tar.xz"; + sha256 = "0kcgw7bsyw3bhai2djcq3qjn5ims7i4qbvpm7nwpjkm1p3m7fjii"; + name = "krecorder-22.09.tar.xz"; }; }; ktrip = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/ktrip-22.06.tar.xz"; - sha256 = "123770qa8d4xhpgga6gbs7dnnfmka9jshsbkpckvbzl3ndcnlpql"; - name = "ktrip-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/ktrip-22.09.tar.xz"; + sha256 = "0x9s4yh2nvy7zmg3ds9bn8ir6wx10i8d0mvfaylbzb39rcabpmrl"; + name = "ktrip-22.09.tar.xz"; }; }; kweather = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/kweather-22.06.tar.xz"; - sha256 = "0a47swzvp6z1fdn3vhgfnqz06583x6xsgvf01wsspkz4g2lxj5zk"; - name = "kweather-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/kweather-22.09.tar.xz"; + sha256 = "0z3z659y1r1jry02w0hxwcpghkgxgqiwj1kqck07vlg8ks7lz1jz"; + name = "kweather-22.09.tar.xz"; }; }; neochat = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/neochat-22.06.tar.xz"; - sha256 = "16wxkc3h0bqlnb7jhkk6qh1v5hj06rwaj7khzqxbm9cj8zh29wdn"; - name = "neochat-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/neochat-22.09.tar.xz"; + sha256 = "1j8p6mv89q1krjjbc9n26r83csqpxwd03zzhvzxxm53334qwqdci"; + name = "neochat-22.09.tar.xz"; }; }; plasma-dialer = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/plasma-dialer-22.06.tar.xz"; - sha256 = "07sbjmk9hzf1nhk7jhvavikwkb4nmy0bwccs7qa4nf9g2yzbli87"; - name = "plasma-dialer-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/plasma-dialer-22.09.tar.xz"; + sha256 = "1wk8q5lc15d53viqyknsww1hgci1rxmnra4hj887fabnj0id29rs"; + name = "plasma-dialer-22.09.tar.xz"; }; }; plasma-phonebook = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/plasma-phonebook-22.06.tar.xz"; - sha256 = "00h9plfjgr4bmcay56la074pza2hp4l28a566nbqqivagpn1qz8w"; - name = "plasma-phonebook-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/plasma-phonebook-22.09.tar.xz"; + sha256 = "1wsv330sfjh78fg98kd2g6a4bsmdyf7gn9r3aqazci7p7i5n2ln0"; + name = "plasma-phonebook-22.09.tar.xz"; }; }; plasma-settings = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/plasma-settings-22.06.tar.xz"; - sha256 = "096zyzxff0b948wnnmdykp9fm87r8xyn8kkndnjkrmacz2p3822m"; - name = "plasma-settings-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/plasma-settings-22.09.tar.xz"; + sha256 = "0jq2r7ckz27a8r41n4jn61wlrpcx0qwlasipig4jz7rc9i0ayfka"; + name = "plasma-settings-22.09.tar.xz"; }; }; plasmatube = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/plasmatube-22.06.tar.xz"; - sha256 = "009kcba9blhyx8xhbsxawjxayq1vrpi2byig1n1ra848kij0hi3q"; - name = "plasmatube-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/plasmatube-22.09.tar.xz"; + sha256 = "00w9p5fcpv4s406lmcdcbrxf19sgkvf9yy8pfjmf1asvvvi8bpnk"; + name = "plasmatube-22.09.tar.xz"; }; }; qmlkonsole = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/qmlkonsole-22.06.tar.xz"; - sha256 = "1h244bb566sgfgswgdqkljfdd70z4v52gxm0h5bmvmdqjhb6zg7n"; - name = "qmlkonsole-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/qmlkonsole-22.09.tar.xz"; + sha256 = "19bf9f4vxa8arnl1zjappg6kh21br131cbsx902qnpv6y0r3swz1"; + name = "qmlkonsole-22.09.tar.xz"; }; }; spacebar = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/spacebar-22.06.tar.xz"; - sha256 = "0jl9gvhf8dfg9y8wwxp0c86rlsmj8inrl7syb25pz57z1mvv4kkr"; - name = "spacebar-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/spacebar-22.09.tar.xz"; + sha256 = "0fmk7fa7i67l8ff0amn80yxhf05vf0j9c42zj6qg5p30d1j31pbl"; + name = "spacebar-22.09.tar.xz"; }; }; telly-skout = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/telly-skout-22.06.tar.xz"; - sha256 = "09ibm424x5k1kjbay1cn48car6xacz82dk6qwi8ww3jph32jm4pf"; - name = "telly-skout-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/telly-skout-22.09.tar.xz"; + sha256 = "1byakylbjjxyz6bh59dydqnvh8c627jpx39ih1ylrdl8jlkd0scy"; + name = "telly-skout-22.09.tar.xz"; }; }; tokodon = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/tokodon-22.06.tar.xz"; - sha256 = "0cgg42ys7liab754n9nwbanwl3i7iz587933vvhf5k9zmvx4jqhb"; - name = "tokodon-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/tokodon-22.09.tar.xz"; + sha256 = "123vyq9vfl48l7ssrymvkhxlkwihplnssal0wvz4n2dk59byl46p"; + name = "tokodon-22.09.tar.xz"; }; }; vakzination = { - version = "22.06"; + version = "22.09"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.06/vakzination-22.06.tar.xz"; - sha256 = "0wa58a9fps9i0brbppcdkda1przxckg7sir8f2p8k842k2qnsvbp"; - name = "vakzination-22.06.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.09/vakzination-22.09.tar.xz"; + sha256 = "01xzc1di57j0fgzkqwa39jng0fd90laya0rj85vjda7mbh2lxxk6"; + name = "vakzination-22.09.tar.xz"; }; }; } diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 23b64e124c553..400927aed4d7a 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, - pkg-config, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: + pkg-config, soapysdr-with-plugins, wxGTK32, enableDigitalLab ? false, + Cocoa, WebKit }: stdenv.mkDerivation rec { pname = "cubicsdr"; @@ -14,7 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; + buildInputs = [ fftw hamlib liquid-dsp soapysdr-with-plugins wxGTK32 ] + ++ lib.optionals stdenv.isLinux [ libpulseaudio libGL libX11 ] + ++ lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; @@ -24,6 +27,6 @@ stdenv.mkDerivation rec { description = "Software Defined Radio application"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lasandell ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index ffd608edf7ff0..46303d9c92abf 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, glibc, gpsd +{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, gpsd , hamlib, perl, python3, udev }: with lib; diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index a81227ddd46d8..1180f5a941ae7 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hackrf"; - version = "2021.03.1"; + version = "2022.09.1"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "hackrf"; rev = "v${version}"; - sha256 = "sha256-2kEfTco95I9YLz/18nfjJSd7U/HE5sBCEioWL2t804k="; + sha256 = "sha256-c+9DEMxioIbEDNTdLSOnxX1zpFk07K9rlGP9goEJMlU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/klog/default.nix b/pkgs/applications/radio/klog/default.nix index 080011e167e63..248561b3ee139 100644 --- a/pkgs/applications/radio/klog/default.nix +++ b/pkgs/applications/radio/klog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, hamlib, pkg-config, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "klog"; diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/applications/science/biology/angsd/default.nix index ec714fa7a26b9..799ba87f073b7 100644 --- a/pkgs/applications/science/biology/angsd/default.nix +++ b/pkgs/applications/science/biology/angsd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "angsd"; - version = "0.938"; + version = "0.940"; src = fetchFromGitHub { owner = "ANGSD"; repo = "angsd"; - sha256 = "sha256-hNELuPim2caJCzJ63fQ7kIB0ZZnXcC8JIbk4dFcCs2U="; + sha256 = "sha256-Ppxgy54pAnqJUzNX5c12NHjKTQyEEcPSpCEEVOyZ/LA="; rev = "${version}"; }; diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index f758e41167942..7922438df5285 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }: +{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, ncurses, boost }: stdenv.mkDerivation rec { pname = "delly"; diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index 9853b0322c01b..7ace478048289 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.2.6.1"; + version = "4.3.0.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "0hjlsl7fxf3ankyjidqhwxc70gjh6z4lnjzw6b5fldzb0qvgfvy8"; + sha256 = "sha256-AhXZyWbAXM5iwqxkYkMlqYUN838BjvIf5X95MVEfJ2I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/meme-suite/default.nix b/pkgs/applications/science/biology/meme-suite/default.nix index bfa561437e745..c0f67c314161e 100644 --- a/pkgs/applications/science/biology/meme-suite/default.nix +++ b/pkgs/applications/science/biology/meme-suite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, perl, glibc, zlib }: +{ lib, stdenv, fetchurl, python3, perl, zlib }: stdenv.mkDerivation rec { pname = "meme-suite"; diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 11530c6a72264..6884e1955f75e 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, fetchpatch, zlib }: +{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, zlib }: stdenv.mkDerivation rec { pname = "sortmerna"; diff --git a/pkgs/applications/science/electronics/appcsxcad/default.nix b/pkgs/applications/science/electronics/appcsxcad/default.nix index 7aafa70f7fa1a..9645e5426ab11 100644 --- a/pkgs/applications/science/electronics/appcsxcad/default.nix +++ b/pkgs/applications/science/electronics/appcsxcad/default.nix @@ -7,7 +7,6 @@ , hdf5 , vtkWithQt5 , qtbase -, wrapQtAppsHook , fparser , tinyxml , cgal diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 10dcb2327c060..57104cb045eee 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.111"; + version = "3.3.113"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "0cv222qhgldfniz6zys52zhrynfsp5v0h8ia857lng7v33vw5qdl"; + sha256 = "sha256-bv81puBSiFVkO2hNk63rMchbTSN3KtSnyHnL0/apQe0="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index e7b947450acc8..083f01a42881a 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -10,7 +10,6 @@ , zlib , cmake , octave -, gl2ps , mpi , withQcsxcad ? true , withMPI ? false diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 4f37651a171c1..bf7bffd11591b 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2022.07.27"; + version = "unstable-2022-09-08"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "7cc11f7f0c49d4ce7e0ed88950d1c4c8abb1cba4"; - hash = "sha256-6m8XpSYWT0uMpYHXm3ExnH7RMg923YqZAJPTBeFXMzg="; + rev = "ab5b16ede2ff3a4ab5209df24db2c76700899684"; + hash = "sha256-G4MnBViwIosFDiPfUimGqf6fq1KJlxj+LozmgoKaH3A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 07c3b62d37dab..4750dd08c0a97 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.67.0"; + version = "5.68.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-9w6GGi/yW7IYv3NoflpzO/UH712+LWp6f10+ak2hLIA="; + sha256 = "sha256-Hup/E426sPAj8/vpgBz8j6C65fG6U59oq78mqmGkDD8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix index dc1094f3e27d0..343b50dfd7ef9 100644 --- a/pkgs/applications/science/logic/mcy/default.nix +++ b/pkgs/applications/science/logic/mcy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, yosys, symbiyosys, python3 +, yosys, python3 }: let diff --git a/pkgs/applications/science/logic/petrinizer/default.nix b/pkgs/applications/science/logic/petrinizer/default.nix index e28137dde75b3..62d259f831871 100644 --- a/pkgs/applications/science/logic/petrinizer/default.nix +++ b/pkgs/applications/science/logic/petrinizer/default.nix @@ -1,7 +1,6 @@ { mkDerivation , async, base, bytestring, containers, fetchFromGitLab, mtl -, parallel-io, parsec, lib, stm, transformers, sbv_7_13, z3 -}: +, parallel-io, parsec, lib, stm, transformers, sbv_7_13}: mkDerivation rec { pname = "petrinizer"; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 11cd19188965e..160d67094f4c0 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, fetchpatch, lib, stdenv +{ callPackage, fetchurl, lib, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index 54aa22511742b..95d5b95718dd9 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, runCommand, symlinkJoin, why3 }: +{ stdenv, makeWrapper, runCommand, why3 }: provers: let configAwkScript = runCommand "why3-conf.awk" { inherit provers; } '' diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index da66dc241d2e7..927a71b9ef135 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , pkg-config -, fetchpatch , python3 , meson , ninja diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4fd18969a941e..6cdb7919d9ea8 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -1,7 +1,6 @@ { stdenv , fetchFromGitHub , fetchpatch -, runtimeShell }: # This file is responsible for fetching the sage source and adding necessary patches. diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index ed9e64347a87c..eea34fb778850 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , autoreconfHook }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix index a89b73eb8664f..6821e33d1a629 100644 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix @@ -2,9 +2,6 @@ , stdenv , fetchgit , bash -, pkg-config -, jre8 -, libuuid , openmodelica , mkOpenModelicaDerivation }: diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index b65c23521395d..34509f05daa3d 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake +{ lib, mkDerivation, fetchFromGitHub, qmake , qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2 , alsa-lib, libsndfile, flite, openssl, udev, SDL2 }: diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 4aee366e987cb..712374ef7520e 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.56"; + version = "1.8.57"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wyY9oYWABkXNhlZW4RFuyZy/HEnv7cGFVbXVoEnIF1Q="; + sha256 = "sha256-tsx3oVXPIa3OtbLWj3QWrW9leL9/jsdbbLG+Wd3nxn4="; }; postPatch = '' diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 2b145717fb38c..7c0bd8b6410a3 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -16,12 +16,7 @@ , fontconfig , freetype , libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, libXxf86vm -, libxcb +, xorg , libxkbcommon , wayland , xdg-utils @@ -41,12 +36,12 @@ let fontconfig freetype libGL - libX11 - libXcursor - libXi - libXrandr - libXxf86vm - libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libXxf86vm + xorg.libxcb ] ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland @@ -54,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.11.0-rc2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-svo7DIPgNQy+MkIrRtRQjKQ2ND0CRfofSCiXJqoWby0="; + hash = "sha256-2jNE0UdPXfOyAfPPVKhdBpuVVw4IpwWQ+RLQlJNnK0Y="; }; - cargoSha256 = "sha256-ClAW7WjnDs4Peu+UqcOwtuDDkWYWACMQU5p39CiIFm0="; + cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix new file mode 100644 index 0000000000000..67a719d011701 --- /dev/null +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchurl +, meson +, ninja +, pkg-config +, vala +, gtk4 +, vte-gtk4 +, json-glib +, sassc +, libadwaita +, pcre2 +, libxml2 +, librsvg +, callPackage +, python3 +, gtk3 +, desktop-file-utils +, wrapGAppsHook +}: + +let + marble = callPackage ./marble.nix { }; +in +stdenv.mkDerivation rec { + pname = "blackbox"; + version = "0.12.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "raggesilver"; + repo = "blackbox"; + rev = "v${version}"; + sha256 = "sha256-8u4qHC8+3rKDFNdg5kI48dBgAm3d6ESXN5H9aT/nIBY="; + }; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + sassc + wrapGAppsHook + python3 + gtk3 # For gtk-update-icon-cache + desktop-file-utils # For update-desktop-database + ]; + buildInputs = [ + gtk4 + vte-gtk4 + json-glib + marble + libadwaita + pcre2 + libxml2 + librsvg + ]; + + meta = with lib; { + description = "Beautiful GTK 4 terminal"; + homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix new file mode 100644 index 0000000000000..6d100c0894e48 --- /dev/null +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, gtk4 +, gtk3 +, desktop-file-utils +}: + +stdenv.mkDerivation { + pname = "marble"; + version = "unstable-2022-04-20"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "raggesilver"; + repo = "marble"; + # Latest commit from the 'wip/gtk4' branch + rev = "6dcc6fefa35f0151b0549c01bd774750fe6bdef8"; + sha256 = "sha256-0VJ9nyjWOOdLBm3ufleS/xcAS5YsSedJ2NtBjyM3uaY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gtk3 # For gtk-update-icon-cache + desktop-file-utils # For update-desktop-database + gobject-introspection # For g-ir-compiler + ]; + buildInputs = [ gtk4 ]; + + meta = with lib; { + description = "Raggesilver's GTK library"; + homepage = "https://gitlab.gnome.org/raggesilver/marble"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index 17af8457cb103..80d3d6187d1ad 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -1,5 +1,4 @@ { stdenv -, buildGoModule , fetchFromGitHub , lib , go diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix index 790aa17259237..85ee654a989a0 100644 --- a/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { pname = "gnome-console"; + # Do not upgrade until https://gitlab.gnome.org/GNOME/vte/-/issues/2584 is resolved! version = "42.2"; src = fetchurl { @@ -45,8 +46,6 @@ stdenv.mkDerivation rec { libhandy pcre2 vte - ] ++ lib.optionals stdenv.isLinux [ - gnome.nautilus ]; nativeBuildInputs = [ @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - mesonFlags = lib.optionals (!stdenv.isLinux) [ + mesonFlags = [ "-Dnautilus=disabled" ]; diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 056a241384419..2783795f3e535 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { fcitx ibus + ] ++ lib.optionals (stdenv.system != "aarch64-linux") [ + # FIXME Currently broken on aarch64-linux uim ]; @@ -118,5 +120,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg atemu ]; platforms = with platforms; linux ++ darwin; + broken = stdenv.system == "aarch64-darwin"; # https://github.com/arakiken/mlterm/issues/51 }; } diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index 917b179490c62..736b0e36d9567 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , meson , ninja , python3 @@ -13,7 +12,6 @@ , gettext , gtkd , libsecret -, glib , wrapGAppsHook , libunwind , appstream diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix index 7bc4941caf195..7ce5d95775c1f 100644 --- a/pkgs/applications/terminal-emulators/x3270/default.nix +++ b/pkgs/applications/terminal-emulators/x3270/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, m4, expat +{ lib, stdenv, fetchurl, m4, expat , libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir , fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi , fontbhlucidatypewriter100dpi, fontbitstream100dpi diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index bed85a37f544d..fab2780d96440 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,4 +1,4 @@ -{ lib, autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, glibc, pango, gtk2, kcoreaddons, ki18n, kio, kservice +{ lib, autoPatchelfHook, bzip2, cairo, fetchurl, gdk-pixbuf, glibc, pango, gtk2, kcoreaddons, ki18n, kio, kservice , stdenv, runtimeShell, unzip }: diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 7a26b38b6b2d3..5bdab4b081ee8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,29 +1,27 @@ { lib , stdenv -, fetchFromGitea +, fetchFromGitHub , rustPlatform -, libiconv , Security , installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.4.1"; + version = "0.4.2"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "flausch"; - repo = pname; + src = fetchFromGitHub { + owner = "lunaryorn"; + repo = "git-gone"; rev = "v${version}"; - sha256 = "sha256-kqKFs3xvTVHnsLpLC9gjj1dcPChhegmupNrbWy+7C6o="; + sha256 = "sha256-aKBNi797aMPawxD+BLpk0sazXz2g0XTzmDpR/mk07no="; }; - cargoSha256 = "sha256-8R13eHS69fQ3r3LYlnB3nPTPX7VesUPlAUCmQEpUUdw="; + cargoSha256 = "sha256-vO1ePqDIy5HEBauO3OkMCovrgtIVB9biJExw/q89ivE="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' installManPage git-gone.1 @@ -31,8 +29,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cleanup stale Git branches of merge requests"; - homepage = "https://codeberg.org/flausch/git-gone"; - changelog = "https://codeberg.org/flausch/git-gone/raw/tag/v${version}/CHANGELOG.md"; + homepage = "https://github.com/lunaryorn/git-gone"; + changelog = "https://github.com/lunaryorn/git-gone/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index b85f6d973cf22..97e2cf0537ac9 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - sha256 = "sha256-++KTMzTt84dowoZP+Bc9E/jUS21YN5ybKrlpQUKCir0="; + sha256 = "sha256-KqItunxh24jAkvsAMnByS+dhm+wyUqmdF96qEDs/5mI="; }; - cargoSha256 = "sha256-OUaP/nDs589FYaGYcleRMTQNu3/q/2wBjHSv2q8OyjA="; + cargoSha256 = "sha256-510kNtcSsuXADMmSqu2t0HsnPUS/Jedsfvjnh2k+vDs="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index b5c251f247af3..9dc5143790aa8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.12.0"; + version = "3.12.4"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o4OVA9cv+/JLiTUnDEAI/yj+YmOulFrX5XmlRZAb2vw="; + sha256 = "sha256-HRf6e6Qs1zghU01JmZQsR9CHyslUD1T+pCY8eq1JTmo="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-publish/default.nix b/pkgs/applications/version-management/git-and-tools/git-publish/default.nix new file mode 100644 index 0000000000000..0f0eeff156b06 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-publish/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, python, perl, fetchFromGitHub, installShellFiles }: +stdenv.mkDerivation rec { + pname = "git-publish"; + version = "1.8.1"; + + src = fetchFromGitHub { + owner = "stefanha"; + repo = "git-publish"; + rev = "v${version}"; + sha256 = "14rz5kli6sz171cvdc46z3z0nnpd57rliwr6nn6vjjc49yyfwgl4"; + }; + + nativeBuildInputs = [ perl installShellFiles ]; + buildInputs = [ python ]; + + installPhase = '' + runHook preInstall + + install -Dm0755 git-publish $out/bin/git-publish + pod2man git-publish.pod > git-publish.1 + installManPage git-publish.1 + + runHook postInstall + ''; + + meta = { + description = "Prepare and store patch revisions as git tags"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lheckemann ]; + homepage = "https://github.com/stefanha/git-publish"; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 0359ed7ac6098..c06172aa216d4 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-Ic2AsPFdRk3XdTVGbPBByxcHRAGGQfYoQm9GlgmSvA4="; + sha256 = "sha256-YgW0Q1s3V9WvhYQJlAszD7DdEbfggV5w1uMKXhDrn0s="; }; vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 06a2bb48989ca..0a366827e40d5 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pythonPackages, git }: +{ lib, pythonPackages, git }: pythonPackages.buildPythonApplication rec { pname = "git-up"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index def74a723a578..9974174c45b6e 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -14,12 +14,12 @@ buildGoPackage rec { pname = "gitea"; - version = "1.17.2"; + version = "1.17.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { - url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-pDg+HC3dbWf0RxoLvBtIOaFauP1pUYBOG+Q9cinh3lg="; + url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; + sha256 = "sha256-NUkEgKt5OETo751UHcocPH7lEIgyBf6Rl/Nz0nbNH3g="; }; patches = [ diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 3dea75cc622a3..bce2d3b7cf70b 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -10,24 +10,24 @@ with lib; let pname = "gitkraken"; - version = "8.8.0"; + version = "8.9.1"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-F/uqV6CL/zFERS6nKVD8kEqCZQ2O9AGGzU5uCJ94qwk="; + sha256 = "sha256-taz610BIAZm8TB2GQSHLjcDLVjfvtcyLqJ2XBaD6NRE="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-TWkwN39SxPRvUUjAPSBxv4octWasjRiA91FNCWRya44="; + sha256 = "sha256-TMcXtRO9ANQlmHPULgC/05qrqQC6oN58G3ytokRr/Z8="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "sha256-drAj0t8BRUETQ6mZPdHXgkuFAKeYsGLE8oLtf/imHk4="; + sha256 = "sha256-vuk0nfl+Ga5yiZWNwDd9o8qOjmiTLe5tQjGhia0bIk0="; }; }; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index a5c6dc8c27466..feb1063503ff3 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles +{ lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles , re2Support ? true , rustSupport ? stdenv.hostPlatform.isLinux, rustPlatform , fullBuild ? false diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 6f62a381a5045..866146e1d8ffb 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, boost, zlib, botan2, libidn +{ lib, stdenv, fetchFromGitHub, boost, zlib, botan2, libidn , lua, pcre, sqlite, perl, pkg-config, expect, less , bzip2, gmp, openssl , autoreconfHook, texinfo diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index fc57024ea20fc..2c7836f1318a9 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, buildGoModule, git -, asciidoctor, ruby +{ lib, fetchurl, buildGoModule, asciidoctor, ruby }: buildGoModule rec { diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index aee65dee3bbb8..d5c8a97a5f898 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,5 +1,4 @@ { python3 -, openssl , callPackage , recurseIntoAttrs , nixosTests diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix new file mode 100644 index 0000000000000..8e32b42912c0d --- /dev/null +++ b/pkgs/applications/version-management/srvc/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "srvc"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "insilica"; + repo = "rs-srvc"; + rev = "v${version}"; + sha256 = "sha256-PBs86cvEacvCt/2JnURL4qKvXGXRZHWaGYrPUSsnt0I="; + }; + + cargoSha256 = "sha256-5CUbfI67gsINdHcxN8KbIN10Mu90rAU53DbmQ5QotWg="; + + meta = with lib; { + description = "Sysrev version control"; + homepage = "https://github.com/insilica/rs-srvc"; + license = licenses.asl20; + maintainers = with maintainers; [ john-shaffer ]; + }; +} diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index 761a3849c315a..b163fc2aa60b8 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -33,6 +33,7 @@ , libxkbcommon , orc , pcre +, pcre2 , udev , util-linux , xorg @@ -94,7 +95,8 @@ stdenv.mkDerivation rec { libunwind libxkbcommon orc - pcre + pcre # required by libselinux before we USE_PCRE2 + pcre2 # required by glib-2.0 udev util-linux zstd diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index e873ac4a3bc14..0d063e707185c 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-pkskrzpKDsMg7DOC335zXknEIKh9Ku2NgyeinawQtiY="; + hash = "sha256-JINvLmiS6EnkAmxbqPJI+J9Wk4+ZXwZZm1x5Ew7FCBg="; domain = "invent.kde.org"; }; diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix index b8bbe3ae46fa1..a7dc758696c10 100644 --- a/pkgs/applications/video/kodi/addons/iagl/default.nix +++ b/pkgs/applications/video/kodi/addons/iagl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchFromGitHub, fetchzip, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }: +{ lib, buildKodiAddon, fetchFromGitHub, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }: buildKodiAddon rec { pname = "iagl"; diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix index d7b45485d6837..aaaed78d4147c 100644 --- a/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -1,4 +1,4 @@ -{ lib, addonDir, buildKodiAddon, fetchzip, defusedxml, kodi-six }: +{ lib, buildKodiAddon, fetchzip, defusedxml, kodi-six }: buildKodiAddon rec { pname = "keymap"; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 4ad3a6603deac..9cce7bb3b3337 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , pkg-config , autoreconfHook -, qmake , rake , boost , cmark diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index d4f75e7d9301f..01a2d973bf3d9 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -2,7 +2,6 @@ , lib , stdenv , fetchFromGitHub -, fetchpatch , addOpenGLRunpath , docutils , perl diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix index 1dbfef2a8649d..1696a2d9493b0 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libbfd, SDL2, obs-studio +{ lib, stdenv, cmake, libbfd, SDL2, obs-studio , looking-glass-client }: stdenv.mkDerivation { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index b1f3e680ef2a3..80bcb6d41b9de 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, fetchurl , cmake , obs-studio }: diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index f4d915374b830..620cedb6c1b29 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -6,7 +6,6 @@ , wrapGAppsHook , withGtk3 ? false , ffmpeg -, gtk3 , wget , xdg-utils , youtube-dl diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index acd0bb496b5d5..e268b05094edc 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , mkDerivation , SDL2 , frei0r diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 187a493b2502e..f31e7b79ae7db 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-2kh8qMxaAjekvgjMVRmm1nPzlN2wjY/6qYjFyo6CLlg="; + sha256 = "sha256-0jtA64RVlh57zjrGDJAR/tt8V6sSksAx9kBDRW1m+WM="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix index dbeb85821debd..230654d995798 100644 --- a/pkgs/applications/video/video-trimmer/default.nix +++ b/pkgs/applications/video/video-trimmer/default.nix @@ -3,7 +3,6 @@ , fetchFromGitLab , fetchpatch , rustPlatform -, gnome , pkg-config , meson , wrapGAppsHook4 diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 2fb2836a6c070..ee840598930ea 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-choTT20TVp42nN/vS6xCDA7Mbf1ZuAE1tFQZn49g9ak="; }; + separateDebugInfo = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 877bcc2f8b046..66932260886d1 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "1.1.1"; + version = "1.1.2"; suffix = { x86_64-linux = "x86_64"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-KRlOE4iDWMYzKZUZnuKIwIGooj5o8ARpROS7f2VIr1c="; + x86_64-linux = "sha256-RkFlc+atTB9zHRAjQSqe4nJ9N7I9FE/RBeEcXoCk0T8="; aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc="; }; diff --git a/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch b/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch new file mode 100644 index 0000000000000..2e6f1699637b1 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/9pfs-use-GHashTable-for-fid-table.patch @@ -0,0 +1,371 @@ +From 8ab70b8958a8f9cb9bd316eecd3ccbcf05c06614 Mon Sep 17 00:00:00 2001 +From: Linus Heckemann <git@sphalerite.org> +Date: Tue, 4 Oct 2022 12:41:21 +0200 +Subject: [PATCH] 9pfs: use GHashTable for fid table +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The previous implementation would iterate over the fid table for +lookup operations, resulting in an operation with O(n) complexity on +the number of open files and poor cache locality -- for every open, +stat, read, write, etc operation. + +This change uses a hashtable for this instead, significantly improving +the performance of the 9p filesystem. The runtime of NixOS's simple +installer test, which copies ~122k files totalling ~1.8GiB from 9p, +decreased by a factor of about 10. + +Signed-off-by: Linus Heckemann <git@sphalerite.org> +Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> +Reviewed-by: Greg Kurz <groug@kaod.org> +[CS: - Retain BUG_ON(f->clunked) in get_fid(). + - Add TODO comment in clunk_fid(). ] +Message-Id: <20221004104121.713689-1-git@sphalerite.org> +[CS: - Drop unnecessary goto and out: label. ] +Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> +--- + hw/9pfs/9p.c | 194 +++++++++++++++++++++++++++++---------------------- + hw/9pfs/9p.h | 2 +- + 2 files changed, 112 insertions(+), 84 deletions(-) + +diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c +index aebadeaa03..9bf13133e5 100644 +--- a/hw/9pfs/9p.c ++++ b/hw/9pfs/9p.c +@@ -256,7 +256,8 @@ static size_t v9fs_string_size(V9fsString *str) + } + + /* +- * returns 0 if fid got re-opened, 1 if not, < 0 on error */ ++ * returns 0 if fid got re-opened, 1 if not, < 0 on error ++ */ + static int coroutine_fn v9fs_reopen_fid(V9fsPDU *pdu, V9fsFidState *f) + { + int err = 1; +@@ -282,33 +283,32 @@ static V9fsFidState *coroutine_fn get_fid(V9fsPDU *pdu, int32_t fid) + V9fsFidState *f; + V9fsState *s = pdu->s; + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (f) { + BUG_ON(f->clunked); +- if (f->fid == fid) { +- /* +- * Update the fid ref upfront so that +- * we don't get reclaimed when we yield +- * in open later. +- */ +- f->ref++; +- /* +- * check whether we need to reopen the +- * file. We might have closed the fd +- * while trying to free up some file +- * descriptors. +- */ +- err = v9fs_reopen_fid(pdu, f); +- if (err < 0) { +- f->ref--; +- return NULL; +- } +- /* +- * Mark the fid as referenced so that the LRU +- * reclaim won't close the file descriptor +- */ +- f->flags |= FID_REFERENCED; +- return f; ++ /* ++ * Update the fid ref upfront so that ++ * we don't get reclaimed when we yield ++ * in open later. ++ */ ++ f->ref++; ++ /* ++ * check whether we need to reopen the ++ * file. We might have closed the fd ++ * while trying to free up some file ++ * descriptors. ++ */ ++ err = v9fs_reopen_fid(pdu, f); ++ if (err < 0) { ++ f->ref--; ++ return NULL; + } ++ /* ++ * Mark the fid as referenced so that the LRU ++ * reclaim won't close the file descriptor ++ */ ++ f->flags |= FID_REFERENCED; ++ return f; + } + return NULL; + } +@@ -317,12 +317,11 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) + { + V9fsFidState *f; + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ f = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (f) { + /* If fid is already there return NULL */ + BUG_ON(f->clunked); +- if (f->fid == fid) { +- return NULL; +- } ++ return NULL; + } + f = g_new0(V9fsFidState, 1); + f->fid = fid; +@@ -333,7 +332,7 @@ static V9fsFidState *alloc_fid(V9fsState *s, int32_t fid) + * reclaim won't close the file descriptor + */ + f->flags |= FID_REFERENCED; +- QSIMPLEQ_INSERT_TAIL(&s->fid_list, f, next); ++ g_hash_table_insert(s->fids, GINT_TO_POINTER(fid), f); + + v9fs_readdir_init(s->proto_version, &f->fs.dir); + v9fs_readdir_init(s->proto_version, &f->fs_reclaim.dir); +@@ -424,12 +423,12 @@ static V9fsFidState *clunk_fid(V9fsState *s, int32_t fid) + { + V9fsFidState *fidp; + +- QSIMPLEQ_FOREACH(fidp, &s->fid_list, next) { +- if (fidp->fid == fid) { +- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); +- fidp->clunked = true; +- return fidp; +- } ++ /* TODO: Use g_hash_table_steal_extended() instead? */ ++ fidp = g_hash_table_lookup(s->fids, GINT_TO_POINTER(fid)); ++ if (fidp) { ++ g_hash_table_remove(s->fids, GINT_TO_POINTER(fid)); ++ fidp->clunked = true; ++ return fidp; + } + return NULL; + } +@@ -439,10 +438,15 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) + int reclaim_count = 0; + V9fsState *s = pdu->s; + V9fsFidState *f; ++ GHashTableIter iter; ++ gpointer fid; ++ ++ g_hash_table_iter_init(&iter, s->fids); ++ + QSLIST_HEAD(, V9fsFidState) reclaim_list = + QSLIST_HEAD_INITIALIZER(reclaim_list); + +- QSIMPLEQ_FOREACH(f, &s->fid_list, next) { ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &f)) { + /* + * Unlink fids cannot be reclaimed. Check + * for them and skip them. Also skip fids +@@ -514,72 +518,85 @@ void coroutine_fn v9fs_reclaim_fd(V9fsPDU *pdu) + } + } + ++/* ++ * This is used when a path is removed from the directory tree. Any ++ * fids that still reference it must not be closed from then on, since ++ * they cannot be reopened. ++ */ + static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path) + { +- int err; ++ int err = 0; + V9fsState *s = pdu->s; +- V9fsFidState *fidp, *fidp_next; ++ V9fsFidState *fidp; ++ gpointer fid; ++ GHashTableIter iter; ++ /* ++ * The most common case is probably that we have exactly one ++ * fid for the given path, so preallocate exactly one. ++ */ ++ g_autoptr(GArray) to_reopen = g_array_sized_new(FALSE, FALSE, ++ sizeof(V9fsFidState *), 1); ++ gint i; + +- fidp = QSIMPLEQ_FIRST(&s->fid_list); +- if (!fidp) { +- return 0; +- } ++ g_hash_table_iter_init(&iter, s->fids); + + /* +- * v9fs_reopen_fid() can yield : a reference on the fid must be held +- * to ensure its pointer remains valid and we can safely pass it to +- * QSIMPLEQ_NEXT(). The corresponding put_fid() can also yield so +- * we must keep a reference on the next fid as well. So the logic here +- * is to get a reference on a fid and only put it back during the next +- * iteration after we could get a reference on the next fid. Start with +- * the first one. ++ * We iterate over the fid table looking for the entries we need ++ * to reopen, and store them in to_reopen. This is because ++ * v9fs_reopen_fid() and put_fid() yield. This allows the fid table ++ * to be modified in the meantime, invalidating our iterator. + */ +- for (fidp->ref++; fidp; fidp = fidp_next) { ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &fidp)) { + if (fidp->path.size == path->size && + !memcmp(fidp->path.data, path->data, path->size)) { +- /* Mark the fid non reclaimable. */ +- fidp->flags |= FID_NON_RECLAIMABLE; +- +- /* reopen the file/dir if already closed */ +- err = v9fs_reopen_fid(pdu, fidp); +- if (err < 0) { +- put_fid(pdu, fidp); +- return err; +- } +- } +- +- fidp_next = QSIMPLEQ_NEXT(fidp, next); +- +- if (fidp_next) { + /* +- * Ensure the next fid survives a potential clunk request during +- * put_fid() below and v9fs_reopen_fid() in the next iteration. ++ * Ensure the fid survives a potential clunk request during ++ * v9fs_reopen_fid or put_fid. + */ +- fidp_next->ref++; ++ fidp->ref++; ++ fidp->flags |= FID_NON_RECLAIMABLE; ++ g_array_append_val(to_reopen, fidp); + } ++ } + +- /* We're done with this fid */ +- put_fid(pdu, fidp); ++ for (i = 0; i < to_reopen->len; i++) { ++ fidp = g_array_index(to_reopen, V9fsFidState*, i); ++ /* reopen the file/dir if already closed */ ++ err = v9fs_reopen_fid(pdu, fidp); ++ if (err < 0) { ++ break; ++ } + } + +- return 0; ++ for (i = 0; i < to_reopen->len; i++) { ++ put_fid(pdu, g_array_index(to_reopen, V9fsFidState*, i)); ++ } ++ return err; + } + + static void coroutine_fn virtfs_reset(V9fsPDU *pdu) + { + V9fsState *s = pdu->s; + V9fsFidState *fidp; ++ GList *freeing; ++ /* ++ * Get a list of all the values (fid states) in the table, which ++ * we then... ++ */ ++ g_autoptr(GList) fids = g_hash_table_get_values(s->fids); + +- /* Free all fids */ +- while (!QSIMPLEQ_EMPTY(&s->fid_list)) { +- /* Get fid */ +- fidp = QSIMPLEQ_FIRST(&s->fid_list); +- fidp->ref++; ++ /* ... remove from the table, taking over ownership. */ ++ g_hash_table_steal_all(s->fids); + +- /* Clunk fid */ +- QSIMPLEQ_REMOVE(&s->fid_list, fidp, V9fsFidState, next); ++ /* ++ * This allows us to release our references to them asynchronously without ++ * iterating over the hash table and risking iterator invalidation ++ * through concurrent modifications. ++ */ ++ for (freeing = fids; freeing; freeing = freeing->next) { ++ fidp = freeing->data; ++ fidp->ref++; + fidp->clunked = true; +- + put_fid(pdu, fidp); + } + } +@@ -3205,6 +3222,8 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, + V9fsFidState *tfidp; + V9fsState *s = pdu->s; + V9fsFidState *dirfidp = NULL; ++ GHashTableIter iter; ++ gpointer fid; + + v9fs_path_init(&new_path); + if (newdirfid != -1) { +@@ -3238,11 +3257,13 @@ static int coroutine_fn v9fs_complete_rename(V9fsPDU *pdu, V9fsFidState *fidp, + if (err < 0) { + goto out; + } ++ + /* + * Fixup fid's pointing to the old name to + * start pointing to the new name + */ +- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { ++ g_hash_table_iter_init(&iter, s->fids); ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { + if (v9fs_path_is_ancestor(&fidp->path, &tfidp->path)) { + /* replace the name */ + v9fs_fix_path(&tfidp->path, &new_path, strlen(fidp->path.data)); +@@ -3320,6 +3341,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, + V9fsPath oldpath, newpath; + V9fsState *s = pdu->s; + int err; ++ GHashTableIter iter; ++ gpointer fid; + + v9fs_path_init(&oldpath); + v9fs_path_init(&newpath); +@@ -3336,7 +3359,8 @@ static int coroutine_fn v9fs_fix_fid_paths(V9fsPDU *pdu, V9fsPath *olddir, + * Fixup fid's pointing to the old name to + * start pointing to the new name + */ +- QSIMPLEQ_FOREACH(tfidp, &s->fid_list, next) { ++ g_hash_table_iter_init(&iter, s->fids); ++ while (g_hash_table_iter_next(&iter, &fid, (gpointer *) &tfidp)) { + if (v9fs_path_is_ancestor(&oldpath, &tfidp->path)) { + /* replace the name */ + v9fs_fix_path(&tfidp->path, &newpath, strlen(oldpath.data)); +@@ -4226,7 +4250,7 @@ int v9fs_device_realize_common(V9fsState *s, const V9fsTransport *t, + s->ctx.fmode = fse->fmode; + s->ctx.dmode = fse->dmode; + +- QSIMPLEQ_INIT(&s->fid_list); ++ s->fids = g_hash_table_new(NULL, NULL); + qemu_co_rwlock_init(&s->rename_lock); + + if (s->ops->init(&s->ctx, errp) < 0) { +@@ -4286,6 +4310,10 @@ void v9fs_device_unrealize_common(V9fsState *s) + if (s->ctx.fst) { + fsdev_throttle_cleanup(s->ctx.fst); + } ++ if (s->fids) { ++ g_hash_table_destroy(s->fids); ++ s->fids = NULL; ++ } + g_free(s->tag); + qp_table_destroy(&s->qpd_table); + qp_table_destroy(&s->qpp_table); +diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h +index 994f952600..10fd2076c2 100644 +--- a/hw/9pfs/9p.h ++++ b/hw/9pfs/9p.h +@@ -339,7 +339,7 @@ typedef struct { + struct V9fsState { + QLIST_HEAD(, V9fsPDU) free_list; + QLIST_HEAD(, V9fsPDU) active_list; +- QSIMPLEQ_HEAD(, V9fsFidState) fid_list; ++ GHashTable *fids; + FileOperations *ops; + FsContext ctx; + char *tag; +-- +2.36.2 + diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4f55b48bc540c..410c3bf2d9e21 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -3,7 +3,7 @@ , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , makeWrapper, runtimeShell, removeReferencesTo , attr, libcap, libcap_ng, socat -, CoreServices, Cocoa, Hypervisor, rez, setfile +, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet , guestAgentSupport ? with stdenv.hostPlatform; isLinux || isSunOS || isWindows , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { gnutls nettle curl ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile ] + ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile vmnet ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] @@ -111,6 +111,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) + ./9pfs-use-GHashTable-for-fid-table.patch ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index ec078f55aa59f..5ea14cae03352 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -6,7 +6,6 @@ , pkg-config , which , libapparmor -, apparmor-parser , libseccomp , libselinux , makeWrapper diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 95909e36d0c0e..ed882709aa143 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -19,7 +19,8 @@ , pkg-config , python3 , shared-mime-info -, spice-gtk ? null +# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88 +, spice-gtk_libsoup2 ? null , spice-protocol ? null , spiceSupport ? true , vte @@ -29,7 +30,7 @@ assert spiceSupport -> ( gdbm != null && libcap != null - && spice-gtk != null + && spice-gtk_libsoup2 != null && spice-protocol != null ); @@ -78,12 +79,12 @@ stdenv.mkDerivation rec { ] ++ optionals spiceSupport [ gdbm libcap - spice-gtk + spice-gtk_libsoup2 spice-protocol ]; # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; strictDeps = true; diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index bddaab6157831..3472c760428bc 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -4,7 +4,6 @@ , libnotify , gobject-introspection , python3Packages -, wrapGAppsHook , extraLibs ? [] }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index 499713f966aaf..40ac908fe5807 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -1,6 +1,5 @@ { lib, stdenv -, fetchurl , coreutils , makeWrapper , sway-unwrapped diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix index 8fa6a84b721de..50fbae605da2a 100644 --- a/pkgs/applications/window-managers/tinywm/default.nix +++ b/pkgs/applications/window-managers/tinywm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontConfigure = true; buildPhase = '' - ${stdenv.cc}/bin/cc -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm + $CC -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm ''; installPhase = '' diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index bd9bcb30d107d..51111932cd237 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git -, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config }: stdenv.mkDerivation rec { diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix index f47e3ebc61c20..7ac8afdde225a 100644 --- a/pkgs/build-support/build-maven.nix +++ b/pkgs/build-support/build-maven.nix @@ -1,52 +1,60 @@ -{ stdenv, maven, runCommand, writeText, fetchurl, lib, requireFile }: -/* Takes an info file generated by mvn2nix - * (https://github.com/NixOS/mvn2nix-maven-plugin) and builds the maven - * project with it. - * - * repo: A local maven repository with the project's dependencies. - * - * settings: A settings.xml to pass to maven to use the repo. - * - * build: A simple build derivation that uses mvn compile and package to build - * the project. - */ -infoFile: let +{ stdenv, maven, runCommand, writeText, fetchurl, lib, requireFile, linkFarm }: +# Takes an info file generated by mvn2nix +# (https://github.com/NixOS/mvn2nix-maven-plugin) and builds the maven +# project with it. +# +# repo: A local maven repository with the project's dependencies. +# +# settings: A settings.xml to pass to maven to use the repo. +# +# build: A simple build derivation that uses mvn compile and package to build +# the project. +# +# @example +# project = pkgs.buildMaven ./project-info.json +infoFile: +let info = lib.importJSON infoFile; - script = writeText "build-maven-repository.sh" '' - ${lib.concatStrings (map (dep: let + dependencies = lib.flatten (map (dep: + let inherit (dep) sha1 groupId artifactId version metadata repository-id; - versionDir = dep.unresolved-version or version; authenticated = dep.authenticated or false; url = dep.url or ""; - fetch = if (url != "") then ((if authenticated then requireFile else fetchurl) { - inherit url sha1; - }) else ""; + fetch = if (url != "") then + ((if authenticated then requireFile else fetchurl) { + inherit url sha1; + }) + else + ""; fetchMetadata = (if authenticated then requireFile else fetchurl) { inherit (metadata) url sha1; }; - in '' - dir=$out/$(echo ${groupId} | sed 's|\.|/|g')/${artifactId}/${versionDir} - mkdir -p $dir - ${lib.optionalString (fetch != "") '' - ln -sv ${fetch} $dir/${fetch.name} - ''} - ${lib.optionalString (dep ? metadata) '' - ln -svf ${fetchMetadata} $dir/maven-metadata-${repository-id}.xml - ${lib.optionalString (fetch != "") '' - ln -sv ${fetch} $dir/$(echo ${fetch.name} | sed 's|${version}|${dep.unresolved-version}|') - ''} - ''} - '') info.dependencies)} - ''; + layout = "${ + builtins.replaceStrings [ "." ] [ "/" ] groupId + }/${artifactId}/${versionDir}"; + in lib.optional (url != "") { + layout = "${layout}/${fetch.name}"; + drv = fetch; + } ++ lib.optionals (dep ? metadata) ([{ + layout = "${layout}/maven-metadata-${repository-id}.xml"; + drv = fetchMetadata; + }] ++ lib.optional (fetch != "") { + layout = "${layout}/${ + builtins.replaceStrings [ version ] [ dep.unresolved-version ] + fetch.name + }"; + drv = fetch; + })) info.dependencies); - repo = runCommand "maven-repository" {} '' - bash ${script} - ''; + repo = linkFarm "maven-repository" (lib.forEach dependencies (dependency: { + name = dependency.layout; + path = dependency.drv; + })); settings = writeText "settings.xml" '' <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" @@ -65,9 +73,8 @@ in { name = "${info.project.artifactId}-${info.project.version}.jar"; src = builtins.filterSource (path: type: - (toString path) != (toString (src + "/target")) && - (toString path) != (toString (src + "/.git")) - ) src; + (toString path) != (toString (src + "/target")) && (toString path) + != (toString (src + "/.git"))) src; buildInputs = [ maven ]; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index e5b39cdd9dcee..a3145e504f23e 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -984,33 +984,34 @@ rec { # following lines, double-check that your code behaves properly # when the number of layers equals: # maxLayers-1, maxLayers, and maxLayers+1, 0 - store_layers="$( - paths | - jq -sR ' - rtrimstr("\n") | split("\n") - | (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ] - | map(select(length > 0)) + paths | + jq -sR ' + rtrimstr("\n") | split("\n") + | (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ] + | map(select(length > 0)) ' \ - --argjson maxLayers "$availableLayers" - )" + --argjson maxLayers "$availableLayers" > store_layers.json + # The index on $store_layers is necessary because the --slurpfile + # automatically reads the file as an array. cat ${baseJson} | jq ' . + { "store_dir": $store_dir, "from_image": $from_image, - "store_layers": $store_layers, + "store_layers": $store_layers[0], "customisation_layer", $customisation_layer, "repo_tag": $repo_tag, "created": $created } ' --arg store_dir "${storeDir}" \ --argjson from_image ${if fromImage == null then "null" else "'\"${fromImage}\"'"} \ - --argjson store_layers "$store_layers" \ + --slurpfile store_layers store_layers.json \ --arg customisation_layer ${customisationLayer} \ --arg repo_tag "$imageName:$imageTag" \ --arg created "$created" | tee $out ''; + result = runCommand "stream-${baseName}" { inherit (conf) imageName; diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index 1997c80c8a153..a7a3066ffab39 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -1,32 +1,27 @@ -{ stdenv, fetchurl, ... }: -{ name -, url -, version +{ stdenv, fetchzip, applyPatches, ... }: +{ url , sha256 , patches ? [ ] +, name ? null +, version ? null }: -stdenv.mkDerivation { - pname = "nc-app-${name}"; - inherit version patches; - - src = fetchurl { +if name != null || version != null then throw '' + `pkgs.fetchNextcloudApp` has been changed to use `fetchzip`. + To update, please + * remove `name`/`version` + * update the hash +'' +else applyPatches { + inherit patches; + src = fetchzip { inherit url sha256; + postFetch = '' + pushd $out &>/dev/null + if [ ! -f ./appinfo/info.xml ]; then + echo "appinfo/info.xml doesn't exist in $out, aborting!" + exit 1 + fi + popd &>/dev/null + ''; }; - - unpackPhase = '' - tar -xzpf $src - ''; - - installPhase = '' - approot="$(dirname $(dirname $(find -path '*/appinfo/info.xml' | head -n 1)))" - - if [ -d "$approot" ]; - then - mv "$approot/" $out - chmod -R a-w $out - else - echo "Could not find appinfo/info.xml" - exit 1; - fi - ''; } diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index db177006a3dd1..378f33be25268 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "srJ9oEEAu90vTw5bw48tBW2V+jZWcgFj9kNqMWfV6QU="; + sha256 = "NgcWDv/W+R4lqHmLV977IJndcLj+5Ofi8g8mN6woyu4="; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix index 53d9149091e80..2e95777515510 100644 --- a/pkgs/data/fonts/cherry/default.nix +++ b/pkgs/data/fonts/cherry/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: +{ lib, stdenv, fetchFromGitHub, xorg }: stdenv.mkDerivation rec { pname = "cherry"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "13zkxwp6r6kcxv4x459vwscr0n0sik4a3kcz5xnmlpvcdnbxi586"; }; - nativeBuildInputs = [ fonttosfnt mkfontdir ]; + nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontdir ]; buildPhase = '' patchShebangs make.sh diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 5c97d3b713445..9799955d05f38 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: +{ lib, stdenv, fetchurl, xorg, libfaketime }: stdenv.mkDerivation rec { pname = "clearlyU"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21"; }; - nativeBuildInputs = [ fonttosfnt mkfontscale libfaketime ]; + nativeBuildInputs = [ xorg.fonttosfnt xorg.mkfontscale libfaketime ]; buildPhase = '' # convert bdf fonts to otb diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix index d4748544af555..d25464da813fa 100644 --- a/pkgs/data/fonts/creep/default.nix +++ b/pkgs/data/fonts/creep/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libfaketime -, fonttosfnt, mkfontscale +, xorg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n"; }; - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; buildPhase = '' faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 3b5d75acb5039..509a37556cecc 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, unzip -, bdftopcf, mkfontscale, fonttosfnt +, bdftopcf, xorg }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = - [ unzip bdftopcf mkfontscale fonttosfnt ]; + [ unzip bdftopcf xorg.mkfontscale xorg.fonttosfnt ]; postPatch = '' sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index dbfb85f881fc7..b80067baff058 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libfaketime -, fonttosfnt, mkfontscale +, xorg }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270"; }; - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; unpackPhase = '' tar -xzf $src --strip-components=1 diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index e72bed4ae4103..37fb622e13105 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchFromGitHub -, mkfontscale, bdf2psf, bdftopcf -, fonttosfnt, libfaketime +, xorg, bdf2psf, bdftopcf +, libfaketime }: stdenv.mkDerivation rec { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ mkfontscale bdf2psf bdftopcf - fonttosfnt libfaketime + [ xorg.mkfontscale bdf2psf bdftopcf + xorg.fonttosfnt libfaketime ]; buildPhase = '' diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index 3570bf7bf91ad..da12347af0626 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, mkfontscale }: +{ lib, stdenv, fetchzip, xorg }: stdenv.mkDerivation { pname = "profont"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { dontBuild = true; - nativeBuildInputs = [ mkfontscale ]; + nativeBuildInputs = [ xorg.mkfontscale ]; installPhase = '' mkdir -p "$out/share/fonts/misc" diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index adc6a79f10f49..e83c79cca5f4c 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libfaketime, fonttosfnt, mkfontscale }: +{ lib, stdenv, fetchFromGitHub, libfaketime, xorg }: stdenv.mkDerivation rec { name = "siji-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; }; - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; buildPhase = '' # compress pcf fonts diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 162197006ba76..737a799438fc7 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, mkfontscale }: +{ lib, fetchurl, xorg }: let pname = "spleen"; @@ -17,7 +17,7 @@ in fetchurl { install -m644 fonts.alias-spleen $d/fonts.alias # create fonts.dir so NixOS xorg module adds to fp - ${mkfontscale}/bin/mkfontdir "$d" + ${xorg.mkfontscale}/bin/mkfontdir "$d" ''; sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94="; diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index 6f0886e1d971f..64955efd62e82 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fontforge, mkfontscale }: +{ lib, stdenv, fetchurl, fontforge, xorg }: let version = "1.11"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp"; }; - nativeBuildInputs = [ fontforge mkfontscale ]; + nativeBuildInputs = [ fontforge xorg.mkfontscale ]; unpackPhase = '' tar -xzf $src --strip-components=1 diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index 80212a14aebfb..8fcfe694299a7 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, mkfontscale, lib, stdenv }: +{ fetchFromGitHub, xorg, lib, stdenv }: stdenv.mkDerivation rec { pname = "tamzen-font"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s"; }; - nativeBuildInputs = [ mkfontscale ]; + nativeBuildInputs = [ xorg.mkfontscale ]; installPhase = '' install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc" diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 9ccf0371f1929..348f341cea50a 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, python3 -, bdftopcf, mkfontscale +, bdftopcf, xorg }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./SOURCE_DATE_EPOCH-for-otb.patch ]; nativeBuildInputs = - [ python3 bdftopcf mkfontscale ]; + [ python3 bdftopcf xorg.mkfontscale ]; enableParallelBuilding = true; diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index 1cf31b5affe76..3e68042631c70 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, python3 -, bdftopcf, mkfontscale -, libfaketime, fonttosfnt +, bdftopcf, xorg +, libfaketime, }: stdenv.mkDerivation rec { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ python3 bdftopcf mkfontscale - libfaketime fonttosfnt + [ python3 bdftopcf xorg.mkfontscale + libfaketime xorg.fonttosfnt ]; postPatch = '' diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 7bb9930ccfca9..e9d78dd03a7c8 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, bdftopcf -, libfaketime, fonttosfnt, mkfontscale +, libfaketime, xorg }: stdenv.mkDerivation { @@ -24,8 +24,8 @@ stdenv.mkDerivation { sourceRoot = "."; nativeBuildInputs = - [ bdftopcf libfaketime fonttosfnt - mkfontscale + [ bdftopcf libfaketime xorg.fonttosfnt + xorg.mkfontscale ]; buildPhase = '' diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index fea90e8b8e760..1239b12388310 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, kbd, bdftopcf -, libfaketime, fonttosfnt, mkfontscale +, libfaketime, xorg }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ bdftopcf libfaketime - fonttosfnt mkfontscale + xorg.fonttosfnt xorg.mkfontscale ] ++ lib.optionals stdenv.isLinux [ perl kbd ]; postPatch = "patchShebangs ."; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 03ec6092ad1a2..1cd20a1c189b1 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, mkfontscale -, libfaketime, fonttosfnt +{ lib, stdenv, fetchurl, xorg +, libfaketime }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-77rkcU0YajAVugWHnGscaFvcFTgWm+1WPLknQZvTjN0="; }; - nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; + nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; dontUnpack = true; diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/data/fonts/uw-ttyp0/default.nix index a3c3f7b68aa74..f8006516e2763 100644 --- a/pkgs/data/fonts/uw-ttyp0/default.nix +++ b/pkgs/data/fonts/uw-ttyp0/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, perl -, bdftopcf, bdf2psf, mkfontdir -, fonttosfnt +, bdftopcf, bdf2psf, xorg , targetsDat ? null , variantsDat ? null }: @@ -17,7 +16,7 @@ stdenv.mkDerivation rec { # remove for version >1.3 patches = [ ./determinism.patch ]; - nativeBuildInputs = [ perl bdftopcf bdf2psf fonttosfnt mkfontdir ]; + nativeBuildInputs = [ perl bdftopcf bdf2psf xorg.fonttosfnt xorg.mkfontdir ]; # configure sizes, encodings and variants preConfigure = diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 02f113dd1c435..8ce6780cf35ad 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "3f8bc936ca1b36ede05f3cec8166c6ae6c61808d", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f8bc936ca1b36ede05f3cec8166c6ae6c61808d.tar.gz", - "sha256": "0bjd6znvwipc8gd0s4bryjbcj29h1lryxc2cqy0xgy07b7dpz245", - "msg": "Update from Hackage at 2022-10-01T15:28:21Z" + "commit": "d9b306138608746f6f686e7f3af6f35e635eacc8", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d9b306138608746f6f686e7f3af6f35e635eacc8.tar.gz", + "sha256": "11c7x0b1ivcx8z96yr7rwnsby5bmjrwsjbak2pa4kknsklxd1iba", + "msg": "Update from Hackage at 2022-10-05T14:24:18Z" } diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index b276e6fc49e6f..60d0493dd759c 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202210060105"; + version = "202210130107"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "0bb2420d643555aa19b21f3c06b517a7c14826b6"; - sha256 = "sha256-5vr7iO2vny9yalJblBVgNwupEQ9w3LZXM+VKb4xSVD0="; + rev = "becf974734e41542c356a0c0ae21a619c476d500"; + sha256 = "sha256-IF7mcyiZc4CTFWSflxQBH8Z9NloCcsCymOhU85GaoEg="; }; installPhase = '' diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index 3789e18de36f5..e52fcce406443 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks stdenv.mkDerivation rec { inherit pname; - version = "2022-07-17"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "NGgTToaSJBwmHnZjWbJ3dSJg9Mmfchj3W0xgK0CMb9M="; + sha256 = "S9pLwkgWdnk1AezHE2D4vpV+JSmRW3vr6G5qYoup1ko="; }; nativeBuildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { rm $out/share/themes/*/{AUTHORS,COPYING} - jdupes --link-soft --recurse $out/share + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 18c471e4f96b1..a056a405c0440 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "22.04.4"; + version = "22.10.3"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "sha256-EnlzjJDbiMIImn0XmiurK++JnD/kBqv4Mw6B/ps8d4Y="; + hash = "sha256-ZWt9I/Q5p6fAkheR6QlZI1DI/HL8bSNmHuO5+V3vunY="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index 0cd7e4e0db64e..bfb29e2d869db 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -52,6 +52,10 @@ , useStaticSqlite ? false }: +let + cmakeFeatureFlag = feature: flag: + "-D${feature}=${if flag then "on" else "off"}"; +in stdenv.mkDerivation (finalAttrs: { pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; version = "0.6.2"; @@ -156,8 +160,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID" ''; - # INFO: Arcan build scripts require the manpages to be generated - # before the configure phase + # INFO: Arcan build scripts require the manpages to be generated before the + # `configure` phase preConfigure = lib.optionalString buildManPages '' pushd doc ruby docgen.rb mangen @@ -169,13 +173,13 @@ stdenv.mkDerivation (finalAttrs: { # The upstream project recommends tagging the distribution "-DDISTR_TAG=Nixpkgs" "-DENGINE_BUILDTAG=${finalAttrs.version}" - "-DHYBRID_SDL=on" - "-DBUILTIN_LUA=${if useBuiltinLua then "on" else "off"}" - "-DDISABLE_JIT=${if useBuiltinLua then "on" else "off"}" - "-DSTATIC_FREETYPE=${if useStaticFreetype then "on" else "off"}" - "-DSTATIC_LIBUVC=${if useStaticLibuvc then "on" else "off"}" - "-DSTATIC_OPENAL=${if useStaticOpenAL then "on" else "off"}" - "-DSTATIC_SQLite3=${if useStaticSqlite then "on" else "off"}" + (cmakeFeatureFlag "HYBRID_SDL" true) + (cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua) + (cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua) + (cmakeFeatureFlag "STATIC_FREETYPE" useStaticFreetype) + (cmakeFeatureFlag "STATIC_LIBUVC" useStaticLibuvc) + (cmakeFeatureFlag "STATIC_OPENAL" useStaticOpenAL) + (cmakeFeatureFlag "STATIC_SQLite3" useStaticSqlite) "../src" ]; diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index d5e9d0693c842..a18f33ef93aad 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -1,17 +1,17 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub }: -stdenv.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (finalPackages: { pname = "durden"; - version = "unstable-2022-07-16"; + version = "unstable-2022-10-16"; src = fetchFromGitHub { owner = "letoram"; repo = "durden"; - rev = "4c9eaf1550d34e10565b545e0f96b1f6b8d26dcd"; - hash = "sha256-1d+Kg17nxNQeVT/iVa5oPXu96Ivvas9AO/H+NxhB4Yo="; + rev = "728a9f09ac8b306ab2619b4e2ec4f48decf1b7a8"; + hash = "sha256-ckOKdrz232Q6hAyFC2mAyZQLNuuR8JbVhbLy32qFn1o="; }; dontConfigure = true; diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index 6954f157d6e89..1c1c66fd3fb0d 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -1,9 +1,9 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub }: -stdenv.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (finalPackages: { pname = "pipeworld"; version = "unstable-2022-04-03"; diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/desktops/arcan/prio/default.nix index cc5bef3c3ef85..03a8f05908b57 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/desktops/arcan/prio/default.nix @@ -1,9 +1,9 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub }: -stdenv.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (finalPackages: { pname = "prio"; version = "unstable-2018-09-13"; diff --git a/pkgs/desktops/gnome/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix index a6d70d162c08d..4001e358e8516 100644 --- a/pkgs/desktops/gnome/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "cheese"; - version = "41.1"; + version = "43.alpha"; outputs = [ "out" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "UilgyihzD/ZkOQcLBEGMngpLtVVg11v+CLIY2ixn5Uc="; + sha256 = "utrp972m+lch2regi4I3p15TJcDJpmlJj/VPdyFG5M8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index df8e9548c35e8..44b7659d30c7c 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , desktop-file-utils , gettext , glibcLocales @@ -12,29 +13,25 @@ , python3 , wrapGAppsHook , cpio -, file , glib , gnome , gtk3 , libhandy , json-glib , libarchive -, libnotify +, libportal-gtk3 , nautilus -, unzip }: stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.42.0"; + version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HEOObVPsEP9PLrWyLXu/KKfCqElXq2SnUcHN88UjAsc="; + url = "mirror://gnome/sources/file-roller/${lib.versions.major version}/file-roller-${version}.tar.xz"; + sha256 = "KYcp/b252oEywLvGCQdRfWVoWwVhiuBRZzNeZIT1c6E="; }; - LANG = "en_US.UTF-8"; # postinstall.py - nativeBuildInputs = [ desktop-file-utils gettext @@ -50,32 +47,19 @@ stdenv.mkDerivation rec { buildInputs = [ cpio - file glib - gnome.adwaita-icon-theme gtk3 libhandy json-glib libarchive - libnotify + libportal-gtk3 nautilus ]; - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; - postPatch = '' - chmod +x postinstall.py # patchShebangs requires executable file - patchShebangs postinstall.py patchShebangs data/set-mime-type-entry.py ''; - preFixup = '' - # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40 - gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ unzip ]} - ) - ''; - passthru = { updateScript = gnome.updateScript { packageName = "file-roller"; diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index 624ccc36d675c..10f39ef94b4a8 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "42.2"; + version = "43.alpha"; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PGIpER8KwGauRJZJIHkdEmX1u7VrC9lJppt7EmH8j8o="; + sha256 = "K3iOqhbYeeOVdGmS/OdmC5WtIpQ5OgHs0t5CzdWW95o="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index 58659d1748e5c..f1072dde8db3a 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -12,21 +12,23 @@ , itstool , libxml2 , gtk4 +, libadwaita , glib , atk , gobject-introspection +, vala , wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "ghex"; - version = "42.3"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rdQPirJJIdsw0nvljwAnMgGXfYf9yNeezq36iw41Te8="; + sha256 = "hmwGIsZv21rSpHXpz8zLIZocZDHwCayyKR1D8hQLFH4="; }; nativeBuildInputs = [ @@ -38,11 +40,13 @@ stdenv.mkDerivation rec { pkg-config gi-docgen gobject-introspection + vala wrapGAppsHook4 ]; buildInputs = [ gtk4 + libadwaita atk glib ]; @@ -54,6 +58,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + "-Dvapi=true" ] ++ lib.optionals stdenv.isDarwin [ # mremap does not exist on darwin "-Dmmap-buffer-backend=false" diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 0f0d8518e9262..08679b94e2fb5 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -11,15 +12,12 @@ , gobject-introspection , libxml2 , gtk3 -, gtksourceview4 -, gtk-vnc , libvirt , spice-gtk -, python3 , appstream-glib , spice-protocol , libhandy -, libsoup +, libsoup_3 , libosinfo , systemd , tracker @@ -45,7 +43,7 @@ , numactl , libapparmor , json-glib -, webkitgtk +, webkitgtk_4_1 , vte , glib-networking , qemu-utils @@ -53,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "42.3"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Vu/3+vgwD6oc4U+An468Knu02RWvx7EnNxKXkWBbYNM="; + sha256 = "V0UFCWQUyCC4COzQ9x4tGakzI1HhKj3YJvdi5DK/ayY="; }; patches = [ @@ -70,16 +68,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib # for appstream-util - desktop-file-utils gettext gobject-introspection itstool meson ninja pkg-config - python3 vala wrapGAppsHook + # For post install script + glib + gtk3 + desktop-file-utils ]; # Required for USB redirection PolicyKit rules file @@ -95,9 +95,7 @@ stdenv.mkDerivation rec { glib-networking gmp gnome.adwaita-icon-theme - gtk-vnc gtk3 - gtksourceview4 json-glib libapparmor libarchive @@ -108,7 +106,7 @@ stdenv.mkDerivation rec { libosinfo librsvg libsecret - libsoup + libsoup_3 libusb1 libvirt libvirt-glib @@ -120,7 +118,7 @@ stdenv.mkDerivation rec { tracker tracker-miners vte - webkitgtk + webkitgtk_4_1 yajl ]; @@ -128,11 +126,6 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}") ''; - postPatch = '' - chmod +x build-aux/post_install.py # patchShebangs requires executable file - patchShebangs build-aux/post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 432980300d2d2..1f178d964f6d1 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -7,14 +7,14 @@ , wrapGAppsHook4 , libgweather , geoclue2 -, geocode-glib +, geocode-glib_2 , gettext , libxml2 , gnome , gtk4 -, evolution-data-server +, evolution-data-server-gtk4 , libical -, libsoup +, libsoup_3 , glib , gsettings-desktop-schemas , libadwaita @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "42.2"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "rnzGOq6WoCqlmbbWo0hYX0529ylTbznvt0QwKwW1+70="; + sha256 = "CeXA+TYPP4Vt6qfA2zD12rAVEYDfQYOAfGzzYCmS9cw="; }; nativeBuildInputs = [ @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 - evolution-data-server # waiting for GTK4 port + evolution-data-server-gtk4 libical - libsoup + libsoup_3 glib libgweather geoclue2 - geocode-glib + geocode-glib_2 gsettings-desktop-schemas libadwaita ]; diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index b4e9eee9712f8..9dc7d113571da 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XaD/uBb4prRPMDdEyoJ6NAgBGMHJONjXmvF7f+Z5gPg="; + sha256 = "poW5y/k1Re05EWjEHJ2L+DeFq7+0iWdYJ+5zQkcbqsg="; }; patches = [ @@ -63,10 +63,6 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py - - # https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/70 - substituteInPlace meson_post_install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; dontWrapGApps = true; diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 2700f769b0833..488922f291002 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -5,10 +5,10 @@ , ninja , gettext , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , itstool , desktop-file-utils -, vala_0_56 +, vala , gobject-introspection , libxml2 , gtk4 @@ -17,7 +17,7 @@ , sound-theme-freedesktop , gsettings-desktop-schemas , gnome-desktop -, geocode-glib +, geocode-glib_2 , gnome , gdk-pixbuf , geoclue2 @@ -27,21 +27,21 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "DnEY20oDLjzqMhLZjLuCjWt88i/gXgxfyLORxqPdb+A="; + sha256 = "sHQ7cNAIgKo7zcx/fzTIwihiV7XIFzfU+YG8jE9PmB0="; }; nativeBuildInputs = [ - vala_0_56 + vala meson ninja pkg-config gettext itstool - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils libxml2 gobject-introspection # for finding vapi files @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gdk-pixbuf gnome-desktop - geocode-glib + geocode-glib_2 geoclue2 libgweather gsound diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 165004860c422..6fc3519e5e54a 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, vala_0_56 +, vala , gettext , itstool , python3 @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "42.1.2"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-2ObnJ0EJHYkt/IQoH2JVUdBWjNSC1I21ik7bivoTd7Y="; + hash = "sha256-hdrYL5PAsvYJ/o7H7N7scGAKVWEq/A4/AndMJaC7MJ8="; }; nativeBuildInputs = [ meson ninja pkg-config - vala_0_56 + vala gettext itstool python3 diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index 105194123d001..61cc39d61dfe4 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -7,61 +7,61 @@ , pkg-config , gnome , glib -, gtk3 -, wrapGAppsHook +, gtk4 +, desktop-file-utils +, wrapGAppsHook4 , gettext , itstool -, libhandy +, libadwaita , libxml2 , libxslt -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 , systemd -, python3 , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TV5FFp1r9DkC16npoHk8kW65LaumuoWzXI629nLNq9c="; + sha256 = "M6k7l17CfISHglBIqnuK99XCNWWrz3t0yQKrez7CCGE="; }; patches = [ - # meson: Remove redundant check for glib-mkenums + # Remove GTK 3 depndency + # https://gitlab.gnome.org/GNOME/gnome-logs/-/merge_requests/46 (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/01386ce9a69652a00bdb163e569b51150ca8903e.diff"; - sha256 = "sha256-tJJEai4Jw8aVcyhsFTYILiUV1xhsysX/rleeLP13DVM="; - }) - # meson: remove redundant check for pkg-config - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/ad350729a8b81f2c8eb2122de0956bb2199b48da.patch"; - sha256 = "sha256-5qGYyKM+B9XNZKytWH8K4QfSuBf7wpaPCWT6YIO5FGY="; + url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/32193a1385b95012bc8e7007ada89566bd63697d.patch"; + sha256 = "5WsTnfVpWZquU65pSLnk2M6VnY+qQPUi7A0cqMmzfrU="; + postFetch = '' + substituteInPlace "$out" --replace "43.1" "43.0" + ''; }) ]; nativeBuildInputs = [ - python3 meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 gettext itstool libxml2 libxslt - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 glib + gtk4 + desktop-file-utils ]; buildInputs = [ glib - gtk3 - libhandy + gtk4 + libadwaita systemd gsettings-desktop-schemas ]; @@ -70,11 +70,6 @@ stdenv.mkDerivation rec { "-Dman=true" ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - doCheck = true; passthru = { diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 1b419aa892e68..9d455bd9be25c 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -7,34 +7,31 @@ , python3 , pkg-config , gnome -, gtk3 +, glib +, gtk4 , gobject-introspection , gdk-pixbuf -, librest -, librsvg +, librest_1_0 , libgweather , geoclue2 -, wrapGAppsHook -, folks -, libchamplain -, libsoup +, wrapGAppsHook4 +, desktop-file-utils +, libshumate +, libsecret +, libsoup_3 , gsettings-desktop-schemas -, webkitgtk , gjs -, libgee -, libhandy -, geocode-glib -, evolution-data-server -, gnome-online-accounts +, libadwaita +, geocode-glib_2 }: stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "42.3"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5FZGf6zzyP0QyThrXnTEPZWVrZ+3Ulf32gFK+YPWnNE="; + sha256 = "sha256-CGjPz7eMOiesW+YM2E0wuz08KMiFqY+qCeN/o6UyNOQ="; }; doCheck = true; @@ -44,35 +41,31 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 - wrapGAppsHook + wrapGAppsHook4 + gobject-introspection + # For post install script + desktop-file-utils + glib + gtk4 ]; buildInputs = [ - evolution-data-server - folks gdk-pixbuf + glib geoclue2 - geocode-glib + geocode-glib_2 gjs - gnome-online-accounts - gobject-introspection gsettings-desktop-schemas - gtk3 - libchamplain - libgee + gtk4 + libshumate libgweather - libhandy - librest - librsvg - libsoup - webkitgtk + libadwaita + librest_1_0 + libsecret + libsoup_3 ]; postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - # The .service file isn't wrapped with the correct environment # so misses GIR files when started. By re-pointing from the gjs # entry point to the wrapped binary we get back to a wrapped diff --git a/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix index a883067e7804c..eb0070344bd78 100644 --- a/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , gettext , fetchurl , pkg-config @@ -10,24 +11,16 @@ , python3 , desktop-file-utils , wrapGAppsHook -, gnome }: +, gnome +}: -let +stdenv.mkDerivation rec { pname = "gnome-power-manager"; - version = "3.32.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0drfn3wcc8l4n07qwv6p0rw2dwcd00hwzda282q62l6sasks2b2g"; - }; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; - }; + url = "mirror://gnome/sources/gnome-power-manager/${lib.versions.major version}/gnome-power-manager-${version}.tar.xz"; + sha256 = "faq0i73bMOnfKrplDLYNBeZnyfiFrOagoeeVDgy90y8="; }; nativeBuildInputs = [ @@ -39,7 +32,7 @@ in stdenv.mkDerivation rec { # needed by meson_post_install.sh python3 - glib.dev + glib desktop-file-utils ]; @@ -47,9 +40,15 @@ in stdenv.mkDerivation rec { gtk3 glib upower - gnome.adwaita-icon-theme ]; + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-power-manager"; + attrPath = "gnome.gnome-power-manager"; + }; + }; + meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-power-manager"; description = "View battery and power statistics provided by UPower"; diff --git a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index cd7259c3ae956..c8d455ae216ab 100644 --- a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "42.0"; + version = "43.beta"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TAjDFSgvPr96LabyDg/58McdqlIp/NL+C1wKqqoG8K0="; + sha256 = "bbbbmjsbUv0KtU+aW/Tymctx5SoTrF/fw+dOtGmFpOY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index faf32952cfc27..2e813fc10de76 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -15,6 +15,7 @@ , icu , itstool , libadwaita +, editorconfig-core-c , libxml2 , pcre , appstream-glib @@ -23,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "42.2"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-5W1KjNy86KjxwIgbRd55n4slIF7Ay/ImnlMgJXYcxdo="; + sha256 = "sha256-lzpLDeto+fkaVKTdQVtq/em1rj7mhLx2FHH5QpD59ss="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { gtk4 gtksourceview5 libadwaita + editorconfig-core-c pcre ]; diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index c04cd6f2dc96c..bc0fec6cfa71f 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "V57mkdhT5bs/9Q6Me0P4Wundfls6ZJ4CwlSi2bgHtGU="; + sha256 = "LxERf3VVK/G7ngHwHPs8L82mo/aQcP/gUZoHYVMrjyY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix index 84ec0e0d2a849..c81068477e362 100644 --- a/pkgs/desktops/gnome/apps/polari/default.nix +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -17,8 +17,8 @@ , gtk3 , glib , libsecret -, libsoup -, webkitgtk +, libsoup_3 +, webkitgtk_4_1 , gobject-introspection , appstream-glib , gnome @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "polari"; - version = "42.1"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "r5DPCEjsvkB+sjBkBINpdP048xww1HT0bRspIYqWaz0="; + sha256 = "F6GS3uYfWOPNRHJQC+cBGUa5n75SvFrBJPqurC8zQUc="; }; patches = [ @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { gspell gdk-pixbuf libsecret - libsoup - webkitgtk # for thumbnailer + libsoup_3 + webkitgtk_4_1 # for thumbnailer ]; postFixup = '' diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 07e39248bb70d..60de418f1e440 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , vala , meson @@ -11,7 +12,8 @@ , wrapGAppsHook , itstool , gnupg -, libsoup +, desktop-file-utils +, libsoup_3 , gnome , gpgme , python3 @@ -27,11 +29,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-xQys6/jeen4uXx2uC5gjIRR0Epar6NVD45I9YqFT1jA="; + hash = "sha256-Wx0b+6dPNlgifzyC4pbzMN0PzR70Y2tqIYIo/uXqgy0="; }; nativeBuildInputs = [ @@ -44,6 +46,7 @@ stdenv.mkDerivation rec { python3 openssh gnupg + desktop-file-utils gcr # error: Package `...' not found in specified Vala API directories or GObject-Introspection GIR directories # TODO: the vala setuphook should look for vala filess in targetOffset instead of hostOffset @@ -60,7 +63,7 @@ stdenv.mkDerivation rec { gpgme libsecret avahi - libsoup + libsoup_3 p11-kit openldap libpwquality @@ -70,7 +73,7 @@ stdenv.mkDerivation rec { doCheck = true; postPatch = '' - patchShebangs build-aux/ + patchShebangs build-aux/gpg_check_version.py ''; preCheck = '' diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index 5e36cd109e43b..069d1d6040c45 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -1,35 +1,42 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, intltool, gnome -, iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: +{ lib +, stdenv +, fetchurl +, pkg-config +, autoreconfHook +, gnome +, gtk3 +, gdk-pixbuf +, librsvg +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "42.0"; + version = "43"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA="; + sha256 = "LjrHfTKmqlVUFV3zfo8KDdVPxaZf1yHojVBflw2jLsY="; }; - patches = [ - (fetchpatch { - name = "reduce-build-parallelism.patch"; - url = "https://gitlab.gnome.org/vcunat/adwaita-icon-theme/-/commit/27edeca7927eb2247d7385fccb3f0fd7787471e6.patch"; - sha256 = "vDWuvz5yRhtn9obTtHRp6J7gJpXDZz1cajyquPGw53I="; - }) + nativeBuildInputs = [ + pkg-config + autoreconfHook + gtk3 ]; - # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor-icon-theme ]; - - buildInputs = [ gdk-pixbuf librsvg ]; + buildInputs = [ + gdk-pixbuf + librsvg + ]; - nativeBuildInputs = [ pkg-config autoreconfHook intltool iconnamingutils gtk3 ]; + propagatedBuildInputs = [ + # For convenience, we can specify adwaita-icon-theme only in packages + hicolor-icon-theme + ]; dontDropIconThemeCache = true; - # remove a tree of dirs with no files within - postInstall = '' rm -rf "$out/locale" ''; - passthru = { updateScript = gnome.updateScript { packageName = "adwaita-icon-theme"; @@ -40,5 +47,6 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = with platforms; linux ++ darwin; maintainers = teams.gnome.members; + license = licenses.cc-by-sa-30; }; } diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 7c463e8ed283e..8419aa17ea708 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "baobab"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Sxqr5rqxWCs/6nmigpvOfyQVu25QYvJTV67t1TF6UNw="; + sha256 = "UsaGQRj1aX9aVzaILc2ifbIuciC8SSg43uzGmSRs2yY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix index 4c8607bb6f9fa..7cf366b7dc065 100644 --- a/pkgs/desktops/gnome/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -9,6 +9,7 @@ , pkg-config , glib , gtk3 +, libhandy , gnome , python3 , dconf @@ -21,23 +22,17 @@ stdenv.mkDerivation rec { pname = "dconf-editor"; - version = "3.38.3"; + version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Vxr0x9rU8Em1PmzXKLea3fCMJ92ra8V7OW0hGGbueeM="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-k1o8Lddswqk81a7ppU05R/sRHrOW9LY9xfC6j40JkTY="; }; patches = [ # Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR # environment variable, to match what we patched GLib to do. ./schema-override-variable.patch - - # Fix build with Meson 0.61.0 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/56474378568e6ff4af8aa912810323e808c1d977.patch"; - sha256 = "iFyJcskqcmvz7tp1Z9jM9f8WvAhD0L9Vx1hu2c402MA="; - }) ]; nativeBuildInputs = [ @@ -57,6 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 + libhandy dconf ]; diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 3f9333aeb5849..ccb4d439240f9 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "42.3"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MMGzwovG3ChU2Hjr0xoi6qFb+VnBNCBqKhkEGT5H9Do="; + sha256 = "sha256-pSovPrGju1ADijNikCvHlRY+GphnY+6C0gQk566EVG8="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 88cbbee0d0be5..2a7c0323e0917 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -15,19 +15,17 @@ , libxml2 , libxslt , itstool -, webkitgtk -, libsoup +, webkitgtk_4_1 +, libsoup_3 , glib-networking , libsecret , gnome-desktop -, libnotify , libarchive , p11-kit , sqlite , gcr , isocodes , desktop-file-utils -, python3 , nettle , gdk-pixbuf , gst_all_1 @@ -40,11 +38,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "42.3"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cxbTxlAOgl2OVyk/pYBHxWcnvuFs1rasgE/+XZsilWA="; + sha256 = "tm1Jn57nJpbYPPhEElN3GBqVRVSkuzeFtzKTOArAwic="; }; patches = lib.optionals withPantheon [ @@ -67,7 +65,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 wrapGAppsHook buildPackages.glib buildPackages.gtk3 @@ -92,15 +89,14 @@ stdenv.mkDerivation rec { libdazzle libhandy libportal-gtk3 - libnotify libarchive libsecret - libsoup + libsoup_3 libxml2 nettle p11-kit sqlite - webkitgtk + webkitgtk_4_1 ]; # Tests need an X display @@ -108,11 +104,6 @@ stdenv.mkDerivation rec { "-Dunit_tests=disabled" ]; - postPatch = '' - chmod +x post_install.py # patchShebangs requires executable file - patchShebangs post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 8f5a81f0bf556..7138b99476321 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -31,7 +31,6 @@ , gsettings-desktop-schemas , gnome-desktop , dbus -, python3 , texlive , gst_all_1 , gi-docgen @@ -43,20 +42,15 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "42.3"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Sa7PhFyUbJbbF7qJ11yAAsWuiWP1BKmwYm0SZ1kUZF4="; + sha256 = "Zr4N5LR7ETBIYQOYjMFSwErqlZULo+8W3CDC72toHUc="; }; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - nativeBuildInputs = [ appstream gettext @@ -66,7 +60,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 wrapGAppsHook yelp-tools ]; diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index a7d4673158b54..73890d27a002d 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -11,14 +11,13 @@ , python3 , gobject-introspection , gettext -, libsoup +, libsoup_3 , libxml2 , libsecret , icu , sqlite , tzdata , libcanberra-gtk3 -, gcr , p11-kit , db , nspr @@ -33,29 +32,31 @@ , ninja , libkrb5 , openldap -, webkitgtk +, webkitgtk_4_1 +, webkitgtk_5_0 , libaccounts-glib , json-glib , glib , gtk3 +, gtk4 +, withGtk3 ? true +, withGtk4 ? false , libphonenumber , gnome-online-accounts , libgweather -, libgdata -, gsettings-desktop-schemas , boost , protobuf }: stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.44.4"; + version = "3.46.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wMZliDjVi6RgQqS55Qo7sRKWkeTNuEteugvzMLLMsus="; + sha256 = "5fooCVoYP3q1qSjjWoKDebSB3e+D7Ux7UaLjxK71zas="; }; patches = [ @@ -67,8 +68,7 @@ stdenv.mkDerivation rec { prePatch = '' substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ - --subst-var-by EDS_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ - --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas} + --subst-var-by EDS_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} patches="$patches $PWD/hardcode-gsettings.patch" ''; @@ -86,27 +86,27 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libsoup - libxml2 - gtk3 + libsoup_3 gnome-online-accounts - gcr p11-kit libgweather - libgdata libaccounts-glib - json-glib icu sqlite libkrb5 openldap - webkitgtk glib-networking libcanberra-gtk3 pcre libphonenumber boost protobuf + ] ++ lib.optionals withGtk3 [ + gtk3 + webkitgtk_4_1 + ] ++ lib.optionals withGtk4 [ + gtk4 + webkitgtk_5_0 ]; propagatedBuildInputs = [ @@ -115,8 +115,9 @@ stdenv.mkDerivation rec { nss nspr libical - libgdata # needed for GObject inspection, https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs - libsoup + libsoup_3 + libxml2 + json-glib ]; cmakeFlags = [ @@ -125,7 +126,10 @@ stdenv.mkDerivation rec { "-DENABLE_INTROSPECTION=ON" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" "-DWITH_PHONENUMBER=ON" - "-DWITH_GWEATHER4=ON" + "-DENABLE_GTK=${lib.boolToString withGtk3}" + "-DENABLE_EXAMPLES=${lib.boolToString withGtk3}" + "-DENABLE_CANBERRA=${lib.boolToString withGtk3}" + "-DENABLE_GTK4=${lib.boolToString withGtk4}" ]; passthru = { diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci index 9e60e892b7116..8f72e4f5d94b7 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.cocci @@ -24,7 +24,6 @@ e_s_d_schema_constants = [ ] g_d_s_schema_constants = [ - "\"org.gnome.system.proxy\"", ] def get_schema_directory(schema_path): diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index c756b4bcc2ac2..87d5ca56b7c50 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -127,8 +127,32 @@ index 8dfff6d..cd88392 100644 uid = g_settings_get_string (settings, SELF_UID_KEY); g_object_unref (settings); +diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c +index d3f130e..9e8edd4 100644 +--- a/src/addressbook/libedata-book/e-book-meta-backend.c ++++ b/src/addressbook/libedata-book/e-book-meta-backend.c +@@ -135,7 +135,18 @@ ebmb_is_power_saver_enabled (void) + GSettings *settings; + gboolean enabled = FALSE; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + + if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { + GPowerProfileMonitor *power_monitor; diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c -index e696861..52af238 100644 +index 42f3457..faac410 100644 --- a/src/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c @@ -1387,7 +1387,18 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) @@ -152,10 +176,10 @@ index e696861..52af238 100644 cbc->priv->update_alarms_id = 0; cbc->priv->alarm_enabled = FALSE; diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c -index a24ede2..5d2a032 100644 +index 52095a4..e839991 100644 --- a/src/calendar/libecal/e-reminder-watcher.c +++ b/src/calendar/libecal/e-reminder-watcher.c -@@ -2477,7 +2477,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) +@@ -2555,7 +2555,19 @@ e_reminder_watcher_init (EReminderWatcher *watcher) watcher->priv = e_reminder_watcher_get_instance_private (watcher); watcher->priv->cancellable = g_cancellable_new (); @@ -176,6 +200,30 @@ index a24ede2..5d2a032 100644 watcher->priv->scheduled = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, e_reminder_watcher_free_rd_slist); watcher->priv->default_zone = e_cal_util_copy_timezone (zone); watcher->priv->timers_enabled = TRUE; +diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c +index 94a875f..1f914a9 100644 +--- a/src/calendar/libedata-cal/e-cal-meta-backend.c ++++ b/src/calendar/libedata-cal/e-cal-meta-backend.c +@@ -149,7 +149,18 @@ ecmb_is_power_saver_enabled (void) + GSettings *settings; + gboolean enabled = FALSE; + +- settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ settings = g_settings_new_full(schema, NULL, NULL); ++ } + + if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) { + GPowerProfileMonitor *power_monitor; diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c index 8013ba7..ba74769 100644 --- a/src/camel/camel-cipher-context.c @@ -201,10 +249,10 @@ index 8013ba7..ba74769 100644 g_clear_object (&settings); diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c -index 685d3ab..521d91f 100644 +index 205372e..2023704 100644 --- a/src/camel/camel-gpg-context.c +++ b/src/camel/camel-gpg-context.c -@@ -571,7 +571,18 @@ gpg_ctx_get_executable_name (void) +@@ -582,7 +582,18 @@ gpg_ctx_get_executable_name (void) GSettings *settings; gchar *path; @@ -249,6 +297,30 @@ index e61160c..d17871a 100644 g_signal_connect (mi_user_headers_settings, "changed::camel-message-info-user-headers", G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); +diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c +index 2ed68cf..5dad98f 100644 +--- a/src/camel/providers/imapx/camel-imapx-server.c ++++ b/src/camel/providers/imapx/camel-imapx-server.c +@@ -5573,7 +5573,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store) + if (!skip_old_flags_update) { + GSettings *eds_settings; + +- eds_settings = g_settings_new ("org.gnome.evolution-data-server"); ++ { ++ g_autoptr(GSettingsSchemaSource) schema_source; ++ g_autoptr(GSettingsSchema) schema; ++ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", ++ g_settings_schema_source_get_default(), ++ TRUE, ++ NULL); ++ schema = g_settings_schema_source_lookup(schema_source, ++ "org.gnome.evolution-data-server", ++ FALSE); ++ eds_settings = g_settings_new_full(schema, NULL, NULL); ++ } + + if (g_settings_get_boolean (eds_settings, "limit-operations-in-power-saver-mode")) { + GPowerProfileMonitor *power_monitor; diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c index f535ad6..30130b9 100644 --- a/src/camel/providers/smtp/camel-smtp-transport.c @@ -298,10 +370,10 @@ index 188f276..7c4db94 100644 settings, "network-monitor-gio-name", object, "gio-name", diff --git a/src/libedataserver/e-oauth2-service-google.c b/src/libedataserver/e-oauth2-service-google.c -index f9d9056..115d344 100644 +index f215388..3b67126 100644 --- a/src/libedataserver/e-oauth2-service-google.c +++ b/src/libedataserver/e-oauth2-service-google.c -@@ -70,7 +70,18 @@ eos_google_read_settings (EOAuth2Service *service, +@@ -71,7 +71,18 @@ eos_google_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -322,10 +394,10 @@ index f9d9056..115d344 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-outlook.c b/src/libedataserver/e-oauth2-service-outlook.c -index 687c10d..ac1deae 100644 +index 9cff0d0..fd95f0b 100644 --- a/src/libedataserver/e-oauth2-service-outlook.c +++ b/src/libedataserver/e-oauth2-service-outlook.c -@@ -70,7 +70,18 @@ eos_outlook_read_settings (EOAuth2Service *service, +@@ -71,7 +71,18 @@ eos_outlook_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -346,10 +418,10 @@ index 687c10d..ac1deae 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service-yahoo.c b/src/libedataserver/e-oauth2-service-yahoo.c -index 329a38c..f541393 100644 +index 8e4ee81..bb8f8f7 100644 --- a/src/libedataserver/e-oauth2-service-yahoo.c +++ b/src/libedataserver/e-oauth2-service-yahoo.c -@@ -66,7 +66,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, +@@ -67,7 +67,18 @@ eos_yahoo_read_settings (EOAuth2Service *service, if (!value) { GSettings *settings; @@ -370,10 +442,10 @@ index 329a38c..f541393 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index 979095b..ecac6bb 100644 +index 5a21872..a56d589 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c -@@ -89,7 +89,18 @@ eos_default_guess_can_process (EOAuth2Service *service, +@@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service, name_len = strlen (name); hostname_len = strlen (hostname); @@ -393,51 +465,11 @@ index 979095b..ecac6bb 100644 values = g_settings_get_strv (settings, "oauth2-services-hint"); g_object_unref (settings); -diff --git a/src/libedataserver/e-proxy.c b/src/libedataserver/e-proxy.c -index bcd07f9..17db26c 100644 ---- a/src/libedataserver/e-proxy.c -+++ b/src/libedataserver/e-proxy.c -@@ -957,8 +957,33 @@ e_proxy_init (EProxy *proxy) - - proxy->priv->type = PROXY_TYPE_SYSTEM; - -- proxy->priv->evolution_proxy_settings = g_settings_new ("org.gnome.evolution.shell.network-config"); -- proxy->priv->proxy_settings = g_settings_new ("org.gnome.system.proxy"); -+ { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@EDS_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.evolution.shell.network-config", -+ FALSE); -+ proxy->priv->evolution_proxy_settings = g_settings_new_full(schema, -+ NULL, -+ NULL); -+ } -+ { -+ g_autoptr(GSettingsSchemaSource) schema_source; -+ g_autoptr(GSettingsSchema) schema; -+ schema_source = g_settings_schema_source_new_from_directory("@GDS_GSETTINGS_PATH@", -+ g_settings_schema_source_get_default(), -+ TRUE, -+ NULL); -+ schema = g_settings_schema_source_lookup(schema_source, -+ "org.gnome.system.proxy", -+ FALSE); -+ proxy->priv->proxy_settings = g_settings_new_full(schema, -+ NULL, NULL); -+ } - proxy->priv->proxy_http_settings = g_settings_get_child (proxy->priv->proxy_settings, "http"); - proxy->priv->proxy_https_settings = g_settings_get_child (proxy->priv->proxy_settings, "https"); - proxy->priv->proxy_socks_settings = g_settings_get_child (proxy->priv->proxy_settings, "socks"); diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c -index 837e940..4bbd00d 100644 +index 6701a3a..6b8ee33 100644 --- a/src/libedataserver/e-source-registry.c +++ b/src/libedataserver/e-source-registry.c -@@ -1769,7 +1769,19 @@ e_source_registry_init (ESourceRegistry *registry) +@@ -1764,7 +1764,19 @@ e_source_registry_init (ESourceRegistry *registry) g_mutex_init (®istry->priv->sources_lock); @@ -459,10 +491,10 @@ index 837e940..4bbd00d 100644 g_signal_connect ( registry->priv->settings, "changed", diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c -index d18474d..418ccc2 100644 +index 14b6481..6dc55bb 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -1874,7 +1874,19 @@ static void +@@ -1986,7 +1986,19 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { reminders->priv = e_reminders_widget_get_instance_private (reminders); diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index cf435b1e9ea3d..f1fbe7e49d305 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "42.0"; + version = "43.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "oyisl2k3vsF5lx/weCmhJGuYznJBgcEorjKguketOFU="; + sha256 = "lNcNbtffWfp/3k/QL+0RaFk6itzhD87hE8FI1Ss5IpQ="; }; mesonFlags = [ @@ -144,6 +144,7 @@ stdenv.mkDerivation rec { rsync --archive "${DESTDIR}/etc" "$out" rm --recursive "${DESTDIR}/etc" for o in $outputs; do + if [[ "$o" = "debug" ]]; then continue; fi rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" rm --recursive "${DESTDIR}/''${!o}" done @@ -162,6 +163,8 @@ stdenv.mkDerivation rec { # location using DESTDIR and then move it to proper one in postInstall. DESTDIR = "${placeholder "out"}/dest"; + separateDebugInfo = true; + passthru = { updateScript = gnome.updateScript { packageName = "gdm"; diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index ba70570b1f85c..61a367222b689 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "42.0"; + version = "43"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TH/hoJ9FnF93GJpZglJPzgXYiJRJVdZ5kQ8jRgbBKV0="; + sha256 = "GfdJ2MN/hy8VW7aaK756yjgRdeaSnxmYBH13XLxjckQ="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 8b6eb8c4f1bb1..9596f6d84cd53 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -14,7 +14,7 @@ , upower , itstool , libxml2 -, wrapGAppsHook +, wrapGAppsHook4 , libnotify , gsound , gobject-introspection @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "42.2"; + version = "42.4"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "jOjs+rKCctsYMKY/CPnMtTBHNNG+Lb/OeV/kAp5inww="; + sha256 = "HW/PHNtsyZI6szSiwLw3osG7qdGN4VPUhO7cBPPAvNw="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { itstool pkg-config libxml2 - wrapGAppsHook + wrapGAppsHook4 gobject-introspection gtk-doc docbook-xsl-nons diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index c31c6de3b9f1f..59aafb530d798 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -11,12 +11,12 @@ , gtk4 , glib , gtksourceview5 -, wrapGAppsHook +, wrapGAppsHook4 , gobject-introspection , gnome , mpfr , gmp -, libsoup +, libsoup_3 , libmpc , libadwaita , gsettings-desktop-schemas @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "42.2"; + version = "43.0.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M9qxvKQ2WNZlIJWLD2dMsK0xhc/TDBLkWef2lIHFxqA="; + sha256 = "AsEt7Tz1BT0XU32V7GlYf0uRmJnXcm7O7NtLR/+xyQ8="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { vala gettext itstool - wrapGAppsHook + wrapGAppsHook4 gobject-introspection # for finding vapi files ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { gmp libgee gsettings-desktop-schemas - libsoup + libsoup_3 libmpc libadwaita ]; diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index fac22f0b5785f..760af24880c4d 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -2,7 +2,7 @@ , stdenv , gettext , fetchurl -, evolution-data-server +, evolution-data-server-gtk4 , pkg-config , libxslt , docbook-xsl-nons @@ -10,12 +10,11 @@ , desktop-file-utils , gtk4 , glib -, libportal +, libportal-gtk4 , gnome-desktop , gnome-online-accounts -, wrapGAppsHook +, wrapGAppsHook4 , folks -, libgdata , libxml2 , gnome , vala @@ -27,17 +26,13 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "iALDj9wj9SjawSj1O9zx9sow4OHGhIxCzWyEpeIsUhY="; + sha256 = "VbYd9+k/Cr4f+kZeGOPF3k9JqQ8mjqnRHtyGrwbQceE="; }; - propagatedUserEnvPkgs = [ - evolution-data-server - ]; - nativeBuildInputs = [ meson ninja @@ -48,14 +43,14 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_42 desktop-file-utils - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ gtk4 glib - libportal - evolution-data-server + libportal-gtk4 + evolution-data-server-gtk4 gsettings-desktop-schemas folks gnome-desktop diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index f0db2b9849225..2c6db7f854aca 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -63,18 +63,17 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "42.3"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zgrjZQ3ir368sKfh/JkS7dtu/40lfz/lD/iynBk0HH4="; + sha256 = "sha256-mIyTNZLL3E5/DbqakyYuYXtzniWSeqFuF3lgx1TjHEg="; }; patches = [ (substituteAll { src = ./paths.patch; gcm = gnome-color-manager; - gnome_desktop = gnome-desktop; inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) @@ -135,16 +134,6 @@ stdenv.mkDerivation rec { upower ]; - # postPatch = '' - # scriptsToPatch=( - # build-aux/meson/meson_post_install.py - # build-aux/meson/find_xdg_file.py - # ) - # # # patchShebangs requires executable file - # # chmod +x "''${scriptsToPatch[@]}" - # # patchShebangs "''${scriptsToPatch[@]}" - # ''; - preConfigure = '' # For ITS rules addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index a6787477b8144..565d6ecdef0fc 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -54,19 +54,6 @@ index a2376f8a4..98769e08f 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 bd0e07762..0e71351f8 100644 ---- a/panels/info-overview/cc-info-overview-panel.c -+++ b/panels/info-overview/cc-info-overview-panel.c -@@ -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 diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index 89502c8d88305..4cf083ed5644f 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -12,7 +12,6 @@ , gtk3 , glib , wrapGAppsHook -, python3 , libnotify , itstool , gnome @@ -21,17 +20,18 @@ , libcanberra-gtk3 , libxslt , docbook-xsl-nons +, desktop-file-utils , libpwquality , systemd }: stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-G2VkRU1nQmMiyzv8WlVYZTv8ff7qKuCCWx0IYp8BCQs="; + sha256 = "sha256-evypgFprkttpM91+/OxK+DhsAbvB+HHi2uTe9+GSosU="; }; nativeBuildInputs = [ @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { itstool libxslt docbook-xsl-nons + desktop-file-utils wrapGAppsHook - python3 libxml2 ]; @@ -63,11 +63,6 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 64eb22b186d6e..5ebf4903cbd35 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -10,6 +10,7 @@ , libxml2 , gnome-desktop , libadwaita +, fribidi , wrapGAppsHook4 , gnome , harfbuzz @@ -17,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z6K43/8hoQWhoCHa36IT8TYn5qF5p3x7Wf3O2sqEjcw="; + sha256 = "gca/+wbVMyNG4A6uyuwb3P1hfFHf2VvNBY1sdsdt0rk="; }; doCheck = true; @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { gnome-desktop harfbuzz libadwaita + fribidi ]; # Do not run meson-postinstall.sh diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 21dda0e092fdd..7bf3e42ff3ca5 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -1,34 +1,36 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , gettext , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , gnome , accountsservice , fontconfig , gdm , geoclue2 -, geocode-glib +, geocode-glib_2 , glib , gnome-desktop , gnome-online-accounts , gtk3 +, gtk4 , libgweather , json-glib , krb5 , libpwquality -, librest +, librest_1_0 , libsecret , networkmanager , pango , polkit -, webkitgtk +, webkitgtk_5_0 , systemd -, libhandy -, libnma +, libadwaita +, libnma-gtk4 , tzdata , libgnomekbd , gsettings-desktop-schemas @@ -36,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "42.2"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TYPZiySavhW7Kz5+eurZxH+Ei8p7agkavJCLdlQavns="; + sha256 = "Ap7LgZM/QE+k9spVvuR7A++JDoRGK/FF9u4JR34aOVU="; }; patches = [ @@ -56,7 +58,7 @@ stdenv.mkDerivation rec { ninja pkg-config systemd - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -64,33 +66,35 @@ stdenv.mkDerivation rec { fontconfig gdm geoclue2 - geocode-glib + geocode-glib_2 glib gnome-desktop gnome-online-accounts gsettings-desktop-schemas gtk3 + gtk4 json-glib krb5 libgweather - libhandy - libnma + libadwaita + libnma-gtk4 libpwquality - librest + librest_1_0 libsecret networkmanager pango polkit - webkitgtk + webkitgtk_5_0 ]; mesonFlags = [ - "-Dcheese=disabled" "-Dibus=disabled" "-Dparental_controls=disabled" "-Dvendor-conf-file=${./vendor.conf}" ]; + PKG_CONFIG_SYSTEMD_SYSUSERSDIR = "${placeholder "out"}/lib/sysusers.d"; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 2d034c2d8bca5..e1655b2b7c508 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , python3 +, asciidoc , wrapGAppsHook , glib , libepoxy @@ -12,12 +13,13 @@ , nv-codec-headers-11 , pipewire , systemd -, libvncserver , libsecret , libnotify , libxkbcommon , gdk-pixbuf , freerdp +, fdk_aac +, tpm2-tss , fuse3 , mesa , libgudev @@ -28,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "42.4"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-TU0jPvov+lRnMGo8w86Le6IyUtQtSxJy1crJ1d5Fy5o="; + hash = "sha256-NrWdIeyuRLllzZHmynwMAJ1gcOwxyEt3wERZXddSeAs="; }; nativeBuildInputs = [ @@ -40,12 +42,15 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + asciidoc wrapGAppsHook ]; buildInputs = [ cairo freerdp + fdk_aac + tpm2-tss fuse3 gdk-pixbuf # For libnotify glib @@ -54,7 +59,6 @@ stdenv.mkDerivation rec { nv-codec-headers-11 libnotify libsecret - libvncserver libxkbcommon pipewire systemd @@ -77,11 +81,9 @@ stdenv.mkDerivation rec { doCheck = false; postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs \ tests/vnc-test-runner.sh \ - tests/run-vnc-tests.py \ - meson_post_install.py + tests/run-vnc-tests.py substituteInPlace tests/vnc-test-runner.sh \ --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 43bf56eb1fc83..dee4857325f6c 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "42.0"; + version = "43.0"; outputs = [ "out" "sessions" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PMoGBTq2gpJpIJUafalfjMbXLadMaCxG0KBlMzKWnKo="; + sha256 = "P7mUlQE4XIwUYY548XjZUt+YrYyRCA9MXhVoxzk64fI="; }; patches = [ @@ -117,6 +117,8 @@ stdenv.mkDerivation rec { --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" ''; + separateDebugInfo = true; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-session"; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 7e236dc39fd1a..0c20e07a770dd 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -30,23 +30,23 @@ , modemmanager , networkmanager , gnome-desktop -, geocode-glib +, geocode-glib_2 , docbook_xsl , wrapGAppsHook , python3 , tzdata , nss -, gcr +, gcr_4 , gnome-session-ctl }: stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "42.2"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "nESXFKqOwSccDbUTffNFgZWUPwXM0KyJNdkzl3cLqwA="; + sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A="; }; patches = [ @@ -93,12 +93,12 @@ stdenv.mkDerivation rec { libgweather nss polkit - geocode-glib + geocode-glib_2 geoclue2 systemd libgudev libwacom - gcr + gcr_4 ]; mesonFlags = [ @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do chmod +x $f patchShebangs $f done diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index c60e06ea640a1..2f75893b0b5ee 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "42.3"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "DsK+oy6fKKyAWJH2ExlNSPwMCR8JxIMTBlo4hPcic/w="; + sha256 = "5Hw51CeCpyRJu/fes28D/ZbLWSkZRikTkSEuL9mNX5M="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 833e0575e3398..ccc34ecca019e 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -29,7 +29,7 @@ , gobject-introspection , wrapGAppsHook , libxslt -, gcr +, gcr_4 , accountsservice , gdk-pixbuf , gdm @@ -43,7 +43,7 @@ , glib , gjs , mutter -, evolution-data-server +, evolution-data-server-gtk4 , gtk3 , gtk4 , libadwaita @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "42.4"; + version = "43.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "h1/ylw6p+3oFUG4yoNUNyRf0G0yjcTS0E3f5yChzxU4="; + sha256 = "9u7JdwP588xv5ua0H23IIbGOyE34NRxN+XsXroJ0G0E="; }; patches = [ @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gnome-keyring glib - gcr + gcr_4 accountsservice libsecret polkit @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { gjs mutter libpulseaudio - evolution-data-server + evolution-data-server-gtk4 libical gtk3 gtk4 @@ -202,6 +202,8 @@ stdenv.mkDerivation rec { done ''; + separateDebugInfo = true; + passthru = { mozillaPlugin = "/lib/mozilla/plugins"; updateScript = gnome.updateScript { diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index ab35257baa5be..f5d299817a817 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -7,7 +7,7 @@ , ninja , gettext , gnome -, wrapGAppsHook +, wrapGAppsHook4 , packagekit , ostree , glib @@ -24,7 +24,9 @@ , gtk4 , gsettings-desktop-schemas , gnome-desktop +, libgudev , libxmlb +, malcontent , json-glib , libsecret , valgrind-light @@ -34,6 +36,7 @@ , gtk-doc , desktop-file-utils , libsysprof-capture +, gst_all_1 }: let @@ -42,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "42.4"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "cRgp7mf58qG2S/oXQTdzuY8NxdIZ649sohfNZXK7SnQ="; + sha256 = "8WUuquJ0pqhwlQAENRZGUgDMdVlNzM2bShWZsKxJ5o8="; }; patches = [ @@ -61,7 +64,7 @@ stdenv.mkDerivation rec { ninja pkg-config gettext - wrapGAppsHook + wrapGAppsHook4 libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 @@ -87,18 +90,22 @@ stdenv.mkDerivation rec { ostree polkit flatpak + libgudev libxmlb + malcontent libsysprof-capture + # For video screenshots + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ] ++ lib.optionals withFwupd [ fwupd ]; mesonFlags = [ - "-Dgudev=false" - # FIXME: package malcontent parental controls - "-Dmalcontent=false" # Needs flatpak to upgrade "-Dsoup2=true" + # Requires /etc/machine-id, D-Bus system bus, etc. + "-Dtests=false" ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ]; diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index a8ca028b5558b..d344eec3c64a4 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,15 +1,17 @@ { stdenv , lib -, fetchurl +, fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config , python3 , libxml2 , gnome -, dconf +, nix-update-script , nautilus , glib +, gtk4 , gtk3 , gsettings-desktop-schemas , vte @@ -28,13 +30,25 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.44.1"; + version = "3.47.0"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+28g7h/yMamq7asT1dxuWmTJVXESJISLeQCG6IlZ03s="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-terminal"; + rev = version; + sha256 = "sha256-CriI1DtDBeujaz0HtXCyzoGxnas7NmD6EMQ+gLph3E4="; }; + patches = [ + # Fix Nautilus extension build. + # https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7916 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/614ea99b16fb09e10341fc6ccf5e115ac3f93caf.patch"; + sha256 = "K7JHPfXywF3QSjSjyUnNZ11/ed+QXHQ47i135QBMIR8="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -55,11 +69,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib + gtk4 gtk3 gsettings-desktop-schemas vte libuuid - dconf nautilus # For extension ]; @@ -77,13 +91,14 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-terminal"; + updateScript = nix-update-script { attrPath = "gnome.gnome-terminal"; }; - }; - passthru.tests.test = nixosTests.terminal-emulators.gnome-terminal; + tests = { + test = nixosTests.terminal-emulators.gnome-terminal; + }; + }; meta = with lib; { description = "The GNOME Terminal Emulator"; diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index a26dcfa0a7b02..c7edd87d122d9 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-/PGsaJBX2oZZaXDsPag1VSHApy6VBj6wWdX+5N6oL08="; + hash = "sha256-E1HkGWJ/vXx3GTKm7xrYDAvy5oKMSUigYgaJhN2zzIg="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix index 4c33b76b01241..2a09ef1ae2b01 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -1,52 +1,29 @@ -{ lib, stdenv +{ stdenv +, lib , gettext , meson , ninja , fetchurl -, fetchpatch , apacheHttpd -, nautilus , pkg-config -, gtk3 , glib , libxml2 , systemd , wrapGAppsHook , itstool -, libnotify , mod_dnssd , gnome -, libcanberra-gtk3 -, python3 }: stdenv.mkDerivation rec { pname = "gnome-user-share"; - version = "3.34.0"; + version = "43.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"; + url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major version}/gnome-user-share-${version}.tar.xz"; + sha256 = "DfMGqgVYMT81Pvf1G/onwDYoGtxFZ34c+/p8n4YVOM4="; }; - patches = [ - # fix gio-unix-2.0 lookup - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch"; - sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; - }) - # fix compilation with meson >=0.61 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-user-share/-/commit/c31b0a8f33b95c0077cd5ee2102a71a49bee8abe.patch"; - hash = "sha256-kH+cPBmSErWxsw+IyyjWgENi4I3ZcKjSA9+em8u4DYs="; - }) - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' \ -e 's,''${HTTP_MODULES_PATH},${apacheHttpd}/modules,' \ @@ -57,9 +34,6 @@ stdenv.mkDerivation rec { "-Dhttpd=${apacheHttpd.out}/bin/httpd" "-Dmodules_path=${apacheHttpd}/modules" "-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user" - # In 3.34.0 it defaults to false but it is silently ignored and always installed. - # Let’s add it anyway in case they decide to make build respect the option in the future. - "-Dnautilus_extension=true" ]; nativeBuildInputs = [ @@ -70,15 +44,10 @@ stdenv.mkDerivation rec { itstool libxml2 wrapGAppsHook - python3 ]; buildInputs = [ - gtk3 glib - nautilus - libnotify - libcanberra-gtk3 systemd ]; diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/3.38/default.nix index 3c2d30b813ba0..464cd285a780c 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/3.38/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , substituteAll , runCommand , lib @@ -36,12 +37,12 @@ , python3 , wrapGAppsHook , sysprof +, libsysprof-capture , desktop-file-utils , libcap_ng , egl-wayland , graphene , wayland-protocols -, pantheon }: let self = stdenv.mkDerivation rec { @@ -65,6 +66,20 @@ let self = stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/mutter/issues/536 ./fix-glitches-in-gala.patch + # Stop using source_root()/build_root(). + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/6288763671692edbc953a2b80225e9a7c7fc87e7.patch"; + sha256 = "immnfZiY+Cgu7xTbo5y8xs0olTa6UGsKgDJ1Xhkhns0="; + }) + + # Fix build with separate sysprof. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; + sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; + }) + (substituteAll { src = ./fix-paths.patch; inherit zenity; @@ -122,7 +137,8 @@ let self = stdenv.mkDerivation rec { libXdamage pango pipewire - sysprof + sysprof # for D-Bus interfaces + libsysprof-capture xkeyboard_config xwayland wayland-protocols diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index d49c1e2f6aa5f..4c2aded0492a8 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -1,17 +1,18 @@ { fetchurl -, substituteAll , runCommand , lib +, fetchpatch , stdenv , pkg-config , gnome , gettext , gobject-introspection , cairo +, colord +, lcms2 , pango , json-glib , libstartup_notification -, zenity , libcanberra , ninja , xvfb-run @@ -36,7 +37,9 @@ , xorgserver , python3 , wrapGAppsHook +, gi-docgen , sysprof +, libsysprof-capture , desktop-file-utils , libcap_ng , egl-wayland @@ -46,24 +49,31 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "42.4"; + version = "43.0"; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wix/o9GHBh2/KAw4UOEYt7UAkGXQHeMWFqzVAMSYKkA="; + sha256 = "jZulKO2Z72eZZC4Uez/p8ry+ypvs7ShFwcrbMxzT5SU="; }; 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 + # Fix build with separate sysprof. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; + sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; + }) - (substituteAll { - src = ./fix-paths.patch; - inherit zenity; + # color-device: Don't create profiles from obvious garbage data + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2627 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2627.patch"; + sha256 = "SafC29+gjcj6JswHY6yuwcOS16LPYvFwYW1TEpNNSHc="; }) + + ]; mesonFlags = [ @@ -75,6 +85,7 @@ let self = stdenv.mkDerivation rec { # This should be auto detected, but it looks like it manages a false # positive. "-Dxwayland_initfd=disabled" + "-Ddocs=true" ]; propagatedBuildInputs = [ @@ -95,6 +106,7 @@ let self = stdenv.mkDerivation rec { pkg-config python3 wrapGAppsHook + gi-docgen xorgserver # for cvt command ]; @@ -116,9 +128,12 @@ let self = stdenv.mkDerivation rec { libxkbcommon libxkbfile libXdamage + colord + lcms2 pango pipewire - sysprof + sysprof # for D-Bus interfaces + libsysprof-capture xkeyboard_config xwayland wayland-protocols @@ -132,11 +147,19 @@ let self = stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + # TODO: Move this into a directory devhelp can find. + moveToOutput "share/mutter-11/doc" "$devdoc" + ''; + # Install udev files into our own tree. PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + separateDebugInfo = true; + passthru = { - libdir = "${self}/lib/mutter-10"; + libdir = "${self}/lib/mutter-11"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' diff --git a/pkgs/desktops/gnome/core/mutter/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/fix-paths.patch deleted file mode 100644 index 6ac0a431f61ff..0000000000000 --- a/pkgs/desktops/gnome/core/mutter/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/util.c b/src/core/util.c -index 57b73747d..f424cc81c 100644 ---- a/src/core/util.c -+++ b/src/core/util.c -@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, - - args = g_ptr_array_new (); - -- append_argument (args, "zenity"); -+ append_argument (args, "@zenity@/bin/zenity"); - append_argument (args, type); - - if (display) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 53d68c12080a5..163c562a1ab67 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -4,14 +4,15 @@ , meson , ninja , pkg-config +, gi-docgen +, docbook-xsl-nons , gettext , libxml2 , desktop-file-utils -, python3 -, wrapGAppsHook -, gtk3 -, libhandy -, libportal-gtk3 +, wrapGAppsHook4 +, gtk4 +, libadwaita +, libportal-gtk4 , gnome , gnome-autoar , glib-networking @@ -24,23 +25,25 @@ , tracker-miners , gexiv2 , libselinux +, libcloudproviders , gdk-pixbuf , substituteAll , gnome-desktop , gst_all_1 , gsettings-desktop-schemas +, gnome-user-share , gobject-introspection }: stdenv.mkDerivation rec { pname = "nautilus"; - version = "42.2"; + version = "43.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "mSEtLrdZlvGBcorQSi4thvJXewZOaKNMi4GnA330zLI="; + sha256 = "PPVPrAqKvuCQ4VVBf3sW9j6grAwmTvT1RXSvNFgBqRE="; }; patches = [ @@ -62,8 +65,9 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 - wrapGAppsHook + gi-docgen + docbook-xsl-nons + wrapGAppsHook4 ]; buildInputs = [ @@ -72,21 +76,29 @@ stdenv.mkDerivation rec { gnome-desktop gnome.adwaita-icon-theme gsettings-desktop-schemas + gnome-user-share gst_all_1.gst-plugins-base - gtk3 - libhandy - libportal-gtk3 + gtk4 + libadwaita + libportal-gtk4 libexif libnotify libseccomp libselinux + gdk-pixbuf + libcloudproviders shared-mime-info tracker tracker-miners + gnome-autoar ]; propagatedBuildInputs = [ - gnome-autoar + gtk4 + ]; + + mesonFlags = [ + "-Ddocs=true" ]; preFixup = '' @@ -98,8 +110,9 @@ stdenv.mkDerivation rec { ) ''; - postPatch = '' - patchShebangs build-aux/meson/postinstall.py + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { diff --git a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch index e1313999675d0..a1bdd64f989b6 100644 --- a/pkgs/desktops/gnome/core/nautilus/extension_dir.patch +++ b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch @@ -1,19 +1,21 @@ diff --git a/src/nautilus-module.c b/src/nautilus-module.c -index 6273a76..4adcc8a 100644 +index cd889ff18..e2cd6468e 100644 --- a/src/nautilus-module.c +++ b/src/nautilus-module.c -@@ -242,11 +242,17 @@ void +@@ -267,6 +267,7 @@ void nautilus_module_setup (void) { static gboolean initialized = FALSE; + const gchar* extensiondir = NULL; + const gchar *disable_plugins; - if (!initialized) + disable_plugins = g_getenv ("NAUTILUS_DISABLE_PLUGINS"); +@@ -280,7 +281,12 @@ nautilus_module_setup (void) { initialized = TRUE; - load_module_dir (NAUTILUS_EXTENSIONDIR); -+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); ++ extensiondir = g_getenv ("NAUTILUS_4_EXTENSION_DIR"); + if (extensiondir == NULL) { + extensiondir = NAUTILUS_EXTENSIONDIR; + } diff --git a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch index d2319ec13ed3e..5204e3518aba7 100644 --- a/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch +++ b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index 8af2fcf9..0e318307 100644 +index 27bde61f..3d434de9 100644 --- a/meson.build +++ b/meson.build @@ -22,7 +22,11 @@ if not get_option('uninstalled') @@ -12,8 +12,8 @@ index 8af2fcf9..0e318307 100644 + else + rygel_sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) + endif - rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.6', 'plugins') - rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.6', 'engines') + rygel_plugindir = join_paths(rygel_libdir, 'rygel-2.8', 'plugins') + rygel_enginedir = join_paths(rygel_libdir, 'rygel-2.8', 'engines') rygel_presetdir = join_paths(rygel_datadir, 'presets') @@ -57,7 +61,7 @@ conf.set_quoted('DATA_DIR', rygel_datadir) conf.set_quoted('PLUGIN_DIR', rygel_plugindir) diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index c09fb5450f3f7..c2414020968e5 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -10,13 +10,13 @@ , wrapGAppsHook , python3 , glib -, gssdp -, gupnp +, gssdp_1_6 +, gupnp_1_6 , gupnp-av , gupnp-dlna , gst_all_1 , libgee -, libsoup +, libsoup_3 , gtk3 , libmediaart , sqlite @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.40.4"; + version = "0.42.0"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "c22K2+hhX2y8j8//mEXcmF/RDhZinaI2tLUtvt8KNIs="; + sha256 = "AG2nhnffKMruKHxEwp/NntyxshYkI7x/LdLchWuOK7s="; }; patches = [ @@ -56,12 +56,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gssdp - gupnp + gssdp_1_6 + gupnp_1_6 gupnp-av gupnp-dlna libgee - libsoup + libsoup_3 gtk3 libmediaart sqlite diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix index e656624c5c042..07910cd8c7687 100644 --- a/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "42.1"; + version = "42.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-hZvAYRwXabW9q6ljne7TWfUEdMLuz1i7v9fOIZEbIiY="; + sha256 = "sha256-BfXfpOniBu+p1ATJhh3XxEIJF5PnNMQXGXOZFyUOQFA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index 9817f77b6b68d..3c7377630c755 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -9,7 +9,7 @@ , gtksourceview4 , gjs , libsoup -, webkitgtk +, webkitgtk_4_1 , icu , wrapGAppsHook , gst_all_1 @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "sushi"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/sushi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "RdjbevRaeXhOejRYjRSeqVXIvkS7gqNuiWgpQFt8iCA="; + sha256 = "V4SFJhSasceE+5L7yTTDUU/lIqumSdXZ/t7H4bFHUns="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gdk-pixbuf librsvg libsoup - webkitgtk + webkitgtk_4_1 libepoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 44e1319f8d4ae..e7e3e225fa6de 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , gettext @@ -19,6 +21,7 @@ , grilo , grilo-plugins , libpeas +, libportal-gtk3 , libhandy , adwaita-icon-theme , gnome-desktop @@ -29,13 +32,32 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "SvBJHduV34szruOZ06UPnHqxfeiNOvYzVlZ8+I9X5qs="; + sha256 = "s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4="; }; + patches = [ + # Lower X11 dependency version since we do not have it. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem/-/commit/140d9eea70c3101ef3234abb4de5974cb84b13db.patch"; + sha256 = "ohppxqMiH8Ksc9B2e3AXighfM6KVN+RNXYL+fLELSN8="; + revert = true; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem/-/commit/2610b4536f73493587e4a5a38e01c9961fcabb96.patch"; + sha256 = "nPfzS+LQuAlyQOz67hCdtx93w2frhgWlg1KGX5bEU38="; + revert = true; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/totem/-/commit/5b871aee5292f25bbf39dca18045732e979e7a68.patch"; + sha256 = "LqQLdgyZkIVc+/hQ5sdBLqhtjCVIMDSs9tjVXwMFodg="; + revert = true; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -61,6 +83,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas + libportal-gtk3 libhandy shared-mime-info gdk-pixbuf @@ -87,10 +110,9 @@ stdenv.mkDerivation rec { doCheck = false; postPatch = '' - chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file + chmod +x meson_compile_python.py # patchShebangs requires executable file patchShebangs \ - ./meson_compile_python.py \ - ./meson_post_install.py + ./meson_compile_python.py ''; checkPhase = '' diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 3398e8ddd571c..2fa3ec0ecdd40 100644 --- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KbJzzAvRbvtumDRDgD8en9wDUR5cT/Y0j9MKYE1NyEY="; + sha256 = "sha256-I4vhULFlMIDOE5lxMw/TbTomWV4NagQKLAML89IAW80="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 4ae54200d09cc..ee76194433c38 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -2,7 +2,7 @@ , stdenv , gettext , fetchurl -, webkitgtk +, webkitgtk_4_1 , pkg-config , gtk3 , libhandy @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "42.1"; + version = "42.2"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-JbEUarhUmIilqNoGf2O0cLDw+AC2roicrNEU0B1xO0E="; + sha256 = "sha256-osX9B4epCJxyLMZr0Phc33CI2HDntsyFeZ+OW/+erEs="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gtk3 libhandy glib - webkitgtk + webkitgtk_4_1 sqlite libxml2 libxslt @@ -46,10 +46,6 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good ]; - # To reduce the GNOME ISO closure size. Remove when other packages - # are using webkit2gtk_4_1. - configureFlags = ["--with-webkit2gtk-4-0"]; - passthru = { updateScript = gnome.updateScript { packageName = "yelp"; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 1169bae6d67e4..b8d48cf12fd5e 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -178,8 +178,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; - gnome-todo = callPackage ./apps/gnome-todo {}; - gnome-weather = callPackage ./apps/gnome-weather { }; polari = callPackage ./apps/polari { }; @@ -269,6 +267,7 @@ lib.makeScope pkgs.newScope (self: with self; { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16 + gnome-todo = pkgs.endeavour; # added 2022-07-30 libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19 bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26 diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index 4a024f6ff4135..55330921e2671 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -9,11 +8,9 @@ , gtk3 , wrapGAppsHook , glib -, appstream-glib , gobject-introspection -, python3 , gi-docgen -, webkitgtk +, webkitgtk_4_1 , gettext , itstool , gsettings-desktop-schemas @@ -22,24 +19,15 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "41.2"; + version = "43.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "7KqQsPTaqPsgMPbcaQv1M/+Zp3NDf+Dhis/oLZl/YNI="; + sha256 = "Y87u/QU5LgIESIHvHs1yQpNVPaVzW378CCstE/6F3QQ="; }; - patches = [ - # Fix build with meson 0.61 - # https://gitlab.gnome.org/GNOME/devhelp/-/issues/59 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/devhelp/-/commit/281bade14c1925cf9e7329fa8e9cf2d82512c66f.patch"; - sha256 = "LmHoeQ0zJwOhuasAUYy8FfpDnEO+UNfEb293uKttYKo="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -47,16 +35,17 @@ stdenv.mkDerivation rec { gettext itstool wrapGAppsHook - appstream-glib gobject-introspection - python3 gi-docgen + # post install script + glib + gtk3 ]; buildInputs = [ glib gtk3 - webkitgtk + webkitgtk_4_1 gnome.adwaita-icon-theme gsettings-desktop-schemas ]; @@ -67,12 +56,6 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - # patchShebangs requires executable file - chmod +x build-aux/meson/meson_post_install.py - patchShebangs build-aux/meson/meson_post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # Fix pages being blank diff --git a/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix deleted file mode 100644 index 779d7506abf54..0000000000000 --- a/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv -, fetchurl -, cmake -, ninja -, jq -, python3 -, gnome -, wrapGAppsHook -, gobject-introspection -}: - -let - inherit (python3.pkgs) python pygobject3 requests; -in -stdenv.mkDerivation rec { - pname = "chrome-gnome-shell"; - version = "10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; - sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; - }; - - nativeBuildInputs = [ - cmake - ninja - jq - wrapGAppsHook - gobject-introspection # for setup-hook - ]; - - buildInputs = [ - gnome.gnome-shell - python - pygobject3 - requests - gobject-introspection # for Gio typelib - ]; - - cmakeFlags = [ - "-DBUILD_EXTENSION=OFF" - ]; - - wrapPrefixVariables = [ - "PYTHONPATH" - ]; - - # cmake setup hook changes /etc/opt into /var/empty - dontFixCmake = true; - - preConfigure = '' - substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "chrome-gnome-shell"; - }; - }; - - meta = with lib; { - 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.gnome.chrome-gnome-shell.enable</option> to <literal>true</literal>. - ''; - license = licenses.gpl3; - maintainers = teams.gnome.members; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index f6d21c2465302..5f3a2943f8126 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "73"; + version = "74"; # Temporarily switched to commit hash because stable version is buggy. src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-v${version}"; - sha256 = "/NOJWjotfYPujS5G7/zv1OLzfSW0MB+oIRsx9/LSEdA="; + sha256 = "3WNm9kX76+qmn9KWLSKwxmHHpc21kWHrBW9266TOKZ0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix new file mode 100644 index 0000000000000..57052ddf3c56f --- /dev/null +++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, fetchFromGitLab +, meson +, ninja +, python3 +, gnome +, wrapGAppsNoGuiHook +, gobject-introspection +}: + +let + inherit (python3.pkgs) buildPythonApplication pygobject3; +in +buildPythonApplication rec { + pname = "gnome-browser-connector"; + version = "42.0"; + + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "nE0sIghT"; + repo = "gnome-browser-connector"; + rev = "v${version}"; + sha256 = "pYbV/qCmSrM2nrrKxbxHnJYMDOiW0aeNbFlsm5kKWdk="; + }; + + nativeBuildInputs = [ + meson + ninja + wrapGAppsNoGuiHook + gobject-introspection # for setup-hook + ]; + + buildInputs = [ + gnome.gnome-shell + gobject-introspection # for Gio typelib + ]; + + pythonPath = [ + pygobject3 + ]; + + postPatch = '' + patchShebangs contrib/merge_json.py + ''; + + dontWrapGApps = true; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Native host connector for the GNOME Shell browser extension"; + homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegration"; + longDescription = '' + To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegration/Installation">browser extension</link>, and then set <option>services.gnome.gnome-browser-connector.enable</option> to <literal>true</literal>. + ''; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 5f915a4b5af87..b86b295afbcd0 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , substituteAll , openssl , gsound @@ -13,6 +15,7 @@ , gtk3 , openssh , gnome +, evolution-data-server-gtk4 , gjs , nixosTests }: @@ -39,6 +42,12 @@ stdenv.mkDerivation rec { # Allow installing installed tests to a separate output ./installed-tests-path.patch + + # Update extension for Nautilus 43. + (fetchpatch { + url = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/commit/9723ea9102f07c2c60fa065184cc58c2bc260abf.patch"; + sha256 = "9afy/70AwW+OYML5J5IyBBiNKWkZ+wZZryZbi4uRfs4="; + }) ]; nativeBuildInputs = [ @@ -55,7 +64,7 @@ stdenv.mkDerivation rec { gtk3 gsound gjs # for running daemon - gnome.evolution-data-server # for libebook-contacts typelib + evolution-data-server-gtk4 # for libebook-contacts typelib ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index 8716b6858cd3d..112c9cf895549 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -5,12 +5,12 @@ , ninja , vala , pkg-config +, desktop-file-utils , wrapGAppsHook4 , gobject-introspection , gettext , itstool , libxml2 -, python3 , gnome , glib , gtk4 @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "42.1"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZikL9yhky8bufM6Mn0DegSTo5gl712hi8teqsMS9sCw="; + sha256 = "ZDP+3y9C+yK/IC2fE47C7gcjetXXQ4CQULXICbVs28s="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { gettext itstool libxml2 - python3 + desktop-file-utils wrapGAppsHook4 gobject-introspection ]; @@ -49,11 +49,6 @@ stdenv.mkDerivation rec { pango ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-chess"; diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 87e7c467d04c4..388253f131bf6 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -1,22 +1,51 @@ -{ 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 +, lib +, fetchurl +, meson +, ninja +, vala +, pkg-config +, gobject-introspection +, gettext +, gtk3 +, gnome +, wrapGAppsHook +, libgee +, json-glib +, qqwing +, itstool +, libxml2 +, desktop-file-utils +}: stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HS603bgCa0Q2Rc81hbjfEkTjgo7hwHUYBSslmeHFwo8="; + sha256 = "ftJ0KJz1ykELHJKxU3BQpcNi99szmaMrU0PQ3nBGbkk="; }; - nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; - buildInputs = [ gtk3 libgee json-glib qqwing ]; + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + gobject-introspection + gettext + itstool + libxml2 + desktop-file-utils + wrapGAppsHook + ]; - postPatch = '' - chmod +x build-aux/post_install.py - patchShebangs build-aux/post_install.py - ''; + buildInputs = [ + gtk3 + libgee + json-glib + qqwing + ]; passthru = { updateScript = gnome.updateScript { @@ -29,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Sudoku"; description = "Test your logic skills in this number grid puzzle"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index db79db65cb1f9..cb7726d59069d 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , gtk3 , vala @@ -26,7 +25,7 @@ , itstool , libgee , gnome -, webkitgtk +, webkitgtk_4_1 , python3 , gnutls , cacert @@ -48,28 +47,13 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "40.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik"; + sha256 = "SJFm+H3Z0pAR9eW3lpTyWItHP34ZHFnOkBPIyODjY+c="; }; - patches = [ - # Fix accessibility issues with initializer of constants (Fix build with vala 0.56) - # https://gitlab.gnome.org/GNOME/geary/-/merge_requests/720 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.patch"; - sha256 = "sha256-mSms0MOfw8xHxOrEQwrIv+d4h01xLPgyvX2oWmmFQVw="; - }) - # Util.Cache.Lru: Workaround missing generic type argument (Fix build with vala 0.56) - # https://gitlab.gnome.org/GNOME/geary/-/merge_requests/721 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644.patch"; - sha256 = "sha256-1ADQqKm3DxtjDGPSThq3c7s5S+q/3u/qr9JQEsLaFMI="; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -108,7 +92,7 @@ stdenv.mkDerivation rec { libstemmer libytnef sqlite - webkitgtk + webkitgtk_4_1 ]; checkInputs = [ @@ -127,12 +111,9 @@ stdenv.mkDerivation rec { # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa postPatch = '' - chmod +x build-aux/post_install.py build-aux/git_version.py - - patchShebangs build-aux/post_install.py build-aux/git_version.py + chmod +x build-aux/git_version.py - chmod +x build-aux/yaml_to_json.py - patchShebangs build-aux/yaml_to_json.py + patchShebangs build-aux/git_version.py chmod +x desktop/geary-attach ''; diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix index a03b356c21f35..5620310e8a51b 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.44.0"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "MDlifKknGeSAWH1yT0aXEJw9Em7BUPFPOy4Gkk2576c="; + sha256 = "TwRjyoDzCUA4WzCcHmkCWIxx2XFQxlQOg083Tk0nrPc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 4401915d40ba1..cdebb3628bac6 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -4,7 +4,7 @@ , fetchurl , gettext , glib -, gnome-bluetooth_1_0 +, gnome-bluetooth , gnome-desktop , gnome-panel , gnome-session @@ -31,7 +31,7 @@ }: let pname = "gnome-flashback"; - version = "3.44.0"; + version = "3.46.0"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: @@ -62,7 +62,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "sha256-HfCDgSfGJG7s2J0cUP+I/IKr9t47MGjlLd5JWkK9VQo="; + sha256 = "sha256-eo1cAzEOTfrdGKZeAKN3QQMq/upUGN1oBKl1xLCYAEU="; }; # make .desktop Execs absolute @@ -95,7 +95,7 @@ let buildInputs = [ glib - gnome-bluetooth_1_0 + gnome-bluetooth gnome-desktop gsettings-desktop-schemas gtk3 diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index 0b107f23d78d1..503fc34bae87d 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -1,12 +1,11 @@ { stdenv , lib , fetchurl -, fetchpatch , autoreconfHook , dconf , evolution-data-server , gdm -, geocode-glib +, geocode-glib_2 , gettext , glib , gnome-desktop @@ -26,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.44.0"; + version = "3.46.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-mWVfddAxh2wTDtI8TaIsCZ57zEBIsCVaPDo7vHh7Mao="; + hash = "sha256-zsehG3DFJLXo121Nfk2DXuYHq9outC9N92GeYusGrrE="; }; patches = [ @@ -40,13 +39,6 @@ stdenv.mkDerivation rec { # instead of gnome-panel’s libdir so that the NixOS module can make gnome-panel # load modules from other packages as well. ./modulesdir-env-var.patch - - # Add missing geocode-glib-1.0 dependency - # https://gitlab.gnome.org/GNOME/gnome-panel/-/merge_requests/49 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-panel/-/commit/f58a43ec4649a25f1a762b36e1401b81cd2b214b.patch"; - sha256 = "sha256-DFqaNUjkLh4xd81qgQpl+568eUZeWyF8LxdZoTgMfCQ="; - }) ]; # make .desktop Exec absolute @@ -79,7 +71,7 @@ stdenv.mkDerivation rec { dconf evolution-data-server gdm - geocode-glib + geocode-glib_2 glib gnome-desktop gnome-menus diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index ba42a80283697..bc54591ebd650 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -9,6 +9,7 @@ , gobject-introspection , gtk3 , gtk4 +, gcr_4 , libadwaita , meson , mutter @@ -16,22 +17,31 @@ , pango , pkg-config , vala +, desktop-file-utils , wrapGAppsHook }: stdenv.mkDerivation rec { - version = "42.1"; + version = "43.0"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-A5NZ4NiPVZUr7vPdDuNywLsLrejZ4SCg7+3//ZNRmLY="; + sha256 = "sha256-F+AWTYVK145RzJ1Zldh4Q4R/hN/D7aXO3SIJ1t6ClWs="; }; patches = [ ./fix-paths.patch + + # Build against GCR 4. + # Patch was temporarily reverted. + # https://github.com/Keruspe/GPaste/pull/409 + (fetchpatch { + url = "https://github.com/Keruspe/GPaste/commit/0378cb4a657042ce5321f1d9728cff31e55bede6.patch"; + sha256 = "0Ngr+/fS5/wICR84GEiE0pXEXQ/f/3G59lDivH167m8="; + }) ]; # TODO: switch to substituteAll with placeholder @@ -52,6 +62,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala + desktop-file-utils wrapGAppsHook ]; @@ -61,6 +72,7 @@ stdenv.mkDerivation rec { glib gtk3 gtk4 + gcr_4 libadwaita mutter pango @@ -72,10 +84,6 @@ stdenv.mkDerivation rec { "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user" ]; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - meta = with lib; { homepage = "https://github.com/Keruspe/GPaste"; description = "Clipboard management system with GNOME 3 integration"; diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index ef3e31f1032f1..460dbfdb38bfc 100644 --- a/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.44.0"; + version = "3.46.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "GcPF150hcfRbqg9jLMiZX4YHvxIxoWAUQ5usm6Flp8A="; + sha256 = "S6d36ThUe/zL+azKCWdXTEZkMCLgVMk6AzQZyzzHwew="; }; patches = [ diff --git a/pkgs/desktops/gnome/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix index c1d58e2dbda98..b99d939bc12c5 100644 --- a/pkgs/desktops/gnome/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix @@ -2,27 +2,26 @@ , lib , substituteAll , fetchurl +, meson +, ninja , pkg-config -, which , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_412 , python3 -, ncurses , nautilus -, gtk3 , gnome }: stdenv.mkDerivation rec { pname = "nautilus-python"; - version = "1.2.3"; + version = "4.0"; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "doc" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "161050sx3sdxqcpjkjcpf6wl4kx0jydihga7mcvrj9c2f8ly0g07"; + url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor version}/nautilus-python-${version}.tar.xz"; + sha256 = "FyQ9Yut9fYOalGGrjQcBaIgFxxYaZwXmFBOljsJoKBo="; }; patches = [ @@ -37,38 +36,23 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - which + meson + ninja gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_412 ]; buildInputs = [ python3 - ncurses # required by python3 python3.pkgs.pygobject3 nautilus - gtk3 # required by libnautilus-extension ]; - # Workaround build failure on -fno-common toolchains: - # ld: nautilus-python-object.o:src/nautilus-python.h:61: multiple definition of - # `_PyNautilusMenu_Type'; nautilus-python.o:src/nautilus-python.h:61: first defined here - # TODO: remove it once upstream fixes and releases: - # https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/7 - NIX_CFLAGS_COMPILE = "-fcommon"; - - makeFlags = [ - "PYTHON_LIB_LOC=${python3}/lib" - ]; - - PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; - passthru = { updateScript = gnome.updateScript { packageName = pname; attrPath = "gnome.${pname}"; - versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 670cdc44e551c..6da001a554c27 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -30,6 +30,12 @@ mkDerivation rec { url = "https://github.com/lxqt/lxqt-build-tools/pull/76/commits/fa9672b671ede3f46b004f81580f9afb50fedf00.patch"; sha256 = "0dl7n1afcc6ky9vd9lpc65p9grpszpql7lfjq2vlzlilixnv8xv1"; }) + # Fix build failure of libqtxdg with GLib 2.73.1+ + # https://github.com/lxqt/lxqt-build-tools/pull/79 + (fetchpatch { + url = "https://github.com/lxqt/lxqt-build-tools/commit/4991811d9212ec1176af6d1cbe88aa37efad4836.patch"; + sha256 = "sha256-PsYJKonMG6A9O4Li+RC1qBjFUzYgxVAwzSqHq/phmPc="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 1984a6ebbe241..d90a56af2bb67 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -12,10 +13,10 @@ , evolution-data-server , folks , geoclue2 -, geocode-glib +, geocode-glib_2 , granite , gtk3 -, libchamplain +, libchamplain_libsoup3 , libgee , libhandy , libical @@ -32,6 +33,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-c2c8QNifBDzb0CelB72AIL4G694l6KCSXBjWIHrzZJo="; }; + patches = [ + # build: support evolution-data-server 3.46 + # https://github.com/elementary/calendar/pull/758 + (fetchpatch { + url = "https://github.com/elementary/calendar/commit/62c20e5786accd68b96c423b04e32c043e726cac.patch"; + sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio="; + }) + + # GridDay: Fix day in month in grid with GLib 2.73.1+ + # https://github.com/elementary/calendar/pull/763 + (fetchpatch { + url = "https://github.com/elementary/calendar/commit/20b0983c85935bedef065b786ec8bbca55ba7d9e.patch"; + sha256 = "sha256-Tw9uNqqRAC+vOp7EWzZVeDmZxt3hTGl9UIP21FcunqA="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -46,10 +63,10 @@ stdenv.mkDerivation rec { evolution-data-server folks geoclue2 - geocode-glib + geocode-glib_2 granite gtk3 - libchamplain + libchamplain_libsoup3 libgee libhandy libical diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 1dc000f66adfc..879f1f8bd919f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -10,10 +11,8 @@ , gtk3 , libxml2 , libhandy -, webkitgtk +, webkitgtk_4_1 , folks -, libgdata -, sqlite , glib-networking , granite , evolution-data-server @@ -32,6 +31,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-DO3nybH7tb/ISrSQ3+Oj612m64Ov6X0GAWePMbKjCc4="; }; + patches = [ + # build: fix documentation build + # https://github.com/elementary/mail/pull/795 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/52a422cb1c5f061d8a683005e44da0a1c2195096.patch"; + sha256 = "sha256-ndcIZXvmQbM/31Wtm6OSCnXdMYx+OlJrqV+baq6m+KY="; + }) + # build: support webkit2gtk-4.1 + # https://github.com/elementary/mail/pull/794 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch"; + sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk="; + }) + ]; + nativeBuildInputs = [ libxml2 meson @@ -48,11 +62,9 @@ stdenv.mkDerivation rec { glib-networking granite gtk3 - libgdata libgee libhandy - sqlite - webkitgtk + webkitgtk_4_1 ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index 7efd7e99da284..cd82dba99bfeb 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.tasks"; + broken = true; # https://github.com/elementary/tasks/issues/340 }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 4ec5518da21e4..5f4e61ec5c0b2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -29,6 +30,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-qxjHrlpdJcfXEUan/JgU7HqBRdB36gxAb5xmd/ySsj0="; }; + patches = [ + # TerminalWidget: Fix terminal freeze when closing in GLib 2.73.2+ + # https://github.com/elementary/terminal/pull/691 + (fetchpatch { + url = "https://github.com/elementary/terminal/commit/3cabe328abb839f12cd21f4d3d474d1d1e42b907.patch"; + sha256 = "sha256-wd36vOKqqPHCFPOok+Id9KqxbqjF0ohqsoxAU+jo4+Y="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils meson diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index a3d8d049e3b10..7b9fb8bf69896 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -10,9 +11,7 @@ , glib , granite , gtk3 -, libgdata , libhandy -, sqlite , switchboard }: @@ -27,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-Q/vvXKyeedn5o7HnL9F5ixSjJS3OWrvvHbzvx2fW2qY="; }; + patches = [ + # build: support evolution-data-server 3.45 + # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch"; + sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -39,9 +47,7 @@ stdenv.mkDerivation rec { glib granite gtk3 - libgdata libhandy - sqlite # needed for camel-1.2 switchboard ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 3f7408d9dff3d..b00fdb95d3e0c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -37,6 +38,13 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; elementary_calendar = elementary-calendar; }) + + # GridDay: Do not connect to the notify signal for the property + # https://github.com/elementary/wingpanel-indicator-datetime/pull/305 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/845ac1345124571fe995ab7138d5dfe4d29847e9.patch"; + sha256 = "sha256-/wd/FnhjC0c0Y8mCZg8XNoPOYAAmfK+g1F6L6TMEkdM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix index 66e1255f223a6..1a18e1a89de16 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix @@ -1,5 +1,10 @@ -{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules -, kwindowsystem, plasma-framework }: +{ lib +, mkDerivation +, fetchFromGitHub +, extra-cmake-modules +, kwindowsystem +, plasma-framework +}: mkDerivation rec { pname = "plasma-applet-caffeine-plus"; @@ -13,7 +18,8 @@ mkDerivation rec { }; buildInputs = [ - kwindowsystem plasma-framework + kwindowsystem + plasma-framework ]; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix index 5255bb4b0501a..3ac49717390e7 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix @@ -1,6 +1,13 @@ -{ lib, stdenv -, cmake, fetchFromGitHub, extra-cmake-modules -, qtbase, wrapQtAppsHook, ki18n, kdelibs4support, krunner +{ lib +, stdenv +, cmake +, fetchFromGitHub +, extra-cmake-modules +, qtbase +, wrapQtAppsHook +, ki18n +, kdelibs4support +, krunner }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix index e71a0bd0230c7..5e4ac584047cf 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix @@ -19,7 +19,9 @@ mkDerivation rec { }; buildInputs = [ - kwindowsystem plasma-framework qtx11extras + kwindowsystem + plasma-framework + qtx11extras ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix index 043f52c37efcf..2e9864cb1da3a 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "dynamic_workspaces"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix index 23802bef97bdb..b6025c5bdf107 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "krohnkite"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix index a56ebf1579b1d..ce0556ee1a770 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "kzones"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix index 5de935b9ec237..8d38583e1d511 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "parachute"; @@ -13,7 +19,10 @@ mkDerivation rec { }; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix index 8a455cb88826d..5f13a95ce081c 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix @@ -1,5 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub -, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }: +{ lib +, mkDerivation +, fetchFromGitHub +, kcoreaddons +, kwindowsystem +, plasma-framework +, systemsettings +}: mkDerivation rec { pname = "kwin-tiling"; @@ -18,7 +24,10 @@ mkDerivation rec { ''; buildInputs = [ - kcoreaddons kwindowsystem plasma-framework systemsettings + kcoreaddons + kwindowsystem + plasma-framework + systemsettings ]; dontBuild = true; diff --git a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix index 39be6c63f1e33..c4ae4d75d2010 100644 --- a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix @@ -22,7 +22,7 @@ mkDerivation rec{ sha256 = "k1fEZbhzluNlAmj5s/O9X20aCVQxlWQm/Iw/euX7cmI="; }; - extraCmakeFlags=["-DBUILD_TESTING=OFF"]; + extraCmakeFlags = [ "-DBUILD_TESTING=OFF" ]; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/aura-browser.nix b/pkgs/desktops/plasma-5/aura-browser.nix new file mode 100644 index 0000000000000..67af48b2bcb95 --- /dev/null +++ b/pkgs/desktops/plasma-5/aura-browser.nix @@ -0,0 +1,17 @@ +{ mkDerivation +, extra-cmake-modules +, qtwebengine +, qtquickcontrols2 +, kirigami2 +, ki18n +}: +mkDerivation { + pname = "aura-browser"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtwebengine + qtquickcontrols2 + kirigami2 + ki18n + ]; +} diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 0474d875997f8..ab7ceea4b1171 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,16 +1,40 @@ -{ - mkDerivation, lib, extra-cmake-modules, shared-mime-info, - qtbase, qtdeclarative, bluez-qt, - kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, - kwidgetsaddons, kwindowsystem, plasma-framework +{ mkDerivation +, lib +, extra-cmake-modules +, shared-mime-info +, qtbase +, qtdeclarative +, bluez-qt +, kcoreaddons +, kcmutils +, kdbusaddons +, kded +, ki18n +, kiconthemes +, kio +, knotifications +, kwidgetsaddons +, kwindowsystem +, plasma-framework }: mkDerivation { pname = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - qtbase qtdeclarative bluez-qt - ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded - kiconthemes knotifications kwidgetsaddons + qtbase + qtdeclarative + bluez-qt + ki18n + kio + kwindowsystem + plasma-framework + kcoreaddons + kdbusaddons + kded + kiconthemes + knotifications + kwidgetsaddons + kcmutils ]; } diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix index 24d0c96cad97a..86ce3dc112d05 100644 --- a/pkgs/desktops/plasma-5/breeze-grub.nix +++ b/pkgs/desktops/plasma-5/breeze-grub.nix @@ -1,5 +1,4 @@ -{ - mkDerivation +{ mkDerivation }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index bc60662b434ac..b8188fece80bb 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -1,26 +1,25 @@ -{ - mkDerivation, - lib, - extra-cmake-modules, - plymouth, - nixos-icons, - imagemagick, - netpbm, - perl, - logoName ? null, - logoFile ? null, - osName ? null, - osVersion ? null, - topColor ? "black", - bottomColor ? "black" +{ mkDerivation +, lib +, extra-cmake-modules +, plymouth +, nixos-icons +, imagemagick +, netpbm +, perl +, logoName ? null +, logoFile ? null +, osName ? null +, osVersion ? null +, topColor ? "black" +, bottomColor ? "black" }: let validColors = [ "black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green" ]; - resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf(toString logoFile)) else logoName; + resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) else logoName; in - assert lib.asserts.assertOneOf "topColor" topColor validColors; - assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; +assert lib.asserts.assertOneOf "topColor" topColor validColors; +assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; mkDerivation { @@ -30,21 +29,21 @@ mkDerivation { patches = [ ./install-paths.patch ]; - cmakeFlags = [] - ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" - ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" - ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" - ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" + cmakeFlags = [ ] + ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" + ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" + ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" + ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}" ; postPatch = '' - substituteInPlace cmake/FindPlymouth.cmake --subst-var out + substituteInPlace cmake/FindPlymouth.cmake --subst-var out '' + lib.optionalString (logoFile != null) '' - cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png + cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png - # conversion for 16bit taken from the breeze-plymouth readme - convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png - pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png + # conversion for 16bit taken from the breeze-plymouth readme + convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png + pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png ''; } diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index 13a426bb25874..bcabd31eea644 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -1,9 +1,18 @@ -{ - mkDerivation, - extra-cmake-modules, - frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, - kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative, - qtx11extras, fftw +{ mkDerivation +, extra-cmake-modules +, frameworkintegration +, kcmutils +, kconfigwidgets +, kcoreaddons +, kdecoration +, kguiaddons +, ki18n +, kwayland +, kwindowsystem +, plasma-framework +, qtdeclarative +, qtx11extras +, fftw }: mkDerivation { @@ -11,9 +20,19 @@ mkDerivation { sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ - frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration - kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative - qtx11extras fftw + frameworkintegration + kcmutils + kconfigwidgets + kcoreaddons + kdecoration + kguiaddons + ki18n + kwayland + kwindowsystem + plasma-framework + qtdeclarative + qtx11extras + fftw ]; outputs = [ "bin" "dev" "out" ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 09027d3680837..bb3119ed6d458 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -1,31 +1,35 @@ /* -# New packages + # New packages -READ THIS FIRST + READ THIS FIRST -This module is for official packages in KDE Plasma 5. All available packages are -listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see -below). + This module is for official packages in KDE Plasma 5. All available packages are + listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see + below). -IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. -Many of the packages released upstream are not yet built in Nixpkgs due to lack -of demand. To add a Nixpkgs build for an upstream package, copy one of the -existing packages here and modify it as necessary. + Many of the packages released upstream are not yet built in Nixpkgs due to lack + of demand. To add a Nixpkgs build for an upstream package, copy one of the + existing packages here and modify it as necessary. -# Updates + # Updates -1. Update the URL in `./fetch.sh`. -2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5` + 1. Update the URL in `./fetch.sh`. + 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5` from the top of the Nixpkgs tree. -3. Use `nox-review wip` to check that everything builds. -4. Commit the changes and open a pull request. + 3. Use `nox-review wip` to check that everything builds. + 4. Commit the changes and open a pull request. */ -{ libsForQt5, lib, config, fetchurl -, gconf, gsettings-desktop-schemas +{ libsForQt5 +, lib +, config +, fetchurl +, gconf +, gsettings-desktop-schemas }: let @@ -33,7 +37,13 @@ let broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + lgpl21Plus + lgpl3Plus + bsd2 + mit + gpl2Plus + gpl3Plus + fdl12 ]; srcs = import ./srcs.nix { @@ -41,33 +51,35 @@ let mirror = "mirror://kde"; }; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { }; packages = self: with self; let propagate = out: - let setupHook = { writeScript }: - writeScript "setup-hook" '' - if [[ "''${hookName-}" != postHook ]]; then - postHooks+=("source @dev@/nix-support/setup-hook") - else - # Propagate $${out} output - propagatedUserEnvPkgs+=" @${out}@" - - if [ -z "$outputDev" ]; then - echo "error: \$outputDev is unset!" >&2 - exit 1 - fi - - # Propagate $dev so that this setup hook is propagated - # But only if there is a separate $dev output - if [ "$outputDev" != out ]; then - propagatedBuildInputs+=" @dev@" - fi - fi - ''; - in callPackage setupHook {}; + let + setupHook = { writeScript }: + writeScript "setup-hook" '' + if [[ "''${hookName-}" != postHook ]]; then + postHooks+=("source @dev@/nix-support/setup-hook") + else + # Propagate $${out} output + propagatedUserEnvPkgs+=" @${out}@" + + if [ -z "$outputDev" ]; then + echo "error: \$outputDev is unset!" >&2 + exit 1 + fi + + # Propagate $dev so that this setup hook is propagated + # But only if there is a separate $dev output + if [ "$outputDev" != out ]; then + propagatedBuildInputs+=" @dev@" + fi + fi + ''; + in + callPackage setupHook { }; propagateBin = propagate "bin"; @@ -88,11 +100,11 @@ let setupHook = args.setupHook or defaultSetupHook; meta = - let meta = args.meta or {}; in + let meta = args.meta or { }; in meta // { homepage = meta.homepage or "http://www.kde.org"; license = meta.license or license; - maintainers = (meta.maintainers or []) ++ maintainers; + maintainers = (meta.maintainers or [ ]) ++ maintainers; platforms = meta.platforms or lib.platforms.linux; broken = meta.broken or broken; }; @@ -102,56 +114,62 @@ let }); }; - in { - bluedevil = callPackage ./bluedevil.nix {}; - breeze-gtk = callPackage ./breeze-gtk.nix {}; - breeze-qt5 = callPackage ./breeze-qt5.nix {}; - breeze-grub = callPackage ./breeze-grub.nix {}; - breeze-plymouth = callPackage ./breeze-plymouth {}; - discover = callPackage ./discover.nix {}; - kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; - kde-cli-tools = callPackage ./kde-cli-tools.nix {}; + in + { + aura-browser = callPackage ./aura-browser.nix { }; + bluedevil = callPackage ./bluedevil.nix { }; + breeze-gtk = callPackage ./breeze-gtk.nix { }; + breeze-qt5 = callPackage ./breeze-qt5.nix { }; + breeze-grub = callPackage ./breeze-grub.nix { }; + breeze-plymouth = callPackage ./breeze-plymouth { }; + discover = callPackage ./discover.nix { }; + kactivitymanagerd = callPackage ./kactivitymanagerd.nix { }; + kde-cli-tools = callPackage ./kde-cli-tools.nix { }; kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; }; - kdecoration = callPackage ./kdecoration.nix {}; - kdeplasma-addons = callPackage ./kdeplasma-addons.nix {}; - kgamma5 = callPackage ./kgamma5.nix {}; - khotkeys = callPackage ./khotkeys.nix {}; - kinfocenter = callPackage ./kinfocenter.nix {}; - kmenuedit = callPackage ./kmenuedit.nix {}; - kscreen = callPackage ./kscreen.nix {}; - kscreenlocker = callPackage ./kscreenlocker.nix {}; - ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksystemstats = callPackage ./ksystemstats.nix {}; - kwallet-pam = callPackage ./kwallet-pam.nix {}; - kwayland-integration = callPackage ./kwayland-integration.nix {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited.nix {}; - layer-shell-qt = callPackage ./layer-shell-qt.nix {}; - libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard {}; - milou = callPackage ./milou.nix {}; - oxygen = callPackage ./oxygen.nix {}; - oxygen-sounds = callPackage ./oxygen-sounds.nix {}; - plasma-browser-integration = callPackage ./plasma-browser-integration.nix {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-disks = callPackage ./plasma-disks.nix {}; - plasma-integration = callPackage ./plasma-integration {}; - plasma-mobile = callPackage ./plasma-mobile {}; - plasma-nano = callPackage ./plasma-nano {}; - plasma-nm = callPackage ./plasma-nm {}; + kdecoration = callPackage ./kdecoration.nix { }; + kdeplasma-addons = callPackage ./kdeplasma-addons.nix { }; + kgamma5 = callPackage ./kgamma5.nix { }; + khotkeys = callPackage ./khotkeys.nix { }; + kinfocenter = callPackage ./kinfocenter.nix { }; + kmenuedit = callPackage ./kmenuedit.nix { }; + kpipewire = callPackage ./kpipewire.nix { }; + kscreen = callPackage ./kscreen.nix { }; + kscreenlocker = callPackage ./kscreenlocker.nix { }; + ksshaskpass = callPackage ./ksshaskpass.nix { }; + ksystemstats = callPackage ./ksystemstats.nix { }; + kwallet-pam = callPackage ./kwallet-pam.nix { }; + kwayland-integration = callPackage ./kwayland-integration.nix { }; + kwin = callPackage ./kwin { }; + kwrited = callPackage ./kwrited.nix { }; + layer-shell-qt = callPackage ./layer-shell-qt.nix { }; + libkscreen = callPackage ./libkscreen { }; + libksysguard = callPackage ./libksysguard { }; + milou = callPackage ./milou.nix { }; + oxygen = callPackage ./oxygen.nix { }; + oxygen-sounds = callPackage ./oxygen-sounds.nix { }; + plank-player = callPackage ./plank-player.nix { }; + plasma-bigscreen = callPackage ./plasma-bigscreen.nix { }; + plasma-browser-integration = callPackage ./plasma-browser-integration.nix { }; + plasma-desktop = callPackage ./plasma-desktop { }; + plasma-disks = callPackage ./plasma-disks.nix { }; + plasma-integration = callPackage ./plasma-integration { }; + plasma-mobile = callPackage ./plasma-mobile { }; + plasma-nano = callPackage ./plasma-nano { }; + plasma-nm = callPackage ./plasma-nm { }; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; - plasma-sdk = callPackage ./plasma-sdk.nix {}; + plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { }; + plasma-sdk = callPackage ./plasma-sdk.nix { }; plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; - plasma-vault = callPackage ./plasma-vault {}; - plasma-workspace = callPackage ./plasma-workspace {}; - plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; - polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; - powerdevil = callPackage ./powerdevil.nix {}; - qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix {}; - sddm-kcm = callPackage ./sddm-kcm.nix {}; - systemsettings = callPackage ./systemsettings.nix {}; - xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; + plasma-vault = callPackage ./plasma-vault { }; + plasma-workspace = callPackage ./plasma-workspace { }; + plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { }; + polkit-kde-agent = callPackage ./polkit-kde-agent.nix { }; + powerdevil = callPackage ./powerdevil.nix { }; + qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix { }; + sddm-kcm = callPackage ./sddm-kcm.nix { }; + systemsettings = callPackage ./systemsettings.nix { }; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix { }; thirdParty = let inherit (libsForQt5) callPackage; in { plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index dd6c7a3008ca5..82c636bf7a51f 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -14,6 +14,7 @@ , util-linux , qtbase , qtquickcontrols2 +, qtwebview , qtx11extras , karchive , kcmutils @@ -26,6 +27,7 @@ , kirigami2 , kitemmodels , knewstuff +, kpurpose , kwindowsystem , kxmlgui , plasma-framework @@ -45,6 +47,7 @@ mkDerivation { pcre util-linux qtquickcontrols2 + qtwebview qtx11extras karchive kcmutils @@ -57,6 +60,7 @@ mkDerivation { kirigami2 kitemmodels knewstuff + kpurpose kwindowsystem kxmlgui plasma-framework diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 95361c1173e26..8464646a592b4 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.26.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 57800c316aa78..eb094c6871050 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -1,15 +1,32 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel, - kwindowsystem, kxmlgui, kcrash, qtbase +{ mkDerivation +, lib +, extra-cmake-modules +, boost +, kconfig +, kcoreaddons +, kdbusaddons +, ki18n +, kio +, kglobalaccel +, kwindowsystem +, kxmlgui +, kcrash +, qtbase }: mkDerivation { pname = "kactivitymanagerd"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem - kxmlgui kcrash + boost + kconfig + kcoreaddons + kdbusaddons + kglobalaccel + ki18n + kio + kwindowsystem + kxmlgui + kcrash ]; } diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 02694b085f898..e02f1297c012e 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,15 +1,37 @@ -{ - lib, mkDerivation, extra-cmake-modules, kdoctools, - kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, - qtsvg, qtx11extras, kactivities, plasma-workspace +{ lib +, mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfig +, kdesu +, ki18n +, kiconthemes +, kinit +, kio +, kwindowsystem +, qtsvg +, qtx11extras +, kactivities +, plasma-workspace }: mkDerivation { pname = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg - qtx11extras kactivities plasma-workspace + kcmutils + kconfig + kdesu + ki18n + kiconthemes + kinit + kio + kwindowsystem + qtsvg + qtx11extras + kactivities + plasma-workspace ]; postInstall = '' # install a symlink in bin so that kdesu can eventually be found in PATH diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 6949f73a9ce78..a61fc328236d2 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -1,17 +1,41 @@ -{ - mkDerivation, - extra-cmake-modules, wrapGAppsHook, - glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings-desktop-schemas, xsettingsd, kdecoration, sass +{ mkDerivation +, extra-cmake-modules +, wrapGAppsHook +, glib +, gtk2 +, gtk3 +, karchive +, kcmutils +, kconfigwidgets +, ki18n +, kiconthemes +, kio +, knewstuff +, gsettings-desktop-schemas +, xsettingsd +, kdecoration +, sass }: mkDerivation { pname = "kde-gtk-config"; nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; - dontWrapGApps = true; # There is nothing to wrap + dontWrapGApps = true; # There is nothing to wrap buildInputs = [ - ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings-desktop-schemas xsettingsd kdecoration sass + ki18n + kio + glib + gtk2 + gtk3 + karchive + kcmutils + kconfigwidgets + kiconthemes + knewstuff + gsettings-desktop-schemas + xsettingsd + kdecoration + sass ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 5be47327d723d..b8461fbd108d9 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,18 +1,47 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, kcoreaddons, kcmutils, kholidays, - kio, knewstuff, kpurpose, kross, krunner, kservice, - kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative, - qtwebengine, qtx11extras +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kconfig +, kconfigwidgets +, kcoreaddons +, kcmutils +, kholidays +, kio +, knewstuff +, kpurpose +, kross +, krunner +, kservice +, kunitconversion +, ibus +, plasma-framework +, plasma-workspace +, qtdeclarative +, qtwebengine +, qtx11extras }: mkDerivation { pname = "kdeplasma-addons"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio - knewstuff kpurpose kross krunner kservice kunitconversion ibus - plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras + kconfig + kconfigwidgets + kcoreaddons + kcmutils + kholidays + kio + knewstuff + kpurpose + kross + krunner + kservice + kunitconversion + ibus + plasma-framework + plasma-workspace + qtdeclarative + qtwebengine + qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index be5b191c3de73..5c05eca479791 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,7 +1,13 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, ki18n, qtbase, qtx11extras, libXxf86vm +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kconfig +, kconfigwidgets +, ki18n +, qtbase +, qtx11extras +, libXxf86vm }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index dfd5d4668a22b..c30e1c4475826 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -1,17 +1,34 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - qtbase, - kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui, - plasma-framework, plasma-workspace, qtx11extras +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtbase +, kcmutils +, kdbusaddons +, kdelibs4support +, kglobalaccel +, ki18n +, kio +, kxmlgui +, plasma-framework +, plasma-workspace +, qtx11extras }: mkDerivation { pname = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui - plasma-framework plasma-workspace qtx11extras + kcmutils + kdbusaddons + kdelibs4support + kglobalaccel + ki18n + kio + kxmlgui + plasma-framework + plasma-workspace + qtx11extras ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index 662662cdb2fd7..c63d22858a551 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -1,22 +1,57 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - qtbase, - kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, - kdeclarative, ki18n, kiconthemes, kio, kirigami2, kpackage, kservice, - kwayland, kwidgetsaddons, kxmlgui, solid, systemsettings, - libraw1394, libGLU, pciutils, +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtbase +, kcmutils +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kio +, kirigami2 +, kpackage +, kservice +, kwayland +, kwidgetsaddons +, kxmlgui +, solid +, systemsettings +, libraw1394 +, libGLU +, pciutils }: mkDerivation { pname = "kinfocenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons - kdeclarative ki18n kiconthemes kio kirigami2 kpackage kservice kwayland - kwidgetsaddons kxmlgui solid systemsettings + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + ki18n + kiconthemes + kio + kirigami2 + kpackage + kservice + kwayland + kwidgetsaddons + kxmlgui + solid + systemsettings - libraw1394 libGLU pciutils + libraw1394 + libGLU + pciutils ]; preFixup = '' # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix index 6a9d055abe437..57b327a7cdc40 100644 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ b/pkgs/desktops/plasma-5/kmenuedit.nix @@ -1,14 +1,25 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - kdbusaddons, khotkeys, ki18n, kiconthemes, kio, kxmlgui, - sonnet +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kdbusaddons +, khotkeys +, ki18n +, kiconthemes +, kio +, kxmlgui +, sonnet }: mkDerivation { pname = "kmenuedit"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kdbusaddons khotkeys ki18n kiconthemes kio kxmlgui sonnet + kdbusaddons + khotkeys + ki18n + kiconthemes + kio + kxmlgui + sonnet ]; } diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix new file mode 100644 index 0000000000000..fd412711e4a22 --- /dev/null +++ b/pkgs/desktops/plasma-5/kpipewire.nix @@ -0,0 +1,28 @@ +{ mkDerivation +, extra-cmake-modules +, kwayland +, ki18n +, kcoreaddons +, plasma-wayland-protocols +, libepoxy +, ffmpeg +, mesa +, pipewire +, wayland +}: + +mkDerivation { + pname = "kpipewire"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kwayland + ki18n + kcoreaddons + plasma-wayland-protocols + libepoxy + ffmpeg + mesa + pipewire + wayland + ]; +} diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 49f77fc5ff8c9..ca5ad59072f06 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -1,17 +1,44 @@ -{ - mkDerivation, - extra-cmake-modules, - kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, - kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors, - kwindowsystem, kdeclarative, plasma-framework, qtx11extras +{ mkDerivation +, extra-cmake-modules +, kconfig +, kcmutils +, kconfigwidgets +, kdbusaddons +, kglobalaccel +, ki18n +, kwidgetsaddons +, kxmlgui +, libkscreen +, qtdeclarative +, qtgraphicaleffects +, qtsensors +, kwindowsystem +, kdeclarative +, plasma-framework +, qtx11extras +, layer-shell-qt }: mkDerivation { pname = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n - kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors - kwindowsystem kdeclarative plasma-framework qtx11extras + kconfig + kcmutils + kconfigwidgets + kdbusaddons + kglobalaccel + ki18n + kwidgetsaddons + kxmlgui + libkscreen + qtdeclarative + qtgraphicaleffects + qtsensors + kwindowsystem + kdeclarative + plasma-framework + qtx11extras + layer-shell-qt ]; } diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index b37bbc6c8456e..d53d808e10844 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -1,17 +1,39 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kcmutils, kcrash, kdeclarative, kglobalaccel, kidletime, - kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras, - wayland, layer-shell-qt, +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kcmutils +, kcrash +, kdeclarative +, kglobalaccel +, kidletime +, kwayland +, libXcursor +, pam +, plasma-framework +, qtbase +, qtdeclarative +, qtx11extras +, wayland +, layer-shell-qt }: mkDerivation { pname = "kscreenlocker"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland - libXcursor pam plasma-framework qtdeclarative qtx11extras wayland + kcmutils + kcrash + kdeclarative + kglobalaccel + kidletime + kwayland + libXcursor + pam + plasma-framework + qtdeclarative + qtx11extras + wayland layer-shell-qt ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index 4cbf08044934e..9a5ee90cd362e 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,7 +1,12 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase, +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kcoreaddons +, ki18n +, kwallet +, kwidgetsaddons +, qtbase }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix index d5f96e42981b5..6b04d055eac77 100644 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -1,6 +1,10 @@ -{ mkDerivation, lib +{ mkDerivation +, lib , extra-cmake-modules -, libksysguard, libnl, lm_sensors, networkmanager-qt +, libksysguard +, libnl +, lm_sensors +, networkmanager-qt }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 5462814e8de2c..eab364d90d00e 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,8 +1,14 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, - wayland-protocols, wayland-scanner, wayland +{ mkDerivation +, lib +, extra-cmake-modules +, kguiaddons +, kidletime +, kwayland +, kwindowsystem +, qtbase +, wayland-protocols +, wayland-scanner +, wayland }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch b/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch new file mode 100644 index 0000000000000..ddaa7f76b13be --- /dev/null +++ b/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch @@ -0,0 +1,153 @@ +From 84f020835e3624342a928aae68e62e636bf2cc8c Mon Sep 17 00:00:00 2001 +From: Yuriy Taraday <yorik.sar@gmail.com> +Date: Wed, 12 Oct 2022 12:07:23 +0400 +Subject: [PATCH] Revert "[x11] Refactor output updates" + +This reverts commit 9a34ebbffc791cbeadc9abafda793ebee654b270. + +This should fix compilation with older GCC. +--- + CMakeLists.txt | 2 +- + .../standalone/x11_standalone_platform.cpp | 63 +++++++++++-------- + 2 files changed, 38 insertions(+), 27 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3e7bf700e..6ff24aa5c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,7 +70,7 @@ add_definitions(-DMESA_EGL_NO_X11_HEADERS) + add_definitions(-DEGL_NO_X11) + add_definitions(-DEGL_NO_PLATFORM_SPECIFIC_TYPES) + +-set(CMAKE_CXX_STANDARD 20) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + + # required frameworks by Core +diff --git a/src/backends/x11/standalone/x11_standalone_platform.cpp b/src/backends/x11/standalone/x11_standalone_platform.cpp +index 498d5cbe3..ac0f732b2 100644 +--- a/src/backends/x11/standalone/x11_standalone_platform.cpp ++++ b/src/backends/x11/standalone/x11_standalone_platform.cpp +@@ -54,8 +54,6 @@ + #include <QX11Info> + #endif + +-#include <span> +- + namespace KWin + { + +@@ -407,7 +405,8 @@ void X11StandalonePlatform::invertScreen() + ScreenResources res((active_client && active_client->window() != XCB_WINDOW_NONE) ? active_client->window() : rootWindow()); + + if (!res.isNull()) { +- for (auto crtc : std::span(res.crtcs(), res->num_crtcs)) { ++ for (int j = 0; j < res->num_crtcs; ++j) { ++ auto crtc = res.crtcs()[j]; + CrtcGamma gamma(crtc); + if (gamma.isNull()) { + continue; +@@ -480,39 +479,54 @@ void X11StandalonePlatform::doUpdateOutputs() + if (Xcb::Extensions::self()->isRandrAvailable()) { + T resources(rootWindow()); + if (!resources.isNull()) { ++ xcb_randr_crtc_t *crtcs = resources.crtcs(); ++ const xcb_randr_mode_info_t *modes = resources.modes(); ++ ++ QVector<Xcb::RandR::CrtcInfo> infos(resources->num_crtcs); ++ for (int i = 0; i < resources->num_crtcs; ++i) { ++ infos[i] = Xcb::RandR::CrtcInfo(crtcs[i], resources->config_timestamp); ++ } + +- std::span crtcs(resources.crtcs(), resources->num_crtcs); +- for (auto crtc : crtcs) { +- Xcb::RandR::CrtcInfo info(crtc, resources->config_timestamp); ++ for (int i = 0; i < resources->num_crtcs; ++i) { ++ Xcb::RandR::CrtcInfo info(infos.at(i)); + + const QRect geometry = info.rect(); + if (!geometry.isValid()) { + continue; + } + +- float refreshRate = -1.0f; ++ xcb_randr_output_t *outputs = info.outputs(); ++ QVector<Xcb::RandR::OutputInfo> outputInfos(outputs ? resources->num_outputs : 0); ++ QVector<Xcb::RandR::OutputProperty> edids(outputs ? resources->num_outputs : 0); ++ if (outputs) { ++ for (int i = 0; i < resources->num_outputs; ++i) { ++ outputInfos[i] = Xcb::RandR::OutputInfo(outputs[i], resources->config_timestamp); ++ edids[i] = Xcb::RandR::OutputProperty(outputs[i], atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false); ++ } ++ } + +- for (auto mode : std::span(resources.modes(), resources->num_modes)) { +- if (info->mode == mode.id) { +- if (mode.htotal != 0 && mode.vtotal != 0) { // BUG 313996 ++ float refreshRate = -1.0f; ++ for (int j = 0; j < resources->num_modes; ++j) { ++ if (info->mode == modes[j].id) { ++ if (modes[j].htotal != 0 && modes[j].vtotal != 0) { // BUG 313996 + // refresh rate calculation - WTF was wikipedia 1998 when I needed it? +- int dotclock = mode.dot_clock, +- vtotal = mode.vtotal; +- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) { ++ int dotclock = modes[j].dot_clock, ++ vtotal = modes[j].vtotal; ++ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) { + dotclock *= 2; + } +- if (mode.mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) { ++ if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) { + vtotal *= 2; + } +- refreshRate = dotclock / float(mode.htotal * vtotal); ++ refreshRate = dotclock / float(modes[j].htotal * vtotal); + } + break; // found mode + } + } + +- for (auto xcbOutput : std::span(info.outputs(), info->num_outputs)) { +- Xcb::RandR::OutputInfo outputInfo(xcbOutput, resources->config_timestamp); +- if (outputInfo->crtc != crtc) { ++ for (int j = 0; j < info->num_outputs; ++j) { ++ Xcb::RandR::OutputInfo outputInfo(outputInfos.at(j)); ++ if (outputInfo->crtc != crtcs[i]) { + continue; + } + +@@ -528,14 +542,12 @@ void X11StandalonePlatform::doUpdateOutputs() + // TODO: Perhaps the output has to save the inherited gamma ramp and + // restore it during tear down. Currently neither standalone x11 nor + // drm platform do this. +- Xcb::RandR::CrtcGamma gamma(crtc); ++ Xcb::RandR::CrtcGamma gamma(crtcs[i]); + + output->setRenderLoop(m_renderLoop.get()); +- output->setCrtc(crtc); ++ output->setCrtc(crtcs[i]); + output->setGammaRampSize(gamma.isNull() ? 0 : gamma->size); +- auto it = std::find(crtcs.begin(), crtcs.end(), crtc); +- int crtcIndex = std::distance(crtcs.begin(), it); +- output->setXineramaNumber(crtcIndex); ++ output->setXineramaNumber(i); + + QSize physicalSize(outputInfo->mm_width, outputInfo->mm_height); + switch (info->rotation) { +@@ -556,10 +568,9 @@ void X11StandalonePlatform::doUpdateOutputs() + .physicalSize = physicalSize, + }; + +- auto edidProperty = Xcb::RandR::OutputProperty(xcbOutput, atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false); + bool ok; +- if (auto data = edidProperty.toByteArray(&ok); ok && !data.isEmpty()) { +- if (auto edid = Edid(data, edidProperty.data()->num_items); edid.isValid()) { ++ if (auto data = edids[j].toByteArray(&ok); ok && !data.isEmpty()) { ++ if (auto edid = Edid(data, edids[j].data()->num_items); edid.isValid()) { + information.manufacturer = edid.manufacturerString(); + information.model = edid.monitorName(); + information.serialNumber = edid.serialNumber(); +-- +2.37.2 + diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 46283eae26f4d..8f69c965ea072 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,20 +1,62 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, fetchpatch, - - libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa, - pipewire, udev, wayland, xcb-util-cursor, xwayland, - plasma-wayland-protocols, wayland-protocols, libxcvt, - - qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors, - qtvirtualkeyboard, qtx11extras, - - breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, - kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, - kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, - krunner, kscreenlocker, kservice, kwayland, kwidgetsaddons, - kwindowsystem, kxmlgui, plasma-framework, libqaccessibilityclient, - python3 +{ mkDerivation +, stdenv +, lib +, extra-cmake-modules +, kdoctools +, fetchpatch +, libepoxy +, lcms2 +, libICE +, libSM +, libcap +, libdrm +, libinput +, libxkbcommon +, mesa +, pipewire +, udev +, wayland +, xcb-util-cursor +, xwayland +, plasma-wayland-protocols +, wayland-protocols +, libxcvt +, qtdeclarative +, qtmultimedia +, qtquickcontrols2 +, qtscript +, qtsensors +, qtvirtualkeyboard +, qtx11extras +, breeze-qt5 +, kactivities +, kcompletion +, kcmutils +, kconfig +, kconfigwidgets +, kcoreaddons +, kcrash +, kdeclarative +, kdecoration +, kglobalaccel +, ki18n +, kiconthemes +, kidletime +, kinit +, kio +, knewstuff +, knotifications +, kpackage +, krunner +, kscreenlocker +, kservice +, kwayland +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, plasma-framework +, libqaccessibilityclient +, python3 }: # TODO (ttuegel): investigate qmlplugindump failure @@ -23,18 +65,60 @@ mkDerivation { pname = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire - udev wayland xcb-util-cursor xwayland - libxcvt plasma-wayland-protocols wayland-protocols + libepoxy + lcms2 + libICE + libSM + libcap + libdrm + libinput + libxkbcommon + mesa + pipewire + udev + wayland + xcb-util-cursor + xwayland + libxcvt + plasma-wayland-protocols + wayland-protocols - qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors - qtvirtualkeyboard qtx11extras + qtdeclarative + qtmultimedia + qtquickcontrols2 + qtscript + qtsensors + qtvirtualkeyboard + qtx11extras - breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets - kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes - kidletime kinit kio knewstuff knotifications kpackage krunner kscreenlocker - kservice kwayland kwidgetsaddons kwindowsystem kxmlgui - plasma-framework libqaccessibilityclient + breeze-qt5 + kactivities + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kcrash + kdeclarative + kdecoration + kglobalaccel + ki18n + kiconthemes + kidletime + kinit + kio + knewstuff + knotifications + kpackage + krunner + kscreenlocker + kservice + kwayland + kwidgetsaddons + kwindowsystem + kxmlgui + plasma-framework + libqaccessibilityclient ]; outputs = [ "out" "dev" ]; @@ -58,6 +142,8 @@ mkDerivation { url = "https://invent.kde.org/plasma/kwin/-/commit/9a008b223ad696db3bf5692750f2b74e578e08b8.diff"; sha256 = "sha256-f35G+g2MVABLDbAkCed3ZmtDWrzYn1rdD08mEx35j4k="; }) + ] ++ lib.optionals stdenv.isAarch64 [ + ./0001-Revert-x11-Refactor-output-updates.patch ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index 9ba1afaf9f836..3f19acea6bdc3 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,7 +1,12 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase, +{ mkDerivation +, lib +, extra-cmake-modules +, kcoreaddons +, kdbusaddons +, ki18n +, knotifications +, kpty +, qtbase }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix index 8126377955314..721eee4937300 100644 --- a/pkgs/desktops/plasma-5/layer-shell-qt.nix +++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix @@ -1,6 +1,14 @@ -{ mkDerivation, lib +{ mkDerivation +, lib , extra-cmake-modules -, kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, wayland-scanner, wayland, wayland-protocols +, kguiaddons +, kidletime +, kwayland +, kwindowsystem +, qtbase +, wayland-scanner +, wayland +, wayland-protocols }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index 6798a2cdcb0ed..ad9ddc95c0453 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -1,16 +1,21 @@ -{ - mkDerivation, lib, propagate, - extra-cmake-modules, - qtbase, - wayland-scanner, kwayland, - plasma-wayland-protocols, wayland, - libXrandr, qtx11extras +{ mkDerivation +, lib +, propagate +, extra-cmake-modules +, qtbase +, wayland-scanner +, kconfig +, kwayland +, plasma-wayland-protocols +, wayland +, libXrandr +, qtx11extras }: mkDerivation { pname = "libkscreen"; nativeBuildInputs = [ extra-cmake-modules wayland-scanner ]; - buildInputs = [ kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ]; + buildInputs = [ kconfig kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ]; outputs = [ "out" "dev" ]; patches = [ ./libkscreen-backends-path.patch diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index ef4e443844484..8e9be6f743cf9 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -1,9 +1,26 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, - knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, - qtbase, qtscript, qtwebengine, qtx11extras, libnl, libpcap, qtsensors, lm_sensors, +{ mkDerivation +, lib +, extra-cmake-modules +, kauth +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, ki18n +, kiconthemes +, knewstuff +, kservice +, kwidgetsaddons +, kwindowsystem +, plasma-framework +, qtbase +, qtscript +, qtwebengine +, qtx11extras +, libnl +, libpcap +, qtsensors +, lm_sensors }: mkDerivation { @@ -13,9 +30,25 @@ mkDerivation { ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets - kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras - qtwebengine knewstuff libnl libpcap qtsensors lm_sensors + kauth + kconfig + ki18n + kiconthemes + kwindowsystem + kcompletion + kconfigwidgets + kcoreaddons + kservice + kwidgetsaddons + plasma-framework + qtscript + qtx11extras + qtwebengine + knewstuff + libnl + libpcap + qtsensors + lm_sensors ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 8ae5061436d1a..87f5f3b170f2d 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,15 +1,30 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice, - plasma-framework, qtbase, qtscript, qtdeclarative +{ mkDerivation +, lib +, extra-cmake-modules +, kcoreaddons +, kdeclarative +, ki18n +, kitemmodels +, krunner +, kservice +, plasma-framework +, qtbase +, qtscript +, qtdeclarative }: mkDerivation { pname = "milou"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework - qtdeclarative qtscript + kcoreaddons + kdeclarative + ki18n + kitemmodels + krunner + kservice + plasma-framework + qtdeclarative + qtscript ]; } diff --git a/pkgs/desktops/plasma-5/oxygen-sounds.nix b/pkgs/desktops/plasma-5/oxygen-sounds.nix index ddb5be869bea9..78fdebc416c8e 100644 --- a/pkgs/desktops/plasma-5/oxygen-sounds.nix +++ b/pkgs/desktops/plasma-5/oxygen-sounds.nix @@ -1,6 +1,5 @@ -{ - mkDerivation, - extra-cmake-modules, +{ mkDerivation +, extra-cmake-modules }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 78603c3c306a2..a9e4eb18820b9 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -1,18 +1,39 @@ -{ - mkDerivation, - extra-cmake-modules, - frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, - ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative, - qtx11extras, libXdmcp +{ mkDerivation +, extra-cmake-modules +, frameworkintegration +, kcmutils +, kcompletion +, kconfig +, kdecoration +, kguiaddons +, ki18n +, kwidgetsaddons +, kservice +, kwayland +, kwindowsystem +, qtdeclarative +, qtx11extras +, libXdmcp }: mkDerivation { pname = "oxygen"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ - frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons - ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative - qtx11extras libXdmcp + frameworkintegration + kcmutils + kcompletion + kconfig + kdecoration + kguiaddons + ki18n + kservice + kwayland + kwidgetsaddons + kwindowsystem + qtdeclarative + qtx11extras + libXdmcp ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/plank-player.nix b/pkgs/desktops/plasma-5/plank-player.nix new file mode 100644 index 0000000000000..f67cd8728ee7e --- /dev/null +++ b/pkgs/desktops/plasma-5/plank-player.nix @@ -0,0 +1,17 @@ +{ mkDerivation +, extra-cmake-modules +, qtquickcontrols2 +, qtmultimedia +, kirigami2 +, ki18n +}: +mkDerivation { + pname = "plank-player"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtquickcontrols2 + qtmultimedia + kirigami2 + ki18n + ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-bigscreen.nix b/pkgs/desktops/plasma-5/plasma-bigscreen.nix new file mode 100644 index 0000000000000..f94b49efabc79 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-bigscreen.nix @@ -0,0 +1,47 @@ +{ mkDerivation +, extra-cmake-modules +, kactivities +, kactivities-stats +, plasma-framework +, ki18n +, kirigami2 +, kdeclarative +, kcmutils +, knotifications +, kio +, kwayland +, kwindowsystem +, plasma-workspace +, qtmultimedia +}: +mkDerivation { + pname = "plasma-bigscreen"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + kactivities + kactivities-stats + plasma-framework + ki18n + kirigami2 + kdeclarative + kcmutils + knotifications + kio + kwayland + kwindowsystem + plasma-workspace + qtmultimedia + ]; + + postPatch = '' + substituteInPlace bin/plasma-bigscreen-wayland.in \ + --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" + ''; + + preFixup = '' + wrapQtApp $out/bin/plasma-bigscreen-x11 + wrapQtApp $out/bin/plasma-bigscreen-wayland + ''; + + passthru.providedSessions = [ "plasma-bigscreen-x11" "plasma-bigscreen-wayland" ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix index 1ddd844444d80..dcd895efbbc73 100644 --- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix @@ -1,9 +1,17 @@ -{ - mkDerivation, - extra-cmake-modules, - qtbase, - kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose, - krunner, kwindowsystem, kactivities, plasma-workspace +{ mkDerivation +, extra-cmake-modules +, qtbase +, kfilemetadata +, kio +, ki18n +, kconfig +, kdbusaddons +, knotifications +, kpurpose +, krunner +, kwindowsystem +, kactivities +, plasma-workspace }: mkDerivation { @@ -12,7 +20,17 @@ mkDerivation { extra-cmake-modules ]; buildInputs = [ - qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose - krunner kwindowsystem kactivities plasma-workspace + qtbase + kfilemetadata + kio + ki18n + kconfig + kdbusaddons + knotifications + kpurpose + krunner + kwindowsystem + kactivities + plasma-workspace ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 6c8d8a3bc4b6b..5c71b38eaaf12 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,36 +1,115 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - - boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, - libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, - xorgserver, util-linux, - - accounts-qt, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, - qtx11extras, - - attica, baloo, kaccounts-integration, kactivities, kactivities-stats, kauth, - kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, - kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, - kpeople, krunner, kscreenlocker, kwallet, kwin, phonon, - plasma-framework, plasma-workspace, qqc2-desktop-style, xf86inputlibinput +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, wayland-scanner +, boost +, fontconfig +, ibus +, libXcursor +, libXft +, libcanberra_kde +, libpulseaudio +, libxkbfile +, xf86inputevdev +, xf86inputsynaptics +, xinput +, xkeyboard_config +, xorgserver +, util-linux +, wayland +, wayland-protocols +, accounts-qt +, qtdeclarative +, qtquickcontrols +, qtquickcontrols2 +, qtsvg +, qtx11extras +, attica +, baloo +, kaccounts-integration +, kactivities +, kactivities-stats +, kauth +, kcmutils +, kdbusaddons +, kdeclarative +, kded +, kdelibs4support +, kemoticons +, kglobalaccel +, ki18n +, kitemmodels +, knewstuff +, knotifications +, knotifyconfig +, kpeople +, krunner +, kscreenlocker +, kwallet +, kwin +, phonon +, plasma-framework +, plasma-workspace +, qqc2-desktop-style +, xf86inputlibinput }: mkDerivation { pname = "plasma-desktop"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ]; buildInputs = [ - boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver - libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput + boost + fontconfig + ibus + libcanberra_kde + libpulseaudio + libXcursor + libXft + xorgserver + libxkbfile + phonon + xf86inputlibinput + xf86inputevdev + xf86inputsynaptics + xinput xkeyboard_config + wayland + wayland-protocols - accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras + accounts-qt + qtdeclarative + qtquickcontrols + qtquickcontrols2 + qtsvg + qtx11extras - attica baloo kaccounts-integration kactivities kactivities-stats kauth - kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons - kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig - kpeople krunner kscreenlocker kwallet kwin plasma-framework - plasma-workspace qqc2-desktop-style + attica + baloo + kaccounts-integration + kactivities + kactivities-stats + kauth + kcmutils + kdbusaddons + kdeclarative + kded + kdelibs4support + kemoticons + kglobalaccel + ki18n + kitemmodels + knewstuff + knotifications + knotifyconfig + kpeople + krunner + kscreenlocker + kwallet + kwin + plasma-framework + plasma-workspace + qqc2-desktop-style ]; patches = [ diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix index 8ddd53548e750..801bf4d978b3b 100644 --- a/pkgs/desktops/plasma-5/plasma-disks.nix +++ b/pkgs/desktops/plasma-5/plasma-disks.nix @@ -1,18 +1,49 @@ -{ - mkDerivation, extra-cmake-modules, kdoctools, - kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, - kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace, - systemsettings +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfig +, kdbusaddons +, khtml +, ki18n +, kiconthemes +, kio +, kitemviews +, kservice +, kwindowsystem +, kxmlgui +, qtquickcontrols +, qtquickcontrols2 +, kactivities +, kactivities-stats +, kirigami2 +, kcrash +, plasma-workspace +, systemsettings }: mkDerivation { pname = "plasma-disks"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice - kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 - kactivities kactivities-stats kirigami2 kcrash plasma-workspace + kcmutils + kconfig + kdbusaddons + khtml + ki18n + kiconthemes + kio + kitemviews + kservice + kwindowsystem + kxmlgui + qtquickcontrols + qtquickcontrols2 + kactivities + kactivities-stats + kirigami2 + kcrash + plasma-workspace systemsettings ]; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix index 2c6bd8337ff17..f88b737e0ec79 100644 --- a/pkgs/desktops/plasma-5/plasma-integration/default.nix +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -1,9 +1,17 @@ -{ - mkDerivation, - extra-cmake-modules, - breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, - kwayland, libXcursor, qtquickcontrols2, wayland, wayland-protocols, - plasma-wayland-protocols +{ mkDerivation +, extra-cmake-modules +, breeze-qt5 +, kconfig +, kconfigwidgets +, kiconthemes +, kio +, knotifications +, kwayland +, libXcursor +, qtquickcontrols2 +, wayland +, wayland-protocols +, plasma-wayland-protocols }: # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration @@ -12,8 +20,17 @@ mkDerivation { pname = "plasma-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland - libXcursor qtquickcontrols2 wayland wayland-protocols + breeze-qt5 + kconfig + kconfigwidgets + kiconthemes + kio + knotifications + kwayland + libXcursor + qtquickcontrols2 + wayland + wayland-protocols plasma-wayland-protocols ]; } diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix index 3625376f6c2b1..ce0da404bb595 100644 --- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -1,16 +1,36 @@ -{ - mkDerivation, lib, - - extra-cmake-modules, kdoctools, - - coreutils, dbus, gnugrep, gnused, libdbusmenu, pam, wayland, appstream, - - kdeclarative, kdelibs4support, kpeople, kconfig, krunner, kinit, kwayland, kwin, - plasma-framework, telepathy, libphonenumber, protobuf, libqofono, modemmanager-qt, - networkmanager-qt, plasma-workspace, - maliit-framework, maliit-keyboard, qtfeedback, - - qtwayland, qttools +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, coreutils +, dbus +, gnugrep +, gnused +, libdbusmenu +, pam +, wayland +, appstream +, kdeclarative +, kdelibs4support +, kpeople +, kconfig +, krunner +, kinit +, kwayland +, kwin +, plasma-framework +, telepathy +, libphonenumber +, protobuf +, libqofono +, modemmanager-qt +, networkmanager-qt +, plasma-workspace +, maliit-framework +, maliit-keyboard +, qtfeedback +, qtwayland +, qttools }: let inherit (lib) getBin getLib; in @@ -20,14 +40,33 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - appstream libdbusmenu pam wayland - kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin - plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt - networkmanager-qt maliit-framework maliit-keyboard plasma-workspace qtfeedback + appstream + libdbusmenu + pam + wayland + kdeclarative + kdelibs4support + kpeople + kconfig + krunner + kinit + kwayland + kwin + plasma-framework + telepathy + libphonenumber + protobuf + libqofono + modemmanager-qt + networkmanager-qt + maliit-framework + maliit-keyboard + plasma-workspace + qtfeedback ]; postPatch = '' - substituteInPlace bin/kwinwrapper.in \ + substituteInPlace bin/startplasmamobile.in \ --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" substituteInPlace bin/plasma-mobile.desktop.cmake \ @@ -36,7 +75,7 @@ mkDerivation { # Ensures dependencies like libqofono (at the very least) are present for the shell. preFixup = '' - wrapQtApp "$out/bin/kwinwrapper" + wrapQtApp "$out/bin/startplasmamobile" ''; passthru.providedSessions = [ "plasma-mobile" ]; diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix index 6e2608c7f97b1..50f0d321b394e 100644 --- a/pkgs/desktops/plasma-5/plasma-nano/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nano/default.nix @@ -1,7 +1,6 @@ -{ - mkDerivation, - extra-cmake-modules, - plasma-framework +{ mkDerivation +, extra-cmake-modules +, plasma-framework }: mkDerivation { diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 54c8079cf5f43..0a5947cdf19e2 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,28 +1,76 @@ -{ - mkDerivation, lib, substituteAll, - extra-cmake-modules, kdoctools, - kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, - ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, - kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, prison, solid, - - mobile-broadband-provider-info, openconnect, openvpn, - modemmanager-qt, networkmanager-qt, qca-qt5, - qtbase, qtdeclarative, qttools, +{ mkDerivation +, lib +, substituteAll +, extra-cmake-modules +, kdoctools +, kcmutils +, kcompletion +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kinit +, kio +, kitemviews +, knotifications +, kservice +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, plasma-framework +, prison +, solid +, mobile-broadband-provider-info +, openconnect +, openvpn +, modemmanager-qt +, networkmanager-qt +, qca-qt5 +, qtbase +, qtdeclarative +, qttools }: mkDerivation { pname = "plasma-nm"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ - kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion - kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui - prison solid + kdeclarative + ki18n + kio + kwindowsystem + plasma-framework + kcompletion + kcmutils + kconfigwidgets + kcoreaddons + kdbusaddons + kiconthemes + kinit + kitemviews + knotifications + kservice + kwallet + kwidgetsaddons + kxmlgui + prison + solid qtdeclarative - modemmanager-qt networkmanager-qt qca-qt5 - mobile-broadband-provider-info openconnect + modemmanager-qt + networkmanager-qt + qca-qt5 + mobile-broadband-provider-info + openconnect + ]; + + cmakeFlags = [ + "-DBUILD_MOBILE=ON" ]; + patches = [ (substituteAll { src = ./0002-openvpn-binary-path.patch; diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 9e47356579e37..07170892f2799 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,20 +1,44 @@ -{ - mkDerivation, lib, - extra-cmake-modules, kdoctools, - kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework, - qtbase, qtdeclarative, - gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfigwidgets +, kcoreaddons +, kdeclarative +, kglobalaccel +, ki18n +, kwindowsystem +, plasma-framework +, qtbase +, qtdeclarative +, gconf +, glib +, libcanberra-gtk3 +, libpulseaudio +, sound-theme-freedesktop }: mkDerivation { pname = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop + gconf + glib + libcanberra-gtk3 + libpulseaudio + sound-theme-freedesktop - kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework + kcmutils + kconfigwidgets + kcoreaddons + kdeclarative + kglobalaccel + ki18n + plasma-framework kwindowsystem - qtbase qtdeclarative + qtbase + qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix new file mode 100644 index 0000000000000..3f169244fdaff --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix @@ -0,0 +1,40 @@ +{ mkDerivation +, extra-cmake-modules +, kconfig +, knotifications +, ki18n +, solid +, kcoreaddons +, kdeclarative +, kcmutils +, kpackage +, kwindowsystem +, wayland +, pkg-config +, libcec +, libcec_platform +, libevdev +, plasma-workspace +, plasma-wayland-protocols +}: +mkDerivation { + pname = "plasma-remotecontrollers"; + nativeBuildInputs = [ extra-cmake-modules pkg-config ]; + buildInputs = [ + kconfig + knotifications + ki18n + solid + kcoreaddons + kdeclarative + kcmutils + kpackage + kwindowsystem + wayland + libcec + libcec_platform + libevdev + plasma-workspace + plasma-wayland-protocols + ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix index b6ceb37a71ff3..ba1def5304762 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/default.nix +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -1,16 +1,14 @@ -{ - mkDerivation, lib, - extra-cmake-modules, - - kactivities, - plasma-framework, - kwindowsystem, - networkmanager-qt, - libksysguard, - - encfs, - cryfs, - fuse +{ mkDerivation +, lib +, extra-cmake-modules +, kactivities +, plasma-framework +, kwindowsystem +, networkmanager-qt +, libksysguard +, encfs +, cryfs +, fuse }: mkDerivation { @@ -24,7 +22,10 @@ mkDerivation { ]; buildInputs = [ - kactivities plasma-framework kwindowsystem libksysguard + kactivities + plasma-framework + kwindowsystem + libksysguard networkmanager-qt ]; diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix index 8ae136ac78ba2..799973c215383 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix @@ -1,4 +1,4 @@ -{ mkDerivation , extra-cmake-modules }: +{ mkDerivation, extra-cmake-modules }: mkDerivation { pname = "plasma-workspace-wallpapers"; diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch index 211316e24736e..45c9f695b4520 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch @@ -1,23 +1,9 @@ -From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@mailbox.org> -Date: Wed, 5 Feb 2020 05:03:11 -0600 -Subject: [PATCH] absolute-wallpaper-install-dir - ---- - sddm-theme/theme.conf.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index a560da3..f723c1e 100644 ---- a/sddm-theme/theme.conf.cmake -+++ b/sddm-theme/theme.conf.cmake +--- a/lookandfeel/sddm-theme/theme.conf.cmake ++++ b/lookandfeel/sddm-theme/theme.conf.cmake @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg type=image color=#1d99f3 fontSize=10 --background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg -+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png needsFullUserModel=false --- -2.30.0 - diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index ce17561d73fc1..252b6a9fac557 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -1,23 +1,72 @@ -{ - mkDerivation, lib, - - extra-cmake-modules, kdoctools, - - coreutils, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, - libXtst, libXft, pam, wayland, xmessage, xsetroot, - - baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, - kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, - kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, - kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, - kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, - phonon, plasma-framework, prison, solid, kholidays, kquickcharts, - appstream-qt, plasma-wayland-protocols, - - qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, - qtwayland, qtx11extras, qqc2-desktop-style, - - pipewire, libdrm +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, coreutils +, gnugrep +, gnused +, isocodes +, libdbusmenu +, libSM +, libXcursor +, libXtst +, libXft +, pam +, wayland +, xmessage +, xsetroot +, baloo +, breeze-qt5 +, kactivities +, kactivities-stats +, kcmutils +, kconfig +, kcrash +, kdbusaddons +, kdeclarative +, kdelibs4support +, kdesu +, kglobalaccel +, kidletime +, kinit +, kjsembed +, knewstuff +, knotifyconfig +, kpackage +, kpeople +, krunner +, kscreenlocker +, ktexteditor +, ktextwidgets +, kwallet +, kwayland +, kwin +, kxmlrpcclient +, libkscreen +, libksysguard +, libqalculate +, networkmanager-qt +, phonon +, plasma-framework +, prison +, solid +, kholidays +, kquickcharts +, appstream-qt +, plasma-wayland-protocols +, kpipewire +, libkexiv2 +, qtgraphicaleffects +, qtquickcontrols +, qtquickcontrols2 +, qtscript +, qttools +, qtwayland +, qtx11extras +, qqc2-desktop-style +, polkit-qt +, pipewire +, libdrm }: let inherit (lib) getBin getLib; in @@ -28,19 +77,66 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - isocodes libdbusmenu libSM libXcursor libXtst libXft pam wayland + isocodes + libdbusmenu + libSM + libXcursor + libXtst + libXft + pam + wayland - baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons - kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff - knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor - ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard - libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays kquickcharts appstream-qt plasma-wayland-protocols + baloo + kactivities + kactivities-stats + kcmutils + kconfig + kcrash + kdbusaddons + kdeclarative + kdelibs4support + kdesu + kglobalaccel + kidletime + kjsembed + knewstuff + knotifyconfig + kpackage + kpeople + krunner + kscreenlocker + ktexteditor + ktextwidgets + kwallet + kwayland + kwin + kxmlrpcclient + libkscreen + libksysguard + libqalculate + networkmanager-qt + phonon + plasma-framework + prison + solid + kholidays + kquickcharts + appstream-qt + plasma-wayland-protocols + kpipewire + libkexiv2 - qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland - qtx11extras qqc2-desktop-style + qtgraphicaleffects + qtquickcontrols + qtquickcontrols2 + qtscript + qtwayland + qtx11extras + qqc2-desktop-style + polkit-qt - pipewire libdrm + pipewire + libdrm ]; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; outputs = [ "out" "dev" ]; @@ -60,6 +156,12 @@ mkDerivation { --replace 'ecm_query_qt(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")' ''; + # work around wrapQtAppsHook double-wrapping kcminit_startup, + # which is a symlink to kcminit + postFixup = '' + ln -sf $out/bin/kcminit $out/bin/kcminit_startup + ''; + NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"'' diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 82ebf3e313652..3f4387ed5f346 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -1,15 +1,33 @@ -{ - mkDerivation, lib, extra-cmake-modules, - kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, - kwidgetsaddons, kwindowsystem, polkit-qt, qtbase +{ mkDerivation +, lib +, extra-cmake-modules +, kcoreaddons +, kconfig +, kcrash +, kdbusaddons +, ki18n +, kiconthemes +, knotifications +, kwidgetsaddons +, kwindowsystem +, polkit-qt +, qtbase }: mkDerivation { pname = "polkit-kde-agent"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ - kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes - knotifications kwindowsystem polkit-qt + kdbusaddons + kwidgetsaddons + kcoreaddons + kcrash + kconfig + ki18n + kiconthemes + knotifications + kwindowsystem + polkit-qt ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index bb511c21ba67f..d60f9701dee6f 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,17 +1,45 @@ -{ - mkDerivation, - extra-cmake-modules, kdoctools, - bluez-qt, kactivities, kauth, kconfig, kdbusaddons, - kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, - networkmanager-qt, plasma-workspace, qtx11extras, solid, udev +{ mkDerivation +, extra-cmake-modules +, kdoctools +, bluez-qt +, kactivities +, kauth +, kconfig +, kdbusaddons +, kglobalaccel +, ki18n +, kidletime +, kio +, knotifyconfig +, kwayland +, libkscreen +, networkmanager-qt +, plasma-workspace +, qtx11extras +, solid +, udev }: mkDerivation { pname = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth - kglobalaccel ki18n kio kidletime kwayland libkscreen - networkmanager-qt plasma-workspace qtx11extras + kconfig + kdbusaddons + knotifyconfig + solid + udev + bluez-qt + kactivities + kauth + kglobalaccel + ki18n + kio + kidletime + kwayland + libkscreen + networkmanager-qt + plasma-workspace + qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 7db1927402552..c600d8039924c 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,428 +3,468 @@ { fetchurl, mirror }: { + aura-browser = { + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/aura-browser-5.26.0.tar.xz"; + sha256 = "1r43p7jjmsjhav6b3zdk9lx8cg56dapxd6sh2c6cwc1xy8pmvpm9"; + name = "aura-browser-5.26.0.tar.xz"; + }; + }; bluedevil = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/bluedevil-5.25.5.tar.xz"; - sha256 = "1dsah7rcx2brcd1d5x7bvhrixx5nvwp1fwq9b8k2zc038xzpx6ys"; - name = "bluedevil-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/bluedevil-5.26.0.tar.xz"; + sha256 = "1br3vj7xxgzzc82fw1qq1zqk9gcpl5dpmlz61lqq87wnjhqb6xdj"; + name = "bluedevil-5.26.0.tar.xz"; }; }; breeze = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/breeze-5.25.5.tar.xz"; - sha256 = "0m3ggv5znzfcp25afgl7v5w7m27v5hdvv6jw9vrvwbqj8lzq1hlx"; - name = "breeze-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/breeze-5.26.0.tar.xz"; + sha256 = "0z2371bwv7m1zhlgby8vjvx5qblpf94281p5l3qa22ws0k4jgv8i"; + name = "breeze-5.26.0.tar.xz"; }; }; breeze-grub = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/breeze-grub-5.25.5.tar.xz"; - sha256 = "1w5lrnfhnzd9mjs93r1y8f9mlpqd7jlrjwzfryy919alqsxfpyyl"; - name = "breeze-grub-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/breeze-grub-5.26.0.tar.xz"; + sha256 = "12fpxnddcvig9zgj3knjkarl4y2kywgqg60cdjj3shsk2q6q2lh0"; + name = "breeze-grub-5.26.0.tar.xz"; }; }; breeze-gtk = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/breeze-gtk-5.25.5.tar.xz"; - sha256 = "0wj8qzy2104ggczxagxm45zwsvvpwd6jjnbv1893mhlr6f2zrbmh"; - name = "breeze-gtk-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/breeze-gtk-5.26.0.tar.xz"; + sha256 = "1q3lf5sj9f0fx4ahdffd16m0ak4q742b6zpw6crvz4cymh3n9fy8"; + name = "breeze-gtk-5.26.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/breeze-plymouth-5.25.5.tar.xz"; - sha256 = "1p9xgcxx543dddpz7sahk1ky6inzl9lyaf0z506vh91xs5rn0srv"; - name = "breeze-plymouth-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/breeze-plymouth-5.26.0.tar.xz"; + sha256 = "04xhdy89p83p8dhhs40hkp2xlpj20j4l2dwiry9qaqd1yk331gz8"; + name = "breeze-plymouth-5.26.0.tar.xz"; }; }; discover = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/discover-5.25.5.tar.xz"; - sha256 = "01vdi66c7v60db25p0qi0q73wgqw6dy2kirbk34bvhld41gpxhhv"; - name = "discover-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/discover-5.26.0.tar.xz"; + sha256 = "0w7i9w5y1ybd1qzzx1psgf97960bdjkbdr1p90jymqwflcr5yjyz"; + name = "discover-5.26.0.tar.xz"; }; }; drkonqi = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/drkonqi-5.25.5.tar.xz"; - sha256 = "0vw4bfld2jdiwm4g3008x8s1lq1ydf87ckb0fvyzsp11hq9nnnk7"; - name = "drkonqi-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/drkonqi-5.26.0.tar.xz"; + sha256 = "01zsyy4v6ss3iflman0p3m3cq3ckbwjd6928frdvdlvc5w35zrj1"; + name = "drkonqi-5.26.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kactivitymanagerd-5.25.5.tar.xz"; - sha256 = "0hsllhqi46n25sr27crnad053ghk3hni2w496g6d2qfmi20l3g4n"; - name = "kactivitymanagerd-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kactivitymanagerd-5.26.0.tar.xz"; + sha256 = "1l8dncc2ijwg5vxd0l05fd2x3ssbvnhk5m4hhy6k84xaxjvinqnj"; + name = "kactivitymanagerd-5.26.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kde-cli-tools-5.25.5.tar.xz"; - sha256 = "0i1lnkyb2bdvbhnr2wsgjy2sjichzxxqkvn30ca85rj21cavk2z3"; - name = "kde-cli-tools-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kde-cli-tools-5.26.0.tar.xz"; + sha256 = "0w4nx2zdwaaqhm7xrqh0s5p2yp0wjwj0svyr396z8lapimgjn80l"; + name = "kde-cli-tools-5.26.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kde-gtk-config-5.25.5.tar.xz"; - sha256 = "0zr4626fmx5adg65qa0npc222kjxmhml1i014gsrmjmsp0s5w8pw"; - name = "kde-gtk-config-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kde-gtk-config-5.26.0.tar.xz"; + sha256 = "0yffhbrkh204ma8pv11256hn290gml4pmhgplygpwbn7ir9ir72p"; + name = "kde-gtk-config-5.26.0.tar.xz"; }; }; kdecoration = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kdecoration-5.25.5.tar.xz"; - sha256 = "1x3scszz5nfwqciwc3bv0r04wgqlxs0c9j1090zvn6mjjg2nsyb7"; - name = "kdecoration-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kdecoration-5.26.0.tar.xz"; + sha256 = "0cd67mmqriqcx1xvkx7s1zz01y6gc614g0qv6i2ybd6p5r2f3qcb"; + name = "kdecoration-5.26.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kdeplasma-addons-5.25.5.tar.xz"; - sha256 = "1a5cq0jz69hlcr22wxi2p5mzxv5xcp88220irxmq0dhpk85kywlx"; - name = "kdeplasma-addons-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kdeplasma-addons-5.26.0.tar.xz"; + sha256 = "1nfnvbm27rb2sljg01m4s61yqz7pw4h7z5zjp2n1x6l1gmbsbh1h"; + name = "kdeplasma-addons-5.26.0.tar.xz"; }; }; kgamma5 = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kgamma5-5.25.5.tar.xz"; - sha256 = "1c305bs50km7bsn0phz7yj4x2168sxwsw9zxbpcgw4q3r53c0ywz"; - name = "kgamma5-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kgamma5-5.26.0.tar.xz"; + sha256 = "117pwi6ykyhkp7vfpvgxz158m4a76b75mkynichn0b5k3q8svy4h"; + name = "kgamma5-5.26.0.tar.xz"; }; }; khotkeys = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/khotkeys-5.25.5.tar.xz"; - sha256 = "0c9i4vxiiv90dpzsd2hjwavks87cvwplkj63751z8mazax6r95as"; - name = "khotkeys-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/khotkeys-5.26.0.tar.xz"; + sha256 = "02inmqfrsp3w3pig45m3ay544vhdhmrx0alf36van561w76kkdc5"; + name = "khotkeys-5.26.0.tar.xz"; }; }; kinfocenter = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kinfocenter-5.25.5.tar.xz"; - sha256 = "0zvki76yghkn158s7hb5g9drz7xaqxkmp2747404n2n0gmnmsdif"; - name = "kinfocenter-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kinfocenter-5.26.0.tar.xz"; + sha256 = "0nif06xsf7nmgyb3d1navz3vykw88xk88fzgqnax001cmrmiph82"; + name = "kinfocenter-5.26.0.tar.xz"; }; }; kmenuedit = { - version = "5.25.5"; + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/kmenuedit-5.26.0.tar.xz"; + sha256 = "1cfinj96la1c4nkz885lfybk5fw8z8d42yshb3nks66r528xgsmi"; + name = "kmenuedit-5.26.0.tar.xz"; + }; + }; + kpipewire = { + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kmenuedit-5.25.5.tar.xz"; - sha256 = "0z85w7w207dnsinsz8yg6s408pwfy3l7wjkcsjpyg8aj8s9x6nl7"; - name = "kmenuedit-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kpipewire-5.26.0.tar.xz"; + sha256 = "1vmynvwcf2ll6hbcgdkmmdfyvib6fk1cq3yi6n0qdrqvbcrg62bs"; + name = "kpipewire-5.26.0.tar.xz"; }; }; kscreen = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kscreen-5.25.5.tar.xz"; - sha256 = "0361202n0366jiyv61w06jikh2i4s1fzr6x3chmdykx4fgvbqj7s"; - name = "kscreen-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kscreen-5.26.0.tar.xz"; + sha256 = "0ay5qc31b33q9h8isppga97vy1h5hrk8i44pbsr45qcjmigjkr16"; + name = "kscreen-5.26.0.tar.xz"; }; }; kscreenlocker = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kscreenlocker-5.25.5.tar.xz"; - sha256 = "0mivx0l266310iy52qi94b6wi8w2a8nl7cjn5750x66dz81jl3yj"; - name = "kscreenlocker-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kscreenlocker-5.26.0.tar.xz"; + sha256 = "0gf77s8pn8nyjmy5y8khw9l3094lnjbj6cyhcsl817yncp7v44p4"; + name = "kscreenlocker-5.26.0.tar.xz"; }; }; ksshaskpass = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/ksshaskpass-5.25.5.tar.xz"; - sha256 = "0z8pp2mh4s98jh8jkf6r8v014gb6svapmp0m1npzw7zcmr6jvpn6"; - name = "ksshaskpass-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/ksshaskpass-5.26.0.tar.xz"; + sha256 = "1wf5dn73g5whgf40g2irxm72lv6fhr3nillp8y6d08iw8p2mc9yc"; + name = "ksshaskpass-5.26.0.tar.xz"; }; }; ksystemstats = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/ksystemstats-5.25.5.tar.xz"; - sha256 = "07xm6gn2k3vsl1pkrd2n9w8w8b7jq26h3cpslqha4ipw0by2mlqa"; - name = "ksystemstats-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/ksystemstats-5.26.0.tar.xz"; + sha256 = "033b0b1qgkh27d708s6pzyra9dxy2h9fs0w4s0kvy9gkva1y2254"; + name = "ksystemstats-5.26.0.tar.xz"; }; }; kwallet-pam = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kwallet-pam-5.25.5.tar.xz"; - sha256 = "14w803lc3s2c0f4mqzzdhpfy5qnlz7wv00pbrc3v4k3zv381ci8n"; - name = "kwallet-pam-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kwallet-pam-5.26.0.tar.xz"; + sha256 = "1krcnsnyfxz7k2q9pcipv6mvzajkcgmgxsknb9g5cvrh0hla3fxq"; + name = "kwallet-pam-5.26.0.tar.xz"; }; }; kwayland-integration = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kwayland-integration-5.25.5.tar.xz"; - sha256 = "10xl7yrj519b9s5vq0hqqfz3vvg1fdwggw96snzm44iwycqbgss8"; - name = "kwayland-integration-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kwayland-integration-5.26.0.tar.xz"; + sha256 = "0h54mpj9z4cxb2f67lzp8zjm59xxlc35jffk2r0pyjs203a4247f"; + name = "kwayland-integration-5.26.0.tar.xz"; }; }; kwin = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kwin-5.25.5.tar.xz"; - sha256 = "1dh7ydwxbb9r53p353d53gq7w9vmp7idvsr4s5ldxmah35436v2s"; - name = "kwin-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kwin-5.26.0.tar.xz"; + sha256 = "1z9980s4pz9q4wd2lgr6iahqcc6y02f02mprzfbq6mlcq1llg7rs"; + name = "kwin-5.26.0.tar.xz"; }; }; kwrited = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/kwrited-5.25.5.tar.xz"; - sha256 = "03gw3czdgyf35n6x79x416rk6f7w1ayzmy5pb65v9733nx1j34mh"; - name = "kwrited-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/kwrited-5.26.0.tar.xz"; + sha256 = "173b5ppah5mapgx52hnkq6wfp6nn6z7mvm94mfz224r1vcr4841f"; + name = "kwrited-5.26.0.tar.xz"; }; }; layer-shell-qt = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/layer-shell-qt-5.25.5.tar.xz"; - sha256 = "1mvhklq7n9hhjing704jr3ybq58ixwr9fdg3phnqhmdnqc2q3w0l"; - name = "layer-shell-qt-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/layer-shell-qt-5.26.0.tar.xz"; + sha256 = "07mnrwk100mazrghg9biv4vlnnw92l88hwqchwkh541dgqa3s16y"; + name = "layer-shell-qt-5.26.0.tar.xz"; }; }; libkscreen = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/libkscreen-5.25.5.tar.xz"; - sha256 = "17f2pbbkpmw3a32nsqlwd0x5xb71l6dzrh7ldwcqv46nvb54yhfa"; - name = "libkscreen-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/libkscreen-5.26.0.tar.xz"; + sha256 = "092y26bn7g1a2v1jv1d7r71xrp5a8kdnfvz58szs4d4qm1iyp6jf"; + name = "libkscreen-5.26.0.tar.xz"; }; }; libksysguard = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/libksysguard-5.25.5.tar.xz"; - sha256 = "1gqsjsdkp25abqqp4f6cv6ih199q9ad7q1a4lkhjgsh4h8jq1856"; - name = "libksysguard-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/libksysguard-5.26.0.tar.xz"; + sha256 = "15ljaa6ypqdrb0x2b4chs7piq9pi4lm5hx36708has64xmrz9cj3"; + name = "libksysguard-5.26.0.tar.xz"; }; }; milou = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/milou-5.25.5.tar.xz"; - sha256 = "0ijdbiq169sy47g0x22pj9x6abldpfxcnski4w1jh9hi9qz1rc25"; - name = "milou-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/milou-5.26.0.tar.xz"; + sha256 = "1g4ga1ylzj4zcdx3wh5y4rz84w5bwv7041bkp7b03pia2hwfgvy0"; + name = "milou-5.26.0.tar.xz"; }; }; oxygen = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/oxygen-5.25.5.tar.xz"; - sha256 = "1szkaln4if8rafvjg2yjxarspf7lqls2pk0gzac89ncr7840c970"; - name = "oxygen-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/oxygen-5.26.0.tar.xz"; + sha256 = "0mbcdnv40j1jvc1i77rknrrs5xs6w5qaz7sliyygm2f01vgha6cz"; + name = "oxygen-5.26.0.tar.xz"; }; }; oxygen-sounds = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/oxygen-sounds-5.25.5.tar.xz"; - sha256 = "04rn3ccqszznknvblz2i8r406m32hk4d3yzma4vzq93jfk57hdf1"; - name = "oxygen-sounds-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/oxygen-sounds-5.26.0.tar.xz"; + sha256 = "0ww7njndc4ilwsc16l5jv7cbq8mzjm9yz7x515fhvwqzwh61vd47"; + name = "oxygen-sounds-5.26.0.tar.xz"; + }; + }; + plank-player = { + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/plank-player-5.26.0.tar.xz"; + sha256 = "0jwhrhbbwblj8c7n13hg7ac3dbmnybsspq1gpcd16l797msdyp2k"; + name = "plank-player-5.26.0.tar.xz"; + }; + }; + plasma-bigscreen = { + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/plasma-bigscreen-5.26.0.tar.xz"; + sha256 = "1jmv2f60pbgfs110560h4gix1hj8awmlydrikcyn0p2hhc6xdc9r"; + name = "plasma-bigscreen-5.26.0.tar.xz"; }; }; plasma-browser-integration = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-browser-integration-5.25.5.tar.xz"; - sha256 = "18pbn5ic5l3m8i1y99yprpwd4x4746aq3abqn1f2cq5h2683h2ia"; - name = "plasma-browser-integration-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-browser-integration-5.26.0.tar.xz"; + sha256 = "0vzkqhrafqwl5whqyjv1np37wzv5dm49gh4z3acv0yz83842asgl"; + name = "plasma-browser-integration-5.26.0.tar.xz"; }; }; plasma-desktop = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-desktop-5.25.5.tar.xz"; - sha256 = "05s1pkwr4xmkghp8jrwcyrvjm83n68ngmk2694055xcfgi0pxicg"; - name = "plasma-desktop-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-desktop-5.26.0.tar.xz"; + sha256 = "0x5csx29x81szmmil4mlxmfcmz3v1q0n3q3f6k3p4knhpv77x7vx"; + name = "plasma-desktop-5.26.0.tar.xz"; }; }; plasma-disks = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-disks-5.25.5.tar.xz"; - sha256 = "0vci2cf8vx2lclypys9rmvjb8haakv6ksrvqm5j28pazbq2kskvl"; - name = "plasma-disks-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-disks-5.26.0.tar.xz"; + sha256 = "0wb31vnh8bs5wxl07wawji2l66pmnhn9li3smcygsx0qcqxsmcxm"; + name = "plasma-disks-5.26.0.tar.xz"; }; }; plasma-firewall = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-firewall-5.25.5.tar.xz"; - sha256 = "0k3pc0dcsjr2hhh4hr8vhsvaddn66s6imm8skrr02icxqvljs6jh"; - name = "plasma-firewall-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-firewall-5.26.0.tar.xz"; + sha256 = "08ayf84ah294q473554zlgs8ri0l20bzc6gmbfrw833byviqwppr"; + name = "plasma-firewall-5.26.0.tar.xz"; }; }; plasma-integration = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-integration-5.25.5.tar.xz"; - sha256 = "1pab56cg2zi8fcaar53lhhh98iw7l07f5lkymkqhsh8a5crfc3yr"; - name = "plasma-integration-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-integration-5.26.0.tar.xz"; + sha256 = "0mqv9haanmp3q29ik2x07bmcfdly1icrzdcid76rlycnsr1v0qdg"; + name = "plasma-integration-5.26.0.tar.xz"; }; }; plasma-mobile = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-mobile-5.25.5.tar.xz"; - sha256 = "1q4amdqvjbcx88qdyvhhl6j5f0f9p41b3k99zsqv381f94dpybn9"; - name = "plasma-mobile-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-mobile-5.26.0.tar.xz"; + sha256 = "0zw7ppg8fqqb6i2z0zacij4qzwki1ixxi3ky1qvk8q7pqb8n47y2"; + name = "plasma-mobile-5.26.0.tar.xz"; }; }; plasma-nano = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-nano-5.25.5.tar.xz"; - sha256 = "1kgglhr3cvg0crfr6di21kp1pfdc017qh3jnaf25f15bllypznq9"; - name = "plasma-nano-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-nano-5.26.0.tar.xz"; + sha256 = "0cnb1y8xwxq711ighi9zzw6x3npfwpf9865bi16hha8fk7vzn6z7"; + name = "plasma-nano-5.26.0.tar.xz"; }; }; plasma-nm = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-nm-5.25.5.tar.xz"; - sha256 = "036bx0qjrjanfxy8aiy6ab7rmm2h8l7wlkvlwhzw2hgl1w03xjps"; - name = "plasma-nm-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-nm-5.26.0.tar.xz"; + sha256 = "1bjy4iq1v2nkhl0ib2v26anxvpl6dns1c1zqf5w24rfmpdmxz6ky"; + name = "plasma-nm-5.26.0.tar.xz"; }; }; plasma-pa = { - version = "5.25.5"; + version = "5.26.0"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.26.0/plasma-pa-5.26.0.tar.xz"; + sha256 = "00ajjrjyvjxhfxg9amsr009rwpg35r2c29679dypkxfldki81czz"; + name = "plasma-pa-5.26.0.tar.xz"; + }; + }; + plasma-remotecontrollers = { + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-pa-5.25.5.tar.xz"; - sha256 = "0g06pm1isnzx4hv6380rjpyr22s4j5iw9083s71vnl4npx28npvb"; - name = "plasma-pa-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-remotecontrollers-5.26.0.tar.xz"; + sha256 = "0gwmhsqdkr5ra2r7iwasggkxmd0xw08fm7fqvdqcp8m7p0fzc9ap"; + name = "plasma-remotecontrollers-5.26.0.tar.xz"; }; }; plasma-sdk = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-sdk-5.25.5.tar.xz"; - sha256 = "1z0cn0aiiivdb02r5vn8hm8hj9wbx053ksh5jgx2x048g67gmq96"; - name = "plasma-sdk-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-sdk-5.26.0.tar.xz"; + sha256 = "1wsgksds7ygq6d65x1yziqnicczq780gdx1z8xsfdw66gjajxf0r"; + name = "plasma-sdk-5.26.0.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-systemmonitor-5.25.5.tar.xz"; - sha256 = "0rs3avhpmfapzha8dkir9ny60ba2m92bbfv4avsd85vz5kggg29h"; - name = "plasma-systemmonitor-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-systemmonitor-5.26.0.tar.xz"; + sha256 = "1yj72qli0zjm0m20ys5djxcz2ab2v24l7grdk914x6yk4iz6pgs1"; + name = "plasma-systemmonitor-5.26.0.tar.xz"; }; }; plasma-tests = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-tests-5.25.5.tar.xz"; - sha256 = "14gdnyxl4fb5rqv1gpmp2wgx3x30pli919wjn835lbd2mf4rzwfq"; - name = "plasma-tests-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-tests-5.26.0.tar.xz"; + sha256 = "0hvklywisglygv74y2in9a8qkw00rqx78i0snw64hpmfl7n610p8"; + name = "plasma-tests-5.26.0.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-thunderbolt-5.25.5.tar.xz"; - sha256 = "1lbs4y163ccvd5zllazlp0f5v0g0rii1apbji9j7mr1n4w10wp16"; - name = "plasma-thunderbolt-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-thunderbolt-5.26.0.tar.xz"; + sha256 = "07davvxifdswm6s5v8sg3gzwd9s5b46q72c7jjnryjsb3gj0w755"; + name = "plasma-thunderbolt-5.26.0.tar.xz"; }; }; plasma-vault = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-vault-5.25.5.tar.xz"; - sha256 = "15nf4myl6sry0930m8qiixpr1i8bh1g58cy2gf304h029vr2fn5j"; - name = "plasma-vault-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-vault-5.26.0.tar.xz"; + sha256 = "0jx7i7xzi15hnwwscif0ilymfk2nrb93n8q5cjpr79gksmdwdajd"; + name = "plasma-vault-5.26.0.tar.xz"; }; }; plasma-workspace = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-workspace-5.25.5.tar.xz"; - sha256 = "0pxwg3i07sipfchn4qkmlr6kcgqbhj2s10xq69wi32x1fc13jx5x"; - name = "plasma-workspace-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-workspace-5.26.0.tar.xz"; + sha256 = "1cjnalc1yyc3ijm9idjd7bsghr34mnrk7fkk8d6qr8azqm5x67w4"; + name = "plasma-workspace-5.26.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plasma-workspace-wallpapers-5.25.5.tar.xz"; - sha256 = "0pdgg8h6zwyxf1pj241mg3hd94wh38bqxj68af5jfp10xrwkzcyr"; - name = "plasma-workspace-wallpapers-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plasma-workspace-wallpapers-5.26.0.tar.xz"; + sha256 = "10da3xpm82nn971yb9zh3qls78ngcghab3ivknqc6jbqzkk9z76v"; + name = "plasma-workspace-wallpapers-5.26.0.tar.xz"; }; }; plymouth-kcm = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/plymouth-kcm-5.25.5.tar.xz"; - sha256 = "1knywmc6wdjqfq1xqli8hyi69kj7fvc0x0s246y7nrkskfc9ah67"; - name = "plymouth-kcm-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/plymouth-kcm-5.26.0.tar.xz"; + sha256 = "0y7c8wmxb9aigrs6l1rjwhx1hxyip1g4csy121kjisdxzp4fijcd"; + name = "plymouth-kcm-5.26.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.25.5"; + version = "1-5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/polkit-kde-agent-1-5.25.5.tar.xz"; - sha256 = "1qb9nxlkgcv0c30l2vqgf9xs9d220q5pg7ikpb6zjzvj4wsvlvwd"; - name = "polkit-kde-agent-1-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/polkit-kde-agent-1-5.26.0.tar.xz"; + sha256 = "1fw8qh9yg87dq3vmxhas4qpx4zb0knf9nnz96fvcmfnnrh56ahxa"; + name = "polkit-kde-agent-1-5.26.0.tar.xz"; }; }; powerdevil = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/powerdevil-5.25.5.tar.xz"; - sha256 = "0anisirn7z8aw442npdnk1csb5ghpzj2hx49gpw4l6ijk70b76pr"; - name = "powerdevil-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/powerdevil-5.26.0.tar.xz"; + sha256 = "1bph5kg6w2rb5n2xwwh85zrar5cif6hcvwy4j8kazhqm2m507vkn"; + name = "powerdevil-5.26.0.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/qqc2-breeze-style-5.25.5.tar.xz"; - sha256 = "0z71kmhajk1jyp0f32kpl4pklbvxc34jp9jzq09gkq5vpsdccy6g"; - name = "qqc2-breeze-style-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/qqc2-breeze-style-5.26.0.tar.xz"; + sha256 = "1j6y636r4s0m30d9ynwqf9p9f85ivi5pys78y24787rh5nynq519"; + name = "qqc2-breeze-style-5.26.0.tar.xz"; }; }; sddm-kcm = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/sddm-kcm-5.25.5.tar.xz"; - sha256 = "1hvwjcgsjvlg61rfrak5111828lxf0lfh5p95d5kw1x4y2wlr756"; - name = "sddm-kcm-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/sddm-kcm-5.26.0.tar.xz"; + sha256 = "1hx6qrcb1sd7dhnsp6lma7wmrzkd348mcf3ya7v4daixyyasy7i7"; + name = "sddm-kcm-5.26.0.tar.xz"; }; }; systemsettings = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/systemsettings-5.25.5.tar.xz"; - sha256 = "0n7mf6ygi8fgn1m6pk2fadnqj1h58mxqni3h19xbi373wfypq5fl"; - name = "systemsettings-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/systemsettings-5.26.0.tar.xz"; + sha256 = "1k2gi0mrd91xcjch79rmz63imc5ngiyjx4agv5kxam0lnp010bxz"; + name = "systemsettings-5.26.0.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.25.5"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.5/xdg-desktop-portal-kde-5.25.5.tar.xz"; - sha256 = "0l3lmwihxyl65y0mkyg3afk1k6gc0ldjw2vg92g7yydbgmn39q7k"; - name = "xdg-desktop-portal-kde-5.25.5.tar.xz"; + url = "${mirror}/stable/plasma/5.26.0/xdg-desktop-portal-kde-5.26.0.tar.xz"; + sha256 = "17ig8yxm2iygyqg8r1jqbzhqp5sz71j05c7lsiilqpq5r4zng6ly"; + name = "xdg-desktop-portal-kde-5.26.0.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index c83bbcecf5678..94d8f92ac4f94 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -1,17 +1,48 @@ -{ - mkDerivation, extra-cmake-modules, kdoctools, - kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, - kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace +{ mkDerivation +, extra-cmake-modules +, kdoctools +, kcmutils +, kconfig +, kdbusaddons +, khtml +, ki18n +, kiconthemes +, kio +, kitemviews +, kservice +, kwindowsystem +, kxmlgui +, qtquickcontrols +, qtquickcontrols2 +, kactivities +, kactivities-stats +, kirigami2 +, kcrash +, plasma-workspace }: mkDerivation { pname = "systemsettings"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice - kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 - kactivities kactivities-stats kirigami2 kcrash plasma-workspace + kcmutils + kconfig + kdbusaddons + khtml + ki18n + kiconthemes + kio + kitemviews + kservice + kwindowsystem + kxmlgui + qtquickcontrols + qtquickcontrols2 + kactivities + kactivities-stats + kirigami2 + kcrash + plasma-workspace ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 00533367d4ce4..dc5728791b609 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,19 +1,49 @@ -{ - mkDerivation, lib, - extra-cmake-modules, gettext, kdoctools, - cups, libepoxy, mesa, pcre, pipewire, wayland, wayland-protocols, - kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio, - qtbase +{ mkDerivation +, lib +, extra-cmake-modules +, gettext +, kdoctools +, cups +, libepoxy +, mesa +, pcre +, pipewire +, wayland +, wayland-protocols +, kcoreaddons +, knotifications +, kwayland +, kwidgetsaddons +, kwindowsystem +, kirigami2 +, kdeclarative +, plasma-framework +, plasma-wayland-protocols +, kio +, qtbase }: mkDerivation { pname = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ - cups libepoxy mesa pcre pipewire wayland wayland-protocols + cups + libepoxy + mesa + pcre + pipewire + wayland + wayland-protocols - kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem - kirigami2 kdeclarative plasma-framework plasma-wayland-protocols + kio + kcoreaddons + knotifications + kwayland + kwidgetsaddons + kwindowsystem + kirigami2 + kdeclarative + plasma-framework + plasma-wayland-protocols ]; } diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix index 2ce32631562a5..171419a39e80b 100644 --- a/pkgs/development/compilers/ciao/default.nix +++ b/pkgs/development/compilers/ciao/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ciao"; - version = "1.21.0-m1"; + version = "1.22.0-m1"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; rev = "v${version}"; - sha256 = "sha256-o9EQS7KsoTg458Uw+1shgKE6NlZO495XE/rLq6/1S4g="; + sha256 = "sha256-p7QNSsDI8hVMPPfkX3PNjJo01hsPGKZ7jMR9Kmj2qxY="; }; configurePhase = '' diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 9d08a4b85c3cc..2e7397b26fdca 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20220905"; + version = "20221004"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-+1f6ILeoMO+6a+uL3y95PAbcyr2KXh0yMQfzsUcCg0E="; + sha256 = "sha256-r2m5nfNWg5aGJBRLVZwmgilpgc4epLWY4qx34pRIi6Q="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 329d523ddc239..fff2886246ff7 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -29,13 +29,13 @@ let hip = stdenv.mkDerivation rec { pname = "hip"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; rev = "rocm-${version}"; - hash = "sha256-QaN666Rku2Tkio2Gm5/3RD8D5JgmCZLe0Yun1fGxa8U="; + hash = "sha256-UAodlVUiTU4n/EyvTIuQekTGh4izmBjKCRXOHXVKY4M="; }; patches = [ @@ -102,20 +102,20 @@ let description = "C++ Heterogeneous-Compute Interface for Portability"; homepage = "https://github.com/ROCm-Developer-Tools/HIP"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; }; in stdenv.mkDerivation rec { pname = "hip"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; rev = "rocm-${version}"; - hash = "sha256-9YZBFn1jpOiX0X9rcpsFDNhas9vfxNkNnbsWSi7unPU="; + hash = "sha256-gZGZiDP/HbdmzLQkG9Jq9lyMP9hoD6UzTMiX9cUmQNA="; }; nativeBuildInputs = [ cmake python3 makeWrapper perl ]; @@ -133,11 +133,16 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./hipamd-config-paths.patch; - inherit llvm hip; + inherit clang llvm hip; rocm_runtime = rocm-runtime; }) ]; + prePatch = '' + sed -e 's,#!/bin/bash,#!${stdenv.shell},' \ + -i src/hip_embed_pch.sh + ''; + preConfigure = '' export HIP_CLANG_PATH=${clang}/bin export DEVICE_LIB_PATH=${rocm-device-libs}/lib @@ -189,7 +194,7 @@ stdenv.mkDerivation rec { description = "C++ Heterogeneous-Compute Interface for Portability"; homepage = "https://github.com/ROCm-Developer-Tools/hipamd"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/hip/hip-config-paths.patch b/pkgs/development/compilers/hip/hip-config-paths.patch index 71e804c744824..25fa3b8da95a8 100644 --- a/pkgs/development/compilers/hip/hip-config-paths.patch +++ b/pkgs/development/compilers/hip/hip-config-paths.patch @@ -2,7 +2,7 @@ diff --git a/hip-lang-config.cmake.in b/hip-lang-config.cmake.in index 1a72643a..7f35031f 100644 --- a/hip-lang-config.cmake.in +++ b/hip-lang-config.cmake.in -@@ -72,8 +72,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) +@@ -71,8 +71,8 @@ get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH) #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY @@ -13,19 +13,18 @@ index 1a72643a..7f35031f 100644 find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} -@@ -88,10 +88,7 @@ endif() +@@ -87,9 +87,7 @@ endif() #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH=<HSA_PATH> find_path(HSA_HEADER hsa/hsa.h PATHS - "${_IMPORT_PREFIX}/../include" #FILE_REORG_BACKWARD_COMPATIBILITY - "${_IMPORT_PREFIX}/include" - "${ROCM_PATH}/include" -- /opt/rocm/include + "@rocm_runtime@/include" ) - if (HSA_HEADER-NOTFOUND) -@@ -99,7 +96,7 @@ if (HSA_HEADER-NOTFOUND) + if (NOT HSA_HEADER) +@@ -97,7 +94,7 @@ if (HSA_HEADER-NOTFOUND) endif() get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) diff --git a/pkgs/development/compilers/hip/hipamd-config-paths.patch b/pkgs/development/compilers/hip/hipamd-config-paths.patch index 605b73f75c7a2..78838836e9aa4 100644 --- a/pkgs/development/compilers/hip/hipamd-config-paths.patch +++ b/pkgs/development/compilers/hip/hipamd-config-paths.patch @@ -7,7 +7,7 @@ index 89d1224e..120b68c6 100755 endif() else() - set(HIP_CLANG_ROOT "${ROCM_PATH}/llvm") -+ set(HIP_CLANG_ROOT "@llvm@") ++ set(HIP_CLANG_ROOT "@clang@") endif() if(NOT HIP_CXX_COMPILER) set(HIP_CXX_COMPILER ${CMAKE_CXX_COMPILER}) @@ -45,3 +45,29 @@ index 89d1224e..120b68c6 100755 ) endif() endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 83866d83..4125d3aa 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -178,7 +178,7 @@ if(__HIP_ENABLE_PCH) + ${ROCM_PATH}/llvm) + # find_package(LLVM) returns the lib/cmake/llvm location. We require the root. + if(NOT DEFINED HIP_LLVM_ROOT) +- set(HIP_LLVM_ROOT "${LLVM_DIR}/../../..") ++ set(HIP_LLVM_ROOT "@clang@") + endif() + + execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/hip_embed_pch.sh ${HIP_COMMON_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC) +diff --git a/src/hip_embed_pch.sh b/src/hip_embed_pch.sh +index 0a1572b2..aa855d63 100755 +--- a/src/hip_embed_pch.sh ++++ b/src/hip_embed_pch.sh +@@ -149,7 +149,7 @@ EOF + + $LLVM_DIR/bin/clang -cc1 -O3 -emit-pch -triple amdgcn-amd-amdhsa -aux-triple x86_64-unknown-linux-gnu -fcuda-is-device -std=c++17 -fgnuc-version=4.2.1 -o $tmp/hip_wave64.pch -x hip-cpp-output - <$tmp/pch_wave64.cui && + +- $LLVM_DIR/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && ++ @llvm@/bin/llvm-mc -o hip_pch.o $tmp/hip_pch.mcin --filetype=obj && + + rm -rf $tmp + } diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index a3e50ab4761d8..a952615a6c240 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: let - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-sudH8hnjReyuCFm2CBEPd8W88SjAARgCd1MTIJaDjTI="; + hash = "sha256-MN7W4Gl6+a1nCozdn9gMzIXOiBPquoOP87x26boeSCA="; }; in rec { clang = wrapCCWith rec { diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index bac99fd79ac8c..601f05a51bb0a 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -26,8 +26,8 @@ let }; "2.13" = { - version = "2.13.8"; - sha256 = "LLMdhGnGUYOfDpyDehqwZVDQMXJnUvVJBr4bneATFM8="; + version = "2.13.10"; + sha256 = "sha256-sBRhWZzQeGBCxktTN5D0XlG6u5HFLcRl2EaDjpcBnMQ="; pname = "scala_2_13"; }; }; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 43ff938598d58..6db4b9c959b1e 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -93,18 +93,18 @@ let in rec { vala_0_48 = generic { - version = "0.48.24"; - sha256 = "NknvhFc7aGX8NHBkDuYDcgCZ65FbOfqtGbdJjeGn3yQ="; + version = "0.48.25"; + sha256 = "UMs8Xszdx/1DaL+pZBSlVgReedKxWmiRjHJ7jIOxiiQ="; }; vala_0_54 = generic { - version = "0.54.8"; - sha256 = "7fs+eUhqS/SM666pKR5X/HfakyK2lh6VSd9tlz0EvIA="; + version = "0.54.9"; + sha256 = "hXLA6Nd9eMFZfVFgCPBUDH50leA10ou0wlzJk+U85LQ="; }; vala_0_56 = generic { - version = "0.56.2"; - sha256 = "Zslhm7F4Wf0aw6ugpXlwYT44/Soe4wVBF0JgyfuQEkw="; + version = "0.56.3"; + sha256 = "4QZiIb97icsfpzJ6OIhkXLM7YE3jv0WqgRMv0EC2mb8="; }; vala = vala_0_56; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 44f56d366022d..34c76b48384e2 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -72,18 +72,27 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.20"; + version = "0.22"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-0oDF6wLcWlDG2hWFjIL+oQmICQl/H6YAwDzgTiuF298="; + hash = "sha256-us4GiulqkzcwD2iuNXB5eTd3iqgUdvj9Nd2p/9TJerQ="; }; enableParallelBuilding = true; nativeBuildInputs = [ pkg-config bison flex ]; - buildInputs = [ tcl readline libffi python3 protobuf zlib ]; + buildInputs = [ + tcl + readline + libffi + protobuf + zlib + (python3.withPackages (pp: with pp; [ + click + ])) + ]; makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; diff --git a/pkgs/development/coq-modules/relation-algebra/default.nix b/pkgs/development/coq-modules/relation-algebra/default.nix index 204be2931a50f..d2124d56f3f5a 100644 --- a/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/pkgs/development/coq-modules/relation-algebra/default.nix @@ -10,6 +10,7 @@ mkCoqDerivation { then "v.${v}" else "v${v}"; + release."1.7.8".sha256 = "sha256-RITFd3G5TjY+rFzW073Ao1AGU+u6OGQyQeGHVodAXnA="; release."1.7.7".sha256 = "sha256:1dff3id6nypl2alhk9rcifj3dab0j78dym05blc525lawsmc26l2"; release."1.7.6".sha256 = "sha256:02gsj06zcy9zgd0h1ibqspwfiwm36pkkgg9cz37k4bxzcapxcr6w"; release."1.7.5".sha256 = "sha256-XdO8agoJmNXPv8Ho+KTlLCB4oRlQsb0w06aM9M16ZBU="; @@ -20,6 +21,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = isEq "8.16"; out = "1.7.8"; } { case = isEq "8.15"; out = "1.7.7"; } { case = isEq "8.14"; out = "1.7.6"; } { case = isEq "8.13"; out = "1.7.5"; } diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/development/embedded/arduino/arduino-language-server/default.nix new file mode 100644 index 0000000000000..6ed310649368f --- /dev/null +++ b/pkgs/development/embedded/arduino/arduino-language-server/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "arduino-language-server"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "arduino"; + repo = "arduino-language-server"; + rev = version; + hash = "sha256-7xuVCD27gE8uDFBTQgBwH8bx8OWc9Lj71o27FYOSiTY="; + }; + + subPackages = [ "." ]; + + vendorHash = "sha256-Xa26ilo95sQ/6dGvl4gB2bb0vzWXr+WPKLezAnZPeqM="; + + doCheck = false; + + ldflags = [ + "-s" + "-w" + "-X github.com/arduino/arduino-language-server/version.versionString=${version}" + "-X github.com/arduino/arduino-language-server/version.commit=unknown" + ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "An Arduino Language Server based on Clangd to Arduino code autocompletion"; + license = licenses.asl20; + maintainers = with maintainers; [ BattleCh1cken ]; + }; +} diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 0c12426434c5f..4dc6ca80d125c 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,11 +8,12 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2022-07-22"; + version = "unstable-2022-10-10"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e00ab24821be85cb025432f8e9c4ff56dbb00a81.tar.gz"; - sha256 = "11a5l0fdj67bpqv30af4v5zxr3c7n9p81pfs4c0d3w65bmr9sa1y"; + url = "https://github.com/NixOS/cabal2nix/archive/b3ae6f9240d07ba103f1eb7ab22f6055e9cdb7dc.tar.gz"; + sha256 = "0ym6lyp4br57442b6a9cg9bczbjqz8nz984rxwiacldqzndk8jbr"; }; + postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1f056ac25ef3c..22e0152547ed6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -60,6 +60,13 @@ self: super: { ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-vis = disableLibraryProfiling super.ghc-vis; + # Patch providing GHC9 compat, can be removed once the following gets released: + # > https://github.com/adinapoli/snaplet-purescript/pull/25 + snaplet-purescript = appendPatch (fetchpatch { + url = "https://github.com/adinapoli/snaplet-purescript/commit/4c7457d9357558524d4d19ff7c7f13f85b442539.patch"; + sha256 = "sha256-wpNvCO6txEvSv8LjQaaEIbBBPJnFaMpFx5ER8BT9lXo="; + }) super.snaplet-purescript; + # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present # and the upper bound doesn't exist in code anymore: @@ -99,7 +106,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0dw89528kzbisbilyx6ggrh25vslivyylr8xk4dc4cikhd6dkm7p"; + sha256 = "09ksaaf5kxpskq2hmi1ad35k15cnhn86j795iw6nk86gbvx5hrap"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -247,7 +254,7 @@ self: super: { # 2020-06-05: HACK: does not pass own build suite - `dontCheck` # 2022-06-17: Use hnix-store 0.5 until hnix 0.17 - hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck ( + hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (dontCheck ( super.hnix.overrideScope (hself: hsuper: { hnix-store-core = hself.hnix-store-core_0_5_0_0; hnix-store-remote = hself.hnix-store-remote_0_5_0_0; @@ -719,7 +726,7 @@ self: super: { # updated dependencies (haskeline and megaparsec) which can be # removed when the next idris release (1.3.4 probably) comes # around. - idris = generateOptparseApplicativeCompletion "idris" + idris = self.generateOptparseApplicativeCompletions [ "idris" ] (doJailbreak (dontCheck super.idris)); # https://github.com/pontarius/pontarius-xmpp/issues/105 @@ -998,14 +1005,14 @@ self: super: { servant-auth-server = doJailbreak super.servant-auth-server; # Generate cli completions for dhall. - dhall = generateOptparseApplicativeCompletion "dhall" super.dhall; + dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall; # For reasons that are not quire clear 'dhall-json' won't compile without 'tasty 1.4' due to its tests # https://github.com/commercialhaskell/stackage/issues/5795 # This issue can be mitigated with 'dontCheck' which skips the tests and their compilation. - dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); - dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix; - dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; - dhall-nixpkgs = generateOptparseApplicativeCompletion "dhall-to-nixpkgs" super.dhall-nixpkgs; + dhall-json = self.generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); + dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] super.dhall-nix; + dhall-yaml = self.generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; + dhall-nixpkgs = self.generateOptparseApplicativeCompletions [ "dhall-to-nixpkgs" ] super.dhall-nixpkgs; # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc; @@ -1014,7 +1021,7 @@ self: super: { hgettext = doJailbreak super.hgettext; stack = - generateOptparseApplicativeCompletion "stack" + self.generateOptparseApplicativeCompletions [ "stack" ] # stack has a bunch of constraints in its .cabal file that don't seem to be necessary (doJailbreak (super.stack.overrideScope (self: super: { @@ -1067,7 +1074,7 @@ self: super: { hoopl = dontCheck super.hoopl; # Generate shell completion for spago - spago = generateOptparseApplicativeCompletion "spago" super.spago; + spago = self.generateOptparseApplicativeCompletions [ "spago" ] super.spago; # 2020-06-05: HACK: Package can not pass test suite, # Upstream Report: https://github.com/kcsongor/generic-lens/issues/83 @@ -1380,6 +1387,13 @@ self: super: { }) ] super.svgcairo; + # Espial is waiting for a hackage release to be compatible with GHC 9.X. + espial = appendPatch (fetchpatch { + url = "https://github.com/jonschoning/espial/commit/70177f9efb9666c3616e8a474681d3eb763d0e84.patch"; + sha256 = "sha256-aJtwZGp9DUpACBV0WYRL7k32m6qWf5vq6eKBFq/G23s="; + excludes = ["package.yaml" "stack.yaml" "stack.yaml.lock"]; + }) super.espial; + # 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 massiv = dontCheck super.massiv; @@ -1505,7 +1519,7 @@ self: super: { # PATH. # - Patch can be removed on next package set bump update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; - in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal + in self.generateOptparseApplicativeCompletions [ "update-nix-fetchgit" ] (overrideCabal (drv: { buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ]; postInstall = drv.postInstall or "" + '' @@ -1633,7 +1647,9 @@ self: super: { http-media = doJailbreak super.http-media; # 2022-03-19: strict upper bounds https://github.com/poscat0x04/hinit/issues/2 - hinit = doJailbreak (generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_2; })); + hinit = doJailbreak + (self.generateOptparseApplicativeCompletions [ "hi" ] + (super.hinit.override { haskeline = self.haskeline_0_8_2; })); # 2022-03-19: Keeping jailbreak because of tons of strict bounds: https://github.com/snapframework/snap/issues/220 snap = doJailbreak super.snap; @@ -1676,7 +1692,7 @@ self: super: { # waiting for aeson bump servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core; - hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; + hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] super.hercules-ci-agent; # Test suite doesn't compile with aeson 2.0 # https://github.com/hercules-ci/hercules-ci-agent/pull/387 @@ -1687,7 +1703,7 @@ self: super: { (overrideCabal (drv: { hydraPlatforms = super.hercules-ci-cli.meta.platforms; })) # See hercules-ci-optparse-applicative in non-hackage-packages.nix. (addBuildDepend super.hercules-ci-optparse-applicative) - (generateOptparseApplicativeCompletion "hci") + (self.generateOptparseApplicativeCompletions [ "hci" ]) ]; pipes-aeson = appendPatches [ @@ -2571,7 +2587,7 @@ in { # likely be removed when purescript-0.14.6 is released. doJailbreak # Generate shell completions - (generateOptparseApplicativeCompletion "purs") + (self.generateOptparseApplicativeCompletions [ "purs" ]) ]; purescript-cst = purescriptStOverride super.purescript-cst; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 1eb8e4af80f7b..85708b5e7774c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -90,7 +90,7 @@ self: super: { }) (doJailbreak super.language-haskell-extract); # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. - hnix = generateOptparseApplicativeCompletion "hnix" + hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (overrideCabal (drv: { # executable is allowed for ghc >= 8.10 and needs repline executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 071cdeaa50302..1c1579566a9af 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -110,9 +110,6 @@ self: super: { # of issues with Cabal 3.x. darcs = dontDistribute super.darcs; - # cabal-fmt requires Cabal3 - cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; - # liquidhaskell does not support ghc version 8.8.x. liquid = markBroken super.liquid; liquid-base = markBroken super.liquid-base; 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 9cc6a3ecd2432..8951319e1bbbc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -147,4 +147,7 @@ self: super: { # 2022-05-31: weeder 2.3.0 requires GHC 9.2 weeder = doDistribute self.weeder_2_3_1; + + # Restrictive upper bound on base and containers + sv2v = doJailbreak super.sv2v; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 7dd63c579934b..e1c5a414fef5c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -226,4 +226,7 @@ self: super: { inline-c-cpp = (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x) super.inline-c-cpp; + + relude = dontCheck self.relude_1_1_0_0; + hermes-json = doJailbreak super.hermes-json; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 6d2335fefe73c..b5bf696cc7615 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -74,7 +74,12 @@ in { # removed after https://github.com/NixOS/cabal2nix/pull/571 is merged. # TODO(@sternenseemann): merge and release a fixed version distribution-nixpkgs = dontCheck super.distribution-nixpkgs; - cabal2nix = dontCheck super.cabal2nix; + cabal2nix = + # cabal2nix depends on foundation, which is broken on aarch64-linux. + # https://github.com/haskell-foundation/foundation/issues/571 + overrideCabal + (drv: { badPlatforms = [ "aarch64-linux" ]; }) + (dontCheck super.cabal2nix); cabal2nix-unstable = dontCheck super.cabal2nix-unstable; # build fails on due to ghc api changes @@ -224,4 +229,25 @@ in { # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; + # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260 + ghc-check = dontHaddock super.ghc-check; + + # 2022-10-06: plugins disabled for hls 1.8.0.0 based on + # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers + haskell-language-server = super.haskell-language-server.override { + hls-refactor-plugin = null; + hls-class-plugin = null; + hls-eval-plugin = null; + hls-floskell-plugin = null; + hls-fourmolu-plugin = null; + hls-gadt-plugin = null; + hls-hlint-plugin = null; + hls-ormolu-plugin = null; + hls-rename-plugin = null; + hls-stylish-haskell-plugin = null; + hls-tactics-plugin = null; + hls-haddock-comments-plugin = null; + hls-retrie-plugin = null; + hls-splice-plugin = null; + }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 04684effd6fdc..babbe6a44456b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1341,7 +1341,6 @@ broken-packages: - ert - escape-artist - escoger - - espial - esqueleto-pgcrypto - ess - essence-of-live-coding-gloss-example @@ -1769,7 +1768,6 @@ broken-packages: - glue - gluturtle - g-npm - - gnuidn - goa - goal-core - goatee @@ -2001,7 +1999,6 @@ broken-packages: - haskell-igraph - haskell-import-graph - haskell-in-space - - haskellish - haskell-kubernetes - HaskellLM - haskell-lsp @@ -2064,6 +2061,7 @@ broken-packages: - hasql-resource-pool - hasql-simple - hasql-streams-example + - hasql-transaction-io - hastache - haste - haste-prim @@ -3965,6 +3963,7 @@ broken-packages: - PortFusion - portray-pretty - portray-prettyprinter + - posit - positron - posix-acl - posix-api @@ -4430,6 +4429,8 @@ broken-packages: - sandman - sarasvati - sat + - satchmo-backends + - satchmo-minisat - Saturnin - satyros - savage @@ -4472,6 +4473,7 @@ broken-packages: - sdl2-cairo-image - sdl2-compositor - sdl2-fps + - SDL-mpeg - sdr - seacat - seakale @@ -4726,7 +4728,6 @@ broken-packages: - snaplet-mandrill - snaplet-mongodb-minimalistic - snaplet-postgresql-simple - - snaplet-purescript - snaplet-redis - snaplet-sass - snaplet-scoped-session @@ -4943,7 +4944,6 @@ broken-packages: - supervisors - supplemented - surjective - - sv2v - sv-core - SVD2HS - svfactor diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 21009fa9cb215..ca5decb685b5b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -161,6 +161,7 @@ extra-packages: - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 + - ghc-exactprint == 1.5.0 # 2022-10-06: newer versions of ghc-exactprint require ghc 9.4.2 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 40512dd991f87..081be641891b0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.25 +# Stackage LTS 19.27 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 677566d60fb63..7343aeb944006 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1984,6 +1984,11 @@ dont-distribute-packages: - hasql-cursor-query - hasql-postgres - hasql-postgres-options + - hasql-streams-conduit + - hasql-streams-core + - hasql-streams-pipes + - hasql-streams-streaming + - hasql-streams-streamly - hasqlator-mysql - hasqly-mysql - hastache-aeson @@ -2221,7 +2226,6 @@ dont-distribute-packages: - hws - hwsl2-bytevector - hwsl2-reducers - - hxmppc - hxournal - hxt-binary - hxt-filter @@ -2805,7 +2809,6 @@ dont-distribute-packages: - network-minihttp - network-netpacket - network-pgi - - network-protocol-xmpp - network-rpca - network-stream - network-topic-models @@ -3328,6 +3331,7 @@ dont-distribute-packages: - sarsi - sasl - sat-micro-hs + - satchmo-examples - satchmo-funsat - satchmo-toysat - sauron diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2b04d881b01de..c29963bb1d1e9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -95,12 +95,12 @@ self: super: builtins.intersectAttrs super { sfml-audio = appendConfigureFlag "--extra-include-dirs=${pkgs.openal}/include/AL" super.sfml-audio; # avoid compiling twice by providing executable as a separate output (with small closure size) - niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv); + niv = enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv); ghcid = enableSeparateBinOutput super.ghcid; - ormolu = generateOptparseApplicativeCompletion "ormolu" (enableSeparateBinOutput super.ormolu); + ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu); # Generate shell completion. - cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; + cabal2nix = self.generateOptparseApplicativeCompletions [ "cabal2nix" ] super.cabal2nix; arbtt = overrideCabal (drv: { # The test suite needs the packages's executables in $PATH to succeed. @@ -814,7 +814,7 @@ self: super: builtins.intersectAttrs super { install -D man/pnbackup.1 $out/share/man/man1/pnbackup.1 '' + (drv.postInstall or ""); }) - (generateOptparseApplicativeCompletion "pnbackup" super.pinboard-notes-backup); + (self.generateOptparseApplicativeCompletions [ "pnbackup" ] super.pinboard-notes-backup); # Pass the correct libarchive into the package. streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; }; @@ -875,7 +875,7 @@ self: super: builtins.intersectAttrs super { }) super.tophat; # Runtime dependencies and CLI completion - nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal + nvfetcher = self.generateOptparseApplicativeCompletions [ "nvfetcher" ] (overrideCabal (drv: { # test needs network doCheck = false; @@ -889,7 +889,7 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend pkgs.postgresql super.rel8; - cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); + cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; }); hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; }; hercules-ci-cnix-expr = @@ -917,7 +917,7 @@ self: super: builtins.intersectAttrs super { # to arbitrary files in $HOME. This doesn't either not achieve anything # or even fail, so we prevent it and install everything necessary ourselves. # See also: https://hackage.haskell.org/package/cli-setup-0.2.1.4/docs/src/Distribution.CommandLine.html#setManpathGeneric - ats-format = generateOptparseApplicativeCompletion "atsfmt" ( + ats-format = self.generateOptparseApplicativeCompletions [ "atsfmt" ] ( justStaticExecutables ( overrideCabal (drv: { # use vanilla Setup.hs diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 08b21ad0bd79a..9caa2a21956cf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -18080,6 +18080,8 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -21574,8 +21576,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.10.3.1"; - sha256 = "1ncjrn2dcxpi8gykn0axi7wwi35frpp5wqvbm7zyd2pp2wfi2f3i"; + version = "0.10.4"; + sha256 = "1bdab2pbxyyxlmvjicxd2mpa4lwf29s4kpgp2xv7nvwgfbazk9w3"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -25864,8 +25866,8 @@ self: { }: mkDerivation { pname = "aeson-match-qq"; - version = "1.5.3"; - sha256 = "0j4qddxxr0pfjz2d4hwvxdgmb4vb343ysw6g1fms4shdk41h1kz5"; + version = "1.6.0"; + sha256 = "14phbs7m1zs7dlc1cpbmawlzq99h9bz6wq5shdsllg5mwzzhskia"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive containers either haskell-src-meta pretty scientific template-haskell text @@ -34715,8 +34717,8 @@ self: { }: mkDerivation { pname = "arrayfire"; - version = "0.6.0.0"; - sha256 = "0vm1m3bc3c29dwbpzkp0pnxnz7rah8gqrgc0p4haivm5w4r10bf8"; + version = "0.7.0.0"; + sha256 = "0id1safpvd6lmjddgnkw94i6c586ba71yid4xfjq06wjx52l33rk"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -34724,8 +34726,7 @@ self: { librarySystemDepends = [ af ]; executableHaskellDepends = [ base directory parsec text vector ]; testHaskellDepends = [ - base directory hspec hspec-discover QuickCheck quickcheck-classes - vector + base directory hspec QuickCheck quickcheck-classes vector ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings to the ArrayFire general-purpose GPU library"; @@ -35013,8 +35014,8 @@ self: { pname = "ascii"; version = "1.2.3.0"; sha256 = "0s6w1wv6hjx1abz038cw7fyl8ilbs3cxmcs989c3hh9659l82p2j"; - revision = "1"; - editedCabalFile = "1fxvasc860zdnbycblvv3b5ak5dzz1qvpjijzbn8zdc0hng4gw4v"; + revision = "2"; + editedCabalFile = "16b1dmjl0p2zdn05h2iwm1ymhrvgr19c1gzankrn0i7jj89nf979"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-numbers ascii-predicates ascii-superset ascii-th base bytestring text @@ -35053,6 +35054,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-case_1_0_0_11" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.0.11"; + sha256 = "03rhq303igzvx9yil5qli2ga9iz47psrlnbb494785w9whwayxq1"; + revision = "1"; + editedCabalFile = "0a4nz34a5034lkq42q2l7xqdkjpakcy44syqy0gvx8p6h83ccrb1"; + libraryHaskellDepends = [ ascii-char base hashable ]; + testHaskellDepends = [ ascii-char base ]; + description = "ASCII letter case"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-char" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { @@ -35065,6 +35081,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-char_1_0_0_15" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.0.15"; + sha256 = "10vvhpl7y1gpw7gw2hpcckl0pmx7rkn35zy6yl6c9mx0hib0745a"; + revision = "1"; + editedCabalFile = "0b73pm9z5k3xbpn49fz4m8jwzw3r4z0l2v4alinf5l7n6vx4wvj0"; + libraryHaskellDepends = [ base hashable ]; + testHaskellDepends = [ base ]; + description = "A Char type representing an ASCII character"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-cows" = callPackage ({ mkDerivation, base, random-extras, random-fu, text }: mkDerivation { @@ -35108,6 +35139,21 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-group_1_0_0_13" = callPackage + ({ mkDerivation, ascii-char, base, hashable, hedgehog }: + mkDerivation { + pname = "ascii-group"; + version = "1.0.0.13"; + sha256 = "1xynfvrr8lwmrxqww2c2bwp6r3162mqgmx7hljwmbvdmnc0na30d"; + revision = "1"; + editedCabalFile = "0snp4qfj20jjchhhf7v8lyssjydv57sd2wy88fbc0aaba4c5lq7y"; + libraryHaskellDepends = [ ascii-char base hashable ]; + testHaskellDepends = [ ascii-char base hedgehog ]; + description = "ASCII character groups"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-holidays" = callPackage ({ mkDerivation, base, random, random-shuffle, terminfo, time }: mkDerivation { @@ -35152,8 +35198,8 @@ self: { pname = "ascii-numbers"; version = "1.1.0.0"; sha256 = "041qyhgksqchj3x09fbirxba7s31aicaqnk8185g2l70zgxjz6iv"; - revision = "1"; - editedCabalFile = "05w36jqzy1r6bhp6gsnbfgbx5765w6bxa511j2z0z5wrzzdbnqp9"; + revision = "2"; + editedCabalFile = "0nw6iy42ql53gl4i74ilmdar5r4l2wbn5ihv1yqbqm7rm9bqda8p"; libraryHaskellDepends = [ ascii-case ascii-char ascii-superset base bytestring hashable text ]; @@ -35184,8 +35230,8 @@ self: { pname = "ascii-predicates"; version = "1.0.1.0"; sha256 = "1zqlly878qlrkjw2m4mgs4cgw6xspn0alx6xnvnrp1r2b412ykyn"; - revision = "1"; - editedCabalFile = "16l7vij4k3qnrny8sfrg90b5m60ixqwa7shb23yq467y13x4s7da"; + revision = "2"; + editedCabalFile = "15jb8yq55dwwbbq0k0vzcznsk4xvxylm61i2jspyhjhgzq9w34ik"; libraryHaskellDepends = [ ascii-char base ]; testHaskellDepends = [ ascii-char base hedgehog ]; description = "Various categorizations of ASCII characters"; @@ -35245,8 +35291,8 @@ self: { pname = "ascii-superset"; version = "1.0.1.13"; sha256 = "0pf1awrx0bfpgyc96r1ycybgpy801iqxr8qf3vp9pvbnfava1v8s"; - revision = "1"; - editedCabalFile = "06j1anb8h5lppa4mlk67sbx1xkfra1v3717lj437i12bm9pf0bap"; + revision = "2"; + editedCabalFile = "1551j1x284zdv9w233ma5r15bwmwizh5zi2ifcsp86d09c38505n"; libraryHaskellDepends = [ ascii-char base bytestring hashable text ]; @@ -35292,6 +35338,27 @@ self: { license = lib.licenses.asl20; }) {}; + "ascii-th_1_0_0_11" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, bytestring + , hedgehog, template-haskell, text + }: + mkDerivation { + pname = "ascii-th"; + version = "1.0.0.11"; + sha256 = "14a50pxmri17nch7bcmrdflrqq5qq2z5012aiqh260iq4qsw74xq"; + revision = "1"; + editedCabalFile = "037i6n02c9xsxj5zz1nxihwgzhksbzjzd0s2a2m8ndsq3a5hgc61"; + libraryHaskellDepends = [ + ascii-char ascii-superset base template-haskell + ]; + testHaskellDepends = [ + ascii-char ascii-superset base bytestring hedgehog text + ]; + description = "Template Haskell support for ASCII"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -36651,8 +36718,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.5.0.2"; - sha256 = "1whx2yyjxc3b4s7nrwrxvyz9bwy7n15gmr9m6lcs3zxr7dvwvlmk"; + version = "3.5.0.3"; + sha256 = "0dnaa14jwsi60b9jxgpm60nkw9q8zljz5vsl93dffqnr32znryss"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -67178,6 +67245,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "construct_0_3_1_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, cabal-doctest + , cereal, directory, doctest, filepath, incremental-parser + , input-parsers, markdown-unlit, monoid-subclasses, parsers + , rank2classes, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "construct"; + version = "0.3.1.1"; + sha256 = "0ja4xxlr9pyd2gq3w07847zz3glcx3ygd9bygjhr3ppi2n3fiwx0"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base bytestring cereal incremental-parser input-parsers + monoid-subclasses parsers rank2classes text + ]; + testHaskellDepends = [ + attoparsec base bytestring cereal directory doctest filepath + incremental-parser monoid-subclasses rank2classes tasty tasty-hunit + text + ]; + testToolDepends = [ markdown-unlit ]; + description = "Haskell version of the Construct library for easy specification of file formats"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "constructible" = callPackage ({ mkDerivation, base, binary-search, complex-generic , integer-roots @@ -68552,6 +68646,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-data_0_3_8_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, hourglass, prettyprinter, scientific, text, time + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.3.8.0"; + sha256 = "16gkll00awgb0l5mdpxd33f3szgvfsbwxlh3nkj1jsdkjrir4ggc"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable hourglass + prettyprinter scientific text time unordered-containers uuid vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -68591,22 +68703,22 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_5_2_0" = callPackage - ({ mkDerivation, async, base, bytestring, core-data, core-text - , directory, exceptions, filepath, fsnotify, hashable, hourglass - , mtl, prettyprinter, safe-exceptions, stm, template-haskell + "core-program_0_6_0_1" = callPackage + ({ mkDerivation, base, bytestring, core-data, core-text, directory + , exceptions, filepath, fsnotify, hashable, hourglass, mtl + , prettyprinter, safe-exceptions, stm, template-haskell , terminal-size, text, text-short, transformers, typed-process , unix }: mkDerivation { pname = "core-program"; - version = "0.5.2.0"; - sha256 = "1yagjv69q49lchbp6qb51qb5s6pmszz522y0r645kmqp7chb9nqf"; + version = "0.6.0.1"; + sha256 = "1fmqq65aq6z99jjw11csqpzxwgn1l54nrf2lylqvvcd3x6ysay3h"; libraryHaskellDepends = [ - async base bytestring core-data core-text directory exceptions - filepath fsnotify hashable hourglass mtl prettyprinter - safe-exceptions stm template-haskell terminal-size text text-short - transformers typed-process unix + base bytestring core-data core-text directory exceptions filepath + fsnotify hashable hourglass mtl prettyprinter safe-exceptions stm + template-haskell terminal-size text text-short transformers + typed-process unix ]; description = "Opinionated Haskell Interoperability"; license = lib.licenses.mit; @@ -68614,17 +68726,17 @@ self: { }) {}; "core-telemetry" = callPackage - ({ mkDerivation, async, base, bytestring, core-data, core-program + ({ mkDerivation, base, bytestring, core-data, core-program , core-text, exceptions, http-streams, io-streams, mtl , network-info, random, safe-exceptions, scientific, stm , template-haskell, text, time, unix, uuid-types, zlib }: mkDerivation { pname = "core-telemetry"; - version = "0.2.6.0"; - sha256 = "04a0blnkap9mdlryikvn5dri60k0dvhkbbp9112p8417ywp0gsh7"; + version = "0.2.6.1"; + sha256 = "0i74ij12q99dap4yvwf4rkirq9wwib9w6ygwav29j2rv8rni6pim"; libraryHaskellDepends = [ - async base bytestring core-data core-program core-text exceptions + base bytestring core-data core-program core-text exceptions http-streams io-streams mtl network-info random safe-exceptions scientific stm template-haskell text time unix uuid-types zlib ]; @@ -80191,8 +80303,8 @@ self: { pname = "diagrams-graphviz"; version = "1.4.1.1"; sha256 = "0lscrxd682jvyrl5bj4dxp7593qwyis01sl0p4jm2jfn335wdq40"; - revision = "2"; - editedCabalFile = "0cxg21lsahkrf129k5h82d4znm3861dqc597mgzwyl5f0ywhllzr"; + revision = "3"; + editedCabalFile = "1rp3rxpv0dp810rsxwqj8n8lgx60pyh6dxyc27lflp1ag38v8887"; libraryHaskellDepends = [ base containers diagrams-lib fgl graphviz split ]; @@ -92299,8 +92411,6 @@ self: { ]; description = "Espial is an open-source, web-based bookmarking server"; license = lib.licenses.agpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "esqueleto" = callPackage @@ -93577,37 +93687,36 @@ self: { }) {}; "eventuo11y" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, resourcet - , text, time, unliftio-core, uuid + ({ mkDerivation, aeson, base, bytestring, exceptions, primitive + , resourcet, text, time, unliftio-core, uuid }: mkDerivation { pname = "eventuo11y"; - version = "0.1.0.1"; - sha256 = "1mrjmyn2dscn05n6il1h0n09kim1mihh9v6jimvipsfbm4kjxsb9"; + version = "0.3.2.0"; + sha256 = "1dx6q09bymvr7f4l7bnmb8c9gn46yp95qfhf9dml5i33x4scr2s8"; libraryHaskellDepends = [ - aeson base bytestring exceptions resourcet text time unliftio-core - uuid + aeson base bytestring exceptions primitive resourcet text time + unliftio-core uuid ]; description = "An event-oriented observability library"; license = lib.licenses.asl20; }) {}; "eventuo11y-batteries" = callPackage - ({ mkDerivation, aeson, async, base, binary, bytestring - , case-insensitive, containers, eventuo11y, exceptions, http-media - , http-types, monad-control, mtl, network, semigroupoids - , servant-client, servant-client-core, text, transformers-base - , unliftio-core, wai, warp + ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive + , containers, eventuo11y, exceptions, http-media, http-types + , monad-control, mtl, network, semigroupoids, servant-client + , servant-client-core, text, transformers-base, wai, warp }: mkDerivation { pname = "eventuo11y-batteries"; - version = "0.1.0.1"; - sha256 = "135976nic8ficph20dani0m4clsv361324jwmhw8hywrla56mz36"; + version = "0.2.1.0"; + sha256 = "0hdhryk7srb0dcjbqfk6ah2l7x3bbl3rqhncwx0wc3nfcx97dr0v"; libraryHaskellDepends = [ - aeson async base binary bytestring case-insensitive containers - eventuo11y exceptions http-media http-types monad-control mtl - network semigroupoids servant-client servant-client-core text - transformers-base unliftio-core wai warp + aeson base binary bytestring case-insensitive containers eventuo11y + exceptions http-media http-types monad-control mtl network + semigroupoids servant-client servant-client-core text + transformers-base wai warp ]; description = "Grab bag of eventuo11y-enriched functionality"; license = lib.licenses.asl20; @@ -99998,6 +100107,34 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "flat_0_5" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, filepath, ghc-prim, hashable, list-t, mono-traversable + , pretty, primitive, QuickCheck, quickcheck-text, tasty + , tasty-hunit, tasty-quickcheck, text, timeit, unordered-containers + , vector + }: + mkDerivation { + pname = "flat"; + version = "0.5"; + sha256 = "1338h8w2s1vpjl019rv1qmc5s0xlpn3jdi4jzycc805l9cxdqa7w"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist ghc-prim hashable + list-t mono-traversable pretty primitive text unordered-containers + vector + ]; + testHaskellDepends = [ + array base bytestring containers deepseq dlist filepath ghc-prim + list-t mono-traversable pretty QuickCheck quickcheck-text tasty + tasty-hunit tasty-quickcheck text timeit unordered-containers + vector + ]; + description = "Principled and efficient bit-oriented binary serialization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "flat-maybe" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -109654,6 +109791,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-exactprint_1_6_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghc-exactprint"; + version = "1.6.0"; + sha256 = "1yj0vn42sysilikylabnncq2g005mnmpf8n7sn0a6lphpcv9gdcf"; + isLibrary = true; + isExecutable = true; + description = "ExactPrint for GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-gc-hook" = callPackage ({ mkDerivation, base, clock }: mkDerivation { @@ -110679,8 +110829,8 @@ self: { ({ mkDerivation, base, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.8.0.0"; - sha256 = "1xk6ircvrx0dy0dff5vlxz7sjf1i1dkpkd3vaifc2sifmb9m5j3y"; + version = "0.8.3.0"; + sha256 = "0qrb8zz93rb25p8f4dhh2bxx3vb0yc92rx59xbh23ixijiszhas8"; libraryHaskellDepends = [ base ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -113257,8 +113407,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20220927"; - sha256 = "1bqcaddw47g6i3z9g0iym5x7zy1q8fsirzqnjsa63n2bwm6zzplc"; + version = "10.20221003"; + sha256 = "0nyhmwkzd8gyd9mvlnjyalfix32x5y4g89d5g36jp3jp1bkwg9i4"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -115670,6 +115820,8 @@ self: { pname = "gnuidn"; version = "0.2.2"; sha256 = "0vxrcp9xz5gsvx60k12991zn5c9nk3fgg0yw7dixbsjcfqgnnd31"; + revision = "1"; + editedCabalFile = "11aq4k74fdl12i73vqbxppdz23f8aafkxgdp59sw8wi9qby0rljd"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ libidn ]; libraryPkgconfigDepends = [ libidn ]; @@ -115682,8 +115834,6 @@ self: { testToolDepends = [ c2hs ]; description = "Bindings for GNU IDN"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage @@ -127564,15 +127714,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "hashtables_1_3" = callPackage + "hashtables_1_3_1" = callPackage ({ mkDerivation, base, ghc-prim, hashable, HUnit, mwc-random , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector }: mkDerivation { pname = "hashtables"; - version = "1.3"; - sha256 = "1lqdz4hp6lrzi37f6d2448dmk8jpv56igv5h0kcbnbl42dnmly5g"; + version = "1.3.1"; + sha256 = "1hsrihk948xfpy14qrhar50b41kp60i1rx8bkadjg1xb4bml0gbg"; libraryHaskellDepends = [ base ghc-prim hashable primitive vector ]; @@ -130474,8 +130624,6 @@ self: { ]; description = "For parsing Haskell-ish languages"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskellscrabble" = callPackage @@ -132258,14 +132406,14 @@ self: { license = lib.licenses.mit; }) {}; - "hasql-pool_0_8_0_3" = callPackage + "hasql-pool_0_8_0_4" = callPackage ({ mkDerivation, async, base, hasql, hspec, rerebase, stm, time , transformers }: mkDerivation { pname = "hasql-pool"; - version = "0.8.0.3"; - sha256 = "1drr82mkcapkzvvx7fhrp1nvps4xr9lcam8110f4b0idgq826z9c"; + version = "0.8.0.4"; + sha256 = "1zpc79k63pysc5zj7lcj81qm48gs0f6zqv455dpwgyipj7g0ba65"; libraryHaskellDepends = [ base hasql stm time transformers ]; testHaskellDepends = [ async hasql hspec rerebase stm ]; description = "Pool of connections for Hasql"; @@ -132408,6 +132556,7 @@ self: { ]; description = "Stream Hasql queries with Conduit"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-streams-core" = callPackage @@ -132419,6 +132568,7 @@ self: { libraryHaskellDepends = [ base hasql hasql-transaction-io ]; description = "Stream Hasql queries"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-streams-example" = callPackage @@ -132462,6 +132612,7 @@ self: { ]; description = "Stream Hasql queries with Pipes"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-streams-streaming" = callPackage @@ -132478,6 +132629,7 @@ self: { ]; description = "Stream Hasql queries with Streaming"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-streams-streamly" = callPackage @@ -132494,6 +132646,7 @@ self: { ]; description = "Stream Hasql queries with Streamly"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-th" = callPackage @@ -132557,14 +132710,16 @@ self: { }: mkDerivation { pname = "hasql-transaction-io"; - version = "0.1.0.0"; - sha256 = "0cqm6c4axivxvw5r35ass9qa0bmgxnz7n8d8l12vz78nsfxp76ci"; + version = "0.2.0.0"; + sha256 = "1d6dmswc40ywr62fxywv1phsq2fxn6vg7q7247kzacrd0kkgs0ja"; libraryHaskellDepends = [ base bytestring bytestring-tree-builder hasql mtl resourcet safe-exceptions transformers unliftio-core ]; description = "Perform IO actions during transactions for Hasql"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hasql-url" = callPackage @@ -156270,7 +156425,6 @@ self: { ]; description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hxmppc"; }) {}; @@ -159737,6 +159891,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "incremental-parser_0_5_0_4" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , input-parsers, monoid-subclasses, parsers, QuickCheck + , rank2classes, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.5.0.4"; + sha256 = "1gk3qxn8hg15h6aw7aswjr302pda2m20irzmbc6av2hw254d8b9p"; + libraryHaskellDepends = [ + base input-parsers monoid-subclasses parsers rank2classes + transformers + ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -160691,6 +160869,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "input-parsers_0_3" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , monoid-subclasses, parsec, parsers, text, transformers + }: + mkDerivation { + pname = "input-parsers"; + version = "0.3"; + sha256 = "00xiaxf135v3g8l8gn0lzhfkc1lffvjblrij6lwyfigicm2ggff0"; + libraryHaskellDepends = [ + attoparsec base binary bytestring monoid-subclasses parsec parsers + text transformers + ]; + description = "Extension of the parsers library with more capability and efficiency"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { @@ -161097,8 +161292,8 @@ self: { }: mkDerivation { pname = "int-like"; - version = "0.1.0"; - sha256 = "1v7cv0f6bg8lkr1m8fbfrkysggysrli76q6l04y66cvwcjniz6i6"; + version = "0.1.1"; + sha256 = "19dblzvwjbvvlz8xi5k3x1rciwm2zwxvmsg9vf997xk4shrxswn1"; libraryHaskellDepends = [ algebraic-graphs base containers deepseq hashable ]; @@ -162071,8 +162266,8 @@ self: { pname = "invert"; version = "1.0.0.2"; sha256 = "13zl9i6g7ygkm3pgm7b72815cfp66mykxzp5vwy5kqakr8c3w1fp"; - revision = "2"; - editedCabalFile = "1kc8nfwwy3vr6sc6pdw23lpyc1x91bp9rinmrkjp3zl94ck8y179"; + revision = "3"; + editedCabalFile = "1jrpqnd03j5h1g879n63ygj561db7kvk43xjvhhv4f4h1rmpzpri"; libraryHaskellDepends = [ base containers generic-deriving hashable unordered-containers vector @@ -194254,6 +194449,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "monoid-subclasses_1_2" = callPackage + ({ mkDerivation, base, bytestring, commutative-semigroups + , containers, primes, QuickCheck, quickcheck-instances, tasty + , tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "1.2"; + sha256 = "10ajd7pm0jgqvsyp61sjyfg4392nmrxir0fry4zc4l2rl8vw1q9s"; + libraryHaskellDepends = [ + base bytestring commutative-semigroups containers primes text + vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + description = "Subclasses of Monoid"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -200999,8 +201216,8 @@ self: { pname = "nettle"; version = "0.3.0"; sha256 = "0pbxpxr9xdw3ha5lm9vnsbsvq0kzzsqv6gfk041ijllf1sc0hgyg"; - revision = "1"; - editedCabalFile = "1j8h6m4cj1ykxrsxmjiyb1c4mv6cawssgb8phl0aijrjn3b79f2b"; + revision = "2"; + editedCabalFile = "0szkcrp9ws984ah282jwwfsmzn85khvpmkphv2b1jgxfwzqg426z"; libraryHaskellDepends = [ base byteable bytestring crypto-cipher-types securemem tagged ]; @@ -201841,7 +202058,6 @@ self: { ]; description = "Client library for the XMPP protocol"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "network-rpca" = callPackage @@ -210698,6 +210914,29 @@ self: { mainProgram = "SortLines"; }) {}; + "overeasy" = callPackage + ({ mkDerivation, algebraic-graphs, base, containers, deepseq + , hashable, hedgehog, int-like, logict, mtl, prop-unit + , recursion-schemes, text, transformers, unfree + , unordered-containers + }: + mkDerivation { + pname = "overeasy"; + version = "0.2.0"; + sha256 = "1yyh79l9fjb1r769wm878ldi4g81i3iqmjwng02frs9c2fzbsp3w"; + libraryHaskellDepends = [ + algebraic-graphs base containers deepseq hashable int-like logict + mtl recursion-schemes text transformers unfree unordered-containers + ]; + testHaskellDepends = [ + algebraic-graphs base containers deepseq hashable hedgehog int-like + logict mtl prop-unit recursion-schemes text transformers unfree + unordered-containers + ]; + description = "A purely functional E-Graph library"; + license = lib.licenses.bsd3; + }) {}; + "overhang" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -224445,6 +224684,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "posit" = callPackage + ({ mkDerivation, base, data-dword, deepseq, scientific }: + mkDerivation { + pname = "posit"; + version = "3.2.0.0"; + sha256 = "1qbf413cj0z35gc5dglkrzk5l20fvrcqs964jpn927k37i3dmxx1"; + libraryHaskellDepends = [ base data-dword deepseq scientific ]; + testHaskellDepends = [ base ]; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "positive" = callPackage ({ mkDerivation, base, nats, semigroups }: mkDerivation { @@ -227405,6 +227657,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "prettyprinter-interp" = callPackage + ({ mkDerivation, base, prettyprinter, string-interpolate, tasty + , tasty-hunit, template-haskell, text + }: + mkDerivation { + pname = "prettyprinter-interp"; + version = "0.1.0.0"; + sha256 = "0p5mqvgdmh76yndf2agrmbs3qzb9wx9rimw1jcb2xdaixjrc7gzm"; + libraryHaskellDepends = [ + base prettyprinter string-interpolate template-haskell text + ]; + testHaskellDepends = [ + base prettyprinter string-interpolate tasty tasty-hunit text + ]; + description = "Efficient interpolation for Prettyprinter"; + license = lib.licenses.bsd2; + }) {}; + "prettyprinter-lucid" = callPackage ({ mkDerivation, base, lucid, prettyprinter, text }: mkDerivation { @@ -229080,8 +229350,8 @@ self: { }: mkDerivation { pname = "project-forge"; - version = "0.2.0.0"; - sha256 = "1zn5djbfxgh1sxmf7w91isjii6p7d1l0ik7jpim1id9fzvcn7yk7"; + version = "0.3.0.0"; + sha256 = "0ppi64aa49970iig292bhnc48v37yvvcc2smjskvjjgka5nv4855"; libraryHaskellDepends = [ aeson base Blammo bytestring containers directory filepath pretty-simple stache temporary text typed-process @@ -229337,8 +229607,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.27"; - sha256 = "14av500898qy24kjwnhlnllh6mdmwi458843wsmii2xc7c29rg4c"; + version = "0.0.0.29"; + sha256 = "16nj96rhkfl5h9prqsfr8n1i20vcqlpfz8plbp2vsfha8kzsi2wl"; libraryHaskellDepends = [ aeson base bytestring cassava containers esqueleto generic-random lens mongoDB network-uri persistent persistent-mongoDB QuickCheck @@ -229548,6 +229818,21 @@ self: { broken = true; }) {}; + "prop-unit" = callPackage + ({ mkDerivation, base, hedgehog, tasty, tasty-hedgehog, tasty-hunit + }: + mkDerivation { + pname = "prop-unit"; + version = "0.1.0"; + sha256 = "1sz04samdhac9czcym2rra5fgncccvj6hjsymljxsvgcs2h7429i"; + libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Conveniences for using Hedgehog as a unit test runner"; + license = lib.licenses.bsd3; + }) {}; + "propane" = callPackage ({ mkDerivation, base, colour, containers, directory, filepath , repa, repa-devil, spawn @@ -238869,8 +239154,8 @@ self: { }: mkDerivation { pname = "reflex-dom-th"; - version = "0.3.3"; - sha256 = "1h4iwn3x2jqyb7hdf2p146lvl8qqm4p1b0l43wmm3xqw8qxpxj8g"; + version = "0.3.4"; + sha256 = "1di5sf4larka8k8acpp68wdp6l09sz8sr1syqwp9caawgzwgdy9i"; libraryHaskellDepends = [ array base containers gettext-th megaparsec mtl reflex-dom-core template-haskell text th-lift-instances @@ -248132,7 +248417,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "sandwich_0_1_1_1" = callPackage + "sandwich_0_1_1_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, brick , bytestring, colour, containers, directory, exceptions, filepath , free, haskell-src-exts, lifted-async, microlens, microlens-th @@ -248143,8 +248428,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.1.1"; - sha256 = "0dbbjd0q5nilb40qmjl5ddcwpm1p00pclh53brnr6v4jypvxhj0z"; + version = "0.1.1.2"; + sha256 = "1flac21bgxq07xq5ax9ga7xm1bg2bwld88msbginqxycx21dvcdq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248449,6 +248734,8 @@ self: { ]; description = "driver for external satchmo backends"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "satchmo-examples" = callPackage @@ -248466,6 +248753,7 @@ self: { ]; description = "examples that show how to use satchmo"; license = "GPL"; + hydraPlatforms = lib.platforms.none; }) {}; "satchmo-funsat" = callPackage @@ -248493,6 +248781,8 @@ self: { libraryHaskellDepends = [ base containers process satchmo ]; description = "minisat driver as backend for satchmo"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "satchmo-toysat" = callPackage @@ -250604,14 +250894,14 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; - "sdl2_2_5_3_3" = callPackage + "sdl2_2_5_4_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh }: mkDerivation { pname = "sdl2"; - version = "2.5.3.3"; - sha256 = "1a0vdw7nhwhq9zz1wq1w8j9za02js55h92n2rj8zrbqxcr2091ma"; + version = "2.5.4.0"; + sha256 = "1g35phifz49kxk48s8jmgglxhxl79cbzc1cg2qlgk0vdpxpin8ym"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -263755,8 +264045,6 @@ self: { ]; description = "Automatic (re)compilation of purescript projects"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "snaplet-recaptcha" = callPackage @@ -264954,14 +265242,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "some_1_0_4" = callPackage + "some_1_0_4_1" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; - version = "1.0.4"; - sha256 = "0x1qivqnayybxa6nbnaqyay73yfglxwb3xwfy03pb6ycs639avs4"; - revision = "1"; - editedCabalFile = "0hwq21d0y2iwcrkdhqkq76fna90dsdzrkk6ryh9hbg71lf768ih9"; + version = "1.0.4.1"; + sha256 = "1qy840b2f58f0jxmw4q9sfgbx64kypzdlqnwc72md5wwv84b9b1d"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -265439,6 +265725,39 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "spacecookie_1_0_0_2" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, directory, download-curl, fast-logger + , filepath-bytestring, hxt-unicode, mtl, process, socket, systemd + , tasty, tasty-expected-failure, tasty-hunit, text, transformers + , unix + }: + mkDerivation { + pname = "spacecookie"; + version = "1.0.0.2"; + sha256 = "0f60ak4i6msyxk4bypgiijsm8wg2qvj96lr7chy20kdy44wghnxp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base bytestring containers directory + filepath-bytestring hxt-unicode mtl socket text transformers unix + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring containers directory fast-logger + filepath-bytestring mtl socket systemd text transformers unix + ]; + testHaskellDepends = [ + attoparsec base bytestring containers directory download-curl + filepath-bytestring process tasty tasty-expected-failure + tasty-hunit + ]; + description = "Gopher server library and daemon"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + mainProgram = "spacecookie"; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "spacefill" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -265484,40 +265803,44 @@ self: { "spade" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring - , constraints, containers, Decimal, exceptions, file-embed - , hedgehog, hex-text, hspec, hspec-discover, hspec-hedgehog - , monad-loops, mtl, neat-interpolation, ordered-containers, process - , random, scientific, sdl2, sdl2-mixer, stm, strip-ansi-escape - , template-haskell, terminal, text, time, unordered-containers - , vector, WAVE, with-utf8 + , constraints, containers, cryptonite, Decimal, directory + , exceptions, file-embed, filepath, hedgehog, hex-text, hspec + , hspec-discover, hspec-hedgehog, memory, monad-loops, mtl + , neat-interpolation, ordered-containers, process, random + , regex-tdfa, scientific, sdl2, sdl2-mixer, stm, strip-ansi-escape + , template-haskell, terminal, text, time, unix + , unordered-containers, vector, WAVE, with-utf8 }: mkDerivation { pname = "spade"; - version = "0.1.0.6"; - sha256 = "12ffyb1hx2zgb7cmfbvr88xjxs423734w048nw3c3sa4qyfc0hyk"; + version = "0.1.0.7"; + sha256 = "02pih7d5jv231gj674rilyfkbc27his7ibs50whkjqnfbf673fzl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring constraints containers Decimal - exceptions file-embed hedgehog hex-text hspec hspec-hedgehog - monad-loops mtl ordered-containers process random scientific sdl2 - sdl2-mixer stm template-haskell terminal text time + aeson ansi-terminal base bytestring constraints containers + cryptonite Decimal directory exceptions file-embed filepath + hedgehog hex-text hspec hspec-hedgehog memory monad-loops mtl + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-mixer stm template-haskell terminal text time unix unordered-containers vector WAVE with-utf8 ]; executableHaskellDepends = [ - aeson ansi-terminal base bytestring constraints containers Decimal - exceptions file-embed hedgehog hex-text hspec hspec-hedgehog - monad-loops mtl ordered-containers process random scientific sdl2 - sdl2-mixer stm template-haskell terminal text time + aeson ansi-terminal base bytestring constraints containers + cryptonite Decimal directory exceptions file-embed filepath + hedgehog hex-text hspec hspec-hedgehog memory monad-loops mtl + ordered-containers process random regex-tdfa scientific sdl2 + sdl2-mixer stm template-haskell terminal text time unix unordered-containers vector WAVE with-utf8 ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring constraints containers Decimal - exceptions file-embed hedgehog hex-text hspec hspec-discover - hspec-hedgehog monad-loops mtl neat-interpolation - ordered-containers process random scientific sdl2 sdl2-mixer stm - strip-ansi-escape template-haskell terminal text time - unordered-containers vector WAVE with-utf8 + aeson ansi-terminal base bytestring constraints containers + cryptonite Decimal directory exceptions file-embed filepath + hedgehog hex-text hspec hspec-discover hspec-hedgehog memory + monad-loops mtl neat-interpolation ordered-containers process + random regex-tdfa scientific sdl2 sdl2-mixer stm strip-ansi-escape + template-haskell terminal text time unix unordered-containers + vector WAVE with-utf8 ]; testToolDepends = [ hspec-discover ]; description = "A simple programming and debugging environment"; @@ -274385,9 +274708,7 @@ self: { executableToolDepends = [ alex happy ]; description = "SystemVerilog to Verilog conversion"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sv2v"; - broken = true; }) {}; "svfactor" = callPackage @@ -274455,8 +274776,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.2.0.0"; - sha256 = "1paqpv99kwdphm508bka610g6wkm12yq8mfs20q6ayx1i9akm0rh"; + version = "2.2.0.1"; + sha256 = "1wkncrg2jc5mbmdmsjx4i02d2ldsb7ydz3h8z55x8g1nzgby2pzl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -278780,16 +279101,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "tasty-hedgehog_1_3_0_0" = callPackage + "tasty-hedgehog_1_3_1_0" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty , tasty-expected-failure }: mkDerivation { pname = "tasty-hedgehog"; - version = "1.3.0.0"; - sha256 = "1dk4bcm0a8vl1y5d3c89ypc688rp59fn11hyr2jx5kd8yvpzh0bj"; - revision = "1"; - editedCabalFile = "1bcc9sn60ca5x4jld5s4lzvmvz26vi67xgk5s7nkd8a7kp230hrl"; + version = "1.3.1.0"; + sha256 = "1iq452mvd9wc9pfmjsmm848jwp3cvsk1faf2mlr21vcs0yaxvq3m"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -283034,6 +283353,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_10" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers, criterion + , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim + , hspec, hspec-discover, QuickCheck, quickcheck-instances + , template-haskell, text, th-abstraction, th-lift, transformers + , transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.10"; + sha256 = "1iq24lpy59c8wc62ss4bwsaks6wlcr73c8vdyd2xha2p4fswmfyf"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers generic-deriving ghc-boot-th ghc-prim + template-haskell text th-abstraction th-lift transformers + transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + QuickCheck quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -283069,7 +283419,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show-instances_3_9_1" = callPackage + "text-show-instances_3_9_2" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time @@ -283080,8 +283430,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "3.9.1"; - sha256 = "0jh4lb2hzyfkp39kpnl82bnx5sz4d9gf0hjk4zasqvra456y5nbh"; + version = "3.9.2"; + sha256 = "1j1mcmw9l7hfmvhmv083bssc2w6zbvibaq3w4c7g7a2vxxcqwh3y"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -294642,6 +294992,24 @@ self: { license = lib.licenses.asl20; }) {}; + "unfree" = callPackage + ({ mkDerivation, base, deepseq, hashable, recursion-schemes, tasty + , tasty-hunit + }: + mkDerivation { + pname = "unfree"; + version = "0.1.0"; + sha256 = "0k1ksbq4nkc5bwgpg47x59m0ik5pfczdisyvy3zxhpxg1gvpw1ac"; + libraryHaskellDepends = [ + base deepseq hashable recursion-schemes + ]; + testHaskellDepends = [ + base deepseq hashable recursion-schemes tasty tasty-hunit + ]; + description = "Simplistic free monad with deriving through UndecidableInstances"; + license = lib.licenses.bsd3; + }) {}; + "ungadtagger" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -294805,6 +295173,34 @@ self: { license = lib.licenses.bsd2; }) {}; + "unicode-collation_0_1_3_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, parsec + , QuickCheck, quickcheck-instances, tasty, tasty-bench, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-icu + , th-lift-instances, unicode-transforms + }: + mkDerivation { + pname = "unicode-collation"; + version = "0.1.3.3"; + sha256 = "0imcdsk0qqwj31zwgpick4s2nbxlyxwa64lq6r212jd0y0hrrvvl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers parsec template-haskell text + th-lift-instances + ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ + base QuickCheck quickcheck-instances tasty-bench text text-icu + ]; + description = "Haskell implementation of the Unicode Collation Algorithm"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "unicode-data" = callPackage ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty , tasty-bench @@ -298615,8 +299011,8 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.13"; - sha256 = "04cdzlbcx95r7x3nz0r676c376j0lfiidp0160maw651in2a3b5f"; + version = "0.0.14"; + sha256 = "17qj6s6aypypc8yn9jsjqcjkravs90c3xcszpm0rgrjpmqwc0718"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -301873,8 +302269,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.22.1"; - sha256 = "0v5x3kbw0z7cvw4s10f79i50i4yk415v0jdn0rw4m50bgl9y2icd"; + version = "3.23"; + sha256 = "0859b2nq2rifaa0xjwfv1shdc501xynd8w84dv93xkqil932ax98"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -301908,8 +302304,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.10"; - sha256 = "0pa0vmwjjqwyiyrzz2bhzlbvv8y4wcwky51bnmshj7xsnqp755n5"; + version = "0.5.10.1"; + sha256 = "0jr5pl13plmg1fm2ai4f24c0lviazjinqrrafxb948ajrlwm8la1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -305805,8 +306201,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; - version = "0.14.4.3"; - sha256 = "177qh668fx41sizb7lq4w3f43ii0n54vcqgv20a5hywbygzfz9hy"; + version = "0.14.4.4"; + sha256 = "03x9nzdw13j5zwi2l5hz78lz12j6fcf96k6k0iw6bgmcyi4i6w59"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk ]; @@ -307106,6 +307502,26 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "witch_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, tagged + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "witch"; + version = "1.1.0.0"; + sha256 = "1lnx18mlcpdkj0dl1fbgjkxr14fqf5y36cds3p6l07kvin29qa27"; + libraryHaskellDepends = [ + base bytestring containers tagged template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit tagged text time transformers + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix index 4c11a4e1e8bca..5f7e127c0b4df 100644 --- a/pkgs/development/haskell-modules/lib/compose.nix +++ b/pkgs/development/haskell-modules/lib/compose.nix @@ -417,24 +417,11 @@ rec { in builtins.listToAttrs (map toKeyVal haskellPaths); - addOptparseApplicativeCompletionScripts = exeName: pkg: - builtins.trace "addOptparseApplicativeCompletionScripts is deprecated in favor of generateOptparseApplicativeCompletion. Please change ${pkg.name} to use the latter or its plural form." - (generateOptparseApplicativeCompletion exeName pkg); - /* - Modify a Haskell package to add shell completion scripts for the - given executable produced by it. These completion scripts will be - picked up automatically if the resulting derivation is installed, - e.g. by `nix-env -i`. - - Invocation: - generateOptparseApplicativeCompletion command pkg - - - command: name of an executable - pkg: Haskell package that builds the executables + INTERNAL function retained for backwards compatibility, use + haskell.packages.*.generateOptparseApplicativeCompletions instead! */ - generateOptparseApplicativeCompletion = exeName: overrideCabal (drv: { + __generateOptparseApplicativeCompletion = exeName: overrideCabal (drv: { postInstall = (drv.postInstall or "") + '' bashCompDir="''${!outputBin}/share/bash-completion/completions" zshCompDir="''${!outputBin}/share/zsh/vendor-completions" @@ -453,20 +440,22 @@ rec { }); /* - Modify a Haskell package to add shell completion scripts for the - given executables produced by it. These completion scripts will be - picked up automatically if the resulting derivation is installed, - e.g. by `nix-env -i`. - - Invocation: - generateOptparseApplicativeCompletions commands pkg - - - commands: name of an executable - pkg: Haskell package that builds the executables + Retained for backwards compatibility. + Use haskell.packages.*.generateOptparseApplicativeCompletions + which is cross aware instead. */ generateOptparseApplicativeCompletions = commands: pkg: - pkgs.lib.foldr generateOptparseApplicativeCompletion pkg commands; + lib.warnIf (lib.isInOldestRelease 2211) "haskellLib.generateOptparseApplicativeCompletions is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" + (pkgs.lib.foldr __generateOptparseApplicativeCompletion pkg commands); + + /* + Retained for backwards compatibility. + Use haskell.packages.*.generateOptparseApplicativeCompletions + which is cross aware instead. + */ + generateOptparseApplicativeCompletion = command: pkg: + lib.warnIf (lib.isInOldestRelease 2211) "haskellLib.generateOptparseApplicativeCompletion is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions (plural!). Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" + (__generateOptparseApplicativeCompletion command pkg); # Don't fail at configure time if there are multiple versions of the # same package in the (recursive) dependencies of the package being diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix index a4f4104e97684..581e9aa1016f2 100644 --- a/pkgs/development/haskell-modules/lib/default.nix +++ b/pkgs/development/haskell-modules/lib/default.nix @@ -316,7 +316,9 @@ rec { # packagesFromDirectory : { directory : Directory, ... } -> HaskellPackageOverrideSet packagesFromDirectory = compose.packagesFromDirectory; - addOptparseApplicativeCompletionScripts = compose.addOptparseApplicativeCompletionScripts; + addOptparseApplicativeCompletionScripts = exeName: pkg: + lib.warn "addOptparseApplicativeCompletionScripts is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" + (compose.__generateOptparseApplicativeCompletion exeName pkg); /* Modify a Haskell package to add shell completion scripts for the diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 9d7cbe6f8f1b2..843d1a9694c30 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -597,4 +597,34 @@ in package-set { inherit pkgs lib callPackage; } self // { } pkg; + /* + Modify a Haskell package to add shell completion scripts for the + given executables produced by it. These completion scripts will be + picked up automatically if the resulting derivation is installed, + e.g. by `nix-env -i`. + + This depends on the `--*-completion` flag `optparse-applicative` provides + automatically. Since we need to invoke installed executables, completions + are not generated if we are cross-compiling. + + commands: names of the executables built by the derivation + pkg: Haskell package that builds the executables + + Example: + generateOptparseApplicativeCompletions [ "exec1" "exec2" ] pkg + + Type: [str] -> drv -> drv + */ + generateOptparseApplicativeCompletions = + self.callPackage ( + { stdenv }: + + commands: + pkg: + + if stdenv.buildPlatform.canExecute stdenv.hostPlatform + then lib.foldr haskellLib.__generateOptparseApplicativeCompletion pkg commands + else pkg + ) { }; + } diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index d236252e5bc72..478c5bdb34db8 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -69,6 +69,8 @@ let inherit executable luaversion sourceVersion; luaOnBuild = luaOnBuildForHost.override { inherit packageOverrides; self = luaOnBuild; }; + tests = callPackage ./tests { inherit (luaPackages) wrapLua; }; + inherit luaAttr; }; diff --git a/pkgs/development/interpreters/lua-5/tests/assert.sh b/pkgs/development/interpreters/lua-5/tests/assert.sh new file mode 100644 index 0000000000000..fe5582a0b0623 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/tests/assert.sh @@ -0,0 +1,16 @@ +# Always failing assertion with a message. +# +# Example: +# fail "It should have been but it wasn't to be" +function fail() { + echo "$1" + exit 1 +} + + +function assertStringEqual { + + if ! diff <(echo "$1") <(echo "$2") ; then + fail "Strings differ" + fi +} diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix new file mode 100644 index 0000000000000..38479af5f2070 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -0,0 +1,50 @@ +{ lua +, hello +, wrapLua +, lib, fetchFromGitHub +, fetchFromGitLab +, pkgs +}: +let + + runTest = lua: { name, command }: + pkgs.runCommandLocal "test-${lua.name}" ({ + nativeBuildInputs = [lua]; + meta.platforms = lua.meta.platforms; + }) ('' + source ${./assert.sh} + '' + + command + + "touch $out" + ); + + wrappedHello = hello.overrideAttrs(oa: { + propagatedBuildInputs = [ + wrapLua + lua.pkgs.cjson + ]; + postFixup = '' + wrapLuaPrograms + ''; + }); +in + pkgs.recurseIntoAttrs ({ + + checkAliases = runTest lua { + name = "check-aliases"; + command = '' + generated=$(lua -e 'print(package.path)') + golden_LUA_PATH='./share/lua/${lua.luaversion}/?.lua;./?.lua;./?/init.lua' + + assertStringEqual "$generated" "$golden_LUA_PATH" + ''; + }; + + checkWrapping = pkgs.runCommandLocal "test-${lua.name}" ({ + }) ('' + grep -- 'LUA_PATH=' ${wrappedHello}/bin/hello + touch $out + ''); + +}) + diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index b9ac255d24329..9431522b71e5d 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -60,6 +60,8 @@ let passthru = lua.passthru // { interpreter = "${env}/bin/lua"; inherit lua; + luaPath = lua.pkgs.lib.genLuaPathAbsStr env; + luaCpath = lua.pkgs.lib.genLuaCPathAbsStr env; env = stdenv.mkDerivation { name = "interactive-${lua.name}-environment"; nativeBuildInputs = [ env ]; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index ade4168036a52..6d3c677397d2f 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -1,6 +1,15 @@ -{ pkgs }: - -with pkgs; +{ __splicedPackages +, callPackage +, config +, darwin +, db +, lib +, libffiBoot +, newScope +, pythonPackagesExtensions +, splicePackages +, stdenv +}: (let @@ -79,11 +88,11 @@ with pkgs; extra = _: {}; optionalExtensions = cond: as: if cond then as else []; python2Extension = import ../../../top-level/python2-packages.nix; - extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pkgs.pythonPackagesExtensions ++ [ overrides ]); + extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pythonPackagesExtensions ++ [ overrides ]); aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super); in lib.makeScopeWithSplicing - pkgs.splicePackages - pkgs.newScope + splicePackages + newScope otherSplices keep extra @@ -150,7 +159,7 @@ with pkgs; in { python27 = callPackage ./cpython/2.7 { - self = python27; + self = __splicedPackages.python27; sourceVersion = { major = "2"; minor = "7"; @@ -163,45 +172,45 @@ in { }; python37 = callPackage ./cpython { - self = python37; + self = __splicedPackages.python37; sourceVersion = { major = "3"; minor = "7"; - patch = "14"; + patch = "15"; suffix = ""; }; - sha256 = "sha256-QVeuMeuBrxnoHDaIJhBJGw+49Q4A+ooXsJXIiQi5xFw="; + sha256 = "sha256-WRFHWgesK1PXRuiKBxavbStHNJQZGRNuoNM/ucdblxQ="; inherit (darwin) configd; inherit passthruFun; }; python38 = callPackage ./cpython { - self = python38; + self = __splicedPackages.python38; sourceVersion = { major = "3"; minor = "8"; - patch = "14"; + patch = "15"; suffix = ""; }; - sha256 = "sha256-XXfieCcbqAPpkJpBpPO6ygBhgck62mgqXl/o3EokxfM="; + sha256 = "sha256-URT8eRiipeIOtarGlrMMNvQSxu8ksT9cnrngVpgtlVA="; inherit (darwin) configd; inherit passthruFun; }; python39 = callPackage ./cpython ({ - self = python39; + self = __splicedPackages.python39; inherit (darwin) configd; inherit passthruFun; } // sources.python39); python310 = callPackage ./cpython ({ - self = python310; + self = __splicedPackages.python310; inherit (darwin) configd; inherit passthruFun; } // sources.python310); python311 = callPackage ./cpython { - self = python311; + self = __splicedPackages.python311; sourceVersion = { major = "3"; minor = "11"; @@ -215,7 +224,7 @@ in { # Minimal versions of Python (built without optional dependencies) python3Minimal = (callPackage ./cpython ({ - self = python3Minimal; + self = __splicedPackages.python3Minimal; inherit passthruFun; pythonAttr = "python3Minimal"; # strip down that python version as much as possible @@ -226,7 +235,7 @@ in { sqlite = null; configd = null; tzdata = null; - libffi = pkgs.libffiBoot; # without test suite + libffi = libffiBoot; # without test suite stripConfig = true; stripIdlelib = true; stripTests = true; @@ -244,7 +253,7 @@ in { }); pypy27 = callPackage ./pypy { - self = pypy27; + self = __splicedPackages.pypy27; sourceVersion = { major = "7"; minor = "3"; @@ -253,14 +262,14 @@ in { sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; - python = python27; + python = __splicedPackages.python27; inherit passthruFun; inherit (darwin) libunwind; inherit (darwin.apple_sdk.frameworks) Security; }; pypy38 = callPackage ./pypy { - self = pypy38; + self = __splicedPackages.pypy38; sourceVersion = { major = "7"; minor = "3"; @@ -269,20 +278,20 @@ in { sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY="; pythonVersion = "3.8"; db = db.override { dbmSupport = !stdenv.isDarwin; }; - python = python27; + python = __splicedPackages.python27; inherit passthruFun; inherit (darwin) libunwind; inherit (darwin.apple_sdk.frameworks) Security; }; - pypy37 = pypy38.override { - self = pythonInterpreters.pypy37; + pypy37 = __splicedPackages.pypy38.override { + self = __splicedPackages.pythonInterpreters.pypy37; pythonVersion = "3.7"; sha256 = "sha256-LtAqyecQhZxBvILer7CGGXkruaJ+6qFnbHQe3t0hTdc="; }; pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { # Not included at top-level - self = pythonInterpreters.pypy27_prebuilt; + self = __splicedPackages.pythonInterpreters.pypy27_prebuilt; sourceVersion = { major = "7"; minor = "3"; @@ -295,7 +304,7 @@ in { pypy38_prebuilt = callPackage ./pypy/prebuilt.nix { # Not included at top-level - self = pythonInterpreters.pypy38_prebuilt; + self = __splicedPackages.pythonInterpreters.pypy38_prebuilt; sourceVersion = { major = "7"; minor = "3"; diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index f58441beedbf7..7c20e42d4cc97 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "postgresql-jdbc"; - version = "42.2.20"; + version = "42.5.0"; src = fetchMavenArtifact { artifactId = "postgresql"; groupId = "org.postgresql"; - sha256 = "0kjilsrz9shymfki48kg1q84la1870ixlh2lnfw347x8mqw2k2vh"; + sha256 = "sha256-pNGLWrGuuShaixezZfQk8mhEUinKv45BIRXbYVK33uM="; inherit version; }; diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 68cb1dd3e339e..954628986e468 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -3,6 +3,8 @@ , fetchRepoProject , writeScript , cmake +, directx-shader-compiler +, glslang , ninja , patchelf , perl @@ -22,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q3.3"; + version = "2022.Q3.5"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "jbx6R6tDaVWD5jLVW2IiNaw+VwFkQ9EG2FvpAj/bfZ4="; + sha256 = "YY9/njuzGONqAtbM54OGGvC1V73JyL+IHkLSZs4JSYs="; }; buildInputs = [ @@ -49,6 +51,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + directx-shader-compiler + glslang ninja patchelf perl diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 5882805fdfc6e..2e3a67af5ad89 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -14,7 +14,7 @@ , gtk3 , json-glib , libarchive -, libsoup +, curl , libuuid , libxslt , meson @@ -24,7 +24,7 @@ }: stdenv.mkDerivation rec { pname = "appstream-glib"; - version = "0.7.18"; + version = "0.8.1"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = "${lib.replaceStrings ["-"] ["_"] pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "12s7d3nqjs1fldnppbg2mkjg4280f3h8yzj3q1hiz3chh1w0vjbx"; + sha256 = "Qf0z9YTfjTiEr9OlK2BgOpVDtM2ozsiyjzO04O81zas="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { gtk3 json-glib libarchive - libsoup + curl libuuid ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 5f67eda61a20d..5af49f23c44fd 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "11.4.0"; + version = "11.4.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-AWUxFSwCcppgKqbxb0ujsEdXQNXBvSjTTt1yZPR2Rhw="; + sha256 = "sha256-2ttf01vE3CUbNvXdgHKcPFiNZeLsvNTk41mtnLBFI/s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix deleted file mode 100644 index 7989cfd857776..0000000000000 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv -, fetchurl - -, meson -, ninja -, pkg-config - -, at-spi2-core -, atk -, dbus -, glib -, libxml2 - -, gnome # To pass updateScript -}: - -stdenv.mkDerivation rec { - pname = "at-spi2-atk"; - version = "2.38.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "z6AIpa+CKzauYofxgYLEDJHdaZxV+qOGBYge0XXKRk8="; - }; - - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ at-spi2-core atk dbus glib libxml2 ]; - - doCheck = false; # fails with "No test data file provided" - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; - homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 606ff2b340413..3a2f446cf84ff 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -11,6 +11,7 @@ , glib , dconf , libX11 +, libxml2 , libXtst , libXi , libXext @@ -19,13 +20,13 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.44.1"; + version = "2.46.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "S+sjJwumz3yvILWXNU11GU2Jr7adLvzxX0JxaIum90Y="; + sha256 = "qgyGx596jWe65JpbelqwhDDGCM/+bjO/R6cvQasDw9A="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 + libxml2 # 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 libXtst libXi @@ -46,6 +48,7 @@ stdenv.mkDerivation rec { ]; # In atspi-2.pc dbus-1 glib-2.0 + # In atk.pc gobject-2.0 propagatedBuildInputs = [ dbus glib @@ -55,6 +58,7 @@ stdenv.mkDerivation rec { doCheck = false; mesonFlags = [ + "-Dintrospection=yes" # Provide dbus-daemon fallback when it is not already running when # at-spi2-bus-launcher is executed. This allows us to avoid # including the entire dbus closure in libraries linked with @@ -80,7 +84,7 @@ stdenv.mkDerivation rec { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; license = licenses.lgpl21Plus; - maintainers = teams.gnome.members; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix deleted file mode 100644 index 268bf43eb3e8c..0000000000000 --- a/pkgs/development/libraries/atk/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, gettext -, pkg-config -, glib -, fixDarwinDylibNames -, gobject-introspection -, gnome -}: - -stdenv.mkDerivation rec { - pname = "atk"; - version = "2.38.0"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY="; - }; - - patches = [ - # meson builds an incorrect .pc file - # glib should be Requires not Requires.private - ./fix_pc.patch - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - gobject-introspection - glib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - fixDarwinDylibNames - ]; - - buildInputs = [ gobject-introspection ]; - - propagatedBuildInputs = [ - # Required by atk.pc - glib - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - }; - - meta = { - description = "Accessibility toolkit"; - - longDescription = '' - ATK is the Accessibility Toolkit. It provides a set of generic - interfaces allowing accessibility technologies such as screen - readers to interact with a graphical user interface. Using the - ATK interfaces, accessibility tools have full access to view and - control running applications. - ''; - - homepage = "https://gitlab.gnome.org/GNOME/atk"; - - license = lib.licenses.lgpl2Plus; - - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; - -} diff --git a/pkgs/development/libraries/atk/fix_pc.patch b/pkgs/development/libraries/atk/fix_pc.patch deleted file mode 100644 index 3d19d9862cbdf..0000000000000 --- a/pkgs/development/libraries/atk/fix_pc.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/atk/meson.build -+++ b/atk/meson.build -@@ -162,5 +162,6 @@ pkgconfig.generate(libatk, - name: 'Atk', - description: 'Accessibility Toolkit', - subdirs: atk_api_name, -+ requires: glib_dep, - filebase: 'atk', - ) diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 5626c5fa8f8d0..616802202146d 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "sha256-SCyeicZ+JkJU1x2X3efOvxUXT2qF2IiUsj+anLg5Lsg="; + sha256 = "sha256-QEfkeofsVxB9gyISL/P7bvnbcBuG7Q3A4UoAyQAXxgE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/pkgs/development/libraries/boost-ext/boost-sml/default.nix new file mode 100644 index 0000000000000..fd69db12d3c08 --- /dev/null +++ b/pkgs/development/libraries/boost-ext/boost-sml/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, cmake +, fetchFromGitHub +, boost +}: + +stdenv.mkDerivation rec { + pname = "boost-sml"; + # This is first commit since 1.1.6 that passes all tests (test_policies_logging is commented out) + version = "1.1.6"; + working_tests = "24d762d1901f4f6afaa5c5e0d1b7b77537964694"; + + src = fetchFromGitHub { + owner = "boost-ext"; + repo = "sml"; + rev = "${working_tests}"; + hash = "sha256-ZhIfyYdzrzPTAYevOz5I6tAcUiLRMV8HENKX9jychEY="; + }; + + buildInputs = [ boost ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DSML_BUILD_BENCHMARKS=OFF" + "-DSML_BUILD_EXAMPLES=OFF" + "-DSML_BUILD_TESTS=ON" + "-DSML_USE_EXCEPTIONS=ON" + ]; + + doCheck = true; + + meta = with lib; { + description = "Header only state machine library with no dependencies"; + homepage = "https://github.com/boost-ext/sml"; + license = licenses.boost; + maintainers = with maintainers; [ prtzl ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix index 0a0f976e0dc49..7dfc2e0844687 100644 --- a/pkgs/development/libraries/clanlib/default.nix +++ b/pkgs/development/libraries/clanlib/default.nix @@ -9,7 +9,6 @@ , file , freetype , fontconfig -, xlibsWrapper , alsa-lib , libXrender }: @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { xorg.xorgproto freetype fontconfig - xlibsWrapper alsa-lib libXrender ]; diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/development/libraries/ctre/default.nix new file mode 100644 index 0000000000000..b91c00930ae01 --- /dev/null +++ b/pkgs/development/libraries/ctre/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "ctre"; + version = "3.7.1"; + + src = fetchFromGitHub { + owner = "hanickadot"; + repo = "compile-time-regular-expressions"; + rev = "v${version}"; + hash = "sha256-KqYBSY45x8FDQ0YgjrKoZdOiuhf33gv5w160/dSsSsg="; + }; + + nativeBuildInputs = [ cmake ]; + + postPatch = '' + substituteInPlace packaging/pkgconfig.pc.in \ + --replace "\''${prefix}/" "" + ''; + + dontBuild = true; + + meta = with lib; { + description = "Fast compile-time regular expressions library"; + longDescription = '' + Fast compile-time regular expressions with support for + matching/searching/capturing during compile-time or runtime. + ''; + license = licenses.asl20; + homepage = "https://compile-time.re"; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index a2b9314ca9ce1..59df0e8469cbc 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (rec { ''; meta = with lib; { - homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; + homepage = "https://www.oracle.com/database/technologies/related/berkeleydb.html"; description = "Berkeley DB"; license = license; platforms = platforms.unix; diff --git a/pkgs/development/libraries/expected-lite/default.nix b/pkgs/development/libraries/expected-lite/default.nix new file mode 100644 index 0000000000000..6afe391e032d3 --- /dev/null +++ b/pkgs/development/libraries/expected-lite/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +}: + +stdenv.mkDerivation rec { + pname = "expected-lite"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "martinmoene"; + repo = "expected-lite"; + rev = "v${version}"; + hash = "sha256-d3lFpi62QPZKVt/QeBV7MoH3QltSg5dsUI3dIUArPpA="; + }; + + nativeBuildInputs = [ cmake ninja ]; + + doCheck = true; + + meta = with lib; { + description = '' + Expected objects in C++11 and later in a single-file header-only library + ''; + homepage = "https://github.com/martinmoene/expected-lite"; + changelog = "https://github.com/martinmoene/expected-lite/blob/${src.rev}/CHANGES.txt"; + license = licenses.boost; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch deleted file mode 100644 index e0b6df195893c..0000000000000 --- a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 9e885070..d02eeb8c 100644 ---- a/icon-validator/validate-icon.c -+++ b/icon-validator/validate-icon.c -@@ -156,8 +156,8 @@ rerun_in_sandbox (const char *arg_width, - "--unshare-ipc", - "--unshare-net", - "--unshare-pid", -- "--ro-bind", "/usr", "/usr", -- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", -+ "--ro-bind", "@storeDir@", "@storeDir@", -+ "--ro-bind", "/run/current-system", "/run/current-system", - "--ro-bind", validate_icon, validate_icon, - NULL); - diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index c992a6b0dfa2e..d79923c0f81a5 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -11,13 +11,15 @@ , libxslt , pkg-config , xmlto -, appstream-glib , substituteAll +, runCommand , bison , xdg-dbus-proxy , p11-kit +, appstream , bubblewrap , bzip2 +, curl , dbus , glib , gpgme @@ -32,9 +34,8 @@ , shared-mime-info , desktop-file-utils , gtk3 -, fuse +, fuse3 , nixosTests -, libsoup , xz , zstd , ostree @@ -51,16 +52,16 @@ , makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.12.7"; + version = "1.14.0"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { - url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bbUqUxzieCgqx+v7mfZqC7PsyvROhkhEwslcHuW6kxY="; # Taken from https://github.com/flatpak/flatpak/releases/ + url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-jidpc3cOok3fJZetSuzTa5g5PmvekeSOF0OqymfyeBU="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ @@ -80,12 +81,6 @@ stdenv.mkDerivation rec { p11kit = "${p11-kit.bin}/bin/p11-kit"; }) - # Adapt paths exposed to sandbox for NixOS. - (substituteAll { - src = ./bubblewrap-paths.patch; - inherit (builtins) storeDir; - }) - # Allow gtk-doc to find schemas using XML_CATALOG_FILES environment variable. # Patch taken from gtk-doc expression. ./respect-xml-catalog-files-var.patch @@ -94,8 +89,13 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/53441 ./unset-env-vars.patch - # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. - ./validate-icon-pixbuf.patch + # Do not clear XDG_DATA_DIRS in fish shell + # https://github.com/flatpak/flatpak/pull/5123 + ./no-breaking-fish.patch + + # The icon validator needs to access the gdk-pixbuf loaders in the Nix store + # and cannot bind FHS paths since those are not available on NixOS. + finalAttrs.passthru.icon-validator-patch ]; nativeBuildInputs = [ @@ -110,14 +110,15 @@ stdenv.mkDerivation rec { libxslt pkg-config xmlto - appstream-glib bison wrapGAppsNoGuiHook ]; buildInputs = [ + appstream bubblewrap bzip2 + curl dbus dconf gpgme @@ -125,14 +126,13 @@ stdenv.mkDerivation rec { libarchive libcap libseccomp - libsoup xz zstd polkit python3 systemd xorg.libXau - fuse + fuse3 gsettings-desktop-schemas glib-networking librsvg # for flatpak-validate-icon @@ -156,6 +156,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--with-curl" "--with-system-bubblewrap=${bubblewrap}/bin/bwrap" "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy" "--with-dbus-config-dir=${placeholder "out"}/share/dbus-1/system.d" @@ -187,8 +188,18 @@ stdenv.mkDerivation rec { ''; passthru = { + icon-validator-patch = substituteAll { + src = ./fix-icon-validation.patch; + inherit (builtins) storeDir; + }; + tests = { installedTests = nixosTests.installed-tests.flatpak; + + validate-icon = runCommand "test-icon-validation" { } '' + ${finalAttrs.finalPackage}/libexec/flatpak-validate-icon --sandbox 512 512 ${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" + grep format=svg "$out" + ''; }; }; @@ -199,4 +210,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/flatpak/fix-icon-validation.patch b/pkgs/development/libraries/flatpak/fix-icon-validation.patch new file mode 100644 index 0000000000000..0e4db2b162f19 --- /dev/null +++ b/pkgs/development/libraries/flatpak/fix-icon-validation.patch @@ -0,0 +1,31 @@ +--- a/icon-validator/validate-icon.c ++++ b/icon-validator/validate-icon.c +@@ -163,7 +163,7 @@ rerun_in_sandbox (const char *arg_width, + const char *arg_height, + const char *filename) + { +- const char * const usrmerged_dirs[] = { "bin", "lib32", "lib64", "lib", "sbin" }; ++ const char * const usrmerged_dirs[] = { }; + int i; + g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free); + char validate_icon[PATH_MAX + 1]; +@@ -183,8 +183,7 @@ rerun_in_sandbox (const char *arg_width, + "--unshare-ipc", + "--unshare-net", + "--unshare-pid", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ "--ro-bind", "@storeDir@", "@storeDir@", + "--ro-bind", validate_icon, validate_icon, + NULL); + +@@ -227,6 +226,9 @@ rerun_in_sandbox (const char *arg_width, + add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); + if (g_getenv ("G_MESSAGES_PREFIXED")) + add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); ++ if (g_getenv ("GDK_PIXBUF_MODULE_FILE")) ++ add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL); ++ + + add_args (args, validate_icon, arg_width, arg_height, filename, NULL); + g_ptr_array_add (args, NULL); diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index dcba666818582..683cdbcaf18cf 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,8 +1,8 @@ diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c -index 43fd0563..4067bd36 100644 +index 3f5d8a1f..79493e61 100644 --- a/app/flatpak-builtins-build-export.c +++ b/app/flatpak-builtins-build-export.c -@@ -458,7 +458,7 @@ validate_desktop_file (GFile *desktop_file, +@@ -464,7 +464,7 @@ validate_desktop_file (GFile *desktop_file, subprocess = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE | G_SUBPROCESS_FLAGS_STDERR_PIPE | G_SUBPROCESS_FLAGS_STDERR_MERGE, @@ -12,10 +12,10 @@ index 43fd0563..4067bd36 100644 { if (!g_error_matches (local_error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT)) diff --git a/tests/libtest.sh b/tests/libtest.sh -index acb2095b..b361da16 100644 +index 36d39ac4..3ad2c7a6 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -431,7 +431,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then +@@ -511,7 +511,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then # running installed-tests: assume we know what we're doing _flatpak_bwrap_works=true elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -24,7 +24,7 @@ index acb2095b..b361da16 100644 _flatpak_bwrap_works=false else _flatpak_bwrap_works=true -@@ -504,7 +504,7 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ +@@ -591,7 +591,7 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -33,20 +33,20 @@ index acb2095b..b361da16 100644 assert_not_reached "Failed to start dbus-daemon" fi -@@ -519,7 +519,7 @@ commit_to_path () { +@@ -606,7 +606,7 @@ commit_to_path () { } cleanup () { - /bin/kill -9 $DBUS_SESSION_BUS_PID + @coreutils@/bin/kill -9 $DBUS_SESSION_BUS_PID - gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true - fusermount -u $XDG_RUNTIME_DIR/doc || : + gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye >&2 || true + fusermount -u $XDG_RUNTIME_DIR/doc >&2 || : kill $(jobs -p) &> /dev/null || true diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh -index 612f914f..4b890da2 100755 +index afa11a6b..5b12055f 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh -@@ -151,13 +151,13 @@ msgid "Hello world" +@@ -190,13 +190,13 @@ msgid "Hello world" msgstr "Hallo Welt" EOF mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES @@ -60,10 +60,10 @@ index 612f914f..4b890da2 100755 -msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po +@gettext@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po - flatpak build-finish ${DIR} + flatpak build-finish ${DIR} >&2 mkdir -p repos diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh -index af289625..7db51c17 100755 +index 4ba950df..fd50fab3 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh @@ -28,9 +28,10 @@ EOF @@ -80,7 +80,7 @@ index af289625..7db51c17 100755 ln -s ../lib ${DIR}/usr/lib64 @@ -40,40 +41,17 @@ if test -f /sbin/ldconfig.real; then else - cp `which ldconfig` ${DIR}/usr/bin + cp "$(type -P ldconfig)" "${DIR}/usr/bin" fi -LIBS=`mktemp` -BINS=`mktemp` @@ -106,8 +106,8 @@ index af289625..7db51c17 100755 -} - for i in $@ bash ls cat echo readlink socat; do -- I=`which $i` -- add_bin $I +- I=$(type -P "$i") +- add_bin "$I" -done -for i in `cat $BINS`; do - #echo Adding binary $i 1>&2 @@ -116,16 +116,16 @@ index af289625..7db51c17 100755 -for i in `cat $LIBS`; do - #echo Adding library $i 1>&2 - cp "$i" ${DIR}/usr/lib/ -+ I=$(readlink -f $(which $i)) -+ [ -e ${DIR}/usr/bin/$i ] && continue ++ I=$(readlink -f "$(type -P "$i")") ++ [ -e "${DIR}/usr/bin/$i" ] && continue + requisites=$(nix-store --query --requisites "$I") + for r in $requisites; do + # a single store item can be needed by multiple paths, no need to copy it again -+ if [ ! -e ${DIR}/$r ]; then -+ cp -r $r ${DIR}/$r ++ if [ ! -e "${DIR}/$r" ]; then ++ cp -r "$r" "${DIR}/$r" + fi + done -+ ln -s $I ${DIR}/usr/bin/$i ++ ln -s "$I" "${DIR}/usr/bin/$i" done ln -s bash ${DIR}/usr/bin/sh @@ -141,18 +141,18 @@ index af289625..7db51c17 100755 +# We do not copy C.UTF8 locale because it is in locale archive and +# that is already copied with glibc. + -+mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store -+chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed -+find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths -+find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets ++mv "${DIR}/nix/store" "${DIR}/usr/store" # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store ++chmod -R u+w "${DIR}" # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed ++find "${DIR}" -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths ++find "${DIR}" -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets if [ x$COLLECTION_ID != x ]; then collection_args=--collection-id=${COLLECTION_ID} diff --git a/tests/testlibrary.c b/tests/testlibrary.c -index 509ce6cc..6a333c9c 100644 +index 831d85c1..ae4f03d0 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -1399,7 +1399,7 @@ check_bwrap_support (void) +@@ -1601,7 +1601,7 @@ check_bwrap_support (void) { gint exit_code = 0; char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", @@ -162,44 +162,43 @@ index 509ce6cc..6a333c9c 100644 g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); diff --git a/triggers/desktop-database.trigger b/triggers/desktop-database.trigger -index 2188f535..d8283061 100755 +index 1037466d..c4c7ed6d 100755 --- a/triggers/desktop-database.trigger +++ b/triggers/desktop-database.trigger @@ -1,5 +1,5 @@ #!/bin/sh --if test \( -x "$(which update-desktop-database 2>/dev/null)" \) -a \( -d $1/exports/share/applications \); then -- exec update-desktop-database -q $1/exports/share/applications -+if test \( -d $1/exports/share/applications \); then -+ exec @dfu@/bin/update-desktop-database -q $1/exports/share/applications +-if command -v update-desktop-database >/dev/null && test -d "$1/exports/share/applications"; then +- exec update-desktop-database -q "$1/exports/share/applications" ++if test -d "$1/exports/share/applications"; then ++ exec @dfu@/bin/update-desktop-database -q "$1/exports/share/applications" fi diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger -index 711cfab2..07baa2ac 100755 +index d9fc8251..d8ddb96e 100755 --- a/triggers/gtk-icon-cache.trigger +++ b/triggers/gtk-icon-cache.trigger @@ -1,10 +1,10 @@ #!/bin/sh --if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d $1/exports/share/icons/hicolor \); then -- cp /usr/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/ -+if test \( -d $1/exports/share/icons/hicolor \); then -+ cp @hicolorIconTheme@/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/ - for dir in $1/exports/share/icons/*; do - if test -f $dir/index.theme; then -- if ! gtk-update-icon-cache --quiet $dir; then -+ if ! @gtk3@/bin/gtk-update-icon-cache --quiet $dir; then + if command -v gtk-update-icon-cache >/dev/null && test -d "$1/exports/share/icons/hicolor"; then +- cp /usr/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" ++ cp @hicolorIconTheme@/share/icons/hicolor/index.theme "$1/exports/share/icons/hicolor/" + for dir in "$1"/exports/share/icons/*; do + if test -f "$dir/index.theme"; then +- if ! gtk-update-icon-cache --quiet "$dir"; then ++ if ! @gtk3@/bin/gtk-update-icon-cache --quiet "$dir"; then echo "Failed to run gtk-update-icon-cache for $dir" exit 1 fi diff --git a/triggers/mime-database.trigger b/triggers/mime-database.trigger -index 2067d8ec..a49a8777 100755 +index 10ddbbb3..c270998a 100755 --- a/triggers/mime-database.trigger +++ b/triggers/mime-database.trigger @@ -1,5 +1,5 @@ #!/bin/sh --if test \( -x "$(which update-mime-database 2>/dev/null)" \) -a \( -d $1/exports/share/mime/packages \); then -- exec update-mime-database $1/exports/share/mime -+if test \( -d $1/exports/share/mime/packages \); then -+ exec @smi@/bin/update-mime-database $1/exports/share/mime +-if command -v update-mime-database >/dev/null && test -d "$1/exports/share/mime/packages"; then +- exec update-mime-database "$1/exports/share/mime" ++if test -d "$1/exports/share/mime/packages"; then ++ exec @smi@/bin/update-mime-database "$1/exports/share/mime" fi diff --git a/pkgs/development/libraries/flatpak/no-breaking-fish.patch b/pkgs/development/libraries/flatpak/no-breaking-fish.patch new file mode 100644 index 0000000000000..2a67aead1201e --- /dev/null +++ b/pkgs/development/libraries/flatpak/no-breaking-fish.patch @@ -0,0 +1,11 @@ +--- a/profile/flatpak.fish ++++ b/profile/flatpak.fish +@@ -1,7 +1,7 @@ + if type -q flatpak + # Set XDG_DATA_DIRS to include Flatpak installations + +- set -x --path XDG_DATA_DIRS ++ set -x --path XDG_DATA_DIRS $XDG_DATA_DIRS + + set -q XDG_DATA_DIRS[1]; or set XDG_DATA_DIRS /usr/local/share /usr/share + set -q XDG_DATA_HOME; or set -l XDG_DATA_HOME $HOME/.local/share diff --git a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch deleted file mode 100644 index 086114e11c30d..0000000000000 --- a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 9e885070..44fea035 100644 ---- a/icon-validator/validate-icon.c -+++ b/icon-validator/validate-icon.c -@@ -200,6 +200,8 @@ rerun_in_sandbox (const char *arg_width, - add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); - if (g_getenv ("G_MESSAGES_PREFIXED")) - add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); -+ if (g_getenv ("GDK_PIXBUF_MODULE_FILE")) -+ add_args (args, "--setenv", "GDK_PIXBUF_MODULE_FILE", g_getenv ("GDK_PIXBUF_MODULE_FILE"), NULL); - - add_args (args, validate_icon, arg_width, arg_height, filename, NULL); - g_ptr_array_add (args, NULL); diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index f6161535df5dd..41ede8b85a848 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -17,8 +17,7 @@ , nss , dbus , libgee -, evolution-data-server -, libgdata +, evolution-data-server-gtk4 , libsecret , db , python3 @@ -61,8 +60,7 @@ stdenv.mkDerivation rec { buildInputs = [ db dbus-glib - evolution-data-server - libgdata # required for some backends transitively + evolution-data-server-gtk4 libsecret libsoup libxml2 diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 807e96669c677..dd5056ced93fb 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchsvn, darwin, libtiff , libpng, zlib, libwebp, libraw, openexr, openjpeg , libjpeg, jxrlib, pkg-config -, fixDarwinDylibNames }: +, fixDarwinDylibNames, autoSignDarwinBinariesHook }: stdenv.mkDerivation { pname = "freeimage"; @@ -39,6 +39,8 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools fixDarwinDylibNames + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ]; buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ]; diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index d0d314037d282..ad5ef1ced5b8b 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -8,7 +8,6 @@ , pkg-config , meson , ninja -, git , vala , glib , zlib @@ -18,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gcab"; - version = "1.4"; + version = "1.5"; outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13q43iqld4l50yra45lhvkd376pn6qpk7rkx374zn8y9wsdzm9b7"; + sha256 = "Rr90QkkfqkFIJCuewqB4al9unv+xsFZuUpDozIbwDww="; }; patches = [ @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - git pkg-config vala gettext diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix new file mode 100644 index 0000000000000..a7f5b66a60e15 --- /dev/null +++ b/pkgs/development/libraries/gcr/4.nix @@ -0,0 +1,113 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, meson +, ninja +, gettext +, gnupg +, p11-kit +, glib +, libgcrypt +, libtasn1 +, gtk4 +, pango +, libsecret +, openssh +, systemd +, gobject-introspection +, wrapGAppsHook4 +, vala +, gi-docgen +, gnome +, python3 +, shared-mime-info +}: + +stdenv.mkDerivation rec { + pname = "gcr"; + version = "4.0.0"; + + outputs = [ "out" "bin" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "xFhVkk8O57q0Pi3Ti/r9KsgVxumGQ0HAFh4XEXPc7Hw="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + gobject-introspection + gi-docgen + wrapGAppsHook4 + vala + gi-docgen + shared-mime-info + ]; + + buildInputs = [ + gnupg + libgcrypt + libtasn1 + pango + libsecret + openssh + systemd + gtk4 + ]; + + propagatedBuildInputs = [ + glib + p11-kit + ]; + + checkInputs = [ + python3 + ]; + + mesonFlags = [ + # We are still using ssh-agent from gnome-keyring. + # https://github.com/NixOS/nixpkgs/issues/140824 + "-Dssh_agent=false" + ]; + + doCheck = false; # fails 21 out of 603 tests, needs dbus daemon + + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + + postPatch = '' + patchShebangs gcr/fixtures/ + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "gcr_4"; + packageName = pname; + }; + }; + + meta = with lib; { + platforms = platforms.unix; + maintainers = teams.gnome.members; + description = "GNOME crypto services (daemon and tools)"; + homepage = "https://gitlab.gnome.org/GNOME/gcr"; + license = licenses.lgpl2Plus; + + longDescription = '' + GCR is a library for displaying certificates, and crypto UI, accessing + key stores. It also provides the viewer for crypto files on the GNOME + desktop. + + GCK is a library for accessing PKCS#11 modules like smart cards, in a + (G)object oriented way. + ''; + }; +} diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index ff8ace9613fc6..ae7d7460487a9 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -7,9 +7,7 @@ , pkg-config , gettext , python3 -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_43 +, docutils , gi-docgen , glib , libtiff @@ -25,14 +23,14 @@ stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.42.8"; + version = "2.42.9"; outputs = [ "out" "dev" "man" "devdoc" ] ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hKzqOsskEbKRNLMgFaWxqqYoRLGcSx74uJccawdZ9MY="; + sha256 = "KPeVjnvymjLU6WNVbSQdCkGmeGWC/2pa0RZl4DR/yWI="; }; patches = [ @@ -59,9 +57,7 @@ stdenv.mkDerivation rec { gobject-introspection # for man pages - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 + docutils ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 1c1d4cfe507b3..e8476b0fefb8c 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -10,10 +10,7 @@ , gobject-introspection , grail , gtk3 -, libX11 -, libXext -, libXi -, libXtst +, xorg , pango , xorgserver }: @@ -38,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook python3Packages.wrapPython]; buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail - gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver + gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver ]; patchPhase = '' diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index e69ea93bb1216..ee619aad89ead 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , mesonEmulatorHook , ninja @@ -19,31 +18,17 @@ stdenv.mkDerivation rec { pname = "geocode-glib"; - version = "3.26.3"; + version = "3.26.4"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz"; - sha256 = "Hf6ug7kOzMobbPfc98XjsxeCjPC1YgXERx7w+RGZl2Y="; + sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o="; }; patches = [ ./installed-tests-path.patch - - # Install data for pi test. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geocode-glib/-/commit/0eb5c21cf4deb2c45aedf5a4393d4208b8dc6d58.patch"; - sha256 = "DmaPzGEu7f+gjjb2HSZ3+ZMc4EJSsba9ufsVysB0UPA="; - }) - # Fix pi test. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/geocode-glib/-/commit/464bb3bae5525566a7f41d157f73575cc4f3b5f8.patch"; - sha256 = "qSjXR8eKl+E38Zp7/Kgge/FxOLHYUJgRSR68okc3No0="; - postFetch = '' - substituteInPlace $out --replace "LC_MESSAGES" "LC_ALL" - ''; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch index c68b7a3a75c3c..e5f24abdddd1c 100644 --- a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch +++ b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch @@ -1,11 +1,17 @@ +diff --git a/geocode-glib/tests/meson.build b/geocode-glib/tests/meson.build +index 5cd1fca..c2f9a9d 100644 --- a/geocode-glib/tests/meson.build +++ b/geocode-glib/tests/meson.build -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ -install_dir = get_option('prefix') / get_option('datadir') / 'installed-tests' / library_name +-install_bindir = get_option('prefix') / get_option('libexecdir') / library_name +install_dir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / library_name ++install_bindir = get_option('installed_test_prefix') / 'libexec' / library_name e = executable('geo-uri', 'geo-uri.c', +diff --git a/meson_options.txt b/meson_options.txt +index 62b713d..1454416 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,9 @@ diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index e242115900547..6a24be2adbbba 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -9,7 +9,7 @@ , gtk3 , atk , gobject-introspection -, spidermonkey_91 +, spidermonkey_102 , pango , cairo , readline @@ -32,13 +32,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.72.2"; + version = "1.74.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3e43m9xafTA6XYlL4rKBvrisVFCGBOfT8geBqGnaOXc="; + sha256 = "sha256-fWQYr2LMc1VqssJbSt9n9FI4q4kliI96VyUTWdTr7R4="; }; patches = [ @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { cairo readline libsysprof-capture - spidermonkey_91 + spidermonkey_102 ]; checkInputs = [ diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 489e92648a991..60d812b16dcdf 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , substituteAll , meson @@ -8,7 +9,6 @@ , glib , gettext , makeWrapper -, python3 , gnutls , p11-kit , libproxy @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.72.2"; + version = "2.74.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "zSoITHu5HXjoSftV1A5HL22PaGLN3J8Sw5FJNZuhgmg="; + sha256 = "HxharvCUEj+OJdj6VWYbP9cQIBY6AXSts1o3aFzaYTs="; }; patches = [ @@ -36,18 +36,12 @@ stdenv.mkDerivation rec { ./installed-tests-path.patch ]; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - nativeBuildInputs = [ meson ninja pkg-config gettext makeWrapper - python3 # for install_script ]; buildInputs = [ diff --git a/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/pkgs/development/libraries/glib-networking/installed-tests-path.patch index 942ca053dd4fd..549307cca39d4 100644 --- a/pkgs/development/libraries/glib-networking/installed-tests-path.patch +++ b/pkgs/development/libraries/glib-networking/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 4d91677..aaaeb2b 100644 +index 01e18a9..5dbb2fc 100644 --- a/meson.build +++ b/meson.build -@@ -12,8 +12,8 @@ +@@ -12,8 +12,8 @@ libdir = join_paths(prefix, get_option('libdir')) libexecdir = join_paths(prefix, get_option('libexecdir')) localedir = join_paths(prefix, get_option('localedir')) @@ -14,12 +14,14 @@ index 4d91677..aaaeb2b 100644 cc = meson.get_compiler('c') host_system = host_machine.system() diff --git a/meson_options.txt b/meson_options.txt -index 3a525dd..fc86302 100644 +index c566ccd..80f7c33 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -3,4 +3,5 @@ +@@ -10,6 +10,7 @@ option('environment_proxy', type: 'feature', value: 'auto', description: 'suppor option('libproxy', type: 'feature', value: 'auto', description: 'support for libproxy proxy configration') option('gnome_proxy', type: 'feature', value: 'auto', description: 'support for GNOME desktop proxy configuration') option('installed_tests', type: 'boolean', value: false, description: 'enable installed tests') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') - option('static_modules', type: 'boolean', value: false, description: 'build static modules') + option('debug_logs', type: 'boolean', value: false, description: 'enable debug log messages (slow)') + + # Deprecated, use -Ddefault_library=static instead. diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c6da42738c6ae..45d8ee69a0225 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, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt +, libiconv, zlib, libffi, pcre2, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45, libxslt # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null , buildPackages @@ -44,11 +44,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glib"; - version = "2.72.3"; + version = "2.74.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; - sha256 = "Sjmi9iS4US1QDVhAFz7af6hfUcEJBS6ugGrOzoXTRfA="; + sha256 = "NlLH8HLXsDGmte3WI/d+vF3NKuaYWYq8yJ/znKda3TA="; }; patches = optionals stdenv.isDarwin [ @@ -90,6 +90,14 @@ stdenv.mkDerivation (finalAttrs: { # * gio-launch-desktop ./split-dev-programs.patch + # Fix build on Darwin + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2914 + (fetchpatch { + name = "gio-properly-guard-use-of-utimensat.patch"; + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/7f7171e68a420991b537d3e9e63263a0b2871618.patch"; + sha256 = "kKEqmBqx/RlvFT3eixu+NnM7JXhHb34b9NLRfAt+9h0="; + }) + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2866 (fetchpatch { name = "tests-skip-g-file-info-test-if-atime-unsupported.patch"; @@ -99,6 +107,12 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2867 ./tests-skip-shared-libs-if-default_library-static.patch + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2921 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/f0dd96c28751f15d0703b384bfc7c314af01caa8.patch"; + sha256 = "sha256-8ucHS6ZnJuP6ajGb4/L8QfhC49FTQG1kAGHVdww/YYE="; + }) + ./skip-timer-test.patch ]; @@ -107,7 +121,9 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; buildInputs = [ - libelf finalAttrs.setupHook pcre + libelf + finalAttrs.setupHook + pcre2 ] ++ optionals (!stdenv.hostPlatform.isWindows) [ bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch index 9a949ea1226c0..247db2150ede1 100644 --- a/pkgs/development/libraries/glib/split-dev-programs.patch +++ b/pkgs/development/libraries/glib/split-dev-programs.patch @@ -1,32 +1,32 @@ diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build -index 5ea6bae2f..e0b584a86 100644 +index f0a256898..9c8497cd0 100644 --- a/gio/gdbus-2.0/codegen/meson.build +++ b/gio/gdbus-2.0/codegen/meson.build -@@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) +@@ -19,7 +19,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir) # Install gdbus-codegen executable gdbus_codegen = configure_file(input : 'gdbus-codegen.in', output : 'gdbus-codegen', - install_dir : get_option('bindir'), + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', configuration : gdbus_codegen_conf ) - # Provide tools for others when we're a subproject and they use the Meson GNOME module diff --git a/gio/meson.build b/gio/meson.build -index 3535788ab..99c3b48d6 100644 +index fdd2528df..cf359c7d7 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,14 +831,15 @@ pkg.generate(libgio, +@@ -859,14 +859,15 @@ pkg.generate(libgio, variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 'bindir=' + join_paths('${prefix}', get_option('bindir')), + 'devbindir=' + get_option('devbindir'), 'giomoduledir=' + pkgconfig_giomodulesdir, 'gio=' + join_paths('${bindir}', 'gio'), -- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), -- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), +- 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), +- 'glib_compile_schemas=@0@'.format(pkgconfig_multiarch_bindir / 'glib-compile-schemas'), - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), -+ 'gio_querymodules=' + join_paths('${devbindir}', 'gio-querymodules'), -+ 'glib_compile_schemas=' + join_paths('${devbindir}', 'glib-compile-schemas'), ++ 'gio_querymodules=@0@'.format('${devbindir}' / 'gio-querymodules'), ++ 'glib_compile_schemas=@0@'.format('${devbindir}' / 'glib-compile-schemas'), + 'glib_compile_resources=' + join_paths('${devbindir}', 'glib-compile-resources'), 'gdbus=' + join_paths('${bindir}', 'gdbus'), - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), @@ -36,42 +36,45 @@ index 3535788ab..99c3b48d6 100644 'gsettings=' + join_paths('${bindir}', 'gsettings')], version : glib_version, install_dir : glib_pkgconfigreldir, -@@ -939,12 +940,14 @@ executable('gio', gio_tool_sources, +@@ -968,6 +969,7 @@ executable('gio', gio_tool_sources, executable('gresource', 'gresource-tool.c', install : true, + install_dir : get_option('devbindir'), + install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, - dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) +@@ -975,7 +977,7 @@ executable('gresource', 'gresource-tool.c', gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', install : true, +- install_dir : multiarch_bindir, + install_dir : get_option('devbindir'), + install_tag : 'bin', c_args : gio_c_args, # intl.lib is not compatible with SAFESEH - link_args : noseh_link_args, -@@ -953,6 +956,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -985,7 +987,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu glib_compile_schemas = executable('glib-compile-schemas', - [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'], + ['glib-compile-schemas.c'], install : true, +- install_dir : multiarch_bindir, + install_dir : get_option('devbindir'), + install_tag : 'bin', # intl.lib is not compatible with SAFESEH link_args : noseh_link_args, - dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) -@@ -960,6 +964,7 @@ glib_compile_schemas = executable('glib-compile-schemas', +@@ -994,6 +996,7 @@ glib_compile_schemas = executable('glib-compile-schemas', glib_compile_resources = executable('glib-compile-resources', - [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'], + [gconstructor_as_data_h, 'glib-compile-resources.c'], install : true, + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', c_args : gio_c_args, # intl.lib is not compatible with SAFESEH - link_args : noseh_link_args, diff --git a/glib/meson.build b/glib/meson.build -index aaf5f00f5..09edd291a 100644 +index 1e6dc36be..6b5de6c86 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -375,9 +375,10 @@ pkg.generate(libglib, +@@ -396,9 +396,10 @@ pkg.generate(libglib, subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), @@ -85,59 +88,46 @@ index aaf5f00f5..09edd291a 100644 version : glib_version, install_dir : glib_pkgconfigreldir, filebase : 'glib-2.0', -@@ -413,6 +414,7 @@ if host_system == 'windows' +@@ -435,6 +436,7 @@ if host_system == 'windows' else gtester = executable('gtester', 'gtester.c', install : true, + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', c_args : ['-UG_DISABLE_ASSERT'], include_directories : configinc, - dependencies : [libglib_dep]) -@@ -424,7 +426,7 @@ report_conf.set('PYTHON', python_name) +@@ -447,7 +449,7 @@ report_conf.set('PYTHON', python_name) configure_file( input: 'gtester-report.in', output: 'gtester-report', - install_dir: get_option('bindir'), + install_dir: get_option('devbindir'), + install_tag : 'bin-devel', configuration: report_conf, install_mode: 'rwxr-xr-x' - ) diff --git a/gobject/meson.build b/gobject/meson.build -index 85e283bab..386ad5e4e 100644 +index a994eb591..36b36b925 100644 --- a/gobject/meson.build +++ b/gobject/meson.build -@@ -75,7 +75,7 @@ foreach tool: python_tools +@@ -79,7 +79,7 @@ foreach tool: python_tools input : tool + '.in', output : tool, configuration : python_tools_conf, - install_dir : glib_bindir, + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', ) - # Set variables for later use -@@ -145,6 +145,7 @@ libgobject_dep = declare_dependency(link_with : libgobject, +@@ -155,6 +155,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep) executable('gobject-query', 'gobject-query.c', install : true, + install_dir : get_option('devbindir'), + install_tag : 'bin-devel', dependencies : [libglib_dep, libgobject_dep]) - install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) -diff --git a/meson.build b/meson.build -index 484f4c750..c7f9327d9 100644 ---- a/meson.build -+++ b/meson.build -@@ -2122,7 +2122,7 @@ if have_sh - gettextize_conf.set('datarootdir', glib_datadir) - gettextize_conf.set('datadir', glib_datadir) - configure_file(input : 'glib-gettextize.in', -- install_dir : glib_bindir, -+ install_dir : get_option('devbindir'), - output : 'glib-gettextize', - configuration : gettextize_conf) - endif diff --git a/meson_options.txt b/meson_options.txt -index 2c831e37e..5d8928577 100644 +index f13cbfdd5..f218db581 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,6 +3,11 @@ option('runtime_libdir', @@ -152,3 +142,16 @@ index 2c831e37e..5d8928577 100644 option('iconv', type : 'combo', choices : ['auto', 'libc', 'external'], +diff --git a/tools/meson.build b/tools/meson.build +index 0542fb89b..bfb10cd80 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -8,7 +8,7 @@ if have_sh + gettextize_conf.set('datarootdir', glib_datadir) + gettextize_conf.set('datadir', glib_datadir) + configure_file(input : 'glib-gettextize.in', +- install_dir : glib_bindir, ++ install_dir : get_option('devbindir'), + install_tag : 'bin-devel', + output : 'glib-gettextize', + configuration : gettextize_conf) diff --git a/pkgs/development/libraries/glib/tests-skip-shared-libs-if-default_library-static.patch b/pkgs/development/libraries/glib/tests-skip-shared-libs-if-default_library-static.patch index 681e361896e45..106ba4f99a97c 100644 --- a/pkgs/development/libraries/glib/tests-skip-shared-libs-if-default_library-static.patch +++ b/pkgs/development/libraries/glib/tests-skip-shared-libs-if-default_library-static.patch @@ -13,7 +13,7 @@ Part-of: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2867 --- gio/tests/meson.build | 43 +++++++++++++++++++++++------------------- glib/tests/meson.build | 2 +- - tests/meson.build | 30 +++++++++++++++-------------- + gmodule/tests/meson.build | 30 +++++++++++++++-------------- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build @@ -95,10 +95,10 @@ index 301158e0f..6203ff45e 100644 glib_tests += { 'gutils-user-database' : { 'depends' : [ -diff --git a/tests/meson.build b/tests/meson.build +diff --git a/gmodule/tests/meson.build b/gmodule/tests/meson.build index c95fa1d00..25144c941 100644 ---- a/tests/meson.build -+++ b/tests/meson.build +--- a/gmodule/tests/meson.build ++++ b/gmodule/tests/meson.build @@ -72,20 +72,22 @@ if ['darwin', 'ios'].contains(host_machine.system()) module_suffix = 'so' endif diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index f1f3df86349e6..531d487cb9334 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.72.1"; + version = "2.74.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KnZJooq13FOsTau3bJ9hWZ+8Yokjq2p910v2ddkVXNg="; + sha256 = "sha256-K0cmlsuseduOQFckEY7JRSGcW5sYr2PcjPt/HYmw8fo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 996eacd65f4c6..9f4a16a0ce41a 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.66.4"; + version = "2.66.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-GZrOVoLYGxWh1WVIC0qVBoLy22QCyKpd1yF9ce3/gdU="; + sha256 = "sha256-ezhGYt1uw7hsBXAzHTKvBdsr2Zp5FgK3Z7SgslZuwUk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix index 157d7fa84040a..6b58b171f7d3e 100644 --- a/pkgs/development/libraries/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "42.3"; + version = "43"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2lBBC48Z/X53WwDR/g26Z/xeEVHe0pkVjcJd2tw/qKk="; + sha256 = "sha256-PW4VMxdIYVdZaqOAL4dnZBTFcHOPRQqUoEH+iDVCCmk="; }; patches = lib.optionals stdenv.isLinux [ @@ -78,8 +78,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" "-Ddesktop_docs=false" - "-Ddate_in_gnome_version=false" - "-Dgnome_distributor=NixOS" ] ++ lib.optionals (!stdenv.isLinux) [ "-Dsystemd=disabled" "-Dudev=disabled" diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 1fed0b470691f..9ffa5d2a0d720 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,23 +1,24 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab , pkg-config , vala , glib , meson , ninja -, python3 , libxslt , gtk3 -, webkitgtk +, webkitgtk_4_1 , json-glib -, librest +, librest_1_0 +, libxml2 , libsecret , gtk-doc , gobject-introspection , gettext , icu , glib-networking -, libsoup +, libsoup_3 , docbook-xsl-nons , docbook_xml_dtd_412 , gnome @@ -30,7 +31,9 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.44.0"; + version = "3.46.0"; + + outputs = [ "out" "man" "dev" "devdoc" ]; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,11 +41,9 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-8dp3cizyQVHegDxX9G6iGLW5g44audn431hCPMS/KlA="; + sha256 = "sha256-qVd55fmhY05zJ871OWc3hd1eWjYbYJuxlE/T2i3VCUA="; }; - outputs = [ "out" "man" "dev" "devdoc" ]; - mesonFlags = [ "-Dfedora=false" # not useful in NixOS or for NixOS users. "-Dgtk_doc=true" @@ -61,7 +62,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook ]; @@ -75,19 +75,15 @@ stdenv.mkDerivation rec { icu json-glib libkrb5 - librest + librest_1_0 + libxml2 libsecret - libsoup - webkitgtk + libsoup_3 + webkitgtk_4_1 ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 175a149e5c6ba..bb306fb3a8591 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.72.0"; + version = "1.74.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 @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - sha256 = "Av6OWQhh2I+DBg3TnNpcyqYLLaHSHQ+VSZMBsYa+qrw="; + sha256 = "NHs6cZ5oukxp/y1X7iaJIz6owH/EkiBeVzOGd55C1lM="; }; patches = [ diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 4428b077a47d3..9e2585d7ee036 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.52"; + version = "0.10.53"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "YLnv2UNw8JabOU8KrIxuuR4V68DOEja0Sqc16xyYhAw="; + sha256 = "J/1YeW+qHNTMASDDTqhTFaCJHscfVbxnk8FOzxaKP1c="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index db968f4730f89..624dbd70a617c 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -7,9 +7,8 @@ , gettext , gperf , sqlite -, librest , libarchive -, libsoup +, libsoup_3 , gnome , libxml2 , lua5_3 @@ -31,11 +30,11 @@ stdenv.mkDerivation rec { pname = "grilo-plugins"; - version = "0.3.14"; + version = "0.3.15"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "aGhEs07HOySTH/bMT2Az8AcpR6bbYKzcf7Pq8Velgcg="; + sha256 = "hRjD2VT5MJXZVWJKBEzhanNFUy+BHSmdv6HhFM/rqzM="; }; patches = [ @@ -65,15 +64,14 @@ stdenv.mkDerivation rec { buildInputs = [ grilo libxml2 - libgdata + # libgdata lua5_3 liboauth sqlite gnome-online-accounts totem-pl-parser - librest libarchive - libsoup + libsoup_3 gmime gom json-glib diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index 2f8c291da0d6d..bf5d1db13406c 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -16,13 +16,13 @@ , libxml2 , gnome , gobject-introspection -, libsoup +, libsoup_3 , totem-pl-parser }: stdenv.mkDerivation rec { pname = "grilo"; - version = "0.3.14"; # if you change minor, also change ./setup-hook.sh + version = "0.3.15"; # if you change minor, also change ./setup-hook.sh outputs = [ "out" "dev" "man" "devdoc" ]; outputBin = "dev"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "A2nQsAuw9Zul966oz8Zl843xSltBgtKMfB4s0VtRh0M="; + sha256 = "81Ks9zZlZpk0JwY2/t5mtS2mgB/iD2OMQEirJnhXey0="; }; mesonFlags = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { liboauth gtk3 libxml2 - libsoup + libsoup_3 totem-pl-parser ]; diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 2f990a3cbe646..cbfddde09a02e 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gsasl"; - version = "2.0.1"; + version = "2.2.0"; src = fetchurl { url = "mirror://gnu/gsasl/${pname}-${version}.tar.gz"; - sha256 = "sha256-Mix1QgCIQbzYukrgkzsiAhHRkKe1anDdYfZVbezAG3o="; + sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k="; }; buildInputs = [ libidn libkrb5 ]; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 8a26742ce23e1..7431ca1f82a38 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "42.0"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZoYzWp7WI/euInb++lCkENTnHUIxiAgkcUBwyzFzI9I="; + sha256 = "XVVoKCqzi5V1nUJUAfdHblb4y/JimIVYdDn0O9C4S74="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gsl-lite/default.nix b/pkgs/development/libraries/gsl-lite/default.nix new file mode 100644 index 0000000000000..34beee93ecd32 --- /dev/null +++ b/pkgs/development/libraries/gsl-lite/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, installCompatHeader ? false +, installLegacyHeaders ? false +}: + +stdenv.mkDerivation rec { + pname = "gsl-lite"; + version = "0.40.0"; + + src = fetchFromGitHub { + owner = "gsl-lite"; + repo = "gsl-lite"; + rev = "v${version}"; + hash = "sha256-80ksT8XFn2LLMr63gKGZD/0+FDLnAtFyMpuuSjtoBlk="; + }; + + nativeBuildInputs = [ cmake ninja ]; + + cmakeFlags = lib.mapAttrsToList + (name: value: ''-DGSL_LITE_OPT_${name}:BOOL=${if value then "ON" else "OFF"}'') + { + INSTALL_COMPAT_HEADER = installCompatHeader; + INSTALL_LEGACY_HEADERS = installLegacyHeaders; + BUILD_TESTS = doCheck; + }; + + # Building tests is broken on Darwin. + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = '' + A single-file header-only version of ISO C++ Guidelines Support Library + (GSL) for C++98, C++11, and later + ''; + longDescription = '' + gsl-lite is a single-file header-only implementation of the C++ Core + Guidelines Support Library originally based on Microsoft GSL and adapted + for C++98, C++03. It also works when compiled as C++11, C++14, C++17, + C++20. + ''; + homepage = "https://github.com/gsl-lite/gsl-lite"; + changelog = "https://github.com/gsl-lite/gsl-lite/blob/${src.rev}/CHANGES.txt"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 9592fd1167666..f27e0e7be60a7 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "gspell"; - version = "1.11.1"; + version = "1.12.0"; outputs = [ "out" "dev" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "72qk4/cRd1FYp+JBpfgJzyQmvA4Cwjp9K1xx/D3gApI="; + sha256 = "QNKFDxu26HdSRvoeOUOLNsqvvbraHSihn6HKB+H/gq0="; }; patches = [ diff --git a/pkgs/development/libraries/gssdp/1.6.nix b/pkgs/development/libraries/gssdp/1.6.nix new file mode 100644 index 0000000000000..7dcd20991a268 --- /dev/null +++ b/pkgs/development/libraries/gssdp/1.6.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, python3 +, libsoup_3 +, glib +, gnome +, gssdp-tools +}: + +stdenv.mkDerivation rec { + pname = "gssdp"; + version = "1.6.0"; + + outputs = [ "out" "dev" ] + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "FI7UFijI8XM2osj6SxSrD7rpi2Amvi2s/d6nv0OGZok="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + python3 + ]; + + buildInputs = [ + libsoup_3 + ]; + + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = [ + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dsniffer=false" + "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + ]; + + doCheck = true; + + postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' + # Move developer documentation to devdoc output. + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ + | while IFS= read -r -d ''' file; do + moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc" + done + ''; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "gssdp_1_6"; + packageName = pname; + }; + + tests = { + inherit gssdp-tools; + }; + }; + + meta = with lib; { + broken = stdenv.isDarwin; + description = "GObject-based API for handling resource discovery and announcement over SSDP"; + homepage = "http://www.gupnp.org/"; + license = licenses.lgpl2Plus; + maintainers = teams.gnome.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 21af779a51124..3ec5cea99b047 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; + freeze = true; }; tests = { diff --git a/pkgs/development/libraries/gssdp/standalone-tools.patch b/pkgs/development/libraries/gssdp/standalone-tools.patch index f2273a978d675..6491afbe86781 100644 --- a/pkgs/development/libraries/gssdp/standalone-tools.patch +++ b/pkgs/development/libraries/gssdp/standalone-tools.patch @@ -22,9 +22,9 @@ index 40eb8e3..5db545b 100644 +project('gssdp-tools', 'c', version: '@version@') +gnome = import('gnome') + -+gssdp = dependency('gssdp-1.2') ++gssdp = dependency('gssdp-1.6') +gtk = dependency('gtk4', version : '>= 4') -+libsoup = dependency('libsoup-2.4', version : '>= 2.26.1') ++libsoup = dependency('libsoup-3.0', version : '>= 2.99.0') + resource = gnome.compile_resources( 'org.gupnp.GSSDP.DeviceSniffer', diff --git a/pkgs/development/libraries/gssdp/tools.nix b/pkgs/development/libraries/gssdp/tools.nix index 36bc564290080..5fcd0219a9458 100644 --- a/pkgs/development/libraries/gssdp/tools.nix +++ b/pkgs/development/libraries/gssdp/tools.nix @@ -5,14 +5,14 @@ , ninja , pkg-config , wrapGAppsHook4 -, gssdp +, gssdp_1_6 , gtk4 -, libsoup +, libsoup_3 }: stdenv.mkDerivation rec { pname = "gssdp-tools"; - inherit (gssdp) version src; + inherit (gssdp_1_6) version src; patches = [ # Allow building tools separately from the library. @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gssdp + gssdp_1_6 gtk4 - libsoup + libsoup_3 ]; preConfigure = '' @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Device Sniffer tool based on GSSDP framework"; homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; - maintainers = gssdp.meta.maintainers; + maintainers = gssdp_1_6.meta.maintainers; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 7245b97493038..82c5ea6597a5c 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.6"; + version = "3.24.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Sz4ULpROFjO7oAiQBgXDQak8/XVaf6KgCwXQQTQfEdY="; + sha256 = "HXo1r5xc7MrLJE7jwt65skVyDYUQrFx+b0tvmUfmeJw="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 74acd6f743d61..b7828de45585e 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -70,7 +70,9 @@ stdenv.mkDerivation rec { dbus ]; - doCheck = stdenv.isLinux; + # Broken by PCRE 2 bump in GLib. + # https://gitlab.gnome.org/GNOME/gtksourceview/-/issues/283 + doCheck = false; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 307fb15e98d87..25bd8127a546f 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.4.2"; + version = "5.6.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "rRQOB+uEGRDeSDwJK9SIWr0puq3W6V+iLZPtLfC3nec="; + sha256 = "ZZ2cydA0oRTwfn4TTugNd97ASXyxUWrlNpEZwvy52hY="; }; patches = [ diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix new file mode 100644 index 0000000000000..7054a75d38879 --- /dev/null +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, glib +, gssdp_1_6 +, libsoup_3 +, libxml2 +, gnome +}: + +stdenv.mkDerivation rec { + pname = "gupnp"; + version = "1.6.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-MsSdrkd4zT74/Zpg9jdenId2ju5sPAWzPYp5+R4Ivcs="; + }; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + ]; + + propagatedBuildInputs = [ + glib + gssdp_1_6 + libsoup_3 + libxml2 + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dintrospection=true" + ]; + + doCheck = true; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + attrPath = "gupnp_1_6"; + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "http://www.gupnp.org/"; + description = "An implementation of the UPnP specification"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index afb6c0d037cbd..07b64064ce635 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; + freeze = true; }; }; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 039a5cb41619b..8e4cf0ac936e9 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.2.0"; + version = "22.2.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-Wy2OroZI4bo+3OdKaa0e5N+QNKKgWVOJrK1Cdda8yDI="; + sha256 = "sha256-/v2RUn/s3wrBdfClXkm6MM9KfSEWjbE2Njs3fDqXaj8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 1b461ee9e1cd5..925cd2eeb8f85 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.5.2"; + version = "22.5.3.1"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-3WqmTM68XdQfGibkVAT1S9N7Cn8eviNM6qUeF8qogtc="; + sha256 = "sha256-3l8mfw1h1se0+w4VtfMr0xuPW8G3JA6hbvkyCaEGTek="; }; patches = [ diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 288f12ac1fcf4..665fdb3f93e38 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 = "22.5.3"; + version = "22.5.4"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-oWwES0XKjhVGPVsPo4t9WWorm+4J6lMPa+/pSY7r6I0="; + sha256 = "sha256-f9b0+BWUlekMM0huPdJ5Ms4tYr/ipgfLiQ310FQKAXA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index e7704c32122bc..168ab3bdf63e3 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.98/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.99/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 6379a5e2e31b8..ee6a33a83225f 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -1,12 +1,13 @@ { mkDerivation, extra-cmake-modules, - qtbase, qtx11extras + qtbase, qtx11extras, + wayland, plasma-wayland-protocols }: mkDerivation { pname = "kidletime"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; + buildInputs = [ qtx11extras wayland plasma-wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 6b03f50687a2c..2c7ae1f8a4b22 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/attica-5.98.0.tar.xz"; - sha256 = "0w1w6w2jia1q32jnn2dhyxmkq64ha1dcbsqj233v4f224rp3aknp"; - name = "attica-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/attica-5.99.0.tar.xz"; + sha256 = "1cb3cdn8v68d14l7gax4zdjk0vgqwj6gxmdnzhf9qfvik6rd6nhp"; + name = "attica-5.99.0.tar.xz"; }; }; baloo = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/baloo-5.98.0.tar.xz"; - sha256 = "0x515lnvrzlnsv5i924q17mzi88k00krj90myad17s0g7p5pi1rw"; - name = "baloo-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/baloo-5.99.0.tar.xz"; + sha256 = "0spz0sa2lbdbm12d10bswcyawayxpykk3v8yicv5khgf6adpdyq0"; + name = "baloo-5.99.0.tar.xz"; }; }; bluez-qt = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/bluez-qt-5.98.0.tar.xz"; - sha256 = "0h2k2qiskn921cpni5rs7x5ahric6dlllwsrk77akpi4xcsrip2g"; - name = "bluez-qt-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/bluez-qt-5.99.0.tar.xz"; + sha256 = "11fg7lk1yxj5dfq7s8z17n9prvnqfvk1hsgyd1ygi1x1d2qipjg7"; + name = "bluez-qt-5.99.0.tar.xz"; }; }; breeze-icons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/breeze-icons-5.98.0.tar.xz"; - sha256 = "0a3zvmhcfsnxv0jpyjny3sl769p99psadl1872v0qlkax47pvsjp"; - name = "breeze-icons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/breeze-icons-5.99.0.tar.xz"; + sha256 = "1z9wrmb4jj7sfnb7kqmx2ww53vily52ycm7rgycr2b1q0jf6j3s8"; + name = "breeze-icons-5.99.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/extra-cmake-modules-5.98.0.tar.xz"; - sha256 = "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w"; - name = "extra-cmake-modules-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/extra-cmake-modules-5.99.0.tar.xz"; + sha256 = "0zl0hwp077b8w338bl0210i6892kwfx2vqpn55qvb3b20sk8m081"; + name = "extra-cmake-modules-5.99.0.tar.xz"; }; }; frameworkintegration = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/frameworkintegration-5.98.0.tar.xz"; - sha256 = "1mrangjj8lhm4njpkhqna2zwnidkd9crs23gj6kdlwzmiknypi6q"; - name = "frameworkintegration-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/frameworkintegration-5.99.0.tar.xz"; + sha256 = "14dx60xvgcb6nf5d83cgm7y6wc8d7ngxg6aaka6k8996qfkczz9k"; + name = "frameworkintegration-5.99.0.tar.xz"; }; }; kactivities = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kactivities-5.98.0.tar.xz"; - sha256 = "0n7r88y1b8mph5al2xh8fbw5ckdzdmdzjipf205y20ib35bskd9i"; - name = "kactivities-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kactivities-5.99.0.tar.xz"; + sha256 = "1l7jzj3nscfmbiq105v9gkz4sd0c92vydmhw4j9mjjjn16aqbs39"; + name = "kactivities-5.99.0.tar.xz"; }; }; kactivities-stats = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kactivities-stats-5.98.0.tar.xz"; - sha256 = "0zvw3km1wf91wl9xbjvawjia0847kbs3js4nbf3d0z87l5h6rbx8"; - name = "kactivities-stats-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kactivities-stats-5.99.0.tar.xz"; + sha256 = "0cr0sjk1rwv3zjvmhs2xc7wfs33r9x6padybc7v2aq751gz5cc4k"; + name = "kactivities-stats-5.99.0.tar.xz"; }; }; kapidox = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kapidox-5.98.0.tar.xz"; - sha256 = "1k2qk8ibv5dqdhkn2992n8rlmslpmngz83hxb7zrh3pkphdg8v2n"; - name = "kapidox-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kapidox-5.99.0.tar.xz"; + sha256 = "15r8x5z50xwfmh507kf3hsr8yqlfank224hfhcrpyl1vi256jb8c"; + name = "kapidox-5.99.0.tar.xz"; }; }; karchive = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/karchive-5.98.0.tar.xz"; - sha256 = "1ipj7j1iw6g56z0qppji38h6qwbs05piiqqbsw8hdbf96l6cdiq2"; - name = "karchive-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/karchive-5.99.0.tar.xz"; + sha256 = "1z4msj6w7g2fy2mp07aadm9f2qv5x4mhjisv7ppl8hrhz355f6ap"; + name = "karchive-5.99.0.tar.xz"; }; }; kauth = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kauth-5.98.0.tar.xz"; - sha256 = "0nzdvx2mibpq1cgzpll9ffjr46vch1qvriaywyqih0iybx6mx5z6"; - name = "kauth-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kauth-5.99.0.tar.xz"; + sha256 = "14xz3gh4p7dn0wacjyqwm5x82kiwik3nswx7icmhnq686cvp7fin"; + name = "kauth-5.99.0.tar.xz"; }; }; kbookmarks = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kbookmarks-5.98.0.tar.xz"; - sha256 = "1rpjqz2xnpb2wp2k3pjdclbkb0p96y48x6h8l056nr93alxyrqvi"; - name = "kbookmarks-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kbookmarks-5.99.0.tar.xz"; + sha256 = "0vb8q69ki6aqmq8hacqq886dl7kwf9zyw015vb52nsinv8zjvf5m"; + name = "kbookmarks-5.99.0.tar.xz"; }; }; kcalendarcore = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcalendarcore-5.98.0.tar.xz"; - sha256 = "16kclspsjzld9n07z1i8li2pc91ihpqhbk46a4s92nsihs2dkayk"; - name = "kcalendarcore-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcalendarcore-5.99.0.tar.xz"; + sha256 = "11zcgjkz0q4da3vxis7b4lg07sfvk01z0dgx1ccpa15ardmc8l8r"; + name = "kcalendarcore-5.99.0.tar.xz"; }; }; kcmutils = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcmutils-5.98.0.tar.xz"; - sha256 = "0jqkg4i16jnxricrhi1cbvv7gjjj7ry3z36mzh11h48ml7rl05qx"; - name = "kcmutils-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcmutils-5.99.0.tar.xz"; + sha256 = "1ljaz8xja2z720cr6n8g2lizsb4kw4vlakfv5xhq466am27csyvm"; + name = "kcmutils-5.99.0.tar.xz"; }; }; kcodecs = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcodecs-5.98.0.tar.xz"; - sha256 = "0n10r7s9r25xp7vlym41qi421kld00niig73yark7yghj0r41jcz"; - name = "kcodecs-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcodecs-5.99.0.tar.xz"; + sha256 = "0xi0hscwf4kv5cp7hxwialy2wqr6ijdh0syh9p43icwx6c8q1kb2"; + name = "kcodecs-5.99.0.tar.xz"; }; }; kcompletion = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcompletion-5.98.0.tar.xz"; - sha256 = "191vid00zskvhl6dgj6yz9iyvwdcmg35l5gq68ggjr17cj59acsf"; - name = "kcompletion-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcompletion-5.99.0.tar.xz"; + sha256 = "14s7nmslli2vaiwg993rg0wvfqlnfcvxadapl41s92iisf6b4m2b"; + name = "kcompletion-5.99.0.tar.xz"; }; }; kconfig = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kconfig-5.98.0.tar.xz"; - sha256 = "15m2bggfr682q68dym7nzmvz7q7pwarzijad1wj0r5cs62l3bkjy"; - name = "kconfig-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kconfig-5.99.0.tar.xz"; + sha256 = "19jqsah1x1086sqnv5f4bicmi4c5y8idxrx96ji7jign5z9c7isx"; + name = "kconfig-5.99.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kconfigwidgets-5.98.0.tar.xz"; - sha256 = "05bwldqc5k6dlzsxjby5565sch6i0mh7jg5cbyjz24xb1fpj0d7b"; - name = "kconfigwidgets-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kconfigwidgets-5.99.0.tar.xz"; + sha256 = "07xzgmx3fvrynzhnnxrdr4536n1v10rwgk2z92q1y1q18cmbwyc5"; + name = "kconfigwidgets-5.99.0.tar.xz"; }; }; kcontacts = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcontacts-5.98.0.tar.xz"; - sha256 = "0g3lg1i9rg7hjw7xjx9228sy54dy35lgwghcjds5cawszl5yi106"; - name = "kcontacts-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcontacts-5.99.0.tar.xz"; + sha256 = "1f3288xll0kd0dyq7namfykq8f9zkg5lm27lk2vfvba4v28hdax5"; + name = "kcontacts-5.99.0.tar.xz"; }; }; kcoreaddons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcoreaddons-5.98.0.tar.xz"; - sha256 = "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52"; - name = "kcoreaddons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcoreaddons-5.99.0.tar.xz"; + sha256 = "06qkyk3zjkpjd7zynx5krh6k2qx8nxmggyhkvd4dgcbi74ys6xjs"; + name = "kcoreaddons-5.99.0.tar.xz"; }; }; kcrash = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kcrash-5.98.0.tar.xz"; - sha256 = "03ba3x9jgp15dxgwbjnv5s98f5di2z4ncp4hiv1qkyiibqqfx6kf"; - name = "kcrash-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kcrash-5.99.0.tar.xz"; + sha256 = "1wn3cwdhipw2ry1qf58cf24vq23jg8rnki33vc6mwbi54qkc95p8"; + name = "kcrash-5.99.0.tar.xz"; }; }; kdav = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdav-5.98.0.tar.xz"; - sha256 = "02474a3k7yqgnb1sbxbnm6l4cahn88y2631jvkq9xlmcx7xs2dzi"; - name = "kdav-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdav-5.99.0.tar.xz"; + sha256 = "1r36nlybwwn5pk6q9hl4zkyhp3vyrqdp75g4fd4jj1a2y88yiwzd"; + name = "kdav-5.99.0.tar.xz"; }; }; kdbusaddons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdbusaddons-5.98.0.tar.xz"; - sha256 = "0fwdmlnci2xn5pi1ywgia3xka3zsh6gl6xpx1gvql7lczk1y490a"; - name = "kdbusaddons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdbusaddons-5.99.0.tar.xz"; + sha256 = "1n9j9gf4br0vykbwf1n0zcvwfz727d71ny92ka0g97bid7nwrix0"; + name = "kdbusaddons-5.99.0.tar.xz"; }; }; kdeclarative = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdeclarative-5.98.0.tar.xz"; - sha256 = "0y5scmcnzhwvyb7x6fdb59xgdhghw8v9i3r05gx1x7g1gfsw0wh6"; - name = "kdeclarative-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdeclarative-5.99.0.tar.xz"; + sha256 = "191s25l07z0blqcap23l6gbzvxa6pcqhsfaqfkf4f3vap48wr2hn"; + name = "kdeclarative-5.99.0.tar.xz"; }; }; kded = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kded-5.98.0.tar.xz"; - sha256 = "1k8yxdnihfvvdjmw7lmd62vi5k1hpvjdcwd7njqxz6178iq7dd75"; - name = "kded-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kded-5.99.0.tar.xz"; + sha256 = "1kbh921p3n9zszbvsrnrmi32v567s7dqp7dfm13kykmz9lsxih82"; + name = "kded-5.99.0.tar.xz"; }; }; kdelibs4support = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kdelibs4support-5.98.0.tar.xz"; - sha256 = "0hyyrxic1rkw2jrr92rnmbk6bqkfrcnpc917vs7xyansk9799b8f"; - name = "kdelibs4support-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kdelibs4support-5.99.0.tar.xz"; + sha256 = "074d7qaai4xj2w1534862a13flqfchdr2c6651gdgrw4275cfd85"; + name = "kdelibs4support-5.99.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kdesignerplugin-5.98.0.tar.xz"; - sha256 = "17b0javl6k5zcmx04aqzmh3qdgwvzhf62x603m4pg6xbl3zns67g"; - name = "kdesignerplugin-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kdesignerplugin-5.99.0.tar.xz"; + sha256 = "0wvx95nx11b25ib1yqmagvzp2ky7yqdrwaxm03cvhb0y92ymmrmf"; + name = "kdesignerplugin-5.99.0.tar.xz"; }; }; kdesu = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdesu-5.98.0.tar.xz"; - sha256 = "15fbb7zifk4lhnlwvqhs9svzb80qwms03zbrjfnsc1n1wyyfk7v2"; - name = "kdesu-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdesu-5.99.0.tar.xz"; + sha256 = "0chwfman5ka1fgbv5ckr21z93xmbhccv527y43mqa9rwa3gdk4xk"; + name = "kdesu-5.99.0.tar.xz"; }; }; kdewebkit = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kdewebkit-5.98.0.tar.xz"; - sha256 = "03bwwgzh1xfj4w7q2cvr7712yrjgf9qhqkqgzypcdb49gpvaq164"; - name = "kdewebkit-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kdewebkit-5.99.0.tar.xz"; + sha256 = "1m1x63w6qb4dbr5p9vzg0v5hc0bxk86h2qswm52nx8wagapi1qhp"; + name = "kdewebkit-5.99.0.tar.xz"; }; }; kdnssd = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdnssd-5.98.0.tar.xz"; - sha256 = "0wcjq0g1cdjz9npy31i4rqbx85a95f15w71aamhm8x82l8nysv4g"; - name = "kdnssd-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdnssd-5.99.0.tar.xz"; + sha256 = "071ab2gx19vrl5jcm14w4y0rk431wmmmkzcs8mkcr8rwpdclyca7"; + name = "kdnssd-5.99.0.tar.xz"; }; }; kdoctools = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kdoctools-5.98.0.tar.xz"; - sha256 = "0ygpjasdynsmb3c8rdwnc5jminl5f34cmqnihsig831xsq8z6chs"; - name = "kdoctools-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kdoctools-5.99.0.tar.xz"; + sha256 = "19p3lkis641cdbbfpld122n242l3980j5x38mwd6slpl2alyz5f6"; + name = "kdoctools-5.99.0.tar.xz"; }; }; kemoticons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kemoticons-5.98.0.tar.xz"; - sha256 = "0f3d0jmpnqkrjn95sbvjzda923rfdgrlxd4k58pmzd0bblxkcxh2"; - name = "kemoticons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kemoticons-5.99.0.tar.xz"; + sha256 = "1fihsp4w9icc47fswnikmdpdwrznrv2zdddc59akd5n308224sys"; + name = "kemoticons-5.99.0.tar.xz"; }; }; kfilemetadata = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kfilemetadata-5.98.0.tar.xz"; - sha256 = "1nsvslhs2kiff3r5ji8z931lh6srvjzzvwnv9cs0j74sr46c6rkn"; - name = "kfilemetadata-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kfilemetadata-5.99.0.tar.xz"; + sha256 = "15ni3ns6c85a7121nph9c48f9ddna5bfj1134wrn76jwa2scs7vs"; + name = "kfilemetadata-5.99.0.tar.xz"; }; }; kglobalaccel = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kglobalaccel-5.98.0.tar.xz"; - sha256 = "1vr6k7lpxsxa6in60ld2wcdqfpaan5xgbmwm3xyr584x6pv737cl"; - name = "kglobalaccel-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kglobalaccel-5.99.0.tar.xz"; + sha256 = "0c4wi6kpra34wwvsj12f1bis8jkv4c57jgp9b5k72h04hpnps7a7"; + name = "kglobalaccel-5.99.0.tar.xz"; }; }; kguiaddons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kguiaddons-5.98.0.tar.xz"; - sha256 = "022qf858khdqklq117i223ihpw8mvdcbcfn8cwqmn2cv9qnfxnqj"; - name = "kguiaddons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kguiaddons-5.99.0.tar.xz"; + sha256 = "0kqvf7h98d0bsgqmcfwasi7ik3025g0bi3brx47wrkd3nxjym1zf"; + name = "kguiaddons-5.99.0.tar.xz"; }; }; kholidays = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kholidays-5.98.0.tar.xz"; - sha256 = "0ysw52wiyxrkprn0gis85nphpfl1wdb4439i66dfmg7s9nyqpzp0"; - name = "kholidays-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kholidays-5.99.0.tar.xz"; + sha256 = "1k165ksmznhx2d5ycmw1lwly7qkmj50113w1qrfqvg16jl6il4zq"; + name = "kholidays-5.99.0.tar.xz"; }; }; khtml = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/khtml-5.98.0.tar.xz"; - sha256 = "0bflwrp6i2w6a3fq2m2df655495rpnsmqcm7w1f1dzfndc6yd9i5"; - name = "khtml-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/khtml-5.99.0.tar.xz"; + sha256 = "0vwkii8x6l3sw0nkxvv960frz9qgjxpkxg6cabxvp3v5gcb3fbzr"; + name = "khtml-5.99.0.tar.xz"; }; }; ki18n = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/ki18n-5.98.0.tar.xz"; - sha256 = "0b3r53v2ybhlyqpkjv98dv2w9q49yqqxk9qzbyc4mm7ypq4hvl47"; - name = "ki18n-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/ki18n-5.99.0.tar.xz"; + sha256 = "1bgq7saadrh9vvx15hyf03cir1nywad63vlg07qpc8ra01ddsi0m"; + name = "ki18n-5.99.0.tar.xz"; }; }; kiconthemes = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kiconthemes-5.98.0.tar.xz"; - sha256 = "1qmld8xgabmwx2dh5395pll0a0jgirxhlbqv6aph76jg4lvynkqx"; - name = "kiconthemes-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kiconthemes-5.99.0.tar.xz"; + sha256 = "019s0wr00s6c8p70jzi3vr2m5wkc3rsnlc44ldn16z4r4x9wl9m4"; + name = "kiconthemes-5.99.0.tar.xz"; }; }; kidletime = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kidletime-5.98.0.tar.xz"; - sha256 = "1jdbjkishqnlzz1qrzyg92xnlsl7w89dmrh0zhzaj9bnr5a3icck"; - name = "kidletime-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kidletime-5.99.0.tar.xz"; + sha256 = "1wfwhfzhpsy1m5zm2m99dsg0g9hjns33m4v4714sfpyngzqwlggg"; + name = "kidletime-5.99.0.tar.xz"; }; }; kimageformats = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kimageformats-5.98.0.tar.xz"; - sha256 = "0v4jr1lh2qjk453q8mpz94cd98k4kmjrykn8kxrd7zvrkaa4snfy"; - name = "kimageformats-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kimageformats-5.99.0.tar.xz"; + sha256 = "1vmi3mi7gg81f556dm8gk7i3k9izr008swpdpyqd3n03zva3drh6"; + name = "kimageformats-5.99.0.tar.xz"; }; }; kinit = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kinit-5.98.0.tar.xz"; - sha256 = "04654hz3yipnlhy5gz3bkh988fcfl1lv7608k4xa5qnbsxaqh141"; - name = "kinit-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kinit-5.99.0.tar.xz"; + sha256 = "0xq1sqyni7xzcnjiaszaxwhv7q2p4zjp6nixkam356iswkbss0i3"; + name = "kinit-5.99.0.tar.xz"; }; }; kio = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kio-5.98.0.tar.xz"; - sha256 = "0z1ikpa3an3qmd26h2v48kxxw1jph21i12x4nawvc4x1dp4vkm1d"; - name = "kio-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kio-5.99.0.tar.xz"; + sha256 = "0z587zrmdxg2dld6x6qzkpnqbcar7swz76ihhclwhcsjp94vzlpg"; + name = "kio-5.99.0.tar.xz"; }; }; kirigami2 = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kirigami2-5.98.0.tar.xz"; - sha256 = "1l0ggwrprmg5n5y3gxv7h4593fg87d7naxkf30603kkavq0hgks6"; - name = "kirigami2-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kirigami2-5.99.0.tar.xz"; + sha256 = "1qh3vpac07582d944zgh3sxsb5i4kn2csa5dj6m52697jfpyp25r"; + name = "kirigami2-5.99.0.tar.xz"; }; }; kitemmodels = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kitemmodels-5.98.0.tar.xz"; - sha256 = "1z9swjmll833jxy2ym63zzgi9vl8ld79mgypndqszsrd4mfsbs16"; - name = "kitemmodels-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kitemmodels-5.99.0.tar.xz"; + sha256 = "1z52dkrj5pg0c3avm8jph54j4vjfswsnkcmbdnbg6337qs6rvkip"; + name = "kitemmodels-5.99.0.tar.xz"; }; }; kitemviews = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kitemviews-5.98.0.tar.xz"; - sha256 = "176gqlinsvdgkbg7kr4qd97mnvcnbymrkcs9kg6hm75qzxcaj8dj"; - name = "kitemviews-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kitemviews-5.99.0.tar.xz"; + sha256 = "13gr90sjbpqkzg370d82ji03wn9d3zcnvlhmpkvclbql6knx0q8i"; + name = "kitemviews-5.99.0.tar.xz"; }; }; kjobwidgets = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kjobwidgets-5.98.0.tar.xz"; - sha256 = "0f87n5d3h2f9y1z2imfd0jj9108wbcxg7dg4k1c53zar2lrfx4wc"; - name = "kjobwidgets-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kjobwidgets-5.99.0.tar.xz"; + sha256 = "1ywqpcw925wl1lcrqpkvdhwj5s4m3n02mghx8pir7w42n36ykxq6"; + name = "kjobwidgets-5.99.0.tar.xz"; }; }; kjs = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kjs-5.98.0.tar.xz"; - sha256 = "03is1a5b1sfh1nd011lchgir9nrywvax06ilg9y7z0vsn0ick7ik"; - name = "kjs-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kjs-5.99.0.tar.xz"; + sha256 = "0jsy13gjhyl0yhdx7dxxapaqigr9a06bz555pngnfzf6lia15wa0"; + name = "kjs-5.99.0.tar.xz"; }; }; kjsembed = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kjsembed-5.98.0.tar.xz"; - sha256 = "0zb4vr0hp73lzc1gfnpq1grwmlpdvnp8awf3ydx4vqjh9n6jbaf2"; - name = "kjsembed-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kjsembed-5.99.0.tar.xz"; + sha256 = "0w104v96416bcf18aimxqykmi7d40l2x53g8d91zjclpylxx12gw"; + name = "kjsembed-5.99.0.tar.xz"; }; }; kmediaplayer = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kmediaplayer-5.98.0.tar.xz"; - sha256 = "0wcv99xgg9pxijbjl4cmsgmpwb893ira6wd3ys5ihk2nakbvd09x"; - name = "kmediaplayer-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kmediaplayer-5.99.0.tar.xz"; + sha256 = "1f2cn1gakjh7m52gsm4294ccn35iwwa35diyd6r8k6fvyf0bn3ny"; + name = "kmediaplayer-5.99.0.tar.xz"; }; }; knewstuff = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/knewstuff-5.98.0.tar.xz"; - sha256 = "09mxzpv0l1i5ml963gdnji8rskmi8b2f0hp4rn6ibkcj00z48fgy"; - name = "knewstuff-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/knewstuff-5.99.0.tar.xz"; + sha256 = "0bd7shvl6m4gry8cql2p64iba8iim12rsj5shaqp31n512mbc928"; + name = "knewstuff-5.99.0.tar.xz"; }; }; knotifications = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/knotifications-5.98.0.tar.xz"; - sha256 = "10whr3wjldaxdvbj6i250rqgsy2m1n606ja1yka571f1fz7laqcd"; - name = "knotifications-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/knotifications-5.99.0.tar.xz"; + sha256 = "0arhbhf5hrg943zmr9gs6dq3z7jifica72bqnxpv4jgn05l15c9n"; + name = "knotifications-5.99.0.tar.xz"; }; }; knotifyconfig = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/knotifyconfig-5.98.0.tar.xz"; - sha256 = "1qlmgr5rifygp8zk8qfjwm6k72kfyj8x6hvqwy2a59lfi3wgbm07"; - name = "knotifyconfig-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/knotifyconfig-5.99.0.tar.xz"; + sha256 = "1k0ryay0vdd0slzcdjlvp3kry7q9v3drx06jl1qwamfjs4ak65xp"; + name = "knotifyconfig-5.99.0.tar.xz"; }; }; kpackage = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kpackage-5.98.0.tar.xz"; - sha256 = "1234jq9qqhq2z5afkkniz6w5s1ab9r4x9wamq3c9y08nzjq634py"; - name = "kpackage-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kpackage-5.99.0.tar.xz"; + sha256 = "05z459mg0l0gv8749sdsgj9xfhwqgsv2cxwfjsqv06nymgq71jyq"; + name = "kpackage-5.99.0.tar.xz"; }; }; kparts = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kparts-5.98.0.tar.xz"; - sha256 = "01gcnywbzrgwlk4cws2rr139r95r201yfal1af3jkd7g2x499vgr"; - name = "kparts-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kparts-5.99.0.tar.xz"; + sha256 = "0pkw1r1hr34ppl72blcmsdgp9a37dav7l83nc3dfcfvkhzzj0ch0"; + name = "kparts-5.99.0.tar.xz"; }; }; kpeople = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kpeople-5.98.0.tar.xz"; - sha256 = "0wxy8pxkbfqbb4i9v3q912shzck56bk6xra3blhwva82qm9rps0f"; - name = "kpeople-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kpeople-5.99.0.tar.xz"; + sha256 = "0gb63gvi61gncmd79i1zdjcgidlmb4xh5ldvp6piydw5kl2z81bz"; + name = "kpeople-5.99.0.tar.xz"; }; }; kplotting = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kplotting-5.98.0.tar.xz"; - sha256 = "0hnzyl1x6acv1psdgsa9prpvnm12j71x6w6wbs1b0fl9bv5zw222"; - name = "kplotting-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kplotting-5.99.0.tar.xz"; + sha256 = "0yxlzh1ffjs4b3fw7yxkvsxiabm1jw8zgkzzgqvmsjs41h1g8nyq"; + name = "kplotting-5.99.0.tar.xz"; }; }; kpty = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kpty-5.98.0.tar.xz"; - sha256 = "0arxbdxldwnrcg5x1vpvkwdd4hayrpqvn08jz6r7zb4s9h1582ww"; - name = "kpty-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kpty-5.99.0.tar.xz"; + sha256 = "0vg8s3minm1p2qmhp7i7d0yxvbkzpxibvb76w9kag1ds3lq8k150"; + name = "kpty-5.99.0.tar.xz"; }; }; kquickcharts = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kquickcharts-5.98.0.tar.xz"; - sha256 = "1xll5yf8cjziraxgybmhclnsg1i5lgmvh5bqqnwnzncg8anzijhk"; - name = "kquickcharts-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kquickcharts-5.99.0.tar.xz"; + sha256 = "0b60jj9w491amciq3cragsyjfzamzakajhvzfb76xpjw2wvjaqb9"; + name = "kquickcharts-5.99.0.tar.xz"; }; }; kross = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kross-5.98.0.tar.xz"; - sha256 = "0yjn66r44jxlrm4vz1nf8s64kcw7lmarjpqz1mcgb1n4jc28hs60"; - name = "kross-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kross-5.99.0.tar.xz"; + sha256 = "1ml8fylm66dksnx5d3n2p0mndxwspqb25ak3inlf8m2my6asixvv"; + name = "kross-5.99.0.tar.xz"; }; }; krunner = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/krunner-5.98.0.tar.xz"; - sha256 = "0kch839xw09h1lddqgdcfwniq6rza5wdyyzcx99hcasn7l60nhsj"; - name = "krunner-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/krunner-5.99.0.tar.xz"; + sha256 = "1nf8cvzvbgaynimgf5i3lc632w71zzypbdg8a25lyvvc2n5qf895"; + name = "krunner-5.99.0.tar.xz"; }; }; kservice = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kservice-5.98.0.tar.xz"; - sha256 = "0lgwpcdkkbxwq84zp5aymrdwy0iacqxz5ckc89pymcm0bacyhl31"; - name = "kservice-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kservice-5.99.0.tar.xz"; + sha256 = "0ra6znqja27g3r4b856h26nchn8h5lzxahazsyx5ndrkx1ranl0s"; + name = "kservice-5.99.0.tar.xz"; }; }; ktexteditor = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/ktexteditor-5.98.0.tar.xz"; - sha256 = "1pazi9rz4v95g31s7d26yla8rcb0cgd08mlmdcasywsaxc8nn7vw"; - name = "ktexteditor-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/ktexteditor-5.99.0.tar.xz"; + sha256 = "13462wsc5nd71w6hyn010zgmw83ml02kpximazk0pjf6akamqg8j"; + name = "ktexteditor-5.99.0.tar.xz"; }; }; ktextwidgets = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/ktextwidgets-5.98.0.tar.xz"; - sha256 = "14ivmpng7x9rsk3x6kyd86jabzqxgjcdrma1im44wacnvisi4llk"; - name = "ktextwidgets-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/ktextwidgets-5.99.0.tar.xz"; + sha256 = "1a39nj96hi6wvzig9khp1rfh32hfd25zgmzb5ybz0rpqagqdzs1i"; + name = "ktextwidgets-5.99.0.tar.xz"; }; }; kunitconversion = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kunitconversion-5.98.0.tar.xz"; - sha256 = "0lhyg1d1k25kqk94lzy8mb06p4c17limmcrzirnsnxjvhjrc6r05"; - name = "kunitconversion-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kunitconversion-5.99.0.tar.xz"; + sha256 = "0bx44j94j2zp68n32zkml101j49pi1zq829aqsl8zxdzyj4qm8ny"; + name = "kunitconversion-5.99.0.tar.xz"; }; }; kwallet = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kwallet-5.98.0.tar.xz"; - sha256 = "0kwxkxlk0xlxkjgpjpb40xfl2l9hnhpymb4lxw4zwlxjn81r6sab"; - name = "kwallet-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kwallet-5.99.0.tar.xz"; + sha256 = "01raw36fzk3bjih72vi9ixyc0pngbqr6amyvwiy3lmkjd1rnpinj"; + name = "kwallet-5.99.0.tar.xz"; }; }; kwayland = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kwayland-5.98.0.tar.xz"; - sha256 = "0c0953gm63xhrqb7aspvf28wi7x31mrgaid23dw5gqphkbgis5qw"; - name = "kwayland-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kwayland-5.99.0.tar.xz"; + sha256 = "18k5vmlg1ahxv83892937k4d9h5yz7a06nj0v6dfjcx8wcjj3gm7"; + name = "kwayland-5.99.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kwidgetsaddons-5.98.0.tar.xz"; - sha256 = "117wki4w2bs1d2pjhi5qpb2b3qhhva6fq9gikba5fb6980kmdayr"; - name = "kwidgetsaddons-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kwidgetsaddons-5.99.0.tar.xz"; + sha256 = "0scjrpwbp4p8hkxbvsaamd0y7fx5drq7nl6icfsm5v2v5rpa5kas"; + name = "kwidgetsaddons-5.99.0.tar.xz"; }; }; kwindowsystem = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kwindowsystem-5.98.0.tar.xz"; - sha256 = "02l7xmxcilmrxpkkid4m9srl0d8ymqgwpw5j80w3g57p0rahwjl1"; - name = "kwindowsystem-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kwindowsystem-5.99.0.tar.xz"; + sha256 = "0xzqlw0nr8icdmwpr6rpi806ryb7wl6pm6cznmdhf19caszkzlgl"; + name = "kwindowsystem-5.99.0.tar.xz"; }; }; kxmlgui = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/kxmlgui-5.98.0.tar.xz"; - sha256 = "08n5l3zgkh0fxaqwrfx5mk4j5wq9ylkpxd37751qcivpag7l0x45"; - name = "kxmlgui-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/kxmlgui-5.99.0.tar.xz"; + sha256 = "1p2ay1hfkhm3cfzyb7b31y5i7scq0z3cypysryfcnz75zz7wd4ic"; + name = "kxmlgui-5.99.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/portingAids/kxmlrpcclient-5.98.0.tar.xz"; - sha256 = "09apfrkgvvzv8zwxyjbi5qb145a9awirk02nx474bshgypfqslpb"; - name = "kxmlrpcclient-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/portingAids/kxmlrpcclient-5.99.0.tar.xz"; + sha256 = "0rma78pj0h3ss28ncz7km0cd5l1rwwf5vraf0h96apb0vh2y115x"; + name = "kxmlrpcclient-5.99.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/modemmanager-qt-5.98.0.tar.xz"; - sha256 = "0gk4jy3r1451a2dajhnz6lin4lfawc4qdlxp7n7m43ca4d89h13k"; - name = "modemmanager-qt-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/modemmanager-qt-5.99.0.tar.xz"; + sha256 = "0wjcrnkgaxq5kqck6fl2328k220byhmc66ss63x7rmz7y3jir17g"; + name = "modemmanager-qt-5.99.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/networkmanager-qt-5.98.0.tar.xz"; - sha256 = "0s1h02v9k8nyl30mw7gayzvpb8bnzzp9crcfqpry7rf02rxv9idw"; - name = "networkmanager-qt-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/networkmanager-qt-5.99.0.tar.xz"; + sha256 = "0643dx3jcjrabrhds2d3lh5h9c7dc6q26gg4vb5vrhgwsybqzna9"; + name = "networkmanager-qt-5.99.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/oxygen-icons5-5.98.0.tar.xz"; - sha256 = "03wk52hqrgj0r73nb4yiq7rnmdn4rrqzrj3cdzbg3flkw5r7wbbq"; - name = "oxygen-icons5-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/oxygen-icons5-5.99.0.tar.xz"; + sha256 = "1pak09dps9fwcs6rcbvjdxvivw8ahcvnmzk175ky7xjq065aprlc"; + name = "oxygen-icons5-5.99.0.tar.xz"; }; }; plasma-framework = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/plasma-framework-5.98.0.tar.xz"; - sha256 = "1bmwvk0pj0bnb8qhcl0bz82r63nls6h7lzzmkfkdwcwmjifmiqg4"; - name = "plasma-framework-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/plasma-framework-5.99.0.tar.xz"; + sha256 = "1ax029s0nmcv4cg6pqgv66hgyj5b4djdvvnmpmzb1003l22aivck"; + name = "plasma-framework-5.99.0.tar.xz"; }; }; prison = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/prison-5.98.0.tar.xz"; - sha256 = "1ppqm1f06q8fc1ncvzn9a133npmvlh1qxgvvbpwn6m0a8cr7ac6w"; - name = "prison-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/prison-5.99.0.tar.xz"; + sha256 = "1wf1fkqgnyrbd8i2mhkb6baynkkg010f2lbiwbz77jkrkv0vkpl4"; + name = "prison-5.99.0.tar.xz"; }; }; purpose = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/purpose-5.98.0.tar.xz"; - sha256 = "0g9ykhsn9dl3y3qp4wm3r7bkdhpl9mcbg671wa26qx3ba8a2jynr"; - name = "purpose-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/purpose-5.99.0.tar.xz"; + sha256 = "1bh2rrc3h9r95qv5kn45nhx10vgcfv6y7qfl7r152mrsvas317qy"; + name = "purpose-5.99.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/qqc2-desktop-style-5.98.0.tar.xz"; - sha256 = "1af7izd4k220dzngf1nwgcw0bi7vl772lpjrqd9fp9rijh74dx7d"; - name = "qqc2-desktop-style-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/qqc2-desktop-style-5.99.0.tar.xz"; + sha256 = "19pykvy9ifnfnhh7587dbb68jnk1bfjyipw3f1gshqr9b9vgjfdx"; + name = "qqc2-desktop-style-5.99.0.tar.xz"; }; }; solid = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/solid-5.98.0.tar.xz"; - sha256 = "14bf2k40skhyhrmgyyscg7psm1a8klf4z696pimlwjjhnawjfr06"; - name = "solid-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/solid-5.99.0.tar.xz"; + sha256 = "0yyhyqhvb2r374idn70rr74vyjvrgsv604issvx8d8dmvwyldrcb"; + name = "solid-5.99.0.tar.xz"; }; }; sonnet = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/sonnet-5.98.0.tar.xz"; - sha256 = "0j4p91xx1scg3jmvq6km7bwfjz5ihafk76yf1byb6aqyw50h3bm3"; - name = "sonnet-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/sonnet-5.99.0.tar.xz"; + sha256 = "1r57zhxfcgkp2bh3yqirdyl1s040qjzcsg4jsvvzqp10z408xwgk"; + name = "sonnet-5.99.0.tar.xz"; }; }; syndication = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/syndication-5.98.0.tar.xz"; - sha256 = "04py880hxkvidydsqcyjbkq0wv9cp42d7svkdgf74fmzfyfrmrax"; - name = "syndication-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/syndication-5.99.0.tar.xz"; + sha256 = "1lfgm0a2wmsssr4vlw5h4gjvci6g11n78y609mzk5hw51989i672"; + name = "syndication-5.99.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/syntax-highlighting-5.98.0.tar.xz"; - sha256 = "092ilbhhs8xaqblc9w1xksapdzvqyazz8lj011wz4762p1nagiq2"; - name = "syntax-highlighting-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/syntax-highlighting-5.99.0.tar.xz"; + sha256 = "0yh92dmf6kfannbx1iv90k7g931vlqw82qfvhbk7m8kvggdvy2xy"; + name = "syntax-highlighting-5.99.0.tar.xz"; }; }; threadweaver = { - version = "5.98.0"; + version = "5.99.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.98/threadweaver-5.98.0.tar.xz"; - sha256 = "1pwinpz5kscx64kc7dn4qf76m64kxzp92zjk8j2a2s1mx0s0vk2s"; - name = "threadweaver-5.98.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.99/threadweaver-5.99.0.tar.xz"; + sha256 = "1j3vcr2kcmd01byklnly239xb07vs9d74vnd7y37zjbg3yx14ina"; + name = "threadweaver-5.99.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix index 3af1c44bf885b..3ccde40b751bb 100644 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ b/pkgs/development/libraries/kirigami-addons/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "kirigami-addons"; - version = "21.05"; + version = "0.4"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "0pwkpag15mvzhd3hvdwx0a8ajwq9j30r6069vsx85bagnag3zanh"; + sha256 = "sha256-3RPOab10kLcMVBngcRILDXbhOBI/BhjkMZqWVC0IPlM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix index f3617059f1e7c..e0e804c11018b 100644 --- a/pkgs/development/libraries/kweathercore/default.nix +++ b/pkgs/development/libraries/kweathercore/default.nix @@ -2,23 +2,25 @@ , lib , fetchFromGitLab , extra-cmake-modules +, kholidays , ki18n , qtlocation }: mkDerivation rec { pname = "kweathercore"; - version = "0.5"; + version = "0.6"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "08ipabskhsbspkzzdlpwl89r070q8d0vc9500ma6d5i9fnpmkz6d"; + sha256 = "sha256-LIgUSXKHcRqcBwGTRxU5Z4eHuWmPLerorlrnI6Cf9k4="; }; buildInputs = [ + kholidays ki18n qtlocation ]; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index b0d09a5f74912..71a800520adc9 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -3,8 +3,7 @@ , fetchFromGitHub , autoreconfHook , imlib2 -, libX11 -, libXext +, xorg , ncurses , pkg-config , zlib @@ -32,8 +31,8 @@ stdenv.mkDerivation rec { zlib (imlib2.override { inherit x11Support; }) ] ++ lib.optionals x11Support [ - libX11 - libXext + xorg.libX11 + xorg.libXext ]; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index a8208820dff47..b3087f0abea7b 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -2,22 +2,14 @@ stdenv.mkDerivation rec { pname = "libcdr"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.xz"; - sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81"; + hash = "sha256-VmYknWE0ZrmqHph+pBCcBDZYZuknfYD2zZZj6GuOzdQ="; }; - patches = [ - # Fix build with icu 68 - # Remove in next release - (fetchpatch { - name = "libcdr-fix-icu-68"; - url = "https://cgit.freedesktop.org/libreoffice/libcdr/patch/?id=bf3e7f3bbc414d4341cf1420c99293debf1bd894"; - sha256 = "0cgra10p8ibgwn8y5q31jrpan317qj0ribzjs4jq0bwavjq92w2k"; - }) - ]; + strictDeps = true; buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 20609509b66d8..34440d67818d8 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,5 +1,25 @@ -{ 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 */ }: +{ fetchurl +, fetchpatch +, lib +, stdenv +, meson +, ninja +, vala +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, pkg-config +, glib +, gtk3 +, cairo +, sqlite +, gnome +, clutter-gtk +, libsoup +, libsoup_3 +, gobject-introspection /*, libmemphis */ +, withLibsoup3 ? false +}: stdenv.mkDerivation rec { pname = "libchamplain"; @@ -10,13 +30,40 @@ stdenv.mkDerivation rec { sha256 = "0rihpb0npqpihqcdz4w03rq6xl7jdckfqskvv9diq2hkrnzv8ch2"; }; + patches = lib.optionals withLibsoup3 [ + # Port to libsoup3 + # https://gitlab.gnome.org/GNOME/libchamplain/-/merge_requests/13 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libchamplain/-/commit/1cbaf3193c2b38e447fbc383d4c455c3dcac6db8.patch"; + excludes = [ ".gitlab-ci.yml" ]; + sha256 = "uk38gExnUgeUKwhDsqRU77hGWhJ+8fG5dSiV2MAWLFk="; + }) + ]; + outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; - buildInputs = [ sqlite libsoup ]; + buildInputs = [ + sqlite + (if withLibsoup3 then libsoup_3 else libsoup) + ]; - propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk ]; + propagatedBuildInputs = [ + glib + gtk3 + cairo + clutter-gtk + ]; mesonFlags = [ "-Dgtk_doc=true" @@ -44,7 +91,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - maintainers = teams.gnome.members; - platforms = platforms.gnu ++ platforms.linux; # arbitrary choice + maintainers = teams.gnome.members ++ teams.pantheon.members; + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index b34790d59c735..cec611f366cf9 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.5"; + version = "0.20.6"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "MYY6iVfVpyf5BnSVyr8KCIn6XT1EYm5UCUMxGI1cFRg="; + sha256 = "G/g09eENYMxhJNdO08HdONpkZ4f794ciILi0Bo5HbU0="; }; doCheck = true; diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index 7ae7bff50efa5..1c5d43af12e06 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,19 +1,43 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome -, webkitgtk, libsoup, libxml2, libarchive }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, glib +, gobject-introspection +, gnome +, webkitgtk_4_1 +, libsoup_3 +, libxml2 +, libarchive +}: stdenv.mkDerivation rec { pname = "libgepub"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7"; + sha256 = "IQpMeJXC6E8BpWglArpej6PqiWrzFw+yWS/OHdpW4C4="; }; - doCheck = true; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + ]; + + buildInputs = [ + glib + webkitgtk_4_1 + libsoup_3 + libxml2 + libarchive + ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection ]; - buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; + doCheck = true; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 5efd751bbb1ee..251f86b057893 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,19 +1,31 @@ -{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome, gobject-introspection }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gobject-introspection +, glib +, gtk3 +, libxklavier +, wrapGAppsHook +, gnome +}: stdenv.mkDerivation rec { pname = "libgnomekbd"; - version = "3.26.1"; + version = "3.28.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp"; + sha256 = "ItxZVm1zwAZTUPWpc0DmLsx7CMTfGRg4BLuL4kyP6HA="; }; nativeBuildInputs = [ - file - intltool + meson + ninja pkg-config wrapGAppsHook glib @@ -27,9 +39,9 @@ stdenv.mkDerivation rec { glib ]; - postPatch = '' - substituteInPlace libgnomekbd/Makefile.in \ - --replace "shell pkg-config" 'shell $(PKG_CONFIG)' + postInstall = '' + # Missing post-install script. + glib-compile-schemas "$out/share/glib-2.0/schemas" ''; passthru = { diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 6897ed5a09733..b567a99d455d5 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,6 +1,8 @@ -{ fetchurl +{ fetchFromGitLab , lib , stdenv +, autoreconfHook +, gtk-doc , pkg-config , intltool , gettext @@ -21,12 +23,26 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bmwg0HeDOQadWDwNY3WdKX6BfqENDYl+u+ll8W4ujlI="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "libgsf"; + rev = "LIBGSF_${lib.replaceStrings ["."] ["_"] version}"; + hash = "sha256-6RP2DJWcDQ8dkKtcPxAkRsS7jSvvLoDNZHXiDJwR8Eg="; }; + postPatch = '' + # Fix cross-compilation + substituteInPlace configure.ac \ + --replace "AC_PATH_PROG(PKG_CONFIG, pkg-config, no)" \ + "PKG_PROG_PKG_CONFIG" + ''; + + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook + gtk-doc pkg-config intltool libintl diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 77a4b936ae544..0dfa6b91a79f8 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -5,27 +5,28 @@ , ninja , pkg-config , libxml2 +, json-glib , glib , gettext -, libsoup +, libsoup_3 , gi-docgen , gobject-introspection , python3 , tzdata -, geocode-glib +, geocode-glib_2 , vala , gnome }: stdenv.mkDerivation rec { pname = "libgweather"; - version = "4.0.0"; + version = "4.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RA1EgBtvcrSMZ25eN/kQnP7hOU/XTMknJeGxuk+ug0w="; + sha256 = "r4qBLaDYl2oADh1iVywlYIaoFzI/vzWwZtv92NLKYgM="; }; patches = [ @@ -52,9 +53,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libsoup + libsoup_3 libxml2 - geocode-glib + json-glib + geocode-glib_2 ]; mesonFlags = [ @@ -64,7 +66,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs build-aux/meson/meson_post_install.py patchShebangs build-aux/meson/gen_locations_variant.py # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 58d9097d83780..de3bdad3e8dfe 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.6.3"; + version = "1.8.0"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R3iL01gE69M8sJkR6XU0TIQ1ngttlSCv0cgh66i6d/8="; + sha256 = "sha256-bCVCwFeJJLDCm3rmy0TrJt846wHW1e89fQsIJXYyMOg="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix index 77987362cb3fe..f1b6d18a86b24 100644 --- a/pkgs/development/libraries/libks/default.nix +++ b/pkgs/development/libraries/libks/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libks"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "1wvl8kzi1fx7pg58r5x1lw4gwkvrkljqajsn72yq6sbsd3iqn8wr"; + sha256 = "sha256-Bfp8+jqXu1utlaYuPewm+t3zHxaTWEw+cGZu1nFzkDk="; }; patches = [ diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 5d3bf851f9ef5..781e62982b38b 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-NtZjAXwp1JraoWsB750itKv1b+cfLwbr4XuxgIuZ+8A="; + sha256 = "sha256-Mbmd1bhFnc4feC0bnOa5mD15DxvY4Sgftx3Ep/7Cdp4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 7564e87cdc25b..032589336237b 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -9,7 +9,7 @@ , gtk-doc , docbook_xsl , glib -, libsoup +, libsoup_3 , libxml2 , libxslt , check @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib - libsoup + libsoup_3 libxml2 libxslt ]; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 95e56153e51c2..e218a78bdfc3b 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.32.0"; + version = "1.34.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1iVSD6AuiXcCmyRq5Dm8IYloll8egtYSIItxPx3MPQ4="; + sha256 = "QwX3Fdq0ta0+gAfa7DFmJecGWpTmPiXvVese+5ZKe/A="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/development/libraries/librest/1.0.nix index 30482a510274b..cbd525d40b0e3 100644 --- a/pkgs/development/libraries/librest/1.0.nix +++ b/pkgs/development/libraries/librest/1.0.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gobject-introspection ]; - buildInputs = [ + propagatedBuildInputs = [ glib json-glib libsoup_3 diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 91e0033cd2746..1d2954eb74fcc 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -22,23 +22,32 @@ , vala , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform , gobject-introspection -, nixosTests +, _experimental-update-script-combinators +, common-updater-scripts +, jq +, nix }: stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.54.4"; + version = "2.55.1"; - outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ + outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6hUqJD9qQ8DgNqKMcN4/y83qVmTGgRx4WSvCKezCSDM="; + sha256 = "a69IqdOlb9E7v7ufH3Z1myQLcKH6Ig/SOEdNZqkm+Yw="; }; - cargoVendorDir = "vendor"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-nRmOB9Jo+mmB0+wXrQvoII4e0ucV7bNCDeuk6CbcPdk="; + # TODO: move this to fetchCargoTarball + dontConfigure = true; + }; strictDeps = true; @@ -83,16 +92,10 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004 (lib.enableFeature (withIntrospection && !stdenv.isDarwin) "vala") - "--enable-installed-tests" "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}"; - makeFlags = [ - "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG" - "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/RSVG" - ]; - 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 @@ -131,14 +134,40 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - - tests = { - installedTests = nixosTests.installed-tests.librsvg; - }; + updateScript = + let + updateSource = gnome.updateScript { + packageName = "librsvg"; + }; + + updateLockfile = { + command = [ + "sh" + "-c" + '' + PATH=${lib.makeBinPath [ + common-updater-scripts + jq + nix + ]} + # update-source-version does not allow updating to the same version so we need to clear it temporarily. + # Get the current version so that we can restore it later. + latestVersion=$(nix-instantiate --eval -A librsvg.version | jq --raw-output) + # Clear the version. Provide hash so that we do not need to do pointless TOFU. + # Needs to be a fake SRI hash that is non-zero, since u-s-v uses zero as a placeholder. + # Also cannot be here verbatim or u-s-v would be confused what to replace. + update-source-version librsvg 0 "sha256-${lib.fixedWidthString 44 "B" "="}" --source-key=cargoDeps > /dev/null + update-source-version librsvg "$latestVersion" --source-key=cargoDeps > /dev/null + '' + ]; + # Experimental feature: do not copy! + supportedFeatures = [ "silent" ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateLockfile + ]; }; meta = with lib; { diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index 7443ec4c502db..5911e199bcb2f 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -10,7 +10,7 @@ , glib , cairo , sqlite -, libsoup +, libsoup_3 , gtk4 , xvfb-run , gnome @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libshumate"; - version = "1.0.0.alpha.1"; + version = "1.0.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libshumate"; rev = version; - sha256 = "4kCXFUJRglh1aIBk03MNUV8jfx0mJzIFCUDM4g9tzlg="; + sha256 = "fpHMfxnPnGJSfJe4kJ28+704QjjRwYddOZAB17QxXno="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { glib cairo sqlite - libsoup + libsoup_3 gtk4 ]; diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 2b1c6e68795f9..af7d640b6de11 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , glib , meson , ninja @@ -15,27 +16,37 @@ , withVala ? stdenv.buildPlatform == stdenv.hostPlatform , libpsl , python3 +, gi-docgen , brotli , libnghttp2 }: stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.0.7"; + version = "3.2.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-69+QzzWZwRrLtoGKnZ4/ydLGjlbrgpuTlilyaD4b98g="; + sha256 = "sha256-KDI3BpjKj5+/F0w0W3PYm2BWEQOmJsLfcHJrBwf3m9M="; }; + # https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/310 + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libsoup/-/commit/0fae143dc8b0e668b7a35a9c1364009e7cf06d0f.patch"; + sha256 = "sha256-yAKC7WGk0aQxMkT4At6Qfx1QO2InNotITrl/Lim41Jk="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config glib python3 + gi-docgen ] ++ lib.optionals withIntrospection [ gobject-introspection ] ++ lib.optionals withVala [ @@ -64,8 +75,6 @@ stdenv.mkDerivation rec { "-Dntlm=disabled" # Requires wstest from autobahn-testsuite. "-Dautobahn=disabled" - # Requires quart Python module. - "-Dhttp2_tests=disabled" # Requires gnutls, not added for closure size. "-Dpkcs11_tests=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ @@ -82,6 +91,11 @@ stdenv.mkDerivation rec { patchShebangs libsoup/ ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { propagatedUserEnvPackages = [ glib-networking.out diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index 9f92ed5fd459e..d6e6475917291 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , fetchpatch , meson @@ -21,16 +22,25 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "40.1"; + version = "43.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AxNPoRTvP740B1qoNnj1iqLevp/O9OojwHeeKGAdZhE="; + sha256 = "kFvNuFhH1rj4hh5WswzW3GHq5n7O9M2ZSp+SWiaiwf4="; }; + patches = [ + # bamfdaemon crashes with libwnck3 43.0 + # https://bugs.launchpad.net/ubuntu/+source/libwnck3/+bug/1990263 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libwnck/-/commit/6ceb684442eb26e3bdb8a38bf52264ad55f96a7b.patch"; + sha256 = "/1wCnElCrZB7XTDW/l3dxMKZ9czGnukbGu4/aQStoXE="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index d895574d527d2..7f7b202576f6c 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.12.3"; + version = "1.14.0"; src = fetchurl { - url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-uE/b+8hJzk/fCEuyi1jlRjsbS2zI8gDcd7QfhUXVMp0="; + url = "https://wpewebkit.org/releases/libwpe-${version}.tar.xz"; + sha256 = "wHMwW7rF9EAswcikdTv6PWOkCJAfhhggUeqlp13YnAA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index 736b408323dd7..ce385f24c208c 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.12.1"; + version = "1.14.0"; src = fetchurl { - url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-RaqDPETsKS8x+pQ7AbjMdeVOtiOte6amb8LxGP5p5ik="; + url = "https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz"; + sha256 = "51sMsscUVEhBboaWAT2Ig/Z1xmwR7XUOBoZe/sWAkVU="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/development/libraries/libyuv/default.nix index ac69ab8dacc0a..d0d692ed98151 100644 --- a/pkgs/development/libraries/libyuv/default.nix +++ b/pkgs/development/libraries/libyuv/default.nix @@ -24,10 +24,12 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; + NIX_CFLAGS_LINK = lib.optional stdenv.isDarwin "-ljpeg"; + meta = with lib; { homepage = "https://chromium.googlesource.com/libyuv/libyuv"; description = "Open source project that includes YUV scaling and conversion functionality"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ leixb ]; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 144a215acb454..29fa134ba69d1 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , autoreconfHook , cctools +, autoSignDarwinBinariesHook +, fixDarwinDylibNames }: stdenv.mkDerivation rec { @@ -17,7 +19,9 @@ stdenv.mkDerivation rec { }; configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; - nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ cctools ]; + + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optionals stdenv.isDarwin [ cctools autoSignDarwinBinariesHook fixDarwinDylibNames ]; meta = { homepage = "https://liquidsdr.org/"; diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 4154f0315cd24..92ec23542883f 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , gobject-introspection -, wrapGAppsHook +, wrapGAppsNoGuiHook , glib , coreutils , accountsservice @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.10.5"; + version = "0.11.0"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "sha256-UPKAStB6wTd3qbbISHMgNw1bJjIRgn89tHnsw4ZptvQ="; + sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA="; }; patches = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ninja pkg-config gobject-introspection - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix index e306267154ae2..8969d1e134284 100644 --- a/pkgs/development/libraries/malcontent/ui.nix +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -4,14 +4,15 @@ , pkg-config , gobject-introspection , itstool -, wrapGAppsHook +, wrapGAppsHook4 , glib , accountsservice , dbus , flatpak , malcontent -, gtk3 -, appstream-glib +, gtk4 +, libadwaita +, appstream , desktop-file-utils , polkit , glib-testing @@ -39,11 +40,11 @@ stdenv.mkDerivation rec { gobject-introspection itstool desktop-file-utils - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - appstream-glib + appstream dbus polkit glib-testing @@ -54,7 +55,8 @@ stdenv.mkDerivation rec { accountsservice malcontent glib - gtk3 + gtk4 + libadwaita ]; mesonFlags = [ @@ -64,6 +66,12 @@ stdenv.mkDerivation rec { "-Dui=enabled" ]; + postPatch = '' + # https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148 + substituteInPlace build-aux/meson_post_install.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache + ''; + meta = with lib; { description = "UI components for parental controls library"; homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 825694aad889f..09eaa64e600a2 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.83"; - hash = "sha256-qyPqZ/lkCQuLc8gKZ0CCVxw25fTrqSBXrGSMnB3vASg="; + version = "3.84"; + hash = "sha256-mjh//jUP8U8AHZQ/lswMBkiRVR1x4al6Xdv/5/EgeiU="; } diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix index 7225efad2f68b..3554457d3f279 100644 --- a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nvidia-vaapi-driver"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "elFarto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/9PCqjs0hiIM7ZLvDesff5Bh0a1B8/w/CTw62spw+j4="; + sha256 = "sha256-c74XJW9e8sgjBuTpZQOgIvgEoP73aQlx6beE6bChYfw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index b13aa66eb8f2b..30ddc3d3b629c 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { homepage = "https://oracle.github.io/odpi/"; maintainers = with maintainers; [ mkazulak flokli ]; license = licenses.asl20; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 8c205d73287f3..8220ac503e38d 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.12"; + version = "3.2.13"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "sha256-EvqQvg7khsJ2OrcoHBImd9fTgjA65pVRqbJuMV5MG80="; + sha256 = "sha256-s1OleVRvJRFvN9MwXT7lAjDjyHkbIkbpl/F8P/91oaU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 8dd2415433a69..5d2ad71bada8e 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -2,8 +2,6 @@ , libdeflate, libpng, libtiff, zlib, lcms2, jpylyzer , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server -, opjViewerSupport ? false, wxGTK # OPJViewer executable -, openjpegJarSupport ? false # Openjpeg jar (Java) , jdk , poppler }: @@ -45,8 +43,8 @@ stdenv.mkDerivation rec { "-DBUILD_THIRDPARTY=OFF" (mkFlag jpipLibSupport "BUILD_JPIP") (mkFlag jpipServerSupport "BUILD_JPIP_SERVER") - (mkFlag opjViewerSupport "BUILD_VIEWER") - (mkFlag openjpegJarSupport "BUILD_JAVA") + "-DBUILD_VIEWER=OFF" + "-DBUILD_JAVA=OFF" (mkFlag doCheck "BUILD_TESTING") ]; @@ -54,8 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdeflate libpng libtiff zlib lcms2 ] ++ lib.optionals jpipServerSupport [ curl fcgi ] - ++ lib.optional opjViewerSupport wxGTK - ++ lib.optional (openjpegJarSupport || jpipLibSupport) jdk; + ++ lib.optional (jpipLibSupport) jdk; doCheck = (!stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 @@ -78,7 +75,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; - # opj viewer fails to compile with lots of errors, jar requires openjpeg library already compiled and installed - broken = (opjViewerSupport || openjpegJarSupport); }; } diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index f5a414786ac37..129874c1dfbaf 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -22,18 +22,32 @@ let # determine the version number, there might be different ones per architecture version = { - x86_64-linux = "19.3.0.0.0"; + x86_64-linux = "19.16.0.0.0"; + aarch64-linux = "19.10.0.0.0"; x86_64-darwin = "19.3.0.0.0"; }.${stdenv.hostPlatform.system} or throwSystem; + directory = { + x86_64-linux = "1916000"; + aarch64-linux = "191000"; + x86_64-darwin = "193000"; + }.${stdenv.hostPlatform.system} or throwSystem; + # hashes per component and architecture hashes = { x86_64-linux = { - basic = "1yk4ng3a9ka1mzgfph9br6rwclagbgfvmg6kja11nl5dapxdzaxy"; - sdk = "115v1gqr0czy7dcf2idwxhc6ja5b0nind0mf1rn8iawgrw560l99"; - sqlplus = "0zj5h84ypv4n4678kfix6jih9yakb277l9hc0819iddc0a5slbi5"; - tools = "1q19blr0gz1c8bq0bnv1njzflrp03hf82ngid966xc6gwmqpkdsk"; - odbc = "1g1z6pdn76dp440fh49pm8ijfgjazx4cvxdi665fsr62h62xkvch"; + basic = "sha256-Sq1rWvbC1YME7EjSYPaP2g+1Xxxkk4ZkGaBmLo2cKcQ="; + sdk = "sha256-yJ8f/Hlq6vZoPxv+dfY4z1E7rWvcqlK+ou0SU0KKlEI="; + sqlplus = "sha256-C44srukpCB9et9UWm59daJmU83zr0HAktnWv7R42Irw="; + tools = "sha256-GP4E1REIoU3lctVYmLsAiwTJEvGRpCmOFlRuZk+A8HE="; + odbc = "sha256-JECxK7Ia1IJtve2goZJdTkvm5NJjqB2rc6k5BXUt3oA="; + }; + aarch64-linux = { + basic = "sha256-DNntH20BAmo5kOz7uEgW2NXaNfwdvJ8l8oMnp50BOsY="; + sdk = "sha256-8VpkNyLyFMUfQwbZpSDV/CB95RoXfaMr8w58cRt/syw="; + sqlplus = "sha256-iHcyijHhAvjsAqN9R+Rxo2R47k940VvPbScc2MWYn0Q="; + tools = "sha256-4QY0EwcnctwPm6ZGDZLudOFM4UycLFmRIluKGXVwR0M="; + odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms="; }; x86_64-darwin = { basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd"; @@ -50,11 +64,13 @@ let # convert platform to oracle architecture names arch = { x86_64-linux = "linux.x64"; + aarch64-linux = "linux.arm64"; x86_64-darwin = "macos.x64"; }.${stdenv.hostPlatform.system} or throwSystem; shortArch = { x86_64-linux = "linux"; + aarch64-linux = "linux"; x86_64-darwin = "mac"; }.${stdenv.hostPlatform.system} or throwSystem; @@ -62,12 +78,11 @@ let srcFilename = component: arch: version: rel: "instantclient-${component}-${arch}-${version}" + (optionalString (rel != "") "-${rel}") + - (optionalString (arch == "linux.x64" || arch == "macos.x64") "dbru") + # ¯\_(ツ)_/¯ - ".zip"; + "dbru.zip"; # ¯\_(ツ)_/¯ # fetcher for the non clickthrough artifacts fetcher = srcFilename: hash: fetchurl { - url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/193000/${srcFilename}"; + url = "https://download.oracle.com/otn_software/${shortArch}/instantclient/${directory}/${srcFilename}"; sha256 = hash; }; @@ -127,7 +142,7 @@ stdenv.mkDerivation { ''; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ flokli ]; hydraPlatforms = [ ]; }; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 92da6bbdd4a1a..f7cedc96b7c72 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -1,9 +1,9 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "sha256-9HJZFsIs9RSWnvsVw8IHIz1kc5OD99QpVgOLePbK6Mg="; + sha256 = "sha256-/oL+hBYIJmrBWlwRGCFtoAxVTVAG4odaisN1Kx5q3Hk="; }; pname = "libosip2"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 6ce22a8c1c68f..3beeaa67321e0 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.8"; + version = "1.50.11"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "z2JvWd0UbAIxdMQDSSDpZn8dJawsFWlRbWMTbDESVfo="; + sha256 = "iAD4Etie5hOIGIcDID86eHiWPCL4aVqvH6ChoUKNF64="; }; depsBuildBuild = [ @@ -97,6 +97,8 @@ stdenv.mkDerivation rec { updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; + # 1.90 is alpha for API 2. + freeze = true; }; }; diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index cdc644ec9cd9f..478378f64c271 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.50.0"; + version= "2.50.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-onqnfgF7mvzp51HYW9HPiQq7s6WL9Z0PrJF+74LbO1s="; + sha256 = "sha256-zMmSNBPkCMK/9jffZjJIMn1ygi8R45S0I+HFZSt9khQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 1fc5cea01de52..ccabdfdcfe8af 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.46.2"; + version= "2.46.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-V0QqtNwEOHe/44OZFXMastaT/GY0pxYUQi+1MMnqpvQ="; + sha256 = "sha256-QQ/gTUcaYI8/AnPToX2EAkHZEe0P8sdYqYWcZsbyQ3k="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index 354c68decfb07..7e903a3d6b8b1 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -8,6 +8,7 @@ , gdal , hdf5-cpp , LASzip +, enableE57 ? lib.meta.availableOn stdenv.hostPlatform libe57format , libe57format , libgeotiff , libxml2 @@ -40,7 +41,6 @@ stdenv.mkDerivation rec { gdal hdf5-cpp LASzip - libe57format libgeotiff libxml2 postgresql @@ -48,10 +48,12 @@ stdenv.mkDerivation rec { xercesc zlib zstd + ] ++ lib.optionals enableE57 [ + libe57format ]; cmakeFlags = [ - "-DBUILD_PLUGIN_E57=ON" + "-DBUILD_PLUGIN_E57=${if enableE57 then "ON" else "OFF"}" "-DBUILD_PLUGIN_HDF=ON" "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" "-DBUILD_PLUGIN_TILEDB=ON" diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/development/libraries/physics/clhep/default.nix index 6f648463c8544..a3b85e36796e3 100644 --- a/pkgs/development/libraries/physics/clhep/default.nix +++ b/pkgs/development/libraries/physics/clhep/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clhep"; - version = "2.4.5.3"; + version = "2.4.6.0"; src = fetchurl { url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; - hash = "sha256-RfY+6wl/Av5nuGp9rb8Q1Am0AcKKGj4XLbNiUsMJfBM="; + hash = "sha256-6NFt67hM7SjkDproR4nPWgra1F+SE/usPOdYPgbKp7E="; }; prePatch = '' diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix index fef1d2de324e7..66c498418d98f 100644 --- a/pkgs/development/libraries/plplot/default.nix +++ b/pkgs/development/libraries/plplot/default.nix @@ -6,7 +6,7 @@ , wxGTK32 , Cocoa , enableXWin ? false -, libX11 +, xorg }: stdenv.mkDerivation rec { @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { buildInputs = lib.optional enableWX wxGTK32 ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa - ++ lib.optional enableXWin libX11; + ++ lib.optional enableXWin xorg.libX11; passthru = { + inherit (xorg) libX11; inherit enableWX enableXWin - libX11 ; }; diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index b76baea499306..c8abc71a22359 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -32,4 +32,8 @@ qtModule { "bin/qmlscene" "bin/qmltestrunner" ]; + + NIX_CFLAGS_COMPILE = [ + "-fmacro-prefix-map=${qtbase.dev}=qtbase.dev" + ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index c365f3c068532..4dff38d3acc2d 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -228,6 +228,10 @@ qtModule { requiredSystemFeatures = [ "big-parallel" ]; + preConfigure = '' + export NINJAFLAGS="-j$NIX_BUILD_CORES" + ''; + postInstall = '' # This is required at runtime mkdir $out/libexec diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 4de1f3909e263..a9e254d9d349b 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-DER6PBYXmZRgwFNVU5rpn87HrXMR+HnQf8cwHioUals="; + hash = "sha256-l14+l8FkiFmGuRZ9dyD/PEYH9nHVRRg1vMXMnVhg3K4="; }; patches = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "Source package of the Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; # rocclr seems to have some AArch64 ifdefs, but does not seem # to be supported yet by the build infrastructure. Recheck in # the future. diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 1da9b869a0db1..c915a3df521fd 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.7.2"; + version = "7.7.3"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cla2yat/xCrzx53mYRKjcvH9cCY0MVD8RSMjGfxVDUM="; + sha256 = "sha256-Np3HPTZYzyoPOKL0xgsLzcvOkceFiEQd+1nyGbg4BHo="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/rocm-comgr/cmake.patch b/pkgs/development/libraries/rocm-comgr/cmake.patch index 0c599e2403c55..ae966745171cb 100644 --- a/pkgs/development/libraries/rocm-comgr/cmake.patch +++ b/pkgs/development/libraries/rocm-comgr/cmake.patch @@ -1,19 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index eac270a..27610ec 100644 +index 62b857b..d21c7f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -53,10 +53,6 @@ set(SOURCES - - if(COMGR_BUILD_SHARED_LIBS) - add_library(amd_comgr SHARED ${SOURCES}) -- # Windows doesn't have a strip utility, so CMAKE_STRIP won't be set. -- if((CMAKE_BUILD_TYPE STREQUAL "Release") AND NOT ("${CMAKE_STRIP}" STREQUAL "")) -- add_custom_command(TARGET amd_comgr POST_BUILD COMMAND ${CMAKE_STRIP} $<TARGET_FILE:amd_comgr>) -- endif() - else() - add_library(amd_comgr STATIC ${SOURCES}) - endif() -@@ -141,8 +137,8 @@ if (UNIX) +@@ -147,8 +147,8 @@ if (UNIX) list(APPEND AMD_COMGR_PUBLIC_LINKER_OPTIONS -pthread) if (NOT APPLE AND COMGR_BUILD_SHARED_LIBS) configure_file( @@ -24,17 +13,7 @@ index eac270a..27610ec 100644 list(APPEND AMD_COMGR_PRIVATE_LINKER_OPTIONS "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/src/exportmap") # When building a shared library with -fsanitize=address we can't be -@@ -154,6 +150,9 @@ if (UNIX) - -Wl,--no-undefined) - endif() - endif() -+ -+ # Strip in release build -+ set_target_properties(amd_comgr PROPERTIES LINK_FLAGS_RELEASE -s) - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS - "/wd4244" #[[Suppress 'argument' : conversion from 'type1' to 'type2', possible loss of data]] -@@ -169,10 +168,6 @@ endif() +@@ -175,10 +175,6 @@ endif() # the shared header. list(APPEND AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS AMD_COMGR_EXPORT) @@ -45,100 +24,209 @@ index eac270a..27610ec 100644 include(bc2h) include(opencl_pch) include(DeviceLibs) -@@ -203,8 +198,11 @@ target_compile_definitions(amd_comgr - PRIVATE "${AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS}") - target_include_directories(amd_comgr - PUBLIC -- $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> -- $<INSTALL_INTERFACE:include>) -+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>) -+ +@@ -212,10 +208,14 @@ target_include_directories(amd_comgr + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> + $<INSTALL_INTERFACE:include>) + +configure_file( + include/amd_comgr.h.in + include/amd_comgr.h @ONLY) - ++ set(AMD_COMGR_CONFIG_NAME amd_comgr-config.cmake) set(AMD_COMGR_TARGETS_NAME amd_comgr-targets.cmake) -@@ -220,29 +218,30 @@ if (NOT COMGR_BUILD_SHARED_LIBS) + set(AMD_COMGR_VERSION_NAME amd_comgr-config-version.cmake) +-set(AMD_COMGR_PACKAGE_PREFIX ${CMAKE_INSTALL_LIBDIR}/cmake/amd_comgr) ++set(AMD_COMGR_PACKAGE_PREFIX cmake/amd_comgr) + + # Generate the build-tree package. + set(AMD_COMGR_PREFIX_CODE) +@@ -226,13 +226,13 @@ if (NOT COMGR_BUILD_SHARED_LIBS) endif() set(AMD_COMGR_TARGETS_PATH - "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") --set(AMD_COMGR_VERSION_PATH ++ "${CMAKE_CURRENT_BINARY_DIR}/lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") + set(AMD_COMGR_VERSION_PATH - "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") --export(TARGETS amd_comgr ++ "${CMAKE_CURRENT_BINARY_DIR}/lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") + export(TARGETS amd_comgr - FILE "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") -+ "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") ++ FILE "lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" - "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" -+ ${AMD_COMGR_CONFIG_NAME} ++ "lib/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" @ONLY) --write_basic_package_version_file("${AMD_COMGR_VERSION_PATH}" -+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_VERSION_NAME}" + write_basic_package_version_file("${AMD_COMGR_VERSION_PATH}" VERSION "${amd_comgr_VERSION}" - COMPATIBILITY SameMajorVersion) - - install(TARGETS amd_comgr - EXPORT amd_comgr_export -- COMPONENT amd-comgr -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ COMPONENT amd-comgr) -+install(EXPORT amd_comgr_export -+ DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -+ FILE "${AMD_COMGR_TARGETS_NAME}") - - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/include/amd_comgr.h" - COMPONENT amd-comgr - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES -+ "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}" -+ "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_VERSION_NAME}" -+ COMPONENT amd-comgr -+ DESTINATION ${AMD_COMGR_PACKAGE_PREFIX}) - - install(FILES - "README.md" -@@ -251,37 +250,6 @@ install(FILES - COMPONENT amd-comgr - DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr) - --# Generate the install-tree package. --set(AMD_COMGR_PREFIX_CODE " --# Derive absolute install prefix from config file path. --get_filename_component(AMD_COMGR_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") +@@ -266,7 +266,7 @@ install(FILES + set(AMD_COMGR_PREFIX_CODE " + # Derive absolute install prefix from config file path. + get_filename_component(AMD_COMGR_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") -string(REGEX REPLACE "/" ";" count "${AMD_COMGR_PACKAGE_PREFIX}") --foreach(p ${count}) -- set(AMD_COMGR_PREFIX_CODE "${AMD_COMGR_PREFIX_CODE} --get_filename_component(AMD_COMGR_PREFIX \"\${AMD_COMGR_PREFIX}\" PATH)") --endforeach() -- --if (NOT COMGR_BUILD_SHARED_LIBS) -- string(APPEND AMD_COMGR_PREFIX_CODE "\ninclude(CMakeFindDependencyMacro)\n") -- string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(Clang REQUIRED)\n") -- string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(LLD REQUIRED)\n") --endif() -- ++string(REGEX REPLACE "/" ";" count "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}") + foreach(p ${count}) + set(AMD_COMGR_PREFIX_CODE "${AMD_COMGR_PREFIX_CODE} + get_filename_component(AMD_COMGR_PREFIX \"\${AMD_COMGR_PREFIX}\" PATH)") +@@ -278,20 +278,20 @@ if (NOT COMGR_BUILD_SHARED_LIBS) + string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(LLD REQUIRED)\n") + endif() + -set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") --configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" -- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" -- @ONLY) --install(FILES ++set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") + configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" - "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" ++ "${AMD_COMGR_CONFIG_NAME}.install" + @ONLY) + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" - DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -- RENAME "${AMD_COMGR_CONFIG_NAME}") --install(EXPORT amd_comgr_export ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}" + RENAME "${AMD_COMGR_CONFIG_NAME}") + install(EXPORT amd_comgr_export - DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" -- FILE "${AMD_COMGR_TARGETS_NAME}") --install(FILES -- "${AMD_COMGR_VERSION_PATH}" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}" + FILE "${AMD_COMGR_TARGETS_NAME}") + install(FILES + "${AMD_COMGR_VERSION_PATH}" - DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${AMD_COMGR_PACKAGE_PREFIX}") + + if(TARGET clangFrontendTool) + set(CLANG_LIBS +diff --git a/cmake/DeviceLibs.cmake b/cmake/DeviceLibs.cmake +index 27e9546..dfe1b57 100644 +--- a/cmake/DeviceLibs.cmake ++++ b/cmake/DeviceLibs.cmake +@@ -1,8 +1,7 @@ + set(INC_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) + + set(GEN_LIBRARY_INC_FILE ${INC_DIR}/libraries.inc) - - set(CLANG_LIBS - clangFrontendTool) +-file(WRITE ${GEN_LIBRARY_INC_FILE} "// Automatically generated file; DO NOT EDIT.\n") ++set(GEN_LIBRARY_DEFS_INC_FILE ${INC_DIR}/libraries_defs.inc) + + # cmake does not provide a way to query targets produced by a project, + # so we have to make one up. Ordinarily, individual library target +@@ -23,6 +22,7 @@ if(NOT AMD_DEVICE_LIBS_TARGETS) + message(FATAL_ERROR "Could not find list of device libraries") + endif() + ++set(TARGETS_INCLUDES "") + foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) + set(header ${AMDGCN_LIB_TARGET}.inc) +@@ -54,75 +54,52 @@ foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) + add_custom_target(${AMDGCN_LIB_TARGET}_header DEPENDS ${INC_DIR}/${header}) + add_dependencies(amd_comgr ${AMDGCN_LIB_TARGET}_header) + +- file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"${header}\"\n") ++ list(APPEND TARGETS_INCLUDES "#include \"${header}\"") ++endforeach() ++ ++list(JOIN TARGETS_INCLUDES "\n" TARGETS_INCLUDES) ++file(GENERATE OUTPUT ${GEN_LIBRARY_INC_FILE} CONTENT "${TARGETS_INCLUDES}") ++ ++foreach(OPENCL_VERSION 1.2 2.0) ++ string(REPLACE . _ OPENCL_UNDERSCORE_VERSION ${OPENCL_VERSION}) ++ add_custom_command(OUTPUT ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc ++ COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl${OPENCL_VERSION}-c.pch ++ ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc ++ opencl${OPENCL_UNDERSCORE_VERSION}_c ++ DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl${OPENCL_VERSION}-c.pch ++ COMMENT "Generating opencl${OPENCL_VERSION}-c.inc" ++ ) ++ set_property(DIRECTORY APPEND PROPERTY ++ ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc) ++ add_custom_target(opencl${OPENCL_VERSION}-c.inc_target DEPENDS ${INC_DIR}/opencl${OPENCL_VERSION}-c.inc) ++ add_dependencies(amd_comgr opencl${OPENCL_VERSION}-c.inc_target) + endforeach() + +-add_custom_command(OUTPUT ${INC_DIR}/opencl1.2-c.inc +- COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.pch +- ${INC_DIR}/opencl1.2-c.inc +- opencl1_2_c +- DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.pch +- COMMENT "Generating opencl1.2-c.inc" +-) +-set_property(DIRECTORY APPEND PROPERTY +- ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl1.2-c.inc) +-add_custom_target(opencl1.2-c.inc_target DEPENDS ${INC_DIR}/opencl1.2-c.inc) +-add_dependencies(amd_comgr opencl1.2-c.inc_target) +-file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"opencl1.2-c.inc\"\n") +- +-add_custom_command(OUTPUT ${INC_DIR}/opencl2.0-c.inc +- COMMAND bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.pch +- ${INC_DIR}/opencl2.0-c.inc +- opencl2_0_c +- DEPENDS bc2h ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.pch +- COMMENT "Generating opencl2.0-c.inc" +-) +-set_property(DIRECTORY APPEND PROPERTY +- ADDITIONAL_MAKE_CLEAN_FILES ${INC_DIR}/opencl2.0-c.inc) +-add_custom_target(opencl2.0-c.inc_target DEPENDS ${INC_DIR}/opencl2.0-c.inc) +-add_dependencies(amd_comgr opencl2.0-c.inc_target) +-file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"opencl2.0-c.inc\"\n") +- +-# Generate function to select libraries for a given GFXIP number. +-file(APPEND ${GEN_LIBRARY_INC_FILE} "#include \"llvm/ADT/StringRef.h\"\n") +-file(APPEND ${GEN_LIBRARY_INC_FILE} +- "static std::tuple<const char*, const void*, size_t> get_oclc_isa_version(llvm::StringRef gfxip) {") ++set(TARGETS_DEFS "") ++list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_TARGET\n#define AMD_DEVICE_LIBS_TARGET(t)\n#endif") ++list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_GFXIP\n#define AMD_DEVICE_LIBS_GFXIP(t, g)\n#endif") ++list(APPEND TARGETS_DEFS "#ifndef AMD_DEVICE_LIBS_FUNCTION\n#define AMD_DEVICE_LIBS_FUNCTION(t, f)\n#endif") ++list(APPEND TARGETS_DEFS "") + foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) ++ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_TARGET(${AMDGCN_LIB_TARGET})") ++ # Generate function to select libraries for a given GFXIP number. + if (${AMDGCN_LIB_TARGET} MATCHES "^oclc_isa_version_.+$") + string(REGEX REPLACE "^oclc_isa_version_(.+)$" "\\1" gfxip ${AMDGCN_LIB_TARGET}) +- file(APPEND ${GEN_LIBRARY_INC_FILE} +- "if (gfxip == \"${gfxip}\") return std::make_tuple(\"${AMDGCN_LIB_TARGET}.bc\", ${AMDGCN_LIB_TARGET}_lib, ${AMDGCN_LIB_TARGET}_lib_size);") ++ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_GFXIP(${AMDGCN_LIB_TARGET}, \"${gfxip}\")") + endif() +-endforeach() +-file(APPEND ${GEN_LIBRARY_INC_FILE} +- "return std::make_tuple(nullptr, nullptr, 0); }") +- +-# Generate function to select libraries for given feature. +-foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) ++ # Generate function to select libraries for given feature. + if (${AMDGCN_LIB_TARGET} MATCHES "^oclc_.*_on$") + string(REGEX REPLACE "^oclc_(.*)_on" "\\1" function ${AMDGCN_LIB_TARGET}) +- file(APPEND ${GEN_LIBRARY_INC_FILE} +- "static std::tuple<const char*, const void*, size_t> get_oclc_${function}(bool on) { \ +- return std::make_tuple( \ +- on ? \"oclc_${function}_on_lib.bc\" : \"oclc_${function}_off_lib.bc\", \ +- on ? oclc_${function}_on_lib : oclc_${function}_off_lib, \ +- on ? oclc_${function}_on_lib_size : oclc_${function}_off_lib_size \ +- ); }") ++ list(APPEND TARGETS_DEFS "AMD_DEVICE_LIBS_FUNCTION(${AMDGCN_LIB_TARGET}, ${function})") + endif() + endforeach() + +-# Generate function yield all libraries. +-file(APPEND ${GEN_LIBRARY_INC_FILE} "\n#include \"llvm/ADT/ArrayRef.h\"\n") +-file(APPEND ${GEN_LIBRARY_INC_FILE} +- "llvm::ArrayRef<std::tuple<llvm::StringRef, llvm::StringRef>> COMGR::getDeviceLibraries() { \ +- static std::tuple<llvm::StringRef, llvm::StringRef> DeviceLibs[] = {") +-foreach(AMDGCN_LIB_TARGET ${AMD_DEVICE_LIBS_TARGETS}) +- file(APPEND ${GEN_LIBRARY_INC_FILE} +- "{\"${AMDGCN_LIB_TARGET}.bc\", llvm::StringRef(reinterpret_cast<const char *>(${AMDGCN_LIB_TARGET}_lib), ${AMDGCN_LIB_TARGET}_lib_size)},") +-endforeach() +-file(APPEND ${GEN_LIBRARY_INC_FILE} +- "}; \ +- return DeviceLibs; \ +- }") ++list(APPEND TARGETS_DEFS "") ++list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_TARGET") ++list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_GFXIP") ++list(APPEND TARGETS_DEFS "#undef AMD_DEVICE_LIBS_FUNCTION") ++ ++list(JOIN TARGETS_DEFS "\n" TARGETS_DEFS) ++file(GENERATE OUTPUT ${GEN_LIBRARY_DEFS_INC_FILE} CONTENT "${TARGETS_DEFS}") + + include_directories(${INC_DIR}) diff --git a/cmake/bc2h.cmake b/cmake/bc2h.cmake index 146fe2b..9134985 100644 --- a/cmake/bc2h.cmake @@ -222,3 +310,56 @@ index 146fe2b..9134985 100644 add_executable(bc2h ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c) if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +diff --git a/src/comgr-device-libs.cpp b/src/comgr-device-libs.cpp +index 4d2b914..80786d1 100644 +--- a/src/comgr-device-libs.cpp ++++ b/src/comgr-device-libs.cpp +@@ -35,7 +35,7 @@ + + #include "comgr-device-libs.h" + #include "comgr.h" +-#include "libraries.inc" ++#include "comgr-libraries.h" + #include "llvm/ADT/StringSwitch.h" + #include <cstdint> + +diff --git a/src/comgr-libraries.h b/src/comgr-libraries.h +new file mode 100644 +index 0000000..3caa0a0 +--- /dev/null ++++ b/src/comgr-libraries.h +@@ -0,0 +1,34 @@ ++#include "libraries.inc" ++#include "opencl1.2-c.inc" ++#include "opencl2.0-c.inc" ++#include "llvm/ADT/StringRef.h" ++#include "llvm/ADT/ArrayRef.h" ++ ++static std::tuple<const char*, const void*, size_t> get_oclc_isa_version(llvm::StringRef gfxip) { ++#define AMD_DEVICE_LIBS_GFXIP(target, target_gfxip) \ ++ if (gfxip == target_gfxip) return std::make_tuple(#target ".bc", target##_lib, target##_lib_size); ++#include "libraries_defs.inc" ++ ++ return std::make_tuple(nullptr, nullptr, 0); ++} ++ ++#define AMD_DEVICE_LIBS_FUNCTION(target, function) \ ++ static std::tuple<const char*, const void*, size_t> get_oclc_##function(bool on) { \ ++ return std::make_tuple( \ ++ on ? "oclc_" #function "_on_lib.bc" : "oclc_" #function "_off_lib.bc", \ ++ on ? oclc_##function##_on_lib : oclc_##function##_off_lib, \ ++ on ? oclc_##function##_on_lib_size : oclc_##function##_off_lib_size \ ++ ); \ ++ } ++#include "libraries_defs.inc" ++ ++llvm::ArrayRef<std::tuple<llvm::StringRef, llvm::StringRef>> COMGR::getDeviceLibraries() { ++ static std::tuple<llvm::StringRef, llvm::StringRef> DeviceLibs[] = { ++#define AMD_DEVICE_LIBS_TARGET(target) \ ++ {#target ".bc", llvm::StringRef(reinterpret_cast<const char *>(target##_lib), target##_lib_size)}, ++#include "libraries_defs.inc" ++ }; ++ return DeviceLibs; ++} ++ ++ diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index db9e012e4eec3..e7f07380758b7 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-5C5bRdrt3xZAlRgtiIRTMAuwsFvVM4Win96P5+Pf5ZM="; + hash = "sha256-LQyMhqcWm8zqt6138fnT7EOq/F8bG3Iuf04PTemVQmg="; }; sourceRoot = "source/lib/comgr"; @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ clang rocm-device-libs llvm ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_C_COMPILER=${clang}/bin/clang" "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm" @@ -39,7 +38,7 @@ stdenv.mkDerivation rec { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-device-libs/cmake.patch b/pkgs/development/libraries/rocm-device-libs/cmake.patch new file mode 100644 index 0000000000000..500ff37a99052 --- /dev/null +++ b/pkgs/development/libraries/rocm-device-libs/cmake.patch @@ -0,0 +1,43 @@ +diff --git a/cmake/Packages.cmake b/cmake/Packages.cmake +index 07c60eb..c736b3e 100644 +--- a/cmake/Packages.cmake ++++ b/cmake/Packages.cmake +@@ -12,24 +12,29 @@ set_target_properties(${target} PROPERTIES + IMPORTED_LOCATION \"${target_path}\")") + endforeach() + configure_file(AMDDeviceLibsConfig.cmake.in +- ${PACKAGE_PREFIX}/AMDDeviceLibsConfig.cmake ++ lib/cmake/AMDDeviceLibs/AMDDeviceLibsConfig.cmake + @ONLY) + + + set(install_path_suffix "amdgcn/bitcode") + + # Generate the install-tree package. +-# We do not know the absolute path to the intall tree until we are installed, +-# so we calculate it dynamically in AMD_DEVICE_LIBS_PREFIX_CODE and use +-# relative paths in the target imports in AMD_DEVICE_LIBS_TARGET_CODE. +-set(AMD_DEVICE_LIBS_PREFIX_CODE " ++if(IS_ABSOLUTE "${CMAKE_INSTALL_PREFIX}") ++ set(AMD_DEVICE_LIBS_PREFIX_CODE "set(AMD_DEVICE_LIBS_PREFIX \"${CMAKE_INSTALL_PREFIX}\")") ++else() ++ # We do not know the absolute path to the install tree until we are installed, ++ # so we calculate it dynamically in AMD_DEVICE_LIBS_PREFIX_CODE and use ++ # relative paths in the target imports in AMD_DEVICE_LIBS_TARGET_CODE. ++ set(AMD_DEVICE_LIBS_PREFIX_CODE " + # Derive absolute install prefix from config file path. + get_filename_component(AMD_DEVICE_LIBS_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") +-string(REGEX REPLACE "/" ";" count "${PACKAGE_PREFIX}") +-foreach(p ${count}) +- set(AMD_DEVICE_LIBS_PREFIX_CODE "${AMD_DEVICE_LIBS_PREFIX_CODE} ++ string(REGEX REPLACE "/" ";" count "${PACKAGE_PREFIX}") ++ foreach(p ${count}) ++ set(AMD_DEVICE_LIBS_PREFIX_CODE "${AMD_DEVICE_LIBS_PREFIX_CODE} + get_filename_component(AMD_DEVICE_LIBS_PREFIX \"\${AMD_DEVICE_LIBS_PREFIX}\" PATH)") +-endforeach() ++ endforeach() ++endif() ++ + set(AMD_DEVICE_LIBS_TARGET_CODE) + foreach(target ${AMDGCN_LIB_LIST}) + get_target_property(target_name ${target} ARCHIVE_OUTPUT_NAME) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 08690f3fa4501..c94e1f2753e05 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-TBCSznHyiaiOcBR9irybCnOgfqPiNNn4679PCQwrLhA="; + hash = "sha256-rKMe0B/pkDek/ZU37trnJNa8aqvlwxobPb1+VTx/bJU="; }; nativeBuildInputs = [ cmake ]; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { "-DCLANG=${clang}/bin/clang" ]; + patches = [ ./cmake.patch ]; + passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 699f00449cc7c..fc5f8fba52500 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-Mk7Wssz34Uxtb9PRIEGrTn/tXtqxLMrq0damA/p/DsY="; + hash = "sha256-QvAF25Zfq9d1M/KIsr2S+Ggxzqw/MQ2OVcm9ZNfjTa8="; }; nativeBuildInputs = [ cmake rocm-cmake ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ acowley lovesegfault ]; + maintainers = with maintainers; [ acowley lovesegfault Flakebi ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 36d178ea0433e..563632b9d7f51 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -4,8 +4,10 @@ , writeScript , addOpenGLRunpath , cmake +, pkg-config , xxd , elfutils +, libdrm , llvm , numactl , rocm-device-libs @@ -13,28 +15,33 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-TY0YPgNzxBLXAj7fncLQ01cSJyydveOLHrimCmLS32o="; + hash = "sha256-26E7vA2JlC50zmpaQfDrFMlgjAqmfTdp9/A8g5caDqI="; }; sourceRoot = "source/src"; - nativeBuildInputs = [ cmake xxd ]; + nativeBuildInputs = [ cmake pkg-config xxd ]; - buildInputs = [ elfutils llvm numactl ]; + buildInputs = [ elfutils libdrm llvm numactl ]; - cmakeFlags = [ - "-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode" - "-DCMAKE_PREFIX_PATH=${rocm-thunk}" - ]; + cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ]; postPatch = '' patchShebangs image/blit_src/create_hsaco_ascii_file.sh + patchShebangs core/runtime/trap_handler/create_trap_handler_header.sh + + substituteInPlace CMakeLists.txt \ + --replace 'hsa/include/hsa' 'include/hsa' + + # We compile clang before rocm-device-libs, so patch it in afterwards + substituteInPlace image/blit_src/CMakeLists.txt \ + --replace '-cl-denorms-are-zero' '-cl-denorms-are-zero --rocm-device-lib-path=${rocm-device-libs}/amdgcn/bitcode' ''; fixupPhase = '' @@ -52,6 +59,6 @@ stdenv.mkDerivation rec { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; }; } diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index c2a67a6f14622..d7add50386e75 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-iXhlEofPAQNxeZzDgdF1DdflIKfSI7rHGTqOybHnnHM="; + hash = "sha256-cM78Bx6uYsxhvdqSVNgmqOUYQnUJVCA7mNpRNNSFv6k="; }; preConfigure = '' @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index d9341a96d3e83..c544436af8efa 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.9"; + version = "3.14.10"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-mlRr1BjkWiJZSgpxQIc0k1tXGewJkHwxf6xe0edUHaY="; + sha256 = "sha256-4SHmqalrGeqp1nBx2BQLRnRWEYw5lJk5Yao67GQw3qM="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/sigslot/default.nix b/pkgs/development/libraries/sigslot/default.nix new file mode 100644 index 0000000000000..e410c280a282e --- /dev/null +++ b/pkgs/development/libraries/sigslot/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "sigslot"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "palacaze"; + repo = "sigslot"; + rev = "v${version}"; + hash = "sha256-FXoKI0aTpZNHHYZnEoPduf3ctOQ/qKoQrrXZPviAvuY="; + }; + + nativeBuildInputs = [ cmake ]; + + dontBuild = true; + + meta = with lib; { + description = "A header-only, thread safe implementation of signal-slots for C++"; + license = licenses.mit; + homepage = "https://github.com/palacaze/sigslot"; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 7a647084f9cd3..2564162c3bf1e 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -17,13 +17,16 @@ , libdrm , libjpeg_turbo , libopus +, withLibsoup2 ? false , libsoup +, libsoup_3 , libusb1 , lz4 , meson , ninja , openssl , perl +, phodav_2_0 , phodav , pixman , pkg-config @@ -84,7 +87,6 @@ stdenv.mkDerivation rec { gettext gobject-introspection gtk-doc - libsoup meson ninja perl @@ -108,10 +110,11 @@ stdenv.mkDerivation rec { libcacard libjpeg_turbo libopus + (if withLibsoup2 then libsoup else libsoup_3) libusb1 lz4 openssl - phodav + (if withLibsoup2 then phodav_2_0 else phodav) pixman spice-protocol usbredir diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 23d2e8907ff1c..bbb5aef36f14c 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,25 +1,57 @@ -{ 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.1"; +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, glib +, gobject-introspection +, flex +, bison +, vala +, gettext +, gnome +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +}: + +stdenv.mkDerivation rec { pname = "template-glib"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nsm3HgTU9csU91XveQYxzQtFwGA+Ecg2/Hz9niaM0Ho="; + sha256 = "HBKVJa5kQDpmL3Zm9jWDhqgVZohyrPEctWirObuh9CE="; }; - nativeBuildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection ]; - buildInputs = [ glib ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + flex + bison + vala + glib + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + gobject-introspection + ]; + + buildInputs = [ + glib + ]; mesonFlags = [ - "-Denable_gtk_doc=true" + "-Dgtk_doc=true" ]; + doCheck = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index e7918ea56e29b..c6c7d265ed7d9 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "6.0.2"; + version = "6.1.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "W0qcbGG9AAVT75eZ9MpiXQX1gBA2+ywvkopJRIyQPAk="; + sha256 = "Cv4uyaWNT6ixBntqc0/TxzNqn/+3VyyWPFLqbYckoZs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index 846346d534b82..fa0e30f1abc45 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , asciidoc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -14,10 +13,9 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsNoGuiHook , bzip2 , dbus -, evolution-data-server , exempi , giflib , glib @@ -34,7 +32,6 @@ , libosinfo , libpng , libseccomp -, libsoup , libtiff , libuuid , libxml2 @@ -49,25 +46,13 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Pt3G0nLAKWn6TCwV360MSddtAh8aJ+xwi2m+gCU1PJQ="; + sha256 = "ouA2XjCBG7YelcghSzP0eCo6BODGJGoG7NnAFBfNhOY="; }; - # TODO: remove me on 3.4.0 - patches = [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/cc655ba0f95022cf35bc6d44cb5155788fee2e24.patch"; - sha256 = "sha256-a85ygtabpkruiDgKbseQxYbFIAQlVDhs3eWkbStJjKs="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/9e613ceb37ec41fd1cd88c3d539e3ee03e8f6ba6.patch"; - sha256 = "sha256-ht7EfZztyl0st0Sv7H92Q37vwXY4T61GQm9WJ8IxTTg="; - }) - ]; - nativeBuildInputs = [ asciidoc docbook-xsl-nons @@ -79,7 +64,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsNoGuiHook ]; # TODO: add libenca, libosinfo @@ -108,14 +93,12 @@ stdenv.mkDerivation rec { libjpeg libosinfo libpng - libsoup libtiff libuuid libxml2 poppler taglib ] ++ lib.optionals stdenv.isLinux [ - evolution-data-server libseccomp networkmanager systemd diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index e8d6ed82ed003..2c4422d7a1f96 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -13,7 +13,6 @@ , libxml2 , glib , wrapGAppsNoGuiHook -, vala , sqlite , libxslt , libstemmer @@ -30,13 +29,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "3.3.2"; + version = "3.4.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DtK5iRiVbW8WQpxgfdihTIT02gpIlw/S64yTq6PPmRM="; + sha256 = "s7OAyVcdfHQjtfQB5KLy143kcUOwNessEoHiQjxZIYs="; }; postPatch = '' @@ -50,7 +49,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - vala pkg-config asciidoc gettext diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index a5bd2fd361627..f2f0fabb06377 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -1,33 +1,51 @@ -{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkg-config, glib, libsoup, gobject-introspection }: +{ stdenv +, lib +, fetchFromGitLab +, meson +, ninja +, pkg-config +, gobject-introspection +, vala +, gtk-doc +, docbook-xsl-nons +, glib +, libsoup +}: stdenv.mkDerivation rec { - version="0.5.0"; pname = "uhttpmock"; + version = "0.5.5"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pwithnall"; repo = "uhttpmock"; - owner = "uhttpmock"; rev = version; - sha256 = "0kkf670abkq5ikm3mqls475lydfsd9by1kv5im4k757xrl1br1d4"; + sha256 = "NuxiVVowZ8ilP9rcgapCe9OzFCpoOfZxZiSyjTeOrts="; }; - nativeBuildInputs = [ pkg-config autoconf automake gtk-doc libtool gobject-introspection ]; - buildInputs = [ glib libsoup ]; - - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gtk-doc + docbook-xsl-nons + ]; - # while cross - # /build/source/tmp-introspect3xf43lf3/.libs/Uhm-0.0: error while loading shared libraries: libuhttpmock-0.0.so.0: cannot open shared object file: No such file or directory - preBuild = '' - mkdir -p ${placeholder "out"}/lib - ln -s $PWD/libuhttpmock/.libs/libuhttpmock-0.0.so.0 ${placeholder "out"}/lib/libuhttpmock-0.0.so.0 - ''; + buildInputs = [ + glib + libsoup + ]; meta = with lib; { description = "Project for mocking web service APIs which use HTTP or HTTPS"; - homepage = "https://gitlab.com/groups/uhttpmock/"; - license = licenses.lgpl21; + homepage = "https://gitlab.freedesktop.org/pwithnall/uhttpmock/"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; - platforms = with platforms; linux; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 0ddff4d1812ab..8fa3c08622488 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -9,9 +9,12 @@ , gnome , glib , gtk3 +, gtk4 +, gtkVersion ? "3" , gobject-introspection , vala , python3 +, gi-docgen , libxml2 , gnutls , gperf @@ -27,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.68.0"; + version = "0.70.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-E+fUeJyiFqM3gAMNJGybE92/0ECUxjFu6n/5IoTdF0k="; + sha256 = "sha256-k+DdShvCp6GmLaZBYKJ0zORWl26hVn2YWR2pbi0mWuY="; }; patches = [ @@ -45,6 +48,11 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) + # error: implicit declaration of function 'cfmakeraw' is invalid in C99 [-Werror,-Wimplicit-function-declaration] + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/vte/-/commit/1f1f177ff797ac2bb453168951135865cfded900.patch"; + sha256 = "sha256-VRVhq8JAshtcFejJkNUpMilo7tLgcojlEnCTrAtGVa0="; + }) ]; nativeBuildInputs = [ @@ -57,6 +65,7 @@ stdenv.mkDerivation rec { pkg-config vala python3 + gi-docgen ]; buildInputs = [ @@ -69,15 +78,20 @@ stdenv.mkDerivation rec { systemd ]; - propagatedBuildInputs = [ + propagatedBuildInputs = assert (gtkVersion == "3" || gtkVersion == "4"); [ # Required by vte-2.91.pc. - gtk3 + (if gtkVersion == "3" then gtk3 else gtk4) glib pango ]; - mesonFlags = lib.optionals (!systemdSupport) [ + mesonFlags = [ + "-Ddocs=true" + ] ++ lib.optionals (!systemdSupport) [ "-D_systemd=false" + ] ++ lib.optionals (gtkVersion == "4") [ + "-Dgtk3=false" + "-Dgtk4=true" ] ++ lib.optionals stdenv.isDarwin [ # -Bsymbolic-functions is not supported on darwin "-D_b_symbolic_functions=false" @@ -93,6 +107,11 @@ stdenv.mkDerivation rec { patchShebangs src/modes.py ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/wlroots/0.14.nix b/pkgs/development/libraries/wlroots/0.14.nix index 7fe678cb62461..db10e57443cc2 100644 --- a/pkgs/development/libraries/wlroots/0.14.nix +++ b/pkgs/development/libraries/wlroots/0.14.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4, xcbutilrenderutil, seatd +, libcap, mesa, xorg +, libpng, ffmpeg_4, seatd , enableXWayland ? true, xwayland ? null }: @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 xcbutilrenderutil seatd + xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa + libpng ffmpeg_4 xorg.xcbutilrenderutil seatd ] ++ lib.optional enableXWayland xwayland ; diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix index 7648ebe5d2578..117b7ebdc5d5d 100644 --- a/pkgs/development/libraries/wlroots/0.15.nix +++ b/pkgs/development/libraries/wlroots/0.15.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang +,libcap, mesa, xorg +, libpng, ffmpeg_4, seatd, vulkan-loader, glslang , nixosTests , enableXWayland ? true, xwayland ? null @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader + xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa + libpng ffmpeg_4 xorg.xcbutilrenderutil seatd vulkan-loader ] ++ lib.optional enableXWayland xwayland ; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 199994038b5bc..5339a0c54cbb8 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "42.3"; + version = "43.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "TtEFpmfkYyVGcQPcc0bSAj+uwdXsFTvRcxbak49TrOA="; + sha256 = "DhhnpFvKpd2yQKTP2yLdBVz4fwchC547twlJ88e+FqY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 05b0f55344817..438940f3bac6e 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -3,9 +3,9 @@ , autoreconfHook , dbus , fetchFromGitHub -, fetchpatch , flatpak , fuse3 +, bubblewrap , systemdMinimal , geoclue2 , glib @@ -20,12 +20,12 @@ , python3 , pkg-config , stdenv -, substituteAll +, runCommand , wrapGAppsHook , enableGeoLocation ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal"; version = "1.15.0"; @@ -33,11 +33,21 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "flatpak"; - repo = pname; - rev = version; + repo = "xdg-desktop-portal"; + rev = finalAttrs.version; sha256 = "sha256-Kw3zJeGwPfw1fDo8HsgYmrpgCk/PUvWZPRloKJNAJVc="; }; + patches = [ + # The icon validator copied from Flatpak needs to access the gdk-pixbuf loaders + # in the Nix store and cannot bind FHS paths since those are not available on NixOS. + (runCommand "icon-validator.patch" { } '' + # Flatpak uses a different path + substitute "${flatpak.icon-validator-patch}" "$out" \ + --replace "/icon-validator/validate-icon.c" "/src/validate-icon.c" + '') + ]; + nativeBuildInputs = [ autoreconfHook libxml2 @@ -50,6 +60,7 @@ stdenv.mkDerivation rec { dbus flatpak fuse3 + bubblewrap systemdMinimal # libsystemd glib gsettings-desktop-schemas @@ -83,6 +94,11 @@ stdenv.mkDerivation rec { passthru = { tests = { installedTests = nixosTests.installed-tests.xdg-desktop-portal; + + validate-icon = runCommand "test-icon-validation" { } '' + ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --sandbox 512 512 ${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" + grep format=svg "$out" + ''; }; }; @@ -92,4 +108,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d3b9695fbefa1..d6f9927738112 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2606,19 +2606,24 @@ buildLuarocksPackage { }) {}; nvim-cmp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua +, fetchgit, lua }: buildLuarocksPackage { pname = "nvim-cmp"; - version = "0.0.1-2"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/nvim-cmp-0.0.1-2.rockspec"; - sha256 = "0jx4i2rnc7zmy1bbqp6fqymlklc7xvqyv35prjl3ld05c4dpg7nq"; - }).outPath; - src = fetchzip { - url = "http://github.com/hrsh7th/nvim-cmp/archive/v0.0.1.zip"; - sha256 = "0649n476jd6dqd79fmywmigz19sb0s344ablwr25gr23fp46hzaz"; - }; + version = "scm-1"; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/hrsh7th/nvim-cmp", + "rev": "3347dd3c59b6c62288d861ddb92b9ba1227257a8", + "date": "2022-10-15T15:20:35+09:00", + "path": "/nix/store/yz8ak36srpzaw6qm2gip07ppl6zladcd-nvim-cmp", + "sha256": "1ca9mpxq7cqi36mqz0cgyhl9w1dwcalwh6v4kj377g1vqslyl5ay", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 0e5faa37bf5ef..99660c98e0a2d 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.118"; + version = "0.6.119"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nUhVHVjhrZm+Y/kIF3D85orm/EECug2xYSpcItYCThU="; + sha256 = "sha256-IYFVju7OcCxdFJKWK6TiXPt4p16oiTuBi51gfpi9tAE="; }; vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw="; diff --git a/pkgs/development/misc/msp430/newlib.nix b/pkgs/development/misc/msp430/newlib.nix index 4ea98bfc8b2e9..005d8f8cbd9f8 100644 --- a/pkgs/development/misc/msp430/newlib.nix +++ b/pkgs/development/misc/msp430/newlib.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lndir, newlib, msp430GccSupport }: +{ stdenvNoCC, xorg, newlib, msp430GccSupport }: stdenvNoCC.mkDerivation { name = "msp430-${newlib.name}"; @@ -10,9 +10,9 @@ stdenvNoCC.mkDerivation { buildCommand = '' mkdir $out - ${lndir}/bin/lndir -silent $newlib $out - ${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} - ${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} + ${xorg.lndir}/bin/lndir -silent $newlib $out + ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} + ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} ''; passthru = { diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d38a2809e982b..e175de4d5f042 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -120,6 +120,7 @@ , "dockerfile-language-server-nodejs" , "elasticdump" , "@electron-forge/cli" +, "eas-cli" , "elm-oracle" , "emoj" , "emojione" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c710f16c98a89..6d5ce854445e8 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -373,13 +373,13 @@ let sha512 = "9Kt7EuS/7WbMAUv2gSziqjvxwDbFSg3Xeyfuj5laUODX8o/k/CpsAKiQ8W7/R88eXFTMbJYg6+7uAmOWNKmwnw=="; }; }; - "@apollo/protobufjs-1.2.4" = { + "@apollo/protobufjs-1.2.6" = { name = "_at_apollo_slash_protobufjs"; packageName = "@apollo/protobufjs"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.4.tgz"; - sha512 = "npVJ9NVU/pynj+SCU+fambvTneJDyCnif738DnZ7pCxdDtzeEz7WkpSIq5wNUmWm5Td55N+S2xfqZ+WP4hDLng=="; + url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.6.tgz"; + sha512 = "Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw=="; }; }; "@apollo/utils.dropunuseddefinitions-1.1.0" = { @@ -1507,13 +1507,13 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.19.3" = { + "@babel/compat-data-7.19.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.19.3"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.3.tgz"; - sha512 = "prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz"; + sha512 = "CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw=="; }; }; "@babel/core-7.0.0" = { @@ -1552,13 +1552,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.19.3" = { + "@babel/generator-7.19.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.19.3"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.3.tgz"; - sha512 = "fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.19.4.tgz"; + sha512 = "5T2lY5vXqS+5UEit/5TwcIUeCnwgCljcF8IQRT6XRQPBrvLeq5V8W+URv+GvwoF3FP8tkhp++evVyDzkDGzNmA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -1714,13 +1714,13 @@ let sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw=="; }; }; - "@babel/helper-simple-access-7.18.6" = { + "@babel/helper-simple-access-7.19.4" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.6"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; - sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz"; + sha512 = "f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { @@ -1741,13 +1741,13 @@ let sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-string-parser-7.18.10" = { + "@babel/helper-string-parser-7.19.4" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.18.10"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; - sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; + sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; }; }; "@babel/helper-validator-identifier-7.19.1" = { @@ -1777,13 +1777,13 @@ let sha512 = "txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg=="; }; }; - "@babel/helpers-7.19.0" = { + "@babel/helpers-7.19.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.19.0"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz"; - sha512 = "DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz"; + sha512 = "G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw=="; }; }; "@babel/highlight-7.18.6" = { @@ -1813,13 +1813,13 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.19.3" = { + "@babel/parser-7.19.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.19.3"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.3.tgz"; - sha512 = "pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.19.4.tgz"; + sha512 = "qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -1957,13 +1957,13 @@ let sha512 = "14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.18.9" = { + "@babel/plugin-proposal-object-rest-spread-7.19.4" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.9"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; - sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz"; + sha512 = "wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { @@ -2227,13 +2227,13 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.18.9" = { + "@babel/plugin-transform-block-scoping-7.19.4" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.18.9"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; - sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz"; + sha512 = "934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ=="; }; }; "@babel/plugin-transform-classes-7.19.0" = { @@ -2254,13 +2254,13 @@ let sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.18.13" = { + "@babel/plugin-transform-destructuring-7.19.4" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.13"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz"; - sha512 = "TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz"; + sha512 = "t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -2596,13 +2596,13 @@ let sha512 = "Fnx1wWaWv2w2rl+VHxA9si//Da40941IQ29fKiRejVR7oN1FxSEL8+SyAX/2oKIye2gPvY/GBbJVEKQ/oi43zQ=="; }; }; - "@babel/preset-env-7.19.3" = { + "@babel/preset-env-7.19.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.19.3"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.3.tgz"; - sha512 = "ziye1OTc9dGFOAXSWKUqQblYHNlBOaDl8wzqf2iKXJAltYiR3hKHUKmkt+S9PppW7RQpq4fFCrwwpIDj/f5P4w=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz"; + sha512 = "5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg=="; }; }; "@babel/preset-flow-7.18.6" = { @@ -2686,13 +2686,13 @@ let sha512 = "lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw=="; }; }; - "@babel/runtime-7.19.0" = { + "@babel/runtime-7.19.4" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.19.0"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz"; - sha512 = "eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz"; + sha512 = "EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA=="; }; }; "@babel/runtime-7.9.0" = { @@ -2713,13 +2713,13 @@ let sha512 = "Yww0jXgolNtkhcK+Txo5JN+DjBpNmmAtD7G99HOebhEjBzjnACG09Tip9C8lSOF6PrhA56OeJWeOZduNJaKxBA=="; }; }; - "@babel/runtime-corejs3-7.19.1" = { + "@babel/runtime-corejs3-7.19.4" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.19.1"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.1.tgz"; - sha512 = "j2vJGnkopRzH+ykJ8h68wrHnEUmtK//E723jjixiAl/PPf6FhqY/vYRcMVlNydRKQjQsTsYEjpx+DZMIvnGk/g=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.4.tgz"; + sha512 = "HzjQ8+dzdx7dmZy4DQ8KV8aHi/74AjEbBGTFutBmg/pd3dY5/q1sfuOGPTFGEytlQhWoeVXqcK5BwMgIkRkNDQ=="; }; }; "@babel/template-7.0.0" = { @@ -2740,13 +2740,13 @@ let sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.19.3" = { + "@babel/traverse-7.19.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.19.3"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.3.tgz"; - sha512 = "qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.4.tgz"; + sha512 = "w3K1i+V5u2aJUOXBFFC5pveFLmtq1s3qcdDNC2qRI6WPBQIDaKFqXxDEqDO/h1dQ3HjsZoZMyIy6jGLq0xtw+g=="; }; }; "@babel/types-7.18.4" = { @@ -2758,13 +2758,13 @@ let sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; }; }; - "@babel/types-7.19.3" = { + "@babel/types-7.19.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.19.3"; + version = "7.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.19.3.tgz"; - sha512 = "hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz"; + sha512 = "M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw=="; }; }; "@blueprintjs/colors-4.1.7" = { @@ -3424,13 +3424,13 @@ let sha512 = "MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g=="; }; }; - "@cspell/dict-software-terms-2.2.12" = { + "@cspell/dict-software-terms-2.2.13" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "2.2.12"; + version = "2.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.2.12.tgz"; - sha512 = "wVVy4on8Uq5VAWm3cqrrhewTRRbpmNxtmTURGQ5rT6FqUtJvZ7W2Pj3QquzXsA9zSFZhGFQR3U7IdFesET9yAg=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.2.13.tgz"; + sha512 = "8PSJkeOKqbxdjAkUa0J1C1nPCk8ucg/Mn5SaUaBzQyKlPwGnvOAC/BbtflTDYjxX0jTwkQ16KWZK1T5DaYadLQ=="; }; }; "@cspell/dict-sql-1.0.4" = { @@ -3982,22 +3982,22 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-1.3.2" = { + "@eslint/eslintrc-1.3.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz"; - sha512 = "AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz"; + sha512 = "uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg=="; }; }; - "@exodus/schemasafe-1.0.0-rc.7" = { + "@exodus/schemasafe-1.0.0-rc.9" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; - version = "1.0.0-rc.7"; + version = "1.0.0-rc.9"; src = fetchurl { - url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.7.tgz"; - sha512 = "+1mBLsa+vvlV0lwEAP1hwgmOPkjMnoJ8hyCMfCCJga0sVDwDzrPJjnxZwdDaUmOh/vbFHQGBTk+FxsVjoI/CjQ=="; + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.9.tgz"; + sha512 = "dGGHpb61hLwifAu7sotuHFDBw6GTdpG8aKC0fsK17EuTzMRvUrH7lEAr6LTJ+sx3AZYed9yZ77rltVDHyg2hRg=="; }; }; "@expo/apple-utils-0.0.0-alpha.31" = { @@ -4009,6 +4009,15 @@ let sha512 = "lGJOS8eAPcZhaRl5GZFIg4ZNSRY1k10wYeYXjHUbHxbZGE9lkzrATY8OvrVpcu8qQh3lvPguel63V4mrnoAuOA=="; }; }; + "@expo/apple-utils-0.0.0-alpha.34" = { + name = "_at_expo_slash_apple-utils"; + packageName = "@expo/apple-utils"; + version = "0.0.0-alpha.34"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-0.0.0-alpha.34.tgz"; + sha512 = "GRHN1xhI3Yjb76aFVLhxE7o/Pdx8D78Gm2HaRHxdFRSSdYK5lPw2/1y1/GhDH7DoXqqGwo2uQSevd6ywlj657g=="; + }; + }; "@expo/bunyan-4.0.0" = { name = "_at_expo_slash_bunyan"; packageName = "@expo/bunyan"; @@ -4117,6 +4126,24 @@ let sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; + "@expo/eas-build-job-0.2.94" = { + name = "_at_expo_slash_eas-build-job"; + packageName = "@expo/eas-build-job"; + version = "0.2.94"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.2.94.tgz"; + sha512 = "+tig8SczdGfjk2Tma5cVmESkx0bPBmR6dan2Bp5ITai3nhl8JN9mNZfEJPaBPCDlUe37sHvJwosh3GMfcq7QYg=="; + }; + }; + "@expo/eas-json-2.2.0" = { + name = "_at_expo_slash_eas-json"; + packageName = "@expo/eas-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-2.2.0.tgz"; + sha512 = "CwWv6kTTwRghWoKM/+r2hZYChwZqfZBpbC2rYmxKN9oMstPf/ItVKP7jNHtfoWG23qed6o/ZUYNtBseDBovxvw=="; + }; + }; "@expo/image-utils-0.3.20" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; @@ -4171,6 +4198,15 @@ let sha512 = "QhOiotuzklalLbbsTMXJ5v4q4jffQ5xXhy1zsosgc2DL/ZzUr/Yhm3xUcOGnPQ2x7UyeY9Tl3njPHBOJJe7CSA=="; }; }; + "@expo/multipart-body-parser-1.1.0" = { + name = "_at_expo_slash_multipart-body-parser"; + packageName = "@expo/multipart-body-parser"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/multipart-body-parser/-/multipart-body-parser-1.1.0.tgz"; + sha512 = "XOaS79wFIJgx0J7oUzRb+kZsnZmFqGpisu0r8RPO3b0wjbW7xpWgiXmRR4RavKeGiVAPauZOi4vad7cJ3KCspg=="; + }; + }; "@expo/osascript-2.0.33" = { name = "_at_expo_slash_osascript"; packageName = "@expo/osascript"; @@ -4189,6 +4225,15 @@ let sha512 = "PGk34uz4XDyhoNIlPh2D+BDsiXYuW2jXavTiax8d32uvHlRO6FN0cAsqlWD6fx3H2hRn8cU/leTuc4M7pYovCQ=="; }; }; + "@expo/pkcs12-0.0.8" = { + name = "_at_expo_slash_pkcs12"; + packageName = "@expo/pkcs12"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/pkcs12/-/pkcs12-0.0.8.tgz"; + sha512 = "VNZnmsu3PgdvZRqYLB0Ja8dNjKrgKpcqMvtUPINI4fJbF/ihDNI0A/LkHvnR2/21WRMHk2tm4QgMIkOQTfZ5kg=="; + }; + }; "@expo/plist-0.0.18" = { name = "_at_expo_slash_plist"; packageName = "@expo/plist"; @@ -4198,6 +4243,33 @@ let sha512 = "+48gRqUiz65R21CZ/IXa7RNBXgAI/uPSdvJqoN9x1hfL44DNbUoWHgHiEXTx7XelcATpDwNTz6sHLfy0iNqf+w=="; }; }; + "@expo/plugin-autocomplete-1.4.0" = { + name = "_at_expo_slash_plugin-autocomplete"; + packageName = "@expo/plugin-autocomplete"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/plugin-autocomplete/-/plugin-autocomplete-1.4.0.tgz"; + sha512 = "HK+lq5kWXvP2NOg/mME9ZlbCWRzwvslIZmVvYHnoRmIGvPUXku7eoOtlSEpmOk77wM+wu/IoFRAY8kBYeAZEbQ=="; + }; + }; + "@expo/plugin-help-5.3.0" = { + name = "_at_expo_slash_plugin-help"; + packageName = "@expo/plugin-help"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/plugin-help/-/plugin-help-5.3.0.tgz"; + sha512 = "dgh5zo2E2hOQ+5vCRWdrPRDp/omnDdTWpMcxFmco5CkCaRX21FRzMFEZdJVhoLlEeavDgX98VyzqWslJxXHn3w=="; + }; + }; + "@expo/plugin-warn-if-update-available-2.3.0" = { + name = "_at_expo_slash_plugin-warn-if-update-available"; + packageName = "@expo/plugin-warn-if-update-available"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/plugin-warn-if-update-available/-/plugin-warn-if-update-available-2.3.0.tgz"; + sha512 = "GBHwvWNt23aOrpFW2kw2RBkInnWKPa3j4h5gp09cxjYawcI3jl2FKyOEokxCiFhE+9QnIFTEm0fWJDceGmBe0w=="; + }; + }; "@expo/prebuild-config-4.0.3" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; @@ -4216,6 +4288,15 @@ let sha512 = "G4j1H3WFjRaiQ+FgFNULrnIm7RsQyjc4xp6lLTP2ydBv79wO3x8wAdeZvaZh7eOkfu9BESpQzACT1uuJTag5jg=="; }; }; + "@expo/results-1.0.0" = { + name = "_at_expo_slash_results"; + packageName = "@expo/results"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/results/-/results-1.0.0.tgz"; + sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; + }; + }; "@expo/rudder-sdk-node-1.1.1" = { name = "_at_expo_slash_rudder-sdk-node"; packageName = "@expo/rudder-sdk-node"; @@ -4252,6 +4333,24 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; + "@expo/spawn-async-1.7.0" = { + name = "_at_expo_slash_spawn-async"; + packageName = "@expo/spawn-async"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/spawn-async/-/spawn-async-1.7.0.tgz"; + sha512 = "sqPAjOEFTrjaTybrh9SnPFLInDXcoMC06psEFmH68jLTmoipSQCq8GCEfIoHhxRDALWB+DsiwXJSbXlE/iVIIQ=="; + }; + }; + "@expo/timeago.js-1.0.0" = { + name = "_at_expo_slash_timeago.js"; + packageName = "@expo/timeago.js"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/timeago.js/-/timeago.js-1.0.0.tgz"; + sha512 = "PD45CGlCL8kG0U3YcH1NvYxQThw5XAS7qE9bgP4L7dakm8lsMz+p8BQ1IjBFMmImawVWsV3py6JZINaEebXLnw=="; + }; + }; "@expo/vector-icons-13.0.0" = { name = "_at_expo_slash_vector-icons"; packageName = "@expo/vector-icons"; @@ -4405,22 +4504,22 @@ let sha512 = "puklLc6Jvg279OGagqkSfuHML6ckBhw3gJakdvIZHKeJiduh+34U4Finl3K24yBSXzG2WsN+LwLTd1Vcociy+g=="; }; }; - "@fluentui/font-icons-mdl2-8.5.0" = { + "@fluentui/font-icons-mdl2-8.5.1" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.0.tgz"; - sha512 = "EV9QFy/plJ0blnf6AKZ8s2UQMfzNTUEdtAm/nP2Z3cd7XdYyXBN7HDAWmxwNWhoGyZ6hhKrruj4ZW0C/qKYDMQ=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.1.tgz"; + sha512 = "706EOX9EO28GkOchYq5Wb9ED7bAbrnKqt1hJgDXyXh7eL+87lSRacKHaS8kZETuqqC/MdOeHqiPo0NqIW/dA4A=="; }; }; - "@fluentui/foundation-legacy-8.2.20" = { + "@fluentui/foundation-legacy-8.2.21" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.20"; + version = "8.2.21"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.20.tgz"; - sha512 = "iyJSr5Y/yYt0x9yBLP+aIy5U9tiDlgbxJZo6enNwFo0zEuBeWg/2L2IgAUzAwJB2vb73oQBlQt8In602R0Vj8w=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.21.tgz"; + sha512 = "HY55Arf3Hxyclc/fsWusO1Yh1JEvkHqpMMbwhs9s3D8hiSLMAFNp8lgWew9x4yqDHeYYfdXJYJ5BSHqMAlTj+g=="; }; }; "@fluentui/keyboard-key-0.4.2" = { @@ -4441,22 +4540,22 @@ let sha512 = "bHWftN3zTp1bbBfmAEH8YK9UURWj2mffw7b7VaW2Og1qxwv3GMSza1cyv/d3EVqpMJ8AVwFv3mbi9p1ieMN9mw=="; }; }; - "@fluentui/react-8.97.2" = { + "@fluentui/react-8.98.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.97.2"; + version = "8.98.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.97.2.tgz"; - sha512 = "MwBFRydKfdu26F3yXqpCJxVUuWw8GDl1pEkjlWfKEKnBMiODmEmeMEsvSaI3BusXXz09q05+cdMqmD4lhuZlcw=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.98.0.tgz"; + sha512 = "BIClnchh0Ucv+DRp/qgkvNGoElpwgUzGyem9sz/W7OmmndL5UDxHIx9B7EBG5BM0Xmpiwhah1i17FO+j7WMnYQ=="; }; }; - "@fluentui/react-focus-8.8.5" = { + "@fluentui/react-focus-8.8.6" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.8.5"; + version = "8.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.5.tgz"; - sha512 = "+BNjLHKpA0IqUToY9MMARGpYg3ngBmW+1KhJeVxCUnAESNMwnzJ6hx/3MOYUA/FPbYfBvs8QnpTZrrOd7sLG/A=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.6.tgz"; + sha512 = "Ys4w9120o65Xx2SAs9yjgOEnU0YT9vpgx/61TWd2/KeUQMDRyzipVMVa7qEjpLnuDiNWzdfTCs2cGqApv8MbzQ=="; }; }; "@fluentui/react-hooks-8.6.11" = { @@ -4495,13 +4594,13 @@ let sha512 = "Vg20KZ0ufgWjxx6GFbqC5wiVxXZDUWgNT0r0By/Eyj4bUSb1jG6lmf5z1oY1dUX0YS6Cp5e6GnvbNdXg5E7orA=="; }; }; - "@fluentui/style-utilities-8.7.12" = { + "@fluentui/style-utilities-8.8.0" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.7.12"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.7.12.tgz"; - sha512 = "Ayxyo5brZxNI3CK4la+esJ5yDUQFAD26+BqjbIZvXemKq6ZsZDb2875H//saSVHc+dRq8R6J80A1GGV0fJpIEA=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.8.0.tgz"; + sha512 = "wqntrpzOGvBNojAlnXVQB98hYQkS0g5ZckF/JxkNDWYRUcemu9bUTgBOg1hdiV9DM8nxyg34LE794oMxRIuLHA=="; }; }; "@fluentui/theme-2.6.16" = { @@ -4549,22 +4648,22 @@ let sha512 = "+GFtFqBhFzwKaKmeEfw1jWQgZJNX4q11CCx1fSPFJB49Fdjb7k3lx74jAyzHlX0UWnm6DMK+/cYT7j5t6G9LfA=="; }; }; - "@forge/bundler-3.1.1" = { + "@forge/bundler-3.1.2" = { name = "_at_forge_slash_bundler"; packageName = "@forge/bundler"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/bundler/-/bundler-3.1.1.tgz"; - sha512 = "30ozovWrcW04qXYLgqleW0V6VaG8qzntasEBlm4y+4dAFvvkGUcmrLjzprcOELXxE50+wQzLhn+aFGaE9WxeKg=="; + url = "https://registry.npmjs.org/@forge/bundler/-/bundler-3.1.2.tgz"; + sha512 = "dCceVDQ4hsuNMwqNlU0DwHJ3XaljNBp0ruKZIQ0phxhL3tAO1s1x0xjzQH5iWT4J3SdPvfiFZWjMyoJ1Pt9EZw=="; }; }; - "@forge/cli-shared-3.1.1" = { + "@forge/cli-shared-3.2.0" = { name = "_at_forge_slash_cli-shared"; packageName = "@forge/cli-shared"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.1.1.tgz"; - sha512 = "OEy4Ty180+QGscY0KSMaiZXrAHOizWfgla/OSZE4E9BGnN37fe8qZooU/5M1l2V04S+RlEtiMLCrWNf03UQ1KQ=="; + url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.2.0.tgz"; + sha512 = "QWKBVNCIkWRZ9JgULvCnd5bHGPx+oX57gkvnWsbB3DUgqwu+q8amVWbQ94j91kzOMc/2TS7vHhpt6frujP6Z0g=="; }; }; "@forge/egress-1.1.1" = { @@ -4576,22 +4675,22 @@ let sha512 = "ycnIIOKyurzchlocjjvTwqtQNsCF98XRT+YvwVwZWwKZ0OmSzPcXPZImrIFw3dF1qySwRwRL31R0xZ1HYUEs8w=="; }; }; - "@forge/lint-3.2.5" = { + "@forge/lint-3.2.6" = { name = "_at_forge_slash_lint"; packageName = "@forge/lint"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.5.tgz"; - sha512 = "C9KArqoF88uqBE9MoLnsq1ZrorM66LEF2B4f6ZngMY9KNzDxH8WEOm6DLugOWHi77SeCES7evuJxRlUfIT3W/Q=="; + url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.6.tgz"; + sha512 = "yu7gjlMLbh/pigAWpk03knZHoL2F5rRz1lh4zb0CZnldccKzlQYiz/Sv2BfcuTikcCR9x4dRphy/0E43Z0dEKQ=="; }; }; - "@forge/manifest-4.3.0" = { + "@forge/manifest-4.4.0" = { name = "_at_forge_slash_manifest"; packageName = "@forge/manifest"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.3.0.tgz"; - sha512 = "ICZHlvOiBeBv1QxnWunpDqFo4U3OEN95LWulYNeYrVhsgLP267UH5oy4scN6JkSZWAbIy4LveYHW+BCRcLox9Q=="; + url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.4.0.tgz"; + sha512 = "X0JvVhYX8Gfj2DdURrxhzdDlzfb37ZguX732s+BMsETovaYgVrNCQ32f45xAo62+levq0OXOA9N0LjnR/pdHJg=="; }; }; "@forge/storage-1.3.0" = { @@ -5602,13 +5701,13 @@ let sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; }; - "@jridgewell/trace-mapping-0.3.15" = { + "@jridgewell/trace-mapping-0.3.16" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.15"; + version = "0.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz"; - sha512 = "oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.16.tgz"; + sha512 = "LCQ+NeThyJ4k1W2d+vIKdxuSt9R3pQSZ4P92m7EakaYuXcVWbHuT5bjNcqLd4Rdgi6xYWYDvBJZJLZSLanjDcA=="; }; }; "@jridgewell/trace-mapping-0.3.9" = { @@ -5845,544 +5944,544 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@lerna/add-5.6.1" = { + "@lerna/add-5.6.2" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-5.6.1.tgz"; - sha512 = "cZvqMYoAclefw/KQwrRIpeQiKuj/KhbkNItWc6LnWcpweUmnrAm/AEfddIOnSagRHUgkSIY/pafjL2DGdIU25w=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-5.6.2.tgz"; + sha512 = "NHrm7kYiqP+EviguY7/NltJ3G9vGmJW6v2BASUOhP9FZDhYbq3O+rCDlFdoVRNtcyrSg90rZFMOWHph4KOoCQQ=="; }; }; - "@lerna/bootstrap-5.6.1" = { + "@lerna/bootstrap-5.6.2" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-5.6.1.tgz"; - sha512 = "YMNDTDtAo5fpt/pmA/JOcU2HvgD/bdwiZAa80312HcRy6MortJqFDo6wOM6trfoqf0XkWOpcw+P7/d/8+b8SVw=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-5.6.2.tgz"; + sha512 = "S2fMOEXbef7nrybQhzBywIGSLhuiQ5huPp1sU+v9Y6XEBsy/2IA+lb0gsZosvPqlRfMtiaFstL+QunaBhlWECA=="; }; }; - "@lerna/changed-5.6.1" = { + "@lerna/changed-5.6.2" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-5.6.1.tgz"; - sha512 = "YVXkTEXlQWW1BSyURwZHz4HDpfl/yAwkLQbRQ2OtEmknkh4QOK41PPBgX0q1SCWKs3OYdSuI30A2H3KY8LMkxg=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-5.6.2.tgz"; + sha512 = "uUgrkdj1eYJHQGsXXlpH5oEAfu3x0qzeTjgvpdNrxHEdQWi7zWiW59hRadmiImc14uJJYIwVK5q/QLugrsdGFQ=="; }; }; - "@lerna/check-working-tree-5.6.1" = { + "@lerna/check-working-tree-5.6.2" = { name = "_at_lerna_slash_check-working-tree"; packageName = "@lerna/check-working-tree"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-5.6.1.tgz"; - sha512 = "pzM/d+009Yl7ThpbWPntao5WuHi4nb/T9WKTOG/CzS/yLQgceVaX1vRaf3fML92RYmV+XGFPq+PaVQXtwHdMkA=="; + url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-5.6.2.tgz"; + sha512 = "6Vf3IB6p+iNIubwVgr8A/KOmGh5xb4SyRmhFtAVqe33yWl2p3yc+mU5nGoz4ET3JLF1T9MhsePj0hNt6qyOTLQ=="; }; }; - "@lerna/child-process-5.6.1" = { + "@lerna/child-process-5.6.2" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-5.6.1.tgz"; - sha512 = "+86Z5EwBkdypTyV8z8Se3McbGCHh4wUBfGuOoNmar4NjeY2HVuiRCoaJsyqgoyNLoXJb1gqDGlWkG5LTuKvw/A=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-5.6.2.tgz"; + sha512 = "QIOQ3jIbWdduHd5892fbo3u7/dQgbhzEBB7cvf+Ys/iCPP8UQrBECi1lfRgA4kcTKC2MyMz0SoyXZz/lFcXc3A=="; }; }; - "@lerna/clean-5.6.1" = { + "@lerna/clean-5.6.2" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-5.6.1.tgz"; - sha512 = "af+jZ/JT5AKvnW3JwFjqcuZyOiV1MCdYCi8KwHGJbEOT3ak2u7jdgFyHYtTngYTYeFn+VOSi9+vnVZ8RhQ0DQg=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-5.6.2.tgz"; + sha512 = "A7j8r0Hk2pGyLUyaCmx4keNHen1L/KdcOjb4nR6X8GtTJR5AeA47a8rRKOCz9wwdyMPlo2Dau7d3RV9viv7a5g=="; }; }; - "@lerna/cli-5.6.1" = { + "@lerna/cli-5.6.2" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-5.6.1.tgz"; - sha512 = "y7GmT30rVovwJHKZQE+1aH5BbR+m9psNwzGhAl3bI3pIi3DPNwa+5Ag7XV+tzKItqwfNtNQbrGIt6u3xbVgR3Q=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-5.6.2.tgz"; + sha512 = "w0NRIEqDOmYKlA5t0iyqx0hbY7zcozvApmfvwF0lhkuhf3k6LRAFSamtimGQWicC779a7J2NXw4ASuBV47Fs1Q=="; }; }; - "@lerna/collect-uncommitted-5.6.1" = { + "@lerna/collect-uncommitted-5.6.2" = { name = "_at_lerna_slash_collect-uncommitted"; packageName = "@lerna/collect-uncommitted"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-5.6.1.tgz"; - sha512 = "Z1I4BFBcbqxX3RRiHtPA3JU92NOyTeJF/pWB5DImWDL7i5AYXWYA6iW99HyKTGfIsA3GrS4BIL0UOmp4vP7Yvw=="; + url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-5.6.2.tgz"; + sha512 = "i0jhxpypyOsW2PpPwIw4xg6EPh7/N3YuiI6P2yL7PynZ8nOv8DkIdoyMkhUP4gALjBfckH8Bj94eIaKMviqW4w=="; }; }; - "@lerna/collect-updates-5.6.1" = { + "@lerna/collect-updates-5.6.2" = { name = "_at_lerna_slash_collect-updates"; packageName = "@lerna/collect-updates"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-5.6.1.tgz"; - sha512 = "xY5nJ//ACDVU/k9zn45W//wWw9+Cf4HWN7nla8J1YHLsRmn79uJONZnyK3MBCjMpgVzSAmMe47wuDu+ZzqV/Ew=="; + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-5.6.2.tgz"; + sha512 = "DdTK13X6PIsh9HINiMniFeiivAizR/1FBB+hDVe6tOhsXFBfjHMw1xZhXlE+mYIoFmDm1UFK7zvQSexoaxRqFA=="; }; }; - "@lerna/command-5.6.1" = { + "@lerna/command-5.6.2" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-5.6.1.tgz"; - sha512 = "QxJr73TUQQ4B+4mWfwH7kNNTxP3lBnNKN6zX9NnjanQ2u6Nij/SMbvym1L0T2EVgZMseFzZEQnXE3d+jbWn/aQ=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-5.6.2.tgz"; + sha512 = "eLVGI9TmxcaGt1M7TXGhhBZoeWOtOedMiH7NuCGHtL6TMJ9k+SCExyx+KpNmE6ImyNOzws6EvYLPLjftiqmoaA=="; }; }; - "@lerna/conventional-commits-5.6.1" = { + "@lerna/conventional-commits-5.6.2" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-5.6.1.tgz"; - sha512 = "H86fO470tU/lnws+xrSxzeJFBehAo10dtI35+AC9kwub7XwWO19AhdbQjf4PwWhG8/CTl65Tn9UMg+kHYilmzA=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-5.6.2.tgz"; + sha512 = "fPrJpYJhxCgY2uyOCTcAAC6+T6lUAtpEGxLbjWHWTb13oKKEygp9THoFpe6SbAD0fYMb3jeZCZCqNofM62rmuA=="; }; }; - "@lerna/create-5.6.1" = { + "@lerna/create-5.6.2" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-5.6.1.tgz"; - sha512 = "DSDprUvSszb6qedync3TFfDLrFzP264LNPdw+MBSw4o3lpZAmAGelzyw+xSQQQjLNoGC5q/UUePKiCiWps8aPw=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-5.6.2.tgz"; + sha512 = "+Y5cMUxMNXjTTU9IHpgRYIwKo39w+blui1P+s+qYlZUSCUAew0xNpOBG8iN0Nc5X9op4U094oIdHxv7Dyz6tWQ=="; }; }; - "@lerna/create-symlink-5.6.1" = { + "@lerna/create-symlink-5.6.2" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-5.6.1.tgz"; - sha512 = "u46aoyxdoHXiyOQ1vCsA8PPkPkyjZanKuiJxnqMXITMwpQFjo18FvSN9BvnZkbJ6Jwnj/boO1TjDUewrQ4wPjw=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-5.6.2.tgz"; + sha512 = "0WIs3P6ohPVh2+t5axrLZDE5Dt7fe3Kv0Auj0sBiBd6MmKZ2oS76apIl0Bspdbv8jX8+TRKGv6ib0280D0dtEw=="; }; }; - "@lerna/describe-ref-5.6.1" = { + "@lerna/describe-ref-5.6.2" = { name = "_at_lerna_slash_describe-ref"; packageName = "@lerna/describe-ref"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-5.6.1.tgz"; - sha512 = "VskLszuC3NoN5l31kSh3NiIt4cqaulBI75Ek1HDT+VcGXR2AJzsE1BweDWrh2xJBdqdK8cLp72R/vgUDbjKQCg=="; + url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-5.6.2.tgz"; + sha512 = "UqU0N77aT1W8duYGir7R+Sk3jsY/c4lhcCEcnayMpFScMbAp0ETGsW04cYsHK29sgg+ZCc5zEwebBqabWhMhnA=="; }; }; - "@lerna/diff-5.6.1" = { + "@lerna/diff-5.6.2" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-5.6.1.tgz"; - sha512 = "5JTxFUuLfEJZwtplAhWAbffv+FzJsP9ndsJFsmobdfKHZxxoyCvwc5fgMFRgQQMZcQue+lnZEYITJim078xy2A=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-5.6.2.tgz"; + sha512 = "aHKzKvUvUI8vOcshC2Za/bdz+plM3r/ycqUrPqaERzp+kc1pYHyPeXezydVdEmgmmwmyKI5hx4+2QNnzOnun2A=="; }; }; - "@lerna/exec-5.6.1" = { + "@lerna/exec-5.6.2" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-5.6.1.tgz"; - sha512 = "nNZAm6yhbHG59xMOCnJjYjQRtjqZqwjSiWakWz8upj+2HBd2Z0eMnQvrX1j9GhurhgHzhG7AM7FLnJHyh1b3Tw=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-5.6.2.tgz"; + sha512 = "meZozok5stK7S0oAVn+kdbTmU+kHj9GTXjW7V8kgwG9ld+JJMTH3nKK1L3mEKyk9TFu9vFWyEOF7HNK6yEOoVg=="; }; }; - "@lerna/filter-options-5.6.1" = { + "@lerna/filter-options-5.6.2" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-5.6.1.tgz"; - sha512 = "uii0ZDlv2j8e6d3D25wp59L0nRUh7C3B6ImCTOraEdkir6E1UEXZK7VmIzxWD44L78vnUW1kl+j/q7Kib3cP/g=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-5.6.2.tgz"; + sha512 = "4Z0HIhPak2TabTsUqEBQaQeOqgqEt0qyskvsY0oviYvqP/nrJfJBZh4H93jIiNQF59LJCn5Ce3KJJrLExxjlzw=="; }; }; - "@lerna/filter-packages-5.6.1" = { + "@lerna/filter-packages-5.6.2" = { name = "_at_lerna_slash_filter-packages"; packageName = "@lerna/filter-packages"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-5.6.1.tgz"; - sha512 = "uKaIebxrx235wg78SqY8A0ZugValdW6PgwkDFjss/Y2m8/9c+PiAbfkBeF5Q8iv8VP7te2MsGcvV12UmIQKDdA=="; + url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-5.6.2.tgz"; + sha512 = "el9V2lTEG0Bbz+Omo45hATkRVnChCTJhcTpth19cMJ6mQ4M5H4IgbWCJdFMBi/RpTnOhz9BhJxDbj95kuIvvzw=="; }; }; - "@lerna/get-npm-exec-opts-5.6.1" = { + "@lerna/get-npm-exec-opts-5.6.2" = { name = "_at_lerna_slash_get-npm-exec-opts"; packageName = "@lerna/get-npm-exec-opts"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.6.1.tgz"; - sha512 = "y+Fzd9l1LM6tlarKrWxXQBKm02m7sjzj1T7vgiPW5uo324qEZVil89849iXgm2tLZt7/KD18Gqene2Hik0jmGQ=="; + url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.6.2.tgz"; + sha512 = "0RbSDJ+QC9D5UWZJh3DN7mBIU1NhBmdHOE289oHSkjDY+uEjdzMPkEUy+wZ8fCzMLFnnNQkAEqNaOAzZ7dmFLA=="; }; }; - "@lerna/get-packed-5.6.1" = { + "@lerna/get-packed-5.6.2" = { name = "_at_lerna_slash_get-packed"; packageName = "@lerna/get-packed"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-5.6.1.tgz"; - sha512 = "PI+WSCHXsBCF2+McaEUtcR3acZu/0JApUH+IJMz0TdYzspF4ewzEWhBn+4Gmw926oFsqnqfz37KInXNHGmBvCg=="; + url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-5.6.2.tgz"; + sha512 = "pp5nNDmtrtd21aKHjwwOY5CS7XNIHxINzGa+Jholn1jMDYUtdskpN++ZqYbATGpW831++NJuiuBVyqAWi9xbXg=="; }; }; - "@lerna/github-client-5.6.1" = { + "@lerna/github-client-5.6.2" = { name = "_at_lerna_slash_github-client"; packageName = "@lerna/github-client"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-5.6.1.tgz"; - sha512 = "XGAry8MX2fou8aAP3mf1+6oPP34QdgXzrRbdtXlCv8ksddbp/S1Tn5hNvorEJn2yDMNcjIDIdvrL/T4UiVzQjA=="; + url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-5.6.2.tgz"; + sha512 = "pjALazZoRZtKqfwLBwmW3HPptVhQm54PvA8s3qhCQ+3JkqrZiIFwkkxNZxs3jwzr+aaSOzfhSzCndg0urb0GXA=="; }; }; - "@lerna/gitlab-client-5.6.1" = { + "@lerna/gitlab-client-5.6.2" = { name = "_at_lerna_slash_gitlab-client"; packageName = "@lerna/gitlab-client"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-5.6.1.tgz"; - sha512 = "zNG27B1dNy4QF45tUPEywthNtsDbzvsUSiokMx847Gxq5qLHtRHRR8kK51Q2dJ6u2biZafGNyzHqT5CQ/0ndnQ=="; + url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-5.6.2.tgz"; + sha512 = "TInJmbrsmYIwUyrRxytjO82KjJbRwm67F7LoZs1shAq6rMvNqi4NxSY9j+hT/939alFmEq1zssoy/caeLXHRfQ=="; }; }; - "@lerna/global-options-5.6.1" = { + "@lerna/global-options-5.6.2" = { name = "_at_lerna_slash_global-options"; packageName = "@lerna/global-options"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-5.6.1.tgz"; - sha512 = "VgHVo0T2NC/YK/mR9nu8Z3DL65UtoamRclrnqK3HsaTub15UnqAlbcnEk2lB50e5TLsIZAp4TatDYrYNPKKJPQ=="; + url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-5.6.2.tgz"; + sha512 = "kaKELURXTlczthNJskdOvh6GGMyt24qat0xMoJZ8plYMdofJfhz24h1OFcvB/EwCUwP/XV1+ohE5P+vdktbrEg=="; }; }; - "@lerna/has-npm-version-5.6.1" = { + "@lerna/has-npm-version-5.6.2" = { name = "_at_lerna_slash_has-npm-version"; packageName = "@lerna/has-npm-version"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-5.6.1.tgz"; - sha512 = "V6lt830kXnEm/1pHyFh9Pci4lgRbQcBr1eORAD8d03uxQDfxA7Z8Gu9afhH5m0rk+P8txNO/3pUe2pf5Ex4DGg=="; + url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-5.6.2.tgz"; + sha512 = "kXCnSzffmTWsaK0ol30coyCfO8WH26HFbmJjRBzKv7VGkuAIcB6gX2gqRRgNLLlvI+Yrp+JSlpVNVnu15SEH2g=="; }; }; - "@lerna/import-5.6.1" = { + "@lerna/import-5.6.2" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-5.6.1.tgz"; - sha512 = "cOLjRAWWfY1ezsiBRIbA6lN4THu89xjtS+wJ8WUqr/xbYbGZ/qr4DBAWnpWpMfLLWN6Eel6nEAhah+Ch1IKNog=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-5.6.2.tgz"; + sha512 = "xQUE49mtcP0z3KUdXBsyvp8rGDz6phuYUoQbhcFRJ7WPcQKzMvtm0XYrER6c2YWEX7QOuDac6tU82P8zTrTBaA=="; }; }; - "@lerna/info-5.6.1" = { + "@lerna/info-5.6.2" = { name = "_at_lerna_slash_info"; packageName = "@lerna/info"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/info/-/info-5.6.1.tgz"; - sha512 = "0ixkn6Z8jlesMozQBlG3vdivFOjleapCusjDFZ1F7quuEcWDQuW1bQ4i55ISsVhh5gLCTTwQiNEhPnDQzs7fww=="; + url = "https://registry.npmjs.org/@lerna/info/-/info-5.6.2.tgz"; + sha512 = "MPjY5Olj+fiZHgfEdwXUFRKamdEuLr9Ob/qut8JsB/oQSQ4ALdQfnrOcMT8lJIcC2R67EA5yav2lHPBIkezm8A=="; }; }; - "@lerna/init-5.6.1" = { + "@lerna/init-5.6.2" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-5.6.1.tgz"; - sha512 = "EPA3XCteadwZjb7GOqJFw+QcqwV/CrpWm9FZOEpo9uXNUCvOW8NqDlFzTEMrMiXBTldoP0H9SK9yM81c0Mip7Q=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-5.6.2.tgz"; + sha512 = "ahU3/lgF+J8kdJAQysihFJROHthkIDXfHmvhw7AYnzf94HjxGNXj7nz6i3At1/dM/1nQhR+4/uNR1/OU4tTYYQ=="; }; }; - "@lerna/link-5.6.1" = { + "@lerna/link-5.6.2" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-5.6.1.tgz"; - sha512 = "iWr7HGviIK3N/WNUoAZVV0RRf0CQzpR9uJXmsfuVKXj5gN8IHqFOdGS8TIIN57ekC0DOpDtR21h65zZXD1TSHQ=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-5.6.2.tgz"; + sha512 = "hXxQ4R3z6rUF1v2x62oIzLyeHL96u7ZBhxqYMJrm763D1VMSDcHKF9CjJfc6J9vH5Z2ZbL6CQg50Hw5mUpJbjg=="; }; }; - "@lerna/list-5.6.1" = { + "@lerna/list-5.6.2" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-5.6.1.tgz"; - sha512 = "4VyAvVwKZQC+ntfjJuL8PbFu5jeR/8t21BzFXVWRkrZc3/sGVxSNtzi+9Brgrxm4n8qir3+wiiC4LSHdYG8Mlw=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-5.6.2.tgz"; + sha512 = "WjE5O2tQ3TcS+8LqXUaxi0YdldhxUhNihT5+Gg4vzGdIlrPDioO50Zjo9d8jOU7i3LMIk6EzCma0sZr2CVfEGg=="; }; }; - "@lerna/listable-5.6.1" = { + "@lerna/listable-5.6.2" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-5.6.1.tgz"; - sha512 = "c7vzJYEPiH0DT7BJpjomLt2zwViPupk0g/dU9rCBkm4w2jk6Vult60/O3rx5rb95PUFz/pYM+3w3vkZWXx9AnQ=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-5.6.2.tgz"; + sha512 = "8Yp49BwkY/5XqVru38Zko+6Wj/sgbwzJfIGEPy3Qu575r1NA/b9eI1gX22aMsEeXUeGOybR7nWT5ewnPQHjqvA=="; }; }; - "@lerna/log-packed-5.6.1" = { + "@lerna/log-packed-5.6.2" = { name = "_at_lerna_slash_log-packed"; packageName = "@lerna/log-packed"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-5.6.1.tgz"; - sha512 = "nyrrI8SbwO4nezuwDDQPea2XR3IWVRxgDzuZHA+g5utx75BuCZ2d1yrZe8URzfCIVVoGYI5OuOlv32BtLzt4tw=="; + url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-5.6.2.tgz"; + sha512 = "O9GODG7tMtWk+2fufn2MOkIDBYMRoKBhYMHshO5Aw/VIsH76DIxpX1koMzWfUngM/C70R4uNAKcVWineX4qzIw=="; }; }; - "@lerna/npm-conf-5.6.1" = { + "@lerna/npm-conf-5.6.2" = { name = "_at_lerna_slash_npm-conf"; packageName = "@lerna/npm-conf"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-5.6.1.tgz"; - sha512 = "u4Pg0IjMhRIGdgNr18nzwyv6wcP5Qo0QEvf07P6tV8G3ocY+3w8q6mrPyFT3NitodLQ4AMWFDfyFZzXikJI+uw=="; + url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-5.6.2.tgz"; + sha512 = "gWDPhw1wjXYXphk/PAghTLexO5T6abVFhXb+KOMCeem366mY0F5bM88PiorL73aErTNUoR8n+V4X29NTZzDZpQ=="; }; }; - "@lerna/npm-dist-tag-5.6.1" = { + "@lerna/npm-dist-tag-5.6.2" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-5.6.1.tgz"; - sha512 = "YEbIP1J6V0U9qco7wk9qK0JbApIshPrUGqr0Kp1rx57pwtcwxIAvH/AEbqdVqjmItiPDpYgP7VukG7MI6EGe1w=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-5.6.2.tgz"; + sha512 = "t2RmxV6Eog4acXkUI+EzWuYVbeVVY139pANIWS9qtdajfgp4GVXZi1S8mAIb70yeHdNpCp1mhK0xpCrFH9LvGQ=="; }; }; - "@lerna/npm-install-5.6.1" = { + "@lerna/npm-install-5.6.2" = { name = "_at_lerna_slash_npm-install"; packageName = "@lerna/npm-install"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-5.6.1.tgz"; - sha512 = "PWJyqWzDQGkhn5/mr88yYfLF+t9NzHadcmMPYxv8lBTBUTZy9sdCw8k0uQ19lNUsI/DfMTLrcYZPSLxqe3mN8A=="; + url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-5.6.2.tgz"; + sha512 = "AT226zdEo+uGENd37jwYgdALKJAIJK4pNOfmXWZWzVb9oMOr8I2YSjPYvSYUNG7gOo2YJQU8x5Zd7OShv2924Q=="; }; }; - "@lerna/npm-publish-5.6.1" = { + "@lerna/npm-publish-5.6.2" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-5.6.1.tgz"; - sha512 = "eSotBP+mu6EtRIfhKsbQR3m5RnL7zxhZav1zxtnYvolKPjodLlGxzqcYCqTMdnR6GAIcInFh123uuTfZNzu9CA=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-5.6.2.tgz"; + sha512 = "ldSyewCfv9fAeC5xNjL0HKGSUxcC048EJoe/B+KRUmd+IPidvZxMEzRu08lSC/q3V9YeUv9ZvRnxATXOM8CffA=="; }; }; - "@lerna/npm-run-script-5.6.1" = { + "@lerna/npm-run-script-5.6.2" = { name = "_at_lerna_slash_npm-run-script"; packageName = "@lerna/npm-run-script"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-5.6.1.tgz"; - sha512 = "VRScf/chK01PxFCiH6j8GWOlS8w3dH4koq7tVX9OSi3FVwqrNvN7wky/AO7cKRyuTmdoG+puDsI7gHtGclYvrQ=="; + url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-5.6.2.tgz"; + sha512 = "MOQoWNcAyJivM8SYp0zELM7vg/Dj07j4YMdxZkey+S1UO0T4/vKBxb575o16hH4WeNzC3Pd7WBlb7C8dLOfNwQ=="; }; }; - "@lerna/otplease-5.6.1" = { + "@lerna/otplease-5.6.2" = { name = "_at_lerna_slash_otplease"; packageName = "@lerna/otplease"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-5.6.1.tgz"; - sha512 = "MbS09KoDHDvsFpnwIYOZ3lu5+d/bDUm2jQ+kcJe7VH3P37t84OFRXmixSVjf1xpLuvoXbSZZsfDsYx9VkAdq4w=="; + url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-5.6.2.tgz"; + sha512 = "dGS4lzkEQVTMAgji82jp8RK6UK32wlzrBAO4P4iiVHCUTuwNLsY9oeBXvVXSMrosJnl6Hbe0NOvi43mqSucGoA=="; }; }; - "@lerna/output-5.6.1" = { + "@lerna/output-5.6.2" = { name = "_at_lerna_slash_output"; packageName = "@lerna/output"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/output/-/output-5.6.1.tgz"; - sha512 = "XEUvLn8jOVL63PRcjwSd8SdjAJvWLDDNpq75hBfemHHSpcfc7qlqqkXWs+Mz1C938rub8MtPUj7ImEUo12k1KQ=="; + url = "https://registry.npmjs.org/@lerna/output/-/output-5.6.2.tgz"; + sha512 = "++d+bfOQwY66yo7q1XuAvRcqtRHCG45e/awP5xQomTZ6R1rhWiZ3whWdc9Z6lF7+UtBB9toSYYffKU/xc3L0yQ=="; }; }; - "@lerna/pack-directory-5.6.1" = { + "@lerna/pack-directory-5.6.2" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-5.6.1.tgz"; - sha512 = "vmkvD4LnYJhPps+I9t03pV02rnZak4gyAh/St1lj/OYV9ecRWQWOqWIFhffKOFHBes3Lxmha8FMSN2IOkG1BxQ=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-5.6.2.tgz"; + sha512 = "w5Jk5fo+HkN4Le7WMOudTcmAymcf0xPd302TqAQncjXpk0cb8tZbj+5bbNHsGb58GRjOIm5icQbHXooQUxbHhA=="; }; }; - "@lerna/package-5.6.1" = { + "@lerna/package-5.6.2" = { name = "_at_lerna_slash_package"; packageName = "@lerna/package"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package/-/package-5.6.1.tgz"; - sha512 = "QTWoRe/wTETDrF9ByhctmyZpFl+UmwSJJUcsTd2pUqvd5QaOd1twXwZdc5/1Rr08Yxl0PZqJCtZYJDcXce0eRg=="; + url = "https://registry.npmjs.org/@lerna/package/-/package-5.6.2.tgz"; + sha512 = "LaOC8moyM5J9WnRiWZkedjOninSclBOJyPqhif6mHb2kCFX6jAroNYzE8KM4cphu8CunHuhI6Ixzswtv+Dultw=="; }; }; - "@lerna/package-graph-5.6.1" = { + "@lerna/package-graph-5.6.2" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-5.6.1.tgz"; - sha512 = "R3ToEGzFy5x1Po/eoOy8vsM2x/zxR26bFewDLUDWbs5lWDC7ml5v44JqjfWB869M/XprN55yz2/VE5NhEB6QsQ=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-5.6.2.tgz"; + sha512 = "TmL61qBBvA3Tc4qICDirZzdFFwWOA6qicIXUruLiE2PblRowRmCO1bKrrP6XbDOspzwrkPef6N2F2/5gHQAnkQ=="; }; }; - "@lerna/prerelease-id-from-version-5.6.1" = { + "@lerna/prerelease-id-from-version-5.6.2" = { name = "_at_lerna_slash_prerelease-id-from-version"; packageName = "@lerna/prerelease-id-from-version"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.6.1.tgz"; - sha512 = "+ctzgoA1XAGbTQCeJjMEoQQCzCBW6WVAMVKNEOKrcsEVMb5gsKKSVha8WsKEzvK6gAC/x3pXemtuVWQvtYPw0Q=="; + url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.6.2.tgz"; + sha512 = "7gIm9fecWFVNy2kpj/KbH11bRcpyANAwpsft3X5m6J7y7A6FTUscCbEvl3ZNdpQKHNuvnHgCtkm3A5PMSCEgkA=="; }; }; - "@lerna/profiler-5.6.1" = { + "@lerna/profiler-5.6.2" = { name = "_at_lerna_slash_profiler"; packageName = "@lerna/profiler"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-5.6.1.tgz"; - sha512 = "HxY0hg5iHxPzyHvb7gVkZzUG+jJKZ1fErATcC53+kA7qOBTGlz2huZ8gU+rpX3SlTJGodnZ5FwHQvHD2bzkTZg=="; + url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-5.6.2.tgz"; + sha512 = "okwkagP5zyRIOYTceu/9/esW7UZFt7lyL6q6ZgpSG3TYC5Ay+FXLtS6Xiha/FQdVdumFqKULDWTGovzUlxcwaw=="; }; }; - "@lerna/project-5.6.1" = { + "@lerna/project-5.6.2" = { name = "_at_lerna_slash_project"; packageName = "@lerna/project"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/project/-/project-5.6.1.tgz"; - sha512 = "GlM+b4pyImtegQztMRsLAkSPCYfmAqCqtgkffjXQS9tMjXnUBqu4+gW/uMBTTOD2CKf+Nikwjc602rpRaUQLyw=="; + url = "https://registry.npmjs.org/@lerna/project/-/project-5.6.2.tgz"; + sha512 = "kPIMcIy/0DVWM91FPMMFmXyAnCuuLm3NdhnA8NusE//VuY9wC6QC/3OwuCY39b2dbko/fPZheqKeAZkkMH6sGg=="; }; }; - "@lerna/prompt-5.6.1" = { + "@lerna/prompt-5.6.2" = { name = "_at_lerna_slash_prompt"; packageName = "@lerna/prompt"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-5.6.1.tgz"; - sha512 = "CZSHV2yK6I6+35IKz7Fh3SeNSPR4XuCFXsW0RuauTZoNffk3mP2pOt/CrI1P6yOj7tqcyjghzzv1gkINtrq4/w=="; + url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-5.6.2.tgz"; + sha512 = "4hTNmVYADEr0GJTMegWV+GW6n+dzKx1vN9v2ISqyle283Myv930WxuyO0PeYGqTrkneJsyPreCMovuEGCvZ0iQ=="; }; }; - "@lerna/publish-5.6.1" = { + "@lerna/publish-5.6.2" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-5.6.1.tgz"; - sha512 = "J2zYyDGXs44YQ1h19933F9bm3fjog0gNpD27kL7Zw2nrMrR/LAuxNIFT/0ljtZSuMjlXllxZ7Kyxyz1gvMv3cA=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-5.6.2.tgz"; + sha512 = "QaW0GjMJMuWlRNjeDCjmY/vjriGSWgkLS23yu8VKNtV5U3dt5yIKA3DNGV3HgZACuu45kQxzMDsfLzgzbGNtYA=="; }; }; - "@lerna/pulse-till-done-5.6.1" = { + "@lerna/pulse-till-done-5.6.2" = { name = "_at_lerna_slash_pulse-till-done"; packageName = "@lerna/pulse-till-done"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-5.6.1.tgz"; - sha512 = "SCD1gCSkC4roOvCB0GTvnFrYVTLX7o9TXykyg5UTXb/XRMNqr9ZBFH7qZHJnleO9x3eMk1oh4W1rvfFIITyRjw=="; + url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-5.6.2.tgz"; + sha512 = "eA/X1RCxU5YGMNZmbgPi+Kyfx1Q3bn4P9jo/LZy+/NRRr1po3ASXP2GJZ1auBh/9A2ELDvvKTOXCVHqczKC6rA=="; }; }; - "@lerna/query-graph-5.6.1" = { + "@lerna/query-graph-5.6.2" = { name = "_at_lerna_slash_query-graph"; packageName = "@lerna/query-graph"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-5.6.1.tgz"; - sha512 = "ySXS5Ur/GtrBOr+u5FZxrcH0xD3LsBSu68OEPNnMIAdt66AOhh6K4OXmc58biTN0sWAdnE43mulqA87bZH0aMg=="; + url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-5.6.2.tgz"; + sha512 = "KRngr96yBP8XYDi9/U62fnGO+ZXqm04Qk6a2HtoTr/ha8QvO1s7Tgm0xs/G7qWXDQHZgunWIbmK/LhxM7eFQrw=="; }; }; - "@lerna/resolve-symlink-5.6.1" = { + "@lerna/resolve-symlink-5.6.2" = { name = "_at_lerna_slash_resolve-symlink"; packageName = "@lerna/resolve-symlink"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-5.6.1.tgz"; - sha512 = "25TdowB5dIVycCJWyZGBDPSz6LoFOi/YRh85+dL1RrvxmvfiDwjrJ8P4eDl03/fDSV9YTFVYYmR8r1K2Vw8kQg=="; + url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-5.6.2.tgz"; + sha512 = "PDQy+7M8JEFtwIVHJgWvSxHkxJf9zXCENkvIWDB+SsoDPhw9+caewt46bTeP5iGm9pOMu3oZukaWo/TvF7sNjg=="; }; }; - "@lerna/rimraf-dir-5.6.1" = { + "@lerna/rimraf-dir-5.6.2" = { name = "_at_lerna_slash_rimraf-dir"; packageName = "@lerna/rimraf-dir"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-5.6.1.tgz"; - sha512 = "1lm5FIiwFOpSzCMyNF90HX6NWHzDmY47TgDs07416B8ghMtZgb5aLMHi/aoarqWopn4X0ae3lxsZjUEOhSAWgA=="; + url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-5.6.2.tgz"; + sha512 = "jgEfzz7uBUiQKteq3G8MtJiA2D2VoKmZSSY3VSiW/tPOSXYxxSHxEsClQdCeNa6+sYrDNDT8fP6MJ3lPLjDeLA=="; }; }; - "@lerna/run-5.6.1" = { + "@lerna/run-5.6.2" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-5.6.1.tgz"; - sha512 = "kb4hwnhth3GKWIxoNlA/xdDUWGbK67yx1aLEyZjssmMemxfSKxvqrNB+TaHAPSz27hyAKqnOL9Ym/YkAt7s59A=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-5.6.2.tgz"; + sha512 = "c2kJxdFrNg5KOkrhmgwKKUOsfSrGNlFCe26EttufOJ3xfY0VnXlEw9rHOkTgwtu7969rfCdyaVP1qckMrF1Dgw=="; }; }; - "@lerna/run-lifecycle-5.6.1" = { + "@lerna/run-lifecycle-5.6.2" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-5.6.1.tgz"; - sha512 = "LkEvYDVYNX2mUY3PoNoDDBPDMofzNa5dHvAg7P2NVpffE41VbWBI0c0Q7uhN9nGuCksvsqamTffvmPdU9lCffA=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-5.6.2.tgz"; + sha512 = "u9gGgq/50Fm8dvfcc/TSHOCAQvzLD7poVanDMhHYWOAqRDnellJEEmA1K/Yka4vZmySrzluahkry9G6jcREt+g=="; }; }; - "@lerna/run-topologically-5.6.1" = { + "@lerna/run-topologically-5.6.2" = { name = "_at_lerna_slash_run-topologically"; packageName = "@lerna/run-topologically"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-5.6.1.tgz"; - sha512 = "UjOppd/1dSQxDfIjQIJOH+c/lLwuTKSNyd9uKhII11OnpO+gmBP1kvA65k1cm9EZVky63o7X9/O+oTB8Tr8C3g=="; + url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-5.6.2.tgz"; + sha512 = "QQ/jGOIsVvUg3izShWsd67RlWYh9UOH2yw97Ol1zySX9+JspCMVQrn9eKq1Pk8twQOFhT87LpT/aaxbTBgREPw=="; }; }; - "@lerna/symlink-binary-5.6.1" = { + "@lerna/symlink-binary-5.6.2" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-5.6.1.tgz"; - sha512 = "Y9x8gvvAP281467+QPwp56L6DDGdWtt24pREyWF7D+FIRcooJ29pn2C3B0rmzd5Ti63/6mrfCipUp9DXSWGwNg=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-5.6.2.tgz"; + sha512 = "Cth+miwYyO81WAmrQbPBrLHuF+F0UUc0el5kRXLH6j5zzaRS3kMM68r40M7MmfH8m3GPi7691UARoWFEotW5jw=="; }; }; - "@lerna/symlink-dependencies-5.6.1" = { + "@lerna/symlink-dependencies-5.6.2" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-5.6.1.tgz"; - sha512 = "lKnJFbEpIdj9R70cpRor6vf3pxBnvk0RF7fwiTlWpF2BmlBYVihM+lML2vCts5G7ZBSQ9zTVyIqlCXG3qhyoxQ=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-5.6.2.tgz"; + sha512 = "dUVNQLEcjVOIQiT9OlSAKt0ykjyJPy8l9i4NJDe2/0XYaUjo8PWsxJ0vrutz27jzi2aZUy07ASmowQZEmnLHAw=="; }; }; - "@lerna/temp-write-5.6.1" = { + "@lerna/temp-write-5.6.2" = { name = "_at_lerna_slash_temp-write"; packageName = "@lerna/temp-write"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-5.6.1.tgz"; - sha512 = "o0MOTsAfvMM8RC2o1wQ//F05hUd/cZJjBH8PKTrgXINDweW9VFey2fuUdL7TCpzgC4MUenL2x1nV6o8w87nFOQ=="; + url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-5.6.2.tgz"; + sha512 = "S5ZNVTurSwWBmc9kh5alfSjmO3+BnRT6shYtOlmVIUYqWeYVYA5C1Htj322bbU4CSNCMFK6NQl4qGKL17HMuig=="; }; }; - "@lerna/timer-5.6.1" = { + "@lerna/timer-5.6.2" = { name = "_at_lerna_slash_timer"; packageName = "@lerna/timer"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/timer/-/timer-5.6.1.tgz"; - sha512 = "MALjTi1KuYZeRPH18xttlJb6+BLAcVuwGIsSYHBREkuXdRwW1oEcnnN5xzGsMGpG0KRxWu5wgNgc94aH/MCz6A=="; + url = "https://registry.npmjs.org/@lerna/timer/-/timer-5.6.2.tgz"; + sha512 = "AjMOiLc2B+5Nzdd9hNORetAdZ/WK8YNGX/+2ypzM68TMAPfIT5C40hMlSva9Yg4RsBz22REopXgM5s2zQd5ZQA=="; }; }; - "@lerna/validation-error-5.6.1" = { + "@lerna/validation-error-5.6.2" = { name = "_at_lerna_slash_validation-error"; packageName = "@lerna/validation-error"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-5.6.1.tgz"; - sha512 = "0Kl9SmRb72bcXANdRO3fjuz+hHhHL9AEl/exCGODaT+PYAC+xH717Xj2ts/1u4qNuLlsQEE6+iVhAAMLUv86CA=="; + url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-5.6.2.tgz"; + sha512 = "4WlDUHaa+RSJNyJRtX3gVIAPVzjZD2tle8AJ0ZYBfdZnZmG0VlB2pD1FIbOQPK8sY2h5m0cHLRvfLoLncqHvdQ=="; }; }; - "@lerna/version-5.6.1" = { + "@lerna/version-5.6.2" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-5.6.1.tgz"; - sha512 = "s9WIzduXOxeLH2Vu0T2HLBe1ICd9gxUsB3tlUyQveIAGE5wBuTAIL3nGQ3ljImPzFnriPqcS0xa5PC2DaW9JLA=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-5.6.2.tgz"; + sha512 = "odNSR2rTbHW++xMZSQKu/F6Syrd/sUvwDLPaMKktoOSPKmycHt/eWcuQQyACdtc43Iqeu4uQd7PCLsniqOVFrw=="; }; }; - "@lerna/write-log-file-5.6.1" = { + "@lerna/write-log-file-5.6.2" = { name = "_at_lerna_slash_write-log-file"; packageName = "@lerna/write-log-file"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-5.6.1.tgz"; - sha512 = "wvgkL/tMozHbW6EkCFH7yLhLh5D3djRuwREsn5ptZxcCcay1RQjraON18yMX06mwsPfbpDItMH4D68q1dMSk5w=="; + url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-5.6.2.tgz"; + sha512 = "J09l18QnWQ3sXIRwuJkjXY3+KwPR2uO5NgbZGE3GXJK1V/LzOBRMvjGAIbuQHXw25uqe7vpLUpB8drtnFrubCQ=="; }; }; "@lezer/common-0.15.12" = { @@ -7672,15 +7771,6 @@ let sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; }; }; - "@oclif/config-1.18.3" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.18.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz"; - sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; - }; - }; "@oclif/config-1.18.5" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; @@ -7690,6 +7780,15 @@ let sha512 = "R6dBedaUVn5jtAh79aaRm7jezx4l3V7Im9NORlLmudz5BL1foMeuXEvnqm+bMiejyexVA+oi9mto6YKZPzo/5Q=="; }; }; + "@oclif/core-1.13.10" = { + name = "_at_oclif_slash_core"; + packageName = "@oclif/core"; + version = "1.13.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/core/-/core-1.13.10.tgz"; + sha512 = "nwpjXwWscETdvO+/z94V1zd95vnzmCB6VRaobR4BdBllwWU6jHF/eCi1Ud2Tk9RSedChoLneZuDCkKnRCmxyng=="; + }; + }; "@oclif/errors-1.3.4" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -7717,13 +7816,13 @@ let sha512 = "fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ=="; }; }; - "@oclif/help-1.0.2" = { + "@oclif/help-1.0.3" = { name = "_at_oclif_slash_help"; packageName = "@oclif/help"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.2.tgz"; - sha512 = "Y0UqBSoCNrOGsjXgEMEeRA/l7pWG5Fs4bDuWVl7aipp9wtmqxDVoGpWdO+Kcai9OsSNKwvv02nOJkEK/twK9Qg=="; + url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.3.tgz"; + sha512 = "AjjhSWFQkRb9rChEH+IRUmp0CxEacYpUbh+kQqtdCR9CDSsj2a3ibWjtMtJb4lFGAle6kVKfaal/juYe+6P5TQ=="; }; }; "@oclif/linewrap-1.0.0" = { @@ -7789,6 +7888,15 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; + "@oclif/screen-3.0.2" = { + name = "_at_oclif_slash_screen"; + packageName = "@oclif/screen"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.2.tgz"; + sha512 = "S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ=="; + }; + }; "@octokit/auth-token-2.5.0" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; @@ -10021,139 +10129,139 @@ let sha512 = "PA4p7nC5LwPdEVcQXFxMTpfvizYPeMoB55nIIx+yC3FiLnyPgC2hcpUitPy5h8RRGdCZ/Mvb2ryEcVYS8nI6YA=="; }; }; - "@swc/core-1.3.5" = { + "@swc/core-1.3.6" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.5.tgz"; - sha512 = "H5YNI9rCViudhEmu9g/Yc8ai6k5/pfy+ItYns0SZ+iSZen+bgWeGb+9p4KRQhzNNC8Lfkfw+ENHzSwZltpWG6Q=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.6.tgz"; + sha512 = "L3EemOWywrxXsRQFeU50PYFwrDKOxi2RGTT+TT3CcbIszwc7qnE6vsVzEll/eK32H1veicc0EegkZgtD4PFNRA=="; }; }; - "@swc/core-android-arm-eabi-1.3.5" = { + "@swc/core-android-arm-eabi-1.3.6" = { name = "_at_swc_slash_core-android-arm-eabi"; packageName = "@swc/core-android-arm-eabi"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.3.5.tgz"; - sha512 = "gIq3fuXiRMtVhTf2ZQ9Z6JeuqvL30JOM0L+S6zAZD4v8lpGJ1ejpw7rghpAsGSG9Qc9oaNjx5yayTg3z/EtBzA=="; + url = "https://registry.npmjs.org/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.3.6.tgz"; + sha512 = "FQk/4cRRDoMPLgSm/1WvEqRqlSgBb6Twd5W13NYUbXJpzPGoPHhzwaCEbpGjPKG/OvAqA2NVrWquuJjhDvQyVQ=="; }; }; - "@swc/core-android-arm64-1.3.5" = { + "@swc/core-android-arm64-1.3.6" = { name = "_at_swc_slash_core-android-arm64"; packageName = "@swc/core-android-arm64"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-android-arm64/-/core-android-arm64-1.3.5.tgz"; - sha512 = "SsRA6AhNZK8YXBbv7DAp5Zgv4tOWvPJlEBoOZ0uLIot7oYghWvSVs3jOgEzJSbQLU5U7ad6Q6boBdg0Q/kb2Ew=="; + url = "https://registry.npmjs.org/@swc/core-android-arm64/-/core-android-arm64-1.3.6.tgz"; + sha512 = "6qjZYatlFAN0IKhhYFsN+BaywooHFpK9/A/jMkjgIfbUoDz3wPJWZc2MDvcttgqZ+cfsSCcGeNw++H894z1zfw=="; }; }; - "@swc/core-darwin-arm64-1.3.5" = { + "@swc/core-darwin-arm64-1.3.6" = { name = "_at_swc_slash_core-darwin-arm64"; packageName = "@swc/core-darwin-arm64"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.5.tgz"; - sha512 = "Jyem+f3/aTKJTRzyvdSfYS358jo7245g7nWmwmhQMgZI3/z2VcYHpIIYOi+dgsBaMRevK9tbsW0TSx805Njzjw=="; + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.6.tgz"; + sha512 = "2qjaABxA7cloVTkS+uDEcVQ5buSi8de7qEv6P6InDE/iCjnI5ALyDxn7eauJJsVKimh9DyqN9sSZJ/z9U4FDUQ=="; }; }; - "@swc/core-darwin-x64-1.3.5" = { + "@swc/core-darwin-x64-1.3.6" = { name = "_at_swc_slash_core-darwin-x64"; packageName = "@swc/core-darwin-x64"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.5.tgz"; - sha512 = "zW1tfS000RlHcqKp1HJK5vXBR0/AHw74qzOK0uh/G1cTczFDX2Hep4IuOxSJ1+7Zx9oFEOKSEY0lPXYbDAlF2w=="; + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.6.tgz"; + sha512 = "+OtW18d2o3RUuXodB41ZDj0iRCeXNL0OxVU0jTl7iyCWDypmCzhalbaQXD/ZJxgnpGRB7/s2ZwNR/gzjXgz9VA=="; }; }; - "@swc/core-freebsd-x64-1.3.5" = { + "@swc/core-freebsd-x64-1.3.6" = { name = "_at_swc_slash_core-freebsd-x64"; packageName = "@swc/core-freebsd-x64"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-freebsd-x64/-/core-freebsd-x64-1.3.5.tgz"; - sha512 = "H2f0NkfqYDC6+vJO6wSBwiGnnR/cK9AQx574izPw3Utmb28zC+FOPAY63QLA/orNHjwHa6B6AuVDNwYuKUrRHQ=="; + url = "https://registry.npmjs.org/@swc/core-freebsd-x64/-/core-freebsd-x64-1.3.6.tgz"; + sha512 = "f+ePNodn7ET9qEa93VMfnsPNnubWKIkn0EfxmfzJCt/abNVZ7+DyCSABfWKkexOZ8OuNyxnBCdKLL6nlizxkhQ=="; }; }; - "@swc/core-linux-arm-gnueabihf-1.3.5" = { + "@swc/core-linux-arm-gnueabihf-1.3.6" = { name = "_at_swc_slash_core-linux-arm-gnueabihf"; packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.5.tgz"; - sha512 = "PvuhjUCsNQDtwSSXWmmF6tU8jnAcFVRZt6bBNltvPW48oHNmIq9lEZ+hJTSPvqqxLvi9W7HG5ADzsTAaciKeRw=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.6.tgz"; + sha512 = "JwdJmqKzsdq7Itg5ssKDEY9mP3AkQ+XENF6WXXlaNu1U/InqQhD0DqsFzw4TQ4LzB7lB7Wj+dv3JjKIhnHNNag=="; }; }; - "@swc/core-linux-arm64-gnu-1.3.5" = { + "@swc/core-linux-arm64-gnu-1.3.6" = { name = "_at_swc_slash_core-linux-arm64-gnu"; packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.5.tgz"; - sha512 = "NQ1LVrIvAsSwSoKO6DzHQMxzpvo17v/2LREqBiaNuCwDyYg2yFdgUdVW4FcbrdBK4MurRA2HFZZ/rt5DqAg3+A=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.6.tgz"; + sha512 = "sRoPnwYFX+t95S7khi4KL2lZMZwbuzvPUf8NYmtTzfqVIseo8HD6IMgyeaQHYDfwDGF5elQGi4ALjRx2huSi0Q=="; }; }; - "@swc/core-linux-arm64-musl-1.3.5" = { + "@swc/core-linux-arm64-musl-1.3.6" = { name = "_at_swc_slash_core-linux-arm64-musl"; packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.5.tgz"; - sha512 = "DDcM3ciJRBBjyN7qqw/AEEFh61YjiuxOcZ5SqYR0wyfroqOFX1+5JtCGJ9mU2MZ4Vfmxb1v5IFoQ3nfgJDcd8g=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.6.tgz"; + sha512 = "XT8vRcxGaKujiplFfuMtGRgZ3Nx611TMVLUg91alzEIe2Adtrpaumzrwv2vqVdMr4X4GBK9z0rHsqkDLPhmuaw=="; }; }; - "@swc/core-linux-x64-gnu-1.3.5" = { + "@swc/core-linux-x64-gnu-1.3.6" = { name = "_at_swc_slash_core-linux-x64-gnu"; packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.5.tgz"; - sha512 = "AJR0J+b3jMmXuIxqhgrX/7vworHjciUPZuoyY2OrIhSXwMPVbWfb72h9oQdMbARfodTFLVJGQqy2Pij67+C0GQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.6.tgz"; + sha512 = "nip81Ngcx8cory+FtapKhXb/rgh/pTAlvTiwJjMhsE3xcKRsbnJEPMVIoArCBV0BmYJBLWvOtpHf8B62JS7L5w=="; }; }; - "@swc/core-linux-x64-musl-1.3.5" = { + "@swc/core-linux-x64-musl-1.3.6" = { name = "_at_swc_slash_core-linux-x64-musl"; packageName = "@swc/core-linux-x64-musl"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.5.tgz"; - sha512 = "+Ig/rJ/GOZyQgCO72PFR+oJYUee0zQRsd6fpeuE66rn8P07a26WY1ZfMGw8miWcURccjDgAc1XCwVn6wa/OTCw=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.6.tgz"; + sha512 = "IzrQB67BY/rSZPJXWU3XzpkJqh4vYkYuOUmz1yrV/vxgPjJp/kUllfBYsHCiIedb7sjvfTt409SIN0FlPJY2+Q=="; }; }; - "@swc/core-win32-arm64-msvc-1.3.5" = { + "@swc/core-win32-arm64-msvc-1.3.6" = { name = "_at_swc_slash_core-win32-arm64-msvc"; packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.5.tgz"; - sha512 = "9Go5jiGWToT+00/J26E92n/JIHqG2wcaw79Z1+Z7GHrrm5TeL0VMyTMGLMeGFvtje/j+Lv0y4XKed+dKnRvc5w=="; + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.6.tgz"; + sha512 = "gLsE/4qgqTxy0OOFJKi9QRs9mVYv4yOXSwPB2Rb+grOmNnG+Ds2LWqGEaABKDErnUtTQiOzLpdwesNZxeJgMhA=="; }; }; - "@swc/core-win32-ia32-msvc-1.3.5" = { + "@swc/core-win32-ia32-msvc-1.3.6" = { name = "_at_swc_slash_core-win32-ia32-msvc"; packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.5.tgz"; - sha512 = "AIeD5uKVkvXTAbKAwyPFubFrXmQR77PNun59DHZWtRpxgOcHqK6xug9DfUSfc2zMw/ftEe9kNruUUS96023jfQ=="; + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.6.tgz"; + sha512 = "0Jr7KMGEPapYGni+97oNOeVP7edBwjMGQ9HsJUUN1uIE7fALQ+zVGuwbc+22myql2Uhh5V5hZx5xtVraqLVMHw=="; }; }; - "@swc/core-win32-x64-msvc-1.3.5" = { + "@swc/core-win32-x64-msvc-1.3.6" = { name = "_at_swc_slash_core-win32-x64-msvc"; packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.5.tgz"; - sha512 = "GtrAkUo5xVTogwTDH9Zms7LELdTKyRll+K9o87P+YOEizCUvA0BPE1N4mu+ZqsI/dv56g2N4gNCD8RVLH3HekQ=="; + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.6.tgz"; + sha512 = "O3F/jxqaFwGq9XxYeCIVRCDIR4+GdSBu/5io6TkN8O5QLqB3/KOJVDn6TALtbL6ClwjUwZt66HKnYeSx19j2Ow=="; }; }; - "@swc/helpers-0.4.11" = { + "@swc/helpers-0.4.12" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.4.11"; + version = "0.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.11.tgz"; - sha512 = "rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.12.tgz"; + sha512 = "R6RmwS9Dld5lNvwKlPn62+piU+WDG1sMfsnfJioXCciyko/gZ0DQ4Mqglhq1iGU1nQ/RcGkAwfMH+elMSkJH3Q=="; }; }; "@swc/wasm-1.2.122" = { @@ -10174,13 +10282,13 @@ let sha512 = "rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q=="; }; }; - "@swc/wasm-1.3.5" = { + "@swc/wasm-1.3.6" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.5.tgz"; - sha512 = "G7c3wX2bxa3OJFOwZB9utXQ0jaq+JI5HgHUxwduQwFRFVGVu+YsWaZ4TQ5iOFBLAsXA6AwMaJDOffcmB3DjpuQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.6.tgz"; + sha512 = "rFygmNDMl25/t2ETAtFjpcw6acQOm/o4sW/GN0fVPFUdNpI2zr2/oCXpyRM71OUPbXvksy9jXrt7yMZGD65+wQ=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10894,15 +11002,6 @@ let sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; }; }; - "@types/express-serve-static-core-4.17.30" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz"; - sha512 = "gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ=="; - }; - }; "@types/express-serve-static-core-4.17.31" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -12316,6 +12415,15 @@ let sha512 = "PUxhtBh7/8167HJK6WqBv6Z0piuiaZHQGYbhwpNL9aIQmLROPEdaUYkY4wh45wPQXcTpnd11l0q3Pw+TI11pdw=="; }; }; + "@urql/core-2.6.1" = { + name = "_at_urql_slash_core"; + packageName = "@urql/core"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@urql/core/-/core-2.6.1.tgz"; + sha512 = "gYrEHy3tViJhwIhauK6MIf2Qp09QTsgNHZRd0n71rS+hF6gdwjspf1oKljl4m25+272cJF7fPjBUGmjaiEr7Kg=="; + }; + }; "@urql/exchange-retry-0.3.0" = { name = "_at_urql_slash_exchange-retry"; packageName = "@urql/exchange-retry"; @@ -12325,6 +12433,15 @@ let sha512 = "hHqer2mcdVC0eYnVNbWyi28AlGOPb2vjH3lP3/Bc8Lc8BjhMsDwFMm7WhoP5C1+cfbr/QJ6Er3H/L08wznXxfg=="; }; }; + "@urql/exchange-retry-0.3.3" = { + name = "_at_urql_slash_exchange-retry"; + packageName = "@urql/exchange-retry"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@urql/exchange-retry/-/exchange-retry-0.3.3.tgz"; + sha512 = "CgGy/rs3VlcWglSEi5SitbMjueDlG4Oq8fveHFdvcCVGf2Vj5Oeq0Blbjfd8vfyXBQS0cPgdZD8kalOPeV0URA=="; + }; + }; "@vercel/build-utils-5.5.4" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; @@ -13711,13 +13828,13 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-3.0.0-rc.22" = { + "@yarnpkg/parsers-3.0.0-rc.24" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "3.0.0-rc.22"; + version = "3.0.0-rc.24"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.22.tgz"; - sha512 = "GAWDjXduYBUVmOzlj3X0OwTQ1BV4ZeDdgw8yXST3K0lB95drWEGxa1at0v7BmHDyK2y1F1IJufc8N4yrcuXjWg=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.24.tgz"; + sha512 = "A5wXsIUOipZUGDly1SHBht1OjKKW4y+E9EzzJxR2tby0Pj3atgCta9RSYa4+aXLkFfIMX3onnykmJnwJWqJj5g=="; }; }; "@zeit/schemas-2.21.0" = { @@ -13837,13 +13954,13 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; - "abortcontroller-polyfill-1.7.3" = { + "abortcontroller-polyfill-1.7.5" = { name = "abortcontroller-polyfill"; packageName = "abortcontroller-polyfill"; - version = "1.7.3"; + version = "1.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz"; - sha512 = "zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q=="; + url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz"; + sha512 = "JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ=="; }; }; "abstract-leveldown-6.0.3" = { @@ -15007,22 +15124,22 @@ let sha512 = "L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg=="; }; }; - "apollo-reporting-protobuf-3.3.2" = { + "apollo-reporting-protobuf-3.3.3" = { name = "apollo-reporting-protobuf"; packageName = "apollo-reporting-protobuf"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.2.tgz"; - sha512 = "j1tx9tmkVdsLt1UPzBrvz90PdjAeKW157WxGn+aXlnnGfVjZLIRXX3x5t1NWtXvB7rVaAsLLILLtDHW382TSoQ=="; + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.3.tgz"; + sha512 = "L3+DdClhLMaRZWVmMbBcwl4Ic77CnEBPXLW53F7hkYhkaZD88ivbCVB1w/x5gunO6ZHrdzhjq0FHmTsBvPo7aQ=="; }; }; - "apollo-server-core-3.10.2" = { + "apollo-server-core-3.10.3" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.10.2.tgz"; - sha512 = "/1o9KPoAMgcjJJ9Y0IH1665wf9d02L/m/mcfBOHiFmRgeGkNgrhTy59BxQTBK241USAWMhwMpp171cv/hM5Dng=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.10.3.tgz"; + sha512 = "PiTirlcaszgnJGzSsGui9XWh0KAh0BUW+GvRKN6O0H0qOSXSLmoqqyL83J+u+HaUZGyyiE0+VOkyCcuF+kKbEw=="; }; }; "apollo-server-env-4.2.1" = { @@ -15043,31 +15160,31 @@ let sha512 = "xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA=="; }; }; - "apollo-server-express-3.10.2" = { + "apollo-server-express-3.10.3" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "3.10.2"; + version = "3.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.10.2.tgz"; - sha512 = "TUpnh23qAP3NqMp3/2TxcCpOxhvT64H6teOM5W+t5ncdHZ85aEMDrbfIhNwqkdsya+UyMn9IoBmn25h5TW93ZQ=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.10.3.tgz"; + sha512 = "Z8m0r10mX8KlGS3noYeRPcWxWR2hX6NHJicjuwZ62PeTZlrDJF5cwGmXqbUg/sCTPx7Ny//ZEASBTwFFp8DOeQ=="; }; }; - "apollo-server-plugin-base-3.6.2" = { + "apollo-server-plugin-base-3.6.3" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.6.2.tgz"; - sha512 = "erWXjLOO1u7fxQkbxJ2cwSO7p0tYzNied91I1SJ9tikXZ/2eZUyDyvrpI+4g70kOdEi+AmJ5Fo8ahEXKJ75zdg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.6.3.tgz"; + sha512 = "/Q0Zx8N8La97faKV0siGHDzfZ56ygN6ovtUpPbr+1GIbNmUzkte3lWW2YV08HmxiRmC2i2OGN80exNJEvbKvNA=="; }; }; - "apollo-server-types-3.6.2" = { + "apollo-server-types-3.6.3" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.6.2.tgz"; - sha512 = "9Z54S7NB+qW1VV+kmiqwU2Q6jxWfX89HlSGCGOo3zrkrperh85LrzABgN9S92+qyeHYd72noMDg2aI039sF3dg=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.6.3.tgz"; + sha512 = "+7caNTLdevpWI2dGKSa7CWdyudO3NBuJ3HzcrYxjBei6Bth9YdRUNzPSFmBjlm2baHF0GsrMwLpjO+HStJzm3A=="; }; }; "app-path-2.2.0" = { @@ -16645,15 +16762,6 @@ let sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw=="; }; }; - "aws-sdk-2.1230.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.1230.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1230.0.tgz"; - sha512 = "7Y260dvzr7b8/lZhg6A7h5WyHvfCgdFL0NiBgCuT3/xlw9rvq9b08JNYErEpaJSmo+A5hW35n6wtzii4/FUSTA=="; - }; - }; "aws-sdk-2.1231.0" = { name = "aws-sdk"; packageName = "aws-sdk"; @@ -17932,13 +18040,13 @@ let sha512 = "wrDhHe7LUkqaytxgbsFXoemzHRv6e8FrVNWWsQCgUfmuVYW6ke44hoGc9VdpjgfIsJ/ejmCFA8wDtDqACNAvyw=="; }; }; - "bittorrent-dht-10.0.4" = { + "bittorrent-dht-10.0.6" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "10.0.4"; + version = "10.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.4.tgz"; - sha512 = "Yx5cZXU4R+mUbxR2PbKdvOVTizOrePPF8NT3WGCXX5qzJVt8gF8gq9GMBWcmNjHUBYHVigDaRf030hxQ2dJWUg=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-10.0.6.tgz"; + sha512 = "Odmfmo36/vr0E4PWicans0fesjCfRib2daGaYfB8WHljPTO/U2820EFOA9HBhzdzekGBhBHlSPVi6Jf9vu7/yQ=="; }; }; "bittorrent-dht-6.4.2" = { @@ -20336,22 +20444,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.5.9" = { + "cdk8s-2.5.12" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.5.9"; + version = "2.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.5.9.tgz"; - sha512 = "nrf4rdQ+mmHLE/Ap7NC+G8PEPXitDbVwbhfcHDykC1ZDmbDpXi7vjEVu/3F45T4tthykhKXPGBLj6Cz4la2iyA=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.5.12.tgz"; + sha512 = "Hm60r2EYEMuQT5aV4Z3k4nd80+TMFtcT+nreHJvMPw5diSlPo1ldunKg+gaheN3EItkC97yFLw15AHRMJPX2zA=="; }; }; - "cdk8s-plus-22-2.0.0-rc.141" = { + "cdk8s-plus-22-2.0.0-rc.144" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "2.0.0-rc.141"; + version = "2.0.0-rc.144"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.141.tgz"; - sha512 = "rKJFxOG9XCjQWsq3DostboSYdAF7B+Boq5ipHjVTsZDh8+zMxHOJvLpq4T8HGImKu+48PfQdd4iCQGKe5DrHLg=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.144.tgz"; + sha512 = "XHz1QGuliZr6gz/erbU8cJJzq3CIlUsEQz/sNbClWDVb0CcNxlvCjL+HwxTDSgCjw26rC0ZrMhO0KWLeJIiMeg=="; }; }; "cdktf-0.13.0" = { @@ -20624,13 +20732,13 @@ let sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; - "chardet-1.4.0" = { + "chardet-1.5.0" = { name = "chardet"; packageName = "chardet"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-1.4.0.tgz"; - sha512 = "NpwMDdSIprbYx1CLnfbxEIarI0Z+s9MssEgggMNheGM+WD68yOhV7IEA/3r6tr0yTRgQD0HuZJDw32s99i6L+A=="; + url = "https://registry.npmjs.org/chardet/-/chardet-1.5.0.tgz"; + sha512 = "Nj3VehbbFs/1ZnJJJaL3ztEf3Nu5Fs6YV/NBs6lyz/iDDHUU+X9QNk5QgPy1/5Rjtb/cGVf+NyazP7kVEJqKRg=="; }; }; "charenc-0.0.2" = { @@ -21047,13 +21155,13 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; - "ci-info-3.4.0" = { + "ci-info-3.5.0" = { name = "ci-info"; packageName = "ci-info"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-3.4.0.tgz"; - sha512 = "t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug=="; + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.5.0.tgz"; + sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; }; }; "cipher-base-1.0.4" = { @@ -23090,13 +23198,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.124" = { + "constructs-10.1.127" = { name = "constructs"; packageName = "constructs"; - version = "10.1.124"; + version = "10.1.127"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.124.tgz"; - sha512 = "kDnRUYyn2zNda0Lx98kz9KLzS4hBCqi4mbg1AnRExF9sY3PHRQsex11cWClVmyqWFC+5HhR05k4l+0Tl/iNraQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.127.tgz"; + sha512 = "pdWLyxoUHqbZ47aSNjagXCnR705Ehu5QBYn9+N9ysiZJauz8EBHf9MHwJZk8vsWW3E1IZtprRaTQaeJaF9rtsg=="; }; }; "consume-http-header-1.0.0" = { @@ -26637,13 +26745,13 @@ let sha512 = "KqOPKqX9VLrCfdKK/zMll+xb9kZOP4QyguB6jyN4pKaPoedk1bMFIfyTCFhVdrHb3GU7aJvKjd8myKxFRRDwCg=="; }; }; - "defaults-1.0.3" = { + "defaults-1.0.4" = { name = "defaults"; packageName = "defaults"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha512 = "s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA=="; + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz"; + sha512 = "eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A=="; }; }; "defer-to-connect-1.1.3" = { @@ -27195,6 +27303,15 @@ let sha512 = "MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA=="; }; }; + "dicer-0.3.1" = { + name = "dicer"; + packageName = "dicer"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.3.1.tgz"; + sha512 = "ObioMtXnmjYs3aRtpIJt9rgQSPCIhKVkFPip+E9GUDyWl8N435znUxK/JfNwGZJ2wnn5JKQ7Ly3vOK5Q5dylGA=="; + }; + }; "didyoumean-1.2.2" = { name = "didyoumean"; packageName = "didyoumean"; @@ -28455,13 +28572,13 @@ let sha512 = "FkEZNFViUem3P0RLYbZkUjC8LUFIK+wKq09GHoOITSJjfDAVQv964hwaNseTTWt58sITQX3/5fHNYcTefqaCWw=="; }; }; - "electron-to-chromium-1.4.275" = { + "electron-to-chromium-1.4.276" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.275"; + version = "1.4.276"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.275.tgz"; - sha512 = "aJeQQ+Hl9Jyyzv4chBqYJwmVRY46N5i2BEX5Cuyk/5gFCUZ5F3i7Hnba6snZftWla7Gglwc5pIgcd+E7cW+rPg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.276.tgz"; + sha512 = "EpuHPqu8YhonqLBXHoU6hDJCD98FCe6KDoet3/gY1qsQ6usjJoHqBH2YIVs8FXaAtHwVL8Uqa/fsYao/vq9VWQ=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -29006,6 +29123,15 @@ let sha512 = "+6r/UAzikJWJPcQZpBQS+bVmjAMz2BkDP/N4n2Uz1zz8lyw1IHWUeVdh/85gs0dp5A+z76LOQhCZkR6F88mlUw=="; }; }; + "env-paths-2.2.0" = { + name = "env-paths"; + packageName = "env-paths"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz"; + sha512 = "6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA=="; + }; + }; "env-paths-2.2.1" = { name = "env-paths"; packageName = "env-paths"; @@ -29015,6 +29141,15 @@ let sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; }; + "env-string-1.0.1" = { + name = "env-string"; + packageName = "env-string"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/env-string/-/env-string-1.0.1.tgz"; + sha512 = "/DhCJDf5DSFK32joQiWRpWrT0h7p3hVQfMKxiBb7Nt8C8IF8BYyPtclDnuGGLOoj16d/8udKeiE7JbkotDmorQ=="; + }; + }; "envinfo-7.8.1" = { name = "envinfo"; packageName = "envinfo"; @@ -30096,13 +30231,13 @@ let sha512 = "/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA=="; }; }; - "eslint-8.24.0" = { + "eslint-8.25.0" = { name = "eslint"; packageName = "eslint"; - version = "8.24.0"; + version = "8.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz"; - sha512 = "dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz"; + sha512 = "DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A=="; }; }; "eslint-config-prettier-6.15.0" = { @@ -30195,13 +30330,13 @@ let sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; }; }; - "eslint-plugin-react-7.31.8" = { + "eslint-plugin-react-7.31.9" = { name = "eslint-plugin-react"; packageName = "eslint-plugin-react"; - version = "7.31.8"; + version = "7.31.9"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz"; - sha512 = "5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw=="; + url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.9.tgz"; + sha512 = "vrVJwusIw4L99lyfXjtCw8HWdloajsiYslMavogrBe2Gl8gr95TJsJnOMRasN4b4N24I3XuJf6aAV6MhyGmjqw=="; }; }; "eslint-plugin-react-hooks-4.6.0" = { @@ -31203,6 +31338,15 @@ let sha512 = "av9ln2zwUt303g98raX7sDmESgL3SXs1sbbtIjh1rL7R0676XIUacIKgbydR0/4tMbOShWx14Z9fozpk9xIAJA=="; }; }; + "expo-modules-autolinking-0.11.0" = { + name = "expo-modules-autolinking"; + packageName = "expo-modules-autolinking"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-0.11.0.tgz"; + sha512 = "yWJ6DZkui/LtN19engSFsSvywDOGu5S7JTCHw7m5ezpVbrhiu5VKP10Uh62PHJn+/InWG4b3Hiv2L+ccQJfcxg=="; + }; + }; "expo-modules-autolinking-0.8.1" = { name = "expo-modules-autolinking"; packageName = "expo-modules-autolinking"; @@ -31302,6 +31446,15 @@ let sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; + "express-4.18.2" = { + name = "express"; + packageName = "express"; + version = "4.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; + sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; + }; + }; "express-async-handler-1.2.0" = { name = "express-async-handler"; packageName = "express-async-handler"; @@ -31824,6 +31977,15 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; + "fast-glob-3.2.11" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"; + sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; + }; + }; "fast-glob-3.2.12" = { name = "fast-glob"; packageName = "fast-glob"; @@ -35353,6 +35515,15 @@ let sha512 = "4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw=="; }; }; + "golden-fleece-1.0.9" = { + name = "golden-fleece"; + packageName = "golden-fleece"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/golden-fleece/-/golden-fleece-1.0.9.tgz"; + sha512 = "YSwLaGMOgSBx9roJlNLL12c+FRiw7VECphinc6mGucphc/ZxTHgdEz6gmJqH6NOzYEd/yr64hwjom5pZ+tJVpg=="; + }; + }; "goldengate-11.2.2" = { name = "goldengate"; packageName = "goldengate"; @@ -35596,6 +35767,15 @@ let sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; }; }; + "gradle-to-js-2.0.1" = { + name = "gradle-to-js"; + packageName = "gradle-to-js"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gradle-to-js/-/gradle-to-js-2.0.1.tgz"; + sha512 = "is3hDn9zb8XXnjbEeAEIqxTpLHUiGBqjegLmXPuyMBfKAggpadWFku4/AP8iYAGBX6qR9/5UIUIp47V0XI3aMw=="; + }; + }; "grammy-1.11.1" = { name = "grammy"; packageName = "grammy"; @@ -35722,6 +35902,15 @@ let sha512 = "5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw=="; }; }; + "graphql-16.5.0" = { + name = "graphql"; + packageName = "graphql"; + version = "16.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-16.5.0.tgz"; + sha512 = "qbHgh8Ix+j/qY+a/ZcJnFQ+j8ezakqPiHwPiZhV/3PgGlgf96QMBB5/f2rkiC9sgLoy/xvT6TSiaf2nTHJh5iA=="; + }; + }; "graphql-16.6.0" = { name = "graphql"; packageName = "graphql"; @@ -37495,6 +37684,15 @@ let sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; }; + "http-call-5.3.0" = { + name = "http-call"; + packageName = "http-call"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz"; + sha512 = "ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w=="; + }; + }; "http-deceiver-1.2.7" = { name = "http-deceiver"; packageName = "http-deceiver"; @@ -41500,6 +41698,15 @@ let sha512 = "8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA=="; }; }; + "jks-js-1.0.2" = { + name = "jks-js"; + packageName = "jks-js"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jks-js/-/jks-js-1.0.2.tgz"; + sha512 = "OTJ+BKJTUHbnytW4X/py22Adhm9eJdBXzsqFthecsvuup7BnxVv82UEPG6bEr+0A/ZcLtf0F/B5klDOV6ewzjg=="; + }; + }; "jmespath-0.16.0" = { name = "jmespath"; packageName = "jmespath"; @@ -41527,6 +41734,15 @@ let sha512 = "b2Zna/wGIyTzi0Gemg27JYUaRyTyBETw5GnqyVQMr71uojOYMrgkD2+Px3bG2ZFi7/zTUXJSDoGoBOhMixq7tg=="; }; }; + "joi-17.6.0" = { + name = "joi"; + packageName = "joi"; + version = "17.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz"; + sha512 = "OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw=="; + }; + }; "joi-17.6.2" = { name = "joi"; packageName = "joi"; @@ -42041,13 +42257,13 @@ let sha512 = "zAvvzRShVMmUxNRLtbR4HShGEn17kyiED5XSo1CrVu4JzG6I7YEtYO1WrNFe1XTh76Bbi4OoamZm3Um91DPtXg=="; }; }; - "jsii-srcmak-0.1.695" = { + "jsii-srcmak-0.1.698" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.695"; + version = "0.1.698"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.695.tgz"; - sha512 = "LWn8LhJhwNYVB+kc21wKUdQgTJMoqiYiRitBJYlqHb7yjL/g34h2NAtcRNVOLBOwVpmilBSRsyJd5jxFqjYqFA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.698.tgz"; + sha512 = "rELtXGP065txtYrKifEPCY/ON9QxC/+AeFGGRfQBdXfP2fmTNtKRWxpnGOM59gEnSdjqwFUVnrkXGa4t3vJKNw=="; }; }; "json-bigint-1.0.0" = { @@ -42383,13 +42599,13 @@ let sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; }; }; - "json2jsii-0.3.144" = { + "json2jsii-0.3.147" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.144"; + version = "0.3.147"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.144.tgz"; - sha512 = "VXL3y91qdtBLd4lH8vJ1I3xI+H7xHb3dwZacmb6szAaLcmnHvUhX9klSHiqeGpwANvM8KP7VWoFX+3evK9wRCA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.147.tgz"; + sha512 = "CKxpNrFvHql7xUqJCUhMq6tJLKq35q7/1P+LUlrL7JGD1Ii16VcKyDxNZzyNFTPNp0XPrvdOzxhrSLgjy2ssJw=="; }; }; "json3-3.2.6" = { @@ -53447,13 +53663,13 @@ let sha512 = "TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw=="; }; }; - "openapi3-ts-3.1.0" = { + "openapi3-ts-3.1.1" = { name = "openapi3-ts"; packageName = "openapi3-ts"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-3.1.0.tgz"; - sha512 = "1qKTvCCVoV0rkwUh1zq5o8QyghmwYPuhdvtjv1rFjuOnJToXhQyF8eGjNETQ8QmGjr9Jz/tkAKLITIl2s7dw3A=="; + url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-3.1.1.tgz"; + sha512 = "lNUS87ncFqm1m8W21sbTGIeD7sydkQ4nnRUrkBiGlAzTngr50eBKU2suUXhdEk51z6m4cCgaXdB1SFgXtyn81Q=="; }; }; "opencollective-postinstall-2.0.3" = { @@ -57965,13 +58181,13 @@ let sha512 = "tEJiPjTB1eVT5Czcbkj9GoRG/oMewOnG9x737p/hJUD5QXJmn7LiYFM2dKkX0i4A1fhhsGfXT+uqsAXcw2r8JQ=="; }; }; - "prettier-plugin-svelte-2.7.1" = { + "prettier-plugin-svelte-2.8.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.1.tgz"; - sha512 = "H33qjhCBZyd9Zr1A5hUAYDh7j0Mf97uvy7XcA7CP4nNSYrNcPvBUf7wI8K9NptWTIs0S41QtgTWmJIUiGlEBtw=="; + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.8.0.tgz"; + sha512 = "QlXv/U3bUszks3XYDPsk1fsaQC+fo2lshwKbcbO+lrSVdJ+40mB1BfL8OCAk1W9y4pJxpqO/4gqm6NtF3zNGCw=="; }; }; "prettier-tslint-0.4.2" = { @@ -58397,6 +58613,15 @@ let sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; }; }; + "promise-limit-2.7.0" = { + name = "promise-limit"; + packageName = "promise-limit"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-limit/-/promise-limit-2.7.0.tgz"; + sha512 = "7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw=="; + }; + }; "promise-nodify-1.0.2" = { name = "promise-nodify"; packageName = "promise-nodify"; @@ -69540,13 +69765,13 @@ let sha512 = "sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw=="; }; }; - "svelte2tsx-0.5.19" = { + "svelte2tsx-0.5.20" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.5.19"; + version = "0.5.20"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.19.tgz"; - sha512 = "PvhcjG3fVhFmoO7XWYYqWYkg7lQzO8Q9/T4RQiCAsTZ+lK+9jCAPV8rbeQD8M4AN44u3JqgvaxHrmh095SaxBA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.20.tgz"; + sha512 = "yNHmN/uoAnJ7d1XqVohiNA6TMFOxibHyEddUAHVt1PiLXtbwAJF3WaGYlg8QbOdoXzOVsVNCAlqRUIdULUm+OA=="; }; }; "sver-compat-1.5.0" = { @@ -71413,13 +71638,13 @@ let sha512 = "bPTDIA7XEjRlw6vQyt7kM/h1mg1INBsibjbujISITonx4POENZgxfyCSEXZpDhbAkluSPH4HKRKs4/YTmNLC6w=="; }; }; - "torrent-discovery-9.4.13" = { + "torrent-discovery-9.4.14" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.13"; + version = "9.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.13.tgz"; - sha512 = "HZD8nAxIejcGnzUyXRMhBnK0rYQCQ85vaaCzmzl2r3/vmj0M/b6JuO6yNhe1vyLOU3ZngzDYaHxCJjmAIa4wwg=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.14.tgz"; + sha512 = "IyzlrHctvqqKtN8Y2BMxNL3d2FLazs6pC2yzKOHJlXWYUFkLpZhZSaSZcAkfmZXgdjwq59N2umr1przsRDMzkA=="; }; }; "torrent-piece-1.1.2" = { @@ -72484,6 +72709,15 @@ let sha512 = "MINvUN5ug9u+0hJDzSZNSnuKXI8M4F5Yvb6SQZ2CYqe7SgKXKOosEcU5R7tRgo85I6eAVBbkVF7TCvB4AUK2xQ=="; }; }; + "type-fest-3.1.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.1.0.tgz"; + sha512 = "StmrZmK3eD9mDF9Vt7UhqthrDSk66O9iYl5t5a0TSoVkHjl0XZx/xuc/BRz4urAXXGHOY5OLsE0RdJFIApSFmw=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -74770,6 +75004,15 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; + "uuid-9.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"; + sha512 = "MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="; + }; + }; "uvu-0.5.6" = { name = "uvu"; packageName = "uvu"; @@ -77173,13 +77416,13 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.8.30" = { + "webtorrent-1.8.32" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.8.30"; + version = "1.8.32"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.30.tgz"; - sha512 = "vJbZYnmzSRwvHAXP6YGPsps69vux6ft6J6B0sFqGyqmIN28g5xK3z4Dvq0EZHRYz1z9egkvzY1Khs6XWlmGJCA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.32.tgz"; + sha512 = "PjtJn3sY4Uqb1PEuxID+Cps4AshUKZpo3EhkT14y1SySmMVHeSX2crwh1rXIGX3fJUeF0zM5iEg+Ic2mN4CFZw=="; }; }; "webworkify-webpack-2.1.5" = { @@ -79503,7 +79746,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."debug-4.3.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."define-lazy-prop-2.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -80513,45 +80756,45 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -80799,10 +81042,10 @@ in "@forge/cli" = nodeEnv.buildNodePackage { name = "_at_forge_slash_cli"; packageName = "@forge/cli"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli/-/cli-5.1.1.tgz"; - sha512 = "Oeoe4Gr20aiYAAdgbBY2tgbXNHgVT2yGdI38DqEVxl8T9XyVKUkCSllAkBUt121LSAXFObAEmLy/7dmCPmf5Jg=="; + url = "https://registry.npmjs.org/@forge/cli/-/cli-5.2.0.tgz"; + sha512 = "KoFDuisUshhGtS5XHjy0rZOW7PD5+LHqZy0nRZz7S67e5Rcxt67Dl6zLsYB9CjPJs4htQKCYImUcmCm0+YLy0Q=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -80813,9 +81056,9 @@ in ]; }) sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" sources."@babel/core-7.19.3" - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -80832,15 +81075,15 @@ in sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.19.0" sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" @@ -80852,15 +81095,15 @@ in sources."@babel/plugin-transform-typescript-7.19.3" sources."@babel/preset-typescript-7.18.6" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@colors/colors-1.5.0" sources."@discoveryjs/json-ext-0.5.7" sources."@forge/api-2.7.0" sources."@forge/auth-0.0.1" sources."@forge/babel-plugin-transform-ui-1.1.0" - sources."@forge/bundler-3.1.1" - (sources."@forge/cli-shared-3.1.1" // { + sources."@forge/bundler-3.1.2" + (sources."@forge/cli-shared-3.2.0" // { dependencies = [ sources."glob-7.2.3" ]; @@ -80871,8 +81114,8 @@ in sources."minimatch-5.1.0" ]; }) - sources."@forge/lint-3.2.5" - sources."@forge/manifest-4.3.0" + sources."@forge/lint-3.2.6" + sources."@forge/manifest-4.4.0" sources."@forge/storage-1.3.0" sources."@forge/util-1.2.0" sources."@jridgewell/gen-mapping-0.1.1" @@ -80884,7 +81127,7 @@ in ]; }) sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@jsdevtools/ono-7.1.3" sources."@polka/url-1.0.0-next.21" sources."@sindresorhus/is-0.14.0" @@ -81087,7 +81330,7 @@ in sources."debug-4.3.4" sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" @@ -81120,7 +81363,7 @@ in ]; }) sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81249,13 +81492,14 @@ in sources."inflight-1.0.6" sources."inherits-2.0.1" sources."ini-1.3.8" - (sources."inquirer-7.3.3" // { + (sources."inquirer-8.2.4" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."ora-5.4.1" sources."supports-color-7.2.0" ]; }) @@ -81282,6 +81526,7 @@ in sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-weakref-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -81350,7 +81595,16 @@ in sources."lodash.some-4.6.0" sources."lodash.sortby-4.7.0" sources."lodash.union-4.6.0" - sources."log-symbols-3.0.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) (sources."lower-case-2.0.2" // { dependencies = [ sources."tslib-2.4.0" @@ -81433,6 +81687,16 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + (sources."log-symbols-3.0.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."supports-color-7.2.0" ]; }) @@ -81531,7 +81795,11 @@ in sources."rimraf-2.4.5" sources."ripemd160-2.0.2" sources."run-async-2.4.1" - sources."rxjs-6.6.7" + (sources."rxjs-7.5.7" // { + dependencies = [ + sources."tslib-2.4.0" + ]; + }) sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-test-1.0.0" @@ -81800,7 +82068,7 @@ in sources."mimic-response-3.1.0" ]; }) - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" sources."dotf-2.0.2" @@ -82067,7 +82335,7 @@ in sha512 = "Pl9Q5rqt4hKGVcZ1/iPMj8VXY3US0UgY8JGkgm+XFUtAJ9JntN0Qj1bj1JBfPj5R7YyrZzuuDbEk4eOCd+wI/A=="; }; dependencies = [ - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@medable/mdctl-api-1.0.67" sources."@medable/mdctl-api-driver-1.0.67" sources."@medable/mdctl-axon-tools-1.0.67" @@ -83040,7 +83308,7 @@ in sources."commander-6.2.1" sources."cross-spawn-4.0.2" sources."debug-4.3.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."deprecation-2.3.1" sources."encoding-0.1.13" sources."esprima-4.0.1" @@ -83139,7 +83407,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" (sources."@nestjs/schematics-9.0.3" // { dependencies = [ (sources."@angular-devkit/core-14.2.1" // { @@ -83221,8 +83489,8 @@ in sources."cross-spawn-7.0.3" sources."de-indent-1.0.2" sources."deepmerge-4.2.2" - sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.275" + sources."defaults-1.0.4" + sources."electron-to-chromium-1.4.276" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.10.0" @@ -83451,7 +83719,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."has-flag-4.0.0" sources."ieee754-1.2.1" sources."inherits-2.0.4" @@ -83501,45 +83769,45 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -83652,45 +83920,45 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -83822,45 +84090,45 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -83973,45 +84241,45 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -84139,7 +84407,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1230.0" + sources."aws-sdk-2.1231.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ @@ -84416,7 +84684,7 @@ in sources."@achrinza/node-ipc-9.2.5" sources."@akryum/winattr-3.0.0" sources."@ampproject/remapping-2.2.0" - (sources."@apollo/protobufjs-1.2.4" // { + (sources."@apollo/protobufjs-1.2.6" // { dependencies = [ sources."@types/node-10.17.60" ]; @@ -84436,13 +84704,13 @@ in sources."@apollographql/apollo-tools-0.5.4" sources."@apollographql/graphql-playground-html-1.6.29" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" (sources."@babel/core-7.19.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -84472,14 +84740,14 @@ in sources."@babel/helper-plugin-utils-7.19.0" sources."@babel/helper-remap-async-to-generator-7.18.9" sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -84490,7 +84758,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.19.1" @@ -84502,7 +84770,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-object-rest-spread-7.19.4" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" @@ -84528,10 +84796,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-block-scoping-7.19.4" sources."@babel/plugin-transform-classes-7.19.0" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.19.4" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -84559,7 +84827,7 @@ in sources."@babel/plugin-transform-typescript-7.19.3" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.19.3" // { + (sources."@babel/preset-env-7.19.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -84574,10 +84842,10 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@graphql-tools/merge-8.3.1" (sources."@graphql-tools/mock-8.7.6" // { dependencies = [ @@ -84595,7 +84863,7 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@node-ipc/js-queue-2.0.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -84619,8 +84887,8 @@ in sources."@types/connect-3.4.35" sources."@types/cors-2.8.12" sources."@types/ejs-3.1.1" - sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.30" + sources."@types/express-4.17.14" + sources."@types/express-serve-static-core-4.17.31" sources."@types/inquirer-8.2.4" (sources."@types/jscodeshift-0.7.2" // { dependencies = [ @@ -84659,13 +84927,13 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."apollo-datasource-3.3.2" - sources."apollo-reporting-protobuf-3.3.2" - sources."apollo-server-core-3.10.2" + sources."apollo-reporting-protobuf-3.3.3" + sources."apollo-server-core-3.10.3" sources."apollo-server-env-4.2.1" sources."apollo-server-errors-3.3.1" - sources."apollo-server-express-3.10.2" - sources."apollo-server-plugin-base-3.6.2" - sources."apollo-server-types-3.6.2" + sources."apollo-server-express-3.10.3" + sources."apollo-server-plugin-base-3.6.3" + sources."apollo-server-types-3.6.3" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -84833,7 +85101,7 @@ in ]; }) sources."deepmerge-4.2.2" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.4" sources."define-property-2.0.2" @@ -84850,7 +85118,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -84887,12 +85155,9 @@ in sources."kind-of-5.1.0" ]; }) - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."body-parser-1.20.0" sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - sources."qs-6.10.3" ]; }) sources."express-history-api-fallback-2.2.1" @@ -85152,6 +85417,7 @@ in sources."node-gyp-build-4.5.0" (sources."node-notifier-10.0.1" // { dependencies = [ + sources."uuid-8.3.2" sources."which-2.0.2" ]; }) @@ -85485,7 +85751,7 @@ in sources."utf-8-validate-5.0.9" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-8.3.2" + sources."uuid-9.0.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."value-or-promise-1.0.11" @@ -85665,18 +85931,18 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.19.3" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/generator-7.19.4" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/types-7.19.3" + sources."@babel/types-7.19.4" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -86231,9 +86497,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" sources."@babel/core-7.19.3" - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -86244,22 +86510,22 @@ in sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" sources."@babel/helper-module-transforms-7.19.0" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@xmldom/xmldom-0.8.2" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" @@ -86278,7 +86544,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -86666,7 +86932,7 @@ in dependencies = [ sources."browserslist-4.21.4" sources."caniuse-lite-1.0.30001418" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."nanoid-3.3.4" @@ -86744,7 +87010,7 @@ in sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1230.0" // { + (sources."aws-sdk-2.1231.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -86783,7 +87049,7 @@ in sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.4" sources."deep-is-0.1.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."define-properties-1.1.4" sources."degenerator-2.2.0" sources."depd-2.0.0" @@ -87099,7 +87365,7 @@ in ]; }) sources."decompress-response-3.3.0" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" (sources."del-6.1.1" // { dependencies = [ @@ -87586,7 +87852,7 @@ in sources."crypto-js-4.1.1" sources."csv-parse-5.3.0" sources."debug-2.6.9" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."define-property-1.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -88785,11 +89051,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/parser-7.19.4" + sources."@babel/types-7.19.4" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@popperjs/core-2.11.6" @@ -88932,12 +89198,10 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."event-loop-stats-1.4.1" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."body-parser-1.20.0" sources."cookie-0.5.0" sources."debug-2.6.9" - sources."qs-6.10.3" sources."safe-buffer-5.2.1" ]; }) @@ -90353,10 +90617,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.1.7"; + version = "2.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.7.tgz"; - sha512 = "DpYA4Vpgk/FBokefXPl1aocUFdrd5diPFPqmCz9w8l/ZB8QKqXV2DPty5CpYc6X4lIAqFjSufqNdEBTVrhBtsw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.10.tgz"; + sha512 = "qUGnFwUlKBEuLcT4ttNNJKT6qtGhIiowcQb7u0Kw3DjW+J0eJdyRhOOtKgizf0Ba9wvJyUFSD4fRbWD7+NIqEA=="; }; dependencies = [ sources."@jsii/check-node-1.69.0" @@ -90374,8 +90638,8 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.5.9" - sources."cdk8s-plus-22-2.0.0-rc.141" + sources."cdk8s-2.5.12" + sources."cdk8s-plus-22-2.0.0-rc.144" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -90388,7 +90652,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.124" + sources."constructs-10.1.127" sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -90442,14 +90706,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.695" // { + (sources."jsii-srcmak-0.1.698" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.144" + sources."json2jsii-0.3.147" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" sources."lodash.truncate-4.4.2" @@ -90538,13 +90802,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.19.3" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/generator-7.19.4" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/types-7.19.3" + sources."@babel/types-7.19.4" sources."@cdktf/hcl2cdk-0.13.0" sources."@cdktf/hcl2json-0.13.0" sources."@cdktf/provider-generator-0.13.0" @@ -90552,7 +90816,7 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" (sources."@jsii/check-node-1.69.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -90624,7 +90888,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.124" + sources."constructs-10.1.127" sources."convert-to-spaces-1.0.2" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" @@ -90756,7 +91020,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.695" // { + (sources."jsii-srcmak-0.1.698" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -91128,10 +91392,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.25.0"; + version = "0.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.25.0.tgz"; - sha512 = "UWmJlM6e8ScC2ZOu/Brrj55lfYc24eKVxkypvQawp7ZukMgwOQB/ALwtOerJvak6hQdY8qu4ISqXT/XugP0brA=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.26.0.tgz"; + sha512 = "8k37u4XWNIwr9vQN7LNPUMATtWyhcc/u2an6f9YC2mpinYYt8P8rhoqQDrFPTnO/YIjtH1J8jQWCYa8d0X4vKA=="; }; buildInputs = globalBuildInputs; meta = { @@ -92074,9 +92338,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" sources."@babel/core-7.19.3" - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -92087,26 +92351,26 @@ in sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" sources."@babel/helper-module-transforms-7.19.0" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -92177,7 +92441,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -92418,10 +92682,10 @@ in coc-sumneko-lua = nodeEnv.buildNodePackage { name = "coc-sumneko-lua"; packageName = "coc-sumneko-lua"; - version = "0.0.34"; + version = "0.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.34.tgz"; - sha512 = "K3uNx1HuAN+u4YL6HZkUYSFE6ry2Q04/xRENJ5pSlQjNnToXRtt93GewSUeEMA6prtKXyUOXVaKkRf1vdSA44g=="; + url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.35.tgz"; + sha512 = "UcrTwjaeN9vGuedPcy8aOLMWWtjbOleBFBOiv44DZao6M32QaRRsgAmVZZ8tjCMzBJgsoGmbklqhuLQ4ftbTNg=="; }; buildInputs = globalBuildInputs; meta = { @@ -93570,14 +93834,14 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.51" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."bytes-3.1.2" sources."debug-2.6.9" sources."depd-2.0.0" sources."iconv-lite-0.4.24" sources."ms-2.0.0" - sources."qs-6.10.3" + sources."qs-6.11.0" ]; }) (sources."boxen-5.1.2" // { @@ -93707,12 +93971,12 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-5.1.1" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."debug-2.6.9" sources."depd-2.0.0" sources."ms-2.0.0" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."safe-buffer-5.2.1" ]; }) @@ -94603,7 +94867,7 @@ in sources."@cspell/dict-ruby-2.0.2" sources."@cspell/dict-rust-2.0.1" sources."@cspell/dict-scala-2.0.0" - sources."@cspell/dict-software-terms-2.2.12" + sources."@cspell/dict-software-terms-2.2.13" sources."@cspell/dict-sql-1.0.4" sources."@cspell/dict-swift-1.0.3" sources."@cspell/dict-typescript-2.0.2" @@ -95406,9 +95670,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" sources."@babel/core-7.19.3" - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -95430,16 +95694,16 @@ in sources."@babel/helper-plugin-utils-7.19.0" sources."@babel/helper-remap-async-to-generator-7.18.9" sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.19.1" @@ -95451,7 +95715,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-object-rest-spread-7.19.4" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" @@ -95476,10 +95740,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-block-scoping-7.19.4" sources."@babel/plugin-transform-classes-7.19.0" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.19.4" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -95509,13 +95773,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.18.9" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - sources."@babel/preset-env-7.19.3" + sources."@babel/preset-env-7.19.4" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.18.6" - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@blueprintjs/colors-4.1.7" sources."@blueprintjs/core-4.11.2" sources."@blueprintjs/icons-4.6.3" @@ -95527,7 +95791,7 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@juggle/resize-observer-3.4.0" sources."@mapbox/extent-0.4.0" sources."@mapbox/geojson-coords-0.0.2" @@ -95665,7 +95929,7 @@ in sources."@types/node-16.11.64" ]; }) - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -96511,7 +96775,7 @@ in sources."mimic-response-3.1.0" ]; }) - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.4" @@ -96875,6 +97139,455 @@ in bypassCache = true; reconstructLock = true; }; + eas-cli = nodeEnv.buildNodePackage { + name = "eas-cli"; + packageName = "eas-cli"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-2.3.0.tgz"; + sha512 = "Tc9gxflhjqb8o67NIj9tF5ES5qI2ckDj+29OEYjyQIxJVAAV0kJzH5+kFSmGlAV8qV4L3tUku+ur8LRPsJnzbA=="; + }; + dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.19.1" + (sources."@babel/highlight-7.18.6" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@expo/apple-utils-0.0.0-alpha.34" + sources."@expo/bunyan-4.0.0" + sources."@expo/code-signing-certificates-0.0.2" + (sources."@expo/config-7.0.1" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) + sources."@expo/config-plugins-5.0.1" + sources."@expo/config-types-46.0.2" + sources."@expo/eas-build-job-0.2.94" + (sources."@expo/eas-json-2.2.0" // { + dependencies = [ + sources."@babel/code-frame-7.18.6" + ]; + }) + (sources."@expo/image-utils-0.3.20" // { + dependencies = [ + sources."@expo/spawn-async-1.5.0" + sources."fs-extra-9.0.0" + sources."mime-2.6.0" + sources."semver-7.3.2" + ]; + }) + sources."@expo/json-file-8.2.36" + sources."@expo/multipart-body-parser-1.1.0" + sources."@expo/package-manager-0.0.56" + sources."@expo/pkcs12-0.0.8" + (sources."@expo/plist-0.0.18" // { + dependencies = [ + sources."xmlbuilder-14.0.0" + ]; + }) + sources."@expo/plugin-autocomplete-1.4.0" + sources."@expo/plugin-help-5.3.0" + sources."@expo/plugin-warn-if-update-available-2.3.0" + (sources."@expo/prebuild-config-5.0.3" // { + dependencies = [ + sources."fs-extra-9.1.0" + sources."semver-7.3.2" + sources."universalify-2.0.0" + ]; + }) + sources."@expo/results-1.0.0" + sources."@expo/rudder-sdk-node-1.1.1" + sources."@expo/sdk-runtime-versions-1.0.0" + (sources."@expo/spawn-async-1.7.0" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + sources."@expo/timeago.js-1.0.0" + sources."@graphql-typed-document-node/core-3.1.1" + sources."@hapi/hoek-9.3.0" + sources."@hapi/topo-5.1.0" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + (sources."@oclif/core-1.13.10" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."fs-extra-9.1.0" + sources."has-flag-4.0.0" + sources."supports-color-8.1.1" + sources."universalify-2.0.0" + ]; + }) + sources."@oclif/linewrap-1.0.0" + sources."@oclif/screen-3.0.2" + sources."@react-native/normalize-color-2.0.0" + sources."@segment/loosely-validate-event-2.0.0" + sources."@sideway/address-4.1.4" + sources."@sideway/formula-3.0.0" + sources."@sideway/pinpoint-2.0.0" + sources."@urql/core-2.6.1" + sources."@urql/exchange-retry-0.3.3" + sources."@xmldom/xmldom-0.7.5" + sources."agent-base-6.0.2" + sources."ajv-6.12.6" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-regex-5.0.1" + sources."ansi-styles-3.2.1" + sources."ansicolors-0.3.2" + sources."any-promise-1.3.0" + sources."argparse-1.0.10" + sources."array-union-2.1.0" + sources."asn1-0.2.6" + sources."async-3.2.4" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."better-opn-3.0.2" + sources."big-integer-1.6.51" + sources."bplist-creator-0.1.1" + sources."bplist-parser-0.3.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."builtins-1.0.3" + sources."cardinal-2.1.1" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."charenc-0.0.2" + sources."chownr-2.0.0" + (sources."clean-stack-3.0.1" // { + dependencies = [ + sources."escape-string-regexp-4.0.0" + ]; + }) + sources."cli-cursor-3.1.0" + sources."cli-progress-3.11.2" + sources."cli-spinners-2.7.0" + sources."cli-table3-0.6.2" + sources."clone-1.0.4" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" + sources."commander-4.1.1" + sources."component-type-1.2.1" + sources."concat-map-0.0.1" + sources."content-type-1.0.4" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."crypt-0.0.2" + sources."crypto-random-string-1.0.0" + sources."dateformat-4.6.3" + sources."debug-4.3.4" + sources."defaults-1.0.4" + sources."define-lazy-prop-2.0.0" + sources."delayed-stream-1.0.0" + sources."dicer-0.3.1" + sources."dir-glob-3.0.1" + sources."domino-2.1.6" + sources."ejs-3.1.8" + sources."emoji-regex-8.0.0" + sources."encoding-0.1.13" + sources."env-paths-2.2.0" + sources."env-string-1.0.1" + sources."envinfo-7.8.1" + sources."err-code-2.0.3" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + (sources."expo-modules-autolinking-0.11.0" // { + dependencies = [ + sources."commander-7.2.0" + sources."fs-extra-9.1.0" + sources."universalify-2.0.0" + ]; + }) + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.11" + sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.13.0" + sources."fetch-retry-4.1.1" + sources."figures-3.2.0" + sources."filelist-1.0.4" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" + sources."find-yarn-workspace-root-2.0.0" + sources."form-data-4.0.0" + (sources."fs-extra-10.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."fs-minipass-2.1.0" + sources."fs.realpath-1.0.0" + sources."get-package-type-0.1.0" + sources."getenv-1.0.0" + (sources."glob-7.1.6" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) + sources."glob-parent-5.1.2" + sources."globby-11.1.0" + sources."golden-fleece-1.0.9" + sources."graceful-fs-4.2.10" + sources."gradle-to-js-2.0.1" + sources."graphql-16.5.0" + sources."graphql-tag-2.12.6" + sources."has-flag-3.0.0" + sources."hosted-git-info-3.0.8" + sources."http-call-5.3.0" + sources."https-proxy-agent-5.0.1" + sources."hyperlinker-1.0.0" + sources."iconv-lite-0.6.3" + sources."ignore-5.2.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-docker-2.2.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.3" + sources."is-interactive-1.0.0" + sources."is-number-7.0.0" + sources."is-retry-allowed-1.2.0" + sources."is-stream-2.0.1" + sources."is-unicode-supported-0.1.0" + sources."is-wsl-2.2.0" + sources."isexe-2.0.0" + (sources."jake-10.8.5" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) + sources."jimp-compact-0.16.1" + sources."jks-js-1.0.2" + sources."joi-17.6.0" + sources."join-component-1.1.0" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-traverse-0.4.1" + sources."json5-1.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."keychain-1.3.0" + sources."kleur-3.0.3" + sources."lines-and-columns-1.2.4" + sources."locate-path-6.0.0" + sources."lodash.merge-4.6.2" + sources."log-symbols-4.1.0" + sources."lru-cache-6.0.0" + sources."md5-2.3.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.5" + sources."mime-3.0.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-fn-2.1.0" + (sources."minimatch-5.1.0" // { + dependencies = [ + sources."brace-expansion-2.0.1" + ]; + }) + sources."minimist-1.2.6" + sources."minipass-3.3.5" + sources."minizlib-2.1.2" + sources."mkdirp-0.5.6" + sources."ms-2.1.2" + sources."mute-stream-0.0.8" + (sources."mv-2.1.1" // { + dependencies = [ + sources."glob-6.0.4" + sources."minimatch-3.1.2" + sources."rimraf-2.4.5" + ]; + }) + sources."mz-2.7.0" + sources."nanoid-3.3.4" + sources."natural-orderby-2.0.3" + sources."ncp-2.0.0" + sources."nice-try-1.0.5" + sources."node-fetch-2.6.7" + sources."node-forge-1.3.1" + sources."node-int64-0.4.0" + sources."node-rsa-1.1.1" + (sources."npm-package-arg-7.0.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."nullthrows-1.1.1" + sources."object-assign-4.1.1" + sources."object-treeify-1.1.33" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."open-8.4.0" + sources."ora-5.1.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."p-try-2.2.0" + sources."parse-json-4.0.0" + sources."parse-png-2.1.0" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + ]; + }) + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-type-4.0.0" + sources."picomatch-2.3.1" + sources."pirates-4.0.5" + (sources."pkg-dir-4.2.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + ]; + }) + sources."plist-3.0.6" + sources."pngjs-3.4.0" + sources."promise-limit-2.7.0" + sources."promise-retry-2.0.1" + sources."prompts-2.4.2" + sources."punycode-2.1.1" + sources."qrcode-terminal-0.12.0" + sources."queue-microtask-1.2.3" + sources."redeyed-2.1.1" + sources."remove-trailing-slash-0.1.1" + sources."require-from-string-2.0.2" + sources."resolve-from-5.0.0" + sources."restore-cursor-3.1.0" + sources."retry-0.12.0" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" + sources."safe-buffer-5.2.1" + sources."safe-json-stringify-1.2.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-7.3.7" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.7" + sources."simple-plist-1.4.0" + sources."sisteransi-1.0.5" + sources."slash-3.0.0" + sources."slugify-1.6.5" + sources."split-1.0.1" + sources."sprintf-js-1.0.3" + sources."stream-buffers-2.2.0" + sources."streamsearch-1.1.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."structured-headers-0.4.1" + sources."sucrase-3.28.0" + sources."sudo-prompt-9.1.1" + sources."supports-color-5.5.0" + (sources."supports-hyperlinks-2.3.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."tar-6.1.11" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) + sources."temp-dir-1.0.0" + sources."tempy-0.3.0" + sources."terminal-link-2.1.1" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."through-2.3.8" + sources."to-regex-range-5.0.1" + sources."tr46-0.0.3" + sources."ts-interface-checker-0.1.13" + sources."tslib-2.4.0" + sources."tunnel-agent-0.6.0" + sources."turndown-7.1.1" + sources."type-fest-0.3.1" + sources."unique-string-1.0.0" + sources."universalify-1.0.0" + sources."untildify-4.0.0" + sources."uri-js-4.4.1" + sources."uuid-8.3.2" + sources."validate-npm-package-name-3.0.0" + sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."which-1.3.1" + sources."widest-line-3.1.0" + sources."wonka-4.0.15" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.3" + (sources."xcode-3.0.1" // { + dependencies = [ + sources."uuid-7.0.3" + ]; + }) + (sources."xml2js-0.4.23" // { + dependencies = [ + sources."xmlbuilder-11.0.1" + ]; + }) + sources."xmlbuilder-15.1.1" + sources."yallist-4.0.0" + sources."yocto-queue-0.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "EAS command line tool"; + homepage = "https://github.com/expo/eas-cli"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; elm-oracle = nodeEnv.buildNodePackage { name = "elm-oracle"; packageName = "elm-oracle"; @@ -96904,13 +97617,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" (sources."@babel/core-7.19.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -96927,28 +97640,28 @@ in sources."@babel/helper-module-imports-7.18.6" sources."@babel/helper-module-transforms-7.19.0" sources."@babel/helper-plugin-utils-7.19.0" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/parser-7.19.4" + sources."@babel/plugin-proposal-object-rest-spread-7.19.4" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.19.4" sources."@babel/plugin-transform-parameters-7.18.8" sources."@babel/plugin-transform-react-jsx-7.19.0" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" @@ -97007,7 +97720,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -97310,17 +98023,17 @@ in }) sources."@fluentui/date-time-utilities-8.5.2" sources."@fluentui/dom-utilities-2.2.2" - sources."@fluentui/font-icons-mdl2-8.5.0" - sources."@fluentui/foundation-legacy-8.2.20" + sources."@fluentui/font-icons-mdl2-8.5.1" + sources."@fluentui/foundation-legacy-8.2.21" sources."@fluentui/keyboard-key-0.4.2" sources."@fluentui/merge-styles-8.5.3" - sources."@fluentui/react-8.97.2" - sources."@fluentui/react-focus-8.8.5" + sources."@fluentui/react-8.98.0" + sources."@fluentui/react-focus-8.8.6" sources."@fluentui/react-hooks-8.6.11" sources."@fluentui/react-portal-compat-context-9.0.2" sources."@fluentui/react-window-provider-2.2.2" sources."@fluentui/set-version-8.2.2" - sources."@fluentui/style-utilities-8.7.12" + sources."@fluentui/style-utilities-8.8.0" sources."@fluentui/theme-2.6.16" sources."@fluentui/utilities-8.13.1" sources."@gar/promisify-1.1.3" @@ -97351,7 +98064,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@js-joda/core-5.4.1" sources."@mapbox/node-pre-gyp-1.0.10" sources."@microsoft/load-themed-styles-1.10.295" @@ -97391,45 +98104,45 @@ in }) sources."@sindresorhus/is-0.14.0" sources."@sqltools/formatter-1.2.3" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@szmarczak/http-timer-1.1.2" sources."@tediousjs/connection-string-0.4.1" sources."@tokenizer/token-0.3.0" @@ -97837,7 +98550,7 @@ in sources."each-props-1.3.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -99153,7 +99866,7 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -99493,11 +100206,11 @@ in sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.2.1" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.10.3" + sources."qs-6.11.0" ]; }) (sources."bonjour-3.5.0" // { @@ -99786,7 +100499,7 @@ in sources."which-2.0.2" ]; }) - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."define-properties-1.1.4" sources."define-property-2.0.2" (sources."del-4.1.1" // { @@ -99840,7 +100553,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99993,11 +100706,11 @@ in sources."ms-2.0.0" ]; }) - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.10.3" + sources."qs-6.11.0" ]; }) sources."extend-3.0.2" @@ -101481,15 +102194,14 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.24.0"; + version = "8.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz"; - sha512 = "dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz"; + sha512 = "DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A=="; }; dependencies = [ - sources."@eslint/eslintrc-1.3.2" + sources."@eslint/eslintrc-1.3.3" sources."@humanwhocodes/config-array-0.10.7" - sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@nodelib/fs.scandir-2.1.5" @@ -101516,7 +102228,7 @@ in sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.24.0" + sources."eslint-8.25.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -101624,9 +102336,8 @@ in sha512 = "qOJ9cTi5AaH5bOgEoCkv41DJ637mHgzffbOLojwU4wadwC6qbR+OxVJRvVzH0v2XYmQOvw4eiJK7ivrr5SvzsA=="; }; dependencies = [ - sources."@eslint/eslintrc-1.3.2" + sources."@eslint/eslintrc-1.3.3" sources."@humanwhocodes/config-array-0.10.7" - sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@nodelib/fs.scandir-2.1.5" @@ -101658,7 +102369,7 @@ in sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.24.0" + sources."eslint-8.25.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -101790,14 +102501,14 @@ in ]; }) sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" (sources."@babel/core-7.9.0" // { dependencies = [ sources."json5-2.2.1" sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.19.3" + sources."@babel/generator-7.19.4" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" (sources."@babel/helper-compilation-targets-7.19.3" // { @@ -101823,20 +102534,20 @@ in sources."@babel/helper-plugin-utils-7.19.0" sources."@babel/helper-remap-async-to-generator-7.18.9" sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" (sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" // { dependencies = [ @@ -101864,7 +102575,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-object-rest-spread-7.19.4" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" @@ -101893,10 +102604,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-block-scoping-7.19.4" sources."@babel/plugin-transform-classes-7.19.0" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.19.4" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -101933,7 +102644,7 @@ in sources."@babel/plugin-transform-typescript-7.19.3" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.19.3" // { + (sources."@babel/preset-env-7.19.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -101945,18 +102656,18 @@ in sources."@babel/code-frame-7.18.6" ]; }) - (sources."@babel/traverse-7.19.3" // { + (sources."@babel/traverse-7.19.4" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; }) - sources."@babel/types-7.19.3" + sources."@babel/types-7.19.4" sources."@colors/colors-1.5.0" sources."@expo/apple-utils-0.0.0-alpha.31" sources."@expo/bunyan-4.0.0" (sources."@expo/cli-0.3.1" // { dependencies = [ - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" (sources."@expo/config-7.0.1" // { dependencies = [ sources."semver-7.3.2" @@ -102073,7 +102784,7 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -102320,7 +103031,7 @@ in sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" - sources."ci-info-3.4.0" + sources."ci-info-3.5.0" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -102505,7 +103216,7 @@ in sources."deep-extend-0.6.0" sources."deepmerge-4.2.2" sources."default-gateway-4.2.0" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.4" @@ -102560,7 +103271,7 @@ in sources."duplexer3-0.1.5" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -102634,7 +103345,7 @@ in }) (sources."expo-46.0.15" // { dependencies = [ - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."commander-7.2.0" sources."expo-modules-autolinking-0.10.3" sources."fs-extra-9.1.0" @@ -103968,7 +104679,7 @@ in sources."anymatch-2.0.0" sources."array-union-1.0.2" sources."binary-extensions-1.13.1" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."debug-2.6.9" ]; @@ -103980,7 +104691,7 @@ in sources."cookie-0.5.0" sources."del-4.1.1" sources."depd-2.0.0" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."debug-2.6.9" ]; @@ -104008,7 +104719,7 @@ in sources."p-map-2.1.0" sources."p-retry-3.0.1" sources."pify-2.3.0" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."raw-body-2.5.1" sources."readdirp-2.2.1" sources."rimraf-2.7.1" @@ -104125,9 +104836,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" sources."@babel/core-7.19.3" - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -104140,28 +104851,28 @@ in sources."@babel/helper-module-imports-7.18.6" sources."@babel/helper-module-transforms-7.19.0" sources."@babel/helper-plugin-utils-7.19.0" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/parser-7.19.4" + sources."@babel/plugin-proposal-object-rest-spread-7.19.4" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.19.4" sources."@babel/plugin-transform-parameters-7.18.8" sources."@babel/plugin-transform-react-jsx-7.19.0" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@types/minimist-1.2.2" sources."@types/node-18.8.3" sources."@types/normalize-package-data-2.4.1" @@ -104220,7 +104931,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -104440,9 +105151,8 @@ in sources."@oclif/command-1.8.18" sources."@oclif/config-1.18.5" sources."@oclif/errors-1.3.6" - (sources."@oclif/help-1.0.2" // { + (sources."@oclif/help-1.0.3" // { dependencies = [ - sources."@oclif/config-1.18.3" sources."wrap-ansi-6.2.0" ]; }) @@ -104560,7 +105270,7 @@ in sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-is-0.1.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."dotenv-8.6.0" @@ -104819,7 +105529,7 @@ in sources."js-yaml-4.1.0" ]; }) - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@esbuild/android-arm-0.15.10" @@ -105051,7 +105761,7 @@ in sources."deep-extend-0.6.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" sources."degenerator-3.0.2" sources."delayed-stream-1.0.0" @@ -105129,12 +105839,10 @@ in ]; }) sources."exegesis-express-4.0.0" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."body-parser-1.20.0" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.10.3" ]; }) sources."extend-3.0.2" @@ -105795,7 +106503,7 @@ in sources."map-obj-1.0.1" ]; }) - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" sources."error-ex-1.3.2" @@ -106727,13 +107435,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" (sources."@babel/core-7.19.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -106754,32 +107462,32 @@ in sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.19.0" sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/plugin-syntax-typescript-7.18.6" sources."@babel/plugin-transform-typescript-7.19.3" sources."@babel/preset-typescript-7.18.6" - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@lmdb/lmdb-darwin-arm64-2.5.3" sources."@lmdb/lmdb-darwin-x64-2.5.3" sources."@lmdb/lmdb-linux-arm-2.5.3" @@ -106894,7 +107602,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -107326,7 +108034,7 @@ in sources."debug-4.3.4" sources."debuglog-1.0.1" sources."deep-extend-0.6.0" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."delegates-1.0.0" sources."depd-1.1.2" sources."deprecation-2.3.1" @@ -108022,7 +108730,7 @@ in sources."mimic-response-3.1.0" ]; }) - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."delay-5.0.0" sources."delayed-stream-1.0.0" @@ -108159,7 +108867,7 @@ in sources."camelcase-keys-7.0.2" sources."chalk-5.1.0" sources."chardet-0.7.0" - sources."ci-info-3.4.0" + sources."ci-info-3.5.0" sources."cli-boxes-3.0.0" sources."cli-cursor-4.0.0" sources."cli-spinners-2.7.0" @@ -108194,7 +108902,7 @@ in }) sources."deep-extend-0.6.0" sources."deep-is-0.1.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."degenerator-3.0.2" sources."depd-2.0.0" @@ -108264,7 +108972,7 @@ in (sources."inquirer-autocomplete-prompt-3.0.0" // { dependencies = [ sources."ansi-escapes-6.0.0" - sources."type-fest-3.0.0" + sources."type-fest-3.1.0" ]; }) sources."ip-1.1.8" @@ -108680,7 +109388,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@exodus/schemasafe-1.0.0-rc.7" + sources."@exodus/schemasafe-1.0.0-rc.9" sources."@graphql-cli/common-4.1.0" (sources."@graphql-cli/init-4.1.0" // { dependencies = [ @@ -108861,7 +109569,7 @@ in sources."decompress-response-3.3.0" sources."deep-equal-2.0.5" sources."deep-extend-0.6.0" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" @@ -109263,12 +109971,12 @@ in dependencies = [ sources."@ardatan/sync-fetch-0.0.1" sources."@babel/code-frame-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/polyfill-7.12.1" - sources."@babel/types-7.19.3" + sources."@babel/types-7.19.4" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" sources."@graphql-tools/batch-execute-8.5.6" sources."@graphql-tools/delegate-9.0.8" @@ -109531,45 +110239,45 @@ in sources."@peculiar/asn1-schema-2.3.0" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.0" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -109998,7 +110706,7 @@ in dependencies = [ sources."accepts-1.3.8" sources."array-flatten-1.1.1" - sources."body-parser-1.20.0" + sources."body-parser-1.20.1" sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."content-disposition-0.5.4" @@ -110012,7 +110720,7 @@ in sources."encodeurl-1.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.18.1" + sources."express-4.18.2" sources."express-ws-2.0.0" sources."finalhandler-1.2.0" sources."forwarded-0.2.0" @@ -110040,7 +110748,7 @@ in sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.7" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" sources."safe-buffer-5.2.1" @@ -112087,7 +112795,7 @@ in sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" sources."decimal.js-7.5.1" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."end-of-stream-1.4.4" sources."execa-1.0.0" sources."fs-extra-0.24.0" @@ -114102,7 +114810,7 @@ in sha512 = "8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg=="; }; dependencies = [ - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" @@ -114395,10 +115103,8 @@ in sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."body-parser-1.20.0" - sources."qs-6.10.3" sources."safe-buffer-5.2.1" ]; }) @@ -114717,10 +115423,8 @@ in sources."etag-1.8.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."body-parser-1.20.0" - sources."qs-6.10.3" sources."safe-buffer-5.2.1" ]; }) @@ -115187,9 +115891,8 @@ in sources."@oclif/command-1.8.18" sources."@oclif/config-1.18.5" sources."@oclif/errors-1.3.6" - (sources."@oclif/help-1.0.2" // { + (sources."@oclif/help-1.0.3" // { dependencies = [ - sources."@oclif/config-1.18.3" sources."wrap-ansi-6.2.0" ]; }) @@ -115618,13 +116321,13 @@ in sources."@ampproject/remapping-2.2.0" sources."@babel/cli-7.19.3" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" (sources."@babel/core-7.19.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -115641,26 +116344,26 @@ in sources."@babel/helper-module-imports-7.18.6" sources."@babel/helper-module-transforms-7.19.0" sources."@babel/helper-plugin-utils-7.19.0" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" sources."@babel/node-7.19.1" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-transform-react-jsx-7.19.0" sources."@babel/register-7.18.9" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" (sources."@mapbox/node-pre-gyp-1.0.10" // { dependencies = [ (sources."make-dir-3.1.0" // { @@ -115739,7 +116442,7 @@ in sources."bitwise-xor-0.0.0" sources."bl-4.1.0" sources."bn.js-4.12.0" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."debug-2.6.9" sources."iconv-lite-0.4.24" @@ -115759,7 +116462,7 @@ in sources."caniuse-lite-1.0.30001418" sources."canvas-2.10.1" sources."chalk-2.4.2" - sources."chardet-1.4.0" + sources."chardet-1.5.0" sources."chownr-2.0.0" sources."cipher-base-1.0.4" sources."cliui-7.0.4" @@ -115821,7 +116524,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -115840,7 +116543,7 @@ in sources."etag-1.8.1" sources."events-3.3.0" sources."expand-template-2.0.3" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -116086,7 +116789,7 @@ in sources."punycode-2.1.1" sources."pvtsutils-1.3.2" sources."pvutils-1.1.3" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."query-string-6.14.1" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -116400,7 +117103,7 @@ in sources."decamelize-1.2.0" sources."deep-equal-0.2.2" sources."deep-is-0.1.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."delayed-stream-1.0.0" sources."dom-serializer-0.1.1" sources."domelementtype-1.3.1" @@ -116659,7 +117362,7 @@ in sources."decamelize-1.2.0" sources."deep-equal-0.2.2" sources."deep-is-0.1.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."delayed-stream-1.0.0" sources."dom-serializer-0.1.1" sources."domelementtype-1.3.1" @@ -116849,10 +117552,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-5.6.1.tgz"; - sha512 = "gAZxKlQVpYpAvzXMOpc6VfFa6WYZmdD7u6js1u3wu7tOwnwHcSQK+qGOO3/Ky/YP+LbrXuH0BnLj09d+ev9OwA=="; + url = "https://registry.npmjs.org/lerna/-/lerna-5.6.2.tgz"; + sha512 = "Y0yMPslvnBnTZi7Nrs/gDyYZYauNf61xWNCehISHIORxZmmpoluNkcWTfcyb47is5uJQCv5QJX5xKKubbs+a6w=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -116870,39 +117573,39 @@ in sources."@gar/promisify-1.1.3" sources."@hutson/parse-repository-url-3.0.2" sources."@isaacs/string-locale-compare-1.1.0" - sources."@lerna/add-5.6.1" - sources."@lerna/bootstrap-5.6.1" - sources."@lerna/changed-5.6.1" - sources."@lerna/check-working-tree-5.6.1" - sources."@lerna/child-process-5.6.1" - sources."@lerna/clean-5.6.1" - sources."@lerna/cli-5.6.1" - sources."@lerna/collect-uncommitted-5.6.1" - sources."@lerna/collect-updates-5.6.1" - sources."@lerna/command-5.6.1" - sources."@lerna/conventional-commits-5.6.1" - (sources."@lerna/create-5.6.1" // { + sources."@lerna/add-5.6.2" + sources."@lerna/bootstrap-5.6.2" + sources."@lerna/changed-5.6.2" + sources."@lerna/check-working-tree-5.6.2" + sources."@lerna/child-process-5.6.2" + sources."@lerna/clean-5.6.2" + sources."@lerna/cli-5.6.2" + sources."@lerna/collect-uncommitted-5.6.2" + sources."@lerna/collect-updates-5.6.2" + sources."@lerna/command-5.6.2" + sources."@lerna/conventional-commits-5.6.2" + (sources."@lerna/create-5.6.2" // { dependencies = [ sources."builtins-5.0.1" sources."validate-npm-package-name-4.0.0" sources."yargs-parser-20.2.4" ]; }) - sources."@lerna/create-symlink-5.6.1" - sources."@lerna/describe-ref-5.6.1" - sources."@lerna/diff-5.6.1" - sources."@lerna/exec-5.6.1" - sources."@lerna/filter-options-5.6.1" - sources."@lerna/filter-packages-5.6.1" - sources."@lerna/get-npm-exec-opts-5.6.1" - sources."@lerna/get-packed-5.6.1" - sources."@lerna/github-client-5.6.1" - sources."@lerna/gitlab-client-5.6.1" - sources."@lerna/global-options-5.6.1" - sources."@lerna/has-npm-version-5.6.1" - sources."@lerna/import-5.6.1" - sources."@lerna/info-5.6.1" - (sources."@lerna/init-5.6.1" // { + sources."@lerna/create-symlink-5.6.2" + sources."@lerna/describe-ref-5.6.2" + sources."@lerna/diff-5.6.2" + sources."@lerna/exec-5.6.2" + sources."@lerna/filter-options-5.6.2" + sources."@lerna/filter-packages-5.6.2" + sources."@lerna/get-npm-exec-opts-5.6.2" + sources."@lerna/get-packed-5.6.2" + sources."@lerna/github-client-5.6.2" + sources."@lerna/gitlab-client-5.6.2" + sources."@lerna/global-options-5.6.2" + sources."@lerna/has-npm-version-5.6.2" + sources."@lerna/import-5.6.2" + sources."@lerna/info-5.6.2" + (sources."@lerna/init-5.6.2" // { dependencies = [ sources."detect-indent-6.1.0" sources."is-plain-obj-2.1.0" @@ -116913,23 +117616,23 @@ in sources."write-json-file-4.3.0" ]; }) - sources."@lerna/link-5.6.1" - sources."@lerna/list-5.6.1" - sources."@lerna/listable-5.6.1" - sources."@lerna/log-packed-5.6.1" - sources."@lerna/npm-conf-5.6.1" - sources."@lerna/npm-dist-tag-5.6.1" - sources."@lerna/npm-install-5.6.1" - sources."@lerna/npm-publish-5.6.1" - sources."@lerna/npm-run-script-5.6.1" - sources."@lerna/otplease-5.6.1" - sources."@lerna/output-5.6.1" - sources."@lerna/pack-directory-5.6.1" - sources."@lerna/package-5.6.1" - sources."@lerna/package-graph-5.6.1" - sources."@lerna/prerelease-id-from-version-5.6.1" - sources."@lerna/profiler-5.6.1" - (sources."@lerna/project-5.6.1" // { + sources."@lerna/link-5.6.2" + sources."@lerna/list-5.6.2" + sources."@lerna/listable-5.6.2" + sources."@lerna/log-packed-5.6.2" + sources."@lerna/npm-conf-5.6.2" + sources."@lerna/npm-dist-tag-5.6.2" + sources."@lerna/npm-install-5.6.2" + sources."@lerna/npm-publish-5.6.2" + sources."@lerna/npm-run-script-5.6.2" + sources."@lerna/otplease-5.6.2" + sources."@lerna/output-5.6.2" + sources."@lerna/pack-directory-5.6.2" + sources."@lerna/package-5.6.2" + sources."@lerna/package-graph-5.6.2" + sources."@lerna/prerelease-id-from-version-5.6.2" + sources."@lerna/profiler-5.6.2" + (sources."@lerna/project-5.6.2" // { dependencies = [ sources."detect-indent-6.1.0" sources."is-plain-obj-2.1.0" @@ -116940,26 +117643,26 @@ in sources."write-json-file-4.3.0" ]; }) - sources."@lerna/prompt-5.6.1" - sources."@lerna/publish-5.6.1" - sources."@lerna/pulse-till-done-5.6.1" - sources."@lerna/query-graph-5.6.1" - sources."@lerna/resolve-symlink-5.6.1" - sources."@lerna/rimraf-dir-5.6.1" - sources."@lerna/run-5.6.1" - sources."@lerna/run-lifecycle-5.6.1" - sources."@lerna/run-topologically-5.6.1" - sources."@lerna/symlink-binary-5.6.1" - sources."@lerna/symlink-dependencies-5.6.1" - (sources."@lerna/temp-write-5.6.1" // { + sources."@lerna/prompt-5.6.2" + sources."@lerna/publish-5.6.2" + sources."@lerna/pulse-till-done-5.6.2" + sources."@lerna/query-graph-5.6.2" + sources."@lerna/resolve-symlink-5.6.2" + sources."@lerna/rimraf-dir-5.6.2" + sources."@lerna/run-5.6.2" + sources."@lerna/run-lifecycle-5.6.2" + sources."@lerna/run-topologically-5.6.2" + sources."@lerna/symlink-binary-5.6.2" + sources."@lerna/symlink-dependencies-5.6.2" + (sources."@lerna/temp-write-5.6.2" // { dependencies = [ sources."make-dir-3.1.0" sources."semver-6.3.0" ]; }) - sources."@lerna/timer-5.6.1" - sources."@lerna/validation-error-5.6.1" - (sources."@lerna/version-5.6.1" // { + sources."@lerna/timer-5.6.2" + sources."@lerna/validation-error-5.6.2" + (sources."@lerna/version-5.6.2" // { dependencies = [ sources."detect-indent-6.1.0" sources."is-plain-obj-2.1.0" @@ -116973,7 +117676,7 @@ in sources."write-json-file-4.3.0" ]; }) - (sources."@lerna/write-log-file-5.6.1" // { + (sources."@lerna/write-log-file-5.6.2" // { dependencies = [ sources."write-file-atomic-4.0.2" ]; @@ -117041,24 +117744,24 @@ in sources."@swc-node/core-1.9.1" sources."@swc-node/register-1.5.4" sources."@swc-node/sourcemap-support-0.2.2" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - sources."@swc/core-android-arm64-1.3.5" - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - sources."@swc/core-freebsd-x64-1.3.5" - sources."@swc/core-linux-arm-gnueabihf-1.3.5" - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - sources."@swc/core-win32-arm64-msvc-1.3.5" - sources."@swc/core-win32-ia32-msvc-1.3.5" - sources."@swc/core-win32-x64-msvc-1.3.5" + sources."@swc/core-android-arm64-1.3.6" + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + sources."@swc/core-freebsd-x64-1.3.6" + sources."@swc/core-linux-arm-gnueabihf-1.3.6" + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + sources."@swc/core-win32-arm64-msvc-1.3.6" + sources."@swc/core-win32-ia32-msvc-1.3.6" + sources."@swc/core-win32-x64-msvc-1.3.6" sources."@swc/wasm-1.2.130" sources."@tootallnate/once-2.0.0" sources."@types/json5-0.0.29" @@ -117067,7 +117770,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@yarnpkg/lockfile-1.1.0" - (sources."@yarnpkg/parsers-3.0.0-rc.22" // { + (sources."@yarnpkg/parsers-3.0.0-rc.24" // { dependencies = [ sources."argparse-1.0.10" sources."js-yaml-3.14.1" @@ -117186,7 +117889,7 @@ in ]; }) sources."dedent-0.7.0" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."define-lazy-prop-2.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -118210,10 +118913,8 @@ in sources."etag-1.8.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."body-parser-1.20.0" - sources."qs-6.10.3" sources."safe-buffer-5.2.1" ]; }) @@ -119068,13 +119769,13 @@ in src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" (sources."@babel/core-7.0.0" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."@babel/generator-7.19.3" + sources."@babel/generator-7.19.4" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" (sources."@babel/helper-compilation-targets-7.19.3" // { @@ -119102,10 +119803,10 @@ in sources."@babel/helper-plugin-utils-7.19.0" sources."@babel/helper-remap-async-to-generator-7.18.9" sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" (sources."@babel/helper-wrap-function-7.19.0" // { @@ -119113,13 +119814,13 @@ in sources."@babel/template-7.18.10" ]; }) - (sources."@babel/helpers-7.19.0" // { + (sources."@babel/helpers-7.19.4" // { dependencies = [ sources."@babel/template-7.18.10" ]; }) sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/plugin-proposal-async-generator-functions-7.19.1" sources."@babel/plugin-proposal-class-properties-7.0.0" sources."@babel/plugin-proposal-json-strings-7.18.6" @@ -119136,10 +119837,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-block-scoping-7.19.4" sources."@babel/plugin-transform-classes-7.19.0" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.19.4" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -119182,14 +119883,14 @@ in ]; }) sources."@babel/template-7.0.0" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@chemzqm/neovim-5.7.10" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@webassemblyjs/ast-1.7.8" sources."@webassemblyjs/floating-point-hex-parser-1.7.8" sources."@webassemblyjs/helper-api-error-1.7.8" @@ -119412,7 +120113,7 @@ in sources."domain-browser-1.2.0" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -119830,7 +120531,7 @@ in sources."regenerator-runtime-0.13.9" (sources."regenerator-transform-0.15.0" // { dependencies = [ - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" ]; }) sources."regex-not-1.0.2" @@ -120798,7 +121499,7 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."detect-node-2.1.0" sources."emoji-regex-8.0.0" (sources."encoding-0.1.13" // { @@ -121073,7 +121774,7 @@ in sources."jest-mock-27.5.1" (sources."jest-util-27.5.1" // { dependencies = [ - sources."ci-info-3.4.0" + sources."ci-info-3.5.0" ]; }) sources."join-component-1.1.0" @@ -121489,7 +122190,7 @@ in sources."biased-opener-0.2.8" sources."big-integer-1.6.51" sources."block-stream-0.0.9" - sources."body-parser-1.20.0" + sources."body-parser-1.20.1" sources."boom-2.10.1" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" @@ -121532,7 +122233,7 @@ in sources."error-ex-1.3.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.18.1" + sources."express-4.18.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."finalhandler-1.2.0" @@ -121646,7 +122347,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."punycode-1.4.1" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" sources."rc-1.2.8" @@ -121870,7 +122571,7 @@ in sha512 = "B6q576kLw96eKOiqNpNJsUiwl5vRipc46T0w/LUI7O3fPAVxwu5zklIBhE6Iefj8FV1IdbLwXULESqMWlwjlGQ=="; }; dependencies = [ - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."@mapbox/node-pre-gyp-1.0.10" sources."@node-red/editor-api-3.0.2" sources."@node-red/editor-client-3.0.2" @@ -123061,10 +123762,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "16.3.8"; + version = "16.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.3.8.tgz"; - sha512 = "2CUeCWEs+arWQUJH2IEkiZU/Ak2fLBqGkMyM5JDkfnGhz1VHNe3yyGiXD+0JeVmjbXTEpgZ0t6C9VK52atGuAw=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.3.11.tgz"; + sha512 = "MxdqS3kXAJasoEaz5BLqTR1Dak+Dm6PoK2N4KdKcQGUEhdVwt0ggfJ0R0Yym8sWc48CYqEl02HBkUAZFUCufHA=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -123118,7 +123819,7 @@ in sources."camelcase-7.0.0" sources."chalk-5.1.0" sources."chownr-2.0.0" - sources."ci-info-3.4.0" + sources."ci-info-3.5.0" sources."clean-stack-2.2.0" sources."cli-boxes-3.0.0" sources."cli-table-0.3.11" @@ -123541,7 +124242,7 @@ in sources."@asyncapi/specs-3.2.1" sources."@esbuild/android-arm-0.15.10" sources."@esbuild/linux-loong64-0.15.10" - sources."@exodus/schemasafe-1.0.0-rc.7" + sources."@exodus/schemasafe-1.0.0-rc.9" sources."@ibm-cloud/openapi-ruleset-0.37.3" sources."@jsdevtools/ono-7.1.3" sources."@jsep-plugin/regex-1.0.3" @@ -123663,7 +124364,7 @@ in sources."debug-4.3.4" sources."deep-is-0.1.4" sources."deepmerge-2.2.1" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."define-properties-1.1.4" (sources."degenerator-3.0.2" // { dependencies = [ @@ -123878,7 +124579,7 @@ in sources."onetime-5.1.2" sources."ono-4.0.11" sources."openapi-types-12.0.2" - sources."openapi3-ts-3.1.0" + sources."openapi3-ts-3.1.1" sources."optionator-0.8.3" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" @@ -124031,14 +124732,14 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" (sources."@babel/core-7.19.3" // { dependencies = [ sources."json5-2.2.1" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -124068,16 +124769,16 @@ in sources."@babel/helper-plugin-utils-7.19.0" sources."@babel/helper-remap-async-to-generator-7.18.9" sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.19.1" @@ -124089,7 +124790,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-object-rest-spread-7.19.4" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" @@ -124115,10 +124816,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-block-scoping-7.19.4" sources."@babel/plugin-transform-classes-7.19.0" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.19.4" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -124146,16 +124847,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.18.9" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.19.3" // { + (sources."@babel/preset-env-7.19.4" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -124166,7 +124867,7 @@ in ]; }) sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -124370,7 +125071,7 @@ in sources."debug-4.3.4" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.4" - (sources."defaults-1.0.3" // { + (sources."defaults-1.0.4" // { dependencies = [ sources."clone-1.0.4" ]; @@ -124421,7 +125122,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -125085,7 +125786,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@lezer/common-0.15.12" sources."@lezer/lr-0.15.8" sources."@lmdb/lmdb-darwin-arm64-2.5.2" @@ -125169,11 +125870,11 @@ in ]; }) sources."@parcel/workers-2.7.0" - sources."@swc/helpers-0.4.11" + sources."@swc/helpers-0.4.12" sources."@trysound/sax-0.2.0" sources."@types/parse-json-4.0.0" sources."abab-2.0.6" - sources."abortcontroller-polyfill-1.7.3" + sources."abortcontroller-polyfill-1.7.5" sources."acorn-8.8.0" (sources."acorn-globals-4.3.4" // { dependencies = [ @@ -125249,7 +125950,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -125499,7 +126200,7 @@ in sources."bintrees-1.0.2" sources."bl-1.2.3" sources."bluebird-3.7.2" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."bytes-3.1.2" sources."content-type-1.0.4" @@ -125553,7 +126254,7 @@ in sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."content-type-1.0.4" sources."safe-buffer-5.2.1" @@ -125659,7 +126360,7 @@ in sources."prr-1.0.1" sources."psl-1.9.0" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { dependencies = [ @@ -126271,10 +126972,8 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."events-3.3.0" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."body-parser-1.20.0" - sources."qs-6.10.3" sources."safe-buffer-5.2.1" ]; }) @@ -126561,7 +127260,7 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -127061,45 +127760,45 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -127350,9 +128049,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" sources."@babel/core-7.19.3" - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -127363,24 +128062,24 @@ in sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" sources."@babel/helper-module-transforms-7.19.0" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@prisma/prisma-fmt-wasm-4.4.0-66.f352a33b70356f46311da8b00d83386dd9f145d6" sources."@types/js-levenshtein-1.1.1" sources."aggregate-error-3.1.0" @@ -127407,7 +128106,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -128404,13 +129103,13 @@ in sources."@ampproject/remapping-2.2.0" sources."@babel/cli-7.19.3" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" (sources."@babel/core-7.19.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -128440,16 +129139,16 @@ in sources."@babel/helper-plugin-utils-7.19.0" sources."@babel/helper-remap-async-to-generator-7.18.9" sources."@babel/helper-replace-supers-7.19.1" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.19.0" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.19.1" @@ -128462,7 +129161,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" - sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-object-rest-spread-7.19.4" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.18.9" sources."@babel/plugin-proposal-private-methods-7.18.6" @@ -128488,10 +129187,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.18.6" sources."@babel/plugin-transform-async-to-generator-7.18.6" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-block-scoping-7.19.4" sources."@babel/plugin-transform-classes-7.19.0" sources."@babel/plugin-transform-computed-properties-7.18.9" - sources."@babel/plugin-transform-destructuring-7.18.13" + sources."@babel/plugin-transform-destructuring-7.19.4" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -128526,7 +129225,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.18.9" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.19.3" // { + (sources."@babel/preset-env-7.19.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -128535,15 +129234,15 @@ in sources."@babel/preset-react-7.18.6" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.18.9" - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.2.0" @@ -128679,7 +129378,7 @@ in sources."blob-0.0.5" sources."bluebird-3.7.2" sources."bn.js-5.2.1" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."bytes-3.1.2" sources."debug-2.6.9" @@ -128965,7 +129664,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -129037,7 +129736,7 @@ in sources."ms-2.0.0" ]; }) - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."cookie-0.5.0" sources."debug-2.6.9" @@ -129659,7 +130358,7 @@ in sources."pumpify-1.5.1" sources."punycode-2.1.1" sources."q-1.5.1" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."query-string-5.1.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -130427,32 +131126,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.19.3" + sources."@babel/generator-7.19.4" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" - sources."@babel/runtime-7.19.0" + sources."@babel/parser-7.19.4" + sources."@babel/runtime-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" sources."@emotion/is-prop-valid-1.2.0" sources."@emotion/memoize-0.8.0" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" - sources."@exodus/schemasafe-1.0.0-rc.7" + sources."@exodus/schemasafe-1.0.0-rc.9" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@redocly/ajv-8.11.0" sources."@redocly/openapi-core-1.0.0-beta.110" sources."@sindresorhus/is-0.14.0" @@ -130600,7 +131299,7 @@ in sources."dompurify-2.4.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.5" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -131450,10 +132149,9 @@ in version = "0.3.1059"; src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps; dependencies = [ - sources."@eslint/eslintrc-1.3.2" + sources."@eslint/eslintrc-1.3.3" sources."@hpcc-js/wasm-1.16.1" sources."@humanwhocodes/config-array-0.10.7" - sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@nodelib/fs.scandir-2.1.5" @@ -131588,7 +132286,7 @@ in sources."entities-4.4.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.24.0" // { + (sources."eslint-8.25.0" // { dependencies = [ sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" @@ -132242,7 +132940,7 @@ in sources."child-process-ext-2.1.1" sources."chokidar-3.5.3" sources."chownr-2.0.0" - sources."ci-info-3.4.0" + sources."ci-info-3.5.0" sources."cli-color-2.0.3" sources."cli-cursor-3.1.0" sources."cli-progress-footer-2.3.2" @@ -132328,7 +133026,7 @@ in sources."get-stream-2.3.1" ]; }) - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."deferred-0.7.11" sources."define-properties-1.1.4" @@ -132710,7 +133408,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.2" - sources."body-parser-1.20.0" + sources."body-parser-1.20.1" sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."callsite-1.0.0" @@ -132759,7 +133457,7 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."event-stream-3.3.5" - sources."express-4.18.1" + sources."express-4.18.2" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -132833,7 +133531,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" sources."read-1.0.7" @@ -133318,10 +134016,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.1025.0"; + version = "1.1026.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1025.0.tgz"; - sha512 = "IfEl2BbNjEHEtOImDa3xqKetUwjqSpRcRIsdAKD8cjnk0z2nbn8K6h6qlvnGuci68t2q62Zj3IHZt4S6A4k+gw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.1026.0.tgz"; + sha512 = "sijn2PlTw8hJb41KxZxJO+/eFAAZPnr1VQ8AAjwH7QeGJsC3qVJCu3gtqr/11cM7JACWfs3pa7D++KDnFVd9oQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -133422,7 +134120,7 @@ in sources."map-obj-1.0.1" ]; }) - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."draftlog-1.0.13" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" @@ -134780,12 +135478,11 @@ in sources."cross-spawn-6.0.5" ]; }) - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."body-parser-1.20.0" sources."cookie-0.5.0" sources."proxy-addr-2.0.7" - sources."qs-6.10.3" + sources."qs-6.11.0" ]; }) (sources."express-validator-2.21.0" // { @@ -135789,9 +136486,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" sources."@babel/core-7.19.3" - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -135802,17 +136499,17 @@ in sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" sources."@babel/helper-module-transforms-7.19.0" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -135822,49 +136519,49 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -135907,7 +136604,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" @@ -136068,17 +136765,17 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.36"; + version = "0.14.37"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.36.tgz"; - sha512 = "BJ56yXvuUgRcuvq/BkdbSeNHAapBVe+OwXvQLdLhUvNcKOGMbfDnXbbw7OZvrrH+w/tmXIOi3Hi+QIaGkH8nIg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.37.tgz"; + sha512 = "gTCIYsI8MasoH0DkvIj3ixGZRglTb89SxMWehoqKJMW5SF4WXcCJyLUGfX71TTUcZqZzMu9k9PlddpkdFK2AzA=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.19.3" + sources."@babel/compat-data-7.19.4" sources."@babel/core-7.19.3" - (sources."@babel/generator-7.19.3" // { + (sources."@babel/generator-7.19.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -136089,17 +136786,17 @@ in sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-module-imports-7.18.6" sources."@babel/helper-module-transforms-7.19.0" - sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-simple-access-7.19.4" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.19.0" + sources."@babel/helpers-7.19.4" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.19.3" + sources."@babel/parser-7.19.4" sources."@babel/template-7.18.10" - sources."@babel/traverse-7.19.3" - sources."@babel/types-7.19.3" + sources."@babel/traverse-7.19.4" + sources."@babel/types-7.19.4" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -136112,49 +136809,49 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -136197,7 +136894,7 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."emmet-2.3.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" @@ -136284,7 +136981,7 @@ in sources."postcss-8.4.17" sources."postcss-load-config-4.0.1" sources."prettier-2.7.1" - sources."prettier-plugin-svelte-2.7.1" + sources."prettier-plugin-svelte-2.8.0" sources."promise-7.3.1" sources."prr-1.0.1" sources."pug-3.0.2" @@ -136335,7 +137032,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.50.1" sources."svelte-preprocess-4.10.7" - sources."svelte2tsx-0.5.19" + sources."svelte2tsx-0.5.20" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" @@ -137095,45 +137792,45 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -137568,7 +138265,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."acorn-8.8.0" sources."buffer-from-1.1.2" sources."commander-2.20.3" @@ -138835,9 +139532,9 @@ in sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ - sources."@babel/runtime-7.19.0" - sources."@babel/runtime-corejs3-7.19.1" - (sources."@eslint/eslintrc-1.3.2" // { + sources."@babel/runtime-7.19.4" + sources."@babel/runtime-corejs3-7.19.4" + (sources."@eslint/eslintrc-1.3.3" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -138849,7 +139546,6 @@ in sources."ms-2.1.2" ]; }) - sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@nodelib/fs.scandir-2.1.5" @@ -138899,7 +139595,7 @@ in sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.24.0" // { + (sources."eslint-8.25.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -138920,7 +139616,7 @@ in }) sources."eslint-plugin-import-2.26.0" sources."eslint-plugin-jsx-a11y-6.6.1" - (sources."eslint-plugin-react-7.31.8" // { + (sources."eslint-plugin-react-7.31.9" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; @@ -142395,45 +143091,45 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.5" - (sources."@swc/core-android-arm-eabi-1.3.5" // { + sources."@swc/core-1.3.6" + (sources."@swc/core-android-arm-eabi-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.122" ]; }) - (sources."@swc/core-android-arm64-1.3.5" // { + (sources."@swc/core-android-arm64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-darwin-arm64-1.3.5" - sources."@swc/core-darwin-x64-1.3.5" - (sources."@swc/core-freebsd-x64-1.3.5" // { + sources."@swc/core-darwin-arm64-1.3.6" + sources."@swc/core-darwin-x64-1.3.6" + (sources."@swc/core-freebsd-x64-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-linux-arm-gnueabihf-1.3.5" // { + (sources."@swc/core-linux-arm-gnueabihf-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-linux-arm64-gnu-1.3.5" - sources."@swc/core-linux-arm64-musl-1.3.5" - sources."@swc/core-linux-x64-gnu-1.3.5" - sources."@swc/core-linux-x64-musl-1.3.5" - (sources."@swc/core-win32-arm64-msvc-1.3.5" // { + sources."@swc/core-linux-arm64-gnu-1.3.6" + sources."@swc/core-linux-arm64-musl-1.3.6" + sources."@swc/core-linux-x64-gnu-1.3.6" + sources."@swc/core-linux-x64-musl-1.3.6" + (sources."@swc/core-win32-arm64-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - (sources."@swc/core-win32-ia32-msvc-1.3.5" // { + (sources."@swc/core-win32-ia32-msvc-1.3.6" // { dependencies = [ sources."@swc/wasm-1.2.130" ]; }) - sources."@swc/core-win32-x64-msvc-1.3.5" - sources."@swc/wasm-1.3.5" + sources."@swc/core-win32-x64-msvc-1.3.6" + sources."@swc/wasm-1.3.6" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -142501,10 +143197,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-2.0.0.tgz"; - sha512 = "wBV3iSt2498Wl6wMozCRDyPrL0KsFtthvYqVZ3JFRyreBGlxEe3bfK2bnLSwtRwYAZuO9n1roi/NNn94rT5Y+w=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-2.0.1.tgz"; + sha512 = "UdXkgnP3UkZvQ4v6ma0mxSZ18m9WP6EuFt2nzlCCSCU+fw65J/Wis36Fwp5yBw9JhqAwlH9deFfq9xl2l/J5IQ=="; }; dependencies = [ sources."commander-9.4.1" @@ -142760,11 +143456,9 @@ in sources."eve-0.5.4" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ - sources."body-parser-1.20.0" sources."cookie-0.5.0" - sources."qs-6.10.3" ]; }) (sources."express-session-1.17.3" // { @@ -144686,7 +145380,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" sources."define-property-2.0.2" sources."diff-4.0.2" @@ -145446,7 +146140,7 @@ in sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.19.1" + sources."@babel/runtime-corejs3-7.19.4" sources."@mapbox/node-pre-gyp-1.0.10" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -145671,7 +146365,7 @@ in sources."@devicefarmer/adbkit-3.2.3" sources."@devicefarmer/adbkit-logcat-2.1.2" sources."@devicefarmer/adbkit-monkey-1.2.1" - (sources."@eslint/eslintrc-1.3.2" // { + (sources."@eslint/eslintrc-1.3.3" // { dependencies = [ sources."ajv-6.12.6" sources."espree-9.4.0" @@ -145781,7 +146475,7 @@ in sources."escape-string-regexp-4.0.0" ]; }) - sources."ci-info-3.4.0" + sources."ci-info-3.5.0" sources."cli-boxes-3.0.0" (sources."cliui-7.0.4" // { dependencies = [ @@ -145861,7 +146555,7 @@ in sources."deep-is-0.1.4" sources."deepcopy-2.1.0" sources."deepmerge-4.2.2" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" @@ -146487,7 +147181,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@types/eslint-8.4.6" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" @@ -146519,7 +147213,7 @@ in sources."caniuse-lite-1.0.30001418" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."enhanced-resolve-5.10.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -146588,7 +147282,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@types/eslint-8.4.6" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" @@ -146626,7 +147320,7 @@ in sources."colorette-2.0.19" sources."commander-7.2.0" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."enhanced-resolve-5.10.0" sources."envinfo-7.8.1" sources."es-module-lexer-0.9.3" @@ -146730,7 +147424,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@leichtgewicht/ip-codec-2.0.4" sources."@types/body-parser-1.19.2" sources."@types/bonjour-3.5.10" @@ -146781,7 +147475,7 @@ in sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" - (sources."body-parser-1.20.0" // { + (sources."body-parser-1.20.1" // { dependencies = [ sources."bytes-3.1.2" ]; @@ -146822,7 +147516,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.4.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.10.0" sources."es-module-lexer-0.9.3" @@ -146839,7 +147533,7 @@ in sources."eventemitter3-4.0.7" sources."events-3.3.0" sources."execa-5.1.1" - (sources."express-4.18.1" // { + (sources."express-4.18.2" // { dependencies = [ sources."array-flatten-1.1.1" sources."safe-buffer-5.2.1" @@ -146939,7 +147633,7 @@ in ]; }) sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { @@ -147062,7 +147756,7 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" - sources."@jridgewell/trace-mapping-0.3.15" + sources."@jridgewell/trace-mapping-0.3.16" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -147100,7 +147794,7 @@ in sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.275" + sources."electron-to-chromium-1.4.276" sources."enhanced-resolve-5.10.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -147227,7 +147921,7 @@ in sources."bep53-range-1.1.1" sources."binary-search-1.3.6" sources."bitfield-4.1.0" - (sources."bittorrent-dht-10.0.4" // { + (sources."bittorrent-dht-10.0.6" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -147311,7 +148005,7 @@ in sources."create-torrent-5.0.6" sources."debug-2.6.9" sources."decompress-response-3.3.0" - sources."defaults-1.0.3" + sources."defaults-1.0.4" sources."define-lazy-prop-2.0.0" (sources."dlnacasts-0.1.0" // { dependencies = [ @@ -147520,7 +148214,7 @@ in sources."timeout-refresh-1.0.3" sources."tmp-0.0.33" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.13" // { + (sources."torrent-discovery-9.4.14" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -147549,7 +148243,7 @@ in sources."videostream-3.2.2" sources."vlc-command-1.2.0" sources."wcwidth-1.0.1" - (sources."webtorrent-1.8.30" // { + (sources."webtorrent-1.8.32" // { dependencies = [ sources."debug-4.3.4" sources."decompress-response-6.0.0" @@ -147661,10 +148355,10 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "2.1.10"; + version = "2.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-2.1.10.tgz"; - sha512 = "hiaTNvkKw8axZljxHOjtDXIVo4GOrDclyxr0cF2aypzAwtrGlaYWD+WP0Z66BqRLpUpbF3BdzrPn1k+xGp0u+Q=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-2.1.11.tgz"; + sha512 = "zXydDzU+KKOwYDD9IX+XdSZMFEPWTghzTN/CiZc+pxHGIjTuQBtbk97trY3i9YKeih/QOSlo+H7Clfoq+6rZLw=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" @@ -147848,9 +148542,9 @@ in sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; dependencies = [ - sources."@babel/runtime-7.19.0" - sources."@babel/runtime-corejs3-7.19.1" - (sources."@eslint/eslintrc-1.3.2" // { + sources."@babel/runtime-7.19.4" + sources."@babel/runtime-corejs3-7.19.4" + (sources."@eslint/eslintrc-1.3.3" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -147862,7 +148556,6 @@ in sources."ms-2.1.2" ]; }) - sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" sources."@nodelib/fs.scandir-2.1.5" @@ -147908,7 +148601,7 @@ in sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.24.0" // { + (sources."eslint-8.25.0" // { dependencies = [ sources."debug-4.3.4" sources."doctrine-3.0.0" @@ -147929,7 +148622,7 @@ in }) sources."eslint-plugin-import-2.26.0" sources."eslint-plugin-jsx-a11y-6.6.1" - (sources."eslint-plugin-react-7.31.8" // { + (sources."eslint-plugin-react-7.31.9" // { dependencies = [ sources."resolve-2.0.0-next.4" ]; @@ -148237,7 +148930,7 @@ in sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ - sources."@babel/runtime-7.19.0" + sources."@babel/runtime-7.19.4" sources."@gar/promisify-1.1.3" sources."@isaacs/string-locale-compare-1.1.0" sources."@nodelib/fs.scandir-2.1.5" @@ -148419,7 +149112,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."default-uid-1.0.0" - (sources."defaults-1.0.3" // { + (sources."defaults-1.0.4" // { dependencies = [ sources."clone-1.0.4" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix deleted file mode 100644 index 47f48c89be792..0000000000000 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview, camlp4 }: - -if lib.versionAtLeast ocaml.version "4.04" -then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else - -let - pname = "lablgtk"; -in - -stdenv.mkDerivation (rec { - name = "${pname}-${version}"; - version = "2.14.0"; - - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz"; - sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; - }; - - nativeBuildInputs = [ pkg-config ocaml findlib camlp4 ]; - buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; - - configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; - buildFlags = [ "world" ]; - - preInstall = '' - mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib - export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH - ''; - - meta = { - branch = "2.14"; - inherit (ocaml.meta) platforms; - maintainers = [ - lib.maintainers.maggesi - lib.maintainers.roconnor - ]; - homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html"; - description = "LablGTK is is an Objective Caml interface to GTK"; - license = lib.licenses.lgpl21Plus; - }; -}) diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index 34989fdf14db5..1a56ed70401a9 100644 --- a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix @@ -1,19 +1,19 @@ -{ lib, fetchurl, buildDunePackage, cstruct-lwt, diet, io-page, logs +{ lib, fetchurl, buildDunePackage, cstruct-lwt, diet, logs , mirage-block, ounit2, rresult, uri }: buildDunePackage rec { pname = "mirage-block-unix"; - version = "2.14.1"; + version = "2.14.2"; src = fetchurl { url = "https://github.com/mirage/mirage-block-unix/releases/download/v${version}/mirage-block-unix-${version}.tbz"; - sha256 = "sha256-FcUhbjHKT11ePDXaAVzUdV/WOHoxMoXyZKG5ikKpBNU="; + sha256 = "sha256-6ReAzd+pCd5ccmXOh6GlSxHo4GuEgptxLha62n+dBsE="; }; - minimalOCamlVersion = "4.06"; + minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ cstruct-lwt io-page logs mirage-block rresult uri ]; + propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ]; doCheck = true; checkInputs = [ diet ounit2 ]; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index b7940b64032cc..0ead92d9c54b6 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "uuidm is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { version = "0.9.8"; pname = "uuidm"; diff --git a/pkgs/development/octave-modules/signal/default.nix b/pkgs/development/octave-modules/signal/default.nix index ae1339ca274a4..b879b9f313a8e 100644 --- a/pkgs/development/octave-modules/signal/default.nix +++ b/pkgs/development/octave-modules/signal/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "signal"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1amfh7ifjqxz2kr34hgq2mq8ygmd5j3cjdk1k2dk6qcgic7n0y6r"; + sha256 = "YqTgYRfcxDw2FpkF+CVdAVSBypgq6ukBOw2d8+SOcGI="; }; requiredOctavePackages = [ diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index aab86edbf7f5a..d87626e7b5304 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.31.0"; + version = "3.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-gXANW2nXoOVv8bZearpgQRhFAgyErUIgoJ4isnmgnnU="; + hash = "sha256-MbrRf7kcPNYb1i+5cSkCvO9SJbvrPAeKGWxtfi1FmaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 6fdc8b2dd4f27..2c19b714c957f 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-LIqazN7U0pRt9yUsnb5vM6ZOtQOstkwanNr7FufHyUo="; + hash = "sha256-mCShbfpIsbIxFs/YDJY21Cvorn6sAB4f+s5zops8MAc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix index 33a2201dffaa1..342a2fc978f3b 100644 --- a/pkgs/development/python-modules/aioairq/default.nix +++ b/pkgs/development/python-modules/aioairq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairq"; - version = "0.2.0"; + version = "0.2.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CorantGmbH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qPpa6eo33IPCHSv3LFQXpRzomfrbAMqHlRi+IdoxHEc="; + hash = "sha256-+5FyBfsB3kjyX/V9CdZ072mZ3THyvALyym+uk7/kZLo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index 1ad6c354a7fe7..a0b62f5f90108 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "0.2.1"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "v${version}"; - hash = "sha256-jZBs1h+01Mbwpvy3hg5/DEIU5EPKW4P/iMqp4eb4EpM="; + hash = "sha256-goS+BLIeFJ2fXQ2srbhKRfEjsMFX3+eA7iWzpBWMqZQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiocsv/default.nix b/pkgs/development/python-modules/aiocsv/default.nix new file mode 100644 index 0000000000000..6a4340e5c5410 --- /dev/null +++ b/pkgs/development/python-modules/aiocsv/default.nix @@ -0,0 +1,54 @@ +{ lib +, aiofiles +, buildPythonPackage +, cython +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiocsv"; + version = "1.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "MKuranowski"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-lh+yHyHU+XrK4nk1xxrxgF5zGH7lP9jHdJ+m9ncfprw="; + }; + + nativeBuildInputs = [ + cython + ]; + + checkInputs = [ + aiofiles + pytest-asyncio + pytestCheckHook + ]; + + preBuild = '' + export CYTHONIZE=1 + ''; + + pythonImportsCheck = [ + "aiocsv" + ]; + + disabledTestPaths = [ + # Import issue + "tests/test_parser.py" + ]; + + meta = with lib; { + description = "Library for for asynchronous CSV reading/writing"; + homepage = "https://github.com/MKuranowski/aiocsv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 8f0ef50e7fd09..df7575de04842 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.21.3"; + version = "0.21.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xtrlCzqgfwlbLZOoN9Y23ZPyNaqv5Ure+Cvg+OVWf9I="; + sha256 = "sha256-KLsm1GFsfDgaFUMoH5hwUbjS0dW/rwI9nn4sIQXFG7k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index d4c85b2d50cad..4d0edf652085a 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yuZKgDbdxQ7pGGLVB1/B3cD3Ep08uE9jjCqVzc+DF3c="; + hash = "sha256-pZEZHhsU/1tEX1VOFQ8b+ERJ8tU1pzRJMRYD28nfTb0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 5af0c0b63cdcf..561cbe5ddac9a 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtv"; - version = "0.0.68"; + version = "0.0.69"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - hash = "sha256-cRupsdHpzzxV57ZsuWqZBvtbMYWwXFSVLqsNJ7kfpPA="; + hash = "sha256-GfwXYugDrxOe9ekC1M7mi0BuqmohHdgZVTO4J8+B5iI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index cc88392d53c86..c9d0b436bbb8b 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-DOH1yRdWpKpYEjcnQInYU3g2HRm3wj3y8W7Kyuz4i2M="; + hash = "sha256-hkFWZHEdIXOQm14t05eyOqFTtWdXdgrQLjh+iVdKiCw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix index 9c4cfcc93a38c..964a008412911 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.21"; + version = "2.0.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WObnE5/xOtbX0c3VjVQbec2TDSDKoUe68GFax7dt7WY="; + hash = "sha256-RFyQvg7CF5Fa+DnOo0PoDtGPJMOx0Md8I+gshMH2Fvs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 46522ea9d6a93..a2f58dba048c0 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.8.1"; + version = "6.8.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-E/ci0+AyOwzjoQc1jA4eIWnbWpO2j/zyDhAwu6Fv1w0="; + sha256 = "sha256-F9+ssNkTmkNczyCVI04gSR1Vb3rbl97diRtAVm4xZVM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index f900854317185..bd435fc617e6a 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.3.0"; + version = "6.5.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-1fqfwVqNRcjVJHqWRbC0j5ldc1sSxNplVmbUhQYnNSY="; + sha256 = "sha256-fAzc0RIaXxKrLaS90uFMLBU+ASFL/GprwVa2G9dAHFs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index f9e2f177a88a8..bc6b62dae8c34 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "aocd"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "wimglenn"; repo = "advent-of-code-data"; rev = "refs/tags/v${version}"; - sha256 = "sha256-3Cs9tiyWXtyeDXf4FK4gXokCZgtxv4Z5jmSv47t04ag="; + sha256 = "sha256-V6byleGCgXc2xfceb+aO0sYwGD6uThE6/8s5NDEjerw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 8119ac5cdb442..c4c492009a968 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-29KWlXZ4KrDq4CmTeF6z1CDVDgnO2JyxOdOi5bhl1nI="; + hash = "sha256-fqGz8+ZKmeBuwbjxFofspKSMdyG0NLVj+Jq+VPK2A90="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index bb517f7ff8ce5..7f09c490cb9fb 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "21.0.1"; + version = "22.0.0"; pname = "azure-mgmt-network"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8="; + hash = "sha256-qXWmZuiYA6BwFP/uydPi8mV68WlXrJlwP9eiTk+q1Ak="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 8ac4330b45a80..4988406ac968b 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "21.1.0"; + version = "21.2.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-UpZa3jHNBZ/qKxUT1l/mFgRuQz3g5YPc9cnJvr8+vWk="; + sha256 = "sha256-v4pd5sTate/H8NGND1cWXe5SMepS0j0Q2C5Ee4wqGlQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 8bef6cf2148e7..c2f3c1f7915f5 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -1,21 +1,38 @@ { lib , buildPythonPackage -, python, runCommand +, python +, runCommand , fetchFromGitHub -, configargparse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface -, dialog, gnureadline -, pytest-xdist, pytestCheckHook, python-dateutil +, configargparse +, acme +, configobj +, cryptography +, distro +, josepy +, parsedatetime +, pyRFC3339 +, pyopenssl +, pytz +, requests +, six +, zope_component +, zope_interface +, dialog +, gnureadline +, pytest-xdist +, pytestCheckHook +, python-dateutil }: buildPythonPackage rec { pname = "certbot"; - version = "1.29.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-DFdXDFSqqkm4r59Kmd1wxcg2YePP3dI9squiW+iSmaU="; + sha256 = "sha256-JDhesUU6SQBEf0CG3vo1AhlRfGpltTEUmSqrpGIpptg="; }; sourceRoot = "source/${pname}"; @@ -59,15 +76,17 @@ buildPythonPackage rec { # certbot.withPlugins has a similar calling convention as python*.withPackages # it gets invoked with a lambda, and invokes that lambda with the python package set matching certbot's: # certbot.withPlugins (cp: [ cp.certbot-dns-foo ]) - passthru.withPlugins = f: let - pythonEnv = python.withPackages f; + passthru.withPlugins = f: + let + pythonEnv = python.withPackages f; - in runCommand "certbot-with-plugins" { - } '' - mkdir -p $out/bin - cd $out/bin - ln -s ${pythonEnv}/bin/certbot - ''; + in + runCommand "certbot-with-plugins" + { } '' + mkdir -p $out/bin + cd $out/bin + ln -s ${pythonEnv}/bin/certbot + ''; meta = with lib; { homepage = src.meta.homepage; diff --git a/pkgs/development/python-modules/cirq-aqt/default.nix b/pkgs/development/python-modules/cirq-aqt/default.nix index a240ce47d7e5f..4357abe0ac8f9 100644 --- a/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/pkgs/development/python-modules/cirq-aqt/default.nix @@ -26,4 +26,9 @@ buildPythonPackage rec { # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_aqt" ]; + + disabledTestPaths = [ + # No need to test the version number + "cirq_aqt/_version_test.py" + ]; } diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 6684037b35685..e9328079b717b 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -31,15 +31,16 @@ buildPythonPackage rec { pname = "cirq-core"; - version = "0.15.0"; + version = "1.0.0"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "quantumlib"; repo = "cirq"; rev = "v${version}"; - sha256 = "sha256-E36zXpv+9WBNYvv/shItS7Q34gYqUyADlqWd+m4Jpps="; + hash = "sha256-KJ+z4zGrdGIXcGZzqHtWMf8aAzcn9CtltFawcHVldMQ="; }; sourceRoot = "source/${pname}"; @@ -48,8 +49,7 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace "matplotlib~=3.0" "matplotlib" \ --replace "networkx~=2.4" "networkx" \ - --replace "numpy~=1.16" "numpy" \ - --replace "sympy<1.10" "sympy" + --replace "numpy~=1.16" "numpy" ''; propagatedBuildInputs = [ @@ -80,20 +80,25 @@ buildPythonPackage rec { ]; disabledTestPaths = lib.optionals (!withContribRequires) [ - # requires external (unpackaged) libraries, so untested. + # Requires external (unpackaged) libraries, so untested "cirq/contrib/" + # No need to test the version number + "cirq/_version_test.py" ]; + disabledTests = [ - "test_metadata_search_path" # tries to import flynt, which isn't in Nixpkgs - "test_benchmark_2q_xeb_fidelities" # fails due pandas MultiIndex. Maybe issue with pandas version in nix? + # Tries to import flynt, which isn't in Nixpkgs + "test_metadata_search_path" + # Fails due pandas MultiIndex. Maybe issue with pandas version in nix? + "test_benchmark_2q_xeb_fidelities" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits"; homepage = "https://github.com/quantumlib/cirq"; changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger fab ]; + broken = (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index 4aa20a237110e..ebd420244e4b2 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -2,7 +2,6 @@ , cirq-core , google-api-core , protobuf -# test inputs , pytestCheckHook , freezegun }: @@ -15,7 +14,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" + --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" \ + --replace "protobuf >= 3.15.0, < 4" "protobuf >= 3.15.0" ''; propagatedBuildInputs = [ @@ -29,9 +29,15 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # No need to test the version number + "cirq_google/_version_test.py" + ]; + disabledTests = [ # unittest.mock.InvalidSpecError: Cannot autospec attr 'QuantumEngineServiceClient' "test_get_engine_sampler_explicit_project_id" "test_get_engine_sampler" ]; + } diff --git a/pkgs/development/python-modules/cirq-ionq/default.nix b/pkgs/development/python-modules/cirq-ionq/default.nix index 24ced1859580a..78f52de89a8d6 100644 --- a/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/pkgs/development/python-modules/cirq-ionq/default.nix @@ -26,4 +26,9 @@ buildPythonPackage rec { # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_ionq" ]; + + disabledTestPaths = [ + # No need to test the version number + "cirq_ionq/_version_test.py" + ]; } diff --git a/pkgs/development/python-modules/cirq-pasqal/default.nix b/pkgs/development/python-modules/cirq-pasqal/default.nix index 0743ee02dc743..3fe2e52f7db50 100644 --- a/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -26,4 +26,9 @@ buildPythonPackage rec { # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_pasqal" ]; + + disabledTestPaths = [ + # No need to test the version number + "cirq_pasqal/_version_test.py" + ]; } diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index f33ce69fc550f..2345c7ce4d0cd 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -75,6 +75,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # No need to test the version number + "cirq_rigetti/_version_test.py" + ]; + # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_rigetti" ]; } diff --git a/pkgs/development/python-modules/cirq-web/default.nix b/pkgs/development/python-modules/cirq-web/default.nix index aa61157fe0d77..5531716fc64c7 100644 --- a/pkgs/development/python-modules/cirq-web/default.nix +++ b/pkgs/development/python-modules/cirq-web/default.nix @@ -19,4 +19,9 @@ buildPythonPackage rec { # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_web" ]; + + disabledTestPaths = [ + # No need to test the version number + "cirq_web/_version_test.py" + ]; } diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 60f46431bf9b1..992fb0fbc835f 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-4Ql1oYWNxoDKwl6IOrJQ5uMepqtRqrY2cmjsa3w0h9E="; + hash = "sha256-ToRQB3JUZrCuuVMF5IK6zBwYpABQrXsBK3WIc/+E+uM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 417e8becf36eb..625eab88d76c2 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.21"; + version = "9.2.22"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-pVatQJMDocP6RWzCzgyJ1vzmqfdEVYjVFW9m+rS1IoI="; + hash = "sha256-Ppxpptgx91kyCiVrpEUa9ZxZLN9rCLnGB/nl1Fj/gDQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 15f0249fd801f..02b6c6fccda71 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cli_helpers"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DMwc/Noaxk3H7YPXATBVzxnll50p5Wwh87aS3gFVWq4="; + sha256 = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index aabd0cd414319..37f557271540f 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.5.2"; + version = "2.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-C+REl68BZKP3NwkSmBQ/Xs8/sMGNT4bjXa8Jkk/C0Uw="; + hash = "sha256-5j8HT/DzHH8xssv97g/9kpSgtpaY6daWOGwjasD1psg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index 9412e29fe5a77..ad5f56368f1f4 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.47"; + version = "0.1.48"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-UeICgjd3o9cWqEO4pUD7oroL7Z9QeofAwPnu/N7DNCw="; + hash = "sha256-YtUFR9BqVjjOHF6A19cB3fFpY7QHr89b3IPH3k25T3w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index a60d4ae45a4ee..342b073872485 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.4.0"; + version = "3.4.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-lOXoiWY6gyWBL4RLrvslqcMmwtjMTOaHJZzsDO+C/F4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cqPLnahs3fT6AfQQkS5azh4/cHzaexytg78RsJG5c6U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index 95140e82d0d2a..1949fb6714f84 100644 --- a/pkgs/development/python-modules/dinghy/default.nix +++ b/pkgs/development/python-modules/dinghy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , aiofiles , aiohttp , click-log @@ -13,14 +14,16 @@ buildPythonPackage rec { pname = "dinghy"; - version = "0.13.2"; + version = "0.13.4"; format = "setuptools"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "nedbat"; repo = pname; rev = version; - sha256 = "sha256-uRiWcrs3xIb6zxNg0d6/+NCqnEgadHSTLpS53CoZ5so="; + hash = "sha256-H3AFKKtSiFD3LqyWaIYB4LncPaH2/eptuKS4BN0cNBQ="; }; propagatedBuildInputs = [ @@ -33,9 +36,13 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "dinghy.cli" ]; + pythonImportsCheck = [ + "dinghy.cli" + ]; meta = with lib; { description = "A GitHub activity digest tool"; diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 7f0d01ec96f91..f38b504cbb8ce 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.34.0"; + version = "11.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-bahl78c0MGu4AoANO/FWYq/DQWPC4T8WVdRHKzwg444="; + hash = "sha256-vrOqsRe2sBsL5CIfGCmoO3geE9G0FJl88HRcP6FzZe0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 3dfd810f99cba..7adbba522e9b8 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -11,13 +11,13 @@ }: buildPythonPackage rec { - version = "0.9.6"; + version = "0.9.7"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "4b5064ec0fb3999294cca0020d4a27ffe4f29149e8292fdf7b2de9b9cabb7518"; + sha256 = "sha256-k7GOk5M3akURT5QJ18yhGftvT5o31LaXtQCvSLTFzw8="; }; # requires special test data: diff --git a/pkgs/development/python-modules/face-recognition/default.nix b/pkgs/development/python-modules/face-recognition/default.nix new file mode 100644 index 0000000000000..150429acf8790 --- /dev/null +++ b/pkgs/development/python-modules/face-recognition/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# propagates +, click +, dlib +, face-recognition-models +, numpy +, pillow + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "face-recognition"; + version = "1.3.0"; + format = "setuptools"; + + src = fetchPypi { + pname = "face_recognition"; + inherit version; + hash = "sha256-Xl790WhqpWavDTzBMTsTHksZdleo/9A2aebT+tknBew="; + }; + + propagatedBuildInputs = [ + click + dlib + face-recognition-models + numpy + pillow + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + license = licenses.mit; + homepage = "https://github.com/ageitgey/face_recognition"; + maintainers = with maintainers; [ ]; + description = "The world's simplest facial recognition api for Python and the command line"; + }; +} diff --git a/pkgs/development/python-modules/face-recognition/models.nix b/pkgs/development/python-modules/face-recognition/models.nix new file mode 100644 index 0000000000000..9df1ac0605899 --- /dev/null +++ b/pkgs/development/python-modules/face-recognition/models.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, lib +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "face-recognition-models"; + version = "0.3.0"; + format = "setuptools"; + + src = fetchPypi { + pname = "face_recognition_models"; + inherit version; + hash = "sha256-t5vSAKiMh8mp1EbJkK5xxaYm0fNzAXTm1XAVf/HYls8="; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ + "face_recognition_models" + ]; + + meta = with lib; { + homepage = "https://github.com/ageitgey/face_recognition_models"; + license = licenses.cc0; + maintainers = with maintainers; [ ]; + description = "Trained models for the face_recognition python library"; + }; +} diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix deleted file mode 100644 index b0c5266d6fb15..0000000000000 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy -, face_recognition_models, lib, flake8, pytest, glibcLocales -}: - -buildPythonPackage rec { - pname = "face_recognition"; - version = "1.3.0"; - - src = fetchFromGitHub { - repo = pname; - owner = "ageitgey"; - rev = "d34c622bf42e2c619505a4884017051ecf61ac77"; - sha256 = "052878vnh3vbrsvmpgr0bx78k524dlxn47b2xakzbxk7dyjrgcli"; - }; - - postPatch = '' - substituteInPlace setup.py --replace "flake8==2.6.0" "flake8" - ''; - - propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; - - # Our dlib is compiled with AVX instructions by default which breaks - # with "Illegal instruction" on some builders due to missing hardware features. - # - # As this makes the build fairly unreliable, it's better to skip the test and to ensure that - # the build is working and after each change to the package, manual testing should be done. - doCheck = false; - - # Although tests are disabled by default, checkPhase still exists, so - # maintainers can check the package's functionality locally before modifying it. - checkInputs = [ flake8 pytest glibcLocales ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" py.test - ''; - - meta = with lib; { - license = licenses.mit; - homepage = "https://github.com/ageitgey/face_recognition"; - maintainers = with maintainers; [ ]; - description = "The world's simplest facial recognition api for Python and the command line"; - }; -} diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix deleted file mode 100644 index ccf20f4949988..0000000000000 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ buildPythonPackage, lib, fetchPypi, setuptools }: - -buildPythonPackage rec { - pname = "face_recognition_models"; - version = "0.3.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1kwnv3qpy5bhspk780bkyg8jd9n5f6p91ja6sjlwk1wcm00d56xp"; - }; - - # no module named `tests` as no tests are available - doCheck = false; - - propagatedBuildInputs = [ setuptools ]; - - meta = with lib; { - homepage = "https://github.com/ageitgey/face_recognition_models"; - license = licenses.cc0; - maintainers = with maintainers; [ ]; - description = "Trained models for the face_recognition python library"; - }; -} diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 1677e990170ab..5f81b324695c1 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.9.3"; + version = "1.9.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-tZ+t4s5V8Na2Lt/TlkdJi7vZxlxAaMbk3MvxUhdQOLs="; + hash = "sha256-E0GS3nHtkG50gEWo2oPzcSo7IqExnGG64XA8H4d22h8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index f1ddf3bce7883..f7f4b33f16804 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.1.5"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "sabuhish"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Rt+0ZZqo9tiATwS7iwtp7K2RW3t2tsLw5Hp2WrT40B0="; + hash = "sha256-RAUxc7spJL1QECAO0uZcCVAR/LaFIxFu61LD4RV9nEI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index 54a6ce8662e5f..a04dada07dcc0 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -2,48 +2,42 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch -, importlib-metadata , poetry-core , pytestCheckHook , pythonOlder +, urllib3 }: buildPythonPackage rec { pname = "freebox-api"; - version = "0.0.10"; + version = "1.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yUcHdSHSgWxZl0z7Ue0MestvGhiXkDsxArNoDk0ZkR4="; + hash = "sha256-y78PzSivB+IJ9hrN3ZRhDBo7kI7M6uleTPkF6slO6So="; }; - patches = [ - # Switch to poetry-core, https://github.com/hacf-fr/freebox-api/pull/187 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/hacf-fr/freebox-api/commit/07356ac65483bc24fb1ed32612e77f2c2eed0134.patch"; - sha256 = "1zwricrwsqy01pmhrjy41gh4kxb3gki8z8yxlpywd66y7gid547r"; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + urllib3 + ]; checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "freebox_api" ]; + pythonImportsCheck = [ + "freebox_api" + ]; meta = with lib; { description = "Python module to interact with the Freebox OS API"; diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 294d7dc02c4bd..4074d708c646c 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "0.11.0"; + version = "1.0.0"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-7eaAgGVPzBc2A57VAlLZvz+SYl8G7hv2iCDAOh8Gmoc="; + hash = "sha256-zBWYhCzQDpjlEP1CzimcXpEaNbMCbZTWWyWC+JNZENU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index e34c1daacd26e..3eee938f9ee7d 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.12.0"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-p5GsJRoOG1vV3+efHDUFdIkfXe75HvjI3h5mveFak/M="; + hash = "sha256-d8c/kMfDMz5Z9O7OtAz2hAXQHqTlJ8oKcL9Yk+6MsA4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 390af1240dcb2..331b6d8adb7b2 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.9.1"; + version = "3.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-UZ44USwAVUCXYUelrFj+5DZ7x67BIU7Q6zPeV5Fh68s="; + hash = "sha256-yoiHO4/dhFDGZJB+WiouyBtbTQWIecwaIvR+qw8MGBU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 9dc701dcb1eff..5ec7903b9e2df 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.6.2"; + version = "1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uiKJOec6chc0YB3OowQ2CQajo/iQekcEwIDkXVLEve8="; + hash = "sha256-7QR4NS98MtJ8aMLC+qQeTrK1Rv5kw6XlZhSKbatrZFY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 3e8d3734ba78e..5abd123f8f1aa 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.7.1"; + version = "2.7.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UcgDxbFf5/ZRdtEcMaGhOkPZrJDAmKSOSTJv1fIbY48="; + sha256 = "sha256-yGB6dLcRxEuqPYGEbpOI5DInos/1ILWmzeXN+ck/W+g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index a5fe179eea18d..601d213892e22 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IIXCMB1QOwKafqaXM9s4jDqZWO2pnOVxhrm0USm2bPc="; + hash = "sha256-XiuEki6bNKZ8CzfcBBjnDbAh2yEADZohpP991OTf2DI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 9b7e9f63d5ec8..2bc31502339bc 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.9"; + version = "2.13.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5hD6Pi55OviEF0szcDu6j6ME4gOcr+8dBdBW4ohJzIE="; + hash = "sha256-PnRqGpfJa9xj/FSZUp7XJi8UZPbejIuuYjjBIgCRmsA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 0e2cc1cac3384..d35944777fbfd 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.9.1"; + version = "1.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TBZI32KX1c5XPAV1AmjQvQVhE5UgGOGd5U/enLRV3IU="; + hash = "sha256-fUnoV5I9kMwC9zUdsHit6MbIYFV+3E+GT76vwEmzNNs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index a5893d87c0cb4..22372843bdb03 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.2.1"; + version = "3.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-LLvfjlio0UmTwR2ZRpsoKTJoWHOEk740QE6K+5GNlrk="; + hash = "sha256-LtBbHA5r6/YNh2gKX0+NqQjrpKuMioyOYWT0R59SIL4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 720a3cc9f8a0f..618bc5b6cc2c4 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.10.5"; + version = "2022.10.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-E4sKIfrdEqdUqbXciIBAfIOuT/jpkS509P3+lVE3p1M="; + sha256 = "sha256-rZb1VlJvzRt3YxEK5jrzqYTZXEPbiPJek8XtkUhzgm8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index d7fd299419ce1..690f5eb78846f 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , numpy , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "haversine"; - version = "2.6.0"; + version = "2.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mapado"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cFb2DsXIwaaJK3tiOTCc0k45FVJ4/Vudkq0rzqalGJs="; + hash = "sha256-iAGG1mjrt6oJ0IkmlJwrvb2Bpk4dNxV7ee9LYov03UY="; }; checkInputs = [ @@ -21,7 +25,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "haversine" ]; + pythonImportsCheck = [ + "haversine" + ]; meta = with lib; { description = "Python module the distance between 2 points on earth"; diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 8451178605716..cafdc0b10a990 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-/FUr66lj0wgmuLcwc84oHKBGzU8jFnBVMOXk7uKUpSk="; + hash = "sha256-iQ8c48lDn9jLZ8GPzJ5b+9OaRRLte/md5UuwxgYtWVo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix index 5806104d419f9..3838c494cc8c7 100644 --- a/pkgs/development/python-modules/iaqualink/default.nix +++ b/pkgs/development/python-modules/iaqualink/default.nix @@ -1,31 +1,52 @@ { lib -, aiohttp , buildPythonPackage , fetchFromGitHub -, pytest-runner +, hatch-vcs +, hatchling +, httpx , pytestCheckHook , pythonOlder +, respx }: buildPythonPackage rec { pname = "iaqualink"; - version = "0.4.1"; + version = "0.5.0"; + format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "flz"; repo = "iaqualink-py"; rev = "v${version}"; - sha256 = "0xgxajw38jrc55xh8w8mq0dk82ml77mfs8yn05gcpv8l24y70chq"; + hash = "sha256-ewPP2Xq+ecZGc5kokvLEsRokGqTWlymrzkwk480tapk="; }; - nativeBuildInputs = [ pytest-runner ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + httpx + ] ++ httpx.optional-dependencies.http2; - propagatedBuildInputs = [ aiohttp ]; + checkInputs = [ + pytestCheckHook + respx + ]; - checkInputs = [ pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "pytest --cov-config=pyproject.toml --cov-report=xml --cov-report=term --cov=src --cov=tests" "" + ''; - pythonImportsCheck = [ "iaqualink" ]; + pythonImportsCheck = [ + "iaqualink" + ]; meta = with lib; { description = "Python library for Jandy iAqualink"; diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index ad58a71535690..18476fac8c4bd 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ibeacon-ble"; - version = "0.7.3"; + version = "0.7.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-+DPbIIarEAaH1bNzo+FvLp0QpNUPhaJ8nPLdKJKfz0k="; + hash = "sha256-B+ftS/oNCECjCqB396K5iCl0aeJSBGVXshlvZ1kvEuo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index 21c10b86c788a..a315642d32917 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.9.3"; + version = "0.9.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "v${version}"; - hash = "sha256-O5EquX2zoSCsPdXRarTcqwt4aTBS6YF8SBq+/Ft3P1A="; + hash = "sha256-GYQj7hiwyrCQDK19tZ7gN/pS1mFDSHgRfz7eCsKise4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 0d9a38019cc9b..2eb1015dba70e 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -1,21 +1,22 @@ { lib , aiohttp +, aiocsv , buildPythonPackage -, fetchFromGitHub -, rx , certifi -, six +, ciso8601 +, fetchFromGitHub +, numpy +, pandas , python-dateutil +, pythonOlder +, reactivex , setuptools , urllib3 -, ciso8601 -, pytz -, pythonOlder }: buildPythonPackage rec { pname = "influxdb-client"; - version = "1.31.0"; + version = "1.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,29 +25,32 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-gTJgY4vFgmFDn2WYUKEbvbu7hjxcw2QGI+blensS5BI="; + hash = "sha256-RhUIdIwLYJwlpLtyrXO9GCvKY6OLDJl7Aop5acgTHN0="; }; propagatedBuildInputs = [ - rx certifi - six python-dateutil + reactivex setuptools urllib3 - pytz ]; passthru.optional-dependencies = { async = [ + aiocsv aiohttp ]; ciso = [ ciso8601 ]; + extra = [ + numpy + pandas + ]; }; - # requires influxdb server + # Requires influxdb server doCheck = false; pythonImportsCheck = [ @@ -54,7 +58,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "InfluxDB 2.0 Python client library"; + description = "InfluxDB client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix index 1f4425a3e112a..a596dbe902b68 100644 --- a/pkgs/development/python-modules/json-logging/default.nix +++ b/pkgs/development/python-modules/json-logging/default.nix @@ -1,44 +1,56 @@ { lib , buildPythonPackage +, fastapi , fetchFromGitHub -, fetchpatch -, pytestCheckHook -, wheel , flask +, pytestCheckHook +, pythonOlder +, requests , sanic -, fastapi , uvicorn -, requests +, wheel }: buildPythonPackage rec { pname = "json-logging"; - version = "1.3.0"; + version = "1.5.0-rc0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bobbui"; repo = "json-logging-python"; rev = version; - hash = "sha256-0eIhOi30r3ApyVkiBdTQps5tNj7rI+q8TjNWxTnhtMQ="; + hash = "sha256-WOAEY1pONH+Gx1b8zHZDMNgJJSn7jvMO60LYTA8z/dE="; }; - patches = [ - # Fix tests picking up test modules instead of real packages. - (fetchpatch { - url = "https://github.com/bobbui/json-logging-python/commit/6fdb64deb42fe48b0b12bda0442fd5ac5f03107f.patch"; - sha256 = "sha256-BLfARsw2FdvY22NCaFfdFgL9wTmEZyVIi3CQpB5qU0Y="; - }) + + checkInputs = [ + fastapi + flask + pytestCheckHook + # quart + requests + sanic + uvicorn + wheel + ]; + + pythonImportsCheck = [ + "json_logging" + ]; + + disabledTests = [ + "quart" ]; - # - Quart is not packaged for Nixpkgs. - checkInputs = [ wheel flask /*quart*/ sanic fastapi uvicorn requests pytestCheckHook ]; - disabledTests = [ "quart" ]; - # Tests spawn servers and try to connect to them. __darwinAllowLocalNetworking = true; meta = with lib; { description = "Python library to emit logs in JSON format"; longDescription = '' - Python logging library to emit JSON log that can be easily indexed and searchable by logging infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver. + Python logging library to emit JSON log that can be easily indexed and searchable by logging + infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver. ''; homepage = "https://github.com/bobbui/json-logging-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 0053c50ef0c0e..e25cc3c85658a 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.4.7"; + version = "3.4.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TcSKsJgOOvLpId/ybgAT3QOxBLG2fw2FtnRI4W4lMR4="; + sha256 = "sha256-H6+4tlcAXZFgPzw639bZ6OrzP9xgFTf+8JKDMy7+Z8s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix index 31b65023371e0..3e6457aafe84f 100644 --- a/pkgs/development/python-modules/kazoo/default.nix +++ b/pkgs/development/python-modules/kazoo/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "kazoo"; - version = "2.8.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1zpj5cc8624w6i0pxgcxqkjwbkm4pkrv19d7wh5df3jais32g3jq"; + sha256 = "sha256-gAMYx/PatkjN9hbfslvavu+rKmg3qmlR4Po/+A5laWk="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 6605009b8fdd0..a2a5a155b5ea9 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "matrix_client"; + pname = "matrix-client"; version = "0.4.0"; src = fetchPypi { - inherit pname version; + pname = "matrix_client"; + inherit version; sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06"; }; diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 1d8c0d0dccaf1..67bc42c03cf38 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.3.39"; + version = "1.3.40"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - hash = "sha256-ymh8PNis9qh6mgc2IrDiFSwGm9sxC/6YWTxQ9HD0TJo="; + hash = "sha256-ft29c9I13gwduigIPERQQWJmQZs/j/e4leA66DbmEOQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index 4e8d96c3301bb..a49426bb64428 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -14,26 +13,18 @@ buildPythonPackage rec { pname = "meteofrance-api"; - version = "1.0.2"; + version = "1.1.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - hash = "sha256-X8f0z9ZPXH7Wc3GqHmPptxpNxbHeezdOzw4gZCprumU="; + hash = "sha256-1ZN/9ur6uhK7M5TurmmWgUjzkc79MPqKnT637hbAAWA="; }; - patches = [ - (fetchpatch { - # Switch to poetry-core - url = "https://github.com/hacf-fr/meteofrance-api/commit/7536993fe38dfe3d0833da3fd750be9277aeffa6.patch"; - hash = "sha256-/4VgzoJxhaXoj1N1GNLJNvkQvv6IW9OcBJV6vg6kthM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; @@ -41,9 +32,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz requests - urllib3 - ] ++ lib.optionals (pythonOlder "3.7") [ typing-extensions + urllib3 ]; checkInputs = [ @@ -51,12 +41,6 @@ buildPythonPackage rec { requests-mock ]; - postPatch = '' - # https://github.com/hacf-fr/meteofrance-api/pull/378 - substituteInPlace pyproject.toml \ - --replace 'pytz = ">=2020.4,<2022.0"' 'pytz = ">=2020.4,<2023.0"' - ''; - pythonImportsCheck = [ "meteofrance_api" ]; diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index c7ceeb0d4f77a..71a37c16596f9 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.1.1"; + version = "1.2.0"; # PyPI dist insufficient to run tests src = fetchFromGitHub { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-VM7sKcQeAeK20r4/jehhGlvBSHhYwA2SgsNL5Oa/Hug="; + sha256 = "sha256-IqZYkPomS/AjZrPDZapPaZ1jhtrzAvi5MOd9rYrSdKo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 069cda129d1a4..c65ef0c35c236 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, aiohttp , buildPythonPackage , ed25519 , fetchFromGitHub @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.1.7"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,10 +21,11 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-K2ugTwfeYrdBnXFV9SHNQP+fNvUmc1yuy53gpGmmvS0="; + hash = "sha256-w+YySX9RNXUttt7iLg/Efh8bNzmhIQTKMXcoPO1k4lI="; }; propagatedBuildInputs = [ + aiohttp ed25519 ]; diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 8aaa833d2f0a2..18c70e47b216a 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "2.0.2"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-JbWKNM7fNhIuBnIHAvRegAxmE0OOwsTDQWaMtuDVQcc="; + sha256 = "sha256-Pxr69NwdUY1FqIrJu60+KApHRBJ3WwAMifjweJuA8lI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 94da7af296437..c037544e343de 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -3,6 +3,7 @@ , fetchPypi , importlib-metadata , passlib +, python-dateutil , pythonOlder , scramp , setuptools @@ -10,14 +11,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.29.1"; + version = "1.29.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gLT03ksCVIMreUhRHg3UY0LRwERszU/diStj0C5PvHs="; + hash = "sha256-23XCGqCqLm95qVK3GoKaJ17KLi5WUnVpZtpZ192dbyQ="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ passlib + python-dateutil scramp ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index dd7583d7462d1..e8e522eafeaba 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.55"; + version = "8.12.56"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G+PHNT6TJd3qqQmrF5NkI8YpWNVwDWjl2lvpUDxG0Ic="; + hash = "sha256-gqTyJskw0C3N9tSynkz9hniZH+ZcLv1f3RQ1VxhvCGg="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index fb0536e623823..225dac5c08007 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.25.0"; + version = "0.25.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-5kgUSEwrSDdVmPTnWXHGPefDWIWP8AQFBQ+CbKed+Co="; + sha256 = "sha256-wHlIBysNZ0TmgdEL6sT+rqaAcH772V7k16rua2UEEso="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet-py/default.nix index e697683b9b847..3fff30cb6dd56 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet-py/default.nix @@ -9,8 +9,9 @@ }: buildPythonPackage rec { - pname = "pushbullet.py"; + pname = "pushbullet-py"; version = "0.12.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 02656968d682f..d0ebca394460a 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.55"; + version = "1.56"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; - rev = "v${version}"; - sha256 = "sha256-PuGCBFSbM91NtSzuyf0EQUr3LiuHDq90OwkSf53rSyA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-L6xrv3dAT/sWt/7ZeDy3P095g7Lpht52LkfCVYNLkbA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index d32a4a1ca3a1a..7169a4022f639 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.38.2"; + version = "2.46.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DnCJwLYwlhS1NiCDazRi1/kShOQ2/kkpuhYZqEHPEYU="; + sha256 = "1FSJzz1HqhULGjXolJs7MQNfjCB15YjSa278Yllwxi4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index 1feaf72ed283c..8015eebff1c05 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "pyotgw"; - version = "2.0.3"; - disabled = pythonOlder "3.7"; + version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mvn23"; repo = pname; rev = version; - hash = "sha256-5iP+EnDrKYQN5N4EvPeWipjkJNweCvi2QBnvwF22gUY="; + hash = "sha256-1kUL0fY+L8HZIdQki0KK5RstfZSd/ylaqV7m1z40yM8="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { "--asyncio-mode=legacy" ]; - pythonImportsCheck = [ "pyotgw" ]; + pythonImportsCheck = [ + "pyotgw" + ]; meta = with lib; { description = "Python module to interact the OpenTherm Gateway"; diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index 4e56bb49f5fd9..094711199a7a5 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "Pyro5"; - version = "5.13.1"; + version = "5.14"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2be9da379ae0ec4cf69ffb3c5c589b698eea00e614a9af7945b87fa9bb09baf2"; + sha256 = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; }; propagatedBuildInputs = [ serpent ]; diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix index 4b6f61b8114d5..3028f0cac9b77 100644 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysimplegui"; - version = "4.60.3"; + version = "4.60.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - sha256 = "sha256-dexGaU3JdcDka+jFendOA4QztTCVgh1nvjsiGso/1o0="; + sha256 = "sha256-+IyCwwGlGuo1vmBdwGC8zrDctmguFigFRIhHAatLI7o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index eb91d68069c42..87f29704b428f 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.21"; + version = "9.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-uMUK8bnRaig71mdAmTc9rUu4zZnSgbAFZkv2o3hj6G0="; + hash = "sha256-yPz4tCZGoeUMv+qP/9J6e3moJpRsJIXddRJlyy5jky4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 0547f3edd9386..d978559290082 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pywbem"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rYu75Kt+eVciwPJ/JlbJL8Zzp+BqFM0VGlDwMGRU0X4="; + sha256 = "sha256-xffkWMJTDGE1j7xjM750+vNmqs546uM3QUMSZ63zJhA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index 6bc9c220ded44..8a3dec179c104 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.21"; + version = "0.15.22"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1wHV1+xrGFJWLoMIaG5jc01FfC7mV0+ArhPmWS5yG04="; + sha256 = "sha256-KzpQk7ANinEVvOBeZ+8vPmuuu4LbatjHBKUL44bcAAI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix index ca1aaa8e8c207..3256d67b17d73 100644 --- a/pkgs/development/python-modules/qingping-ble/default.nix +++ b/pkgs/development/python-modules/qingping-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "qingping-ble"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "v${version}"; - hash = "sha256-DBkwi++gmyd8/hAMSO+Ktsou1FtcbfoY8PR+c43MOXw="; + hash = "sha256-oUmehWOeweHSqhFmr+SQg2I6Au/6pYfl2s069yWMymo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index f75e5cc19ee58..258cd012716c5 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -7,41 +7,56 @@ , freezegun , humanize , lark +, lxml , parse-type , pysingleton +, pytest-mock , pytestCheckHook +, pythonOlder , pyyaml , tag-expressions -, lxml -, pytest-mock }: buildPythonPackage rec { pname = "radish-bdd"; - version = "0.13.4"; + version = "0.14.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Pypi package does not have necessary test fixtures. src = fetchFromGitHub { owner = pname; repo = "radish"; - rev = "v${version}"; - sha256 = "1slfgh61648i009qj8156qipy21a6zm8qzjk00kbm5kk5z9jfryi"; + rev = "refs/tags/v${version}"; + hash = "sha256-7C8XgGlpNVUONSfg9DsIS8Awpy6iDzFOLAFs1xpfHXI="; }; propagatedBuildInputs = [ - lark click colorful - tag-expressions - parse-type - humanize - pyyaml docopt + humanize + lark + lxml + parse-type pysingleton + tag-expressions + ]; + + checkInputs = [ + freezegun + pytest-mock + pytestCheckHook + pyyaml ]; - checkInputs = [ freezegun lxml pytestCheckHook pytest-mock ]; - disabledTests = [ "test_main_cli_calls" ]; + pythonImportsCheck = [ + "radish" + ]; + + disabledTests = [ + "test_main_cli_calls" + ]; meta = with lib; { description = "Behaviour-Driven-Development tool for python"; diff --git a/pkgs/development/python-modules/reactivex/default.nix b/pkgs/development/python-modules/reactivex/default.nix new file mode 100644 index 0000000000000..4d95605a09b50 --- /dev/null +++ b/pkgs/development/python-modules/reactivex/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "reactivex"; + version = "4.0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ReactiveX"; + repo = "RxPY"; + rev = "refs/tags/v${version}"; + hash = "sha256-W1qYNbYV6Roz1GJtP/vpoPD6KigWaaQOWe1R5DZHlUw="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for their GitHub releases + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' + ''; + + pythonImportsCheck = [ + "reactivex" + ]; + + meta = with lib; { + description = "Library for composing asynchronous and event-based programs"; + homepage = "https://github.com/ReactiveX/RxPY"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 492b0f5434b7d..4f04a7b5ef5b9 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.4"; + version = "3.5.5"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "sha256-ugqHeyuW4n0gkTg9RlK4KqInHP9KUFJD1F2kMLcSqvU="; + sha256 = "sha256-olLEDiHPTyOsbhO//cuCtZALScMEPtj9MdpcYftY0Dc="; }; patches = [ diff --git a/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/pkgs/development/python-modules/sphinx-basic-ng/default.nix index e6da481b96717..e7f17aac9217a 100644 --- a/pkgs/development/python-modules/sphinx-basic-ng/default.nix +++ b/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -2,30 +2,21 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , sphinx }: buildPythonPackage rec { pname = "sphinx-basic-ng"; - version = "0.0.1.a12"; + version = "1.0.0.beta1"; disable = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pradyunsg"; repo = "sphinx-basic-ng"; rev = version; - sha256 = "sha256-3/a/xHPNO96GEMLgWGTLdFoojVsjNyxYgY1gAZr75S0="; + sha256 = "sha256-Zh9KvKs4js+AVSfIk0pAj6Kzq/O2m/MGTF+HCwYJTXk="; }; - patches = [ - (fetchpatch { - name = "fix-import-error.patch"; - url = "https://github.com/pradyunsg/sphinx-basic-ng/pull/32/commits/323a0085721b908aa11bc3c36c51e16f517ee023.patch"; - sha256 = "sha256-/G1wLG/08u2s3YENSKSYekLrV1fUkxDAlxc3crTQNHk="; - }) - ]; - propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index b8e1e9a202f3e..db93064b541f0 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.3.5"; + version = "0.3.8"; format = "pyproject"; src = fetchFromGitHub { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-nKNFV/mzdugQ+UJ/qB0SkCSm5vEpvI/tgHYKJr6NEyg="; + sha256 = "sha256-zEMG2zscGDlRxtLn/lUTEjZBPabcwzMcj/kMcy3yOs8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix index 728676b53b384..a1188e8f01045 100644 --- a/pkgs/development/python-modules/tgcrypto/default.nix +++ b/pkgs/development/python-modules/tgcrypto/default.nix @@ -7,15 +7,15 @@ buildPythonPackage rec { pname = "tgcrypto"; - version = "1.2.3"; + version = "1.2.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pyrogram"; repo = "tgcrypto"; - rev = "v${version}"; - sha256 = "06g1kv3skq2948h0sjf64s1cr2p1rhxnx5pf9nmvhxkmri1xmfzs"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-hifRWVEvNZVFyIJPwYY+CDR04F1I9GyAi3dt2kx+81c="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 2f093200bf35a..9c6396d55c116 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2022.5"; + version = "2022.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - hash = "sha256-S+xki1Bj+wvKhbl2vRRa8gULyxTsH4fyypkrHj3JwH0="; + hash = "sha256-HNX+8TIfXOEy4KCmOjsNvOvLBdF8iQT0NJLBDD+XWsA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 5bd24653f30d8..9fd7048166c45 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.15.3"; + version = "3.15.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wvoxZXSlPWEifwP4Gdgg4wsVjDGm5NzhaZjAUZ886ZI="; + sha256 = "sha256-D9hgnaX9YdYvYApIc5IB2hHyJSJFm9Tgia5KlwM56Rw="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index c75d4559927d3..19e394ff26ba5 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.40.2"; + version = "0.40.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-TRBS51ZlE4TbDAQdQyODUNDVfIuKZtrf38iBPIGyRhI="; + hash = "sha256-kV4BWQ4XfB2QjXY5b46+pxt3rhyo1glKRYO2mMJNhJM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 3508b26a9525d..58f2fcd7a6370 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.48.2"; + version = "0.48.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-4QltLEapYOzCwejeBWAhTdI8UVdlSAqcqFanvsTKBLw="; + hash = "sha256-GXTjG/3Gk58C6TxKrgtblUZI+xf7Te9OA8HnDvNEIvA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/withings-api/default.nix b/pkgs/development/python-modules/withings-api/default.nix new file mode 100644 index 0000000000000..fbfab134b1192 --- /dev/null +++ b/pkgs/development/python-modules/withings-api/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, arrow +, requests-oauthlib +, typing-extensions +, pydantic +, responses +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "withings-api"; + version = "2.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "vangorra"; + repo = "python_withings_api"; + rev = "refs/tags/${version}"; + sha256 = "sha256-8cOLHYnodPGk1b1n6xbVyW2iju3cG6MgnzYTKDsP/nw="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'requests-oauth = ">=0.4.1"' ''' \ + --replace 'addopts = "--capture no --cov ./withings_api --cov-report html:build/coverage_report --cov-report term --cov-report xml:build/coverage.xml"' ''' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + arrow + requests-oauthlib + typing-extensions + pydantic + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + meta = with lib; { + description = "Library for the Withings Health API"; + homepage = "https://github.com/vangorra/python_withings_api"; + license = licenses.mit; + maintainers = with maintainers; [ kittywitch ]; + }; +} diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 3e79dcf20e92a..1a5e718d451b3 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -1,25 +1,31 @@ { lib +, appdirs , buildPythonPackage , fetchFromGitHub , multitasking , numpy , pandas +, pythonOlder , requests , lxml }: buildPythonPackage rec { pname = "yfinance"; - version = "0.1.74"; + version = "0.1.77"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-3YOUdrLCluOuUieBwl15B6WHSXpMoNAjdeNJT3zmTTI="; + hash = "sha256-gg9wX3WWacS5BmbR1wgdicFxhPN5b45KH0+obWmJ65g="; }; propagatedBuildInputs = [ + appdirs multitasking numpy pandas @@ -27,8 +33,12 @@ buildPythonPackage rec { lxml ]; - doCheck = false; # Tests require internet access - pythonImportsCheck = [ "yfinance" ]; + # Tests require internet access + doCheck = false; + + pythonImportsCheck = [ + "yfinance" + ]; meta = with lib; { description = "Yahoo! Finance market data downloader (+faster Pandas Datareader)"; diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index 94580fbebbfd0..f29c10a8a4f64 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -7,13 +7,12 @@ , idna , nose , requests -, six , urllib3 }: buildPythonPackage rec { pname = "youless-api"; - version = "0.16"; + version = "1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "jongsoftdev"; repo = "youless-python-bridge"; rev = version; - sha256 = "sha256-8pJeb3eWchMRrk8KLSI/EbHs1wQDqBoqlAQXm9ulyqs="; + hash = "sha256-yh4ZmMn5z6aTZrhj9ZmvpmsDOF4MeDcPtSgr4fimjGM="; }; propagatedBuildInputs = [ @@ -30,7 +29,6 @@ buildPythonPackage rec { chardet idna requests - six urllib3 ]; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 12c24cd99a923..1a1993aebee49 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -20,7 +20,7 @@ { lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which , libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi -, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, gecode_3, curl +, cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz @@ -69,13 +69,13 @@ in cairo = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre xorg.libpthreadstubs xorg.libXdmcp]; + buildInputs = [ gtk2 pcre2 xorg.libpthreadstubs xorg.libXdmcp]; }; cairo-gobject = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ]; + buildInputs = [ cairo pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; charlock_holmes = attrs: { @@ -230,7 +230,7 @@ in gio2 = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; + buildInputs = [ gtk2 pcre pcre2 gobject-introspection ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux libsepol ]; }; gitlab-markup = attrs: { meta.priority = 1; }; @@ -275,7 +275,7 @@ in glib2 = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ gtk2 pcre ]; + buildInputs = [ gtk2 pcre2 ]; }; gtk2 = attrs: { @@ -293,7 +293,7 @@ in harfbuzz libdatrie libthai - pcre + pcre pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; @@ -301,7 +301,7 @@ in }; gobject-introspection = attrs: { - nativeBuildInputs = [ pkg-config pcre ] + nativeBuildInputs = [ pkg-config pcre2 ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; propagatedBuildInputs = [ gobject-introspection wrapGAppsHook glib ]; }; @@ -518,7 +518,7 @@ in pkg-config fribidi harfbuzz - pcre + pcre pcre2 xorg.libpthreadstubs xorg.libXdmcp ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix index e6d529b0684a3..54ea108b7d463 100644 --- a/pkgs/development/tools/analysis/binlore/default.nix +++ b/pkgs/development/tools/analysis/binlore/default.nix @@ -45,11 +45,11 @@ let # TODO: feeling really uninspired on the API loreDef = { # YARA rule file - rules = (src + /execers.yar); + rules = (src + "/execers.yar"); # output filenames; "types" of lore types = [ "execers" "wrappers" ]; # shell rule callbacks; see github.com/abathur/yallback - yallback = (src + /execers.yall); + yallback = (src + "/execers.yall"); # TODO: # - echo for debug, can be removed at some point # - I really just wanted to put the bit after the pipe @@ -88,7 +88,7 @@ let fi ''; }; - overrides = (src + /overrides); + overrides = (src + "/overrides"); in rec { collect = { lore ? loreDef, drvs, strip ? [ ] }: (runCommand "more-binlore" { } '' diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index edc57ab10b130..4cf5bc4b93f69 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.188.2"; + version = "0.190.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-oMiq4NMerhyLWtx4NhvTbK5yt7LhqnGTkFPRb+vwuug="; + sha256 = "sha256-/MxV1nbOwqW1SKaKhWFpdg6PuQflmqRgF76/JPuegRg="; }; makeFlags = [ "FLOW_RELEASE=1" ]; diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index f7c5eae72a844..3eb953bd48030 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-JfJQuEUeLXCjzm4d0ZNHRVazF0Bk6fVAsNvBb+okoXs="; + sha256 = "sha256-rJYnKQYrwj2zSg3dBHOI7zxwXTAO7ImAj0dkbVmUvHU="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/bingo/bingo_version.patch b/pkgs/development/tools/bingo/bingo_version.patch deleted file mode 100644 index a3d85df6a9ce1..0000000000000 --- a/pkgs/development/tools/bingo/bingo_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pkg/version/version.go b/pkg/version/version.go -index 30f8f30..11c12a0 100644 ---- a/pkg/version/version.go -+++ b/pkg/version/version.go -@@ -6,7 +6,7 @@ package version - import "github.com/Masterminds/semver" - - // Version returns 'bingo' version. --const Version = "v0.6" -+const Version = "v0.6.0" - - var ( - Go114 = semver.MustParse("1.14") diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix index 1b4ddd41c0e38..0c0d90bb9fc9e 100644 --- a/pkgs/development/tools/bingo/default.nix +++ b/pkgs/development/tools/bingo/default.nix @@ -1,24 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, bingo }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bingo"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "bwplotka"; repo = "bingo"; rev = "v${version}"; - sha256 = "sha256-t2nkY+mwek2NcbCwCkI3Mc1ULEJIjatBjChBdnKFAg8="; + sha256 = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A="; }; - vendorSha256 = "sha256-TCbwIHDg2YaLIscCoGPRBv5G3YSJ+qn/koOjPh+KKRY="; - - patches = [ - # Do not execute `go` command when invoking `bingo version`. - ./version_go.patch - # Specific to v0.6.0. `v0.6` -> `v0.6.0` - ./bingo_version.patch - ]; + vendorSha256 = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM="; postPatch = '' rm get_e2e_test.go get_e2e_utils_test.go @@ -28,12 +21,6 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - passthru.tests.version = testers.testVersion { - package = bingo; - command = "bingo version"; - version = "v${version}"; - }; - meta = with lib; { description = "Like `go get` but for Go tools! CI Automating versioning of Go binaries in a nested, isolated Go modules."; homepage = "https://github.com/bwplotka/bingo"; diff --git a/pkgs/development/tools/bingo/version_go.patch b/pkgs/development/tools/bingo/version_go.patch deleted file mode 100644 index 2898326a0547b..0000000000000 --- a/pkgs/development/tools/bingo/version_go.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/main.go b/main.go -index 5600f7e..662ed1b 100644 ---- a/main.go -+++ b/main.go -@@ -201,10 +201,8 @@ func main() { - return pkgs.PrintTab(target, os.Stdout) - } - case "version": -- cmdFunc = func(ctx context.Context, r *runner.Runner) error { -- _, err := fmt.Fprintln(os.Stdout, version.Version) -- return err -- } -+ _, _ = fmt.Fprintln(os.Stdout, version.Version) -+ return - default: - exitOnUsageError(flags.Usage, "No such command", flags.Arg(0)) - } diff --git a/pkgs/development/tools/build-managers/muon/default.nix b/pkgs/development/tools/build-managers/muon/default.nix index 937b53dac2934..b94a376ebb347 100644 --- a/pkgs/development/tools/build-managers/muon/default.nix +++ b/pkgs/development/tools/build-managers/muon/default.nix @@ -17,16 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "muon" + lib.optionalString embedSamurai "-embedded-samurai"; - version = "unstable-2022-09-24"; + version = "0.1.0"; src = fetchFromSourcehut { name = "muon-src"; owner = "~lattis"; repo = "muon"; - rev = "f385c82a6104ea3341ca34756e2812d700bc43d8"; - hash = "sha256-Cr1r/sp6iVotU+n4bTzQiQl8Y+ShaqnnaWjL6gRW8p0="; + rev = finalAttrs.version; + hash = "sha256-m382/Y+qOYk7hHdDdOpiYWNWrqpnWPCG4AKGGkmLt4o="; }; + outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" ]; + nativeBuildInputs = [ pkgconf samurai @@ -50,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { # URLs manually extracted from subprojects directory meson-docs-wrap = fetchurl { name = "meson-docs-wrap"; - url = "https://mochiro.moe/wrap/meson-docs-0.63.0-116-g8a45c81cf.tar.gz"; - hash = "sha256-fsXdhfBEXvw1mvqnPp2TgZnO5FaeHTNW3Nfd5qfTfxg="; + url = "https://mochiro.moe/wrap/meson-docs-0.63.0-239-g41a05ff93.tar.gz"; + hash = "sha256-wg2mDkrkE1xVNXJf4sVm6cN1ozVeDbbw0CBYtixg5/Q="; }; samurai-wrap = fetchurl { @@ -79,14 +81,14 @@ stdenv.mkDerivation (finalAttrs: { ''; buildPhase = let - featureFlag = feature: flag: + muonFeatureFlag = feature: flag: "-D${feature}=${if flag then "enabled" else "disabled"}"; - conditionFlag = condition: flag: + muonConditionFlag = condition: flag: "-D${condition}=${lib.boolToString flag}"; cmdlineForMuon = lib.concatStringsSep " " [ - (conditionFlag "static" stdenv.targetPlatform.isStatic) - (featureFlag "docs" buildDocs) - (featureFlag "samurai" embedSamurai) + (muonConditionFlag "static" stdenv.targetPlatform.isStatic) + (muonFeatureFlag "docs" buildDocs) + (muonFeatureFlag "samurai" embedSamurai) ]; cmdlineForSamu = "-j$NIX_BUILD_CORES"; in '' @@ -132,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: { }; }) # TODO LIST: -# 1. setup hook -# 2. multiple outputs -# 3. automate sources acquisition (especially wraps) -# 4. tests +# 1. automate sources acquisition (especially wraps) +# 2. setup hook +# 3. tests diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 2526957ccbce3..efd2e3a05e53e 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - hash = "sha256-2YALk3G5BhrsXZZHjGSSuk8tCi5sNGuB2VB4uvozyZo="; + hash = "sha256-AOn3SLprHdeo2FwojQdhRAttUHuaWkO6WlymK8Q8lbc="; }; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ Flakebi ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index cb9d5be356243..e3df6799330da 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,17 +1,17 @@ { - "version": "0.1.15", + "version": "0.1.16", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "17zc0fd83r8wsj9bf448f1y0s5plp3xdkqh2qbfsqak4jk4f22jn" + "sha256": "1ryjsf126dsqkpnkc2dmr3p373sb518q2ply0y1ifrx3rhqj0viq" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1c3znwad91czfvym82g4hbh96ny8wnhjcqshj6zchvzdh8c1xiqm" + "sha256": "1vfx9ccl08mykr579nq9kwbv88d6gaq1vd9xscwyq5rps6lxrz92" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0s193bkh1b431hbdfa9fnw3id6p57byy8n10v3s15sk5yi96jl87" + "sha256": "1p2lk2hkj149r27p4kwxvwlvjvzv9l0zncqfs3wa972jyn4hhr9g" } } } diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index a568be182b890..282dce5cc19d6 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.10.05"; + version = "2022.10.14"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-0X+DWjxkXqcST5Wwecqiv8BpJK+xJsXl0Kjfdvx18xU="; + sha256 = "sha256-pLISiyrkHFii69KNlJc/csA4mpNACDWjfu05BL4bRVg="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 3229f2287168c..211191c8f3799 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,13 +3,13 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.39.0"; + version = "3.39.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-wEi14Iax155S2tr+Qxa3figXPDKKIdFcwDYv/nsLScQ="; + sha256 = "sha256-sUBH0Oz1yeOgY5pmzM8XLoQ9vPiPODC6zeOO2n3meXs="; }; vendorSha256 = "sha256-RD8BXwzrqHwgxdjpL++a9pIvzD9rfSTqguRVh+CbbnE="; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 7dd67dcebd33b..c0211bd17fe7d 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.8.2"; + version = "7.8.3"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-Lgsn5k3ITJnRnOXXZjfjlEEG+OvTZjFq+LB3Us3DH8k="; + sha256 = "sha256-7r9/r6gj8u3r4R5UQIxpnmJ33SGfEAuOcqRLK11khfc="; }; - vendorSha256 = "sha256-91N6AOxXFOI6AM28avlInseAeZkqE9IfybJAX31tPDg="; + vendorSha256 = "sha256-tEh1D/eczqLzuVQUcHE4+7Q74jM/yomdPDt6+TVJeew="; subPackages = [ "fly" ]; diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index 0919a6ec58b16..5060d0aeda019 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,6 +1,6 @@ { haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: let - inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; + inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; bundledBins = lib.optional stdenv.isLinux runc; @@ -15,7 +15,7 @@ let makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); + (addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); in pkg // { meta = pkg.meta // { position = toString ./default.nix + ":1"; 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 ec1e6fb93b2ef..b4a783765df97 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,6 +1,6 @@ { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }: let - inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; + inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc; @@ -15,7 +15,7 @@ let makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${lib.escapeShellArg (makeBinPath bundledBins)} ''; }) - (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); + (addBuildTools [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); in pkg.overrideAttrs (o: { meta = o.meta // { position = toString ./default.nix + ":1"; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 5f2e919e22fd3..2d34a706ee589 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.1.0-M5"; + version = "2.1.0-M7"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-mp341H7bvf3Lwt66GKk3afoCtXuBnD97dYrZNx/jkYI="; + sha256 = "sha256-ZKltN/m4ZyOr98k5z4HfPh6jbRUM6MIew+NWo7UAz9o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index ca9219a044181..3bbe5697669d8 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "datree"; - version = "1.6.33"; + version = "1.6.37"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - hash = "sha256-VuTa1bnwxk8SUvOK3jLEvgJTPf3eABUyBssUYtoAxTs="; + hash = "sha256-oDwI4rlpTkriPD2YC8AnlPYHUchC7btYyX/X8sxmvac="; }; vendorSha256 = "sha256-gjD24nyQ8U1WwhUbq8N4dvzFK74t3as7wWZK7rh9yiw="; diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 85836f435cba5..4b627782d8b54 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitLab +, fetchpatch , meson , ninja , python3 @@ -19,6 +20,15 @@ python3.pkgs.buildPythonApplication rec { sha256 = "35pL/2TQRVgPfAcfOGCLlSP1LIh4r95mFC+UoXQEEHo="; }; + patches = [ + # Fix gnome-builder build + # https://gitlab.gnome.org/GNOME/gi-docgen/-/merge_requests/161 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/0524047ada3e6a5572c43dd36201ebe589d08095.patch"; + sha256 = "1P+i7v1sMULOd0w8K363Mssj+tBJ2wiSmE7DlztvCbw="; + }) + ]; + depsBuildBuild = [ python3 ]; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 6a48fc76db229..1032e3e92efe4 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.15.10"; + version = "0.15.11"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk="; + sha256 = "sha256-QgK1+cUW3ntPnzopYTGrIEzGvsQwzBwwryw5MXHX2+c="; }; vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index a96e6df37d1af..7c3e71cdda181 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-1qbUnsCy2JM0GJAvM//cG7j3OsJZCnd+7KXol4FsXFI="; + sha256 = "sha256-sBO0rJFRG38qAh1svChkbyCv8eJ9KjVPJHgOhxUMuH0="; }; - vendorSha256 = "sha256-QXrRsDaWoPp4mbgS7nV/5c5Z5Ca6PyoDpfrjvtoHK4Q="; + vendorSha256 = "sha256-yPzuhM0m+ltkz2z7D+DcFVjZ3OvGkJqQdc6iFidcty8="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index adec880eabe04..b7803843c3450 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -2,7 +2,6 @@ , lib , gettext , fetchurl -, fetchpatch , python3 , meson , ninja @@ -10,7 +9,7 @@ , gtk3 , glib , gjs -, webkitgtk +, webkitgtk_4_1 , gobject-introspection , wrapGAppsHook , itstool @@ -25,29 +24,13 @@ stdenv.mkDerivation rec { pname = "glade"; - version = "3.38.2"; + version = "3.40.0"; src = fetchurl { url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; + sha256 = "McmtrqhJlyq5UXtWThmsGZd8qXdYsQntwxZwCPU+PZw="; }; - patches = [ - # Fix build with meson 0.61 - # data/meson.build:4:5: ERROR: Function does not take positional arguments. - # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glade/-/commit/61304b2e8bac8ded76643cb7c3e781f73881dd2b.patch"; - sha256 = "9x6RK8Wgnm8bDxeBLV3PlUkUuH2706Ba9kwE5S87DgE="; - }) - # help/meson.build:6:6: ERROR: Tried to create target "help-glade-da-update-po", but a target of that name already exists. - # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glade/-/commit/04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb.patch"; - sha256 = "j3XfF7P6rndL+0PWqnp+QYph7Ba6bgcp4Pkikr2wuJA="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -66,7 +49,7 @@ stdenv.mkDerivation rec { gtk3 glib gjs - webkitgtk + webkitgtk_4_1 libxml2 python3 python3.pkgs.pygobject3 @@ -75,6 +58,11 @@ stdenv.mkDerivation rec { gnome.adwaita-icon-theme ]; + postPatch = '' + substituteInPlace meson.build \ + --replace 'webkit2gtk-4.0' 'webkit2gtk-4.1' + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 0b727f70e11a2..ba74387d4990d 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-CHltaS2OJJTwsX6kvgyeQwR1bus03XnMOWSpJ0EDCJ0="; + sha256 = "sha256-pbroxBHo+Y4mjcZVVth2zfDs/5sz9WDhdYMK5v5KeSg="; }; - vendorSha256 = "sha256-xp1s1aixPyXq9oVD8IZYSlUiL8UkIx5c8gYJRpIRD7I="; + vendorSha256 = "sha256-nOrzOSLIFZvEuFAfKOXXIVoSzumQHRRcQcOAPH5fCSU="; doCheck = false; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index e28c6094b37d1..bbbdbe5bab75f 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.7.6"; + version = "3.10.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-AxMt9XnpUvAwWtjh391ep+MFysF5I/HUeHS8Kq8/fvU="; + sha256 = "sha256-Z/J1L6fYuim6LkVh+LDrr3FLTZO7uQwHXRg0YTofkWA="; }; - vendorSha256 = "sha256-eTMqvl7h12GbzEmO5Lo4hdFrbqti3zl9edTz+zS0Xu8="; + vendorSha256 = "sha256-r/1huS/6qqS6TuqPQkwqKuYwye5DYQWYfBS1IcXWRgk="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix index 0127773befe28..3af0ef3152402 100644 --- a/pkgs/development/tools/goda/default.nix +++ b/pkgs/development/tools/goda/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goda"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "loov"; repo = "goda"; rev = "v${version}"; - sha256 = "sha256-gXpO0DvxghyJIIxjE/KGjF/uRQ5W3p5QhqtmzeDmAfA="; + sha256 = "sha256-qBuhwIQvfUZMyzCJ/7Kedc+InrGwpcLhDLvX9i0ws2A="; }; - vendorSha256 = "sha256-OyQEw6mRrRneo3T8wns0doU4lxJYEoilTd30xctLBJ4="; + vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms="; passthru.updateScript = nix-update-script { attrPath = pname; diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index fca3f825d54d1..fc893d92f98ee 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8qL6ryCbCdHA9Zl/yScQ8tJh+i0Vr4JeH+fQYGb+wPE="; + sha256 = "sha256-d2DETEASOe73mpyuk5NZzSzKln1LPttCbnmWEiFnAks="; }; - cargoSha256 = "sha256-E7uuvE2xVyAiDfMEFbvVHt4agPEEt7JwF+SRFe+fqYk="; + cargoSha256 = "sha256-se5tGgZysetH4dlh+oe41FRhVqFQIw218fEKwqa3WCA="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/development/tools/kafkactl/default.nix index 63c80d993e712..0943993fd642c 100644 --- a/pkgs/development/tools/kafkactl/default.nix +++ b/pkgs/development/tools/kafkactl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "2.5.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cCAmqiriiNSEpo5fHLPsarmLLhBE9QILa9xFNLlCorM="; + sha256 = "sha256-W+4JLJIc/wkT8cu5GYx1YpnbBBe3XboMTFihvrmDmR0="; }; - vendorSha256 = "sha256-Y0Muihh9S8g3SLH12jw1MYyq5mpbrTJWJu4cSNTCqmE="; + vendorSha256 = "sha256-ba7amhYuCB3k1esu1qYBCgUZMjlq5iac498TMqeGuz0="; doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index f7add96fbad9c..490ea3241049b 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "google"; + owner = "ko-build"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BwK49dSt3D2BrYvluDOBYIH5qEt59HC1hssHl1D2Heg="; + sha256 = "sha256-hhPV40e5wB2/VcdigqgjffDW4X1ZDddXTZiCUBijtHQ="; }; vendorSha256 = null; @@ -36,6 +36,10 @@ buildGoModule rec { # resolves some complaints from ko export GOROOT="$(go env GOROOT)" git init + + # ko tests will fail if any of those env are set, as ko tries + # to make sure it can build and target multiple GOOS/GOARCH + unset GOOS GOARCH GOARM ''; postInstall = '' @@ -46,8 +50,8 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://github.com/google/ko"; - changelog = "https://github.com/google/ko/releases/tag/v${version}"; + homepage = "https://github.com/ko-build/ko"; + changelog = "https://github.com/ko-build/ko/releases/tag/v${version}"; description = "Build and deploy Go applications on Kubernetes"; longDescription = '' ko is a simple, fast container image builder for Go applications. @@ -56,6 +60,6 @@ buildGoModule rec { ko also includes support for simple YAML templating which makes it a powerful tool for Kubernetes applications. ''; license = licenses.asl20; - maintainers = with maintainers; [ nickcao jk ]; + maintainers = with maintainers; [ nickcao jk vdemeester ]; }; } diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index afe20aef049b3..aab15d2a9681d 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.3.14"; + version = "0.4.2"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fi0kU1+gazSfQEyL3qYcK/qeMh1UGuitGXJ9FsVAiTw="; + sha256 = "sha256-WWZi943PyWnm5TrFIWk/Lg/uQPWdfMuTQTxgNM9lF5w="; }; - cargoSha256 = "sha256-ijXGXq5+OOnf4Nmg68GcSKZe/5tjG0KebOsCWU+vmHc="; + cargoSha256 = "sha256-bHGDbHaMdQG+T1kA/clxDmnJblRYn2X7uVVF+MpvEGE="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/development/tools/misc/d-spy/default.nix index a4a49172c234c..43be248244d71 100644 --- a/pkgs/development/tools/misc/d-spy/default.nix +++ b/pkgs/development/tools/misc/d-spy/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "d-spy"; - version = "1.2.1"; + version = "1.4.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/dspy/${lib.versions.majorMinor version}/dspy-${version}.tar.xz"; - sha256 = "TjnA1to687eJASJd0VEjOFe+Ihtfs62CwdsVhyNrZlI="; + url = "mirror://gnome/sources/d-spy/${lib.versions.majorMinor version}/d-spy-${version}.tar.xz"; + sha256 = "6uh0jOpiTFxMdeAhwt8dc3bk+fj76JrEQ0kR7PeIZ3I="; }; nativeBuildInputs = [ @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = "dspy"; - attrPath = "d-spy"; + packageName = "d-spy"; }; }; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index da608ba5a0617..bf02a6ad55695 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -1,27 +1,40 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, git, Virtualization, testers, linuxkit }: -buildGoPackage rec { - pname = "linuxkit"; - version = "0.8"; - - goPackagePath = "github.com/linuxkit/linuxkit"; +buildGoModule rec { + pname = "linuxkit"; + version = "1.0.0"; src = fetchFromGitHub { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "15jj60k8wz9cahjbdscnwyyfb1k1grjh7yrilb1cj4r8mby4sp2g"; + sha256 = "sha256-y/jsMr7HmrHjVMn4fyQ3MPHION8hQO2G4udX1AMx8bk="; }; - subPackages = [ "src/cmd/linuxkit" ]; + vendorSha256 = null; + + modRoot = "./src/cmd/linuxkit"; + + buildInputs = lib.optionals stdenv.isDarwin [ Virtualization ]; - ldflags = [ "-s" "-w" "-X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev}" "-X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=${version}" + ]; + + checkInputs = [ git ]; + + passthru.tests.version = testers.testVersion { + package = linuxkit; + command = "linuxkit version"; + }; meta = with lib; { description = "A toolkit for building secure, portable and lean operating systems for containers"; license = licenses.asl20; homepage = "https://github.com/linuxkit/linuxkit"; - maintainers = [ maintainers.nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/development/tools/misc/polylith/default.nix index 3d28ffa5238a9..8bf95ec303d5b 100644 --- a/pkgs/development/tools/misc/polylith/default.nix +++ b/pkgs/development/tools/misc/polylith/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "polylith"; - version = "0.2.14-alpha"; + version = "0.2.15-alpha"; src = fetchurl { url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; - sha256 = "sha256-0yJLSveKd49nBnCtBVfwcACXfIH43ZgqTLoo2aLPE2g="; + sha256 = "sha256-RAFxOwQykERpW+KEjTQDJN+XRv3JudREyBOk99A/qV8="; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 9531d5bbc33fe..6a62a625e9389 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-jvD/DLpcJKAqy9LSSEVZFtD+BMxfbUmdJwfnQMtA7rg="; + sha256 = "sha256-Xx5HSwO+m/DWAZjD6zePvKa6BghZJwtlLoaDIqnH/qg="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 2211b5211d6a6..23fc5cc25e377 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -6,11 +6,7 @@ , cmake , fontconfig , libGL -, libxcb -, libX11 -, libXcursor -, libXi -, libXrandr +, xorg , libxkbcommon , wayland # Darwin Frameworks @@ -24,7 +20,7 @@ }: let - rpathLibs = [ fontconfig libGL libxcb libX11 libXcursor libXrandr libXi ] + rpathLibs = [ fontconfig libGL xorg.libxcb xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi ] ++ lib.optionals stdenv.isLinux [ libxkbcommon wayland ]; in rustPlatform.buildRustPackage rec { @@ -39,7 +35,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; - buildInputs = rpathLibs ++ [ libxcb.dev ] + buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index b60dfa7f44669..7570dd586f0a4 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.29.2"; + version = "0.29.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oPBk5mTCq8nn4olC9Z7ROvrfAUXDxnWhm8w20sh5Wkw="; + sha256 = "sha256-CYbeRhwoffyELM0REZL14m4tTe/66GDToqNKcEfmums="; }; - vendorSha256 = "sha256-5Pb1mr3rYPcWFLjETAZp8rLW32n+RyCm7NbfooM4hZs="; + vendorSha256 = "sha256-wbB3/RfzL05SaLv49gs7WKrjV//dM3SjpbMNGI1yH4I="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 3d8ade975f992..e2e3f07d58ebc 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocamlbuild"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "sha256-ZL0BwOCWTNDjNkrwNAmzHjHF1Rpg3CUuV4lSqcwDqgI="; + sha256 = "sha256-QAqIMdi6M9V7RIX0kppKPSkCJE/pLx2iMdh5XYXQCJs="; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 832cfb102231a..9cedd56da8d5d 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.1.0"; + version = "12.3.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kVhdOx4+S0GLYcOIYMN9yzvDDL+/8oke69wqYJ/s5+Q="; + sha256 = "sha256-HTQ9WcplJndRD4MXB6jcfNgldWeez8hPtkO3H7NJuyI="; }; vendorSha256 = "sha256-zL5tkBkZa2Twc2FNNNUIycd/QvkpR1XEntpJ0j4z/xo="; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 9e3e34ed6ba28..abf965f4a0217 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.10.9"; + version = "2022.10.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MuBqtQlX2549Kpn8e+vdRF5zg9lP8rME64sz33FhTmA="; + sha256 = "sha256-pNiPZmfLzZ6kMtYmqLNzzTEBiGufuWTqfn+WUKg/wwc="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index e6690fc0c68b6..4057db6b74f32 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -15,13 +15,15 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dwith_sysprofd=none" + "-Dagent=false" + "-Dsysprofd=none" + "-Dgtk=false" "-Dlibsysprof=false" "-Dlibunwind=false" "-Dhelp=false" - "-Denable_tools=false" - "-Denable_tests=false" - "-Denable_examples=false" + "-Dtools=false" + "-Dtests=false" + "-Dexamples=false" ]; meta = sysprof.meta // { diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 118b55197da53..fed8af725fbc3 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -4,10 +4,10 @@ , fetchurl , gettext , glib -, gtk3 +, gtk4 , json-glib , itstool -, libdazzle +, libadwaita , libunwind , libxml2 , meson @@ -17,19 +17,19 @@ , polkit , shared-mime-info , systemd -, wrapGAppsHook +, wrapGAppsHook4 , gnome }: stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.44.0"; + version = "3.46.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "q12fW3GXOzCI1Yob/fHcI8OaAvX85OXpxz4DSxeLAFs="; + sha256 = "PkMNV4FQqN0LB1sX0vzBunBNQogCYvDMZR8z5JO+QHE="; }; nativeBuildInputs = [ @@ -41,23 +41,24 @@ stdenv.mkDerivation rec { ninja pkg-config shared-mime-info - wrapGAppsHook - gnome.adwaita-icon-theme - glib + wrapGAppsHook4 ]; buildInputs = [ - gtk3 + glib + gtk4 json-glib pango polkit systemd - libdazzle + libadwaita libunwind ]; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" + # In a separate libsysprof-capture package + "-Dinstall-static=false" ]; passthru = { diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index a7f895f8917fd..1761227045b7c 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -7,13 +7,13 @@ # compilers to determine the desired target. , defaultTargets ? []}: stdenv.mkDerivation rec { - version = "5.1.1"; + version = "5.3.0"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; rev = "rocm-${version}"; - sha256 = "sha256-x+QJJtUvgtNS4116tJFWdJOUS8yV4o10mbTAUuxerkE="; + sha256 = "sha256-4wZTm5AZgG8xEd6uYqxWq4bWZgcSYZ2WYA1z4RAPF8U="; }; enableParallelBuilding = true; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "ROCm Application for Reporting System Info"; homepage = "https://github.com/RadeonOpenCompute/rocminfo"; license = licenses.ncsa; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a8c76f3e5e2e8..f06ae2091f7cb 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.69"; + version = "0.0.76"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5TAuWBb4RJGO7prliR+c1wAOmTRaJ/erwK9ISQTiaNA="; + sha256 = "sha256-PWJkn96QInAOgR0T5ISuhfI4OYQ+jMBBqFRlewoGyjI="; }; - cargoSha256 = "sha256-bv51Hj/JMfFr9SLGQxAoWDCeLr4cI6jpYxnnncAQ6kU="; + cargoSha256 = "sha256-c0GxKyQtgkTY8mAgtLgH8S9TKKLyhJvxJR9uc+nVOh0="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-auditable/Cargo.lock b/pkgs/development/tools/rust/cargo-auditable/Cargo.lock deleted file mode 100644 index 81b8cf31f95f9..0000000000000 --- a/pkgs/development/tools/rust/cargo-auditable/Cargo.lock +++ /dev/null @@ -1,391 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "auditable-extract" -version = "0.3.1" -dependencies = [ - "binfarce", -] - -[[package]] -name = "auditable-serde" -version = "0.5.0" -dependencies = [ - "cargo-lock", - "cargo_metadata", - "semver", - "serde", - "serde_json", - "topological-sort", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "binfarce" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18464ccbb85e5dede30d70cc7676dc9950a0fb7dbf595a43d765be9123c616a2" - -[[package]] -name = "camino" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-auditable" -version = "0.5.1" -dependencies = [ - "auditable-extract", - "auditable-serde", - "cargo_metadata", - "miniz_oxide", - "object", - "pico-args", - "serde_json", -] - -[[package]] -name = "cargo-lock" -version = "8.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c4c54d47a4532db3494ef7332c257ab57b02750daae3250d49e01ee55201ce8" -dependencies = [ - "semver", - "serde", - "toml", - "url", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "getrandom" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "itoa" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" - -[[package]] -name = "libc" -version = "0.2.132" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "object" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" -dependencies = [ - "crc32fast", - "hashbrown 0.11.2", - "indexmap", - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "proc-macro2" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rust-audit-info" -version = "0.4.0" -dependencies = [ - "auditable-extract", - "miniz_oxide", -] - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "semver" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "syn" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "topological-sort" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" diff --git a/pkgs/development/tools/rust/cargo-auditable/default.nix b/pkgs/development/tools/rust/cargo-auditable/default.nix index b62425cb061df..164a6b2184ad9 100644 --- a/pkgs/development/tools/rust/cargo-auditable/default.nix +++ b/pkgs/development/tools/rust/cargo-auditable/default.nix @@ -2,26 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-auditable"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m3M2uTQIOLK14VJ5mQfHw72hgAyJBVO2OAzDglByLmo="; + sha256 = "sha256-4CHuthi7GXZKHenOE2Bk+Ps1AJlPkhvMIGHmV9Z00hA="; }; - # not using fetchCrate since it has two binary crates - cargoLock.lockFile = ./Cargo.lock; - - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - ''; + cargoSha256 = "sha256-puq8BgYuynFZCepYZdQ9ggDYJlFDks7s/l3UxM9F7ag="; meta = with lib; { description = "A tool to make production Rust binaries auditable"; homepage = "https://github.com/rust-secure-code/cargo-auditable"; - changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix new file mode 100644 index 0000000000000..68af8c0a2d391 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, Security +, SystemConfiguration +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-clone"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "janlikar"; + repo = pname; + rev = "v${version}"; + sha256 = "1lfg47kw07k4r795n0iixl5cnrb13g74hqlbp8jzbypr255bc16q"; + }; + + cargoSha256 = "sha256-rJcTl5fe3vkNNyLRvm7q5KmzyJXchh1/JuzK0GFhHLk="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + ]; + + # requires internet access + doCheck = false; + + meta = with lib; { + description = "A cargo subcommand to fetch the source code of a Rust crate"; + homepage = "https://github.com/janlikar/cargo-clone"; + changelog = "https://github.com/janlikar/cargo-clone/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-download/Cargo.nix b/pkgs/development/tools/rust/cargo-download/Cargo.nix deleted file mode 100644 index f96a3a207df01..0000000000000 --- a/pkgs/development/tools/rust/cargo-download/Cargo.nix +++ /dev/null @@ -1,675 +0,0 @@ -# Generated by carnix 0.10.0: carnix generate-nix -{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: -with buildRustCrateHelpers; -let inherit (lib.lists) fold; - inherit (lib.attrsets) recursiveUpdate; -in -rec { - crates = cratesIO; - cargo_download = crates.crates.cargo_download."0.1.2" deps; - __all = [ (cargo_download {}) ]; - deps.adler32."1.0.2" = {}; - deps.aho_corasick."0.5.3" = { - memchr = "0.1.11"; - }; - deps.ansi_term."0.9.0" = {}; - deps.arrayvec."0.4.8" = { - nodrop = "0.1.13"; - }; - deps.atty."0.2.3" = { - termion = "1.5.1"; - libc = "0.2.44"; - kernel32_sys = "0.2.2"; - winapi = "0.2.8"; - }; - deps.base64."0.9.3" = { - byteorder = "1.1.0"; - safemem = "0.3.0"; - }; - deps.bitflags."0.7.0" = {}; - deps.bitflags."0.9.1" = {}; - deps.bitflags."1.0.4" = {}; - deps.byteorder."1.1.0" = {}; - deps.bytes."0.4.11" = { - byteorder = "1.1.0"; - iovec = "0.1.1"; - }; - deps.cargo_download."0.1.2" = { - ansi_term = "0.9.0"; - clap = "2.27.1"; - conv = "0.3.3"; - derive_error = "0.0.3"; - exitcode = "1.1.2"; - flate2 = "0.2.20"; - isatty = "0.1.5"; - itertools = "0.6.5"; - lazy_static = "0.2.10"; - log = "0.3.8"; - maplit = "0.1.6"; - reqwest = "0.9.5"; - semver = "0.9.0"; - serde_json = "1.0.6"; - slog = "1.7.1"; - slog_envlogger = "0.5.0"; - slog_stdlog = "1.1.0"; - slog_stream = "1.2.1"; - tar = "0.4.13"; - time = "0.1.38"; - }; - deps.case."0.1.0" = {}; - deps.cc."1.0.3" = {}; - deps.cfg_if."0.1.2" = {}; - deps.chrono."0.2.25" = { - num = "0.1.40"; - time = "0.1.38"; - }; - deps.clap."2.27.1" = { - ansi_term = "0.9.0"; - atty = "0.2.3"; - bitflags = "0.9.1"; - strsim = "0.6.0"; - textwrap = "0.9.0"; - unicode_width = "0.1.4"; - vec_map = "0.8.0"; - }; - deps.cloudabi."0.0.3" = { - bitflags = "1.0.4"; - }; - deps.conv."0.3.3" = { - custom_derive = "0.1.7"; - }; - deps.core_foundation."0.5.1" = { - core_foundation_sys = "0.5.1"; - libc = "0.2.44"; - }; - deps.core_foundation_sys."0.5.1" = { - libc = "0.2.44"; - }; - deps.crc32fast."1.1.1" = {}; - deps.crossbeam."0.2.10" = {}; - deps.crossbeam_deque."0.6.2" = { - crossbeam_epoch = "0.6.1"; - crossbeam_utils = "0.6.1"; - }; - deps.crossbeam_epoch."0.6.1" = { - arrayvec = "0.4.8"; - cfg_if = "0.1.2"; - crossbeam_utils = "0.6.1"; - lazy_static = "1.2.0"; - memoffset = "0.2.1"; - scopeguard = "0.3.3"; - }; - deps.crossbeam_utils."0.6.1" = { - cfg_if = "0.1.2"; - }; - deps.custom_derive."0.1.7" = {}; - deps.derive_error."0.0.3" = { - case = "0.1.0"; - quote = "0.3.15"; - syn = "0.11.11"; - }; - deps.dtoa."0.4.2" = {}; - deps.either."1.4.0" = {}; - deps.encoding_rs."0.8.13" = { - cfg_if = "0.1.2"; - }; - deps.exitcode."1.1.2" = {}; - deps.filetime."0.1.14" = { - cfg_if = "0.1.2"; - redox_syscall = "0.1.31"; - libc = "0.2.44"; - }; - deps.flate2."0.2.20" = { - libc = "0.2.44"; - miniz_sys = "0.1.10"; - }; - deps.fnv."1.0.6" = {}; - deps.foreign_types."0.3.2" = { - foreign_types_shared = "0.1.1"; - }; - deps.foreign_types_shared."0.1.1" = {}; - deps.fuchsia_zircon."0.2.1" = { - fuchsia_zircon_sys = "0.2.0"; - }; - deps.fuchsia_zircon."0.3.3" = { - bitflags = "1.0.4"; - fuchsia_zircon_sys = "0.3.3"; - }; - deps.fuchsia_zircon_sys."0.2.0" = { - bitflags = "0.7.0"; - }; - deps.fuchsia_zircon_sys."0.3.3" = {}; - deps.futures."0.1.25" = {}; - deps.futures_cpupool."0.1.7" = { - futures = "0.1.25"; - num_cpus = "1.8.0"; - }; - deps.h2."0.1.13" = { - byteorder = "1.1.0"; - bytes = "0.4.11"; - fnv = "1.0.6"; - futures = "0.1.25"; - http = "0.1.14"; - indexmap = "1.0.2"; - log = "0.4.6"; - slab = "0.4.0"; - string = "0.1.2"; - tokio_io = "0.1.10"; - }; - deps.http."0.1.14" = { - bytes = "0.4.11"; - fnv = "1.0.6"; - itoa = "0.4.3"; - }; - deps.httparse."1.2.3" = {}; - deps.hyper."0.12.16" = { - bytes = "0.4.11"; - futures = "0.1.25"; - futures_cpupool = "0.1.7"; - h2 = "0.1.13"; - http = "0.1.14"; - httparse = "1.2.3"; - iovec = "0.1.1"; - itoa = "0.4.3"; - log = "0.4.6"; - net2 = "0.2.33"; - time = "0.1.38"; - tokio = "0.1.7"; - tokio_executor = "0.1.5"; - tokio_io = "0.1.10"; - tokio_reactor = "0.1.7"; - tokio_tcp = "0.1.2"; - tokio_threadpool = "0.1.9"; - tokio_timer = "0.2.5"; - want = "0.0.6"; - }; - deps.hyper_tls."0.3.1" = { - bytes = "0.4.11"; - futures = "0.1.25"; - hyper = "0.12.16"; - native_tls = "0.2.2"; - tokio_io = "0.1.10"; - }; - deps.idna."0.1.4" = { - matches = "0.1.6"; - unicode_bidi = "0.3.4"; - unicode_normalization = "0.1.5"; - }; - deps.indexmap."1.0.2" = {}; - deps.iovec."0.1.1" = { - libc = "0.2.44"; - winapi = "0.2.8"; - }; - deps.isatty."0.1.5" = { - libc = "0.2.44"; - kernel32_sys = "0.2.2"; - winapi = "0.2.8"; - }; - deps.itertools."0.6.5" = { - either = "1.4.0"; - }; - deps.itoa."0.3.4" = {}; - deps.itoa."0.4.3" = {}; - deps.kernel32_sys."0.2.2" = { - winapi = "0.2.8"; - winapi_build = "0.1.1"; - }; - deps.lazy_static."0.2.10" = {}; - deps.lazy_static."1.2.0" = {}; - deps.lazycell."1.2.0" = {}; - deps.libc."0.2.44" = {}; - deps.libflate."0.1.19" = { - adler32 = "1.0.2"; - byteorder = "1.1.0"; - crc32fast = "1.1.1"; - }; - deps.lock_api."0.1.5" = { - owning_ref = "0.4.0"; - scopeguard = "0.3.3"; - }; - deps.log."0.3.8" = {}; - deps.log."0.4.6" = { - cfg_if = "0.1.2"; - }; - deps.maplit."0.1.6" = {}; - deps.matches."0.1.6" = {}; - deps.memchr."0.1.11" = { - libc = "0.2.44"; - }; - deps.memoffset."0.2.1" = {}; - deps.mime."0.3.12" = { - unicase = "2.1.0"; - }; - deps.mime_guess."2.0.0-alpha.6" = { - mime = "0.3.12"; - phf = "0.7.21"; - unicase = "1.4.2"; - phf_codegen = "0.7.21"; - }; - deps.miniz_sys."0.1.10" = { - libc = "0.2.44"; - cc = "1.0.3"; - }; - deps.mio."0.6.16" = { - iovec = "0.1.1"; - lazycell = "1.2.0"; - log = "0.4.6"; - net2 = "0.2.33"; - slab = "0.4.0"; - fuchsia_zircon = "0.3.3"; - fuchsia_zircon_sys = "0.3.3"; - libc = "0.2.44"; - kernel32_sys = "0.2.2"; - miow = "0.2.1"; - winapi = "0.2.8"; - }; - deps.miow."0.2.1" = { - kernel32_sys = "0.2.2"; - net2 = "0.2.33"; - winapi = "0.2.8"; - ws2_32_sys = "0.2.1"; - }; - deps.native_tls."0.2.2" = { - lazy_static = "1.2.0"; - libc = "0.2.44"; - security_framework = "0.2.1"; - security_framework_sys = "0.2.1"; - tempfile = "3.0.5"; - openssl = "0.10.15"; - openssl_probe = "0.1.2"; - openssl_sys = "0.9.39"; - log = "0.4.6"; - schannel = "0.1.14"; - }; - deps.net2."0.2.33" = { - cfg_if = "0.1.2"; - libc = "0.2.44"; - winapi = "0.3.6"; - }; - deps.nodrop."0.1.13" = {}; - deps.num."0.1.40" = { - num_integer = "0.1.35"; - num_iter = "0.1.34"; - num_traits = "0.1.40"; - }; - deps.num_integer."0.1.35" = { - num_traits = "0.1.40"; - }; - deps.num_iter."0.1.34" = { - num_integer = "0.1.35"; - num_traits = "0.1.40"; - }; - deps.num_traits."0.1.40" = {}; - deps.num_cpus."1.8.0" = { - libc = "0.2.44"; - }; - deps.openssl."0.10.15" = { - bitflags = "1.0.4"; - cfg_if = "0.1.2"; - foreign_types = "0.3.2"; - lazy_static = "1.2.0"; - libc = "0.2.44"; - openssl_sys = "0.9.39"; - }; - deps.openssl_probe."0.1.2" = {}; - deps.openssl_sys."0.9.39" = { - libc = "0.2.44"; - cc = "1.0.3"; - pkg_config = "0.3.9"; - }; - deps.owning_ref."0.4.0" = { - stable_deref_trait = "1.1.1"; - }; - deps.parking_lot."0.6.4" = { - lock_api = "0.1.5"; - parking_lot_core = "0.3.1"; - }; - deps.parking_lot_core."0.3.1" = { - rand = "0.5.5"; - smallvec = "0.6.7"; - rustc_version = "0.2.3"; - libc = "0.2.44"; - winapi = "0.3.6"; - }; - deps.percent_encoding."1.0.1" = {}; - deps.phf."0.7.21" = { - phf_shared = "0.7.21"; - }; - deps.phf_codegen."0.7.21" = { - phf_generator = "0.7.21"; - phf_shared = "0.7.21"; - }; - deps.phf_generator."0.7.21" = { - phf_shared = "0.7.21"; - rand = "0.3.18"; - }; - deps.phf_shared."0.7.21" = { - siphasher = "0.2.2"; - unicase = "1.4.2"; - }; - deps.pkg_config."0.3.9" = {}; - deps.quote."0.3.15" = {}; - deps.rand."0.3.18" = { - libc = "0.2.44"; - fuchsia_zircon = "0.2.1"; - }; - deps.rand."0.5.5" = { - rand_core = "0.2.2"; - cloudabi = "0.0.3"; - fuchsia_zircon = "0.3.3"; - libc = "0.2.44"; - winapi = "0.3.6"; - }; - deps.rand."0.6.1" = { - rand_chacha = "0.1.0"; - rand_core = "0.3.0"; - rand_hc = "0.1.0"; - rand_isaac = "0.1.1"; - rand_pcg = "0.1.1"; - rand_xorshift = "0.1.0"; - rustc_version = "0.2.3"; - cloudabi = "0.0.3"; - fuchsia_zircon = "0.3.3"; - libc = "0.2.44"; - winapi = "0.3.6"; - }; - deps.rand_chacha."0.1.0" = { - rand_core = "0.3.0"; - rustc_version = "0.2.3"; - }; - deps.rand_core."0.2.2" = { - rand_core = "0.3.0"; - }; - deps.rand_core."0.3.0" = {}; - deps.rand_hc."0.1.0" = { - rand_core = "0.3.0"; - }; - deps.rand_isaac."0.1.1" = { - rand_core = "0.3.0"; - }; - deps.rand_pcg."0.1.1" = { - rand_core = "0.3.0"; - rustc_version = "0.2.3"; - }; - deps.rand_xorshift."0.1.0" = { - rand_core = "0.3.0"; - }; - deps.redox_syscall."0.1.31" = {}; - deps.redox_termios."0.1.1" = { - redox_syscall = "0.1.31"; - }; - deps.regex."0.1.80" = { - aho_corasick = "0.5.3"; - memchr = "0.1.11"; - regex_syntax = "0.3.9"; - thread_local = "0.2.7"; - utf8_ranges = "0.1.3"; - }; - deps.regex_syntax."0.3.9" = {}; - deps.remove_dir_all."0.5.1" = { - winapi = "0.3.6"; - }; - deps.reqwest."0.9.5" = { - base64 = "0.9.3"; - bytes = "0.4.11"; - encoding_rs = "0.8.13"; - futures = "0.1.25"; - http = "0.1.14"; - hyper = "0.12.16"; - hyper_tls = "0.3.1"; - libflate = "0.1.19"; - log = "0.4.6"; - mime = "0.3.12"; - mime_guess = "2.0.0-alpha.6"; - native_tls = "0.2.2"; - serde = "1.0.21"; - serde_json = "1.0.6"; - serde_urlencoded = "0.5.1"; - tokio = "0.1.7"; - tokio_io = "0.1.10"; - url = "1.6.1"; - uuid = "0.7.1"; - }; - deps.rustc_version."0.2.3" = { - semver = "0.9.0"; - }; - deps.safemem."0.3.0" = {}; - deps.schannel."0.1.14" = { - lazy_static = "1.2.0"; - winapi = "0.3.6"; - }; - deps.scopeguard."0.3.3" = {}; - deps.security_framework."0.2.1" = { - core_foundation = "0.5.1"; - core_foundation_sys = "0.5.1"; - libc = "0.2.44"; - security_framework_sys = "0.2.1"; - }; - deps.security_framework_sys."0.2.1" = { - core_foundation_sys = "0.5.1"; - libc = "0.2.44"; - }; - deps.semver."0.9.0" = { - semver_parser = "0.7.0"; - }; - deps.semver_parser."0.7.0" = {}; - deps.serde."1.0.21" = {}; - deps.serde_json."1.0.6" = { - dtoa = "0.4.2"; - itoa = "0.3.4"; - num_traits = "0.1.40"; - serde = "1.0.21"; - }; - deps.serde_urlencoded."0.5.1" = { - dtoa = "0.4.2"; - itoa = "0.3.4"; - serde = "1.0.21"; - url = "1.6.1"; - }; - deps.siphasher."0.2.2" = {}; - deps.slab."0.4.0" = {}; - deps.slog."1.7.1" = {}; - deps.slog_envlogger."0.5.0" = { - log = "0.3.8"; - regex = "0.1.80"; - slog = "1.7.1"; - slog_stdlog = "1.1.0"; - slog_term = "1.5.0"; - }; - deps.slog_extra."0.1.2" = { - slog = "1.7.1"; - thread_local = "0.3.4"; - }; - deps.slog_stdlog."1.1.0" = { - crossbeam = "0.2.10"; - lazy_static = "0.2.10"; - log = "0.3.8"; - slog = "1.7.1"; - slog_term = "1.5.0"; - }; - deps.slog_stream."1.2.1" = { - slog = "1.7.1"; - slog_extra = "0.1.2"; - thread_local = "0.3.4"; - }; - deps.slog_term."1.5.0" = { - chrono = "0.2.25"; - isatty = "0.1.5"; - slog = "1.7.1"; - slog_stream = "1.2.1"; - thread_local = "0.3.4"; - }; - deps.smallvec."0.6.7" = { - unreachable = "1.0.0"; - }; - deps.stable_deref_trait."1.1.1" = {}; - deps.string."0.1.2" = {}; - deps.strsim."0.6.0" = {}; - deps.syn."0.11.11" = { - quote = "0.3.15"; - synom = "0.11.3"; - unicode_xid = "0.0.4"; - }; - deps.synom."0.11.3" = { - unicode_xid = "0.0.4"; - }; - deps.tar."0.4.13" = { - filetime = "0.1.14"; - libc = "0.2.44"; - xattr = "0.1.11"; - }; - deps.tempfile."3.0.5" = { - cfg_if = "0.1.2"; - rand = "0.6.1"; - remove_dir_all = "0.5.1"; - redox_syscall = "0.1.31"; - libc = "0.2.44"; - winapi = "0.3.6"; - }; - deps.termion."1.5.1" = { - libc = "0.2.44"; - redox_syscall = "0.1.31"; - redox_termios = "0.1.1"; - }; - deps.textwrap."0.9.0" = { - unicode_width = "0.1.4"; - }; - deps.thread_id."2.0.0" = { - kernel32_sys = "0.2.2"; - libc = "0.2.44"; - }; - deps.thread_local."0.2.7" = { - thread_id = "2.0.0"; - }; - deps.thread_local."0.3.4" = { - lazy_static = "0.2.10"; - unreachable = "1.0.0"; - }; - deps.time."0.1.38" = { - libc = "0.2.44"; - redox_syscall = "0.1.31"; - kernel32_sys = "0.2.2"; - winapi = "0.2.8"; - }; - deps.tokio."0.1.7" = { - futures = "0.1.25"; - mio = "0.6.16"; - tokio_executor = "0.1.5"; - tokio_fs = "0.1.4"; - tokio_io = "0.1.10"; - tokio_reactor = "0.1.7"; - tokio_tcp = "0.1.2"; - tokio_threadpool = "0.1.9"; - tokio_timer = "0.2.5"; - tokio_udp = "0.1.3"; - }; - deps.tokio_codec."0.1.1" = { - bytes = "0.4.11"; - futures = "0.1.25"; - tokio_io = "0.1.10"; - }; - deps.tokio_executor."0.1.5" = { - futures = "0.1.25"; - }; - deps.tokio_fs."0.1.4" = { - futures = "0.1.25"; - tokio_io = "0.1.10"; - tokio_threadpool = "0.1.9"; - }; - deps.tokio_io."0.1.10" = { - bytes = "0.4.11"; - futures = "0.1.25"; - log = "0.4.6"; - }; - deps.tokio_reactor."0.1.7" = { - crossbeam_utils = "0.6.1"; - futures = "0.1.25"; - lazy_static = "1.2.0"; - log = "0.4.6"; - mio = "0.6.16"; - num_cpus = "1.8.0"; - parking_lot = "0.6.4"; - slab = "0.4.0"; - tokio_executor = "0.1.5"; - tokio_io = "0.1.10"; - }; - deps.tokio_tcp."0.1.2" = { - bytes = "0.4.11"; - futures = "0.1.25"; - iovec = "0.1.1"; - mio = "0.6.16"; - tokio_io = "0.1.10"; - tokio_reactor = "0.1.7"; - }; - deps.tokio_threadpool."0.1.9" = { - crossbeam_deque = "0.6.2"; - crossbeam_utils = "0.6.1"; - futures = "0.1.25"; - log = "0.4.6"; - num_cpus = "1.8.0"; - rand = "0.6.1"; - tokio_executor = "0.1.5"; - }; - deps.tokio_timer."0.2.5" = { - futures = "0.1.25"; - tokio_executor = "0.1.5"; - }; - deps.tokio_udp."0.1.3" = { - bytes = "0.4.11"; - futures = "0.1.25"; - log = "0.4.6"; - mio = "0.6.16"; - tokio_codec = "0.1.1"; - tokio_io = "0.1.10"; - tokio_reactor = "0.1.7"; - }; - deps.try_lock."0.2.2" = {}; - deps.unicase."1.4.2" = { - version_check = "0.1.3"; - }; - deps.unicase."2.1.0" = { - version_check = "0.1.3"; - }; - deps.unicode_bidi."0.3.4" = { - matches = "0.1.6"; - }; - deps.unicode_normalization."0.1.5" = {}; - deps.unicode_width."0.1.4" = {}; - deps.unicode_xid."0.0.4" = {}; - deps.unreachable."1.0.0" = { - void = "1.0.2"; - }; - deps.url."1.6.1" = { - idna = "0.1.4"; - matches = "0.1.6"; - percent_encoding = "1.0.1"; - }; - deps.utf8_ranges."0.1.3" = {}; - deps.uuid."0.7.1" = { - rand = "0.5.5"; - }; - deps.vcpkg."0.2.2" = {}; - deps.vec_map."0.8.0" = {}; - deps.version_check."0.1.3" = {}; - deps.void."1.0.2" = {}; - deps.want."0.0.6" = { - futures = "0.1.25"; - log = "0.4.6"; - try_lock = "0.2.2"; - }; - deps.winapi."0.2.8" = {}; - deps.winapi."0.3.6" = { - winapi_i686_pc_windows_gnu = "0.4.0"; - winapi_x86_64_pc_windows_gnu = "0.4.0"; - }; - deps.winapi_build."0.1.1" = {}; - deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; - deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; - deps.ws2_32_sys."0.2.1" = { - winapi = "0.2.8"; - winapi_build = "0.1.1"; - }; - deps.xattr."0.1.11" = { - libc = "0.2.44"; - }; -} diff --git a/pkgs/development/tools/rust/cargo-download/crates-io.nix b/pkgs/development/tools/rust/cargo-download/crates-io.nix deleted file mode 100644 index dde192585e08a..0000000000000 --- a/pkgs/development/tools/rust/cargo-download/crates-io.nix +++ /dev/null @@ -1,5289 +0,0 @@ -{ lib, buildRustCrate, buildRustCrateHelpers }: -with buildRustCrateHelpers; -let inherit (lib.lists) fold; - inherit (lib.attrsets) recursiveUpdate; -in -rec { - -# adler32-1.0.2 - - crates.adler32."1.0.2" = deps: { features?(features_.adler32."1.0.2" deps {}) }: buildRustCrate { - crateName = "adler32"; - version = "1.0.2"; - description = "Minimal Adler32 implementation for Rust."; - authors = [ "Remi Rampin <remirampin@gmail.com>" ]; - sha256 = "1974q3nysai026zhz24df506cxwi09jdzqksll4h7ibpb5n9g1d4"; - }; - features_.adler32."1.0.2" = deps: f: updateFeatures f ({ - adler32."1.0.2".default = (f.adler32."1.0.2".default or true); - }) []; - - -# end -# aho-corasick-0.5.3 - - crates.aho_corasick."0.5.3" = deps: { features?(features_.aho_corasick."0.5.3" deps {}) }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.5.3"; - description = "Fast multiple substring searching with finite state machines."; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn"; - libName = "aho_corasick"; - crateBin = - [{ name = "aho-corasick-dot"; }]; - dependencies = mapFeatures features ([ - (crates."memchr"."${deps."aho_corasick"."0.5.3"."memchr"}" deps) - ]); - }; - features_.aho_corasick."0.5.3" = deps: f: updateFeatures f ({ - aho_corasick."0.5.3".default = (f.aho_corasick."0.5.3".default or true); - memchr."${deps.aho_corasick."0.5.3".memchr}".default = true; - }) [ - (features_.memchr."${deps."aho_corasick"."0.5.3"."memchr"}" deps) - ]; - - -# end -# ansi_term-0.9.0 - - crates.ansi_term."0.9.0" = deps: { features?(features_.ansi_term."0.9.0" deps {}) }: buildRustCrate { - crateName = "ansi_term"; - version = "0.9.0"; - description = "Library for ANSI terminal colours and styles (bold, underline)"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ]; - sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij"; - }; - features_.ansi_term."0.9.0" = deps: f: updateFeatures f ({ - ansi_term."0.9.0".default = (f.ansi_term."0.9.0".default or true); - }) []; - - -# end -# arrayvec-0.4.8 - - crates.arrayvec."0.4.8" = deps: { features?(features_.arrayvec."0.4.8" deps {}) }: buildRustCrate { - crateName = "arrayvec"; - version = "0.4.8"; - description = "A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString."; - authors = [ "bluss" ]; - sha256 = "0zwpjdxgr0a11h9x7mkrif4wyx3c81b90paxjf326i86s13kib1g"; - dependencies = mapFeatures features ([ - (crates."nodrop"."${deps."arrayvec"."0.4.8"."nodrop"}" deps) - ]); - features = mkFeatures (features."arrayvec"."0.4.8" or {}); - }; - features_.arrayvec."0.4.8" = deps: f: updateFeatures f (rec { - arrayvec = fold recursiveUpdate {} [ - { "0.4.8"."serde" = - (f.arrayvec."0.4.8"."serde" or false) || - (f.arrayvec."0.4.8".serde-1 or false) || - (arrayvec."0.4.8"."serde-1" or false); } - { "0.4.8"."std" = - (f.arrayvec."0.4.8"."std" or false) || - (f.arrayvec."0.4.8".default or false) || - (arrayvec."0.4.8"."default" or false); } - { "0.4.8".default = (f.arrayvec."0.4.8".default or true); } - ]; - nodrop."${deps.arrayvec."0.4.8".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.8".nodrop}".default or false); - }) [ - (features_.nodrop."${deps."arrayvec"."0.4.8"."nodrop"}" deps) - ]; - - -# end -# atty-0.2.3 - - crates.atty."0.2.3" = deps: { features?(features_.atty."0.2.3" deps {}) }: buildRustCrate { - crateName = "atty"; - version = "0.2.3"; - description = "A simple interface for querying atty"; - authors = [ "softprops <d.tangren@gmail.com>" ]; - sha256 = "0zl0cjfgarp5y78nd755lpki5bbkj4hgmi88v265m543yg29i88f"; - dependencies = (if kernel == "redox" then mapFeatures features ([ - (crates."termion"."${deps."atty"."0.2.3"."termion"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."atty"."0.2.3"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."kernel32_sys"."${deps."atty"."0.2.3"."kernel32_sys"}" deps) - (crates."winapi"."${deps."atty"."0.2.3"."winapi"}" deps) - ]) else []); - }; - features_.atty."0.2.3" = deps: f: updateFeatures f ({ - atty."0.2.3".default = (f.atty."0.2.3".default or true); - kernel32_sys."${deps.atty."0.2.3".kernel32_sys}".default = true; - libc."${deps.atty."0.2.3".libc}".default = (f.libc."${deps.atty."0.2.3".libc}".default or false); - termion."${deps.atty."0.2.3".termion}".default = true; - winapi."${deps.atty."0.2.3".winapi}".default = true; - }) [ - (features_.termion."${deps."atty"."0.2.3"."termion"}" deps) - (features_.libc."${deps."atty"."0.2.3"."libc"}" deps) - (features_.kernel32_sys."${deps."atty"."0.2.3"."kernel32_sys"}" deps) - (features_.winapi."${deps."atty"."0.2.3"."winapi"}" deps) - ]; - - -# end -# base64-0.9.3 - - crates.base64."0.9.3" = deps: { features?(features_.base64."0.9.3" deps {}) }: buildRustCrate { - crateName = "base64"; - version = "0.9.3"; - description = "encodes and decodes base64 as bytes or utf8"; - authors = [ "Alice Maz <alice@alicemaz.com>" "Marshall Pierce <marshall@mpierce.org>" ]; - sha256 = "11hhz8ln4zbpn2h2gm9fbbb9j254wrd4fpmddlyah2rrnqsmmqkd"; - dependencies = mapFeatures features ([ - (crates."byteorder"."${deps."base64"."0.9.3"."byteorder"}" deps) - (crates."safemem"."${deps."base64"."0.9.3"."safemem"}" deps) - ]); - }; - features_.base64."0.9.3" = deps: f: updateFeatures f ({ - base64."0.9.3".default = (f.base64."0.9.3".default or true); - byteorder."${deps.base64."0.9.3".byteorder}".default = true; - safemem."${deps.base64."0.9.3".safemem}".default = true; - }) [ - (features_.byteorder."${deps."base64"."0.9.3"."byteorder"}" deps) - (features_.safemem."${deps."base64"."0.9.3"."safemem"}" deps) - ]; - - -# end -# bitflags-0.7.0 - - crates.bitflags."0.7.0" = deps: { features?(features_.bitflags."0.7.0" deps {}) }: buildRustCrate { - crateName = "bitflags"; - version = "0.7.0"; - description = "A macro to generate structures which behave like bitflags.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5"; - }; - features_.bitflags."0.7.0" = deps: f: updateFeatures f ({ - bitflags."0.7.0".default = (f.bitflags."0.7.0".default or true); - }) []; - - -# end -# bitflags-0.9.1 - - crates.bitflags."0.9.1" = deps: { features?(features_.bitflags."0.9.1" deps {}) }: buildRustCrate { - crateName = "bitflags"; - version = "0.9.1"; - description = "A macro to generate structures which behave like bitflags.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws"; - features = mkFeatures (features."bitflags"."0.9.1" or {}); - }; - features_.bitflags."0.9.1" = deps: f: updateFeatures f (rec { - bitflags = fold recursiveUpdate {} [ - { "0.9.1"."example_generated" = - (f.bitflags."0.9.1"."example_generated" or false) || - (f.bitflags."0.9.1".default or false) || - (bitflags."0.9.1"."default" or false); } - { "0.9.1".default = (f.bitflags."0.9.1".default or true); } - ]; - }) []; - - -# end -# bitflags-1.0.4 - - crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate { - crateName = "bitflags"; - version = "1.0.4"; - description = "A macro to generate structures which behave like bitflags.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; - features = mkFeatures (features."bitflags"."1.0.4" or {}); - }; - features_.bitflags."1.0.4" = deps: f: updateFeatures f ({ - bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); - }) []; - - -# end -# byteorder-1.1.0 - - crates.byteorder."1.1.0" = deps: { features?(features_.byteorder."1.1.0" deps {}) }: buildRustCrate { - crateName = "byteorder"; - version = "1.1.0"; - description = "Library for reading/writing numbers in big-endian and little-endian."; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp"; - features = mkFeatures (features."byteorder"."1.1.0" or {}); - }; - features_.byteorder."1.1.0" = deps: f: updateFeatures f (rec { - byteorder = fold recursiveUpdate {} [ - { "1.1.0"."std" = - (f.byteorder."1.1.0"."std" or false) || - (f.byteorder."1.1.0".default or false) || - (byteorder."1.1.0"."default" or false); } - { "1.1.0".default = (f.byteorder."1.1.0".default or true); } - ]; - }) []; - - -# end -# bytes-0.4.11 - - crates.bytes."0.4.11" = deps: { features?(features_.bytes."0.4.11" deps {}) }: buildRustCrate { - crateName = "bytes"; - version = "0.4.11"; - description = "Types and traits for working with bytes"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1lk8bnxcd8shiizarf0n6ljmj1542n90jw6lz6i270gxl7rzplmh"; - dependencies = mapFeatures features ([ - (crates."byteorder"."${deps."bytes"."0.4.11"."byteorder"}" deps) - (crates."iovec"."${deps."bytes"."0.4.11"."iovec"}" deps) - ]); - features = mkFeatures (features."bytes"."0.4.11" or {}); - }; - features_.bytes."0.4.11" = deps: f: updateFeatures f (rec { - byteorder = fold recursiveUpdate {} [ - { "${deps.bytes."0.4.11".byteorder}"."i128" = - (f.byteorder."${deps.bytes."0.4.11".byteorder}"."i128" or false) || - (bytes."0.4.11"."i128" or false) || - (f."bytes"."0.4.11"."i128" or false); } - { "${deps.bytes."0.4.11".byteorder}".default = true; } - ]; - bytes."0.4.11".default = (f.bytes."0.4.11".default or true); - iovec."${deps.bytes."0.4.11".iovec}".default = true; - }) [ - (features_.byteorder."${deps."bytes"."0.4.11"."byteorder"}" deps) - (features_.iovec."${deps."bytes"."0.4.11"."iovec"}" deps) - ]; - - -# end -# cargo-download-0.1.2 - - crates.cargo_download."0.1.2" = deps: { features?(features_.cargo_download."0.1.2" deps {}) }: buildRustCrate { - crateName = "cargo-download"; - version = "0.1.2"; - description = "Cargo subcommand for downloading crate sources"; - authors = [ "Karol Kuczmarski <karol.kuczmarski@gmail.com>" ]; - sha256 = "1gfn0iabiriq0n9sqkyp2g73rw12mr9ng61fx198xaffflxk7g36"; - crateBin = - [{ name = "cargo-download"; }]; - dependencies = mapFeatures features ([ - (crates."ansi_term"."${deps."cargo_download"."0.1.2"."ansi_term"}" deps) - (crates."clap"."${deps."cargo_download"."0.1.2"."clap"}" deps) - (crates."conv"."${deps."cargo_download"."0.1.2"."conv"}" deps) - (crates."derive_error"."${deps."cargo_download"."0.1.2"."derive_error"}" deps) - (crates."exitcode"."${deps."cargo_download"."0.1.2"."exitcode"}" deps) - (crates."flate2"."${deps."cargo_download"."0.1.2"."flate2"}" deps) - (crates."isatty"."${deps."cargo_download"."0.1.2"."isatty"}" deps) - (crates."itertools"."${deps."cargo_download"."0.1.2"."itertools"}" deps) - (crates."lazy_static"."${deps."cargo_download"."0.1.2"."lazy_static"}" deps) - (crates."log"."${deps."cargo_download"."0.1.2"."log"}" deps) - (crates."maplit"."${deps."cargo_download"."0.1.2"."maplit"}" deps) - (crates."reqwest"."${deps."cargo_download"."0.1.2"."reqwest"}" deps) - (crates."semver"."${deps."cargo_download"."0.1.2"."semver"}" deps) - (crates."serde_json"."${deps."cargo_download"."0.1.2"."serde_json"}" deps) - (crates."slog"."${deps."cargo_download"."0.1.2"."slog"}" deps) - (crates."slog_envlogger"."${deps."cargo_download"."0.1.2"."slog_envlogger"}" deps) - (crates."slog_stdlog"."${deps."cargo_download"."0.1.2"."slog_stdlog"}" deps) - (crates."slog_stream"."${deps."cargo_download"."0.1.2"."slog_stream"}" deps) - (crates."tar"."${deps."cargo_download"."0.1.2"."tar"}" deps) - (crates."time"."${deps."cargo_download"."0.1.2"."time"}" deps) - ]); - }; - features_.cargo_download."0.1.2" = deps: f: updateFeatures f ({ - ansi_term."${deps.cargo_download."0.1.2".ansi_term}".default = true; - cargo_download."0.1.2".default = (f.cargo_download."0.1.2".default or true); - clap."${deps.cargo_download."0.1.2".clap}".default = true; - conv."${deps.cargo_download."0.1.2".conv}".default = true; - derive_error."${deps.cargo_download."0.1.2".derive_error}".default = true; - exitcode."${deps.cargo_download."0.1.2".exitcode}".default = true; - flate2."${deps.cargo_download."0.1.2".flate2}".default = true; - isatty."${deps.cargo_download."0.1.2".isatty}".default = true; - itertools."${deps.cargo_download."0.1.2".itertools}".default = true; - lazy_static."${deps.cargo_download."0.1.2".lazy_static}".default = true; - log."${deps.cargo_download."0.1.2".log}".default = true; - maplit."${deps.cargo_download."0.1.2".maplit}".default = true; - reqwest."${deps.cargo_download."0.1.2".reqwest}".default = true; - semver."${deps.cargo_download."0.1.2".semver}".default = true; - serde_json."${deps.cargo_download."0.1.2".serde_json}".default = true; - slog."${deps.cargo_download."0.1.2".slog}".default = true; - slog_envlogger."${deps.cargo_download."0.1.2".slog_envlogger}".default = true; - slog_stdlog."${deps.cargo_download."0.1.2".slog_stdlog}".default = true; - slog_stream."${deps.cargo_download."0.1.2".slog_stream}".default = true; - tar."${deps.cargo_download."0.1.2".tar}".default = true; - time."${deps.cargo_download."0.1.2".time}".default = true; - }) [ - (features_.ansi_term."${deps."cargo_download"."0.1.2"."ansi_term"}" deps) - (features_.clap."${deps."cargo_download"."0.1.2"."clap"}" deps) - (features_.conv."${deps."cargo_download"."0.1.2"."conv"}" deps) - (features_.derive_error."${deps."cargo_download"."0.1.2"."derive_error"}" deps) - (features_.exitcode."${deps."cargo_download"."0.1.2"."exitcode"}" deps) - (features_.flate2."${deps."cargo_download"."0.1.2"."flate2"}" deps) - (features_.isatty."${deps."cargo_download"."0.1.2"."isatty"}" deps) - (features_.itertools."${deps."cargo_download"."0.1.2"."itertools"}" deps) - (features_.lazy_static."${deps."cargo_download"."0.1.2"."lazy_static"}" deps) - (features_.log."${deps."cargo_download"."0.1.2"."log"}" deps) - (features_.maplit."${deps."cargo_download"."0.1.2"."maplit"}" deps) - (features_.reqwest."${deps."cargo_download"."0.1.2"."reqwest"}" deps) - (features_.semver."${deps."cargo_download"."0.1.2"."semver"}" deps) - (features_.serde_json."${deps."cargo_download"."0.1.2"."serde_json"}" deps) - (features_.slog."${deps."cargo_download"."0.1.2"."slog"}" deps) - (features_.slog_envlogger."${deps."cargo_download"."0.1.2"."slog_envlogger"}" deps) - (features_.slog_stdlog."${deps."cargo_download"."0.1.2"."slog_stdlog"}" deps) - (features_.slog_stream."${deps."cargo_download"."0.1.2"."slog_stream"}" deps) - (features_.tar."${deps."cargo_download"."0.1.2"."tar"}" deps) - (features_.time."${deps."cargo_download"."0.1.2"."time"}" deps) - ]; - - -# end -# case-0.1.0 - - crates.case."0.1.0" = deps: { features?(features_.case."0.1.0" deps {}) }: buildRustCrate { - crateName = "case"; - version = "0.1.0"; - description = "A set of letter case string helpers"; - authors = [ "Skyler Lipthay <skyler.lipthay@gmail.com>" ]; - sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n"; - }; - features_.case."0.1.0" = deps: f: updateFeatures f ({ - case."0.1.0".default = (f.case."0.1.0".default or true); - }) []; - - -# end -# cc-1.0.3 - - crates.cc."1.0.3" = deps: { features?(features_.cc."1.0.3" deps {}) }: buildRustCrate { - crateName = "cc"; - version = "1.0.3"; - description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "193pwqgh79w6k0k29svyds5nnlrwx44myqyrw605d5jj4yk2zmpr"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."cc"."1.0.3" or {}); - }; - features_.cc."1.0.3" = deps: f: updateFeatures f (rec { - cc = fold recursiveUpdate {} [ - { "1.0.3"."rayon" = - (f.cc."1.0.3"."rayon" or false) || - (f.cc."1.0.3".parallel or false) || - (cc."1.0.3"."parallel" or false); } - { "1.0.3".default = (f.cc."1.0.3".default or true); } - ]; - }) []; - - -# end -# cfg-if-0.1.2 - - crates.cfg_if."0.1.2" = deps: { features?(features_.cfg_if."0.1.2" deps {}) }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.2"; - description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; - }; - features_.cfg_if."0.1.2" = deps: f: updateFeatures f ({ - cfg_if."0.1.2".default = (f.cfg_if."0.1.2".default or true); - }) []; - - -# end -# chrono-0.2.25 - - crates.chrono."0.2.25" = deps: { features?(features_.chrono."0.2.25" deps {}) }: buildRustCrate { - crateName = "chrono"; - version = "0.2.25"; - description = "Date and time library for Rust"; - authors = [ "Kang Seonghoon <public+rust@mearie.org>" ]; - sha256 = "0gsvqk8cnmm43qj3xyngqvfqh50cbdbqas7ik0wjgnvknirmmca7"; - dependencies = mapFeatures features ([ - (crates."num"."${deps."chrono"."0.2.25"."num"}" deps) - (crates."time"."${deps."chrono"."0.2.25"."time"}" deps) - ]); - }; - features_.chrono."0.2.25" = deps: f: updateFeatures f ({ - chrono."0.2.25".default = (f.chrono."0.2.25".default or true); - num."${deps.chrono."0.2.25".num}".default = (f.num."${deps.chrono."0.2.25".num}".default or false); - time."${deps.chrono."0.2.25".time}".default = true; - }) [ - (features_.num."${deps."chrono"."0.2.25"."num"}" deps) - (features_.time."${deps."chrono"."0.2.25"."time"}" deps) - ]; - - -# end -# clap-2.27.1 - - crates.clap."2.27.1" = deps: { features?(features_.clap."2.27.1" deps {}) }: buildRustCrate { - crateName = "clap"; - version = "2.27.1"; - description = "A simple to use, efficient, and full featured Command Line Argument Parser\n"; - authors = [ "Kevin K. <kbknapp@gmail.com>" ]; - sha256 = "0zx8rskqfl3iqn3vlyxzyd99hpifa7bm871akhxpz9wvrm688zaj"; - dependencies = mapFeatures features ([ - (crates."bitflags"."${deps."clap"."2.27.1"."bitflags"}" deps) - (crates."textwrap"."${deps."clap"."2.27.1"."textwrap"}" deps) - (crates."unicode_width"."${deps."clap"."2.27.1"."unicode_width"}" deps) - ] - ++ (if features.clap."2.27.1".ansi_term or false then [ (crates.ansi_term."${deps."clap"."2.27.1".ansi_term}" deps) ] else []) - ++ (if features.clap."2.27.1".atty or false then [ (crates.atty."${deps."clap"."2.27.1".atty}" deps) ] else []) - ++ (if features.clap."2.27.1".strsim or false then [ (crates.strsim."${deps."clap"."2.27.1".strsim}" deps) ] else []) - ++ (if features.clap."2.27.1".vec_map or false then [ (crates.vec_map."${deps."clap"."2.27.1".vec_map}" deps) ] else [])); - features = mkFeatures (features."clap"."2.27.1" or {}); - }; - features_.clap."2.27.1" = deps: f: updateFeatures f (rec { - ansi_term."${deps.clap."2.27.1".ansi_term}".default = true; - atty."${deps.clap."2.27.1".atty}".default = true; - bitflags."${deps.clap."2.27.1".bitflags}".default = true; - clap = fold recursiveUpdate {} [ - { "2.27.1"."ansi_term" = - (f.clap."2.27.1"."ansi_term" or false) || - (f.clap."2.27.1".color or false) || - (clap."2.27.1"."color" or false); } - { "2.27.1"."atty" = - (f.clap."2.27.1"."atty" or false) || - (f.clap."2.27.1".color or false) || - (clap."2.27.1"."color" or false); } - { "2.27.1"."clippy" = - (f.clap."2.27.1"."clippy" or false) || - (f.clap."2.27.1".lints or false) || - (clap."2.27.1"."lints" or false); } - { "2.27.1"."color" = - (f.clap."2.27.1"."color" or false) || - (f.clap."2.27.1".default or false) || - (clap."2.27.1"."default" or false); } - { "2.27.1"."strsim" = - (f.clap."2.27.1"."strsim" or false) || - (f.clap."2.27.1".suggestions or false) || - (clap."2.27.1"."suggestions" or false); } - { "2.27.1"."suggestions" = - (f.clap."2.27.1"."suggestions" or false) || - (f.clap."2.27.1".default or false) || - (clap."2.27.1"."default" or false); } - { "2.27.1"."term_size" = - (f.clap."2.27.1"."term_size" or false) || - (f.clap."2.27.1".wrap_help or false) || - (clap."2.27.1"."wrap_help" or false); } - { "2.27.1"."vec_map" = - (f.clap."2.27.1"."vec_map" or false) || - (f.clap."2.27.1".default or false) || - (clap."2.27.1"."default" or false); } - { "2.27.1"."yaml" = - (f.clap."2.27.1"."yaml" or false) || - (f.clap."2.27.1".doc or false) || - (clap."2.27.1"."doc" or false); } - { "2.27.1"."yaml-rust" = - (f.clap."2.27.1"."yaml-rust" or false) || - (f.clap."2.27.1".yaml or false) || - (clap."2.27.1"."yaml" or false); } - { "2.27.1".default = (f.clap."2.27.1".default or true); } - ]; - strsim."${deps.clap."2.27.1".strsim}".default = true; - textwrap = fold recursiveUpdate {} [ - { "${deps.clap."2.27.1".textwrap}"."term_size" = - (f.textwrap."${deps.clap."2.27.1".textwrap}"."term_size" or false) || - (clap."2.27.1"."wrap_help" or false) || - (f."clap"."2.27.1"."wrap_help" or false); } - { "${deps.clap."2.27.1".textwrap}".default = true; } - ]; - unicode_width."${deps.clap."2.27.1".unicode_width}".default = true; - vec_map."${deps.clap."2.27.1".vec_map}".default = true; - }) [ - (features_.ansi_term."${deps."clap"."2.27.1"."ansi_term"}" deps) - (features_.atty."${deps."clap"."2.27.1"."atty"}" deps) - (features_.bitflags."${deps."clap"."2.27.1"."bitflags"}" deps) - (features_.strsim."${deps."clap"."2.27.1"."strsim"}" deps) - (features_.textwrap."${deps."clap"."2.27.1"."textwrap"}" deps) - (features_.unicode_width."${deps."clap"."2.27.1"."unicode_width"}" deps) - (features_.vec_map."${deps."clap"."2.27.1"."vec_map"}" deps) - ]; - - -# end -# cloudabi-0.0.3 - - crates.cloudabi."0.0.3" = deps: { features?(features_.cloudabi."0.0.3" deps {}) }: buildRustCrate { - crateName = "cloudabi"; - version = "0.0.3"; - description = "Low level interface to CloudABI. Contains all syscalls and related types."; - authors = [ "Nuxi (https://nuxi.nl/) and contributors" ]; - sha256 = "1z9lby5sr6vslfd14d6igk03s7awf91mxpsfmsp3prxbxlk0x7h5"; - libPath = "cloudabi.rs"; - dependencies = mapFeatures features ([ - ] - ++ (if features.cloudabi."0.0.3".bitflags or false then [ (crates.bitflags."${deps."cloudabi"."0.0.3".bitflags}" deps) ] else [])); - features = mkFeatures (features."cloudabi"."0.0.3" or {}); - }; - features_.cloudabi."0.0.3" = deps: f: updateFeatures f (rec { - bitflags."${deps.cloudabi."0.0.3".bitflags}".default = true; - cloudabi = fold recursiveUpdate {} [ - { "0.0.3"."bitflags" = - (f.cloudabi."0.0.3"."bitflags" or false) || - (f.cloudabi."0.0.3".default or false) || - (cloudabi."0.0.3"."default" or false); } - { "0.0.3".default = (f.cloudabi."0.0.3".default or true); } - ]; - }) [ - (features_.bitflags."${deps."cloudabi"."0.0.3"."bitflags"}" deps) - ]; - - -# end -# conv-0.3.3 - - crates.conv."0.3.3" = deps: { features?(features_.conv."0.3.3" deps {}) }: buildRustCrate { - crateName = "conv"; - version = "0.3.3"; - description = "This crate provides a number of conversion traits with more specific semantics than those provided by 'as' or 'From'/'Into'."; - authors = [ "Daniel Keep <daniel.keep@gmail.com>" ]; - sha256 = "08rl72k1a48xah0ar5l9v1bw19pp8jdw2pdkd3vvj9ijsyyg9yik"; - dependencies = mapFeatures features ([ - (crates."custom_derive"."${deps."conv"."0.3.3"."custom_derive"}" deps) - ]); - }; - features_.conv."0.3.3" = deps: f: updateFeatures f ({ - conv."0.3.3".default = (f.conv."0.3.3".default or true); - custom_derive."${deps.conv."0.3.3".custom_derive}".default = true; - }) [ - (features_.custom_derive."${deps."conv"."0.3.3"."custom_derive"}" deps) - ]; - - -# end -# core-foundation-0.5.1 - - crates.core_foundation."0.5.1" = deps: { features?(features_.core_foundation."0.5.1" deps {}) }: buildRustCrate { - crateName = "core-foundation"; - version = "0.5.1"; - description = "Bindings to Core Foundation for OS X"; - authors = [ "The Servo Project Developers" ]; - sha256 = "03s11z23rb1kk325c34rmsbd7k0l5rkzk4q6id55n174z28zqln1"; - dependencies = mapFeatures features ([ - (crates."core_foundation_sys"."${deps."core_foundation"."0.5.1"."core_foundation_sys"}" deps) - (crates."libc"."${deps."core_foundation"."0.5.1"."libc"}" deps) - ]); - features = mkFeatures (features."core_foundation"."0.5.1" or {}); - }; - features_.core_foundation."0.5.1" = deps: f: updateFeatures f (rec { - core_foundation = fold recursiveUpdate {} [ - { "0.5.1"."chrono" = - (f.core_foundation."0.5.1"."chrono" or false) || - (f.core_foundation."0.5.1".with-chrono or false) || - (core_foundation."0.5.1"."with-chrono" or false); } - { "0.5.1"."uuid" = - (f.core_foundation."0.5.1"."uuid" or false) || - (f.core_foundation."0.5.1".with-uuid or false) || - (core_foundation."0.5.1"."with-uuid" or false); } - { "0.5.1".default = (f.core_foundation."0.5.1".default or true); } - ]; - core_foundation_sys = fold recursiveUpdate {} [ - { "${deps.core_foundation."0.5.1".core_foundation_sys}"."mac_os_10_7_support" = - (f.core_foundation_sys."${deps.core_foundation."0.5.1".core_foundation_sys}"."mac_os_10_7_support" or false) || - (core_foundation."0.5.1"."mac_os_10_7_support" or false) || - (f."core_foundation"."0.5.1"."mac_os_10_7_support" or false); } - { "${deps.core_foundation."0.5.1".core_foundation_sys}"."mac_os_10_8_features" = - (f.core_foundation_sys."${deps.core_foundation."0.5.1".core_foundation_sys}"."mac_os_10_8_features" or false) || - (core_foundation."0.5.1"."mac_os_10_8_features" or false) || - (f."core_foundation"."0.5.1"."mac_os_10_8_features" or false); } - { "${deps.core_foundation."0.5.1".core_foundation_sys}".default = true; } - ]; - libc."${deps.core_foundation."0.5.1".libc}".default = true; - }) [ - (features_.core_foundation_sys."${deps."core_foundation"."0.5.1"."core_foundation_sys"}" deps) - (features_.libc."${deps."core_foundation"."0.5.1"."libc"}" deps) - ]; - - -# end -# core-foundation-sys-0.5.1 - - crates.core_foundation_sys."0.5.1" = deps: { features?(features_.core_foundation_sys."0.5.1" deps {}) }: buildRustCrate { - crateName = "core-foundation-sys"; - version = "0.5.1"; - description = "Bindings to Core Foundation for OS X"; - authors = [ "The Servo Project Developers" ]; - sha256 = "0qbrasll5nw1bgr071i8s8jc975d0y4qfysf868bh9xp0f6vcypa"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."core_foundation_sys"."0.5.1"."libc"}" deps) - ]); - features = mkFeatures (features."core_foundation_sys"."0.5.1" or {}); - }; - features_.core_foundation_sys."0.5.1" = deps: f: updateFeatures f ({ - core_foundation_sys."0.5.1".default = (f.core_foundation_sys."0.5.1".default or true); - libc."${deps.core_foundation_sys."0.5.1".libc}".default = true; - }) [ - (features_.libc."${deps."core_foundation_sys"."0.5.1"."libc"}" deps) - ]; - - -# end -# crc32fast-1.1.1 - - crates.crc32fast."1.1.1" = deps: { features?(features_.crc32fast."1.1.1" deps {}) }: buildRustCrate { - crateName = "crc32fast"; - version = "1.1.1"; - description = "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation"; - authors = [ "Sam Rijs <srijs@airpost.net>" "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1rwvhb98w41mk5phr84mryally58f68h0v933772gdxqvqbcayqy"; - }; - features_.crc32fast."1.1.1" = deps: f: updateFeatures f ({ - crc32fast."1.1.1".default = (f.crc32fast."1.1.1".default or true); - }) []; - - -# end -# crossbeam-0.2.10 - - crates.crossbeam."0.2.10" = deps: { features?(features_.crossbeam."0.2.10" deps {}) }: buildRustCrate { - crateName = "crossbeam"; - version = "0.2.10"; - description = "Support for lock-free data structures, synchronizers, and parallel programming"; - authors = [ "Aaron Turon <aturon@mozilla.com>" ]; - sha256 = "1k1a4q5gy7zakiw39hdzrblnw3kk4nsqmkdp1dpzh8h558140rhq"; - features = mkFeatures (features."crossbeam"."0.2.10" or {}); - }; - features_.crossbeam."0.2.10" = deps: f: updateFeatures f ({ - crossbeam."0.2.10".default = (f.crossbeam."0.2.10".default or true); - }) []; - - -# end -# crossbeam-deque-0.6.2 - - crates.crossbeam_deque."0.6.2" = deps: { features?(features_.crossbeam_deque."0.6.2" deps {}) }: buildRustCrate { - crateName = "crossbeam-deque"; - version = "0.6.2"; - description = "Concurrent work-stealing deque"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "0qjdpq03snj6xp5gydgy1bdd5zzwpdxa57vhky3mf4djxiq81ara"; - dependencies = mapFeatures features ([ - (crates."crossbeam_epoch"."${deps."crossbeam_deque"."0.6.2"."crossbeam_epoch"}" deps) - (crates."crossbeam_utils"."${deps."crossbeam_deque"."0.6.2"."crossbeam_utils"}" deps) - ]); - }; - features_.crossbeam_deque."0.6.2" = deps: f: updateFeatures f ({ - crossbeam_deque."0.6.2".default = (f.crossbeam_deque."0.6.2".default or true); - crossbeam_epoch."${deps.crossbeam_deque."0.6.2".crossbeam_epoch}".default = true; - crossbeam_utils."${deps.crossbeam_deque."0.6.2".crossbeam_utils}".default = true; - }) [ - (features_.crossbeam_epoch."${deps."crossbeam_deque"."0.6.2"."crossbeam_epoch"}" deps) - (features_.crossbeam_utils."${deps."crossbeam_deque"."0.6.2"."crossbeam_utils"}" deps) - ]; - - -# end -# crossbeam-epoch-0.6.1 - - crates.crossbeam_epoch."0.6.1" = deps: { features?(features_.crossbeam_epoch."0.6.1" deps {}) }: buildRustCrate { - crateName = "crossbeam-epoch"; - version = "0.6.1"; - description = "Epoch-based garbage collection"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "0qlwzsf2xmdjbh6pv9bxra2qdq72cmywq4fq1q114zw2s06zr039"; - dependencies = mapFeatures features ([ - (crates."arrayvec"."${deps."crossbeam_epoch"."0.6.1"."arrayvec"}" deps) - (crates."cfg_if"."${deps."crossbeam_epoch"."0.6.1"."cfg_if"}" deps) - (crates."crossbeam_utils"."${deps."crossbeam_epoch"."0.6.1"."crossbeam_utils"}" deps) - (crates."memoffset"."${deps."crossbeam_epoch"."0.6.1"."memoffset"}" deps) - (crates."scopeguard"."${deps."crossbeam_epoch"."0.6.1"."scopeguard"}" deps) - ] - ++ (if features.crossbeam_epoch."0.6.1".lazy_static or false then [ (crates.lazy_static."${deps."crossbeam_epoch"."0.6.1".lazy_static}" deps) ] else [])); - features = mkFeatures (features."crossbeam_epoch"."0.6.1" or {}); - }; - features_.crossbeam_epoch."0.6.1" = deps: f: updateFeatures f (rec { - arrayvec = fold recursiveUpdate {} [ - { "${deps.crossbeam_epoch."0.6.1".arrayvec}"."use_union" = - (f.arrayvec."${deps.crossbeam_epoch."0.6.1".arrayvec}"."use_union" or false) || - (crossbeam_epoch."0.6.1"."nightly" or false) || - (f."crossbeam_epoch"."0.6.1"."nightly" or false); } - { "${deps.crossbeam_epoch."0.6.1".arrayvec}".default = (f.arrayvec."${deps.crossbeam_epoch."0.6.1".arrayvec}".default or false); } - ]; - cfg_if."${deps.crossbeam_epoch."0.6.1".cfg_if}".default = true; - crossbeam_epoch = fold recursiveUpdate {} [ - { "0.6.1"."lazy_static" = - (f.crossbeam_epoch."0.6.1"."lazy_static" or false) || - (f.crossbeam_epoch."0.6.1".std or false) || - (crossbeam_epoch."0.6.1"."std" or false); } - { "0.6.1"."std" = - (f.crossbeam_epoch."0.6.1"."std" or false) || - (f.crossbeam_epoch."0.6.1".default or false) || - (crossbeam_epoch."0.6.1"."default" or false); } - { "0.6.1".default = (f.crossbeam_epoch."0.6.1".default or true); } - ]; - crossbeam_utils = fold recursiveUpdate {} [ - { "${deps.crossbeam_epoch."0.6.1".crossbeam_utils}"."std" = - (f.crossbeam_utils."${deps.crossbeam_epoch."0.6.1".crossbeam_utils}"."std" or false) || - (crossbeam_epoch."0.6.1"."std" or false) || - (f."crossbeam_epoch"."0.6.1"."std" or false); } - { "${deps.crossbeam_epoch."0.6.1".crossbeam_utils}".default = (f.crossbeam_utils."${deps.crossbeam_epoch."0.6.1".crossbeam_utils}".default or false); } - ]; - lazy_static."${deps.crossbeam_epoch."0.6.1".lazy_static}".default = true; - memoffset."${deps.crossbeam_epoch."0.6.1".memoffset}".default = true; - scopeguard."${deps.crossbeam_epoch."0.6.1".scopeguard}".default = (f.scopeguard."${deps.crossbeam_epoch."0.6.1".scopeguard}".default or false); - }) [ - (features_.arrayvec."${deps."crossbeam_epoch"."0.6.1"."arrayvec"}" deps) - (features_.cfg_if."${deps."crossbeam_epoch"."0.6.1"."cfg_if"}" deps) - (features_.crossbeam_utils."${deps."crossbeam_epoch"."0.6.1"."crossbeam_utils"}" deps) - (features_.lazy_static."${deps."crossbeam_epoch"."0.6.1"."lazy_static"}" deps) - (features_.memoffset."${deps."crossbeam_epoch"."0.6.1"."memoffset"}" deps) - (features_.scopeguard."${deps."crossbeam_epoch"."0.6.1"."scopeguard"}" deps) - ]; - - -# end -# crossbeam-utils-0.6.1 - - crates.crossbeam_utils."0.6.1" = deps: { features?(features_.crossbeam_utils."0.6.1" deps {}) }: buildRustCrate { - crateName = "crossbeam-utils"; - version = "0.6.1"; - description = "Utilities for concurrent programming"; - authors = [ "The Crossbeam Project Developers" ]; - sha256 = "031lk6ls49yvwkdxhjm4fvg81iww01h108jq1cnlh88yzbcnwn2c"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."crossbeam_utils"."0.6.1"."cfg_if"}" deps) - ]); - features = mkFeatures (features."crossbeam_utils"."0.6.1" or {}); - }; - features_.crossbeam_utils."0.6.1" = deps: f: updateFeatures f (rec { - cfg_if."${deps.crossbeam_utils."0.6.1".cfg_if}".default = true; - crossbeam_utils = fold recursiveUpdate {} [ - { "0.6.1"."std" = - (f.crossbeam_utils."0.6.1"."std" or false) || - (f.crossbeam_utils."0.6.1".default or false) || - (crossbeam_utils."0.6.1"."default" or false); } - { "0.6.1".default = (f.crossbeam_utils."0.6.1".default or true); } - ]; - }) [ - (features_.cfg_if."${deps."crossbeam_utils"."0.6.1"."cfg_if"}" deps) - ]; - - -# end -# custom_derive-0.1.7 - - crates.custom_derive."0.1.7" = deps: { features?(features_.custom_derive."0.1.7" deps {}) }: buildRustCrate { - crateName = "custom_derive"; - version = "0.1.7"; - description = "(Note: superseded by `macro-attr`) This crate provides a macro that enables the use of custom derive attributes."; - authors = [ "Daniel Keep <daniel.keep@gmail.com>" ]; - sha256 = "160q3pzri2fgrr6czfdkwy1sbddki2za96r7ivvyii52qp1523zs"; - features = mkFeatures (features."custom_derive"."0.1.7" or {}); - }; - features_.custom_derive."0.1.7" = deps: f: updateFeatures f (rec { - custom_derive = fold recursiveUpdate {} [ - { "0.1.7"."std" = - (f.custom_derive."0.1.7"."std" or false) || - (f.custom_derive."0.1.7".default or false) || - (custom_derive."0.1.7"."default" or false); } - { "0.1.7".default = (f.custom_derive."0.1.7".default or true); } - ]; - }) []; - - -# end -# derive-error-0.0.3 - - crates.derive_error."0.0.3" = deps: { features?(features_.derive_error."0.0.3" deps {}) }: buildRustCrate { - crateName = "derive-error"; - version = "0.0.3"; - description = "Derive macro for Error using macros 1.1"; - authors = [ "rushmorem <rushmore@webenchanter.com>" ]; - sha256 = "0239vzxn5xr9nm3i4d6hmqy7dv8llcjblgh1xixfk5dcgcqan77y"; - procMacro = true; - dependencies = mapFeatures features ([ - (crates."case"."${deps."derive_error"."0.0.3"."case"}" deps) - (crates."quote"."${deps."derive_error"."0.0.3"."quote"}" deps) - (crates."syn"."${deps."derive_error"."0.0.3"."syn"}" deps) - ]); - }; - features_.derive_error."0.0.3" = deps: f: updateFeatures f ({ - case."${deps.derive_error."0.0.3".case}".default = true; - derive_error."0.0.3".default = (f.derive_error."0.0.3".default or true); - quote."${deps.derive_error."0.0.3".quote}".default = true; - syn."${deps.derive_error."0.0.3".syn}".default = true; - }) [ - (features_.case."${deps."derive_error"."0.0.3"."case"}" deps) - (features_.quote."${deps."derive_error"."0.0.3"."quote"}" deps) - (features_.syn."${deps."derive_error"."0.0.3"."syn"}" deps) - ]; - - -# end -# dtoa-0.4.2 - - crates.dtoa."0.4.2" = deps: { features?(features_.dtoa."0.4.2" deps {}) }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.2"; - description = "Fast functions for printing floating-point primitives to an io::Write"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; - }; - features_.dtoa."0.4.2" = deps: f: updateFeatures f ({ - dtoa."0.4.2".default = (f.dtoa."0.4.2".default or true); - }) []; - - -# end -# either-1.4.0 - - crates.either."1.4.0" = deps: { features?(features_.either."1.4.0" deps {}) }: buildRustCrate { - crateName = "either"; - version = "1.4.0"; - description = "The enum [`Either`] with variants `Left` and `Right` is a general purpose sum type with two cases.\n"; - authors = [ "bluss" ]; - sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."either"."1.4.0" or {}); - }; - features_.either."1.4.0" = deps: f: updateFeatures f (rec { - either = fold recursiveUpdate {} [ - { "1.4.0"."use_std" = - (f.either."1.4.0"."use_std" or false) || - (f.either."1.4.0".default or false) || - (either."1.4.0"."default" or false); } - { "1.4.0".default = (f.either."1.4.0".default or true); } - ]; - }) []; - - -# end -# encoding_rs-0.8.13 - - crates.encoding_rs."0.8.13" = deps: { features?(features_.encoding_rs."0.8.13" deps {}) }: buildRustCrate { - crateName = "encoding_rs"; - version = "0.8.13"; - description = "A Gecko-oriented implementation of the Encoding Standard"; - authors = [ "Henri Sivonen <hsivonen@hsivonen.fi>" ]; - sha256 = "1a91x1cnw1iz3hc32mvdmwhbqcfx36kk04pnil17mcii1ni6xyy5"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."encoding_rs"."0.8.13"."cfg_if"}" deps) - ]); - features = mkFeatures (features."encoding_rs"."0.8.13" or {}); - }; - features_.encoding_rs."0.8.13" = deps: f: updateFeatures f (rec { - cfg_if."${deps.encoding_rs."0.8.13".cfg_if}".default = true; - encoding_rs = fold recursiveUpdate {} [ - { "0.8.13"."fast-big5-hanzi-encode" = - (f.encoding_rs."0.8.13"."fast-big5-hanzi-encode" or false) || - (f.encoding_rs."0.8.13".fast-legacy-encode or false) || - (encoding_rs."0.8.13"."fast-legacy-encode" or false); } - { "0.8.13"."fast-gb-hanzi-encode" = - (f.encoding_rs."0.8.13"."fast-gb-hanzi-encode" or false) || - (f.encoding_rs."0.8.13".fast-legacy-encode or false) || - (encoding_rs."0.8.13"."fast-legacy-encode" or false); } - { "0.8.13"."fast-hangul-encode" = - (f.encoding_rs."0.8.13"."fast-hangul-encode" or false) || - (f.encoding_rs."0.8.13".fast-legacy-encode or false) || - (encoding_rs."0.8.13"."fast-legacy-encode" or false); } - { "0.8.13"."fast-hanja-encode" = - (f.encoding_rs."0.8.13"."fast-hanja-encode" or false) || - (f.encoding_rs."0.8.13".fast-legacy-encode or false) || - (encoding_rs."0.8.13"."fast-legacy-encode" or false); } - { "0.8.13"."fast-kanji-encode" = - (f.encoding_rs."0.8.13"."fast-kanji-encode" or false) || - (f.encoding_rs."0.8.13".fast-legacy-encode or false) || - (encoding_rs."0.8.13"."fast-legacy-encode" or false); } - { "0.8.13"."simd" = - (f.encoding_rs."0.8.13"."simd" or false) || - (f.encoding_rs."0.8.13".simd-accel or false) || - (encoding_rs."0.8.13"."simd-accel" or false); } - { "0.8.13".default = (f.encoding_rs."0.8.13".default or true); } - ]; - }) [ - (features_.cfg_if."${deps."encoding_rs"."0.8.13"."cfg_if"}" deps) - ]; - - -# end -# exitcode-1.1.2 - - crates.exitcode."1.1.2" = deps: { features?(features_.exitcode."1.1.2" deps {}) }: buildRustCrate { - crateName = "exitcode"; - version = "1.1.2"; - description = "Preferred system exit codes as defined by sysexits.h"; - authors = [ "Ben Wilber <benwilber@gmail.com>" ]; - sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip"; - }; - features_.exitcode."1.1.2" = deps: f: updateFeatures f ({ - exitcode."1.1.2".default = (f.exitcode."1.1.2".default or true); - }) []; - - -# end -# filetime-0.1.14 - - crates.filetime."0.1.14" = deps: { features?(features_.filetime."0.1.14" deps {}) }: buildRustCrate { - crateName = "filetime"; - version = "0.1.14"; - description = "Platform-agnostic accessors of timestamps in File metadata\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "0i6dvc3ba7vl1iccc91k7c9bv9j5md98mbvlmfy0kicikx0ffn08"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."filetime"."0.1.14"."cfg_if"}" deps) - ]) - ++ (if kernel == "redox" then mapFeatures features ([ - (crates."redox_syscall"."${deps."filetime"."0.1.14"."redox_syscall"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."filetime"."0.1.14"."libc"}" deps) - ]) else []); - }; - features_.filetime."0.1.14" = deps: f: updateFeatures f ({ - cfg_if."${deps.filetime."0.1.14".cfg_if}".default = true; - filetime."0.1.14".default = (f.filetime."0.1.14".default or true); - libc."${deps.filetime."0.1.14".libc}".default = true; - redox_syscall."${deps.filetime."0.1.14".redox_syscall}".default = true; - }) [ - (features_.cfg_if."${deps."filetime"."0.1.14"."cfg_if"}" deps) - (features_.redox_syscall."${deps."filetime"."0.1.14"."redox_syscall"}" deps) - (features_.libc."${deps."filetime"."0.1.14"."libc"}" deps) - ]; - - -# end -# flate2-0.2.20 - - crates.flate2."0.2.20" = deps: { features?(features_.flate2."0.2.20" deps {}) }: buildRustCrate { - crateName = "flate2"; - version = "0.2.20"; - description = "Bindings to miniz.c for DEFLATE compression and decompression exposed as\nReader/Writer streams. Contains bindings for zlib, deflate, and gzip-based\nstreams.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."flate2"."0.2.20"."libc"}" deps) - ] - ++ (if features.flate2."0.2.20".miniz-sys or false then [ (crates.miniz_sys."${deps."flate2"."0.2.20".miniz_sys}" deps) ] else [])); - features = mkFeatures (features."flate2"."0.2.20" or {}); - }; - features_.flate2."0.2.20" = deps: f: updateFeatures f (rec { - flate2 = fold recursiveUpdate {} [ - { "0.2.20"."futures" = - (f.flate2."0.2.20"."futures" or false) || - (f.flate2."0.2.20".tokio or false) || - (flate2."0.2.20"."tokio" or false); } - { "0.2.20"."libz-sys" = - (f.flate2."0.2.20"."libz-sys" or false) || - (f.flate2."0.2.20".zlib or false) || - (flate2."0.2.20"."zlib" or false); } - { "0.2.20"."miniz-sys" = - (f.flate2."0.2.20"."miniz-sys" or false) || - (f.flate2."0.2.20".default or false) || - (flate2."0.2.20"."default" or false); } - { "0.2.20"."tokio-io" = - (f.flate2."0.2.20"."tokio-io" or false) || - (f.flate2."0.2.20".tokio or false) || - (flate2."0.2.20"."tokio" or false); } - { "0.2.20".default = (f.flate2."0.2.20".default or true); } - ]; - libc."${deps.flate2."0.2.20".libc}".default = true; - miniz_sys."${deps.flate2."0.2.20".miniz_sys}".default = true; - }) [ - (features_.libc."${deps."flate2"."0.2.20"."libc"}" deps) - (features_.miniz_sys."${deps."flate2"."0.2.20"."miniz_sys"}" deps) - ]; - - -# end -# fnv-1.0.6 - - crates.fnv."1.0.6" = deps: { features?(features_.fnv."1.0.6" deps {}) }: buildRustCrate { - crateName = "fnv"; - version = "1.0.6"; - description = "Fowler–Noll–Vo hash function"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "128mlh23y3gg6ag5h8iiqlcbl59smisdzraqy88ldrf75kbw27ip"; - libPath = "lib.rs"; - }; - features_.fnv."1.0.6" = deps: f: updateFeatures f ({ - fnv."1.0.6".default = (f.fnv."1.0.6".default or true); - }) []; - - -# end -# foreign-types-0.3.2 - - crates.foreign_types."0.3.2" = deps: { features?(features_.foreign_types."0.3.2" deps {}) }: buildRustCrate { - crateName = "foreign-types"; - version = "0.3.2"; - description = "A framework for Rust wrappers over C APIs"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8"; - dependencies = mapFeatures features ([ - (crates."foreign_types_shared"."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) - ]); - }; - features_.foreign_types."0.3.2" = deps: f: updateFeatures f ({ - foreign_types."0.3.2".default = (f.foreign_types."0.3.2".default or true); - foreign_types_shared."${deps.foreign_types."0.3.2".foreign_types_shared}".default = true; - }) [ - (features_.foreign_types_shared."${deps."foreign_types"."0.3.2"."foreign_types_shared"}" deps) - ]; - - -# end -# foreign-types-shared-0.1.1 - - crates.foreign_types_shared."0.1.1" = deps: { features?(features_.foreign_types_shared."0.1.1" deps {}) }: buildRustCrate { - crateName = "foreign-types-shared"; - version = "0.1.1"; - description = "An internal crate used by foreign-types"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5"; - }; - features_.foreign_types_shared."0.1.1" = deps: f: updateFeatures f ({ - foreign_types_shared."0.1.1".default = (f.foreign_types_shared."0.1.1".default or true); - }) []; - - -# end -# fuchsia-zircon-0.2.1 - - crates.fuchsia_zircon."0.2.1" = deps: { features?(features_.fuchsia_zircon."0.2.1" deps {}) }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.2.1"; - description = "Rust bindings for the Zircon kernel"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "0yd4rd7ql1vdr349p6vgq2dnwmpylky1kjp8g1zgvp250jxrhddb"; - dependencies = mapFeatures features ([ - (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.2.1"."fuchsia_zircon_sys"}" deps) - ]); - }; - features_.fuchsia_zircon."0.2.1" = deps: f: updateFeatures f ({ - fuchsia_zircon."0.2.1".default = (f.fuchsia_zircon."0.2.1".default or true); - fuchsia_zircon_sys."${deps.fuchsia_zircon."0.2.1".fuchsia_zircon_sys}".default = true; - }) [ - (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.2.1"."fuchsia_zircon_sys"}" deps) - ]; - - -# end -# fuchsia-zircon-0.3.3 - - crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.3.3"; - description = "Rust bindings for the Zircon kernel"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; - dependencies = mapFeatures features ([ - (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) - (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) - ]); - }; - features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f ({ - bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; - fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); - fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; - }) [ - (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) - (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) - ]; - - -# end -# fuchsia-zircon-sys-0.2.0 - - crates.fuchsia_zircon_sys."0.2.0" = deps: { features?(features_.fuchsia_zircon_sys."0.2.0" deps {}) }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.2.0"; - description = "Low-level Rust bindings for the Zircon kernel"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "1yrqsrjwlhl3di6prxf5xmyd82gyjaysldbka5wwk83z11mpqh4w"; - dependencies = mapFeatures features ([ - (crates."bitflags"."${deps."fuchsia_zircon_sys"."0.2.0"."bitflags"}" deps) - ]); - }; - features_.fuchsia_zircon_sys."0.2.0" = deps: f: updateFeatures f ({ - bitflags."${deps.fuchsia_zircon_sys."0.2.0".bitflags}".default = true; - fuchsia_zircon_sys."0.2.0".default = (f.fuchsia_zircon_sys."0.2.0".default or true); - }) [ - (features_.bitflags."${deps."fuchsia_zircon_sys"."0.2.0"."bitflags"}" deps) - ]; - - -# end -# fuchsia-zircon-sys-0.3.3 - - crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.3.3"; - description = "Low-level Rust bindings for the Zircon kernel"; - authors = [ "Raph Levien <raph@google.com>" ]; - sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; - }; - features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f ({ - fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); - }) []; - - -# end -# futures-0.1.25 - - crates.futures."0.1.25" = deps: { features?(features_.futures."0.1.25" deps {}) }: buildRustCrate { - crateName = "futures"; - version = "0.1.25"; - description = "An implementation of futures and streams featuring zero allocations,\ncomposability, and iterator-like interfaces.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1gdn9z3mi3jjzbxgvawqh90895130c3ydks55rshja0ncpn985q3"; - features = mkFeatures (features."futures"."0.1.25" or {}); - }; - features_.futures."0.1.25" = deps: f: updateFeatures f (rec { - futures = fold recursiveUpdate {} [ - { "0.1.25"."use_std" = - (f.futures."0.1.25"."use_std" or false) || - (f.futures."0.1.25".default or false) || - (futures."0.1.25"."default" or false); } - { "0.1.25"."with-deprecated" = - (f.futures."0.1.25"."with-deprecated" or false) || - (f.futures."0.1.25".default or false) || - (futures."0.1.25"."default" or false); } - { "0.1.25".default = (f.futures."0.1.25".default or true); } - ]; - }) []; - - -# end -# futures-cpupool-0.1.7 - - crates.futures_cpupool."0.1.7" = deps: { features?(features_.futures_cpupool."0.1.7" deps {}) }: buildRustCrate { - crateName = "futures-cpupool"; - version = "0.1.7"; - description = "An implementation of thread pools which hand out futures to the results of the\ncomputation on the threads themselves.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1m0z5d54q1zr687acb4fh5fb3x692vr5ais6135lvp7vxap6p0xb"; - dependencies = mapFeatures features ([ - (crates."futures"."${deps."futures_cpupool"."0.1.7"."futures"}" deps) - (crates."num_cpus"."${deps."futures_cpupool"."0.1.7"."num_cpus"}" deps) - ]); - features = mkFeatures (features."futures_cpupool"."0.1.7" or {}); - }; - features_.futures_cpupool."0.1.7" = deps: f: updateFeatures f (rec { - futures = fold recursiveUpdate {} [ - { "${deps.futures_cpupool."0.1.7".futures}"."use_std" = true; } - { "${deps.futures_cpupool."0.1.7".futures}"."with-deprecated" = - (f.futures."${deps.futures_cpupool."0.1.7".futures}"."with-deprecated" or false) || - (futures_cpupool."0.1.7"."with-deprecated" or false) || - (f."futures_cpupool"."0.1.7"."with-deprecated" or false); } - { "${deps.futures_cpupool."0.1.7".futures}".default = (f.futures."${deps.futures_cpupool."0.1.7".futures}".default or false); } - ]; - futures_cpupool = fold recursiveUpdate {} [ - { "0.1.7"."with-deprecated" = - (f.futures_cpupool."0.1.7"."with-deprecated" or false) || - (f.futures_cpupool."0.1.7".default or false) || - (futures_cpupool."0.1.7"."default" or false); } - { "0.1.7".default = (f.futures_cpupool."0.1.7".default or true); } - ]; - num_cpus."${deps.futures_cpupool."0.1.7".num_cpus}".default = true; - }) [ - (features_.futures."${deps."futures_cpupool"."0.1.7"."futures"}" deps) - (features_.num_cpus."${deps."futures_cpupool"."0.1.7"."num_cpus"}" deps) - ]; - - -# end -# h2-0.1.13 - - crates.h2."0.1.13" = deps: { features?(features_.h2."0.1.13" deps {}) }: buildRustCrate { - crateName = "h2"; - version = "0.1.13"; - description = "An HTTP/2.0 client and server"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1nmbr5i1ssqbnfwmkgsfzghzr4m8676z38s2dmzs9gchha7n8wv7"; - dependencies = mapFeatures features ([ - (crates."byteorder"."${deps."h2"."0.1.13"."byteorder"}" deps) - (crates."bytes"."${deps."h2"."0.1.13"."bytes"}" deps) - (crates."fnv"."${deps."h2"."0.1.13"."fnv"}" deps) - (crates."futures"."${deps."h2"."0.1.13"."futures"}" deps) - (crates."http"."${deps."h2"."0.1.13"."http"}" deps) - (crates."indexmap"."${deps."h2"."0.1.13"."indexmap"}" deps) - (crates."log"."${deps."h2"."0.1.13"."log"}" deps) - (crates."slab"."${deps."h2"."0.1.13"."slab"}" deps) - (crates."string"."${deps."h2"."0.1.13"."string"}" deps) - (crates."tokio_io"."${deps."h2"."0.1.13"."tokio_io"}" deps) - ]); - features = mkFeatures (features."h2"."0.1.13" or {}); - }; - features_.h2."0.1.13" = deps: f: updateFeatures f ({ - byteorder."${deps.h2."0.1.13".byteorder}".default = true; - bytes."${deps.h2."0.1.13".bytes}".default = true; - fnv."${deps.h2."0.1.13".fnv}".default = true; - futures."${deps.h2."0.1.13".futures}".default = true; - h2."0.1.13".default = (f.h2."0.1.13".default or true); - http."${deps.h2."0.1.13".http}".default = true; - indexmap."${deps.h2."0.1.13".indexmap}".default = true; - log."${deps.h2."0.1.13".log}".default = true; - slab."${deps.h2."0.1.13".slab}".default = true; - string."${deps.h2."0.1.13".string}".default = true; - tokio_io."${deps.h2."0.1.13".tokio_io}".default = true; - }) [ - (features_.byteorder."${deps."h2"."0.1.13"."byteorder"}" deps) - (features_.bytes."${deps."h2"."0.1.13"."bytes"}" deps) - (features_.fnv."${deps."h2"."0.1.13"."fnv"}" deps) - (features_.futures."${deps."h2"."0.1.13"."futures"}" deps) - (features_.http."${deps."h2"."0.1.13"."http"}" deps) - (features_.indexmap."${deps."h2"."0.1.13"."indexmap"}" deps) - (features_.log."${deps."h2"."0.1.13"."log"}" deps) - (features_.slab."${deps."h2"."0.1.13"."slab"}" deps) - (features_.string."${deps."h2"."0.1.13"."string"}" deps) - (features_.tokio_io."${deps."h2"."0.1.13"."tokio_io"}" deps) - ]; - - -# end -# http-0.1.14 - - crates.http."0.1.14" = deps: { features?(features_.http."0.1.14" deps {}) }: buildRustCrate { - crateName = "http"; - version = "0.1.14"; - description = "A set of types for representing HTTP requests and responses.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Carl Lerche <me@carllerche.com>" "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1828cz2fh25nmp9rca0yzr548phsvkmzsqhspjnscqg1l9yc1557"; - dependencies = mapFeatures features ([ - (crates."bytes"."${deps."http"."0.1.14"."bytes"}" deps) - (crates."fnv"."${deps."http"."0.1.14"."fnv"}" deps) - (crates."itoa"."${deps."http"."0.1.14"."itoa"}" deps) - ]); - }; - features_.http."0.1.14" = deps: f: updateFeatures f ({ - bytes."${deps.http."0.1.14".bytes}".default = true; - fnv."${deps.http."0.1.14".fnv}".default = true; - http."0.1.14".default = (f.http."0.1.14".default or true); - itoa."${deps.http."0.1.14".itoa}".default = true; - }) [ - (features_.bytes."${deps."http"."0.1.14"."bytes"}" deps) - (features_.fnv."${deps."http"."0.1.14"."fnv"}" deps) - (features_.itoa."${deps."http"."0.1.14"."itoa"}" deps) - ]; - - -# end -# httparse-1.2.3 - - crates.httparse."1.2.3" = deps: { features?(features_.httparse."1.2.3" deps {}) }: buildRustCrate { - crateName = "httparse"; - version = "1.2.3"; - description = "A tiny, safe, speedy, zero-copy HTTP/1.x parser."; - authors = [ "Sean McArthur <sean.monstar@gmail.com>" ]; - sha256 = "13x17y9bip0bija06y4vwpgh8jdmdi2gsvjq02kyfy0fbp5cqa93"; - features = mkFeatures (features."httparse"."1.2.3" or {}); - }; - features_.httparse."1.2.3" = deps: f: updateFeatures f (rec { - httparse = fold recursiveUpdate {} [ - { "1.2.3"."std" = - (f.httparse."1.2.3"."std" or false) || - (f.httparse."1.2.3".default or false) || - (httparse."1.2.3"."default" or false); } - { "1.2.3".default = (f.httparse."1.2.3".default or true); } - ]; - }) []; - - -# end -# hyper-0.12.16 - - crates.hyper."0.12.16" = deps: { features?(features_.hyper."0.12.16" deps {}) }: buildRustCrate { - crateName = "hyper"; - version = "0.12.16"; - description = "A fast and correct HTTP library."; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1h5h9swxh02jcg1m4cvwb5nmkb8z9g4b0p4wfbhfvsd7wf14qr0y"; - dependencies = mapFeatures features ([ - (crates."bytes"."${deps."hyper"."0.12.16"."bytes"}" deps) - (crates."futures"."${deps."hyper"."0.12.16"."futures"}" deps) - (crates."h2"."${deps."hyper"."0.12.16"."h2"}" deps) - (crates."http"."${deps."hyper"."0.12.16"."http"}" deps) - (crates."httparse"."${deps."hyper"."0.12.16"."httparse"}" deps) - (crates."iovec"."${deps."hyper"."0.12.16"."iovec"}" deps) - (crates."itoa"."${deps."hyper"."0.12.16"."itoa"}" deps) - (crates."log"."${deps."hyper"."0.12.16"."log"}" deps) - (crates."time"."${deps."hyper"."0.12.16"."time"}" deps) - (crates."tokio_io"."${deps."hyper"."0.12.16"."tokio_io"}" deps) - (crates."want"."${deps."hyper"."0.12.16"."want"}" deps) - ] - ++ (if features.hyper."0.12.16".futures-cpupool or false then [ (crates.futures_cpupool."${deps."hyper"."0.12.16".futures_cpupool}" deps) ] else []) - ++ (if features.hyper."0.12.16".net2 or false then [ (crates.net2."${deps."hyper"."0.12.16".net2}" deps) ] else []) - ++ (if features.hyper."0.12.16".tokio or false then [ (crates.tokio."${deps."hyper"."0.12.16".tokio}" deps) ] else []) - ++ (if features.hyper."0.12.16".tokio-executor or false then [ (crates.tokio_executor."${deps."hyper"."0.12.16".tokio_executor}" deps) ] else []) - ++ (if features.hyper."0.12.16".tokio-reactor or false then [ (crates.tokio_reactor."${deps."hyper"."0.12.16".tokio_reactor}" deps) ] else []) - ++ (if features.hyper."0.12.16".tokio-tcp or false then [ (crates.tokio_tcp."${deps."hyper"."0.12.16".tokio_tcp}" deps) ] else []) - ++ (if features.hyper."0.12.16".tokio-threadpool or false then [ (crates.tokio_threadpool."${deps."hyper"."0.12.16".tokio_threadpool}" deps) ] else []) - ++ (if features.hyper."0.12.16".tokio-timer or false then [ (crates.tokio_timer."${deps."hyper"."0.12.16".tokio_timer}" deps) ] else [])); - features = mkFeatures (features."hyper"."0.12.16" or {}); - }; - features_.hyper."0.12.16" = deps: f: updateFeatures f (rec { - bytes."${deps.hyper."0.12.16".bytes}".default = true; - futures."${deps.hyper."0.12.16".futures}".default = true; - futures_cpupool."${deps.hyper."0.12.16".futures_cpupool}".default = true; - h2."${deps.hyper."0.12.16".h2}".default = true; - http."${deps.hyper."0.12.16".http}".default = true; - httparse."${deps.hyper."0.12.16".httparse}".default = true; - hyper = fold recursiveUpdate {} [ - { "0.12.16"."__internal_flaky_tests" = - (f.hyper."0.12.16"."__internal_flaky_tests" or false) || - (f.hyper."0.12.16".default or false) || - (hyper."0.12.16"."default" or false); } - { "0.12.16"."futures-cpupool" = - (f.hyper."0.12.16"."futures-cpupool" or false) || - (f.hyper."0.12.16".runtime or false) || - (hyper."0.12.16"."runtime" or false); } - { "0.12.16"."net2" = - (f.hyper."0.12.16"."net2" or false) || - (f.hyper."0.12.16".runtime or false) || - (hyper."0.12.16"."runtime" or false); } - { "0.12.16"."runtime" = - (f.hyper."0.12.16"."runtime" or false) || - (f.hyper."0.12.16".default or false) || - (hyper."0.12.16"."default" or false); } - { "0.12.16"."tokio" = - (f.hyper."0.12.16"."tokio" or false) || - (f.hyper."0.12.16".runtime or false) || - (hyper."0.12.16"."runtime" or false); } - { "0.12.16"."tokio-executor" = - (f.hyper."0.12.16"."tokio-executor" or false) || - (f.hyper."0.12.16".runtime or false) || - (hyper."0.12.16"."runtime" or false); } - { "0.12.16"."tokio-reactor" = - (f.hyper."0.12.16"."tokio-reactor" or false) || - (f.hyper."0.12.16".runtime or false) || - (hyper."0.12.16"."runtime" or false); } - { "0.12.16"."tokio-tcp" = - (f.hyper."0.12.16"."tokio-tcp" or false) || - (f.hyper."0.12.16".runtime or false) || - (hyper."0.12.16"."runtime" or false); } - { "0.12.16"."tokio-threadpool" = - (f.hyper."0.12.16"."tokio-threadpool" or false) || - (f.hyper."0.12.16".runtime or false) || - (hyper."0.12.16"."runtime" or false); } - { "0.12.16"."tokio-timer" = - (f.hyper."0.12.16"."tokio-timer" or false) || - (f.hyper."0.12.16".runtime or false) || - (hyper."0.12.16"."runtime" or false); } - { "0.12.16".default = (f.hyper."0.12.16".default or true); } - ]; - iovec."${deps.hyper."0.12.16".iovec}".default = true; - itoa."${deps.hyper."0.12.16".itoa}".default = true; - log."${deps.hyper."0.12.16".log}".default = true; - net2."${deps.hyper."0.12.16".net2}".default = true; - time."${deps.hyper."0.12.16".time}".default = true; - tokio."${deps.hyper."0.12.16".tokio}".default = true; - tokio_executor."${deps.hyper."0.12.16".tokio_executor}".default = true; - tokio_io."${deps.hyper."0.12.16".tokio_io}".default = true; - tokio_reactor."${deps.hyper."0.12.16".tokio_reactor}".default = true; - tokio_tcp."${deps.hyper."0.12.16".tokio_tcp}".default = true; - tokio_threadpool."${deps.hyper."0.12.16".tokio_threadpool}".default = true; - tokio_timer."${deps.hyper."0.12.16".tokio_timer}".default = true; - want."${deps.hyper."0.12.16".want}".default = true; - }) [ - (features_.bytes."${deps."hyper"."0.12.16"."bytes"}" deps) - (features_.futures."${deps."hyper"."0.12.16"."futures"}" deps) - (features_.futures_cpupool."${deps."hyper"."0.12.16"."futures_cpupool"}" deps) - (features_.h2."${deps."hyper"."0.12.16"."h2"}" deps) - (features_.http."${deps."hyper"."0.12.16"."http"}" deps) - (features_.httparse."${deps."hyper"."0.12.16"."httparse"}" deps) - (features_.iovec."${deps."hyper"."0.12.16"."iovec"}" deps) - (features_.itoa."${deps."hyper"."0.12.16"."itoa"}" deps) - (features_.log."${deps."hyper"."0.12.16"."log"}" deps) - (features_.net2."${deps."hyper"."0.12.16"."net2"}" deps) - (features_.time."${deps."hyper"."0.12.16"."time"}" deps) - (features_.tokio."${deps."hyper"."0.12.16"."tokio"}" deps) - (features_.tokio_executor."${deps."hyper"."0.12.16"."tokio_executor"}" deps) - (features_.tokio_io."${deps."hyper"."0.12.16"."tokio_io"}" deps) - (features_.tokio_reactor."${deps."hyper"."0.12.16"."tokio_reactor"}" deps) - (features_.tokio_tcp."${deps."hyper"."0.12.16"."tokio_tcp"}" deps) - (features_.tokio_threadpool."${deps."hyper"."0.12.16"."tokio_threadpool"}" deps) - (features_.tokio_timer."${deps."hyper"."0.12.16"."tokio_timer"}" deps) - (features_.want."${deps."hyper"."0.12.16"."want"}" deps) - ]; - - -# end -# hyper-tls-0.3.1 - - crates.hyper_tls."0.3.1" = deps: { features?(features_.hyper_tls."0.3.1" deps {}) }: buildRustCrate { - crateName = "hyper-tls"; - version = "0.3.1"; - description = "Default TLS implementation for use with hyper"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "0sk46mmnccxgxwn62rl5m58c2ivwgxgd590cjwg60pjkhx9qn5r7"; - dependencies = mapFeatures features ([ - (crates."bytes"."${deps."hyper_tls"."0.3.1"."bytes"}" deps) - (crates."futures"."${deps."hyper_tls"."0.3.1"."futures"}" deps) - (crates."hyper"."${deps."hyper_tls"."0.3.1"."hyper"}" deps) - (crates."native_tls"."${deps."hyper_tls"."0.3.1"."native_tls"}" deps) - (crates."tokio_io"."${deps."hyper_tls"."0.3.1"."tokio_io"}" deps) - ]); - features = mkFeatures (features."hyper_tls"."0.3.1" or {}); - }; - features_.hyper_tls."0.3.1" = deps: f: updateFeatures f (rec { - bytes."${deps.hyper_tls."0.3.1".bytes}".default = true; - futures."${deps.hyper_tls."0.3.1".futures}".default = true; - hyper."${deps.hyper_tls."0.3.1".hyper}".default = true; - hyper_tls."0.3.1".default = (f.hyper_tls."0.3.1".default or true); - native_tls = fold recursiveUpdate {} [ - { "${deps.hyper_tls."0.3.1".native_tls}"."vendored" = - (f.native_tls."${deps.hyper_tls."0.3.1".native_tls}"."vendored" or false) || - (hyper_tls."0.3.1"."vendored" or false) || - (f."hyper_tls"."0.3.1"."vendored" or false); } - { "${deps.hyper_tls."0.3.1".native_tls}".default = true; } - ]; - tokio_io."${deps.hyper_tls."0.3.1".tokio_io}".default = true; - }) [ - (features_.bytes."${deps."hyper_tls"."0.3.1"."bytes"}" deps) - (features_.futures."${deps."hyper_tls"."0.3.1"."futures"}" deps) - (features_.hyper."${deps."hyper_tls"."0.3.1"."hyper"}" deps) - (features_.native_tls."${deps."hyper_tls"."0.3.1"."native_tls"}" deps) - (features_.tokio_io."${deps."hyper_tls"."0.3.1"."tokio_io"}" deps) - ]; - - -# end -# idna-0.1.4 - - crates.idna."0.1.4" = deps: { features?(features_.idna."0.1.4" deps {}) }: buildRustCrate { - crateName = "idna"; - version = "0.1.4"; - description = "IDNA (Internationalizing Domain Names in Applications) and Punycode."; - authors = [ "The rust-url developers" ]; - sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336"; - dependencies = mapFeatures features ([ - (crates."matches"."${deps."idna"."0.1.4"."matches"}" deps) - (crates."unicode_bidi"."${deps."idna"."0.1.4"."unicode_bidi"}" deps) - (crates."unicode_normalization"."${deps."idna"."0.1.4"."unicode_normalization"}" deps) - ]); - }; - features_.idna."0.1.4" = deps: f: updateFeatures f ({ - idna."0.1.4".default = (f.idna."0.1.4".default or true); - matches."${deps.idna."0.1.4".matches}".default = true; - unicode_bidi."${deps.idna."0.1.4".unicode_bidi}".default = true; - unicode_normalization."${deps.idna."0.1.4".unicode_normalization}".default = true; - }) [ - (features_.matches."${deps."idna"."0.1.4"."matches"}" deps) - (features_.unicode_bidi."${deps."idna"."0.1.4"."unicode_bidi"}" deps) - (features_.unicode_normalization."${deps."idna"."0.1.4"."unicode_normalization"}" deps) - ]; - - -# end -# indexmap-1.0.2 - - crates.indexmap."1.0.2" = deps: { features?(features_.indexmap."1.0.2" deps {}) }: buildRustCrate { - crateName = "indexmap"; - version = "1.0.2"; - description = "A hash table with consistent order and fast iteration.\n\nThe indexmap is a hash table where the iteration order of the key-value\npairs is independent of the hash values of the keys. It has the usual\nhash table functionality, it preserves insertion order except after\nremovals, and it allows lookup of its elements by either hash table key\nor numerical index. A corresponding hash set type is also provided.\n\nThis crate was initially published under the name ordermap, but it was renamed to\nindexmap.\n"; - authors = [ "bluss" "Josh Stone <cuviper@gmail.com>" ]; - sha256 = "18a0cn5xy3a7wswxg5lwfg3j4sh5blk28ykw0ysgr486djd353gf"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."indexmap"."1.0.2" or {}); - }; - features_.indexmap."1.0.2" = deps: f: updateFeatures f (rec { - indexmap = fold recursiveUpdate {} [ - { "1.0.2"."serde" = - (f.indexmap."1.0.2"."serde" or false) || - (f.indexmap."1.0.2".serde-1 or false) || - (indexmap."1.0.2"."serde-1" or false); } - { "1.0.2".default = (f.indexmap."1.0.2".default or true); } - ]; - }) []; - - -# end -# iovec-0.1.1 - - crates.iovec."0.1.1" = deps: { features?(features_.iovec."0.1.1" deps {}) }: buildRustCrate { - crateName = "iovec"; - version = "0.1.1"; - description = "Portable buffer type for scatter/gather I/O operations\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "14fns3g3arbql6lkczf2gbbzaqh22mfv7y1wq5rr2y8jhh5m8jmm"; - dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."iovec"."0.1.1"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."iovec"."0.1.1"."winapi"}" deps) - ]) else []); - }; - features_.iovec."0.1.1" = deps: f: updateFeatures f ({ - iovec."0.1.1".default = (f.iovec."0.1.1".default or true); - libc."${deps.iovec."0.1.1".libc}".default = true; - winapi."${deps.iovec."0.1.1".winapi}".default = true; - }) [ - (features_.libc."${deps."iovec"."0.1.1"."libc"}" deps) - (features_.winapi."${deps."iovec"."0.1.1"."winapi"}" deps) - ]; - - -# end -# isatty-0.1.5 - - crates.isatty."0.1.5" = deps: { features?(features_.isatty."0.1.5" deps {}) }: buildRustCrate { - crateName = "isatty"; - version = "0.1.5"; - description = "libc::isatty that also works on Windows"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0gp781mgqmvsp6a3iyhwk2sqis2ys8jfg3grq40m135zgb4d2cvj"; - dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."isatty"."0.1.5"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."kernel32_sys"."${deps."isatty"."0.1.5"."kernel32_sys"}" deps) - (crates."winapi"."${deps."isatty"."0.1.5"."winapi"}" deps) - ]) else []); - }; - features_.isatty."0.1.5" = deps: f: updateFeatures f ({ - isatty."0.1.5".default = (f.isatty."0.1.5".default or true); - kernel32_sys."${deps.isatty."0.1.5".kernel32_sys}".default = true; - libc."${deps.isatty."0.1.5".libc}".default = true; - winapi."${deps.isatty."0.1.5".winapi}".default = true; - }) [ - (features_.libc."${deps."isatty"."0.1.5"."libc"}" deps) - (features_.kernel32_sys."${deps."isatty"."0.1.5"."kernel32_sys"}" deps) - (features_.winapi."${deps."isatty"."0.1.5"."winapi"}" deps) - ]; - - -# end -# itertools-0.6.5 - - crates.itertools."0.6.5" = deps: { features?(features_.itertools."0.6.5" deps {}) }: buildRustCrate { - crateName = "itertools"; - version = "0.6.5"; - description = "Extra iterator adaptors, iterator methods, free functions, and macros."; - authors = [ "bluss" ]; - sha256 = "0gbhgn7s8qkxxw10i514fzpqnc3aissn4kcgylm2cvnv9zmg8mw1"; - dependencies = mapFeatures features ([ - (crates."either"."${deps."itertools"."0.6.5"."either"}" deps) - ]); - }; - features_.itertools."0.6.5" = deps: f: updateFeatures f ({ - either."${deps.itertools."0.6.5".either}".default = (f.either."${deps.itertools."0.6.5".either}".default or false); - itertools."0.6.5".default = (f.itertools."0.6.5".default or true); - }) [ - (features_.either."${deps."itertools"."0.6.5"."either"}" deps) - ]; - - -# end -# itoa-0.3.4 - - crates.itoa."0.3.4" = deps: { features?(features_.itoa."0.3.4" deps {}) }: buildRustCrate { - crateName = "itoa"; - version = "0.3.4"; - description = "Fast functions for printing integer primitives to an io::Write"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9"; - features = mkFeatures (features."itoa"."0.3.4" or {}); - }; - features_.itoa."0.3.4" = deps: f: updateFeatures f ({ - itoa."0.3.4".default = (f.itoa."0.3.4".default or true); - }) []; - - -# end -# itoa-0.4.3 - - crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate { - crateName = "itoa"; - version = "0.4.3"; - description = "Fast functions for printing integer primitives to an io::Write"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0zadimmdgvili3gdwxqg7ljv3r4wcdg1kkdfp9nl15vnm23vrhy1"; - features = mkFeatures (features."itoa"."0.4.3" or {}); - }; - features_.itoa."0.4.3" = deps: f: updateFeatures f (rec { - itoa = fold recursiveUpdate {} [ - { "0.4.3"."std" = - (f.itoa."0.4.3"."std" or false) || - (f.itoa."0.4.3".default or false) || - (itoa."0.4.3"."default" or false); } - { "0.4.3".default = (f.itoa."0.4.3".default or true); } - ]; - }) []; - - -# end -# kernel32-sys-0.2.2 - - crates.kernel32_sys."0.2.2" = deps: { features?(features_.kernel32_sys."0.2.2" deps {}) }: buildRustCrate { - crateName = "kernel32-sys"; - version = "0.2.2"; - description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants."; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; - libName = "kernel32"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."winapi"."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) - ]); - }; - features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f ({ - kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); - winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; - winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; - }) [ - (features_.winapi."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) - (features_.winapi_build."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) - ]; - - -# end -# lazy_static-0.2.10 - - crates.lazy_static."0.2.10" = deps: { features?(features_.lazy_static."0.2.10" deps {}) }: buildRustCrate { - crateName = "lazy_static"; - version = "0.2.10"; - description = "A macro for declaring lazily evaluated statics in Rust."; - authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "0ylwjvppsm56fpv32l4br7zw0pwn81wbfb1abalyyr1d9c94vg8r"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."lazy_static"."0.2.10" or {}); - }; - features_.lazy_static."0.2.10" = deps: f: updateFeatures f (rec { - lazy_static = fold recursiveUpdate {} [ - { "0.2.10"."compiletest_rs" = - (f.lazy_static."0.2.10"."compiletest_rs" or false) || - (f.lazy_static."0.2.10".compiletest or false) || - (lazy_static."0.2.10"."compiletest" or false); } - { "0.2.10"."nightly" = - (f.lazy_static."0.2.10"."nightly" or false) || - (f.lazy_static."0.2.10".spin_no_std or false) || - (lazy_static."0.2.10"."spin_no_std" or false); } - { "0.2.10"."spin" = - (f.lazy_static."0.2.10"."spin" or false) || - (f.lazy_static."0.2.10".spin_no_std or false) || - (lazy_static."0.2.10"."spin_no_std" or false); } - { "0.2.10".default = (f.lazy_static."0.2.10".default or true); } - ]; - }) []; - - -# end -# lazy_static-1.2.0 - - crates.lazy_static."1.2.0" = deps: { features?(features_.lazy_static."1.2.0" deps {}) }: buildRustCrate { - crateName = "lazy_static"; - version = "1.2.0"; - description = "A macro for declaring lazily evaluated statics in Rust."; - authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "07p3b30k2akyr6xw08ggd5qiz5nw3vd3agggj360fcc1njz7d0ss"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."lazy_static"."1.2.0" or {}); - }; - features_.lazy_static."1.2.0" = deps: f: updateFeatures f (rec { - lazy_static = fold recursiveUpdate {} [ - { "1.2.0"."spin" = - (f.lazy_static."1.2.0"."spin" or false) || - (f.lazy_static."1.2.0".spin_no_std or false) || - (lazy_static."1.2.0"."spin_no_std" or false); } - { "1.2.0".default = (f.lazy_static."1.2.0".default or true); } - ]; - }) []; - - -# end -# lazycell-1.2.0 - - crates.lazycell."1.2.0" = deps: { features?(features_.lazycell."1.2.0" deps {}) }: buildRustCrate { - crateName = "lazycell"; - version = "1.2.0"; - description = "A library providing a lazily filled Cell struct"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Nikita Pekin <contact@nikitapek.in>" ]; - sha256 = "1lzdb3q17yjihw9hksynxgyg8wbph1h791wff8rrf1c2aqjwhmax"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."lazycell"."1.2.0" or {}); - }; - features_.lazycell."1.2.0" = deps: f: updateFeatures f (rec { - lazycell = fold recursiveUpdate {} [ - { "1.2.0"."clippy" = - (f.lazycell."1.2.0"."clippy" or false) || - (f.lazycell."1.2.0".nightly-testing or false) || - (lazycell."1.2.0"."nightly-testing" or false); } - { "1.2.0"."nightly" = - (f.lazycell."1.2.0"."nightly" or false) || - (f.lazycell."1.2.0".nightly-testing or false) || - (lazycell."1.2.0"."nightly-testing" or false); } - { "1.2.0".default = (f.lazycell."1.2.0".default or true); } - ]; - }) []; - - -# end -# libc-0.2.44 - - crates.libc."0.2.44" = deps: { features?(features_.libc."0.2.44" deps {}) }: buildRustCrate { - crateName = "libc"; - version = "0.2.44"; - description = "A library for types and bindings to native C functions often found in libc or\nother common platform libraries.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "17a7p0lcf3qwl1pcxffdflgnx8zr2659mgzzg4zi5fnv1mlj3q6z"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."libc"."0.2.44" or {}); - }; - features_.libc."0.2.44" = deps: f: updateFeatures f (rec { - libc = fold recursiveUpdate {} [ - { "0.2.44"."align" = - (f.libc."0.2.44"."align" or false) || - (f.libc."0.2.44".rustc-dep-of-std or false) || - (libc."0.2.44"."rustc-dep-of-std" or false); } - { "0.2.44"."rustc-std-workspace-core" = - (f.libc."0.2.44"."rustc-std-workspace-core" or false) || - (f.libc."0.2.44".rustc-dep-of-std or false) || - (libc."0.2.44"."rustc-dep-of-std" or false); } - { "0.2.44"."use_std" = - (f.libc."0.2.44"."use_std" or false) || - (f.libc."0.2.44".default or false) || - (libc."0.2.44"."default" or false); } - { "0.2.44".default = (f.libc."0.2.44".default or true); } - ]; - }) []; - - -# end -# libflate-0.1.19 - - crates.libflate."0.1.19" = deps: { features?(features_.libflate."0.1.19" deps {}) }: buildRustCrate { - crateName = "libflate"; - version = "0.1.19"; - description = "A Rust implementation of DEFLATE algorithm and related formats (ZLIB, GZIP)"; - authors = [ "Takeru Ohta <phjgt308@gmail.com>" ]; - sha256 = "1klhvys9541xrwspyyv41qbr37xnwx4bdaspk6gbiprhrsqqkjp0"; - dependencies = mapFeatures features ([ - (crates."adler32"."${deps."libflate"."0.1.19"."adler32"}" deps) - (crates."byteorder"."${deps."libflate"."0.1.19"."byteorder"}" deps) - (crates."crc32fast"."${deps."libflate"."0.1.19"."crc32fast"}" deps) - ]); - }; - features_.libflate."0.1.19" = deps: f: updateFeatures f ({ - adler32."${deps.libflate."0.1.19".adler32}".default = true; - byteorder."${deps.libflate."0.1.19".byteorder}".default = true; - crc32fast."${deps.libflate."0.1.19".crc32fast}".default = true; - libflate."0.1.19".default = (f.libflate."0.1.19".default or true); - }) [ - (features_.adler32."${deps."libflate"."0.1.19"."adler32"}" deps) - (features_.byteorder."${deps."libflate"."0.1.19"."byteorder"}" deps) - (features_.crc32fast."${deps."libflate"."0.1.19"."crc32fast"}" deps) - ]; - - -# end -# lock_api-0.1.5 - - crates.lock_api."0.1.5" = deps: { features?(features_.lock_api."0.1.5" deps {}) }: buildRustCrate { - crateName = "lock_api"; - version = "0.1.5"; - description = "Wrappers to create fully-featured Mutex and RwLock types. Compatible with no_std."; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "132sidr5hvjfkaqm3l95zpcpi8yk5ddd0g79zf1ad4v65sxirqqm"; - dependencies = mapFeatures features ([ - (crates."scopeguard"."${deps."lock_api"."0.1.5"."scopeguard"}" deps) - ] - ++ (if features.lock_api."0.1.5".owning_ref or false then [ (crates.owning_ref."${deps."lock_api"."0.1.5".owning_ref}" deps) ] else [])); - features = mkFeatures (features."lock_api"."0.1.5" or {}); - }; - features_.lock_api."0.1.5" = deps: f: updateFeatures f ({ - lock_api."0.1.5".default = (f.lock_api."0.1.5".default or true); - owning_ref."${deps.lock_api."0.1.5".owning_ref}".default = true; - scopeguard."${deps.lock_api."0.1.5".scopeguard}".default = (f.scopeguard."${deps.lock_api."0.1.5".scopeguard}".default or false); - }) [ - (features_.owning_ref."${deps."lock_api"."0.1.5"."owning_ref"}" deps) - (features_.scopeguard."${deps."lock_api"."0.1.5"."scopeguard"}" deps) - ]; - - -# end -# log-0.3.8 - - crates.log."0.3.8" = deps: { features?(features_.log."0.3.8" deps {}) }: buildRustCrate { - crateName = "log"; - version = "0.3.8"; - description = "A lightweight logging facade for Rust\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; - features = mkFeatures (features."log"."0.3.8" or {}); - }; - features_.log."0.3.8" = deps: f: updateFeatures f (rec { - log = fold recursiveUpdate {} [ - { "0.3.8"."use_std" = - (f.log."0.3.8"."use_std" or false) || - (f.log."0.3.8".default or false) || - (log."0.3.8"."default" or false); } - { "0.3.8".default = (f.log."0.3.8".default or true); } - ]; - }) []; - - -# end -# log-0.4.6 - - crates.log."0.4.6" = deps: { features?(features_.log."0.4.6" deps {}) }: buildRustCrate { - crateName = "log"; - version = "0.4.6"; - description = "A lightweight logging facade for Rust\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1nd8dl9mvc9vd6fks5d4gsxaz990xi6rzlb8ymllshmwi153vngr"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."log"."0.4.6"."cfg_if"}" deps) - ]); - features = mkFeatures (features."log"."0.4.6" or {}); - }; - features_.log."0.4.6" = deps: f: updateFeatures f ({ - cfg_if."${deps.log."0.4.6".cfg_if}".default = true; - log."0.4.6".default = (f.log."0.4.6".default or true); - }) [ - (features_.cfg_if."${deps."log"."0.4.6"."cfg_if"}" deps) - ]; - - -# end -# maplit-0.1.6 - - crates.maplit."0.1.6" = deps: { features?(features_.maplit."0.1.6" deps {}) }: buildRustCrate { - crateName = "maplit"; - version = "0.1.6"; - description = "Container / collection literal macros for HashMap, HashSet, BTreeMap, BTreeSet."; - authors = [ "bluss" ]; - sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h"; - }; - features_.maplit."0.1.6" = deps: f: updateFeatures f ({ - maplit."0.1.6".default = (f.maplit."0.1.6".default or true); - }) []; - - -# end -# matches-0.1.6 - - crates.matches."0.1.6" = deps: { features?(features_.matches."0.1.6" deps {}) }: buildRustCrate { - crateName = "matches"; - version = "0.1.6"; - description = "A macro to evaluate, as a boolean, whether an expression matches a pattern."; - authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; - sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan"; - libPath = "lib.rs"; - }; - features_.matches."0.1.6" = deps: f: updateFeatures f ({ - matches."0.1.6".default = (f.matches."0.1.6".default or true); - }) []; - - -# end -# memchr-0.1.11 - - crates.memchr."0.1.11" = deps: { features?(features_.memchr."0.1.11" deps {}) }: buildRustCrate { - crateName = "memchr"; - version = "0.1.11"; - description = "Safe interface to memchr."; - authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ]; - sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."memchr"."0.1.11"."libc"}" deps) - ]); - }; - features_.memchr."0.1.11" = deps: f: updateFeatures f ({ - libc."${deps.memchr."0.1.11".libc}".default = true; - memchr."0.1.11".default = (f.memchr."0.1.11".default or true); - }) [ - (features_.libc."${deps."memchr"."0.1.11"."libc"}" deps) - ]; - - -# end -# memoffset-0.2.1 - - crates.memoffset."0.2.1" = deps: { features?(features_.memoffset."0.2.1" deps {}) }: buildRustCrate { - crateName = "memoffset"; - version = "0.2.1"; - description = "offset_of functionality for Rust structs."; - authors = [ "Gilad Naaman <gilad.naaman@gmail.com>" ]; - sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf"; - }; - features_.memoffset."0.2.1" = deps: f: updateFeatures f ({ - memoffset."0.2.1".default = (f.memoffset."0.2.1".default or true); - }) []; - - -# end -# mime-0.3.12 - - crates.mime."0.3.12" = deps: { features?(features_.mime."0.3.12" deps {}) }: buildRustCrate { - crateName = "mime"; - version = "0.3.12"; - description = "Strongly Typed Mimes"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "0lmcwkmxwbla9457w9ak13cfgqxfyn5wa1syjy1kll2ras5xifvh"; - dependencies = mapFeatures features ([ - (crates."unicase"."${deps."mime"."0.3.12"."unicase"}" deps) - ]); - }; - features_.mime."0.3.12" = deps: f: updateFeatures f ({ - mime."0.3.12".default = (f.mime."0.3.12".default or true); - unicase."${deps.mime."0.3.12".unicase}".default = true; - }) [ - (features_.unicase."${deps."mime"."0.3.12"."unicase"}" deps) - ]; - - -# end -# mime_guess-2.0.0-alpha.6 - - crates.mime_guess."2.0.0-alpha.6" = deps: { features?(features_.mime_guess."2.0.0-alpha.6" deps {}) }: buildRustCrate { - crateName = "mime_guess"; - version = "2.0.0-alpha.6"; - description = "A simple crate for detection of a file's MIME type by its extension."; - authors = [ "Austin Bonander <austin.bonander@gmail.com>" ]; - sha256 = "1k2mdq43gi2qr63b7m5zs624rfi40ysk33cay49jlhq97jwnk9db"; - dependencies = mapFeatures features ([ - (crates."mime"."${deps."mime_guess"."2.0.0-alpha.6"."mime"}" deps) - (crates."phf"."${deps."mime_guess"."2.0.0-alpha.6"."phf"}" deps) - (crates."unicase"."${deps."mime_guess"."2.0.0-alpha.6"."unicase"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."phf_codegen"."${deps."mime_guess"."2.0.0-alpha.6"."phf_codegen"}" deps) - (crates."unicase"."${deps."mime_guess"."2.0.0-alpha.6"."unicase"}" deps) - ]); - features = mkFeatures (features."mime_guess"."2.0.0-alpha.6" or {}); - }; - features_.mime_guess."2.0.0-alpha.6" = deps: f: updateFeatures f ({ - mime."${deps.mime_guess."2.0.0-alpha.6".mime}".default = true; - mime_guess."2.0.0-alpha.6".default = (f.mime_guess."2.0.0-alpha.6".default or true); - phf = fold recursiveUpdate {} [ - { "${deps.mime_guess."2.0.0-alpha.6".phf}"."unicase" = true; } - { "${deps.mime_guess."2.0.0-alpha.6".phf}".default = true; } - ]; - phf_codegen."${deps.mime_guess."2.0.0-alpha.6".phf_codegen}".default = true; - unicase."${deps.mime_guess."2.0.0-alpha.6".unicase}".default = true; - }) [ - (features_.mime."${deps."mime_guess"."2.0.0-alpha.6"."mime"}" deps) - (features_.phf."${deps."mime_guess"."2.0.0-alpha.6"."phf"}" deps) - (features_.unicase."${deps."mime_guess"."2.0.0-alpha.6"."unicase"}" deps) - (features_.phf_codegen."${deps."mime_guess"."2.0.0-alpha.6"."phf_codegen"}" deps) - (features_.unicase."${deps."mime_guess"."2.0.0-alpha.6"."unicase"}" deps) - ]; - - -# end -# miniz-sys-0.1.10 - - crates.miniz_sys."0.1.10" = deps: { features?(features_.miniz_sys."0.1.10" deps {}) }: buildRustCrate { - crateName = "miniz-sys"; - version = "0.1.10"; - description = "Bindings to the miniz.c library.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln"; - libPath = "lib.rs"; - libName = "miniz_sys"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."miniz_sys"."0.1.10"."libc"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."miniz_sys"."0.1.10"."cc"}" deps) - ]); - }; - features_.miniz_sys."0.1.10" = deps: f: updateFeatures f ({ - cc."${deps.miniz_sys."0.1.10".cc}".default = true; - libc."${deps.miniz_sys."0.1.10".libc}".default = true; - miniz_sys."0.1.10".default = (f.miniz_sys."0.1.10".default or true); - }) [ - (features_.libc."${deps."miniz_sys"."0.1.10"."libc"}" deps) - (features_.cc."${deps."miniz_sys"."0.1.10"."cc"}" deps) - ]; - - -# end -# mio-0.6.16 - - crates.mio."0.6.16" = deps: { features?(features_.mio."0.6.16" deps {}) }: buildRustCrate { - crateName = "mio"; - version = "0.6.16"; - description = "Lightweight non-blocking IO"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "14vyrlmf0w984pi7ad9qvmlfj6vrb0wn6i8ik9j87w5za2r3rban"; - dependencies = mapFeatures features ([ - (crates."iovec"."${deps."mio"."0.6.16"."iovec"}" deps) - (crates."lazycell"."${deps."mio"."0.6.16"."lazycell"}" deps) - (crates."log"."${deps."mio"."0.6.16"."log"}" deps) - (crates."net2"."${deps."mio"."0.6.16"."net2"}" deps) - (crates."slab"."${deps."mio"."0.6.16"."slab"}" deps) - ]) - ++ (if kernel == "fuchsia" then mapFeatures features ([ - (crates."fuchsia_zircon"."${deps."mio"."0.6.16"."fuchsia_zircon"}" deps) - (crates."fuchsia_zircon_sys"."${deps."mio"."0.6.16"."fuchsia_zircon_sys"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."mio"."0.6.16"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."kernel32_sys"."${deps."mio"."0.6.16"."kernel32_sys"}" deps) - (crates."miow"."${deps."mio"."0.6.16"."miow"}" deps) - (crates."winapi"."${deps."mio"."0.6.16"."winapi"}" deps) - ]) else []); - features = mkFeatures (features."mio"."0.6.16" or {}); - }; - features_.mio."0.6.16" = deps: f: updateFeatures f (rec { - fuchsia_zircon."${deps.mio."0.6.16".fuchsia_zircon}".default = true; - fuchsia_zircon_sys."${deps.mio."0.6.16".fuchsia_zircon_sys}".default = true; - iovec."${deps.mio."0.6.16".iovec}".default = true; - kernel32_sys."${deps.mio."0.6.16".kernel32_sys}".default = true; - lazycell."${deps.mio."0.6.16".lazycell}".default = true; - libc."${deps.mio."0.6.16".libc}".default = true; - log."${deps.mio."0.6.16".log}".default = true; - mio = fold recursiveUpdate {} [ - { "0.6.16"."with-deprecated" = - (f.mio."0.6.16"."with-deprecated" or false) || - (f.mio."0.6.16".default or false) || - (mio."0.6.16"."default" or false); } - { "0.6.16".default = (f.mio."0.6.16".default or true); } - ]; - miow."${deps.mio."0.6.16".miow}".default = true; - net2."${deps.mio."0.6.16".net2}".default = true; - slab."${deps.mio."0.6.16".slab}".default = true; - winapi."${deps.mio."0.6.16".winapi}".default = true; - }) [ - (features_.iovec."${deps."mio"."0.6.16"."iovec"}" deps) - (features_.lazycell."${deps."mio"."0.6.16"."lazycell"}" deps) - (features_.log."${deps."mio"."0.6.16"."log"}" deps) - (features_.net2."${deps."mio"."0.6.16"."net2"}" deps) - (features_.slab."${deps."mio"."0.6.16"."slab"}" deps) - (features_.fuchsia_zircon."${deps."mio"."0.6.16"."fuchsia_zircon"}" deps) - (features_.fuchsia_zircon_sys."${deps."mio"."0.6.16"."fuchsia_zircon_sys"}" deps) - (features_.libc."${deps."mio"."0.6.16"."libc"}" deps) - (features_.kernel32_sys."${deps."mio"."0.6.16"."kernel32_sys"}" deps) - (features_.miow."${deps."mio"."0.6.16"."miow"}" deps) - (features_.winapi."${deps."mio"."0.6.16"."winapi"}" deps) - ]; - - -# end -# miow-0.2.1 - - crates.miow."0.2.1" = deps: { features?(features_.miow."0.2.1" deps {}) }: buildRustCrate { - crateName = "miow"; - version = "0.2.1"; - description = "A zero overhead I/O library for Windows, focusing on IOCP and Async I/O\nabstractions.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0"; - dependencies = mapFeatures features ([ - (crates."kernel32_sys"."${deps."miow"."0.2.1"."kernel32_sys"}" deps) - (crates."net2"."${deps."miow"."0.2.1"."net2"}" deps) - (crates."winapi"."${deps."miow"."0.2.1"."winapi"}" deps) - (crates."ws2_32_sys"."${deps."miow"."0.2.1"."ws2_32_sys"}" deps) - ]); - }; - features_.miow."0.2.1" = deps: f: updateFeatures f ({ - kernel32_sys."${deps.miow."0.2.1".kernel32_sys}".default = true; - miow."0.2.1".default = (f.miow."0.2.1".default or true); - net2."${deps.miow."0.2.1".net2}".default = (f.net2."${deps.miow."0.2.1".net2}".default or false); - winapi."${deps.miow."0.2.1".winapi}".default = true; - ws2_32_sys."${deps.miow."0.2.1".ws2_32_sys}".default = true; - }) [ - (features_.kernel32_sys."${deps."miow"."0.2.1"."kernel32_sys"}" deps) - (features_.net2."${deps."miow"."0.2.1"."net2"}" deps) - (features_.winapi."${deps."miow"."0.2.1"."winapi"}" deps) - (features_.ws2_32_sys."${deps."miow"."0.2.1"."ws2_32_sys"}" deps) - ]; - - -# end -# native-tls-0.2.2 - - crates.native_tls."0.2.2" = deps: { features?(features_.native_tls."0.2.2" deps {}) }: buildRustCrate { - crateName = "native-tls"; - version = "0.2.2"; - description = "A wrapper over a platform's native TLS implementation"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0vl2hmmnrcjfylzjfsbnav20ri2n1qjgxn7bklb4mk3fyxfqm1m9"; - dependencies = (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ - (crates."lazy_static"."${deps."native_tls"."0.2.2"."lazy_static"}" deps) - (crates."libc"."${deps."native_tls"."0.2.2"."libc"}" deps) - (crates."security_framework"."${deps."native_tls"."0.2.2"."security_framework"}" deps) - (crates."security_framework_sys"."${deps."native_tls"."0.2.2"."security_framework_sys"}" deps) - (crates."tempfile"."${deps."native_tls"."0.2.2"."tempfile"}" deps) - ]) else []) - ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ - (crates."openssl"."${deps."native_tls"."0.2.2"."openssl"}" deps) - (crates."openssl_probe"."${deps."native_tls"."0.2.2"."openssl_probe"}" deps) - (crates."openssl_sys"."${deps."native_tls"."0.2.2"."openssl_sys"}" deps) - ]) else []) - ++ (if kernel == "android" then mapFeatures features ([ - (crates."log"."${deps."native_tls"."0.2.2"."log"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."schannel"."${deps."native_tls"."0.2.2"."schannel"}" deps) - ]) else []); - features = mkFeatures (features."native_tls"."0.2.2" or {}); - }; - features_.native_tls."0.2.2" = deps: f: updateFeatures f ({ - lazy_static."${deps.native_tls."0.2.2".lazy_static}".default = true; - libc."${deps.native_tls."0.2.2".libc}".default = true; - log."${deps.native_tls."0.2.2".log}".default = true; - native_tls."0.2.2".default = (f.native_tls."0.2.2".default or true); - openssl."${deps.native_tls."0.2.2".openssl}".default = true; - openssl_probe."${deps.native_tls."0.2.2".openssl_probe}".default = true; - openssl_sys."${deps.native_tls."0.2.2".openssl_sys}".default = true; - schannel."${deps.native_tls."0.2.2".schannel}".default = true; - security_framework."${deps.native_tls."0.2.2".security_framework}".default = true; - security_framework_sys."${deps.native_tls."0.2.2".security_framework_sys}".default = true; - tempfile."${deps.native_tls."0.2.2".tempfile}".default = true; - }) [ - (features_.lazy_static."${deps."native_tls"."0.2.2"."lazy_static"}" deps) - (features_.libc."${deps."native_tls"."0.2.2"."libc"}" deps) - (features_.security_framework."${deps."native_tls"."0.2.2"."security_framework"}" deps) - (features_.security_framework_sys."${deps."native_tls"."0.2.2"."security_framework_sys"}" deps) - (features_.tempfile."${deps."native_tls"."0.2.2"."tempfile"}" deps) - (features_.openssl."${deps."native_tls"."0.2.2"."openssl"}" deps) - (features_.openssl_probe."${deps."native_tls"."0.2.2"."openssl_probe"}" deps) - (features_.openssl_sys."${deps."native_tls"."0.2.2"."openssl_sys"}" deps) - (features_.log."${deps."native_tls"."0.2.2"."log"}" deps) - (features_.schannel."${deps."native_tls"."0.2.2"."schannel"}" deps) - ]; - - -# end -# net2-0.2.33 - - crates.net2."0.2.33" = deps: { features?(features_.net2."0.2.33" deps {}) }: buildRustCrate { - crateName = "net2"; - version = "0.2.33"; - description = "Extensions to the standard library's networking types as proposed in RFC 1158.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1qnmajafgybj5wyxz9iffa8x5wgbwd2znfklmhqj7vl6lw1m65mq"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."net2"."0.2.33"."cfg_if"}" deps) - ]) - ++ (if kernel == "redox" || (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."net2"."0.2.33"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."net2"."0.2.33"."winapi"}" deps) - ]) else []); - features = mkFeatures (features."net2"."0.2.33" or {}); - }; - features_.net2."0.2.33" = deps: f: updateFeatures f (rec { - cfg_if."${deps.net2."0.2.33".cfg_if}".default = true; - libc."${deps.net2."0.2.33".libc}".default = true; - net2 = fold recursiveUpdate {} [ - { "0.2.33"."duration" = - (f.net2."0.2.33"."duration" or false) || - (f.net2."0.2.33".default or false) || - (net2."0.2.33"."default" or false); } - { "0.2.33".default = (f.net2."0.2.33".default or true); } - ]; - winapi = fold recursiveUpdate {} [ - { "${deps.net2."0.2.33".winapi}"."handleapi" = true; } - { "${deps.net2."0.2.33".winapi}"."winsock2" = true; } - { "${deps.net2."0.2.33".winapi}"."ws2def" = true; } - { "${deps.net2."0.2.33".winapi}"."ws2ipdef" = true; } - { "${deps.net2."0.2.33".winapi}"."ws2tcpip" = true; } - { "${deps.net2."0.2.33".winapi}".default = true; } - ]; - }) [ - (features_.cfg_if."${deps."net2"."0.2.33"."cfg_if"}" deps) - (features_.libc."${deps."net2"."0.2.33"."libc"}" deps) - (features_.winapi."${deps."net2"."0.2.33"."winapi"}" deps) - ]; - - -# end -# nodrop-0.1.13 - - crates.nodrop."0.1.13" = deps: { features?(features_.nodrop."0.1.13" deps {}) }: buildRustCrate { - crateName = "nodrop"; - version = "0.1.13"; - description = "A wrapper type to inhibit drop (destructor). Use std::mem::ManuallyDrop instead!"; - authors = [ "bluss" ]; - sha256 = "0gkfx6wihr9z0m8nbdhma5pyvbipznjpkzny2d4zkc05b0vnhinb"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."nodrop"."0.1.13" or {}); - }; - features_.nodrop."0.1.13" = deps: f: updateFeatures f (rec { - nodrop = fold recursiveUpdate {} [ - { "0.1.13"."nodrop-union" = - (f.nodrop."0.1.13"."nodrop-union" or false) || - (f.nodrop."0.1.13".use_union or false) || - (nodrop."0.1.13"."use_union" or false); } - { "0.1.13"."std" = - (f.nodrop."0.1.13"."std" or false) || - (f.nodrop."0.1.13".default or false) || - (nodrop."0.1.13"."default" or false); } - { "0.1.13".default = (f.nodrop."0.1.13".default or true); } - ]; - }) []; - - -# end -# num-0.1.40 - - crates.num."0.1.40" = deps: { features?(features_.num."0.1.40" deps {}) }: buildRustCrate { - crateName = "num"; - version = "0.1.40"; - description = "A collection of numeric types and traits for Rust, including bigint,\ncomplex, rational, range iterators, generic integers, and more!\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0b29c25n9mpf6a921khj7a6y3hz5va4vgwppcd2if975qq1shakg"; - dependencies = mapFeatures features ([ - (crates."num_integer"."${deps."num"."0.1.40"."num_integer"}" deps) - (crates."num_iter"."${deps."num"."0.1.40"."num_iter"}" deps) - (crates."num_traits"."${deps."num"."0.1.40"."num_traits"}" deps) - ]); - features = mkFeatures (features."num"."0.1.40" or {}); - }; - features_.num."0.1.40" = deps: f: updateFeatures f (rec { - num = fold recursiveUpdate {} [ - { "0.1.40"."bigint" = - (f.num."0.1.40"."bigint" or false) || - (f.num."0.1.40".default or false) || - (num."0.1.40"."default" or false); } - { "0.1.40"."complex" = - (f.num."0.1.40"."complex" or false) || - (f.num."0.1.40".default or false) || - (num."0.1.40"."default" or false); } - { "0.1.40"."num-bigint" = - (f.num."0.1.40"."num-bigint" or false) || - (f.num."0.1.40".bigint or false) || - (num."0.1.40"."bigint" or false); } - { "0.1.40"."num-complex" = - (f.num."0.1.40"."num-complex" or false) || - (f.num."0.1.40".complex or false) || - (num."0.1.40"."complex" or false); } - { "0.1.40"."num-rational" = - (f.num."0.1.40"."num-rational" or false) || - (f.num."0.1.40".rational or false) || - (num."0.1.40"."rational" or false); } - { "0.1.40"."rational" = - (f.num."0.1.40"."rational" or false) || - (f.num."0.1.40".default or false) || - (num."0.1.40"."default" or false); } - { "0.1.40"."rustc-serialize" = - (f.num."0.1.40"."rustc-serialize" or false) || - (f.num."0.1.40".default or false) || - (num."0.1.40"."default" or false); } - { "0.1.40".default = (f.num."0.1.40".default or true); } - ]; - num_integer."${deps.num."0.1.40".num_integer}".default = true; - num_iter."${deps.num."0.1.40".num_iter}".default = true; - num_traits."${deps.num."0.1.40".num_traits}".default = true; - }) [ - (features_.num_integer."${deps."num"."0.1.40"."num_integer"}" deps) - (features_.num_iter."${deps."num"."0.1.40"."num_iter"}" deps) - (features_.num_traits."${deps."num"."0.1.40"."num_traits"}" deps) - ]; - - -# end -# num-integer-0.1.35 - - crates.num_integer."0.1.35" = deps: { features?(features_.num_integer."0.1.35" deps {}) }: buildRustCrate { - crateName = "num-integer"; - version = "0.1.35"; - description = "Integer traits and functions"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0xybj8isi9b6wc646d5rc043i8l8j6wy0vrl4pn995qms9fxbbcc"; - dependencies = mapFeatures features ([ - (crates."num_traits"."${deps."num_integer"."0.1.35"."num_traits"}" deps) - ]); - }; - features_.num_integer."0.1.35" = deps: f: updateFeatures f ({ - num_integer."0.1.35".default = (f.num_integer."0.1.35".default or true); - num_traits."${deps.num_integer."0.1.35".num_traits}".default = true; - }) [ - (features_.num_traits."${deps."num_integer"."0.1.35"."num_traits"}" deps) - ]; - - -# end -# num-iter-0.1.34 - - crates.num_iter."0.1.34" = deps: { features?(features_.num_iter."0.1.34" deps {}) }: buildRustCrate { - crateName = "num-iter"; - version = "0.1.34"; - description = "External iterators for generic mathematics"; - authors = [ "The Rust Project Developers" ]; - sha256 = "02cld7x9dzbqbs6sxxzq1i22z3awlcd6ljkgvhkfr9rsnaxphzl9"; - dependencies = mapFeatures features ([ - (crates."num_integer"."${deps."num_iter"."0.1.34"."num_integer"}" deps) - (crates."num_traits"."${deps."num_iter"."0.1.34"."num_traits"}" deps) - ]); - }; - features_.num_iter."0.1.34" = deps: f: updateFeatures f ({ - num_integer."${deps.num_iter."0.1.34".num_integer}".default = true; - num_iter."0.1.34".default = (f.num_iter."0.1.34".default or true); - num_traits."${deps.num_iter."0.1.34".num_traits}".default = true; - }) [ - (features_.num_integer."${deps."num_iter"."0.1.34"."num_integer"}" deps) - (features_.num_traits."${deps."num_iter"."0.1.34"."num_traits"}" deps) - ]; - - -# end -# num-traits-0.1.40 - - crates.num_traits."0.1.40" = deps: { features?(features_.num_traits."0.1.40" deps {}) }: buildRustCrate { - crateName = "num-traits"; - version = "0.1.40"; - description = "Numeric traits for generic mathematics"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; - }; - features_.num_traits."0.1.40" = deps: f: updateFeatures f ({ - num_traits."0.1.40".default = (f.num_traits."0.1.40".default or true); - }) []; - - -# end -# num_cpus-1.8.0 - - crates.num_cpus."1.8.0" = deps: { features?(features_.num_cpus."1.8.0" deps {}) }: buildRustCrate { - crateName = "num_cpus"; - version = "1.8.0"; - description = "Get the number of CPUs on a machine."; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1y6qnd9r8ga6y8mvlabdrr73nc8cshjjlzbvnanzyj9b8zzkfwk2"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."num_cpus"."1.8.0"."libc"}" deps) - ]); - }; - features_.num_cpus."1.8.0" = deps: f: updateFeatures f ({ - libc."${deps.num_cpus."1.8.0".libc}".default = true; - num_cpus."1.8.0".default = (f.num_cpus."1.8.0".default or true); - }) [ - (features_.libc."${deps."num_cpus"."1.8.0"."libc"}" deps) - ]; - - -# end -# openssl-0.10.15 - - crates.openssl."0.10.15" = deps: { features?(features_.openssl."0.10.15" deps {}) }: buildRustCrate { - crateName = "openssl"; - version = "0.10.15"; - description = "OpenSSL bindings"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0fj5g66ibkyb6vfdfjgaypfn45vpj2cdv7d7qpq653sv57glcqri"; - dependencies = mapFeatures features ([ - (crates."bitflags"."${deps."openssl"."0.10.15"."bitflags"}" deps) - (crates."cfg_if"."${deps."openssl"."0.10.15"."cfg_if"}" deps) - (crates."foreign_types"."${deps."openssl"."0.10.15"."foreign_types"}" deps) - (crates."lazy_static"."${deps."openssl"."0.10.15"."lazy_static"}" deps) - (crates."libc"."${deps."openssl"."0.10.15"."libc"}" deps) - (crates."openssl_sys"."${deps."openssl"."0.10.15"."openssl_sys"}" deps) - ]); - features = mkFeatures (features."openssl"."0.10.15" or {}); - }; - features_.openssl."0.10.15" = deps: f: updateFeatures f (rec { - bitflags."${deps.openssl."0.10.15".bitflags}".default = true; - cfg_if."${deps.openssl."0.10.15".cfg_if}".default = true; - foreign_types."${deps.openssl."0.10.15".foreign_types}".default = true; - lazy_static."${deps.openssl."0.10.15".lazy_static}".default = true; - libc."${deps.openssl."0.10.15".libc}".default = true; - openssl."0.10.15".default = (f.openssl."0.10.15".default or true); - openssl_sys = fold recursiveUpdate {} [ - { "${deps.openssl."0.10.15".openssl_sys}"."vendored" = - (f.openssl_sys."${deps.openssl."0.10.15".openssl_sys}"."vendored" or false) || - (openssl."0.10.15"."vendored" or false) || - (f."openssl"."0.10.15"."vendored" or false); } - { "${deps.openssl."0.10.15".openssl_sys}".default = true; } - ]; - }) [ - (features_.bitflags."${deps."openssl"."0.10.15"."bitflags"}" deps) - (features_.cfg_if."${deps."openssl"."0.10.15"."cfg_if"}" deps) - (features_.foreign_types."${deps."openssl"."0.10.15"."foreign_types"}" deps) - (features_.lazy_static."${deps."openssl"."0.10.15"."lazy_static"}" deps) - (features_.libc."${deps."openssl"."0.10.15"."libc"}" deps) - (features_.openssl_sys."${deps."openssl"."0.10.15"."openssl_sys"}" deps) - ]; - - -# end -# openssl-probe-0.1.2 - - crates.openssl_probe."0.1.2" = deps: { features?(features_.openssl_probe."0.1.2" deps {}) }: buildRustCrate { - crateName = "openssl-probe"; - version = "0.1.2"; - description = "Tool for helping to find SSL certificate locations on the system for OpenSSL\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a"; - }; - features_.openssl_probe."0.1.2" = deps: f: updateFeatures f ({ - openssl_probe."0.1.2".default = (f.openssl_probe."0.1.2".default or true); - }) []; - - -# end -# openssl-sys-0.9.39 - - crates.openssl_sys."0.9.39" = deps: { features?(features_.openssl_sys."0.9.39" deps {}) }: buildRustCrate { - crateName = "openssl-sys"; - version = "0.9.39"; - description = "FFI bindings to OpenSSL"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "1lraqg3xz4jxrc99na17kn6srfhsgnj1yjk29mgsh803w40s2056"; - build = "build/main.rs"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."openssl_sys"."0.9.39"."libc"}" deps) - ]) - ++ (if abi == "msvc" then mapFeatures features ([ -]) else []); - - buildDependencies = mapFeatures features ([ - (crates."cc"."${deps."openssl_sys"."0.9.39"."cc"}" deps) - (crates."pkg_config"."${deps."openssl_sys"."0.9.39"."pkg_config"}" deps) - ]); - features = mkFeatures (features."openssl_sys"."0.9.39" or {}); - }; - features_.openssl_sys."0.9.39" = deps: f: updateFeatures f (rec { - cc."${deps.openssl_sys."0.9.39".cc}".default = true; - libc."${deps.openssl_sys."0.9.39".libc}".default = true; - openssl_sys = fold recursiveUpdate {} [ - { "0.9.39"."openssl-src" = - (f.openssl_sys."0.9.39"."openssl-src" or false) || - (f.openssl_sys."0.9.39".vendored or false) || - (openssl_sys."0.9.39"."vendored" or false); } - { "0.9.39".default = (f.openssl_sys."0.9.39".default or true); } - ]; - pkg_config."${deps.openssl_sys."0.9.39".pkg_config}".default = true; - }) [ - (features_.libc."${deps."openssl_sys"."0.9.39"."libc"}" deps) - (features_.cc."${deps."openssl_sys"."0.9.39"."cc"}" deps) - (features_.pkg_config."${deps."openssl_sys"."0.9.39"."pkg_config"}" deps) - ]; - - -# end -# owning_ref-0.4.0 - - crates.owning_ref."0.4.0" = deps: { features?(features_.owning_ref."0.4.0" deps {}) }: buildRustCrate { - crateName = "owning_ref"; - version = "0.4.0"; - description = "A library for creating references that carry their owner with them."; - authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "1m95qpc3hamkw9wlbfzqkzk7h6skyj40zr6sa3ps151slcfnnchm"; - dependencies = mapFeatures features ([ - (crates."stable_deref_trait"."${deps."owning_ref"."0.4.0"."stable_deref_trait"}" deps) - ]); - }; - features_.owning_ref."0.4.0" = deps: f: updateFeatures f ({ - owning_ref."0.4.0".default = (f.owning_ref."0.4.0".default or true); - stable_deref_trait."${deps.owning_ref."0.4.0".stable_deref_trait}".default = true; - }) [ - (features_.stable_deref_trait."${deps."owning_ref"."0.4.0"."stable_deref_trait"}" deps) - ]; - - -# end -# parking_lot-0.6.4 - - crates.parking_lot."0.6.4" = deps: { features?(features_.parking_lot."0.6.4" deps {}) }: buildRustCrate { - crateName = "parking_lot"; - version = "0.6.4"; - description = "More compact and efficient implementations of the standard synchronization primitives."; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "0qwfysx8zfkj72sfcrqvd6pp7lgjmklyixsi3y0g6xjspw876rax"; - dependencies = mapFeatures features ([ - (crates."lock_api"."${deps."parking_lot"."0.6.4"."lock_api"}" deps) - (crates."parking_lot_core"."${deps."parking_lot"."0.6.4"."parking_lot_core"}" deps) - ]); - features = mkFeatures (features."parking_lot"."0.6.4" or {}); - }; - features_.parking_lot."0.6.4" = deps: f: updateFeatures f (rec { - lock_api = fold recursiveUpdate {} [ - { "${deps.parking_lot."0.6.4".lock_api}"."nightly" = - (f.lock_api."${deps.parking_lot."0.6.4".lock_api}"."nightly" or false) || - (parking_lot."0.6.4"."nightly" or false) || - (f."parking_lot"."0.6.4"."nightly" or false); } - { "${deps.parking_lot."0.6.4".lock_api}"."owning_ref" = - (f.lock_api."${deps.parking_lot."0.6.4".lock_api}"."owning_ref" or false) || - (parking_lot."0.6.4"."owning_ref" or false) || - (f."parking_lot"."0.6.4"."owning_ref" or false); } - { "${deps.parking_lot."0.6.4".lock_api}".default = true; } - ]; - parking_lot = fold recursiveUpdate {} [ - { "0.6.4"."owning_ref" = - (f.parking_lot."0.6.4"."owning_ref" or false) || - (f.parking_lot."0.6.4".default or false) || - (parking_lot."0.6.4"."default" or false); } - { "0.6.4".default = (f.parking_lot."0.6.4".default or true); } - ]; - parking_lot_core = fold recursiveUpdate {} [ - { "${deps.parking_lot."0.6.4".parking_lot_core}"."deadlock_detection" = - (f.parking_lot_core."${deps.parking_lot."0.6.4".parking_lot_core}"."deadlock_detection" or false) || - (parking_lot."0.6.4"."deadlock_detection" or false) || - (f."parking_lot"."0.6.4"."deadlock_detection" or false); } - { "${deps.parking_lot."0.6.4".parking_lot_core}"."nightly" = - (f.parking_lot_core."${deps.parking_lot."0.6.4".parking_lot_core}"."nightly" or false) || - (parking_lot."0.6.4"."nightly" or false) || - (f."parking_lot"."0.6.4"."nightly" or false); } - { "${deps.parking_lot."0.6.4".parking_lot_core}".default = true; } - ]; - }) [ - (features_.lock_api."${deps."parking_lot"."0.6.4"."lock_api"}" deps) - (features_.parking_lot_core."${deps."parking_lot"."0.6.4"."parking_lot_core"}" deps) - ]; - - -# end -# parking_lot_core-0.3.1 - - crates.parking_lot_core."0.3.1" = deps: { features?(features_.parking_lot_core."0.3.1" deps {}) }: buildRustCrate { - crateName = "parking_lot_core"; - version = "0.3.1"; - description = "An advanced API for creating custom synchronization primitives."; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "0h5p7dys8cx9y6ii4i57ampf7qdr8zmkpn543kd3h7nkhml8bw72"; - dependencies = mapFeatures features ([ - (crates."rand"."${deps."parking_lot_core"."0.3.1"."rand"}" deps) - (crates."smallvec"."${deps."parking_lot_core"."0.3.1"."smallvec"}" deps) - ]) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."parking_lot_core"."0.3.1"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."parking_lot_core"."0.3.1"."winapi"}" deps) - ]) else []); - - buildDependencies = mapFeatures features ([ - (crates."rustc_version"."${deps."parking_lot_core"."0.3.1"."rustc_version"}" deps) - ]); - features = mkFeatures (features."parking_lot_core"."0.3.1" or {}); - }; - features_.parking_lot_core."0.3.1" = deps: f: updateFeatures f (rec { - libc."${deps.parking_lot_core."0.3.1".libc}".default = true; - parking_lot_core = fold recursiveUpdate {} [ - { "0.3.1"."backtrace" = - (f.parking_lot_core."0.3.1"."backtrace" or false) || - (f.parking_lot_core."0.3.1".deadlock_detection or false) || - (parking_lot_core."0.3.1"."deadlock_detection" or false); } - { "0.3.1"."petgraph" = - (f.parking_lot_core."0.3.1"."petgraph" or false) || - (f.parking_lot_core."0.3.1".deadlock_detection or false) || - (parking_lot_core."0.3.1"."deadlock_detection" or false); } - { "0.3.1"."thread-id" = - (f.parking_lot_core."0.3.1"."thread-id" or false) || - (f.parking_lot_core."0.3.1".deadlock_detection or false) || - (parking_lot_core."0.3.1"."deadlock_detection" or false); } - { "0.3.1".default = (f.parking_lot_core."0.3.1".default or true); } - ]; - rand."${deps.parking_lot_core."0.3.1".rand}".default = true; - rustc_version."${deps.parking_lot_core."0.3.1".rustc_version}".default = true; - smallvec."${deps.parking_lot_core."0.3.1".smallvec}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.parking_lot_core."0.3.1".winapi}"."errhandlingapi" = true; } - { "${deps.parking_lot_core."0.3.1".winapi}"."handleapi" = true; } - { "${deps.parking_lot_core."0.3.1".winapi}"."minwindef" = true; } - { "${deps.parking_lot_core."0.3.1".winapi}"."ntstatus" = true; } - { "${deps.parking_lot_core."0.3.1".winapi}"."winbase" = true; } - { "${deps.parking_lot_core."0.3.1".winapi}"."winerror" = true; } - { "${deps.parking_lot_core."0.3.1".winapi}"."winnt" = true; } - { "${deps.parking_lot_core."0.3.1".winapi}".default = true; } - ]; - }) [ - (features_.rand."${deps."parking_lot_core"."0.3.1"."rand"}" deps) - (features_.smallvec."${deps."parking_lot_core"."0.3.1"."smallvec"}" deps) - (features_.rustc_version."${deps."parking_lot_core"."0.3.1"."rustc_version"}" deps) - (features_.libc."${deps."parking_lot_core"."0.3.1"."libc"}" deps) - (features_.winapi."${deps."parking_lot_core"."0.3.1"."winapi"}" deps) - ]; - - -# end -# percent-encoding-1.0.1 - - crates.percent_encoding."1.0.1" = deps: { features?(features_.percent_encoding."1.0.1" deps {}) }: buildRustCrate { - crateName = "percent-encoding"; - version = "1.0.1"; - description = "Percent encoding and decoding"; - authors = [ "The rust-url developers" ]; - sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i"; - libPath = "lib.rs"; - }; - features_.percent_encoding."1.0.1" = deps: f: updateFeatures f ({ - percent_encoding."1.0.1".default = (f.percent_encoding."1.0.1".default or true); - }) []; - - -# end -# phf-0.7.21 - - crates.phf."0.7.21" = deps: { features?(features_.phf."0.7.21" deps {}) }: buildRustCrate { - crateName = "phf"; - version = "0.7.21"; - description = "Runtime support for perfect hash function data structures"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "11m2rzm2s8s35m0s97gjxxb181xz352kjlhr387xj5c8q3qp5afg"; - libPath = "src/lib.rs"; - dependencies = mapFeatures features ([ - (crates."phf_shared"."${deps."phf"."0.7.21"."phf_shared"}" deps) - ]); - features = mkFeatures (features."phf"."0.7.21" or {}); - }; - features_.phf."0.7.21" = deps: f: updateFeatures f (rec { - phf."0.7.21".default = (f.phf."0.7.21".default or true); - phf_shared = fold recursiveUpdate {} [ - { "${deps.phf."0.7.21".phf_shared}"."core" = - (f.phf_shared."${deps.phf."0.7.21".phf_shared}"."core" or false) || - (phf."0.7.21"."core" or false) || - (f."phf"."0.7.21"."core" or false); } - { "${deps.phf."0.7.21".phf_shared}"."unicase" = - (f.phf_shared."${deps.phf."0.7.21".phf_shared}"."unicase" or false) || - (phf."0.7.21"."unicase" or false) || - (f."phf"."0.7.21"."unicase" or false); } - { "${deps.phf."0.7.21".phf_shared}".default = true; } - ]; - }) [ - (features_.phf_shared."${deps."phf"."0.7.21"."phf_shared"}" deps) - ]; - - -# end -# phf_codegen-0.7.21 - - crates.phf_codegen."0.7.21" = deps: { features?(features_.phf_codegen."0.7.21" deps {}) }: buildRustCrate { - crateName = "phf_codegen"; - version = "0.7.21"; - description = "Codegen library for PHF types"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0kgy8s2q4zr0iqcm21mgq4ppc45wy6z7b5wn98xyfsrcad6lwmmj"; - dependencies = mapFeatures features ([ - (crates."phf_generator"."${deps."phf_codegen"."0.7.21"."phf_generator"}" deps) - (crates."phf_shared"."${deps."phf_codegen"."0.7.21"."phf_shared"}" deps) - ]); - }; - features_.phf_codegen."0.7.21" = deps: f: updateFeatures f ({ - phf_codegen."0.7.21".default = (f.phf_codegen."0.7.21".default or true); - phf_generator."${deps.phf_codegen."0.7.21".phf_generator}".default = true; - phf_shared."${deps.phf_codegen."0.7.21".phf_shared}".default = true; - }) [ - (features_.phf_generator."${deps."phf_codegen"."0.7.21"."phf_generator"}" deps) - (features_.phf_shared."${deps."phf_codegen"."0.7.21"."phf_shared"}" deps) - ]; - - -# end -# phf_generator-0.7.21 - - crates.phf_generator."0.7.21" = deps: { features?(features_.phf_generator."0.7.21" deps {}) }: buildRustCrate { - crateName = "phf_generator"; - version = "0.7.21"; - description = "PHF generation logic"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "1jxjfzc6d6d4l9nv0r2bb66if5brk9lnncmg4dpjjifn6zhhqd9g"; - dependencies = mapFeatures features ([ - (crates."phf_shared"."${deps."phf_generator"."0.7.21"."phf_shared"}" deps) - (crates."rand"."${deps."phf_generator"."0.7.21"."rand"}" deps) - ]); - }; - features_.phf_generator."0.7.21" = deps: f: updateFeatures f ({ - phf_generator."0.7.21".default = (f.phf_generator."0.7.21".default or true); - phf_shared."${deps.phf_generator."0.7.21".phf_shared}".default = true; - rand."${deps.phf_generator."0.7.21".rand}".default = true; - }) [ - (features_.phf_shared."${deps."phf_generator"."0.7.21"."phf_shared"}" deps) - (features_.rand."${deps."phf_generator"."0.7.21"."rand"}" deps) - ]; - - -# end -# phf_shared-0.7.21 - - crates.phf_shared."0.7.21" = deps: { features?(features_.phf_shared."0.7.21" deps {}) }: buildRustCrate { - crateName = "phf_shared"; - version = "0.7.21"; - description = "Support code shared by PHF libraries"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0lxpg3wgxfhzfalmf9ha9my1lsvfjy74ah9f6mfw88xlp545jlln"; - libPath = "src/lib.rs"; - dependencies = mapFeatures features ([ - (crates."siphasher"."${deps."phf_shared"."0.7.21"."siphasher"}" deps) - ] - ++ (if features.phf_shared."0.7.21".unicase or false then [ (crates.unicase."${deps."phf_shared"."0.7.21".unicase}" deps) ] else [])); - features = mkFeatures (features."phf_shared"."0.7.21" or {}); - }; - features_.phf_shared."0.7.21" = deps: f: updateFeatures f ({ - phf_shared."0.7.21".default = (f.phf_shared."0.7.21".default or true); - siphasher."${deps.phf_shared."0.7.21".siphasher}".default = true; - unicase."${deps.phf_shared."0.7.21".unicase}".default = true; - }) [ - (features_.siphasher."${deps."phf_shared"."0.7.21"."siphasher"}" deps) - (features_.unicase."${deps."phf_shared"."0.7.21"."unicase"}" deps) - ]; - - -# end -# pkg-config-0.3.9 - - crates.pkg_config."0.3.9" = deps: { features?(features_.pkg_config."0.3.9" deps {}) }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.9"; - description = "A library to run the pkg-config system tool at build time in order to be used in\nCargo build scripts.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; - }; - features_.pkg_config."0.3.9" = deps: f: updateFeatures f ({ - pkg_config."0.3.9".default = (f.pkg_config."0.3.9".default or true); - }) []; - - -# end -# quote-0.3.15 - - crates.quote."0.3.15" = deps: { features?(features_.quote."0.3.15" deps {}) }: buildRustCrate { - crateName = "quote"; - version = "0.3.15"; - description = "Quasi-quoting macro quote!(...)"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; - }; - features_.quote."0.3.15" = deps: f: updateFeatures f ({ - quote."0.3.15".default = (f.quote."0.3.15".default or true); - }) []; - - -# end -# rand-0.3.18 - - crates.rand."0.3.18" = deps: { features?(features_.rand."0.3.18" deps {}) }: buildRustCrate { - crateName = "rand"; - version = "0.3.18"; - description = "Random number generators and other randomness functionality.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "15d7c3myn968dzjs0a2pgv58hzdavxnq6swgj032lw2v966ir4xv"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."rand"."0.3.18"."libc"}" deps) - ]) - ++ (if kernel == "fuchsia" then mapFeatures features ([ - (crates."fuchsia_zircon"."${deps."rand"."0.3.18"."fuchsia_zircon"}" deps) - ]) else []); - features = mkFeatures (features."rand"."0.3.18" or {}); - }; - features_.rand."0.3.18" = deps: f: updateFeatures f (rec { - fuchsia_zircon."${deps.rand."0.3.18".fuchsia_zircon}".default = true; - libc."${deps.rand."0.3.18".libc}".default = true; - rand = fold recursiveUpdate {} [ - { "0.3.18"."i128_support" = - (f.rand."0.3.18"."i128_support" or false) || - (f.rand."0.3.18".nightly or false) || - (rand."0.3.18"."nightly" or false); } - { "0.3.18".default = (f.rand."0.3.18".default or true); } - ]; - }) [ - (features_.libc."${deps."rand"."0.3.18"."libc"}" deps) - (features_.fuchsia_zircon."${deps."rand"."0.3.18"."fuchsia_zircon"}" deps) - ]; - - -# end -# rand-0.5.5 - - crates.rand."0.5.5" = deps: { features?(features_.rand."0.5.5" deps {}) }: buildRustCrate { - crateName = "rand"; - version = "0.5.5"; - description = "Random number generators and other randomness functionality.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0d7pnsh57qxhz1ghrzk113ddkn13kf2g758ffnbxq4nhwjfzhlc9"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand"."0.5.5"."rand_core"}" deps) - ]) - ++ (if kernel == "cloudabi" then mapFeatures features ([ - ] - ++ (if features.rand."0.5.5".cloudabi or false then [ (crates.cloudabi."${deps."rand"."0.5.5".cloudabi}" deps) ] else [])) else []) - ++ (if kernel == "fuchsia" then mapFeatures features ([ - ] - ++ (if features.rand."0.5.5".fuchsia-zircon or false then [ (crates.fuchsia_zircon."${deps."rand"."0.5.5".fuchsia_zircon}" deps) ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - ] - ++ (if features.rand."0.5.5".libc or false then [ (crates.libc."${deps."rand"."0.5.5".libc}" deps) ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - ] - ++ (if features.rand."0.5.5".winapi or false then [ (crates.winapi."${deps."rand"."0.5.5".winapi}" deps) ] else [])) else []) - ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([ -]) else []); - features = mkFeatures (features."rand"."0.5.5" or {}); - }; - features_.rand."0.5.5" = deps: f: updateFeatures f (rec { - cloudabi."${deps.rand."0.5.5".cloudabi}".default = true; - fuchsia_zircon."${deps.rand."0.5.5".fuchsia_zircon}".default = true; - libc."${deps.rand."0.5.5".libc}".default = true; - rand = fold recursiveUpdate {} [ - { "0.5.5"."alloc" = - (f.rand."0.5.5"."alloc" or false) || - (f.rand."0.5.5".std or false) || - (rand."0.5.5"."std" or false); } - { "0.5.5"."cloudabi" = - (f.rand."0.5.5"."cloudabi" or false) || - (f.rand."0.5.5".std or false) || - (rand."0.5.5"."std" or false); } - { "0.5.5"."fuchsia-zircon" = - (f.rand."0.5.5"."fuchsia-zircon" or false) || - (f.rand."0.5.5".std or false) || - (rand."0.5.5"."std" or false); } - { "0.5.5"."i128_support" = - (f.rand."0.5.5"."i128_support" or false) || - (f.rand."0.5.5".nightly or false) || - (rand."0.5.5"."nightly" or false); } - { "0.5.5"."libc" = - (f.rand."0.5.5"."libc" or false) || - (f.rand."0.5.5".std or false) || - (rand."0.5.5"."std" or false); } - { "0.5.5"."serde" = - (f.rand."0.5.5"."serde" or false) || - (f.rand."0.5.5".serde1 or false) || - (rand."0.5.5"."serde1" or false); } - { "0.5.5"."serde_derive" = - (f.rand."0.5.5"."serde_derive" or false) || - (f.rand."0.5.5".serde1 or false) || - (rand."0.5.5"."serde1" or false); } - { "0.5.5"."std" = - (f.rand."0.5.5"."std" or false) || - (f.rand."0.5.5".default or false) || - (rand."0.5.5"."default" or false); } - { "0.5.5"."winapi" = - (f.rand."0.5.5"."winapi" or false) || - (f.rand."0.5.5".std or false) || - (rand."0.5.5"."std" or false); } - { "0.5.5".default = (f.rand."0.5.5".default or true); } - ]; - rand_core = fold recursiveUpdate {} [ - { "${deps.rand."0.5.5".rand_core}"."alloc" = - (f.rand_core."${deps.rand."0.5.5".rand_core}"."alloc" or false) || - (rand."0.5.5"."alloc" or false) || - (f."rand"."0.5.5"."alloc" or false); } - { "${deps.rand."0.5.5".rand_core}"."serde1" = - (f.rand_core."${deps.rand."0.5.5".rand_core}"."serde1" or false) || - (rand."0.5.5"."serde1" or false) || - (f."rand"."0.5.5"."serde1" or false); } - { "${deps.rand."0.5.5".rand_core}"."std" = - (f.rand_core."${deps.rand."0.5.5".rand_core}"."std" or false) || - (rand."0.5.5"."std" or false) || - (f."rand"."0.5.5"."std" or false); } - { "${deps.rand."0.5.5".rand_core}".default = (f.rand_core."${deps.rand."0.5.5".rand_core}".default or false); } - ]; - winapi = fold recursiveUpdate {} [ - { "${deps.rand."0.5.5".winapi}"."minwindef" = true; } - { "${deps.rand."0.5.5".winapi}"."ntsecapi" = true; } - { "${deps.rand."0.5.5".winapi}"."profileapi" = true; } - { "${deps.rand."0.5.5".winapi}"."winnt" = true; } - { "${deps.rand."0.5.5".winapi}".default = true; } - ]; - }) [ - (features_.rand_core."${deps."rand"."0.5.5"."rand_core"}" deps) - (features_.cloudabi."${deps."rand"."0.5.5"."cloudabi"}" deps) - (features_.fuchsia_zircon."${deps."rand"."0.5.5"."fuchsia_zircon"}" deps) - (features_.libc."${deps."rand"."0.5.5"."libc"}" deps) - (features_.winapi."${deps."rand"."0.5.5"."winapi"}" deps) - ]; - - -# end -# rand-0.6.1 - - crates.rand."0.6.1" = deps: { features?(features_.rand."0.6.1" deps {}) }: buildRustCrate { - crateName = "rand"; - version = "0.6.1"; - description = "Random number generators and other randomness functionality.\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "123s3w165iiifmf475lisqkd0kbr7nwnn3k4b1zg2cwap5v9m9bz"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."rand_chacha"."${deps."rand"."0.6.1"."rand_chacha"}" deps) - (crates."rand_core"."${deps."rand"."0.6.1"."rand_core"}" deps) - (crates."rand_hc"."${deps."rand"."0.6.1"."rand_hc"}" deps) - (crates."rand_isaac"."${deps."rand"."0.6.1"."rand_isaac"}" deps) - (crates."rand_pcg"."${deps."rand"."0.6.1"."rand_pcg"}" deps) - (crates."rand_xorshift"."${deps."rand"."0.6.1"."rand_xorshift"}" deps) - ]) - ++ (if kernel == "cloudabi" then mapFeatures features ([ - ] - ++ (if features.rand."0.6.1".cloudabi or false then [ (crates.cloudabi."${deps."rand"."0.6.1".cloudabi}" deps) ] else [])) else []) - ++ (if kernel == "fuchsia" then mapFeatures features ([ - ] - ++ (if features.rand."0.6.1".fuchsia-zircon or false then [ (crates.fuchsia_zircon."${deps."rand"."0.6.1".fuchsia_zircon}" deps) ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - ] - ++ (if features.rand."0.6.1".libc or false then [ (crates.libc."${deps."rand"."0.6.1".libc}" deps) ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - ] - ++ (if features.rand."0.6.1".winapi or false then [ (crates.winapi."${deps."rand"."0.6.1".winapi}" deps) ] else [])) else []) - ++ (if kernel == "wasm32-unknown-unknown" then mapFeatures features ([ -]) else []); - - buildDependencies = mapFeatures features ([ - (crates."rustc_version"."${deps."rand"."0.6.1"."rustc_version"}" deps) - ]); - features = mkFeatures (features."rand"."0.6.1" or {}); - }; - features_.rand."0.6.1" = deps: f: updateFeatures f (rec { - cloudabi."${deps.rand."0.6.1".cloudabi}".default = true; - fuchsia_zircon."${deps.rand."0.6.1".fuchsia_zircon}".default = true; - libc."${deps.rand."0.6.1".libc}".default = (f.libc."${deps.rand."0.6.1".libc}".default or false); - rand = fold recursiveUpdate {} [ - { "0.6.1"."alloc" = - (f.rand."0.6.1"."alloc" or false) || - (f.rand."0.6.1".std or false) || - (rand."0.6.1"."std" or false); } - { "0.6.1"."cloudabi" = - (f.rand."0.6.1"."cloudabi" or false) || - (f.rand."0.6.1".std or false) || - (rand."0.6.1"."std" or false); } - { "0.6.1"."fuchsia-zircon" = - (f.rand."0.6.1"."fuchsia-zircon" or false) || - (f.rand."0.6.1".std or false) || - (rand."0.6.1"."std" or false); } - { "0.6.1"."libc" = - (f.rand."0.6.1"."libc" or false) || - (f.rand."0.6.1".std or false) || - (rand."0.6.1"."std" or false); } - { "0.6.1"."packed_simd" = - (f.rand."0.6.1"."packed_simd" or false) || - (f.rand."0.6.1".simd_support or false) || - (rand."0.6.1"."simd_support" or false); } - { "0.6.1"."simd_support" = - (f.rand."0.6.1"."simd_support" or false) || - (f.rand."0.6.1".nightly or false) || - (rand."0.6.1"."nightly" or false); } - { "0.6.1"."std" = - (f.rand."0.6.1"."std" or false) || - (f.rand."0.6.1".default or false) || - (rand."0.6.1"."default" or false); } - { "0.6.1"."winapi" = - (f.rand."0.6.1"."winapi" or false) || - (f.rand."0.6.1".std or false) || - (rand."0.6.1"."std" or false); } - { "0.6.1".default = (f.rand."0.6.1".default or true); } - ]; - rand_chacha."${deps.rand."0.6.1".rand_chacha}".default = true; - rand_core = fold recursiveUpdate {} [ - { "${deps.rand."0.6.1".rand_core}"."alloc" = - (f.rand_core."${deps.rand."0.6.1".rand_core}"."alloc" or false) || - (rand."0.6.1"."alloc" or false) || - (f."rand"."0.6.1"."alloc" or false); } - { "${deps.rand."0.6.1".rand_core}"."serde1" = - (f.rand_core."${deps.rand."0.6.1".rand_core}"."serde1" or false) || - (rand."0.6.1"."serde1" or false) || - (f."rand"."0.6.1"."serde1" or false); } - { "${deps.rand."0.6.1".rand_core}"."std" = - (f.rand_core."${deps.rand."0.6.1".rand_core}"."std" or false) || - (rand."0.6.1"."std" or false) || - (f."rand"."0.6.1"."std" or false); } - { "${deps.rand."0.6.1".rand_core}".default = (f.rand_core."${deps.rand."0.6.1".rand_core}".default or false); } - ]; - rand_hc."${deps.rand."0.6.1".rand_hc}".default = true; - rand_isaac = fold recursiveUpdate {} [ - { "${deps.rand."0.6.1".rand_isaac}"."serde1" = - (f.rand_isaac."${deps.rand."0.6.1".rand_isaac}"."serde1" or false) || - (rand."0.6.1"."serde1" or false) || - (f."rand"."0.6.1"."serde1" or false); } - { "${deps.rand."0.6.1".rand_isaac}".default = true; } - ]; - rand_pcg."${deps.rand."0.6.1".rand_pcg}".default = true; - rand_xorshift = fold recursiveUpdate {} [ - { "${deps.rand."0.6.1".rand_xorshift}"."serde1" = - (f.rand_xorshift."${deps.rand."0.6.1".rand_xorshift}"."serde1" or false) || - (rand."0.6.1"."serde1" or false) || - (f."rand"."0.6.1"."serde1" or false); } - { "${deps.rand."0.6.1".rand_xorshift}".default = true; } - ]; - rustc_version."${deps.rand."0.6.1".rustc_version}".default = true; - winapi = fold recursiveUpdate {} [ - { "${deps.rand."0.6.1".winapi}"."minwindef" = true; } - { "${deps.rand."0.6.1".winapi}"."ntsecapi" = true; } - { "${deps.rand."0.6.1".winapi}"."profileapi" = true; } - { "${deps.rand."0.6.1".winapi}"."winnt" = true; } - { "${deps.rand."0.6.1".winapi}".default = true; } - ]; - }) [ - (features_.rand_chacha."${deps."rand"."0.6.1"."rand_chacha"}" deps) - (features_.rand_core."${deps."rand"."0.6.1"."rand_core"}" deps) - (features_.rand_hc."${deps."rand"."0.6.1"."rand_hc"}" deps) - (features_.rand_isaac."${deps."rand"."0.6.1"."rand_isaac"}" deps) - (features_.rand_pcg."${deps."rand"."0.6.1"."rand_pcg"}" deps) - (features_.rand_xorshift."${deps."rand"."0.6.1"."rand_xorshift"}" deps) - (features_.rustc_version."${deps."rand"."0.6.1"."rustc_version"}" deps) - (features_.cloudabi."${deps."rand"."0.6.1"."cloudabi"}" deps) - (features_.fuchsia_zircon."${deps."rand"."0.6.1"."fuchsia_zircon"}" deps) - (features_.libc."${deps."rand"."0.6.1"."libc"}" deps) - (features_.winapi."${deps."rand"."0.6.1"."winapi"}" deps) - ]; - - -# end -# rand_chacha-0.1.0 - - crates.rand_chacha."0.1.0" = deps: { features?(features_.rand_chacha."0.1.0" deps {}) }: buildRustCrate { - crateName = "rand_chacha"; - version = "0.1.0"; - description = "ChaCha random number generator\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "0q5pq34cqv1mnibgzd1cmx9q49vkr2lvalkkvizmlld217jmlqc6"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_chacha"."0.1.0"."rand_core"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."rustc_version"."${deps."rand_chacha"."0.1.0"."rustc_version"}" deps) - ]); - }; - features_.rand_chacha."0.1.0" = deps: f: updateFeatures f ({ - rand_chacha."0.1.0".default = (f.rand_chacha."0.1.0".default or true); - rand_core."${deps.rand_chacha."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_chacha."0.1.0".rand_core}".default or false); - rustc_version."${deps.rand_chacha."0.1.0".rustc_version}".default = true; - }) [ - (features_.rand_core."${deps."rand_chacha"."0.1.0"."rand_core"}" deps) - (features_.rustc_version."${deps."rand_chacha"."0.1.0"."rustc_version"}" deps) - ]; - - -# end -# rand_core-0.2.2 - - crates.rand_core."0.2.2" = deps: { features?(features_.rand_core."0.2.2" deps {}) }: buildRustCrate { - crateName = "rand_core"; - version = "0.2.2"; - description = "Core random number generator traits and tools for implementation.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1cxnaxmsirz2wxsajsjkd1wk6lqfqbcprqkha4bq3didznrl22sc"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_core"."0.2.2"."rand_core"}" deps) - ]); - features = mkFeatures (features."rand_core"."0.2.2" or {}); - }; - features_.rand_core."0.2.2" = deps: f: updateFeatures f (rec { - rand_core = fold recursiveUpdate {} [ - { "${deps.rand_core."0.2.2".rand_core}"."alloc" = - (f.rand_core."${deps.rand_core."0.2.2".rand_core}"."alloc" or false) || - (rand_core."0.2.2"."alloc" or false) || - (f."rand_core"."0.2.2"."alloc" or false); } - { "${deps.rand_core."0.2.2".rand_core}"."serde1" = - (f.rand_core."${deps.rand_core."0.2.2".rand_core}"."serde1" or false) || - (rand_core."0.2.2"."serde1" or false) || - (f."rand_core"."0.2.2"."serde1" or false); } - { "${deps.rand_core."0.2.2".rand_core}"."std" = - (f.rand_core."${deps.rand_core."0.2.2".rand_core}"."std" or false) || - (rand_core."0.2.2"."std" or false) || - (f."rand_core"."0.2.2"."std" or false); } - { "${deps.rand_core."0.2.2".rand_core}".default = (f.rand_core."${deps.rand_core."0.2.2".rand_core}".default or false); } - { "0.2.2".default = (f.rand_core."0.2.2".default or true); } - ]; - }) [ - (features_.rand_core."${deps."rand_core"."0.2.2"."rand_core"}" deps) - ]; - - -# end -# rand_core-0.3.0 - - crates.rand_core."0.3.0" = deps: { features?(features_.rand_core."0.3.0" deps {}) }: buildRustCrate { - crateName = "rand_core"; - version = "0.3.0"; - description = "Core random number generator traits and tools for implementation.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1vafw316apjys9va3j987s02djhqp7y21v671v3ix0p5j9bjq339"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."rand_core"."0.3.0" or {}); - }; - features_.rand_core."0.3.0" = deps: f: updateFeatures f (rec { - rand_core = fold recursiveUpdate {} [ - { "0.3.0"."alloc" = - (f.rand_core."0.3.0"."alloc" or false) || - (f.rand_core."0.3.0".std or false) || - (rand_core."0.3.0"."std" or false); } - { "0.3.0"."serde" = - (f.rand_core."0.3.0"."serde" or false) || - (f.rand_core."0.3.0".serde1 or false) || - (rand_core."0.3.0"."serde1" or false); } - { "0.3.0"."serde_derive" = - (f.rand_core."0.3.0"."serde_derive" or false) || - (f.rand_core."0.3.0".serde1 or false) || - (rand_core."0.3.0"."serde1" or false); } - { "0.3.0"."std" = - (f.rand_core."0.3.0"."std" or false) || - (f.rand_core."0.3.0".default or false) || - (rand_core."0.3.0"."default" or false); } - { "0.3.0".default = (f.rand_core."0.3.0".default or true); } - ]; - }) []; - - -# end -# rand_hc-0.1.0 - - crates.rand_hc."0.1.0" = deps: { features?(features_.rand_hc."0.1.0" deps {}) }: buildRustCrate { - crateName = "rand_hc"; - version = "0.1.0"; - description = "HC128 random number generator\n"; - authors = [ "The Rand Project Developers" ]; - sha256 = "05agb75j87yp7y1zk8yf7bpm66hc0673r3dlypn0kazynr6fdgkz"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_hc"."0.1.0"."rand_core"}" deps) - ]); - }; - features_.rand_hc."0.1.0" = deps: f: updateFeatures f ({ - rand_core."${deps.rand_hc."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_hc."0.1.0".rand_core}".default or false); - rand_hc."0.1.0".default = (f.rand_hc."0.1.0".default or true); - }) [ - (features_.rand_core."${deps."rand_hc"."0.1.0"."rand_core"}" deps) - ]; - - -# end -# rand_isaac-0.1.1 - - crates.rand_isaac."0.1.1" = deps: { features?(features_.rand_isaac."0.1.1" deps {}) }: buildRustCrate { - crateName = "rand_isaac"; - version = "0.1.1"; - description = "ISAAC random number generator\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "10hhdh5b5sa03s6b63y9bafm956jwilx41s71jbrzl63ccx8lxdq"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_isaac"."0.1.1"."rand_core"}" deps) - ]); - features = mkFeatures (features."rand_isaac"."0.1.1" or {}); - }; - features_.rand_isaac."0.1.1" = deps: f: updateFeatures f (rec { - rand_core = fold recursiveUpdate {} [ - { "${deps.rand_isaac."0.1.1".rand_core}"."serde1" = - (f.rand_core."${deps.rand_isaac."0.1.1".rand_core}"."serde1" or false) || - (rand_isaac."0.1.1"."serde1" or false) || - (f."rand_isaac"."0.1.1"."serde1" or false); } - { "${deps.rand_isaac."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_isaac."0.1.1".rand_core}".default or false); } - ]; - rand_isaac = fold recursiveUpdate {} [ - { "0.1.1"."serde" = - (f.rand_isaac."0.1.1"."serde" or false) || - (f.rand_isaac."0.1.1".serde1 or false) || - (rand_isaac."0.1.1"."serde1" or false); } - { "0.1.1"."serde_derive" = - (f.rand_isaac."0.1.1"."serde_derive" or false) || - (f.rand_isaac."0.1.1".serde1 or false) || - (rand_isaac."0.1.1"."serde1" or false); } - { "0.1.1".default = (f.rand_isaac."0.1.1".default or true); } - ]; - }) [ - (features_.rand_core."${deps."rand_isaac"."0.1.1"."rand_core"}" deps) - ]; - - -# end -# rand_pcg-0.1.1 - - crates.rand_pcg."0.1.1" = deps: { features?(features_.rand_pcg."0.1.1" deps {}) }: buildRustCrate { - crateName = "rand_pcg"; - version = "0.1.1"; - description = "Selected PCG random number generators\n"; - authors = [ "The Rand Project Developers" ]; - sha256 = "0x6pzldj0c8c7gmr67ni5i7w2f7n7idvs3ckx0fc3wkhwl7wrbza"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_pcg"."0.1.1"."rand_core"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."rustc_version"."${deps."rand_pcg"."0.1.1"."rustc_version"}" deps) - ]); - features = mkFeatures (features."rand_pcg"."0.1.1" or {}); - }; - features_.rand_pcg."0.1.1" = deps: f: updateFeatures f (rec { - rand_core."${deps.rand_pcg."0.1.1".rand_core}".default = (f.rand_core."${deps.rand_pcg."0.1.1".rand_core}".default or false); - rand_pcg = fold recursiveUpdate {} [ - { "0.1.1"."serde" = - (f.rand_pcg."0.1.1"."serde" or false) || - (f.rand_pcg."0.1.1".serde1 or false) || - (rand_pcg."0.1.1"."serde1" or false); } - { "0.1.1"."serde_derive" = - (f.rand_pcg."0.1.1"."serde_derive" or false) || - (f.rand_pcg."0.1.1".serde1 or false) || - (rand_pcg."0.1.1"."serde1" or false); } - { "0.1.1".default = (f.rand_pcg."0.1.1".default or true); } - ]; - rustc_version."${deps.rand_pcg."0.1.1".rustc_version}".default = true; - }) [ - (features_.rand_core."${deps."rand_pcg"."0.1.1"."rand_core"}" deps) - (features_.rustc_version."${deps."rand_pcg"."0.1.1"."rustc_version"}" deps) - ]; - - -# end -# rand_xorshift-0.1.0 - - crates.rand_xorshift."0.1.0" = deps: { features?(features_.rand_xorshift."0.1.0" deps {}) }: buildRustCrate { - crateName = "rand_xorshift"; - version = "0.1.0"; - description = "Xorshift random number generator\n"; - authors = [ "The Rand Project Developers" "The Rust Project Developers" ]; - sha256 = "063vxb678ki8gq4rx9w7yg5f9i29ig1zwykl67mfsxn0kxlkv2ih"; - dependencies = mapFeatures features ([ - (crates."rand_core"."${deps."rand_xorshift"."0.1.0"."rand_core"}" deps) - ]); - features = mkFeatures (features."rand_xorshift"."0.1.0" or {}); - }; - features_.rand_xorshift."0.1.0" = deps: f: updateFeatures f (rec { - rand_core."${deps.rand_xorshift."0.1.0".rand_core}".default = (f.rand_core."${deps.rand_xorshift."0.1.0".rand_core}".default or false); - rand_xorshift = fold recursiveUpdate {} [ - { "0.1.0"."serde" = - (f.rand_xorshift."0.1.0"."serde" or false) || - (f.rand_xorshift."0.1.0".serde1 or false) || - (rand_xorshift."0.1.0"."serde1" or false); } - { "0.1.0"."serde_derive" = - (f.rand_xorshift."0.1.0"."serde_derive" or false) || - (f.rand_xorshift."0.1.0".serde1 or false) || - (rand_xorshift."0.1.0"."serde1" or false); } - { "0.1.0".default = (f.rand_xorshift."0.1.0".default or true); } - ]; - }) [ - (features_.rand_core."${deps."rand_xorshift"."0.1.0"."rand_core"}" deps) - ]; - - -# end -# redox_syscall-0.1.31 - - crates.redox_syscall."0.1.31" = deps: { features?(features_.redox_syscall."0.1.31" deps {}) }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.31"; - description = "A Rust library to access raw Redox system calls"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "0kipd9qslzin4fgj4jrxv6yz5l3l71gnbd7fq1jhk2j7f2sq33j4"; - libName = "syscall"; - }; - features_.redox_syscall."0.1.31" = deps: f: updateFeatures f ({ - redox_syscall."0.1.31".default = (f.redox_syscall."0.1.31".default or true); - }) []; - - -# end -# redox_termios-0.1.1 - - crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate { - crateName = "redox_termios"; - version = "0.1.1"; - description = "A Rust library to access Redox termios functions"; - authors = [ "Jeremy Soller <jackpot51@gmail.com>" ]; - sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; - libPath = "src/lib.rs"; - dependencies = mapFeatures features ([ - (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) - ]); - }; - features_.redox_termios."0.1.1" = deps: f: updateFeatures f ({ - redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; - redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); - }) [ - (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) - ]; - - -# end -# regex-0.1.80 - - crates.regex."0.1.80" = deps: { features?(features_.regex."0.1.80" deps {}) }: buildRustCrate { - crateName = "regex"; - version = "0.1.80"; - description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6"; - dependencies = mapFeatures features ([ - (crates."aho_corasick"."${deps."regex"."0.1.80"."aho_corasick"}" deps) - (crates."memchr"."${deps."regex"."0.1.80"."memchr"}" deps) - (crates."regex_syntax"."${deps."regex"."0.1.80"."regex_syntax"}" deps) - (crates."thread_local"."${deps."regex"."0.1.80"."thread_local"}" deps) - (crates."utf8_ranges"."${deps."regex"."0.1.80"."utf8_ranges"}" deps) - ]); - features = mkFeatures (features."regex"."0.1.80" or {}); - }; - features_.regex."0.1.80" = deps: f: updateFeatures f (rec { - aho_corasick."${deps.regex."0.1.80".aho_corasick}".default = true; - memchr."${deps.regex."0.1.80".memchr}".default = true; - regex = fold recursiveUpdate {} [ - { "0.1.80"."simd" = - (f.regex."0.1.80"."simd" or false) || - (f.regex."0.1.80".simd-accel or false) || - (regex."0.1.80"."simd-accel" or false); } - { "0.1.80".default = (f.regex."0.1.80".default or true); } - ]; - regex_syntax."${deps.regex."0.1.80".regex_syntax}".default = true; - thread_local."${deps.regex."0.1.80".thread_local}".default = true; - utf8_ranges."${deps.regex."0.1.80".utf8_ranges}".default = true; - }) [ - (features_.aho_corasick."${deps."regex"."0.1.80"."aho_corasick"}" deps) - (features_.memchr."${deps."regex"."0.1.80"."memchr"}" deps) - (features_.regex_syntax."${deps."regex"."0.1.80"."regex_syntax"}" deps) - (features_.thread_local."${deps."regex"."0.1.80"."thread_local"}" deps) - (features_.utf8_ranges."${deps."regex"."0.1.80"."utf8_ranges"}" deps) - ]; - - -# end -# regex-syntax-0.3.9 - - crates.regex_syntax."0.3.9" = deps: { features?(features_.regex_syntax."0.3.9" deps {}) }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.3.9"; - description = "A regular expression parser."; - authors = [ "The Rust Project Developers" ]; - sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m"; - }; - features_.regex_syntax."0.3.9" = deps: f: updateFeatures f ({ - regex_syntax."0.3.9".default = (f.regex_syntax."0.3.9".default or true); - }) []; - - -# end -# remove_dir_all-0.5.1 - - crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate { - crateName = "remove_dir_all"; - version = "0.5.1"; - description = "A safe, reliable implementation of remove_dir_all for Windows"; - authors = [ "Aaronepower <theaaronepower@gmail.com>" ]; - sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; - dependencies = (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) - ]) else []); - }; - features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f ({ - remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}"."fileapi" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}"."std" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}"."winbase" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}"."winerror" = true; } - { "${deps.remove_dir_all."0.5.1".winapi}".default = true; } - ]; - }) [ - (features_.winapi."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) - ]; - - -# end -# reqwest-0.9.5 - - crates.reqwest."0.9.5" = deps: { features?(features_.reqwest."0.9.5" deps {}) }: buildRustCrate { - crateName = "reqwest"; - version = "0.9.5"; - description = "higher level HTTP client library"; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1y0fq8ifhbgn6bfvjq831svirqszszj7f73ykbd28inwc0xiv2ix"; - dependencies = mapFeatures features ([ - (crates."base64"."${deps."reqwest"."0.9.5"."base64"}" deps) - (crates."bytes"."${deps."reqwest"."0.9.5"."bytes"}" deps) - (crates."encoding_rs"."${deps."reqwest"."0.9.5"."encoding_rs"}" deps) - (crates."futures"."${deps."reqwest"."0.9.5"."futures"}" deps) - (crates."http"."${deps."reqwest"."0.9.5"."http"}" deps) - (crates."hyper"."${deps."reqwest"."0.9.5"."hyper"}" deps) - (crates."libflate"."${deps."reqwest"."0.9.5"."libflate"}" deps) - (crates."log"."${deps."reqwest"."0.9.5"."log"}" deps) - (crates."mime"."${deps."reqwest"."0.9.5"."mime"}" deps) - (crates."mime_guess"."${deps."reqwest"."0.9.5"."mime_guess"}" deps) - (crates."serde"."${deps."reqwest"."0.9.5"."serde"}" deps) - (crates."serde_json"."${deps."reqwest"."0.9.5"."serde_json"}" deps) - (crates."serde_urlencoded"."${deps."reqwest"."0.9.5"."serde_urlencoded"}" deps) - (crates."tokio"."${deps."reqwest"."0.9.5"."tokio"}" deps) - (crates."tokio_io"."${deps."reqwest"."0.9.5"."tokio_io"}" deps) - (crates."url"."${deps."reqwest"."0.9.5"."url"}" deps) - (crates."uuid"."${deps."reqwest"."0.9.5"."uuid"}" deps) - ] - ++ (if features.reqwest."0.9.5".hyper-tls or false then [ (crates.hyper_tls."${deps."reqwest"."0.9.5".hyper_tls}" deps) ] else []) - ++ (if features.reqwest."0.9.5".native-tls or false then [ (crates.native_tls."${deps."reqwest"."0.9.5".native_tls}" deps) ] else [])); - features = mkFeatures (features."reqwest"."0.9.5" or {}); - }; - features_.reqwest."0.9.5" = deps: f: updateFeatures f (rec { - base64."${deps.reqwest."0.9.5".base64}".default = true; - bytes."${deps.reqwest."0.9.5".bytes}".default = true; - encoding_rs."${deps.reqwest."0.9.5".encoding_rs}".default = true; - futures."${deps.reqwest."0.9.5".futures}".default = true; - http."${deps.reqwest."0.9.5".http}".default = true; - hyper."${deps.reqwest."0.9.5".hyper}".default = true; - hyper_tls."${deps.reqwest."0.9.5".hyper_tls}".default = true; - libflate."${deps.reqwest."0.9.5".libflate}".default = true; - log."${deps.reqwest."0.9.5".log}".default = true; - mime."${deps.reqwest."0.9.5".mime}".default = true; - mime_guess."${deps.reqwest."0.9.5".mime_guess}".default = true; - native_tls."${deps.reqwest."0.9.5".native_tls}".default = true; - reqwest = fold recursiveUpdate {} [ - { "0.9.5"."default-tls" = - (f.reqwest."0.9.5"."default-tls" or false) || - (f.reqwest."0.9.5".default or false) || - (reqwest."0.9.5"."default" or false); } - { "0.9.5"."hyper-old-types" = - (f.reqwest."0.9.5"."hyper-old-types" or false) || - (f.reqwest."0.9.5".hyper-011 or false) || - (reqwest."0.9.5"."hyper-011" or false); } - { "0.9.5"."hyper-tls" = - (f.reqwest."0.9.5"."hyper-tls" or false) || - (f.reqwest."0.9.5".default-tls or false) || - (reqwest."0.9.5"."default-tls" or false); } - { "0.9.5"."native-tls" = - (f.reqwest."0.9.5"."native-tls" or false) || - (f.reqwest."0.9.5".default-tls or false) || - (reqwest."0.9.5"."default-tls" or false); } - { "0.9.5".default = (f.reqwest."0.9.5".default or true); } - ]; - serde."${deps.reqwest."0.9.5".serde}".default = true; - serde_json."${deps.reqwest."0.9.5".serde_json}".default = true; - serde_urlencoded."${deps.reqwest."0.9.5".serde_urlencoded}".default = true; - tokio."${deps.reqwest."0.9.5".tokio}".default = true; - tokio_io."${deps.reqwest."0.9.5".tokio_io}".default = true; - url."${deps.reqwest."0.9.5".url}".default = true; - uuid = fold recursiveUpdate {} [ - { "${deps.reqwest."0.9.5".uuid}"."v4" = true; } - { "${deps.reqwest."0.9.5".uuid}".default = true; } - ]; - }) [ - (features_.base64."${deps."reqwest"."0.9.5"."base64"}" deps) - (features_.bytes."${deps."reqwest"."0.9.5"."bytes"}" deps) - (features_.encoding_rs."${deps."reqwest"."0.9.5"."encoding_rs"}" deps) - (features_.futures."${deps."reqwest"."0.9.5"."futures"}" deps) - (features_.http."${deps."reqwest"."0.9.5"."http"}" deps) - (features_.hyper."${deps."reqwest"."0.9.5"."hyper"}" deps) - (features_.hyper_tls."${deps."reqwest"."0.9.5"."hyper_tls"}" deps) - (features_.libflate."${deps."reqwest"."0.9.5"."libflate"}" deps) - (features_.log."${deps."reqwest"."0.9.5"."log"}" deps) - (features_.mime."${deps."reqwest"."0.9.5"."mime"}" deps) - (features_.mime_guess."${deps."reqwest"."0.9.5"."mime_guess"}" deps) - (features_.native_tls."${deps."reqwest"."0.9.5"."native_tls"}" deps) - (features_.serde."${deps."reqwest"."0.9.5"."serde"}" deps) - (features_.serde_json."${deps."reqwest"."0.9.5"."serde_json"}" deps) - (features_.serde_urlencoded."${deps."reqwest"."0.9.5"."serde_urlencoded"}" deps) - (features_.tokio."${deps."reqwest"."0.9.5"."tokio"}" deps) - (features_.tokio_io."${deps."reqwest"."0.9.5"."tokio_io"}" deps) - (features_.url."${deps."reqwest"."0.9.5"."url"}" deps) - (features_.uuid."${deps."reqwest"."0.9.5"."uuid"}" deps) - ]; - - -# end -# rustc_version-0.2.3 - - crates.rustc_version."0.2.3" = deps: { features?(features_.rustc_version."0.2.3" deps {}) }: buildRustCrate { - crateName = "rustc_version"; - version = "0.2.3"; - description = "A library for querying the version of a installed rustc compiler"; - authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ]; - sha256 = "0rgwzbgs3i9fqjm1p4ra3n7frafmpwl29c8lw85kv1rxn7n2zaa7"; - dependencies = mapFeatures features ([ - (crates."semver"."${deps."rustc_version"."0.2.3"."semver"}" deps) - ]); - }; - features_.rustc_version."0.2.3" = deps: f: updateFeatures f ({ - rustc_version."0.2.3".default = (f.rustc_version."0.2.3".default or true); - semver."${deps.rustc_version."0.2.3".semver}".default = true; - }) [ - (features_.semver."${deps."rustc_version"."0.2.3"."semver"}" deps) - ]; - - -# end -# safemem-0.3.0 - - crates.safemem."0.3.0" = deps: { features?(features_.safemem."0.3.0" deps {}) }: buildRustCrate { - crateName = "safemem"; - version = "0.3.0"; - description = "Safe wrappers for memory-accessing functions, like `std::ptr::copy()`."; - authors = [ "Austin Bonander <austin.bonander@gmail.com>" ]; - sha256 = "0pr39b468d05f6m7m4alsngmj5p7an8df21apsxbi57k0lmwrr18"; - features = mkFeatures (features."safemem"."0.3.0" or {}); - }; - features_.safemem."0.3.0" = deps: f: updateFeatures f (rec { - safemem = fold recursiveUpdate {} [ - { "0.3.0"."std" = - (f.safemem."0.3.0"."std" or false) || - (f.safemem."0.3.0".default or false) || - (safemem."0.3.0"."default" or false); } - { "0.3.0".default = (f.safemem."0.3.0".default or true); } - ]; - }) []; - - -# end -# schannel-0.1.14 - - crates.schannel."0.1.14" = deps: { features?(features_.schannel."0.1.14" deps {}) }: buildRustCrate { - crateName = "schannel"; - version = "0.1.14"; - description = "Schannel bindings for rust, allowing SSL/TLS (e.g. https) without openssl"; - authors = [ "Steven Fackler <sfackler@gmail.com>" "Steffen Butzer <steffen.butzer@outlook.com>" ]; - sha256 = "1g0a88jknns1kwn3x1k3ci5y5zvg58pwdg1xrxkrw3cwd2hynm9k"; - dependencies = mapFeatures features ([ - (crates."lazy_static"."${deps."schannel"."0.1.14"."lazy_static"}" deps) - (crates."winapi"."${deps."schannel"."0.1.14"."winapi"}" deps) - ]); - }; - features_.schannel."0.1.14" = deps: f: updateFeatures f ({ - lazy_static."${deps.schannel."0.1.14".lazy_static}".default = true; - schannel."0.1.14".default = (f.schannel."0.1.14".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.schannel."0.1.14".winapi}"."lmcons" = true; } - { "${deps.schannel."0.1.14".winapi}"."minschannel" = true; } - { "${deps.schannel."0.1.14".winapi}"."schannel" = true; } - { "${deps.schannel."0.1.14".winapi}"."securitybaseapi" = true; } - { "${deps.schannel."0.1.14".winapi}"."sspi" = true; } - { "${deps.schannel."0.1.14".winapi}"."sysinfoapi" = true; } - { "${deps.schannel."0.1.14".winapi}"."timezoneapi" = true; } - { "${deps.schannel."0.1.14".winapi}"."winbase" = true; } - { "${deps.schannel."0.1.14".winapi}"."wincrypt" = true; } - { "${deps.schannel."0.1.14".winapi}"."winerror" = true; } - { "${deps.schannel."0.1.14".winapi}".default = true; } - ]; - }) [ - (features_.lazy_static."${deps."schannel"."0.1.14"."lazy_static"}" deps) - (features_.winapi."${deps."schannel"."0.1.14"."winapi"}" deps) - ]; - - -# end -# scopeguard-0.3.3 - - crates.scopeguard."0.3.3" = deps: { features?(features_.scopeguard."0.3.3" deps {}) }: buildRustCrate { - crateName = "scopeguard"; - version = "0.3.3"; - description = "A RAII scope guard that will run a given closure when it goes out of scope,\neven if the code between panics (assuming unwinding panic).\n\nDefines the macros `defer!` and `defer_on_unwind!`; the latter only runs\nif the scope is extited through unwinding on panic.\n"; - authors = [ "bluss" ]; - sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r"; - features = mkFeatures (features."scopeguard"."0.3.3" or {}); - }; - features_.scopeguard."0.3.3" = deps: f: updateFeatures f (rec { - scopeguard = fold recursiveUpdate {} [ - { "0.3.3"."use_std" = - (f.scopeguard."0.3.3"."use_std" or false) || - (f.scopeguard."0.3.3".default or false) || - (scopeguard."0.3.3"."default" or false); } - { "0.3.3".default = (f.scopeguard."0.3.3".default or true); } - ]; - }) []; - - -# end -# security-framework-0.2.1 - - crates.security_framework."0.2.1" = deps: { features?(features_.security_framework."0.2.1" deps {}) }: buildRustCrate { - crateName = "security-framework"; - version = "0.2.1"; - description = "Security Framework bindings"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0qia5g66zmjn57m9swhrkz3cll3bs4061qim6w72v08c2w0pkvsw"; - dependencies = mapFeatures features ([ - (crates."core_foundation"."${deps."security_framework"."0.2.1"."core_foundation"}" deps) - (crates."core_foundation_sys"."${deps."security_framework"."0.2.1"."core_foundation_sys"}" deps) - (crates."libc"."${deps."security_framework"."0.2.1"."libc"}" deps) - (crates."security_framework_sys"."${deps."security_framework"."0.2.1"."security_framework_sys"}" deps) - ]); - features = mkFeatures (features."security_framework"."0.2.1" or {}); - }; - features_.security_framework."0.2.1" = deps: f: updateFeatures f (rec { - core_foundation."${deps.security_framework."0.2.1".core_foundation}".default = true; - core_foundation_sys."${deps.security_framework."0.2.1".core_foundation_sys}".default = true; - libc."${deps.security_framework."0.2.1".libc}".default = true; - security_framework = fold recursiveUpdate {} [ - { "0.2.1"."OSX_10_10" = - (f.security_framework."0.2.1"."OSX_10_10" or false) || - (f.security_framework."0.2.1".OSX_10_11 or false) || - (security_framework."0.2.1"."OSX_10_11" or false); } - { "0.2.1"."OSX_10_11" = - (f.security_framework."0.2.1"."OSX_10_11" or false) || - (f.security_framework."0.2.1".OSX_10_12 or false) || - (security_framework."0.2.1"."OSX_10_12" or false); } - { "0.2.1"."OSX_10_9" = - (f.security_framework."0.2.1"."OSX_10_9" or false) || - (f.security_framework."0.2.1".OSX_10_10 or false) || - (security_framework."0.2.1"."OSX_10_10" or false); } - { "0.2.1".default = (f.security_framework."0.2.1".default or true); } - ]; - security_framework_sys = fold recursiveUpdate {} [ - { "${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_10" = - (f.security_framework_sys."${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_10" or false) || - (security_framework."0.2.1"."OSX_10_10" or false) || - (f."security_framework"."0.2.1"."OSX_10_10" or false); } - { "${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_11" = - (f.security_framework_sys."${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_11" or false) || - (security_framework."0.2.1"."OSX_10_11" or false) || - (f."security_framework"."0.2.1"."OSX_10_11" or false) || - (security_framework."0.2.1"."OSX_10_12" or false) || - (f."security_framework"."0.2.1"."OSX_10_12" or false); } - { "${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_9" = - (f.security_framework_sys."${deps.security_framework."0.2.1".security_framework_sys}"."OSX_10_9" or false) || - (security_framework."0.2.1"."OSX_10_9" or false) || - (f."security_framework"."0.2.1"."OSX_10_9" or false); } - { "${deps.security_framework."0.2.1".security_framework_sys}".default = true; } - ]; - }) [ - (features_.core_foundation."${deps."security_framework"."0.2.1"."core_foundation"}" deps) - (features_.core_foundation_sys."${deps."security_framework"."0.2.1"."core_foundation_sys"}" deps) - (features_.libc."${deps."security_framework"."0.2.1"."libc"}" deps) - (features_.security_framework_sys."${deps."security_framework"."0.2.1"."security_framework_sys"}" deps) - ]; - - -# end -# security-framework-sys-0.2.1 - - crates.security_framework_sys."0.2.1" = deps: { features?(features_.security_framework_sys."0.2.1" deps {}) }: buildRustCrate { - crateName = "security-framework-sys"; - version = "0.2.1"; - description = "Security Framework bindings"; - authors = [ "Steven Fackler <sfackler@gmail.com>" ]; - sha256 = "0ijxy7bdi4am092hrhm645hcv36xprdx1gjcjmnyw6n78x8sv2iz"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."core_foundation_sys"."${deps."security_framework_sys"."0.2.1"."core_foundation_sys"}" deps) - (crates."libc"."${deps."security_framework_sys"."0.2.1"."libc"}" deps) - ]); - features = mkFeatures (features."security_framework_sys"."0.2.1" or {}); - }; - features_.security_framework_sys."0.2.1" = deps: f: updateFeatures f (rec { - core_foundation_sys."${deps.security_framework_sys."0.2.1".core_foundation_sys}".default = true; - libc."${deps.security_framework_sys."0.2.1".libc}".default = true; - security_framework_sys = fold recursiveUpdate {} [ - { "0.2.1"."OSX_10_10" = - (f.security_framework_sys."0.2.1"."OSX_10_10" or false) || - (f.security_framework_sys."0.2.1".OSX_10_11 or false) || - (security_framework_sys."0.2.1"."OSX_10_11" or false); } - { "0.2.1"."OSX_10_11" = - (f.security_framework_sys."0.2.1"."OSX_10_11" or false) || - (f.security_framework_sys."0.2.1".OSX_10_12 or false) || - (security_framework_sys."0.2.1"."OSX_10_12" or false); } - { "0.2.1"."OSX_10_9" = - (f.security_framework_sys."0.2.1"."OSX_10_9" or false) || - (f.security_framework_sys."0.2.1".OSX_10_10 or false) || - (security_framework_sys."0.2.1"."OSX_10_10" or false); } - { "0.2.1".default = (f.security_framework_sys."0.2.1".default or true); } - ]; - }) [ - (features_.core_foundation_sys."${deps."security_framework_sys"."0.2.1"."core_foundation_sys"}" deps) - (features_.libc."${deps."security_framework_sys"."0.2.1"."libc"}" deps) - ]; - - -# end -# semver-0.9.0 - - crates.semver."0.9.0" = deps: { features?(features_.semver."0.9.0" deps {}) }: buildRustCrate { - crateName = "semver"; - version = "0.9.0"; - description = "Semantic version parsing and comparison.\n"; - authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ]; - sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63"; - dependencies = mapFeatures features ([ - (crates."semver_parser"."${deps."semver"."0.9.0"."semver_parser"}" deps) - ]); - features = mkFeatures (features."semver"."0.9.0" or {}); - }; - features_.semver."0.9.0" = deps: f: updateFeatures f (rec { - semver = fold recursiveUpdate {} [ - { "0.9.0"."serde" = - (f.semver."0.9.0"."serde" or false) || - (f.semver."0.9.0".ci or false) || - (semver."0.9.0"."ci" or false); } - { "0.9.0".default = (f.semver."0.9.0".default or true); } - ]; - semver_parser."${deps.semver."0.9.0".semver_parser}".default = true; - }) [ - (features_.semver_parser."${deps."semver"."0.9.0"."semver_parser"}" deps) - ]; - - -# end -# semver-parser-0.7.0 - - crates.semver_parser."0.7.0" = deps: { features?(features_.semver_parser."0.7.0" deps {}) }: buildRustCrate { - crateName = "semver-parser"; - version = "0.7.0"; - description = "Parsing of the semver spec.\n"; - authors = [ "Steve Klabnik <steve@steveklabnik.com>" ]; - sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h"; - }; - features_.semver_parser."0.7.0" = deps: f: updateFeatures f ({ - semver_parser."0.7.0".default = (f.semver_parser."0.7.0".default or true); - }) []; - - -# end -# serde-1.0.21 - - crates.serde."1.0.21" = deps: { features?(features_.serde."1.0.21" deps {}) }: buildRustCrate { - crateName = "serde"; - version = "1.0.21"; - description = "A generic serialization/deserialization framework"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "10almq7pvx8s4ryiqk8gf7fj5igl0yq6dcjknwc67rkmxd8q50w3"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."serde"."1.0.21" or {}); - }; - features_.serde."1.0.21" = deps: f: updateFeatures f (rec { - serde = fold recursiveUpdate {} [ - { "1.0.21"."serde_derive" = - (f.serde."1.0.21"."serde_derive" or false) || - (f.serde."1.0.21".derive or false) || - (serde."1.0.21"."derive" or false) || - (f.serde."1.0.21".playground or false) || - (serde."1.0.21"."playground" or false); } - { "1.0.21"."std" = - (f.serde."1.0.21"."std" or false) || - (f.serde."1.0.21".default or false) || - (serde."1.0.21"."default" or false); } - { "1.0.21"."unstable" = - (f.serde."1.0.21"."unstable" or false) || - (f.serde."1.0.21".alloc or false) || - (serde."1.0.21"."alloc" or false); } - { "1.0.21".default = (f.serde."1.0.21".default or true); } - ]; - }) []; - - -# end -# serde_json-1.0.6 - - crates.serde_json."1.0.6" = deps: { features?(features_.serde_json."1.0.6" deps {}) }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.6"; - description = "A JSON serialization file format"; - authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1kacyc59splwbg8gr7qs32pp9smgy1khq0ggnv07yxhs7h355vjz"; - dependencies = mapFeatures features ([ - (crates."dtoa"."${deps."serde_json"."1.0.6"."dtoa"}" deps) - (crates."itoa"."${deps."serde_json"."1.0.6"."itoa"}" deps) - (crates."num_traits"."${deps."serde_json"."1.0.6"."num_traits"}" deps) - (crates."serde"."${deps."serde_json"."1.0.6"."serde"}" deps) - ]); - features = mkFeatures (features."serde_json"."1.0.6" or {}); - }; - features_.serde_json."1.0.6" = deps: f: updateFeatures f (rec { - dtoa."${deps.serde_json."1.0.6".dtoa}".default = true; - itoa."${deps.serde_json."1.0.6".itoa}".default = true; - num_traits."${deps.serde_json."1.0.6".num_traits}".default = true; - serde."${deps.serde_json."1.0.6".serde}".default = true; - serde_json = fold recursiveUpdate {} [ - { "1.0.6"."linked-hash-map" = - (f.serde_json."1.0.6"."linked-hash-map" or false) || - (f.serde_json."1.0.6".preserve_order or false) || - (serde_json."1.0.6"."preserve_order" or false); } - { "1.0.6".default = (f.serde_json."1.0.6".default or true); } - ]; - }) [ - (features_.dtoa."${deps."serde_json"."1.0.6"."dtoa"}" deps) - (features_.itoa."${deps."serde_json"."1.0.6"."itoa"}" deps) - (features_.num_traits."${deps."serde_json"."1.0.6"."num_traits"}" deps) - (features_.serde."${deps."serde_json"."1.0.6"."serde"}" deps) - ]; - - -# end -# serde_urlencoded-0.5.1 - - crates.serde_urlencoded."0.5.1" = deps: { features?(features_.serde_urlencoded."0.5.1" deps {}) }: buildRustCrate { - crateName = "serde_urlencoded"; - version = "0.5.1"; - description = "`x-www-form-urlencoded` meets Serde"; - authors = [ "Anthony Ramine <n.oxyde@gmail.com>" ]; - sha256 = "0zh2wlnapmcwqhxnnq1mdlmg8vily7j54wvj01s7cvapzg5jphdl"; - dependencies = mapFeatures features ([ - (crates."dtoa"."${deps."serde_urlencoded"."0.5.1"."dtoa"}" deps) - (crates."itoa"."${deps."serde_urlencoded"."0.5.1"."itoa"}" deps) - (crates."serde"."${deps."serde_urlencoded"."0.5.1"."serde"}" deps) - (crates."url"."${deps."serde_urlencoded"."0.5.1"."url"}" deps) - ]); - }; - features_.serde_urlencoded."0.5.1" = deps: f: updateFeatures f ({ - dtoa."${deps.serde_urlencoded."0.5.1".dtoa}".default = true; - itoa."${deps.serde_urlencoded."0.5.1".itoa}".default = true; - serde."${deps.serde_urlencoded."0.5.1".serde}".default = true; - serde_urlencoded."0.5.1".default = (f.serde_urlencoded."0.5.1".default or true); - url."${deps.serde_urlencoded."0.5.1".url}".default = true; - }) [ - (features_.dtoa."${deps."serde_urlencoded"."0.5.1"."dtoa"}" deps) - (features_.itoa."${deps."serde_urlencoded"."0.5.1"."itoa"}" deps) - (features_.serde."${deps."serde_urlencoded"."0.5.1"."serde"}" deps) - (features_.url."${deps."serde_urlencoded"."0.5.1"."url"}" deps) - ]; - - -# end -# siphasher-0.2.2 - - crates.siphasher."0.2.2" = deps: { features?(features_.siphasher."0.2.2" deps {}) }: buildRustCrate { - crateName = "siphasher"; - version = "0.2.2"; - description = "SipHash functions from rust-core < 1.13"; - authors = [ "Frank Denis <github@pureftpd.org>" ]; - sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr"; - dependencies = mapFeatures features ([ -]); - }; - features_.siphasher."0.2.2" = deps: f: updateFeatures f ({ - siphasher."0.2.2".default = (f.siphasher."0.2.2".default or true); - }) []; - - -# end -# slab-0.4.0 - - crates.slab."0.4.0" = deps: { features?(features_.slab."0.4.0" deps {}) }: buildRustCrate { - crateName = "slab"; - version = "0.4.0"; - description = "Pre-allocated storage for a uniform data type"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0"; - }; - features_.slab."0.4.0" = deps: f: updateFeatures f ({ - slab."0.4.0".default = (f.slab."0.4.0".default or true); - }) []; - - -# end -# slog-1.7.1 - - crates.slog."1.7.1" = deps: { features?(features_.slog."1.7.1" deps {}) }: buildRustCrate { - crateName = "slog"; - version = "1.7.1"; - description = "Structured, composable logging for Rust"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "1qhnwv2gbxmnwasaa0vlhddq6cdhq6n3l8d6h3ql73367h7aav65"; - features = mkFeatures (features."slog"."1.7.1" or {}); - }; - features_.slog."1.7.1" = deps: f: updateFeatures f (rec { - slog = fold recursiveUpdate {} [ - { "1.7.1"."std" = - (f.slog."1.7.1"."std" or false) || - (f.slog."1.7.1".default or false) || - (slog."1.7.1"."default" or false); } - { "1.7.1".default = (f.slog."1.7.1".default or true); } - ]; - }) []; - - -# end -# slog-envlogger-0.5.0 - - crates.slog_envlogger."0.5.0" = deps: { features?(features_.slog_envlogger."0.5.0" deps {}) }: buildRustCrate { - crateName = "slog-envlogger"; - version = "0.5.0"; - description = "Port of de facto standard logger implementation for Rust, to `slog-rs` framework.\n"; - authors = [ "The Rust Project Developers" "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "0ry9k2ppj7z6prdz2kf924w7l9y2kbysrigca6shni1kz2j163qb"; - libPath = "src/lib.rs"; - dependencies = mapFeatures features ([ - (crates."log"."${deps."slog_envlogger"."0.5.0"."log"}" deps) - (crates."regex"."${deps."slog_envlogger"."0.5.0"."regex"}" deps) - (crates."slog"."${deps."slog_envlogger"."0.5.0"."slog"}" deps) - (crates."slog_stdlog"."${deps."slog_envlogger"."0.5.0"."slog_stdlog"}" deps) - (crates."slog_term"."${deps."slog_envlogger"."0.5.0"."slog_term"}" deps) - ]); - }; - features_.slog_envlogger."0.5.0" = deps: f: updateFeatures f ({ - log."${deps.slog_envlogger."0.5.0".log}".default = true; - regex."${deps.slog_envlogger."0.5.0".regex}".default = true; - slog."${deps.slog_envlogger."0.5.0".slog}".default = true; - slog_envlogger."0.5.0".default = (f.slog_envlogger."0.5.0".default or true); - slog_stdlog."${deps.slog_envlogger."0.5.0".slog_stdlog}".default = true; - slog_term."${deps.slog_envlogger."0.5.0".slog_term}".default = true; - }) [ - (features_.log."${deps."slog_envlogger"."0.5.0"."log"}" deps) - (features_.regex."${deps."slog_envlogger"."0.5.0"."regex"}" deps) - (features_.slog."${deps."slog_envlogger"."0.5.0"."slog"}" deps) - (features_.slog_stdlog."${deps."slog_envlogger"."0.5.0"."slog_stdlog"}" deps) - (features_.slog_term."${deps."slog_envlogger"."0.5.0"."slog_term"}" deps) - ]; - - -# end -# slog-extra-0.1.2 - - crates.slog_extra."0.1.2" = deps: { features?(features_.slog_extra."0.1.2" deps {}) }: buildRustCrate { - crateName = "slog-extra"; - version = "0.1.2"; - description = "Standard slog-rs extensions"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "0jrw0xcc81wwcl59xx9qglfcv5l3ad5kbpcyp6ygk94p9kxfrhyj"; - libPath = "lib.rs"; - dependencies = mapFeatures features ([ - (crates."slog"."${deps."slog_extra"."0.1.2"."slog"}" deps) - (crates."thread_local"."${deps."slog_extra"."0.1.2"."thread_local"}" deps) - ]); - }; - features_.slog_extra."0.1.2" = deps: f: updateFeatures f ({ - slog."${deps.slog_extra."0.1.2".slog}".default = true; - slog_extra."0.1.2".default = (f.slog_extra."0.1.2".default or true); - thread_local."${deps.slog_extra."0.1.2".thread_local}".default = true; - }) [ - (features_.slog."${deps."slog_extra"."0.1.2"."slog"}" deps) - (features_.thread_local."${deps."slog_extra"."0.1.2"."thread_local"}" deps) - ]; - - -# end -# slog-stdlog-1.1.0 - - crates.slog_stdlog."1.1.0" = deps: { features?(features_.slog_stdlog."1.1.0" deps {}) }: buildRustCrate { - crateName = "slog-stdlog"; - version = "1.1.0"; - description = "Standard Rust log crate adapter to slog-rs"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "0ig4mjixr4y3dn3s53rlnrpplwkqb8b0z2zkaiiiwyv7nhjxdg46"; - libPath = "lib.rs"; - dependencies = mapFeatures features ([ - (crates."crossbeam"."${deps."slog_stdlog"."1.1.0"."crossbeam"}" deps) - (crates."lazy_static"."${deps."slog_stdlog"."1.1.0"."lazy_static"}" deps) - (crates."log"."${deps."slog_stdlog"."1.1.0"."log"}" deps) - (crates."slog"."${deps."slog_stdlog"."1.1.0"."slog"}" deps) - (crates."slog_term"."${deps."slog_stdlog"."1.1.0"."slog_term"}" deps) - ]); - }; - features_.slog_stdlog."1.1.0" = deps: f: updateFeatures f ({ - crossbeam."${deps.slog_stdlog."1.1.0".crossbeam}".default = true; - lazy_static."${deps.slog_stdlog."1.1.0".lazy_static}".default = true; - log."${deps.slog_stdlog."1.1.0".log}".default = true; - slog."${deps.slog_stdlog."1.1.0".slog}".default = true; - slog_stdlog."1.1.0".default = (f.slog_stdlog."1.1.0".default or true); - slog_term."${deps.slog_stdlog."1.1.0".slog_term}".default = true; - }) [ - (features_.crossbeam."${deps."slog_stdlog"."1.1.0"."crossbeam"}" deps) - (features_.lazy_static."${deps."slog_stdlog"."1.1.0"."lazy_static"}" deps) - (features_.log."${deps."slog_stdlog"."1.1.0"."log"}" deps) - (features_.slog."${deps."slog_stdlog"."1.1.0"."slog"}" deps) - (features_.slog_term."${deps."slog_stdlog"."1.1.0"."slog_term"}" deps) - ]; - - -# end -# slog-stream-1.2.1 - - crates.slog_stream."1.2.1" = deps: { features?(features_.slog_stream."1.2.1" deps {}) }: buildRustCrate { - crateName = "slog-stream"; - version = "1.2.1"; - description = "`io::Write` streamer for slog-rs"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "03dwzbydaamfzjpr16gm065i696lk86gqcpspv5qaqyv938fm2yj"; - libPath = "lib.rs"; - dependencies = mapFeatures features ([ - (crates."slog"."${deps."slog_stream"."1.2.1"."slog"}" deps) - (crates."slog_extra"."${deps."slog_stream"."1.2.1"."slog_extra"}" deps) - (crates."thread_local"."${deps."slog_stream"."1.2.1"."thread_local"}" deps) - ]); - }; - features_.slog_stream."1.2.1" = deps: f: updateFeatures f ({ - slog."${deps.slog_stream."1.2.1".slog}".default = true; - slog_extra."${deps.slog_stream."1.2.1".slog_extra}".default = true; - slog_stream."1.2.1".default = (f.slog_stream."1.2.1".default or true); - thread_local."${deps.slog_stream."1.2.1".thread_local}".default = true; - }) [ - (features_.slog."${deps."slog_stream"."1.2.1"."slog"}" deps) - (features_.slog_extra."${deps."slog_stream"."1.2.1"."slog_extra"}" deps) - (features_.thread_local."${deps."slog_stream"."1.2.1"."thread_local"}" deps) - ]; - - -# end -# slog-term-1.5.0 - - crates.slog_term."1.5.0" = deps: { features?(features_.slog_term."1.5.0" deps {}) }: buildRustCrate { - crateName = "slog-term"; - version = "1.5.0"; - description = "Unix terminal drain and formatter for slog-rs"; - authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ]; - sha256 = "0zq2kyvm7jhqj6sc09w540wqfrrpa46yxf9sgzq7jqpkr66wsiar"; - libPath = "lib.rs"; - dependencies = mapFeatures features ([ - (crates."chrono"."${deps."slog_term"."1.5.0"."chrono"}" deps) - (crates."isatty"."${deps."slog_term"."1.5.0"."isatty"}" deps) - (crates."slog"."${deps."slog_term"."1.5.0"."slog"}" deps) - (crates."slog_stream"."${deps."slog_term"."1.5.0"."slog_stream"}" deps) - (crates."thread_local"."${deps."slog_term"."1.5.0"."thread_local"}" deps) - ]); - }; - features_.slog_term."1.5.0" = deps: f: updateFeatures f ({ - chrono."${deps.slog_term."1.5.0".chrono}".default = true; - isatty."${deps.slog_term."1.5.0".isatty}".default = true; - slog."${deps.slog_term."1.5.0".slog}".default = true; - slog_stream."${deps.slog_term."1.5.0".slog_stream}".default = true; - slog_term."1.5.0".default = (f.slog_term."1.5.0".default or true); - thread_local."${deps.slog_term."1.5.0".thread_local}".default = true; - }) [ - (features_.chrono."${deps."slog_term"."1.5.0"."chrono"}" deps) - (features_.isatty."${deps."slog_term"."1.5.0"."isatty"}" deps) - (features_.slog."${deps."slog_term"."1.5.0"."slog"}" deps) - (features_.slog_stream."${deps."slog_term"."1.5.0"."slog_stream"}" deps) - (features_.thread_local."${deps."slog_term"."1.5.0"."thread_local"}" deps) - ]; - - -# end -# smallvec-0.6.7 - - crates.smallvec."0.6.7" = deps: { features?(features_.smallvec."0.6.7" deps {}) }: buildRustCrate { - crateName = "smallvec"; - version = "0.6.7"; - description = "'Small vector' optimization: store up to a small number of items on the stack"; - authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]; - sha256 = "08ql2yi7ry08cqjl9n6vpb6x6zgqzwllzzk9pxj1143xwg503qcx"; - libPath = "lib.rs"; - dependencies = mapFeatures features ([ - (crates."unreachable"."${deps."smallvec"."0.6.7"."unreachable"}" deps) - ]); - features = mkFeatures (features."smallvec"."0.6.7" or {}); - }; - features_.smallvec."0.6.7" = deps: f: updateFeatures f (rec { - smallvec = fold recursiveUpdate {} [ - { "0.6.7"."std" = - (f.smallvec."0.6.7"."std" or false) || - (f.smallvec."0.6.7".default or false) || - (smallvec."0.6.7"."default" or false); } - { "0.6.7".default = (f.smallvec."0.6.7".default or true); } - ]; - unreachable."${deps.smallvec."0.6.7".unreachable}".default = true; - }) [ - (features_.unreachable."${deps."smallvec"."0.6.7"."unreachable"}" deps) - ]; - - -# end -# stable_deref_trait-1.1.1 - - crates.stable_deref_trait."1.1.1" = deps: { features?(features_.stable_deref_trait."1.1.1" deps {}) }: buildRustCrate { - crateName = "stable_deref_trait"; - version = "1.1.1"; - description = "An unsafe marker trait for types like Box and Rc that dereference to a stable address even when moved, and hence can be used with libraries such as owning_ref and rental.\n"; - authors = [ "Robert Grosse <n210241048576@gmail.com>" ]; - sha256 = "1xy9slzslrzr31nlnw52sl1d820b09y61b7f13lqgsn8n7y0l4g8"; - features = mkFeatures (features."stable_deref_trait"."1.1.1" or {}); - }; - features_.stable_deref_trait."1.1.1" = deps: f: updateFeatures f (rec { - stable_deref_trait = fold recursiveUpdate {} [ - { "1.1.1"."std" = - (f.stable_deref_trait."1.1.1"."std" or false) || - (f.stable_deref_trait."1.1.1".default or false) || - (stable_deref_trait."1.1.1"."default" or false); } - { "1.1.1".default = (f.stable_deref_trait."1.1.1".default or true); } - ]; - }) []; - - -# end -# string-0.1.2 - - crates.string."0.1.2" = deps: { features?(features_.string."0.1.2" deps {}) }: buildRustCrate { - crateName = "string"; - version = "0.1.2"; - description = "A UTF-8 encoded string with configurable byte storage."; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1120qvf02aydqj0k3kpr8d7zybq0y5arnmgmfsdw75r8qwz75wc6"; - }; - features_.string."0.1.2" = deps: f: updateFeatures f ({ - string."0.1.2".default = (f.string."0.1.2".default or true); - }) []; - - -# end -# strsim-0.6.0 - - crates.strsim."0.6.0" = deps: { features?(features_.strsim."0.6.0" deps {}) }: buildRustCrate { - crateName = "strsim"; - version = "0.6.0"; - description = "Implementations of string similarity metrics.\nIncludes Hamming, Levenshtein, Damerau-Levenshtein, Jaro, and Jaro-Winkler.\n"; - authors = [ "Danny Guo <dannyguo91@gmail.com>" ]; - sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd"; - }; - features_.strsim."0.6.0" = deps: f: updateFeatures f ({ - strsim."0.6.0".default = (f.strsim."0.6.0".default or true); - }) []; - - -# end -# syn-0.11.11 - - crates.syn."0.11.11" = deps: { features?(features_.syn."0.11.11" deps {}) }: buildRustCrate { - crateName = "syn"; - version = "0.11.11"; - description = "Nom parser for Rust source code"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; - dependencies = mapFeatures features ([ - ] - ++ (if features.syn."0.11.11".quote or false then [ (crates.quote."${deps."syn"."0.11.11".quote}" deps) ] else []) - ++ (if features.syn."0.11.11".synom or false then [ (crates.synom."${deps."syn"."0.11.11".synom}" deps) ] else []) - ++ (if features.syn."0.11.11".unicode-xid or false then [ (crates.unicode_xid."${deps."syn"."0.11.11".unicode_xid}" deps) ] else [])); - features = mkFeatures (features."syn"."0.11.11" or {}); - }; - features_.syn."0.11.11" = deps: f: updateFeatures f (rec { - quote."${deps.syn."0.11.11".quote}".default = true; - syn = fold recursiveUpdate {} [ - { "0.11.11"."parsing" = - (f.syn."0.11.11"."parsing" or false) || - (f.syn."0.11.11".default or false) || - (syn."0.11.11"."default" or false); } - { "0.11.11"."printing" = - (f.syn."0.11.11"."printing" or false) || - (f.syn."0.11.11".default or false) || - (syn."0.11.11"."default" or false); } - { "0.11.11"."quote" = - (f.syn."0.11.11"."quote" or false) || - (f.syn."0.11.11".printing or false) || - (syn."0.11.11"."printing" or false); } - { "0.11.11"."synom" = - (f.syn."0.11.11"."synom" or false) || - (f.syn."0.11.11".parsing or false) || - (syn."0.11.11"."parsing" or false); } - { "0.11.11"."unicode-xid" = - (f.syn."0.11.11"."unicode-xid" or false) || - (f.syn."0.11.11".parsing or false) || - (syn."0.11.11"."parsing" or false); } - { "0.11.11".default = (f.syn."0.11.11".default or true); } - ]; - synom."${deps.syn."0.11.11".synom}".default = true; - unicode_xid."${deps.syn."0.11.11".unicode_xid}".default = true; - }) [ - (features_.quote."${deps."syn"."0.11.11"."quote"}" deps) - (features_.synom."${deps."syn"."0.11.11"."synom"}" deps) - (features_.unicode_xid."${deps."syn"."0.11.11"."unicode_xid"}" deps) - ]; - - -# end -# synom-0.11.3 - - crates.synom."0.11.3" = deps: { features?(features_.synom."0.11.3" deps {}) }: buildRustCrate { - crateName = "synom"; - version = "0.11.3"; - description = "Stripped-down Nom parser used by Syn"; - authors = [ "David Tolnay <dtolnay@gmail.com>" ]; - sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; - dependencies = mapFeatures features ([ - (crates."unicode_xid"."${deps."synom"."0.11.3"."unicode_xid"}" deps) - ]); - }; - features_.synom."0.11.3" = deps: f: updateFeatures f ({ - synom."0.11.3".default = (f.synom."0.11.3".default or true); - unicode_xid."${deps.synom."0.11.3".unicode_xid}".default = true; - }) [ - (features_.unicode_xid."${deps."synom"."0.11.3"."unicode_xid"}" deps) - ]; - - -# end -# tar-0.4.13 - - crates.tar."0.4.13" = deps: { features?(features_.tar."0.4.13" deps {}) }: buildRustCrate { - crateName = "tar"; - version = "0.4.13"; - description = "A Rust implementation of a TAR file reader and writer. This library does not\ncurrently handle compression, but it is abstract over all I/O readers and\nwriters. Additionally, great lengths are taken to ensure that the entire\ncontents are never required to be entirely resident in memory all at once.\n"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; - sha256 = "1m425d07h0i6h2vbpxnh067zmc16l9yr9bii17zxw4z2inkfyfc4"; - dependencies = mapFeatures features ([ - (crates."filetime"."${deps."tar"."0.4.13"."filetime"}" deps) - (crates."libc"."${deps."tar"."0.4.13"."libc"}" deps) - ]) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - ] - ++ (if features.tar."0.4.13".xattr or false then [ (crates.xattr."${deps."tar"."0.4.13".xattr}" deps) ] else [])) else []); - features = mkFeatures (features."tar"."0.4.13" or {}); - }; - features_.tar."0.4.13" = deps: f: updateFeatures f (rec { - filetime."${deps.tar."0.4.13".filetime}".default = true; - libc."${deps.tar."0.4.13".libc}".default = true; - tar = fold recursiveUpdate {} [ - { "0.4.13"."xattr" = - (f.tar."0.4.13"."xattr" or false) || - (f.tar."0.4.13".default or false) || - (tar."0.4.13"."default" or false); } - { "0.4.13".default = (f.tar."0.4.13".default or true); } - ]; - xattr."${deps.tar."0.4.13".xattr}".default = true; - }) [ - (features_.filetime."${deps."tar"."0.4.13"."filetime"}" deps) - (features_.libc."${deps."tar"."0.4.13"."libc"}" deps) - (features_.xattr."${deps."tar"."0.4.13"."xattr"}" deps) - ]; - - -# end -# tempfile-3.0.5 - - crates.tempfile."3.0.5" = deps: { features?(features_.tempfile."3.0.5" deps {}) }: buildRustCrate { - crateName = "tempfile"; - version = "3.0.5"; - description = "A library for managing temporary files and directories.\n"; - authors = [ "Steven Allen <steven@stebalien.com>" "The Rust Project Developers" "Ashley Mannix <ashleymannix@live.com.au>" "Jason White <jasonaw0@gmail.com>" ]; - sha256 = "11xc89br78ypk4g27v51lm2baz57gp6v555i3sxhrj9qlas2iqfl"; - dependencies = mapFeatures features ([ - (crates."cfg_if"."${deps."tempfile"."3.0.5"."cfg_if"}" deps) - (crates."rand"."${deps."tempfile"."3.0.5"."rand"}" deps) - (crates."remove_dir_all"."${deps."tempfile"."3.0.5"."remove_dir_all"}" deps) - ]) - ++ (if kernel == "redox" then mapFeatures features ([ - (crates."redox_syscall"."${deps."tempfile"."3.0.5"."redox_syscall"}" deps) - ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ - (crates."libc"."${deps."tempfile"."3.0.5"."libc"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."winapi"."${deps."tempfile"."3.0.5"."winapi"}" deps) - ]) else []); - }; - features_.tempfile."3.0.5" = deps: f: updateFeatures f ({ - cfg_if."${deps.tempfile."3.0.5".cfg_if}".default = true; - libc."${deps.tempfile."3.0.5".libc}".default = true; - rand."${deps.tempfile."3.0.5".rand}".default = true; - redox_syscall."${deps.tempfile."3.0.5".redox_syscall}".default = true; - remove_dir_all."${deps.tempfile."3.0.5".remove_dir_all}".default = true; - tempfile."3.0.5".default = (f.tempfile."3.0.5".default or true); - winapi = fold recursiveUpdate {} [ - { "${deps.tempfile."3.0.5".winapi}"."fileapi" = true; } - { "${deps.tempfile."3.0.5".winapi}"."handleapi" = true; } - { "${deps.tempfile."3.0.5".winapi}"."winbase" = true; } - { "${deps.tempfile."3.0.5".winapi}".default = true; } - ]; - }) [ - (features_.cfg_if."${deps."tempfile"."3.0.5"."cfg_if"}" deps) - (features_.rand."${deps."tempfile"."3.0.5"."rand"}" deps) - (features_.remove_dir_all."${deps."tempfile"."3.0.5"."remove_dir_all"}" deps) - (features_.redox_syscall."${deps."tempfile"."3.0.5"."redox_syscall"}" deps) - (features_.libc."${deps."tempfile"."3.0.5"."libc"}" deps) - (features_.winapi."${deps."tempfile"."3.0.5"."winapi"}" deps) - ]; - - -# end -# termion-1.5.1 - - crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate { - crateName = "termion"; - version = "1.5.1"; - description = "A bindless library for manipulating terminals."; - authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ]; - sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; - dependencies = (if !(kernel == "redox") then mapFeatures features ([ - (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps) - ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ - (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps) - (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) - ]) else []); - }; - features_.termion."1.5.1" = deps: f: updateFeatures f ({ - libc."${deps.termion."1.5.1".libc}".default = true; - redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; - redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; - termion."1.5.1".default = (f.termion."1.5.1".default or true); - }) [ - (features_.libc."${deps."termion"."1.5.1"."libc"}" deps) - (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps) - (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps) - ]; - - -# end -# textwrap-0.9.0 - - crates.textwrap."0.9.0" = deps: { features?(features_.textwrap."0.9.0" deps {}) }: buildRustCrate { - crateName = "textwrap"; - version = "0.9.0"; - description = "Textwrap is a small library for word wrapping, indenting, and\ndedenting strings.\n\nYou can use it to format strings (such as help and error messages) for\ndisplay in commandline applications. It is designed to be efficient\nand handle Unicode characters correctly.\n"; - authors = [ "Martin Geisler <martin@geisler.net>" ]; - sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; - dependencies = mapFeatures features ([ - (crates."unicode_width"."${deps."textwrap"."0.9.0"."unicode_width"}" deps) - ]); - }; - features_.textwrap."0.9.0" = deps: f: updateFeatures f ({ - textwrap."0.9.0".default = (f.textwrap."0.9.0".default or true); - unicode_width."${deps.textwrap."0.9.0".unicode_width}".default = true; - }) [ - (features_.unicode_width."${deps."textwrap"."0.9.0"."unicode_width"}" deps) - ]; - - -# end -# thread-id-2.0.0 - - crates.thread_id."2.0.0" = deps: { features?(features_.thread_id."2.0.0" deps {}) }: buildRustCrate { - crateName = "thread-id"; - version = "2.0.0"; - description = "Get a unique thread ID"; - authors = [ "Ruud van Asseldonk <dev@veniogames.com>" ]; - sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3"; - dependencies = mapFeatures features ([ - (crates."kernel32_sys"."${deps."thread_id"."2.0.0"."kernel32_sys"}" deps) - (crates."libc"."${deps."thread_id"."2.0.0"."libc"}" deps) - ]); - }; - features_.thread_id."2.0.0" = deps: f: updateFeatures f ({ - kernel32_sys."${deps.thread_id."2.0.0".kernel32_sys}".default = true; - libc."${deps.thread_id."2.0.0".libc}".default = true; - thread_id."2.0.0".default = (f.thread_id."2.0.0".default or true); - }) [ - (features_.kernel32_sys."${deps."thread_id"."2.0.0"."kernel32_sys"}" deps) - (features_.libc."${deps."thread_id"."2.0.0"."libc"}" deps) - ]; - - -# end -# thread_local-0.2.7 - - crates.thread_local."0.2.7" = deps: { features?(features_.thread_local."0.2.7" deps {}) }: buildRustCrate { - crateName = "thread_local"; - version = "0.2.7"; - description = "Per-object thread-local storage"; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7"; - dependencies = mapFeatures features ([ - (crates."thread_id"."${deps."thread_local"."0.2.7"."thread_id"}" deps) - ]); - }; - features_.thread_local."0.2.7" = deps: f: updateFeatures f ({ - thread_id."${deps.thread_local."0.2.7".thread_id}".default = true; - thread_local."0.2.7".default = (f.thread_local."0.2.7".default or true); - }) [ - (features_.thread_id."${deps."thread_local"."0.2.7"."thread_id"}" deps) - ]; - - -# end -# thread_local-0.3.4 - - crates.thread_local."0.3.4" = deps: { features?(features_.thread_local."0.3.4" deps {}) }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.4"; - description = "Per-object thread-local storage"; - authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ]; - sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; - dependencies = mapFeatures features ([ - (crates."lazy_static"."${deps."thread_local"."0.3.4"."lazy_static"}" deps) - (crates."unreachable"."${deps."thread_local"."0.3.4"."unreachable"}" deps) - ]); - }; - features_.thread_local."0.3.4" = deps: f: updateFeatures f ({ - lazy_static."${deps.thread_local."0.3.4".lazy_static}".default = true; - thread_local."0.3.4".default = (f.thread_local."0.3.4".default or true); - unreachable."${deps.thread_local."0.3.4".unreachable}".default = true; - }) [ - (features_.lazy_static."${deps."thread_local"."0.3.4"."lazy_static"}" deps) - (features_.unreachable."${deps."thread_local"."0.3.4"."unreachable"}" deps) - ]; - - -# end -# time-0.1.38 - - crates.time."0.1.38" = deps: { features?(features_.time."0.1.38" deps {}) }: buildRustCrate { - crateName = "time"; - version = "0.1.38"; - description = "Utilities for working with time-related functions in Rust.\n"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."time"."0.1.38"."libc"}" deps) - ]) - ++ (if kernel == "redox" then mapFeatures features ([ - (crates."redox_syscall"."${deps."time"."0.1.38"."redox_syscall"}" deps) - ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ - (crates."kernel32_sys"."${deps."time"."0.1.38"."kernel32_sys"}" deps) - (crates."winapi"."${deps."time"."0.1.38"."winapi"}" deps) - ]) else []); - }; - features_.time."0.1.38" = deps: f: updateFeatures f ({ - kernel32_sys."${deps.time."0.1.38".kernel32_sys}".default = true; - libc."${deps.time."0.1.38".libc}".default = true; - redox_syscall."${deps.time."0.1.38".redox_syscall}".default = true; - time."0.1.38".default = (f.time."0.1.38".default or true); - winapi."${deps.time."0.1.38".winapi}".default = true; - }) [ - (features_.libc."${deps."time"."0.1.38"."libc"}" deps) - (features_.redox_syscall."${deps."time"."0.1.38"."redox_syscall"}" deps) - (features_.kernel32_sys."${deps."time"."0.1.38"."kernel32_sys"}" deps) - (features_.winapi."${deps."time"."0.1.38"."winapi"}" deps) - ]; - - -# end -# tokio-0.1.7 - - crates.tokio."0.1.7" = deps: { features?(features_.tokio."0.1.7" deps {}) }: buildRustCrate { - crateName = "tokio"; - version = "0.1.7"; - description = "An event-driven, non-blocking I/O platform for writing asynchronous I/O\nbacked applications.\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0d5fj90wk05m5vbd924irg1pl1d4fn86jjw5napzanh6vbwsnr66"; - dependencies = mapFeatures features ([ - (crates."futures"."${deps."tokio"."0.1.7"."futures"}" deps) - (crates."mio"."${deps."tokio"."0.1.7"."mio"}" deps) - (crates."tokio_executor"."${deps."tokio"."0.1.7"."tokio_executor"}" deps) - (crates."tokio_fs"."${deps."tokio"."0.1.7"."tokio_fs"}" deps) - (crates."tokio_io"."${deps."tokio"."0.1.7"."tokio_io"}" deps) - (crates."tokio_reactor"."${deps."tokio"."0.1.7"."tokio_reactor"}" deps) - (crates."tokio_tcp"."${deps."tokio"."0.1.7"."tokio_tcp"}" deps) - (crates."tokio_threadpool"."${deps."tokio"."0.1.7"."tokio_threadpool"}" deps) - (crates."tokio_timer"."${deps."tokio"."0.1.7"."tokio_timer"}" deps) - (crates."tokio_udp"."${deps."tokio"."0.1.7"."tokio_udp"}" deps) - ]); - }; - features_.tokio."0.1.7" = deps: f: updateFeatures f ({ - futures."${deps.tokio."0.1.7".futures}".default = true; - mio."${deps.tokio."0.1.7".mio}".default = true; - tokio."0.1.7".default = (f.tokio."0.1.7".default or true); - tokio_executor."${deps.tokio."0.1.7".tokio_executor}".default = true; - tokio_fs."${deps.tokio."0.1.7".tokio_fs}".default = true; - tokio_io."${deps.tokio."0.1.7".tokio_io}".default = true; - tokio_reactor."${deps.tokio."0.1.7".tokio_reactor}".default = true; - tokio_tcp."${deps.tokio."0.1.7".tokio_tcp}".default = true; - tokio_threadpool."${deps.tokio."0.1.7".tokio_threadpool}".default = true; - tokio_timer."${deps.tokio."0.1.7".tokio_timer}".default = true; - tokio_udp."${deps.tokio."0.1.7".tokio_udp}".default = true; - }) [ - (features_.futures."${deps."tokio"."0.1.7"."futures"}" deps) - (features_.mio."${deps."tokio"."0.1.7"."mio"}" deps) - (features_.tokio_executor."${deps."tokio"."0.1.7"."tokio_executor"}" deps) - (features_.tokio_fs."${deps."tokio"."0.1.7"."tokio_fs"}" deps) - (features_.tokio_io."${deps."tokio"."0.1.7"."tokio_io"}" deps) - (features_.tokio_reactor."${deps."tokio"."0.1.7"."tokio_reactor"}" deps) - (features_.tokio_tcp."${deps."tokio"."0.1.7"."tokio_tcp"}" deps) - (features_.tokio_threadpool."${deps."tokio"."0.1.7"."tokio_threadpool"}" deps) - (features_.tokio_timer."${deps."tokio"."0.1.7"."tokio_timer"}" deps) - (features_.tokio_udp."${deps."tokio"."0.1.7"."tokio_udp"}" deps) - ]; - - -# end -# tokio-codec-0.1.1 - - crates.tokio_codec."0.1.1" = deps: { features?(features_.tokio_codec."0.1.1" deps {}) }: buildRustCrate { - crateName = "tokio-codec"; - version = "0.1.1"; - description = "Utilities for encoding and decoding frames.\n"; - authors = [ "Carl Lerche <me@carllerche.com>" "Bryan Burgers <bryan@burgers.io>" ]; - sha256 = "0jc9lik540zyj4chbygg1rjh37m3zax8pd4bwcrwjmi1v56qwi4h"; - dependencies = mapFeatures features ([ - (crates."bytes"."${deps."tokio_codec"."0.1.1"."bytes"}" deps) - (crates."futures"."${deps."tokio_codec"."0.1.1"."futures"}" deps) - (crates."tokio_io"."${deps."tokio_codec"."0.1.1"."tokio_io"}" deps) - ]); - }; - features_.tokio_codec."0.1.1" = deps: f: updateFeatures f ({ - bytes."${deps.tokio_codec."0.1.1".bytes}".default = true; - futures."${deps.tokio_codec."0.1.1".futures}".default = true; - tokio_codec."0.1.1".default = (f.tokio_codec."0.1.1".default or true); - tokio_io."${deps.tokio_codec."0.1.1".tokio_io}".default = true; - }) [ - (features_.bytes."${deps."tokio_codec"."0.1.1"."bytes"}" deps) - (features_.futures."${deps."tokio_codec"."0.1.1"."futures"}" deps) - (features_.tokio_io."${deps."tokio_codec"."0.1.1"."tokio_io"}" deps) - ]; - - -# end -# tokio-executor-0.1.5 - - crates.tokio_executor."0.1.5" = deps: { features?(features_.tokio_executor."0.1.5" deps {}) }: buildRustCrate { - crateName = "tokio-executor"; - version = "0.1.5"; - description = "Future execution primitives\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "15j2ybs8w38gncgbxkvp2qsp6wl62ibi3rns0vlwggx7svmx4bf3"; - dependencies = mapFeatures features ([ - (crates."futures"."${deps."tokio_executor"."0.1.5"."futures"}" deps) - ]); - }; - features_.tokio_executor."0.1.5" = deps: f: updateFeatures f ({ - futures."${deps.tokio_executor."0.1.5".futures}".default = true; - tokio_executor."0.1.5".default = (f.tokio_executor."0.1.5".default or true); - }) [ - (features_.futures."${deps."tokio_executor"."0.1.5"."futures"}" deps) - ]; - - -# end -# tokio-fs-0.1.4 - - crates.tokio_fs."0.1.4" = deps: { features?(features_.tokio_fs."0.1.4" deps {}) }: buildRustCrate { - crateName = "tokio-fs"; - version = "0.1.4"; - description = "Filesystem API for Tokio.\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "05bpc1p1apb4jfw18i84agwwar57zn07d7smqvslpzagd9b3sd31"; - dependencies = mapFeatures features ([ - (crates."futures"."${deps."tokio_fs"."0.1.4"."futures"}" deps) - (crates."tokio_io"."${deps."tokio_fs"."0.1.4"."tokio_io"}" deps) - (crates."tokio_threadpool"."${deps."tokio_fs"."0.1.4"."tokio_threadpool"}" deps) - ]); - }; - features_.tokio_fs."0.1.4" = deps: f: updateFeatures f ({ - futures."${deps.tokio_fs."0.1.4".futures}".default = true; - tokio_fs."0.1.4".default = (f.tokio_fs."0.1.4".default or true); - tokio_io."${deps.tokio_fs."0.1.4".tokio_io}".default = true; - tokio_threadpool."${deps.tokio_fs."0.1.4".tokio_threadpool}".default = true; - }) [ - (features_.futures."${deps."tokio_fs"."0.1.4"."futures"}" deps) - (features_.tokio_io."${deps."tokio_fs"."0.1.4"."tokio_io"}" deps) - (features_.tokio_threadpool."${deps."tokio_fs"."0.1.4"."tokio_threadpool"}" deps) - ]; - - -# end -# tokio-io-0.1.10 - - crates.tokio_io."0.1.10" = deps: { features?(features_.tokio_io."0.1.10" deps {}) }: buildRustCrate { - crateName = "tokio-io"; - version = "0.1.10"; - description = "Core I/O primitives for asynchronous I/O in Rust.\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "14d65rqa5rb2msgkz2xn40cavs4m7f4qyi7vnfv98v7f10l9wlay"; - dependencies = mapFeatures features ([ - (crates."bytes"."${deps."tokio_io"."0.1.10"."bytes"}" deps) - (crates."futures"."${deps."tokio_io"."0.1.10"."futures"}" deps) - (crates."log"."${deps."tokio_io"."0.1.10"."log"}" deps) - ]); - }; - features_.tokio_io."0.1.10" = deps: f: updateFeatures f ({ - bytes."${deps.tokio_io."0.1.10".bytes}".default = true; - futures."${deps.tokio_io."0.1.10".futures}".default = true; - log."${deps.tokio_io."0.1.10".log}".default = true; - tokio_io."0.1.10".default = (f.tokio_io."0.1.10".default or true); - }) [ - (features_.bytes."${deps."tokio_io"."0.1.10"."bytes"}" deps) - (features_.futures."${deps."tokio_io"."0.1.10"."futures"}" deps) - (features_.log."${deps."tokio_io"."0.1.10"."log"}" deps) - ]; - - -# end -# tokio-reactor-0.1.7 - - crates.tokio_reactor."0.1.7" = deps: { features?(features_.tokio_reactor."0.1.7" deps {}) }: buildRustCrate { - crateName = "tokio-reactor"; - version = "0.1.7"; - description = "Event loop that drives Tokio I/O resources.\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1ssrc6gic43lachv7jk97jxzw609sgcsrkwi7chf96sn7nqrhj0z"; - dependencies = mapFeatures features ([ - (crates."crossbeam_utils"."${deps."tokio_reactor"."0.1.7"."crossbeam_utils"}" deps) - (crates."futures"."${deps."tokio_reactor"."0.1.7"."futures"}" deps) - (crates."lazy_static"."${deps."tokio_reactor"."0.1.7"."lazy_static"}" deps) - (crates."log"."${deps."tokio_reactor"."0.1.7"."log"}" deps) - (crates."mio"."${deps."tokio_reactor"."0.1.7"."mio"}" deps) - (crates."num_cpus"."${deps."tokio_reactor"."0.1.7"."num_cpus"}" deps) - (crates."parking_lot"."${deps."tokio_reactor"."0.1.7"."parking_lot"}" deps) - (crates."slab"."${deps."tokio_reactor"."0.1.7"."slab"}" deps) - (crates."tokio_executor"."${deps."tokio_reactor"."0.1.7"."tokio_executor"}" deps) - (crates."tokio_io"."${deps."tokio_reactor"."0.1.7"."tokio_io"}" deps) - ]); - }; - features_.tokio_reactor."0.1.7" = deps: f: updateFeatures f ({ - crossbeam_utils."${deps.tokio_reactor."0.1.7".crossbeam_utils}".default = true; - futures."${deps.tokio_reactor."0.1.7".futures}".default = true; - lazy_static."${deps.tokio_reactor."0.1.7".lazy_static}".default = true; - log."${deps.tokio_reactor."0.1.7".log}".default = true; - mio."${deps.tokio_reactor."0.1.7".mio}".default = true; - num_cpus."${deps.tokio_reactor."0.1.7".num_cpus}".default = true; - parking_lot."${deps.tokio_reactor."0.1.7".parking_lot}".default = true; - slab."${deps.tokio_reactor."0.1.7".slab}".default = true; - tokio_executor."${deps.tokio_reactor."0.1.7".tokio_executor}".default = true; - tokio_io."${deps.tokio_reactor."0.1.7".tokio_io}".default = true; - tokio_reactor."0.1.7".default = (f.tokio_reactor."0.1.7".default or true); - }) [ - (features_.crossbeam_utils."${deps."tokio_reactor"."0.1.7"."crossbeam_utils"}" deps) - (features_.futures."${deps."tokio_reactor"."0.1.7"."futures"}" deps) - (features_.lazy_static."${deps."tokio_reactor"."0.1.7"."lazy_static"}" deps) - (features_.log."${deps."tokio_reactor"."0.1.7"."log"}" deps) - (features_.mio."${deps."tokio_reactor"."0.1.7"."mio"}" deps) - (features_.num_cpus."${deps."tokio_reactor"."0.1.7"."num_cpus"}" deps) - (features_.parking_lot."${deps."tokio_reactor"."0.1.7"."parking_lot"}" deps) - (features_.slab."${deps."tokio_reactor"."0.1.7"."slab"}" deps) - (features_.tokio_executor."${deps."tokio_reactor"."0.1.7"."tokio_executor"}" deps) - (features_.tokio_io."${deps."tokio_reactor"."0.1.7"."tokio_io"}" deps) - ]; - - -# end -# tokio-tcp-0.1.2 - - crates.tokio_tcp."0.1.2" = deps: { features?(features_.tokio_tcp."0.1.2" deps {}) }: buildRustCrate { - crateName = "tokio-tcp"; - version = "0.1.2"; - description = "TCP bindings for tokio.\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0yvfwybqnyca24aj9as8rgydamjq0wrd9xbxxkjcasvsdmsv6z1d"; - dependencies = mapFeatures features ([ - (crates."bytes"."${deps."tokio_tcp"."0.1.2"."bytes"}" deps) - (crates."futures"."${deps."tokio_tcp"."0.1.2"."futures"}" deps) - (crates."iovec"."${deps."tokio_tcp"."0.1.2"."iovec"}" deps) - (crates."mio"."${deps."tokio_tcp"."0.1.2"."mio"}" deps) - (crates."tokio_io"."${deps."tokio_tcp"."0.1.2"."tokio_io"}" deps) - (crates."tokio_reactor"."${deps."tokio_tcp"."0.1.2"."tokio_reactor"}" deps) - ]); - }; - features_.tokio_tcp."0.1.2" = deps: f: updateFeatures f ({ - bytes."${deps.tokio_tcp."0.1.2".bytes}".default = true; - futures."${deps.tokio_tcp."0.1.2".futures}".default = true; - iovec."${deps.tokio_tcp."0.1.2".iovec}".default = true; - mio."${deps.tokio_tcp."0.1.2".mio}".default = true; - tokio_io."${deps.tokio_tcp."0.1.2".tokio_io}".default = true; - tokio_reactor."${deps.tokio_tcp."0.1.2".tokio_reactor}".default = true; - tokio_tcp."0.1.2".default = (f.tokio_tcp."0.1.2".default or true); - }) [ - (features_.bytes."${deps."tokio_tcp"."0.1.2"."bytes"}" deps) - (features_.futures."${deps."tokio_tcp"."0.1.2"."futures"}" deps) - (features_.iovec."${deps."tokio_tcp"."0.1.2"."iovec"}" deps) - (features_.mio."${deps."tokio_tcp"."0.1.2"."mio"}" deps) - (features_.tokio_io."${deps."tokio_tcp"."0.1.2"."tokio_io"}" deps) - (features_.tokio_reactor."${deps."tokio_tcp"."0.1.2"."tokio_reactor"}" deps) - ]; - - -# end -# tokio-threadpool-0.1.9 - - crates.tokio_threadpool."0.1.9" = deps: { features?(features_.tokio_threadpool."0.1.9" deps {}) }: buildRustCrate { - crateName = "tokio-threadpool"; - version = "0.1.9"; - description = "A task scheduler backed by a work-stealing thread pool.\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0ipr0j79mhjjsvc0ma95sj07m0aiyq6rkwgvlalqwhinivl5d39g"; - dependencies = mapFeatures features ([ - (crates."crossbeam_deque"."${deps."tokio_threadpool"."0.1.9"."crossbeam_deque"}" deps) - (crates."crossbeam_utils"."${deps."tokio_threadpool"."0.1.9"."crossbeam_utils"}" deps) - (crates."futures"."${deps."tokio_threadpool"."0.1.9"."futures"}" deps) - (crates."log"."${deps."tokio_threadpool"."0.1.9"."log"}" deps) - (crates."num_cpus"."${deps."tokio_threadpool"."0.1.9"."num_cpus"}" deps) - (crates."rand"."${deps."tokio_threadpool"."0.1.9"."rand"}" deps) - (crates."tokio_executor"."${deps."tokio_threadpool"."0.1.9"."tokio_executor"}" deps) - ]); - }; - features_.tokio_threadpool."0.1.9" = deps: f: updateFeatures f ({ - crossbeam_deque."${deps.tokio_threadpool."0.1.9".crossbeam_deque}".default = true; - crossbeam_utils."${deps.tokio_threadpool."0.1.9".crossbeam_utils}".default = true; - futures."${deps.tokio_threadpool."0.1.9".futures}".default = true; - log."${deps.tokio_threadpool."0.1.9".log}".default = true; - num_cpus."${deps.tokio_threadpool."0.1.9".num_cpus}".default = true; - rand."${deps.tokio_threadpool."0.1.9".rand}".default = true; - tokio_executor."${deps.tokio_threadpool."0.1.9".tokio_executor}".default = true; - tokio_threadpool."0.1.9".default = (f.tokio_threadpool."0.1.9".default or true); - }) [ - (features_.crossbeam_deque."${deps."tokio_threadpool"."0.1.9"."crossbeam_deque"}" deps) - (features_.crossbeam_utils."${deps."tokio_threadpool"."0.1.9"."crossbeam_utils"}" deps) - (features_.futures."${deps."tokio_threadpool"."0.1.9"."futures"}" deps) - (features_.log."${deps."tokio_threadpool"."0.1.9"."log"}" deps) - (features_.num_cpus."${deps."tokio_threadpool"."0.1.9"."num_cpus"}" deps) - (features_.rand."${deps."tokio_threadpool"."0.1.9"."rand"}" deps) - (features_.tokio_executor."${deps."tokio_threadpool"."0.1.9"."tokio_executor"}" deps) - ]; - - -# end -# tokio-timer-0.2.5 - - crates.tokio_timer."0.2.5" = deps: { features?(features_.tokio_timer."0.2.5" deps {}) }: buildRustCrate { - crateName = "tokio-timer"; - version = "0.2.5"; - description = "Timer facilities for Tokio\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "0jyhizvnpldkbqvqygrg0zd5zvfj9p0ywvjzf47iy632vq3qnwzm"; - dependencies = mapFeatures features ([ - (crates."futures"."${deps."tokio_timer"."0.2.5"."futures"}" deps) - (crates."tokio_executor"."${deps."tokio_timer"."0.2.5"."tokio_executor"}" deps) - ]); - }; - features_.tokio_timer."0.2.5" = deps: f: updateFeatures f ({ - futures."${deps.tokio_timer."0.2.5".futures}".default = true; - tokio_executor."${deps.tokio_timer."0.2.5".tokio_executor}".default = true; - tokio_timer."0.2.5".default = (f.tokio_timer."0.2.5".default or true); - }) [ - (features_.futures."${deps."tokio_timer"."0.2.5"."futures"}" deps) - (features_.tokio_executor."${deps."tokio_timer"."0.2.5"."tokio_executor"}" deps) - ]; - - -# end -# tokio-udp-0.1.3 - - crates.tokio_udp."0.1.3" = deps: { features?(features_.tokio_udp."0.1.3" deps {}) }: buildRustCrate { - crateName = "tokio-udp"; - version = "0.1.3"; - description = "UDP bindings for tokio.\n"; - authors = [ "Carl Lerche <me@carllerche.com>" ]; - sha256 = "1g1x499vqvzwy7xfccr32vwymlx25zpmkx8ppqgifzqwrjnncajf"; - dependencies = mapFeatures features ([ - (crates."bytes"."${deps."tokio_udp"."0.1.3"."bytes"}" deps) - (crates."futures"."${deps."tokio_udp"."0.1.3"."futures"}" deps) - (crates."log"."${deps."tokio_udp"."0.1.3"."log"}" deps) - (crates."mio"."${deps."tokio_udp"."0.1.3"."mio"}" deps) - (crates."tokio_codec"."${deps."tokio_udp"."0.1.3"."tokio_codec"}" deps) - (crates."tokio_io"."${deps."tokio_udp"."0.1.3"."tokio_io"}" deps) - (crates."tokio_reactor"."${deps."tokio_udp"."0.1.3"."tokio_reactor"}" deps) - ]); - }; - features_.tokio_udp."0.1.3" = deps: f: updateFeatures f ({ - bytes."${deps.tokio_udp."0.1.3".bytes}".default = true; - futures."${deps.tokio_udp."0.1.3".futures}".default = true; - log."${deps.tokio_udp."0.1.3".log}".default = true; - mio."${deps.tokio_udp."0.1.3".mio}".default = true; - tokio_codec."${deps.tokio_udp."0.1.3".tokio_codec}".default = true; - tokio_io."${deps.tokio_udp."0.1.3".tokio_io}".default = true; - tokio_reactor."${deps.tokio_udp."0.1.3".tokio_reactor}".default = true; - tokio_udp."0.1.3".default = (f.tokio_udp."0.1.3".default or true); - }) [ - (features_.bytes."${deps."tokio_udp"."0.1.3"."bytes"}" deps) - (features_.futures."${deps."tokio_udp"."0.1.3"."futures"}" deps) - (features_.log."${deps."tokio_udp"."0.1.3"."log"}" deps) - (features_.mio."${deps."tokio_udp"."0.1.3"."mio"}" deps) - (features_.tokio_codec."${deps."tokio_udp"."0.1.3"."tokio_codec"}" deps) - (features_.tokio_io."${deps."tokio_udp"."0.1.3"."tokio_io"}" deps) - (features_.tokio_reactor."${deps."tokio_udp"."0.1.3"."tokio_reactor"}" deps) - ]; - - -# end -# try-lock-0.2.2 - - crates.try_lock."0.2.2" = deps: { features?(features_.try_lock."0.2.2" deps {}) }: buildRustCrate { - crateName = "try-lock"; - version = "0.2.2"; - description = "A lightweight atomic lock."; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1k8xc0jpbrmzp0fwghdh6pwzjb9xx2p8yy0xxnnb8065smc5fsrv"; - }; - features_.try_lock."0.2.2" = deps: f: updateFeatures f ({ - try_lock."0.2.2".default = (f.try_lock."0.2.2".default or true); - }) []; - - -# end -# unicase-1.4.2 - - crates.unicase."1.4.2" = deps: { features?(features_.unicase."1.4.2" deps {}) }: buildRustCrate { - crateName = "unicase"; - version = "1.4.2"; - description = "A case-insensitive wrapper around strings."; - authors = [ "Sean McArthur <sean.monstar@gmail.com>" ]; - sha256 = "0rbnhw2mnhcwrij3vczp0sl8zdfmvf2dlh8hly81kj7132kfj0mf"; - build = "build.rs"; - dependencies = mapFeatures features ([ -]); - - buildDependencies = mapFeatures features ([ - (crates."version_check"."${deps."unicase"."1.4.2"."version_check"}" deps) - ]); - features = mkFeatures (features."unicase"."1.4.2" or {}); - }; - features_.unicase."1.4.2" = deps: f: updateFeatures f (rec { - unicase = fold recursiveUpdate {} [ - { "1.4.2"."heapsize" = - (f.unicase."1.4.2"."heapsize" or false) || - (f.unicase."1.4.2".heap_size or false) || - (unicase."1.4.2"."heap_size" or false); } - { "1.4.2"."heapsize_plugin" = - (f.unicase."1.4.2"."heapsize_plugin" or false) || - (f.unicase."1.4.2".heap_size or false) || - (unicase."1.4.2"."heap_size" or false); } - { "1.4.2".default = (f.unicase."1.4.2".default or true); } - ]; - version_check."${deps.unicase."1.4.2".version_check}".default = true; - }) [ - (features_.version_check."${deps."unicase"."1.4.2"."version_check"}" deps) - ]; - - -# end -# unicase-2.1.0 - - crates.unicase."2.1.0" = deps: { features?(features_.unicase."2.1.0" deps {}) }: buildRustCrate { - crateName = "unicase"; - version = "2.1.0"; - description = "A case-insensitive wrapper around strings."; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "1zzn16hh8fdx5pnbbnl32q8m2mh4vpd1jm9pdcv969ik83dw4byp"; - build = "build.rs"; - - buildDependencies = mapFeatures features ([ - (crates."version_check"."${deps."unicase"."2.1.0"."version_check"}" deps) - ]); - features = mkFeatures (features."unicase"."2.1.0" or {}); - }; - features_.unicase."2.1.0" = deps: f: updateFeatures f ({ - unicase."2.1.0".default = (f.unicase."2.1.0".default or true); - version_check."${deps.unicase."2.1.0".version_check}".default = true; - }) [ - (features_.version_check."${deps."unicase"."2.1.0"."version_check"}" deps) - ]; - - -# end -# unicode-bidi-0.3.4 - - crates.unicode_bidi."0.3.4" = deps: { features?(features_.unicode_bidi."0.3.4" deps {}) }: buildRustCrate { - crateName = "unicode-bidi"; - version = "0.3.4"; - description = "Implementation of the Unicode Bidirectional Algorithm"; - authors = [ "The Servo Project Developers" ]; - sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q"; - libName = "unicode_bidi"; - dependencies = mapFeatures features ([ - (crates."matches"."${deps."unicode_bidi"."0.3.4"."matches"}" deps) - ]); - features = mkFeatures (features."unicode_bidi"."0.3.4" or {}); - }; - features_.unicode_bidi."0.3.4" = deps: f: updateFeatures f (rec { - matches."${deps.unicode_bidi."0.3.4".matches}".default = true; - unicode_bidi = fold recursiveUpdate {} [ - { "0.3.4"."flame" = - (f.unicode_bidi."0.3.4"."flame" or false) || - (f.unicode_bidi."0.3.4".flame_it or false) || - (unicode_bidi."0.3.4"."flame_it" or false); } - { "0.3.4"."flamer" = - (f.unicode_bidi."0.3.4"."flamer" or false) || - (f.unicode_bidi."0.3.4".flame_it or false) || - (unicode_bidi."0.3.4"."flame_it" or false); } - { "0.3.4"."serde" = - (f.unicode_bidi."0.3.4"."serde" or false) || - (f.unicode_bidi."0.3.4".with_serde or false) || - (unicode_bidi."0.3.4"."with_serde" or false); } - { "0.3.4".default = (f.unicode_bidi."0.3.4".default or true); } - ]; - }) [ - (features_.matches."${deps."unicode_bidi"."0.3.4"."matches"}" deps) - ]; - - -# end -# unicode-normalization-0.1.5 - - crates.unicode_normalization."0.1.5" = deps: { features?(features_.unicode_normalization."0.1.5" deps {}) }: buildRustCrate { - crateName = "unicode-normalization"; - version = "0.1.5"; - description = "This crate provides functions for normalization of\nUnicode strings, including Canonical and Compatible\nDecomposition and Recomposition, as described in\nUnicode Standard Annex #15.\n"; - authors = [ "kwantam <kwantam@gmail.com>" ]; - sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5"; - }; - features_.unicode_normalization."0.1.5" = deps: f: updateFeatures f ({ - unicode_normalization."0.1.5".default = (f.unicode_normalization."0.1.5".default or true); - }) []; - - -# end -# unicode-width-0.1.4 - - crates.unicode_width."0.1.4" = deps: { features?(features_.unicode_width."0.1.4" deps {}) }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - description = "Determine displayed width of `char` and `str` types\naccording to Unicode Standard Annex #11 rules.\n"; - authors = [ "kwantam <kwantam@gmail.com>" ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - features = mkFeatures (features."unicode_width"."0.1.4" or {}); - }; - features_.unicode_width."0.1.4" = deps: f: updateFeatures f ({ - unicode_width."0.1.4".default = (f.unicode_width."0.1.4".default or true); - }) []; - - -# end -# unicode-xid-0.0.4 - - crates.unicode_xid."0.0.4" = deps: { features?(features_.unicode_xid."0.0.4" deps {}) }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.0.4"; - description = "Determine whether characters have the XID_Start\nor XID_Continue properties according to\nUnicode Standard Annex #31.\n"; - authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ]; - sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; - features = mkFeatures (features."unicode_xid"."0.0.4" or {}); - }; - features_.unicode_xid."0.0.4" = deps: f: updateFeatures f ({ - unicode_xid."0.0.4".default = (f.unicode_xid."0.0.4".default or true); - }) []; - - -# end -# unreachable-1.0.0 - - crates.unreachable."1.0.0" = deps: { features?(features_.unreachable."1.0.0" deps {}) }: buildRustCrate { - crateName = "unreachable"; - version = "1.0.0"; - description = "An unreachable code optimization hint in stable rust."; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; - dependencies = mapFeatures features ([ - (crates."void"."${deps."unreachable"."1.0.0"."void"}" deps) - ]); - }; - features_.unreachable."1.0.0" = deps: f: updateFeatures f ({ - unreachable."1.0.0".default = (f.unreachable."1.0.0".default or true); - void."${deps.unreachable."1.0.0".void}".default = (f.void."${deps.unreachable."1.0.0".void}".default or false); - }) [ - (features_.void."${deps."unreachable"."1.0.0"."void"}" deps) - ]; - - -# end -# url-1.6.1 - - crates.url."1.6.1" = deps: { features?(features_.url."1.6.1" deps {}) }: buildRustCrate { - crateName = "url"; - version = "1.6.1"; - description = "URL library for Rust, based on the WHATWG URL Standard"; - authors = [ "The rust-url developers" ]; - sha256 = "1qsnhmxznzaxl068a3ksz69kwcz7ghvl4zflg9qj7lyw4bk9ma38"; - dependencies = mapFeatures features ([ - (crates."idna"."${deps."url"."1.6.1"."idna"}" deps) - (crates."matches"."${deps."url"."1.6.1"."matches"}" deps) - (crates."percent_encoding"."${deps."url"."1.6.1"."percent_encoding"}" deps) - ]); - features = mkFeatures (features."url"."1.6.1" or {}); - }; - features_.url."1.6.1" = deps: f: updateFeatures f (rec { - idna."${deps.url."1.6.1".idna}".default = true; - matches."${deps.url."1.6.1".matches}".default = true; - percent_encoding."${deps.url."1.6.1".percent_encoding}".default = true; - url = fold recursiveUpdate {} [ - { "1.6.1"."encoding" = - (f.url."1.6.1"."encoding" or false) || - (f.url."1.6.1".query_encoding or false) || - (url."1.6.1"."query_encoding" or false); } - { "1.6.1"."heapsize" = - (f.url."1.6.1"."heapsize" or false) || - (f.url."1.6.1".heap_size or false) || - (url."1.6.1"."heap_size" or false); } - { "1.6.1".default = (f.url."1.6.1".default or true); } - ]; - }) [ - (features_.idna."${deps."url"."1.6.1"."idna"}" deps) - (features_.matches."${deps."url"."1.6.1"."matches"}" deps) - (features_.percent_encoding."${deps."url"."1.6.1"."percent_encoding"}" deps) - ]; - - -# end -# utf8-ranges-0.1.3 - - crates.utf8_ranges."0.1.3" = deps: { features?(features_.utf8_ranges."0.1.3" deps {}) }: buildRustCrate { - crateName = "utf8-ranges"; - version = "0.1.3"; - description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges."; - authors = [ "Andrew Gallant <jamslam@gmail.com>" ]; - sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp"; - }; - features_.utf8_ranges."0.1.3" = deps: f: updateFeatures f ({ - utf8_ranges."0.1.3".default = (f.utf8_ranges."0.1.3".default or true); - }) []; - - -# end -# uuid-0.7.1 - - crates.uuid."0.7.1" = deps: { features?(features_.uuid."0.7.1" deps {}) }: buildRustCrate { - crateName = "uuid"; - version = "0.7.1"; - description = "A library to generate and parse UUIDs."; - authors = [ "Ashley Mannix<ashleymannix@live.com.au>" "Christopher Armstrong" "Dylan DPC<dylan.dpc@gmail.com>" "Hunar Roop Kahlon<hunar.roop@gmail.com>" ]; - sha256 = "1wh5izr7bssf1j8y3cawj4yfr5pz4cfxgsjlk2gs1vccc848qpbj"; - dependencies = mapFeatures features ([ - ] - ++ (if features.uuid."0.7.1".rand or false then [ (crates.rand."${deps."uuid"."0.7.1".rand}" deps) ] else [])); - features = mkFeatures (features."uuid"."0.7.1" or {}); - }; - features_.uuid."0.7.1" = deps: f: updateFeatures f (rec { - rand."${deps.uuid."0.7.1".rand}".default = true; - uuid = fold recursiveUpdate {} [ - { "0.7.1"."byteorder" = - (f.uuid."0.7.1"."byteorder" or false) || - (f.uuid."0.7.1".u128 or false) || - (uuid."0.7.1"."u128" or false); } - { "0.7.1"."md5" = - (f.uuid."0.7.1"."md5" or false) || - (f.uuid."0.7.1".v3 or false) || - (uuid."0.7.1"."v3" or false); } - { "0.7.1"."nightly" = - (f.uuid."0.7.1"."nightly" or false) || - (f.uuid."0.7.1".const_fn or false) || - (uuid."0.7.1"."const_fn" or false); } - { "0.7.1"."rand" = - (f.uuid."0.7.1"."rand" or false) || - (f.uuid."0.7.1".v3 or false) || - (uuid."0.7.1"."v3" or false) || - (f.uuid."0.7.1".v4 or false) || - (uuid."0.7.1"."v4" or false) || - (f.uuid."0.7.1".v5 or false) || - (uuid."0.7.1"."v5" or false); } - { "0.7.1"."sha1" = - (f.uuid."0.7.1"."sha1" or false) || - (f.uuid."0.7.1".v5 or false) || - (uuid."0.7.1"."v5" or false); } - { "0.7.1"."std" = - (f.uuid."0.7.1"."std" or false) || - (f.uuid."0.7.1".default or false) || - (uuid."0.7.1"."default" or false); } - { "0.7.1".default = (f.uuid."0.7.1".default or true); } - ]; - }) [ - (features_.rand."${deps."uuid"."0.7.1"."rand"}" deps) - ]; - - -# end -# vcpkg-0.2.2 - - crates.vcpkg."0.2.2" = deps: { features?(features_.vcpkg."0.2.2" deps {}) }: buildRustCrate { - crateName = "vcpkg"; - version = "0.2.2"; - description = "A library to find native dependencies in a vcpkg tree at build\ntime in order to be used in Cargo build scripts.\n"; - authors = [ "Jim McGrath <jimmc2@gmail.com>" ]; - sha256 = "1fl5j0ksnwrnsrf1b1a9lqbjgnajdipq0030vsbhx81mb7d9478a"; - }; - features_.vcpkg."0.2.2" = deps: f: updateFeatures f ({ - vcpkg."0.2.2".default = (f.vcpkg."0.2.2".default or true); - }) []; - - -# end -# vec_map-0.8.0 - - crates.vec_map."0.8.0" = deps: { features?(features_.vec_map."0.8.0" deps {}) }: buildRustCrate { - crateName = "vec_map"; - version = "0.8.0"; - description = "A simple map based on a vector for small integer keys"; - authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo OchagavÃa <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ]; - sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; - dependencies = mapFeatures features ([ -]); - features = mkFeatures (features."vec_map"."0.8.0" or {}); - }; - features_.vec_map."0.8.0" = deps: f: updateFeatures f (rec { - vec_map = fold recursiveUpdate {} [ - { "0.8.0"."serde" = - (f.vec_map."0.8.0"."serde" or false) || - (f.vec_map."0.8.0".eders or false) || - (vec_map."0.8.0"."eders" or false); } - { "0.8.0"."serde_derive" = - (f.vec_map."0.8.0"."serde_derive" or false) || - (f.vec_map."0.8.0".eders or false) || - (vec_map."0.8.0"."eders" or false); } - { "0.8.0".default = (f.vec_map."0.8.0".default or true); } - ]; - }) []; - - -# end -# version_check-0.1.3 - - crates.version_check."0.1.3" = deps: { features?(features_.version_check."0.1.3" deps {}) }: buildRustCrate { - crateName = "version_check"; - version = "0.1.3"; - description = "Tiny crate to check the version of the installed/running rustc."; - authors = [ "Sergio Benitez <sb@sergio.bz>" ]; - sha256 = "0z635wdclv9bvafj11fpgndn7y79ibpsnc364pm61i1m4wwg8msg"; - }; - features_.version_check."0.1.3" = deps: f: updateFeatures f ({ - version_check."0.1.3".default = (f.version_check."0.1.3".default or true); - }) []; - - -# end -# void-1.0.2 - - crates.void."1.0.2" = deps: { features?(features_.void."1.0.2" deps {}) }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - description = "The uninhabited void type for use in statically impossible cases."; - authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - features = mkFeatures (features."void"."1.0.2" or {}); - }; - features_.void."1.0.2" = deps: f: updateFeatures f (rec { - void = fold recursiveUpdate {} [ - { "1.0.2"."std" = - (f.void."1.0.2"."std" or false) || - (f.void."1.0.2".default or false) || - (void."1.0.2"."default" or false); } - { "1.0.2".default = (f.void."1.0.2".default or true); } - ]; - }) []; - - -# end -# want-0.0.6 - - crates.want."0.0.6" = deps: { features?(features_.want."0.0.6" deps {}) }: buildRustCrate { - crateName = "want"; - version = "0.0.6"; - description = "Detect when another Future wants a result."; - authors = [ "Sean McArthur <sean@seanmonstar.com>" ]; - sha256 = "03cc2lndz531a4kgql1v9kppyb1yz2abcz5l52j1gg2nypmy3lh8"; - dependencies = mapFeatures features ([ - (crates."futures"."${deps."want"."0.0.6"."futures"}" deps) - (crates."log"."${deps."want"."0.0.6"."log"}" deps) - (crates."try_lock"."${deps."want"."0.0.6"."try_lock"}" deps) - ]); - }; - features_.want."0.0.6" = deps: f: updateFeatures f ({ - futures."${deps.want."0.0.6".futures}".default = true; - log."${deps.want."0.0.6".log}".default = true; - try_lock."${deps.want."0.0.6".try_lock}".default = true; - want."0.0.6".default = (f.want."0.0.6".default or true); - }) [ - (features_.futures."${deps."want"."0.0.6"."futures"}" deps) - (features_.log."${deps."want"."0.0.6"."log"}" deps) - (features_.try_lock."${deps."want"."0.0.6"."try_lock"}" deps) - ]; - - -# end -# winapi-0.2.8 - - crates.winapi."0.2.8" = deps: { features?(features_.winapi."0.2.8" deps {}) }: buildRustCrate { - crateName = "winapi"; - version = "0.2.8"; - description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings."; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; - }; - features_.winapi."0.2.8" = deps: f: updateFeatures f ({ - winapi."0.2.8".default = (f.winapi."0.2.8".default or true); - }) []; - - -# end -# winapi-0.3.6 - - crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate { - crateName = "winapi"; - version = "0.3.6"; - description = "Raw FFI bindings for all of Windows API."; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4"; - build = "build.rs"; - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ - (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) - ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ - (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) - ]) else []); - features = mkFeatures (features."winapi"."0.3.6" or {}); - }; - features_.winapi."0.3.6" = deps: f: updateFeatures f ({ - winapi."0.3.6".default = (f.winapi."0.3.6".default or true); - winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; - winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; - }) [ - (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) - (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) - ]; - - -# end -# winapi-build-0.1.1 - - crates.winapi_build."0.1.1" = deps: { features?(features_.winapi_build."0.1.1" deps {}) }: buildRustCrate { - crateName = "winapi-build"; - version = "0.1.1"; - description = "Common code for build.rs in WinAPI -sys crates."; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; - libName = "build"; - }; - features_.winapi_build."0.1.1" = deps: f: updateFeatures f ({ - winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); - }) []; - - -# end -# winapi-i686-pc-windows-gnu-0.4.0 - - crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - description = "Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead."; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; - build = "build.rs"; - }; - features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ - winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); - }) []; - - -# end -# winapi-x86_64-pc-windows-gnu-0.4.0 - - crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - description = "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead."; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; - build = "build.rs"; - }; - features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f ({ - winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); - }) []; - - -# end -# ws2_32-sys-0.2.1 - - crates.ws2_32_sys."0.2.1" = deps: { features?(features_.ws2_32_sys."0.2.1" deps {}) }: buildRustCrate { - crateName = "ws2_32-sys"; - version = "0.2.1"; - description = "Contains function definitions for the Windows API library ws2_32. See winapi for types and constants."; - authors = [ "Peter Atashian <retep998@gmail.com>" ]; - sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc"; - libName = "ws2_32"; - build = "build.rs"; - dependencies = mapFeatures features ([ - (crates."winapi"."${deps."ws2_32_sys"."0.2.1"."winapi"}" deps) - ]); - - buildDependencies = mapFeatures features ([ - (crates."winapi_build"."${deps."ws2_32_sys"."0.2.1"."winapi_build"}" deps) - ]); - }; - features_.ws2_32_sys."0.2.1" = deps: f: updateFeatures f ({ - winapi."${deps.ws2_32_sys."0.2.1".winapi}".default = true; - winapi_build."${deps.ws2_32_sys."0.2.1".winapi_build}".default = true; - ws2_32_sys."0.2.1".default = (f.ws2_32_sys."0.2.1".default or true); - }) [ - (features_.winapi."${deps."ws2_32_sys"."0.2.1"."winapi"}" deps) - (features_.winapi_build."${deps."ws2_32_sys"."0.2.1"."winapi_build"}" deps) - ]; - - -# end -# xattr-0.1.11 - - crates.xattr."0.1.11" = deps: { features?(features_.xattr."0.1.11" deps {}) }: buildRustCrate { - crateName = "xattr"; - version = "0.1.11"; - description = "unix extended filesystem attributes"; - authors = [ "Steven Allen <steven@stebalien.com>" ]; - sha256 = "0v8wad18pdxv7242a7xs18i9hy00ih3vwajz7my05zbxx2ss01nx"; - dependencies = mapFeatures features ([ - (crates."libc"."${deps."xattr"."0.1.11"."libc"}" deps) - ]); - features = mkFeatures (features."xattr"."0.1.11" or {}); - }; - features_.xattr."0.1.11" = deps: f: updateFeatures f (rec { - libc."${deps.xattr."0.1.11".libc}".default = true; - xattr = fold recursiveUpdate {} [ - { "0.1.11"."unsupported" = - (f.xattr."0.1.11"."unsupported" or false) || - (f.xattr."0.1.11".default or false) || - (xattr."0.1.11"."default" or false); } - { "0.1.11".default = (f.xattr."0.1.11".default or true); } - ]; - }) [ - (features_.libc."${deps."xattr"."0.1.11"."libc"}" deps) - ]; - - -# end -} diff --git a/pkgs/development/tools/rust/cargo-download/default.nix b/pkgs/development/tools/rust/cargo-download/default.nix deleted file mode 100644 index 1cb53a4b6c8d8..0000000000000 --- a/pkgs/development/tools/rust/cargo-download/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, lib, fetchgit, darwin, buildPlatform -, buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }: - -((import ./Cargo.nix { - inherit lib buildPlatform buildRustCrate buildRustCrateHelpers fetchgit; - cratesIO = import ./crates-io.nix { inherit lib buildRustCrate buildRustCrateHelpers; }; -}).cargo_download {}).override { - crateOverrides = defaultCrateOverrides // { - cargo-download = attrs: { - buildInputs = lib.optional stdenv.isDarwin - darwin.apple_sdk.frameworks.Security; - }; - }; -} diff --git a/pkgs/development/tools/rust/cargo-espflash/default.nix b/pkgs/development/tools/rust/cargo-espflash/default.nix index 0e3876cbe9b05..26f935c587253 100644 --- a/pkgs/development/tools/rust/cargo-espflash/default.nix +++ b/pkgs/development/tools/rust/cargo-espflash/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-espflash"; @@ -15,8 +15,10 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ + buildInputs = lib.optionals stdenv.isLinux [ udev + ] ++ lib.optionals stdenv.isDarwin [ + Security ]; cargoSha256 = "sha256-82o3B6qmBVPpBVAogClmTbxrBRXY8Lmd2sHmonP5/s8="; diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 2b732a9d3c9b2..37cb1f6ffa04f 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.37"; + version = "0.9.38"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-fEBTBQyw+yA2O4DGIOcGRo5AqaVZXRNdxi9ImjKiXwE="; + sha256 = "sha256-gBYtO9lnxtrgn5cmmgPeaFQ2Ls3WSO9X4RwDBHKbRO8="; }; - cargoSha256 = "sha256-yXkjCZHAH2Rfp0T2v2OoBskolqvUQwTRlF99gI259F8="; + cargoSha256 = "sha256-Xz5X2I4Lj4lPv18vYjambdlwcRcbHKAbjqPpSuei96Q="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/cargo-pgx/default.nix b/pkgs/development/tools/rust/cargo-pgx/default.nix index 4ad70bfa9ed47..e4ff582964fa3 100644 --- a/pkgs/development/tools/rust/cargo-pgx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgx/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-pgx"; - version = "0.4.5"; + version = "0.5.0"; src = fetchCrate { inherit version pname; - sha256 = "sha256-BcMGa/1ATwLG8VnwItfd5eqmrck/u0MEoR5sA2yuzyQ="; + sha256 = "sha256-5UH34l4zmKFZY2uHLDqJ1kW/QRQbII0/zmmGA3DFKB4="; }; - cargoSha256 = "sha256-urlwqBCZMxlPEjLLPBhI2lDNTusCSZ1bZu1p8poVrtw="; + cargoSha256 = "sha256-1CU/VrNS3tGycjel5MV6SrZJ7LExds2YhdO+VAHgusM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 3bcc9523b9644..5dc829d861efa 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.20.0"; + version = "0.20.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-59A3RPdltDfMDPTFbBHcnJoFEp718xvYgg6v4MvsxaQ="; + sha256 = "sha256-aDkQxt516cN27wtndSkBitoWZvPyaQETqZDHYlrr364="; }; - cargoSha256 = "sha256-GEttxHtdOYMijv1xxK7U0d8WNwJcpqJNgDYKgCV/zVw="; + cargoSha256 = "sha256-EBVPUCQQ9rwl23vYOpCBtOBb8d3K53RPMkIUs6sQyyU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 80c1a53f9fb6f..88eb559a6a4c5 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.21.2"; + version = "0.21.4"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-4iuJRwJeHmofJ1iwzeu4YkGaN+MZBdyzsJmdzncDmZo="; + sha256 = "sha256-UzYVw0LFVxqiYi3kjjpZoMWvIrAtZzLKPvhSMSEf3X8="; }; - cargoSha256 = "sha256-LD+bEA4/PCEY+EvV2ysHFmJKBWT83bXuGUtgyiK/6i0="; + cargoSha256 = "sha256-M39pnbYv0lorLx+6q7so4OVL7viZmlTmCeAH28rR0Rw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/development/tools/rust/cargo-sort/default.nix index 428616e3e9959..f3ee100651320 100644 --- a/pkgs/development/tools/rust/cargo-sort/default.nix +++ b/pkgs/development/tools/rust/cargo-sort/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-sort"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "devinr528"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jESz3SujznGLJeR23LvxORNC0Tj4VcEzdzhIRwyvjd0="; + sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw="; }; - cargoSha256 = "sha256-1iOZ1EEP4bObTweTN4Wjtb9Y9ysJQ/9xnNpprxKIaho="; + cargoSha256 = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU="; meta = with lib; { description = "A tool to check that your Cargo.toml dependencies are sorted alphabetically"; diff --git a/pkgs/development/tools/rust/cargo-ui/default.nix b/pkgs/development/tools/rust/cargo-ui/default.nix index ef27297fa1109..da5137154bb20 100644 --- a/pkgs/development/tools/rust/cargo-ui/default.nix +++ b/pkgs/development/tools/rust/cargo-ui/default.nix @@ -8,11 +8,7 @@ , stdenv , fontconfig , libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, libxcb +, xorg }: rustPlatform.buildRustPackage rec { @@ -33,11 +29,11 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ fontconfig libGL - libX11 - libXcursor - libXi - libXrandr - libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb ]; postInstall = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index bbf4b899e2294..e3cbedd5b7596 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lYQmuenL7cbgfb6tdhdxkNe3wrQj7hTijyrhr/p4zLo="; + sha256 = "sha256-XeeMROSO012vo9nOsVUdFFLTj+9mSYtg+EFHJxs+kl0="; }; - cargoSha256 = "sha256-Ae0ootHGbW5FJTkIRc9lTKHWsHOz6/WZCWCLZlSROU4="; + cargoSha256 = "sha256-KuxGUDS2xJLa32mON+JI7tT+zAheOk7M5FYtSDJlF1A="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/rust-audit-info/default.nix b/pkgs/development/tools/rust/rust-audit-info/default.nix new file mode 100644 index 0000000000000..b46bc7447e48f --- /dev/null +++ b/pkgs/development/tools/rust/rust-audit-info/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "rust-audit-info"; + version = "0.5.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-oxlbtFDQj6nyBXzNczG6ZhSOHvVQjK1FimWm/pSZHtY="; + }; + + cargoSha256 = "sha256-Y+5OUfsmUhDP9Fn8s9nso0W25eTFodDIVEVusn6HRmk="; + + meta = with lib; { + description = "A command-line tool to extract the dependency trees embedded in binaries by cargo-auditable"; + homepage = "https://github.com/rust-secure-code/cargo-auditable/tree/master/rust-audit-info"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/toml2nix/Cargo.lock b/pkgs/development/tools/toml2nix/Cargo.lock new file mode 100644 index 0000000000000..f6b37fbc189d9 --- /dev/null +++ b/pkgs/development/tools/toml2nix/Cargo.lock @@ -0,0 +1,25 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "serde" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" + +[[package]] +name = "toml" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +dependencies = [ + "serde", +] + +[[package]] +name = "toml2nix" +version = "0.1.1" +dependencies = [ + "toml", +] diff --git a/pkgs/development/tools/toml2nix/default.nix b/pkgs/development/tools/toml2nix/default.nix new file mode 100644 index 0000000000000..6987619dbcb50 --- /dev/null +++ b/pkgs/development/tools/toml2nix/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "toml2nix"; + version = "0.1.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-YhluLS4tFMibFrDzgIvNtfjM5dAqJQvygeZocKn3+Jg="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + meta = with lib; { + description = "A tool to convert TOML files to Nix expressions"; + homepage = "https://crates.io/crates/toml2nix"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index 0ab9da2bf8a14..920afba2a30e3 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -17,6 +17,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/Shopify/toxiproxy/v2.Version=${version}" ]; + # Fixes tests on Darwin + __darwinAllowLocalNetworking = true; + checkFlags = [ "-short" ]; postInstall = '' diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix index 87f7ce588f8ec..52e33fee6b608 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/vala-language-server/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -24,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-gntGnz8uqGz2EGwWWyty/N1ImaUKAPtXVZcjgp73SQM="; }; + patches = [ + # Fix regex for links in comments + # https://github.com/vala-lang/vala-language-server/pull/268 + (fetchpatch { + url = "https://github.com/vala-lang/vala-language-server/commit/b6193265d68b90755d57938c2ba1895841cf4b36.patch"; + sha256 = "sha256-nWG+xQAPDVBXamuKQymvn/FBHEP7Ta9p/vhYjxxBGzI="; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = pname; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index f91d00f6a6fd2..958bdd12f79dc 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.1.13"; + version = "0.2.0"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "RYTRcc8xccRmxuKOXwX3bBWJSXLI2/XfH4/7ZdcUBdE="; + sha256 = "fqV/HBezVUw7qVPC412znpDv7pFh0b91ISy2ONedXgA="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "LixLrzSsgbXyfpFKiksM4zNS5iDU3tXOrr7fP8yJknM="; + sha256 = "e/3G+psqujxjS0/mNm5jbJHPVKgM6JiMhp6RQSG51Rs="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "SGZcT2uVy6egr99FzyaykUWLuZBqDsvbCM/lsgy//g0="; + sha256 = "8Obcl9nZDtC6hstDSroJFYkD3iXi/mKmJKBjo2HJQj0="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "ssZtJi+CEVn7MjPMqFkwv1lnwE7a7ttkmiuoT0Y6wao="; + sha256 = "C87tUgJkVSj8EM1xcmHQ+QTiZPBiwjeb7wk2+jpSe10="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 42edaed7f5d2f..26b9971771af7 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.409"; + version = "0.0.413"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-ijkmPyz29p8+YUbx9zPj0hSbpTLJiOXOFEzlJI6hI6I="; + sha256 = "sha256-TpLvIaaZMNMZ4MAVjGA4jMVf1RxcHRUmMUsfoFBTSik="; }; - vendorSha256 = "sha256-1pgR6ghuPSFI3KXOyjNmmiVKJU2y4RCRBpFRY5Yt59A="; + vendorSha256 = "sha256-ZnT9IaL6j2EzKk2RRftB4qELIi4nXKC/2zBOhInFYHA="; subPackages = [ "." ]; diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index a11e0f4cb975e..caf29a2cc027f 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -21,5 +21,8 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ ]; + # Likely broken by GLib 2.74 switch to PCRE 2. + # https://github.com/valum-framework/valum/issues/238 + broken = true; }; } diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index 32c9ddb653472..1937f84f88f7a 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -1,5 +1,13 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, alsa-lib, openssl -, withTTS ? false, llvmPackages, speechd }: +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, alsa-lib +, openssl +, withTTS ? false +, speechd +}: rustPlatform.buildRustPackage rec { pname = "blightmud"; @@ -16,50 +24,29 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional withTTS "tts"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ alsa-lib openssl ] ++ lib.optional withTTS [ speechd ]; - # Building the speech-dispatcher-sys crate for TTS support requires setting - # LIBCLANG_PATH. - LIBCLANG_PATH = lib.optionalString withTTS "${llvmPackages.libclang.lib}/lib"; - - preBuild = lib.optionalString withTTS '' - # When building w/ TTS the speech-dispatcher-sys crate's build.rs uses - # rust-bindgen with libspeechd. This bypasses the normal nixpkgs CC wrapper - # so we have to adapt the BINDGEN_EXTRA_CLANG_ARGS env var to compensate. See - # this blog post[0] for more information. - # - # [0]: https://hoverbear.org/blog/rust-bindgen-in-nix/ - - export BINDGEN_EXTRA_CLANG_ARGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ - $(< ${stdenv.cc}/nix-support/cc-cflags) \ - -isystem ${llvmPackages.libclang.lib}/lib/clang/${ - lib.getVersion llvmPackages.clang - }/include \ - -idirafter ${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.config}/${ - lib.getVersion stdenv.cc.cc - }/include \ - -idirafter ${speechd}/include" - ''; - - checkFlags = let - # Most of Blightmud's unit tests pass without trouble in the isolated - # Nixpkgs build env. The following tests need to be skipped. - skipList = [ - "test_connect" - "test_gmcp_negotiation" - "test_ttype_negotiation" - "test_reconnect" - "test_is_connected" - "test_mud" - "test_server" - "test_lua_script" - "timer_test" - "validate_assertion_fail" - ]; - skipFlag = test: "--skip " + test; - in builtins.concatStringsSep " " (builtins.map skipFlag skipList); + checkFlags = + let + # Most of Blightmud's unit tests pass without trouble in the isolated + # Nixpkgs build env. The following tests need to be skipped. + skipList = [ + "test_connect" + "test_gmcp_negotiation" + "test_ttype_negotiation" + "test_reconnect" + "test_is_connected" + "test_mud" + "test_server" + "test_lua_script" + "timer_test" + "validate_assertion_fail" + ]; + skipFlag = test: "--skip " + test; + in + builtins.concatStringsSep " " (builtins.map skipFlag skipList); meta = with lib; { description = "A terminal MUD client written in Rust"; diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 673c7d3e6d376..5f3bb86d51d79 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.19"; + version = "0.9.20"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-GLF5OXPEc1V1r9INbEdIM17tm7pKq1ZuOuShtAnqXjM="; + sha256 = "sha256-IF8ESbMDvermghBGLMq+GdE67Hg5XedX0REGGnWQhRA="; }; buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 583c6ba902263..66b6faa325521 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.9.1"; + version = "0.9.1.1"; src = fetchFromGitHub { owner = "gemrb"; repo = "gemrb"; rev = "v${version}"; - hash = "sha256-xc59Iyrmbmo7Kxio0lLpvVlpdoeM/vfmBLkJdzJsSPY="; + hash = "sha256-pC83LgAy1aQxUhS2qa57hm03B37bj6dcRVRn7SI5I+k="; }; buildInputs = [ diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix index 2b250aeddf5ee..944902bcadc38 100644 --- a/pkgs/games/gogdl/default.nix +++ b/pkgs/games/gogdl/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "gogdl"; - version = "0.3"; + version = "0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "heroic-gogdl"; - rev = "v${version}"; - sha256 = "sha256-lVNvmdUK7rjSNVdhDuSxyfuEw2FeZt0rVf9pdtsfgqE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4hWuGd0Alzd/ZqtN4zG2aid6C9lnT3Ihrrsjfg9PEYA="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 2afba817fc004..645069e4354d3 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -5,8 +5,7 @@ , pkg-config , alsa-lib , libGL -, libX11 -, libXi +, xorg , udev , Cocoa , OpenGL @@ -32,8 +31,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ alsa-lib libGL - libX11 - libXi + xorg.libX11 + xorg.libXi udev ] ++ lib.optionals stdenv.isDarwin [ Cocoa diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/games/shticker-book-unwritten/unwrapped.nix index a4b25d94e8f8d..1d49a220235f5 100644 --- a/pkgs/games/shticker-book-unwritten/unwrapped.nix +++ b/pkgs/games/shticker-book-unwritten/unwrapped.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "shticker-book-unwritten"; - version = "1.0.3"; + version = "1.2.0"; src = fetchCrate { inherit version; crateName = "shticker_book_unwritten"; - sha256 = "sha256-NQEXLTtotrZQmoYQnhCHIEwSe+fqlcHq5/I6zTHwLvc="; + sha256 = "sha256-jI2uL8tMUmjZ5jPkCV2jb98qtKwi9Ti4NVCPfuO3iB4="; }; - cargoSha256 = "sha256-SniyLp/4R0MkJYQmW3RFvOFeBKTvRlSzEI5Y+ELHfy8="; + cargoSha256 = "sha256-Tney9SG9MZh7AUIT1h/dlgJyRrSPX7mUhfsKD1Rfsfc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/solicurses/default.nix b/pkgs/games/solicurses/default.nix new file mode 100644 index 0000000000000..2a296b525f522 --- /dev/null +++ b/pkgs/games/solicurses/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchFromGitHub +, ncurses +}: + +stdenv.mkDerivation { + pname = "solicurses"; + version = "unstable-2020-02-13"; + + src = fetchFromGitHub { + owner = "KaylaPP"; + repo = "SoliCurses"; + rev = "dc89ca00fc1711dc449d0a594a4727af22fc35a0"; + sha256 = "sha256-zWYXpvEnViT/8gsdMU9Ymi4Hw+nwkG6FT/3h5sNMCE4="; + }; + + buildInputs = [ + ncurses + ]; + + preBuild = '' + cd build + ''; + + installPhase = '' + install -D SoliCurses.out $out/bin/solicurses + ''; + + meta = with lib; { + description = "A version of Solitaire written in C++ using the ncurses library"; + homepage = "https://github.com/KaylaPP/SoliCurses"; + maintainers = with maintainers; [ laalsaas ]; + license = licenses.gpl3Only; + inherit (ncurses.meta) platforms; + }; +} diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 8ad1600701d5a..ea9db37cbddfa 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -294,5 +294,10 @@ in buildFHSUserEnv rec { ${fixBootstrap} exec -- "$run" "$@" ''; + + meta = steam.meta // { + description = "Run commands in the same FHS environment that is used for Steam"; + name = "steam-run"; + }; }; } diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 4c94fa4f1ae3b..5e7af156c48da 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.16.5"; + version = "1.17.4"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-qqrQ+cs/ujzeXAa0xX5Yee3l5bo9DaH+kS1pkCt/UoU="; + sha256 = "sha256-q4SphwL4g1hyMMthhF7VCfRqlJrOp8uk00fPRqCfI/s="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index ad576b4642436..737fed1e7f64d 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -7,7 +7,7 @@ , SDL_ttf , SDL_mixer , libmysqlclient -, wxGTK +, wxGTK32 , symlinkJoin , runCommandLocal , makeWrapper @@ -31,7 +31,7 @@ let SDL_ttf SDL_mixer libmysqlclient - wxGTK + wxGTK32 coreutils ]; hardeningDisable = [ "format" ]; @@ -74,7 +74,8 @@ let ]; postPatch = '' substituteInPlace zod_launcher_src/zod_launcherFrm.cpp \ - --replace 'message = wxT("./zod");' 'message = wxT("zod");' + --replace 'message = wxT("./zod");' 'message = wxT("zod");' \ + --replace "check.replace(i,1,1,'_');" "check.replace(i,1,1,(wxUniChar)'_');" ''; preBuild = "cd zod_launcher_src"; installPhase = '' @@ -106,5 +107,6 @@ in homepage = "http://zod.sourceforge.net/"; maintainers = with maintainers; [ zeri ]; license = licenses.gpl3Plus; /* Says the website */ + platforms = platforms.linux; }; } diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 9531324b14a9d..23a2f707c6b32 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -53,6 +53,10 @@ let makeFlags = [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" + # binutils 2.39 regression + # `warning: /build/source/build/rk3399/release/bl31/bl31.elf has a LOAD segment with RWX permissions` + # See also: https://developer.trustedfirmware.org/T996 + "LDFLAGS=-no-warn-rwx-segments" ] ++ (lib.optional (platform != null) "PLAT=${platform}") ++ extraMakeFlags; diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 36eaa50e32c4f..f53cb5a977600 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -14,9 +14,7 @@ , gnused , imagemagick , procps -, xdpyinfo -, xrandr -, xset +, xorg }: stdenv.mkDerivation rec { @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp betterlockscreen $out/bin/betterlockscreen wrapProgram "$out/bin/betterlockscreen" \ - --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]}" + --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xorg.xdpyinfo xorg.xrandr xorg.xset ]}" runHook postInstall ''; diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 6e838803dea05..4d3aec01439f9 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -1,28 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, wxGTK } : - -stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, wxGTK32, Cocoa }: +stdenv.mkDerivation { pname = "sound-of-sorting"; - version = "2017-12-23"; + version = "unstable-2022-10-12"; src = fetchFromGitHub { owner = "bingmann"; repo = "sound-of-sorting"; - rev = "5884a357af5775fb57d89eb028d4bf150760db75"; - sha256 = "01bpzn38cwn9zlydzvnfz9k7mxdnjnvgnbcpx7i4al8fha7x9lw8"; + rev = "5cfcaf752593c8cbcf52555dd22745599a7d8b1b"; + sha256 = "sha256-cBrTvFoz6WZIsh5qPPiWxQ338Z0OfcIefiI8CZF6nn8="; }; - buildInputs = - [ wxGTK SDL2 ]; + nativeBuildInputs = [ pkg-config ]; - preConfigure = '' - export SDL_CONFIG=${SDL2.dev}/bin/sdl2-config - ''; + buildInputs = [ wxGTK32 SDL2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; meta = with lib; { description = "Audibilization and Visualization of Sorting Algorithms"; homepage = "https://panthema.net/2013/sound-of-sorting/"; - license = with licenses; gpl3; + license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8f16f943d7409..2937e1ca862b6 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -23,10 +23,10 @@ }: let - defaultVersion = "2022.07"; + defaultVersion = "2022.10"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-krCOtJwk2hTBrb9wpxro83zFPutCMOhZrYtnM9E9z14="; + hash = "sha256-ULRIKlBbwoG6hHDDmaPCbhReKbI1ALw1xQ3r1/pGvfg="; }; buildUBoot = lib.makeOverridable ({ version ? null diff --git a/pkgs/os-specific/darwin/macfuse/default.nix b/pkgs/os-specific/darwin/macfuse/default.nix index 4fd92a15562cc..c63b536f248b5 100644 --- a/pkgs/os-specific/darwin/macfuse/default.nix +++ b/pkgs/os-specific/darwin/macfuse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "macfuse-stubs"; - version = "4.1.0"; + version = "4.4.1"; src = fetchurl { url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg"; - sha256 = "118hg64w5wb95lbxw6w1hbqxrx3plcbxfjhvxx86q0zx0saa9diw"; + sha256 = "2a2d0f37ec5fcff547c5efa7d08539103a0b46bc16080c2b41a7e749f6e65c61"; }; nativeBuildInputs = [ cpio xar undmg libtapi ]; diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 2545c73ac5887..07214f4827637 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -65,7 +65,8 @@ stdenv.mkDerivation rec { systemd ]; - doCheck = true; + # https://gitlab.freedesktop.org/bolt/bolt/-/issues/181 + doCheck = false; preCheck = '' export LD_LIBRARY_PATH=${umockdev.out}/lib/ diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 9755e516214a0..0d9fa44a87947 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -15,7 +15,7 @@ , docbook_xsl ? null , docbook_xml_dtd_44 ? null , ncursesSupport ? true , ncurses ? null -, x11Support ? true , xlibsWrapper ? null +, x11Support ? true , freetype, xorg , xdamageSupport ? x11Support, libXdamage ? null , doubleBufferSupport ? x11Support , imlib2Support ? x11Support, imlib2 ? null @@ -43,7 +43,6 @@ assert docsSupport -> docbook2x != null && libxslt != null assert ncursesSupport -> ncurses != null; -assert x11Support -> xlibsWrapper != null; assert xdamageSupport -> x11Support && libXdamage != null; assert imlib2Support -> x11Support && imlib2 != null; assert luaSupport -> lua != null; @@ -95,7 +94,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libXinerama ] ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optional ncursesSupport ncurses - ++ optional x11Support xlibsWrapper + ++ optionals x11Support [ freetype xorg.libICE xorg.libX11 xorg.libXext xorg.libXft xorg.libSM ] ++ optional xdamageSupport libXdamage ++ optional imlib2Support imlib2 ++ optional luaSupport lua diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3a71563593ef3..2e07606345875 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -505,6 +505,11 @@ let # Depends on MODULE_SIG and only really helps when you sign your modules # and enforce signatures which we don't do by default. SECURITY_LOCKDOWN_LSM = option no; + + # provides a register of persistent per-UID keyrings, useful for encrypting storage pools in stratis + PERSISTENT_KEYRINGS = yes; + # enable temporary caching of the last request_key() result + KEYS_REQUEST_CACHE = whenAtLeast "5.3" yes; } // optionalAttrs (!stdenv.hostPlatform.isAarch32) { # Detect buffer overflows on the stack diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c9e600657bf03..34d6a38748018 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,51 +12,51 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.260-hardened1.patch", - "sha256": "08b3kk5m12yqq12ik1d9zxaga2pzw2znzcwh9ymk6i9b8y5f3bsm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.260-hardened1/linux-hardened-4.19.260-hardened1.patch" + "name": "linux-hardened-4.19.261-hardened1.patch", + "sha256": "1hs9jg2n9i89li0p1mbkfhy8r5pv5wrl3gw3b3xvp0n8283cy631", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.261-hardened1/linux-hardened-4.19.261-hardened1.patch" }, - "sha256": "1vlhaapbkvvk2acw1i5f6v6gd8v0x37n1y3i066cddl90my6yl24", - "version": "4.19.260" + "sha256": "1cicb3zydpka9yjx875hbh305bsdvni2kp674pkvaw04pnc35hxy", + "version": "4.19.261" }, "5.10": { "patch": { - "extra": "-hardened1", - "name": "linux-hardened-5.10.146-hardened1.patch", - "sha256": "1ah8p0iy4cqjhmjd1zxqvspihx0wkj515ggca65rjrpmfr05f2ll", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.146-hardened1/linux-hardened-5.10.146-hardened1.patch" + "extra": "-hardened2", + "name": "linux-hardened-5.10.147-hardened2.patch", + "sha256": "0j44mfyc66vq6hncc5w3mxxw8jcpa66w4w40d3wm7ka6yr6p34sh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.147-hardened2/linux-hardened-5.10.147-hardened2.patch" }, - "sha256": "1hbdxvlibp9w0q8bk1zlx77ayq2wcld8rjm134ybgbcf4zrrggbv", - "version": "5.10.146" + "sha256": "16pdpjmvrdml7am7s2kydrif1l7f4aq0wh4ak0xh3dby16zkl9c5", + "version": "5.10.147" }, "5.15": { "patch": { - "extra": "-hardened1", - "name": "linux-hardened-5.15.71-hardened1.patch", - "sha256": "0yfvwivjj8swc4l0ngq4x1104jpfmzj9cb4pvxsagkkf8dwfvqc6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.71-hardened1/linux-hardened-5.15.71-hardened1.patch" + "extra": "-hardened3", + "name": "linux-hardened-5.15.73-hardened3.patch", + "sha256": "1p4cm1viyryf4npbfvg72a4kpqs22vqvfqj2hl6pq5wrpgg677g0", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.73-hardened3/linux-hardened-5.15.73-hardened3.patch" }, - "sha256": "0lqy3nmhij6sb4963kb5dhvfdx46mg79hp81kq10wv01iq9hhm2z", - "version": "5.15.71" + "sha256": "0pbi640llcdbx57vwwzc5axa75w0y5rixa9r752h725f4naz08m8", + "version": "5.15.73" }, "5.19": { "patch": { - "extra": "-hardened1", - "name": "linux-hardened-5.19.12-hardened1.patch", - "sha256": "157m9mkdqpm01rzwsgdcv88z51642fp3v0h5q0mafg4ph4afd7pg", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.12-hardened1/linux-hardened-5.19.12-hardened1.patch" + "extra": "-hardened2", + "name": "linux-hardened-5.19.15-hardened2.patch", + "sha256": "12si2gy6maxbvf252ircp94ci0ihqlxv3l9sf4xwxrs66gn3z2fa", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.15-hardened2/linux-hardened-5.19.15-hardened2.patch" }, - "sha256": "1fmhwbgqpr6q3z3ygys153szivlmv3mcnwilbbyfcb1iqx4aadn4", - "version": "5.19.12" + "sha256": "06zband5q6m9imyvn4y4naafdakjcj00rg23227cagnv8wwf71j6", + "version": "5.19.15" }, "5.4": { "patch": { - "extra": "-hardened1", - "name": "linux-hardened-5.4.215-hardened1.patch", - "sha256": "1xfyvppf16y7bjmjkhpps9vp4zw2dcrk18kajj1lkzhh441y1g94", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.215-hardened1/linux-hardened-5.4.215-hardened1.patch" + "extra": "-hardened2", + "name": "linux-hardened-5.4.217-hardened2.patch", + "sha256": "16hcwjll5dkfc8sb81w3dipqx9j1np91f5gad45b0xfcnqcn70ab", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.217-hardened2/linux-hardened-5.4.217-hardened2.patch" }, - "sha256": "1gafnf9gbsfzvp9jq6y8qhpvas5cv9y0m9bad2sg55sjlb1zfard", - "version": "5.4.215" + "sha256": "0qrfrk0g1dky5apg8gdxczj2ir0g0z41zmdmbwwcxkxjz76jdf1b", + "version": "5.4.217" } } diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index febd66649568e..be2e09bc6a3d0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.147"; + version = "5.10.148"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "16pdpjmvrdml7am7s2kydrif1l7f4aq0wh4ak0xh3dby16zkl9c5"; + sha256 = "0mp9qs8f50hxf72b6cgh8izkyjbhrrmij6slxja701i1w9mkylhj"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 7ae1f28225665..0bab77b4ade9b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.72"; + version = "5.15.74"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1aq75z2spa1jvxv9m89gsaxza29n25k8j1f0pg9yj6j7bcxk5430"; + sha256 = "0ra2ijpw7w07gm3kjwyszlwfq2rbnmq84z50qhv5r0svz2i3j59c"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix index 06041ed9450fb..4dc67c2b90ce1 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.19.14"; + version = "5.19.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1h8srn3fw4vw61qi0xxlk9fq0fqq4wl7fbrzz7sivdd8qkhjgv8x"; + sha256 = "13g0c6ljxk3sd0ja39ndih5vrzp2ssj78qxaf8nswn8hgrkazsx1"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 41e925a9d2545..a39e28bfc91f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.216"; + version = "5.4.218"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "19vyxa0yzdf4w48jamjfz6kpiaaa7mjjz5gs2awckzilfc0n4pyf"; + sha256 = "0f7lm5qq763zrnwwq9jmfpgvskhzi3gwy5rbq2q7gmiphl179p9x"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index b099c5dc140cc..27f8166ecefcb 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0"; + version = "6.0.2"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w"; + sha256 = "17awx4c5fz7f656ig5bydccci052jsai0lczrn2bdk5cihw2cg51"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 3cb3042b0e3e9..3709520547362 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.19.12"; #zen + version = "6.0.2"; #zen suffix = "zen1"; #zen - sha256 = "001zrsgsg5yl74yn4qdmykwmys4mdwnnbiqmfpw60i3qr5ig90ap"; #zen + sha256 = "1x80ah2cszj3fbxfpdnlr30r1fblgrhydslfh9vrk48l0z3z80a7"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.19.12"; #lqx - suffix = "lqx1"; #lqx - sha256 = "19y3znj3zjifkd1m8agb8f80kzfs1rx1ccpnq7fvkd7j4yd3khlf"; #lqx + version = "5.19.16"; #lqx + suffix = "lqx2"; #lqx + sha256 = "1n4hbkb1af9gzdvk7cp73i004j2slb0im9yk1b869h27pxs4il6s"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 1ec98cc7b3498..99382ad4aae1c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -37,10 +37,11 @@ rec { }; latest = selectHighestVersion production (generic { - version = "495.46"; - sha256_64bit = "2Dt30X2gxUZnqlsT1uqVpcUTBCV7Hs8vjUo7WuMcYvU="; - settingsSha256 = "vbcZYn+UBBGwjfrJ6SyXt3+JLBeNcXK4h8mjj7qxZPk="; - persistencedSha256 = "ieYqkVxe26cLw1LUgBsFSSowAyfZkTcItIzQCestCXI="; + version = "520.56.06"; + sha256_64bit = "sha256-UWdLAL7Wdm7EPUHKhNGNaTkGI0+FUZBptqNB92wRPEY="; + openSha256 = "sha256-miIxF/0fA7v8fU+oh/mx0DRqJdPBzmz14IqgPWJQeKU="; + settingsSha256 = "sha256-NeT3tb7NGicKHnNkuOwbte6BJsP1bUzPSE+TXnevCAM="; + persistencedSha256 = "sha256-3nWtnwpLaal3ty8GNMFa4zeonT8nKpYs6DIgsAq9+84="; }); beta = selectHighestVersion latest (generic { diff --git a/pkgs/os-specific/linux/system76-power/default.nix b/pkgs/os-specific/linux/system76-power/default.nix index edaf2b5c8144e..f1a4c9b7bb3b5 100644 --- a/pkgs/os-specific/linux/system76-power/default.nix +++ b/pkgs/os-specific/linux/system76-power/default.nix @@ -2,22 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "system76-power"; - version = "1.1.20"; + version = "1.1.23"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-power"; rev = version; - sha256 = "sha256-Qk9zHqwFlUTWE+YRt2GASIekbDoBCHPAUUN3+0wpvfw="; + sha256 = "sha256-RuYDG4eZE599oa04xUR+W5B3/IPOpQUss1x7hzoydUQ="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libusb1 ]; - cargoSha256 = "sha256-iG7M9ICFRTFVkbC89DyfR+Iyi7jaT9WmG3PSdBOF7YI="; + cargoSha256 = "sha256-Vps02ZRVmeOQ8jDFZJYAUb502MhqY+2YV2W1/9XGY+0="; postInstall = '' - install -D -m 0644 data/system76-power.conf $out/etc/dbus-1/system.d/system76-power.conf + install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf + install -D -m 0644 data/com.system76.PowerDaemon.policy $out/share/polkit-1/actions/com.system76.PowerDaemon.policy + install -D -m 0644 data/com.system76.PowerDaemon.xml $out/share/dbus-1/interfaces/com.system76.PowerDaemon.xml ''; meta = with lib; { diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index fcb709d7f423d..2f63307198a1c 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.22.4"; + version = "9.2.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "sha256-Zog0m8tsx8mDLU1rsW5zhhHgyRmi4JGWuy9DV8yp9nY="; + sha256 = "sha256-+QlZ5/3LZnW7lPvm0it7/pC7kVySbHgf1AQTyPJ+L+U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 51088486809a7..37d6b7251a325 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -7,7 +7,7 @@ , installShellFiles }: let - version = "2.6.1"; + version = "2.6.2"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -23,20 +23,16 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-Z8MiMhXH1er+uYvmDQiamF/jSxHbTMwjo61qbH0ioEo="; + sha256 = "sha256-Tbf6RB3106OEZGc/Wx7vk+I82Z8/Q3WqnID4f8uZ6z0="; }; - vendorSha256 = "sha256-6UTErIPB/z4RfndPSLKFJDFweLB3ax8WxEDA+3G5asI="; - - patches = [ - ./inject_version.diff - ]; + vendorSha256 = "sha256-YxGXk3Q1qw6uZxrGc8l2lKExP2GP+nm3eYbHDoEbgdY="; subPackages = [ "cmd/caddy" ]; ldflags = [ "-s" "-w" - "-X github.com/caddyserver/caddy/v2.ShortVersion=${version}" + "-X github.com/caddyserver/caddy/v2.CustomVersion=${version}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/caddy/inject_version.diff b/pkgs/servers/caddy/inject_version.diff deleted file mode 100644 index 3636f026a77a8..0000000000000 --- a/pkgs/servers/caddy/inject_version.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/caddy.go b/caddy.go -index 584865bd..082b9b6c 100644 ---- a/caddy.go -+++ b/caddy.go -@@ -840,7 +840,10 @@ func InstanceID() (uuid.UUID, error) { - // and https://github.com/golang/go/issues/50603. - // - // This function is experimental and subject to change or removal. -+var ShortVersion = "(devel)" -+ - func Version() (simple, full string) { -+ return ShortVersion, ShortVersion - // the currently-recommended way to build Caddy involves - // building it as a dependency so we can extract version - // information from go.mod tooling; once the upstream \ No newline at end of file diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index a02a6d6449808..263d03616cda8 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "22.05.4.1"; + version = "22.05.5.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "100ixhpi4ahx5w7b1ncgmmg1ar48brp095lrxhcxr55fq2wqlv35"; + sha256 = "1mw0dkll1iwwdpdbxcy26zpnjgj07prlgdz2da64krn4yyfhca30"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 51b3abce6f617..b65bdf15bdbf8 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,19 +3,36 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-o+vdxjxbgTPhXtmjrMXf/kBGYaaF3nvVnrG+PGnaM70="; + sha256 = "sha256-ziKVv5ql1gIAIYpsRCV9f9y711hYz24M1Z+mGWO1vqs="; }; - vendorSha256 = "sha256-sd2frDxtMd0YUVCCQGaNYU7KopZQC1Ld5OHnjttTrgA="; - - # some tests are racy, re-enable once upstream has fixed them - doCheck = false; + vendorSha256 = "sha256-p1UmHIM4h6oe5PRSPD8rtEJpwypTxN1IHzge0Me/9mQ="; + + subPackages = [ + # The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith + "cmd/dendrite-monolith-server" + # The server as a polylith: https://matrix-org.github.io/dendrite/installation/install/polylith + "cmd/dendrite-polylith-multi" + # admin tools + "cmd/create-account" + "cmd/generate-config" + "cmd/generate-keys" + "cmd/resolve-state" + ## curl, but for federation requests, only useful for developers + # "cmd/furl" + ## an internal tool for upgrading ci tests, only relevant for developers + # "cmd/dendrite-upgrade-tests" + ## tech demos + # "cmd/dendrite-demo-pinecone" + # "cmd/dendrite-demo-yggdrasil" + # "cmd/dendritejs-pinecone" + ]; checkInputs = [ postgresqlTestHook @@ -37,6 +54,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://matrix-org.github.io/dendrite"; description = "A second-generation Matrix homeserver written in Go"; + changelog = "https://github.com/matrix-org/dendrite/releases/tag/v${version}"; license = licenses.asl20; maintainers = teams.matrix.members; platforms = platforms.unix; diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix index f6415ee72acda..0491e0e75eb34 100644 --- a/pkgs/servers/endlessh-go/default.nix +++ b/pkgs/servers/endlessh-go/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "endlessh-go"; - version = "20220731"; + version = "20221012"; src = fetchFromGitHub { owner = "shizunge"; repo = "endlessh-go"; rev = version; - sha256 = "sha256-xV9VCbpd6JC/m3RXJt0v8WCCGs8UpZLvAv3bzPRrae4="; + sha256 = "sha256-qgwOaqRyMiN3+vnwzwNet7jMQzgmFb09AVfYFwCAQJI="; }; - vendorSha256 = "sha256-YGVLntDnOX55IoIHIn0z1K7V/PhRLruEASfAGQsTUkk="; + vendorSha256 = "sha256-8W0yh+/FPIf6M5JipwbpLseKEdo4uVRmtsYYqfkwENU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index fb557bb73fb8e..f5e504bb02c2f 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -24,11 +24,11 @@ assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - hash = "sha256-QtGgoC7CrxRyjcdoySHUeAC8gwP0FyIetvMvBCNbBDE="; + hash = "sha256-Xw7seQike8dSV6SIAsrK1Sc/HBOyaA8fhHzwrISKyBA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 67b74bcbe44bf..0fbf7caea35c0 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 = "2022.10.3"; + version = "2022.10.4"; components = { "abode" = ps: with ps; [ abodepy @@ -635,10 +635,10 @@ zeroconf ]; "dlib_face_detect" = ps: with ps; [ - face_recognition + face-recognition ]; "dlib_face_identify" = ps: with ps; [ - face_recognition + face-recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 @@ -1276,12 +1276,12 @@ sqlalchemy ]; "homekit" = ps: with ps; [ - hap-python pyqrcode pyturbojpeg aiohttp-cors base36 fnvhash + hap-python ha-ffmpeg ifaddr zeroconf @@ -2369,7 +2369,7 @@ aiohttp-cors ]; "pushbullet" = ps: with ps; [ - pushbullet + pushbullet-py ]; "pushover" = ps: with ps; [ pushover-complete @@ -3420,7 +3420,8 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors - ]; # missing inputs: withings-api + withings-api + ]; "wiz" = ps: with ps; [ aiohttp-cors ifaddr @@ -4267,6 +4268,7 @@ "whois" "wiffi" "wilight" + "withings" "wiz" "wled" "workday" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 118701d24529f..84b810c1df61f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -40,9 +40,7 @@ let hash = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4="; }; }); - }) - (self: super: { bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec { version = "0.5.0"; postPatch = null; @@ -54,9 +52,7 @@ let hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg="; }; }); - }) - (self: super: { blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec { version = "2.0.2"; src = fetchFromGitHub { @@ -66,9 +62,7 @@ let hash = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA="; }; }); - }) - (self: super: { gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { version = "4.0.0"; src = fetchFromGitHub { @@ -78,10 +72,29 @@ let hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; }; }); - }) - # pytest-aiohttp>0.3.0 breaks home-assistant tests - (self: super: { + hap-python = super.hap-python.overridePythonAttrs (oldAtrs: rec { + pname = "ha-hap-python"; + version = "4.5.2"; + src = fetchFromGitHub { + owner = "bdraco"; + repo = "ha-HAP-python"; + rev = "refs/tags/v4.5.2"; + hash = "sha256-xCmx5QopNShKIuXewT+T86Bxyi4P0ddh8r2UlJ48Wig="; + }; + }); + + iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec { + version = "0.4.1"; + src = fetchFromGitHub { + owner = "flz"; + repo = "iaqualink-py"; + rev = "v${version}"; + hash = "sha256-GDJwPBEU7cteAdYj7eo5tAo0G8AVcQR7KSxLNLhU/XU="; + }; + }); + + # pytest-aiohttp>0.3.0 breaks home-assistant tests pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { version = "0.3.0"; src = self.fetchPypi { @@ -126,10 +139,8 @@ let zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); - }) - # Pinned due to API changes in 0.1.0 - (self: super: { + # Pinned due to API changes in 0.1.0 poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec { version = "0.0.8"; src = super.fetchPypi { @@ -138,10 +149,8 @@ let hash = "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc="; }; }); - }) - # Pinned due to API changes >0.3.5.3 - (self: super: { + # Pinned due to API changes >0.3.5.3 pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec { version = "0.3.5.3"; src = fetchFromGitHub { @@ -151,15 +160,11 @@ let sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6"; }; }); - }) - (self: super: { pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); - }) - (self: super: { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -168,9 +173,7 @@ let hash = "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA="; }; }); - }) - (self: super: { pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.0"; src = fetchFromGitHub { @@ -180,9 +183,7 @@ let hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; }; }); - }) - (self: super: { pysoma = super.pysoma.overridePythonAttrs (oldAttrs: rec { version = "0.0.10"; src = super.fetchPypi { @@ -191,10 +192,8 @@ let hash = "sha256-sU1qHbAjdIUu0etjate8+U1zvunbw3ddBtDVUU10CuE="; }; }); - }) - # Pinned due to API changes in 0.3.0 - (self: super: { + # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; src = fetchFromGitHub { @@ -204,10 +203,8 @@ let hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; }; }); - }) - # Pinned due to API changes in 0.4.0 - (self: super: { + # Pinned due to API changes in 0.4.0 vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { version = "0.3.3"; src = fetchFromGitHub { @@ -217,10 +214,8 @@ let sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; }; }); - }) - # Pinned due to API changes ~1.0 - (self: super: { + # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; src = fetchFromGitHub { @@ -230,10 +225,8 @@ let sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; }; }); - }) - # home-assistant-frontend does not exist in python3.pkgs - (self: super: { + # home-assistant-frontend does not exist in python3.pkgs home-assistant-frontend = self.callPackage ./frontend.nix { }; }) ]; @@ -261,7 +254,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.10.3"; + hassVersion = "2022.10.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,7 +272,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-5ffMs6gXOyg0hhB0Wx4bRmSqkr0uRhNcLhLo1PI2UqE="; + hash = "sha256-949QvezOYW6hA3iU9j2Wu6DhX35CzW0ruwGe3JGPsH4="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index b7bf2937a297d..b2d8e49efc582 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -37,10 +37,11 @@ PKG_SET = "home-assistant.python.pkgs" # If some requirements are matched by multiple or no Python packages, the # following can be used to choose the correct one PKG_PREFERENCES = { + "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 "ha-av": "av", - "youtube_dl": "youtube-dl-light", + "ha-HAP-python": "hap-python", "tensorflow": "tensorflow", - "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 + "youtube_dl": "youtube-dl-light", } diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix index 6524fe6fcd197..3e739b09a25fc 100644 --- a/pkgs/servers/kubemq-community/default.nix +++ b/pkgs/servers/kubemq-community/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "kubemq-community"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "kubemq-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E4X8srrfbOHV2XmjaXV25WilIjBGPjEGD6BqK7HreoQ="; + sha256 = "sha256-d5ZhQFVh7yzZsozlMaxkLMGdLraCFAvuQvQiSdF56wY="; }; CGO_ENABLED=0; @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; # grpc tests are flaky - vendorSha256 = "sha256-kvQ5sPMudI75fVIWJkkwXpmVrJysvWcIgpgjyQh19W0="; + vendorSha256 = "sha256-mie+Akfsn+vjoxYnI23Zxk0OTFbMf51BDbJk2c0U7iU="; meta = { homepage = "https://github.com/kubemq-io/kubemq-community"; diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix new file mode 100644 index 0000000000000..0bbebc669306d --- /dev/null +++ b/pkgs/servers/mail/vsmtp/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, installShellFiles +, openssl +, testers +, vsmtp +}: + +rustPlatform.buildRustPackage rec { + pname = "vsmtp"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "viridIT"; + repo = "vsmtp"; + rev = "v${version}"; + hash = "sha256-nBkfIjACmjnVNF3hJ22B4ecjWrX9licV7c8Yxv2tQCg="; + }; + + cargoHash = "sha256-HqQ8WD1/K7xMx97SbuP45Q/+4oADh1WZFJPXB8wlkbM="; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ openssl ]; + + cargoBuildFlags = [ + "--package" + "vsmtp" + "--package" + "vqueue" + ]; + + postInstall = '' + installManPage tools/install/man/*.1 + ''; + + passthru = { + tests.version = testers.testVersion { package = vsmtp; version = "v${version}"; }; + }; + + meta = with lib; { + description = "A next-gen mail transfer agent (MTA) written in Rust"; + homepage = "https://viridit.com"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 75d828ccf7965..8995feba134ac 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-OUGFp25M8wn8eWMuQHDh8Zp67x+VHVbyvuBHq+UE+NY="; + hash = "sha256-5wZtWFB5y695S4E1Cv8nTSPUy6rPQ/j91w6kI0DAkGs="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-9pOe7jHgyrFP1Sj8O1KEVxcEaUPEE0+41HUfQoPxa2E="; + vendorSha256 = "sha256-v2Zf9nmAzal/nAtbQLunGJR/CUcdbwSUQ1077e7hVrQ="; doCheck = false; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 3e9c9150f03cf..bf810d98ae54d 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.1.7"; + version = "9.2.0"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-dlQlzX3aGZzBOb0V6ogB8yuoC8Dt18O8nKcJAQ9bfvs="; + sha256 = "sha256-cfm+BfzSMtkDMkiDH7rsoh/tEofmqWhuUz1slk+FaOI="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-ioXc9UfbNRz/RCdnFfaEDRxtamR8st9Wc1LQ6wdl8SE="; + sha256 = "sha256-qJnqIog5DQXI8MAZtb2USkb5UwY7c05nDBt2mf13BJ8="; }; - vendorSha256 = "sha256-frY84+Tp9qVj9Xs9l0c0u1YyYywMbXO4KS0AF5mpnhQ="; + vendorSha256 = "sha256-SYDkKB/D+uWHoeGAcYJmYxLhMOw458vkmFJlLbcrf2k="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index b42ca01774a2f..0bfc868167cb6 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.70"; + version = "2.0.71"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "sha256-fczrCulKs7c9e0vKQ12bEJODr74/uBj77llqCqcPMps="; + sha256 = "sha256-RIWZpvC4bVrm5DXnWyBw7/57oZR+Z3m+NfjmSjLSKi0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix index c3ebc47c072d8..5fe9c6baee704 100644 --- a/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -2,16 +2,16 @@ python3Packages.buildPythonApplication rec { pname = "kea-exporter"; - version = "0.4.4"; + version = "0.5.0"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-8hWQfI9HCSKhkgN3F0mwvKKJg6FlwqRZ1QuQFB1YXrc="; + hash = "sha256-RSW1HStfPV7yiuLgGIuMjS3vPXz8P3vmtfw6tDHXp6o="; }; nativeBuildInputs = with python3Packages; [ - poetry-core + pdm-pep517 ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index cca0ab5153e24..ce010f306221c 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -79,12 +79,19 @@ in buildGoModule { version = version; src = src; - nativeBuildInputs = [ go-bindata pkg-config ]; + nativeBuildInputs = [ go-bindata pkg-config perl ]; vendorSha256 = "sha256-DZsd6qPKfRbnvz0UAww+ubaeTEqQxLeil1S3SZAmmJk="; subPackages = [ "cmd/influxd" "cmd/telemetryd" ]; PKG_CONFIG_PATH = "${flux}/pkgconfig"; + + postPatch = '' + # use go-bindata from environment + substituteInPlace static/static.go \ + --replace 'go run github.com/kevinburke/go-bindata/' "" + ''; + # Check that libflux and the UI are at the right version, and embed # the UI assets into the Go source tree. preBuild = '' @@ -95,7 +102,7 @@ in buildGoModule { exit 1 fi - ui_ver=$(egrep 'influxdata/ui/releases/.*/sha256.txt' scripts/fetch-ui-assets.sh | ${perl}/bin/perl -pe 's#.*/OSS-([^/]+)/.*#$1#') + ui_ver=$(egrep 'influxdata/ui/releases/.*/sha256.txt' scripts/fetch-ui-assets.sh | perl -pe 's#.*/OSS-([^/]+)/.*#$1#') if [ "$ui_ver" != "${ui_version}" ]; then echo "scripts/fetch-ui-assets.sh wants UI $ui_ver, but nix derivation provides ${ui_version}" exit 1 diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/servers/rmfakecloud/default.nix index db4b335e666f5..4b84ca3e3567f 100644 --- a/pkgs/servers/rmfakecloud/default.nix +++ b/pkgs/servers/rmfakecloud/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, callPackage, enableWebui ? true }: buildGoModule rec { pname = "rmfakecloud"; @@ -13,8 +13,12 @@ buildGoModule rec { vendorSha256 = "sha256-NwDaPpjkQogXE37RGS3zEALlp3NuXP9RW//vbwM6y0A="; - postPatch = '' - # skip including the JS SPA, which is difficult to build + ui = callPackage ./webui.nix { inherit version src; }; + + postPatch = if enableWebui then '' + mkdir -p ui/build + cp -r ${ui}/* ui/build + '' else '' sed -i '/go:/d' ui/assets.go ''; diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/servers/rmfakecloud/webui.nix new file mode 100644 index 0000000000000..8b636baec1159 --- /dev/null +++ b/pkgs/servers/rmfakecloud/webui.nix @@ -0,0 +1,37 @@ +{ version, src, stdenv, lib, fetchFromGitHub, fetchYarnDeps, fixup_yarn_lock, yarn, nodejs }: + +stdenv.mkDerivation rec { + inherit version src; + + pname = "rmfakecloud-webui"; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/ui/yarn.lock"; + sha256 = "sha256-lKA3W7gXT2Dnux+sIXCluG5HxkGQgHPnCjgV/a4pjY0="; + }; + + nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ]; + + buildPhase = '' + export HOME=$(mktemp -d) + cd ui + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress + patchShebangs node_modules + export PATH=$PWD/node_modules/.bin:$PATH + ./node_modules/.bin/react-scripts build + mkdir -p $out + cd .. + ''; + + installPhase = '' + cp -r ui/build/* $out + ''; + + meta = with lib; { + description = "Only the webui files for rmfakecloud"; + homepage = "https://ddvk.github.io/rmfakecloud/"; + license = licenses.agpl3Only; + }; +} diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index 4ebe1d5438754..f518531f668de 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.3.7"; + version = "4.3.8"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - hash = "sha256-5/gdKueqWKEhHDho+q719J6lQt4XG9JExWef5/Y3y1s="; + hash = "sha256-lJI7TPzV1beZFN6SinjdJ1HqlVX61aWZ281rf3AFpNk="; }; passthru = { diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 94f471dd53fe1..2f22cf3903862 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.44"; + version = "0.25.46"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-j9sLIxUru2rjKaL4uV03yQfEdbXpKo1xGunrNZc/t7E="; + sha256 = "sha256-oXWnrzi10DrVb8aAn27kDAJzhZ+VTFsmpLGt7AB55jU="; }; patches = [ diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 66c294f5d4a89..07311004b6602 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -88,12 +88,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.7"; + version = "1.10.8"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "0npdvidvsi4dhwswdwilff4p3x04qmz7hgs9sdadiy2w83qb6alf"; + sha256 = "sha256-66kwEN42LjTh/oEdFeOyXP2fU88tjR1K5ZWQJkKcDLQ="; }; postPatch = '' diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index f6178dba992fc..ef23614f436c4 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -2,11 +2,11 @@ , dataPath ? "/var/lib/snappymail" }: stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.18.5"; + version = "2.18.6"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-JfKxeXLlK4n2BQwJa2JV5VHtNfW6W9cdd+9W+MnxZZo="; + sha256 = "sha256-BoRumpU9HjkNDr113LvIGmpsLlRJtAmGhSBcUoGO8Vc="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 942ede6270696..a5bdbc97838bb 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -245,4 +245,13 @@ in self: { thisAttr = "postgresql_14"; inherit self; }; + + postgresql_15 = self.callPackage generic { + version = "15.0"; + psqlSchema = "15"; + hash = "sha256-cux09KfBbmhPQ+pC4hVJf81MVdAopo+3LpnmH/QNpNY="; + this = self.postgresql_15; + thisAttr = "postgresql_15"; + inherit self; + }; } diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 4d1d3326457f0..9ceabbe972a10 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "periods"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "xocolatl"; repo = pname; rev = "v${version}"; - sha256 = "13aix61qzlb7cs042dz4x0z4sc2xayg4nzi2cks46zibxm5i4gzm"; + sha256 = "sha256-XAqjP8Cih+HzqlI8XjgCNzSVQSbaetLRvJReiwHdaIc="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 561c16c96459f..c95e4d8174d38 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.7.0"; + version = "4.7.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Hbg3lf9XEIt5r4sYW+1r1tu6GyBgRXQxrPRWNuZPsvM="; + sha256 = "sha256-XewRIzue38aXhjU6GKEiuUyY+6ngtyQLhCl3/T6Al+A="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index 626e4e0290b15..83c3ac0796a71 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "pg_repack"; - version = "1.4.7"; + version = "1.4.8"; buildInputs = [ postgresql openssl zlib readline ]; src = fetchFromGitHub { owner = "reorg"; repo = "pg_repack"; - rev = "refs/tags/ver_${version}"; - sha256 = "12j8crgljvkm9dz790xcsr8l7sv8ydvb2imrb0jh1jvj0r9yg1v5"; + rev = "f42c1bd707bd5d69a9eb33494133db2e47a2c05a"; # no release tag + sha256 = "sha256-pZjspnmPTXS/SbyLAd7vcoF01cbC6PnxZjuto4lUuQA="; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index afa08a8cdce01..c0c9c3104427f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "pgjwt"; - version = "unstable-2017-04-24"; + version = "unstable-2021-11-13"; src = fetchFromGitHub { owner = "michelp"; repo = "pgjwt"; - rev = "546a2911027b716586e241be7fd4c6f1785237cd"; - sha256 = "1riz0xvwb6y02j0fljbr9hcbqb2jqs4njlivmavy9ysbcrrv1vrf"; + rev = "9742dab1b2f297ad3811120db7b21451bca2d3c9"; + sha256 = "sha256-Hw3R9bMGDmh+dMzjmqZSy/rT4mX8cPU969OJiARFg10="; }; dontBuild = true; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 6afbacca812c7..05be683f1ff73 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.9"; + version = "2.4.0"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-qCS0ndupiRUSI0+BX+o56dgDN9/jPLPdAD16N+gGHqo="; + sha256 = "sha256-W6quDn2B+BZ+J46aNMbtVq7OizT1q5jyKMZECAk0F7M="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index ddc51e8d2b732..c04cb0c3b159d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql }: stdenv.mkDerivation rec { pname = "pgvector"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-kIgdr3+KC11Qxk1uBTmcN4dDaLIhfo/Fs898boESsBc="; }; + patches = [ + # Added support for Postgres 15. Remove with the next release. + (fetchpatch { + url = "https://github.com/pgvector/pgvector/commit/c9c6b96eede7d78758ca7ca5db98bf8b24021d0f.patch"; + sha256 = "sha256-hgCpGtuYmqo4Ttlpn4FBskbNdZmM1wJeMQBJZ7H923g="; + }) + ]; + buildInputs = [ postgresql ]; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index a38b6a5ecba0d..0650cf8a7b2a3 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0x7alz0EySMcqi4yZm5z6pZeL6glf8AYHG+dVBBtnIU="; + sha256 = "sha256-Nxq4wpOWYt4oyoLxERWPhlEwWmLiDEk27EFyDtW/BfI="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix deleted file mode 100644 index ca0dcea84358f..0000000000000 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, v8, perl, postgresql -# For test -, runCommand, coreutils, gnugrep }: - -let self = stdenv.mkDerivation rec { - pname = "plv8"; - version = "3.0.0"; - - nativeBuildInputs = [ perl ]; - buildInputs = [ v8 postgresql ]; - - src = fetchFromGitHub { - owner = "plv8"; - repo = "plv8"; - rev = "v${version}"; - sha256 = "KJz8wnGcTXnVn6umpP+UquuJTtQrkBTJ33rB/JIH4kU="; - }; - - makefile = "Makefile.shared"; - - buildFlags = [ "all" ]; - - makeFlags = [ - # Nixpkgs build a v8 monolith instead of separate v8_libplatform. - "V8_OUTDIR=${v8}/lib" - ]; - - installFlags = [ - # PGXS only supports installing to postgresql prefix so we need to redirect this - "DESTDIR=${placeholder "out"}" - ]; - - preConfigure = '' - # We build V8 as a monolith, so this is unnecessary. - substituteInPlace Makefile.shared --replace "-lv8_libplatform" "" - patchShebangs ./generate_upgrade.sh - substituteInPlace generate_upgrade.sh \ - --replace " 2.3.10)" " 2.3.10 2.3.11 2.3.12 2.3.13 2.3.14 2.3.15)" - ''; - - postInstall = '' - # Move the redirected to proper directory. - # There appear to be no references to the install directories - # so changing them does not cause issues. - mv "$out/nix/store"/*/* "$out" - rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix" - ''; - - NIX_CFLAGS_COMPILE = [ - # V8 depends on C++14. - "-std=c++14" - # Without this, PostgreSQL will crash at runtime. - # The flags are only included in Makefile, not Makefile.shared. - # https://github.com/plv8/plv8/pull/469 - "-DJSONB_DIRECT_CONVERSION" "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" - ]; - - passthru.tests.smoke = runCommand "${pname}-test" {} '' - export PATH=${lib.makeBinPath [ (postgresql.withPackages (_: [self])) coreutils gnugrep ]} - db="$PWD/testdb" - initdb "$db" - postgres -k "$db" -D "$db" & - pid="$!" - - for i in $(seq 1 100); do - if psql -h "$db" -d postgres -c "" 2>/dev/null; then - break - elif ! kill -0 "$pid"; then - exit 1 - else - sleep 0.1 - fi - done - - psql -h "$db" -d postgres -c 'CREATE EXTENSION plv8; DO $$ plv8.elog(NOTICE, plv8.version); $$ LANGUAGE plv8;' 2> "$out" - grep -q "${version}" "$out" - kill -0 "$pid" - ''; - - meta = with lib; { - description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; - homepage = "https://plv8.github.io/"; - maintainers = with maintainers; [ marsam ]; - platforms = [ "x86_64-linux" ]; - license = licenses.postgresql; - }; -}; in self diff --git a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch new file mode 100644 index 0000000000000..74e4eb1922dee --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch @@ -0,0 +1,47 @@ +diff --git a/Makefile b/Makefile +index 38879cc..6e78eeb 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,6 +20,7 @@ OBJS = $(SRCS:.cc=.o) + MODULE_big = plv8-$(PLV8_VERSION) + EXTENSION = plv8 + PLV8_DATA = plv8.control plv8--$(PLV8_VERSION).sql $(wildcard upgrade/*.sql) ++USE_SYSTEM_V8 = 0 + + + # Platform detection +@@ -41,6 +42,7 @@ PGXS := $(shell $(PG_CONFIG) --pgxs) + PG_VERSION_NUM := $(shell cat `$(PG_CONFIG) --includedir-server`/pg_config*.h \ + | perl -ne 'print $$1 and exit if /PG_VERSION_NUM\s+(\d+)/') + ++ifeq ($(USE_SYSTEM_V8),0) + AUTOV8_DIR = build/v8 + AUTOV8_OUT = build/v8/out.gn/obj + AUTOV8_STATIC_LIBS = -lv8_libplatform -lv8_libbase +@@ -66,6 +68,7 @@ v8: + make -f Makefiles/Makefile.macos v8 + endif + endif ++endif + + # enable direct jsonb conversion by default + CCFLAGS += -DJSONB_DIRECT_CONVERSION +@@ -83,6 +86,7 @@ ifdef BIGINT_GRACEFUL + endif + + ++ifeq ($(USE_SYSTEM_V8),0) + # We're gonna build static link. Rip it out after include Makefile + SHLIB_LINK := $(filter-out -lv8, $(SHLIB_LINK)) + +@@ -101,6 +105,7 @@ else + SHLIB_LINK += -lrt -std=c++14 + endif + endif ++endif + + DATA = $(PLV8_DATA) + ifndef DISABLE_DIALECT +-- +2.37.3 + diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix new file mode 100644 index 0000000000000..931a5deb40f18 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -0,0 +1,142 @@ +{ stdenv +, lib +, fetchFromGitHub +, v8 +, perl +, postgresql +# For test +, runCommand +, coreutils +, gnugrep +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "plv8"; + version = "3.1.4"; + + src = fetchFromGitHub { + owner = "plv8"; + repo = "plv8"; + rev = "v${finalAttrs.version}"; + sha256 = "GoPP2nAeDItBt3Lug49s+brD0gIy3iDlJpbyHRuMcZ4="; + }; + + patches = [ + # Allow building with system v8. + # https://github.com/plv8/plv8/pull/505 (rejected) + ./0001-build-Allow-using-V8-from-system.patch + ]; + + nativeBuildInputs = [ + perl + ]; + + buildInputs = [ + v8 + postgresql + ]; + + buildFlags = [ "all" ]; + + makeFlags = [ + # Nixpkgs build a v8 monolith instead of separate v8_libplatform. + "USE_SYSTEM_V8=1" + "SHLIB_LINK=-lv8" + "V8_OUTDIR=${v8}/lib" + ]; + + installFlags = [ + # PGXS only supports installing to postgresql prefix so we need to redirect this + "DESTDIR=${placeholder "out"}" + ]; + + # No configure script. + dontConfigure = true; + + postPatch = '' + patchShebangs ./generate_upgrade.sh + # https://github.com/plv8/plv8/pull/506 + substituteInPlace generate_upgrade.sh \ + --replace " 2.3.10 " " 2.3.10 2.3.11 2.3.12 2.3.13 2.3.14 2.3.15 " + ''; + + postInstall = '' + # Move the redirected to proper directory. + # There appear to be no references to the install directories + # so changing them does not cause issues. + mv "$out/nix/store"/*/* "$out" + rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix" + ''; + + passthru = { + tests = + let + postgresqlWithSelf = postgresql.withPackages (_: [ + finalAttrs.finalPackage + ]); + in { + smoke = runCommand "plv8-smoke-test" {} '' + export PATH=${lib.makeBinPath [ + postgresqlWithSelf + coreutils + gnugrep + ]} + db="$PWD/testdb" + initdb "$db" + postgres -k "$db" -D "$db" & + pid="$!" + + for i in $(seq 1 100); do + if psql -h "$db" -d postgres -c "" 2>/dev/null; then + break + elif ! kill -0 "$pid"; then + exit 1 + else + sleep 0.1 + fi + done + + psql -h "$db" -d postgres -c 'CREATE EXTENSION plv8; DO $$ plv8.elog(NOTICE, plv8.version); $$ LANGUAGE plv8;' 2> "$out" + grep -q "${finalAttrs.version}" "$out" + kill -0 "$pid" + ''; + + regression = stdenv.mkDerivation { + name = "plv8-regression"; + inherit (finalAttrs) src patches nativeBuildInputs buildInputs dontConfigure; + + buildPhase = '' + runHook preBuild + + # The regression tests need to be run in the order specified in the Makefile. + echo -e "include Makefile\nprint_regress_files:\n\t@echo \$(REGRESS)" > Makefile.regress + REGRESS_TESTS=$(make -f Makefile.regress print_regress_files) + + ${postgresql}/lib/pgxs/src/test/regress/pg_regress \ + --bindir='${postgresqlWithSelf}/bin' \ + --temp-instance=regress-instance \ + --dbname=contrib_regression \ + $REGRESS_TESTS + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + touch "$out" + + runHook postInstall + ''; + }; + }; + }; + + meta = with lib; { + description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; + homepage = "https://plv8.github.io/"; + maintainers = with maintainers; [ marsam ]; + platforms = [ "x86_64-linux" ]; + license = licenses.postgresql; + }; +}) diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 3f3b2aa4f143f..582451b3ba44c 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation { pname = "tsearch-extras"; @@ -11,7 +11,6 @@ stdenv.mkDerivation { sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; }; - nativenativeBuildInputs = [ pkg-config ]; buildInputs = [ postgresql ]; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index d00e3a175328c..f9e01a7bd517a 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, bison, flex, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql }: stdenv.mkDerivation rec { pname = "wal2json"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "eulerto"; repo = "wal2json"; rev = "wal2json_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-EB+tCaILWsU9fDhqosl6EyMoYBd6SHISFfyxiZ9pNOk="; + sha256 = "sha256-Gpc9uDKrs/dmVSFgdgHM453+TaEnhRh9t0gDbSn8FUI="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 59a06ac11d48e..ee2dc04d05c9f 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -32,7 +32,7 @@ self: super: { plr = super.callPackage ./ext/plr.nix { }; - plv8 = super.callPackage ./ext/plv8.nix { + plv8 = super.callPackage ./ext/plv8 { v8 = self.v8_8_x; }; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index b36b5449caef2..ecb2108858e4e 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.30.2"; + version = "1.32.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-xs3LhldFP4gB5ouW1q8eiCZ5nZD6j9QROm/s+qFMA88="; + sha256 = "sha256-+pJ7YwJKtlB/UmuvKT4zoWRn1ZBAf75/GcscPbFuA8c="; }; - vendorSha256 = "sha256-+7Cr7wmt4PheHJRAlyKhRd6QRIZBqrbVtn5I94h8lLo="; + vendorSha256 = "sha256-VW6FvbgLcokVGunTCHUXKuH5+O6T55hGIP2g5kFfBsE="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index 383c57ee9382a..b0b888012f463 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenvNoCC, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "selfoss"; - version = "2.18"; + version = "2.19"; src = fetchurl { - url = "https://github.com/SSilence/selfoss/releases/download/${version}/${pname}-${version}.zip"; - sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b"; + url = "https://github.com/SSilence/selfoss/releases/download/${version}/selfoss-${version}.zip"; + sha256 = "5JxHUOlyMneWPKaZtgLwn5FI4rnyWPzmsUQpSYrw5Pw="; }; - sourceRoot = "."; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ + unzip + ]; installPhase = '' - mkdir $out - cp -ra * $out/ + runHook preInstall + + mkdir "$out" + cp -ra \ + .htaccess \ + .nginx.conf \ + * \ + "$out/" + + runHook postInstall ''; meta = with lib; { description = "Web-based news feed (RSS/Atom) aggregator"; homepage = "https://selfoss.aditu.de"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ jtojnar regnat ]; platforms = platforms.all; }; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 676e1be3ec30d..5c988c59f9048 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -24,16 +24,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.68.1"; + version = "0.69.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-PE6UewAE7z0Ie5aFocDK3Qu0Y4ppuPtpD6tDnYfM11Y="; + sha256 = "sha256-aEEuzl3HRWNk2zJq+Vh5ZLyT26Qk7oI3bQKUr4SlDr8="; }; - cargoSha256 = "sha256-7guFkR/paL8jk5YwiRNMbWCyA6DqOaLGTmbWHAWDxRw="; + cargoSha256 = "sha256-qaBiTZUe4RSYdXAEWPVv0ATWDN/+aOYiEpq+oztwNEc="; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; @@ -66,7 +66,9 @@ rustPlatform.buildRustPackage rec { # TODO investigate why tests are broken on darwin # failures show that tests try to write to paths # outside of TMPDIR - doCheck = ! stdenv.isDarwin; + # doCheck = ! stdenv.isDarwin; + # TODO tests are not guaranteed while package is in beta + doCheck = false; checkPhase = '' runHook preCheck diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 7adf4f44ee39e..18c4eef480040 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-/WNBZcLGtlAsPKQpV8AMFgZZVHc2yMlCbvGmbH4BLfY="; + sha256 = "sha256-2TAhs2/yAVAU35IeVfT/68xLt9QZ4fLxMQjxnbCfBKs="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 18609c78e3337..1518b2a2b840c 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-10-12"; + version = "2022-10-14"; pname = "oh-my-zsh"; - rev = "b9be3a43b4da579299b4426b1ba9121f746e2555"; + rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "KKvIYEYh8wpgil8d+Uf9M7uk0etPMOtrTjESa2hwJu4="; + sha256 = "qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw="; }; strictDeps = true; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 7b06692ac8ce3..95d1422b127e0 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -16,8 +16,11 @@ let allowUnfree = config.allowUnfree || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; - allowNonSource = config.allowNonSource or true - && builtins.getEnv "NIXPKGS_ALLOW_NONSOURCE" != "0"; + allowNonSource = let + envVar = builtins.getEnv "NIXPKGS_ALLOW_NONSOURCE"; + in if envVar != "" + then envVar != "0" + else config.allowNonSource or true; allowlist = config.allowlistedLicenses or config.whitelistedLicenses or []; blocklist = config.blocklistedLicenses or config.blacklistedLicenses or []; @@ -298,7 +301,7 @@ let executables = listOf str; outputsToInstall = listOf str; position = str; - available = bool; + available = unspecified; isBuildPythonPackage = platforms; schedulingPriority = int; isFcitxEngine = bool; diff --git a/pkgs/tools/X11/sx/default.nix b/pkgs/tools/X11/sx/default.nix index 1b04bb8876d33..faddc74868092 100644 --- a/pkgs/tools/X11/sx/default.nix +++ b/pkgs/tools/X11/sx/default.nix @@ -3,8 +3,7 @@ , coreutils , fetchFromGitHub , resholve -, xauth -, xorgserver +, xorg }: resholve.mkDerivation rec { @@ -26,11 +25,11 @@ resholve.mkDerivation rec { interpreter = "${bash}/bin/sh"; inputs = [ coreutils - xauth - xorgserver + xorg.xauth + xorg.xorgserver ]; execer = [ - "cannot:${xorgserver}/bin/Xorg" + "cannot:${xorg.xorgserver}/bin/Xorg" ]; }; }; diff --git a/pkgs/tools/admin/acme-sh/default.nix b/pkgs/tools/admin/acme-sh/default.nix index 4a2864f04d920..544bd9f041238 100644 --- a/pkgs/tools/admin/acme-sh/default.nix +++ b/pkgs/tools/admin/acme-sh/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { - Cron job notifications for renewal or error etc. ''; license = licenses.gpl3Only; - maintainers = teams.serokell.members; + maintainers = with lib.maintainers; [ mkaito ] ++ teams.serokell.members; inherit (coreutils.meta) platforms; }; } diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index f8aec10b9fd18..a4ca690d318ae 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.128"; + version = "3.0.131"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-FKynQXvxWU4adGzLTKkRpGCej1So8XbeqqGYu0RM4Rw="; + sha256 = "sha256-YE4+/pzUPk8wte+3ITFfhb9tn5RvaGCteAnirouITSo="; }; - vendorSha256 = "sha256-p1QRYXPetuC8jkPRx54jIKBN5WHgrw4/TZ2RUK2kzDU="; + vendorSha256 = "sha256-rUYlFM9OlPXGzxXyOxweUs6md7HhjocC56F+OtT/IXo="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index 0031004a0fa39..bac1cbd375f22 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ApIEMUit0iVwVGq48qPhQG+i4+HCCwPmiH/QQOdZNjs="; + sha256 = "sha256-Jm4UTwWuqbtckIoXD7YVQk2MQlvzdfRbLW7YA+CmhDE="; }; - vendorSha256 = "sha256-GKGMM5oFfEuXS1utbmIcH/5COqfNrSUzthLQSUxSkbo="; + vendorSha256 = "sha256-MOFPuxn6LwPUw0A14OXhZefAgvtm+9qcDTR3kfwCtjQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 30c16e4676d84..ed87e44daf5ea 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-vRzap9JiV6HzQJKVAByLPMCqADMufoool8Nuw2xu2L4="; + sha256 = "sha256-M2FIzLl1pQ/TJinG4UOh2VQWfZx4iT3Qw6pJhjv88cM="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index f62f1c4c687af..db993c0496653 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.114.0"; + version = "0.115.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-m1R6g9KgbbdlBg7p1gVWpSu02azaqg7bQsFQ4gQB2hM="; + sha256 = "sha256-IIxg0xaRfd7jKS4AkSFHcObQmKSRCnQ+K68by8aZlAc="; }; vendorSha256 = "sha256-glMu2GwMWsuIjLjCwskH90wn690tosLTCThd4LUZobo="; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index dc8ce72d99d4f..a068ce7dc9f0f 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.25.0"; + version = "1.26.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/vEu2BJf0T7fSgSXflq56Ilaih7RAhhilZUgbNzZYQg="; + sha256 = "sha256-jAMDXJtFJtv6CwhZZU4pdKDndZKp6bJ/QPWo2q6DvrE="; }; propagatedBuildInputs = [ @@ -26,6 +26,7 @@ buildPythonApplication rec { pygments pymysql pyperclip + sqlglot sqlparse ]; @@ -41,8 +42,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "sqlparse>=0.3.0,<0.4.0" "sqlparse" \ - --replace "importlib_resources >= 5.0.0" "importlib_resources" + --replace "cryptography == 36.0.2" "cryptography" ''; meta = with lib; { diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 8c1b5bcaf764d..938ac08317a8f 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.42.0"; + version = "3.43.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.42.0-linux-x64.tar.gz"; - sha256 = "1lrfswqw5xd0pxmkfaf77bny94f225rbcjxf7py4s2kbhvc580fv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.43.1-linux-x64.tar.gz"; + sha256 = "09jmvk682b595bmpv4lxdwm61fn47iplmqm2qjsp2nwhfg9r8ny8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz"; @@ -29,16 +29,16 @@ sha256 = "0y7np2qg2hp81cji78bjbcw7ng2g81y1asbnqb2jd2ip0yf43aqp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.2-linux-amd64.tar.gz"; - sha256 = "1r65ylh2wpmv3p4wvr93b7yy73s83lv68xv5858lmbx8iblnl9c1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.17.0-linux-amd64.tar.gz"; + sha256 = "0fwshvmqs62dmpscyshd06sf8nk4bdak5xzh5la48fcnzf45cvzs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.21.0-linux-amd64.tar.gz"; - sha256 = "0fh94k411qravqw5iz9m91aasz9s6lcvc73nw6h3v2df1j6rgm0q"; + sha256 = "0wxzmhwd6nji738hwkpjs2b0jpq0ppmy2vnpb0yvbcmd1j4dssip"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-linux-amd64.tar.gz"; - sha256 = "0rjzn2jcaylgnilb9jqzia1cdkjdvqwbm4djmv8sdcrp64jdx0r9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.29.1-linux-amd64.tar.gz"; + sha256 = "0pv2b447658zsf0hr9479ncygakjrcccfq3bhz22m0xijchivjrw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-amd64.tar.gz"; @@ -49,8 +49,8 @@ sha256 = "177s1vi6ci4v04gyck8c2p9r17w8538migw6d1n7yzyf74qjdwhl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-amd64.tar.gz"; - sha256 = "0a5nav53dg3j4rrx7747a7bk90krfg9fxj0kw0wahcnjijbv1255"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-amd64.tar.gz"; + sha256 = "1nk8aprac0bcw5lx75plwg07hlx1jmbbscima0j5g36gkw6lhln2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.11.0-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "1087d10z0h2vlx18czh4yhplb4qqyy94zf0hvqm5n6vmyh9kpr8j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-linux-amd64.tar.gz"; - sha256 = "11qik0dg12svgh93f5xr7sbqs0bkb8m680cn252lwcwdyz06hfni"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.40.0-linux-amd64.tar.gz"; + sha256 = "0cak1x3ims9xqn8jdqiy40nbaplfs17jp38xv718xq917f8y28f1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-linux-amd64.tar.gz"; @@ -141,8 +141,8 @@ sha256 = "1yq72jgvarbh754a1ym9b8jk40jmk25ly78cw2wj31a96rxv1qp9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-linux-amd64.tar.gz"; - sha256 = "10irh4gfljyiqhf1dw2v3g129yxp9lfglwz1lbwxba8ql9m40vcd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.0-linux-amd64.tar.gz"; + sha256 = "1826nmjjqyf4yim4axni2qf7l6anyr62fdd81nw7qz52117kl8ig"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.42.0-darwin-x64.tar.gz"; - sha256 = "1n036l138nz8w8ciidfhvqpyd1qpfyrv4nqy87z9kygx9pivhj20"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.43.1-darwin-x64.tar.gz"; + sha256 = "14w4q0llw4g67gljmqq0r93lqff11x63x8nhdaxwqnxn1a3fr20p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz"; @@ -187,16 +187,16 @@ sha256 = "0dz583zm47v2x2aznc4yszxibmp9schp3b38yzmbry0xrkm1gryx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.2-darwin-amd64.tar.gz"; - sha256 = "1h4pnhz1iimakg7ngfkpa0hlzh9bp42mhp002fa0z40g55y8i0h9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.17.0-darwin-amd64.tar.gz"; + sha256 = "1ds8af2yfhdk9zq745szx7f42gx47crb9xlwh6hb7b94564jvy6p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.21.0-darwin-amd64.tar.gz"; - sha256 = "0382ambpmfp3bwvmwgnpz08jkrxmiwwj5r6a4crq39s8d4lsf3nb"; + sha256 = "1329v6nsbvbydf4pbv23qp78cizga179jnybg269m8sfqflxh2i3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-darwin-amd64.tar.gz"; - sha256 = "01mar9qhgdmh02cqpjrsczfshiv0mpz83vm33y8igjnf371gg51g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.29.1-darwin-amd64.tar.gz"; + sha256 = "1j017xnjn2illayjg46r53khxjja7vrf4dcj2al4c27n5gf31q8l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-amd64.tar.gz"; @@ -207,8 +207,8 @@ sha256 = "18k9gzsbx48q17y9p8i5wqbjcq9bq94ha96lxvljcyf0jmsklkj6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-amd64.tar.gz"; - sha256 = "0pvq5mwl8scsyvkqgy32v1qs4060w0m12z0f1cw0aw34wd3zs67a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-amd64.tar.gz"; + sha256 = "0jh6v9skyxf4ljiqc5070c1r8gkgaic6wy7w7264c1xfrnwsy31g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.11.0-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "02p8g3kirc9g9jgmv50l8c9jamidk389in33f7qnz22hck880dr8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-darwin-amd64.tar.gz"; - sha256 = "0s2lvm3zf5dnirm9ka8ilrk5l4m39bdid2r6dpldfc326h079xva"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.40.0-darwin-amd64.tar.gz"; + sha256 = "1q5xn1x257br9rrdp3n4z4a4a6nggfs2d0fkdp1g6yrwxrwc4z7a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-darwin-amd64.tar.gz"; @@ -299,8 +299,8 @@ sha256 = "0g1kh5zkkr9m1k5qmmmkay089j0yqbz9qap6k7gii1k601mm09sf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-darwin-amd64.tar.gz"; - sha256 = "0z06di24mdzdkv8zvpxbzcvp9k8w5yqkskc2gigxl2iv608glmn6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.0-darwin-amd64.tar.gz"; + sha256 = "0k39q57wwdcxgpmv6sfifkmcc1rplqabjxk8fg3bvna6zias81yn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.42.0-linux-arm64.tar.gz"; - sha256 = "11dz7i0nnsanj8xams0pr9nxbq9rwfzrjyg4m8wi5nv6q3frnml9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.43.1-linux-arm64.tar.gz"; + sha256 = "1vqvnigyv262m70liccz854j6jhj0zv5bkc9vv8drj1pihfiphsr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz"; @@ -345,16 +345,16 @@ sha256 = "0ni0dp0wghcaybnzvvwyf0nbnyq8k2akkghxlym48z8dq7n4206y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.2-linux-arm64.tar.gz"; - sha256 = "132zvb1wnpwbrg1rg0pr07msfnpf1h1izwr87dki6k40kc3q12mk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.17.0-linux-arm64.tar.gz"; + sha256 = "0k7g2fm9bl5pqxp8qv55wlazj0w5a4z2wnnmzij7vh887li9q4xq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.21.0-linux-arm64.tar.gz"; - sha256 = "1c4fxvmw50nrmnq3q8bnypjg2yvpsm3bs6jbw0hxb2zk3im6jjdp"; + sha256 = "08fsndqfibxn203ilddrzr3zqmq8y7kk6zlzrb4y9rzjqykrsnp8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-linux-arm64.tar.gz"; - sha256 = "0m44k0cllmaw17injy8l1pl9xx180nydia937p78v93fwmk8f65a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.29.1-linux-arm64.tar.gz"; + sha256 = "0cxczw5byb9sb16wkb6gygxwnax3rxj5662z2xcpa04sc9qrs5q2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-arm64.tar.gz"; @@ -365,8 +365,8 @@ sha256 = "0gr30lgad0xf7f4acxj9v7r69gncfzh1x7rn7nvyibsfy7ggn80z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-arm64.tar.gz"; - sha256 = "085flnzp062p6ankfl77p1y7n8ijrhmknnb4r46x6b3lrw891pgd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-arm64.tar.gz"; + sha256 = "1hd08gd2v3wl81amvcf821vzmmh7agw8cspnl6fqc7g69agn1l12"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.11.0-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "1cymvx8dx836d2vcnakgqz51nc033702dph66w8j4swj0sg4wd92"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-linux-arm64.tar.gz"; - sha256 = "1bdbf17z8a2rfgs79xvd71vj7k0zhyvjjvb3vwc46qlf9if3kzsm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.40.0-linux-arm64.tar.gz"; + sha256 = "0sh3lv05ywnqvr4cjpiaxdadfs22d6lfabw69vh5507s2a99rqji"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-linux-arm64.tar.gz"; @@ -457,8 +457,8 @@ sha256 = "11n751m4z2gjslvf28xazhq123yfqyyhshni97ad5ki23i1v785l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-linux-arm64.tar.gz"; - sha256 = "0lc6394fvqs62rxmf4ryrvj9v5237wdrmypyyqjibk5rd72n8xfg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.0-linux-arm64.tar.gz"; + sha256 = "0x3xdqd623q83fr67byhnqbx7gz8p8j65myygmjr14p2rfh1jvvb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.42.0-darwin-arm64.tar.gz"; - sha256 = "10lrxkbb8m7pcpqwfi8klpn26k0pbm5lg7yg3y55kc8dqwl220d7"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.43.1-darwin-arm64.tar.gz"; + sha256 = "08sajzfwlgw0ay2ra0wrxfdbia9215jl9dzn9k51xbraxzay3ls8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz"; @@ -503,16 +503,16 @@ sha256 = "11qrwc44vl0s59bbhjbb15nkcy8nb9lcsw9brb7whvxh2z080nbk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.2-darwin-arm64.tar.gz"; - sha256 = "0xh5v19szndrj9r4gd7mx99m383rmbj13n77ny43zwbd8vbnhq6z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.17.0-darwin-arm64.tar.gz"; + sha256 = "0vmgn5yg9al682sxq6gfgmivqz1g5m9fwn0iqpfbjd08b7s63ala"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.21.0-darwin-arm64.tar.gz"; - sha256 = "1899q6zagxi5jjd4a73yfkbbm8idh5dklrzj7620jz3cc6c3mwrg"; + sha256 = "1qsph1x9y82h8d9swh8nq4z9vygiqnqh6nh5ghpc555vjds3r64w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-darwin-arm64.tar.gz"; - sha256 = "15xhkk4d8l445zn3kmh7aqd476gcbig109jchz0r57yhs76hycyg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.29.1-darwin-arm64.tar.gz"; + sha256 = "0alpkm813gd0qi93928dk5k77py67yviz946mx1jbb5562lh7p72"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-arm64.tar.gz"; @@ -523,8 +523,8 @@ sha256 = "0jp50xcv9ss156i3v173j28ia7ykslmcv8nb4a8bz10jmhkxg52v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-arm64.tar.gz"; - sha256 = "11b8dr2ycn3p4k06y2f4pj19hy7zpq0glh8npqixmvn66flp3wa7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-arm64.tar.gz"; + sha256 = "1ss8dak6lk03s391914wxs1y20h4k0khqab7k15lajvl6jm13809"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.11.0-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "1gmx1lympd3r4i2vsnnmd70qq3x0ijbv53j7vkys59g560rw1bvm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-darwin-arm64.tar.gz"; - sha256 = "1rfxrqyfm7dijmcg1h6ipic1wj0r177aqnrfhrql50asy0c0spmf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.40.0-darwin-arm64.tar.gz"; + sha256 = "1sxn6pa064wpivlw6dv52xdk26irw57bczrv14833yhcz888lndy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-darwin-arm64.tar.gz"; @@ -615,8 +615,8 @@ sha256 = "0yyr5dv612ar8c12w74zwp0n1v77lry548fs6b0d20cc3a6d10gb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-darwin-arm64.tar.gz"; - sha256 = "02n0crpb2vf8b3ih658f6576r13ly4v02a4kwbrpifmk3c27yhv6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.0-darwin-arm64.tar.gz"; + sha256 = "16kkhfaskk4rq00h3h6gpndam64py7swk199v4l9w29rg4wl5v3q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 163de7a9b61d5..cc0f0f4a29116 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.42.0" +VERSION="3.43.1" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 9d636d0bae618..bed3e93b31015 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -9,16 +9,17 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3005"; + version = "3005.1"; src = python3.pkgs.fetchPypi { inherit pname version; - hash = "sha256-HSAMRbiARheOpW+1p1cm3GIMxeUUEQdqBN+A/1L3nNQ="; + hash = "sha256-+hTF2HP4Y7UJUBIdfiOiRJUCdFSQx8SMDPBFQGz+V8E="; }; propagatedBuildInputs = with python3.pkgs; [ distro jinja2 + jmespath markupsafe msgpack psutil diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index adfd0b42e399c..9bc3dfefd4ae3 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -122,6 +122,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage mainProgram = "borg"; - maintainers = with maintainers; [ flokli dotlambda globin ]; + maintainers = with maintainers; [ dotlambda globin ]; }; } diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index bc5f0586c6eda..6dc75978d4a5f 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -52,17 +52,17 @@ # going to the `downloadPage` (see `meta` below). # Find the "Backup-archive client" table on that page. # Look for "Download Documents" of the latest release. -# Here, two links must be checked: +# Here, two links must be checked if existing: # * "IBM Spectrum Protect Client ... Downloads and READMEs": # In the table at the page's bottom, # check the date of the "Linux x86_64 client" # * "IBM Spectrum Protect BA client ... interim fix downloads" -# Look for the "Linux x86_64 client" rows +# Look for the "Linux x86_64 client ..." rows # in the table at the bottom of each page. # Follow the "HTTPS" link of the row with the latest date stamp. # In the directory listing to show up, pick the big `.tar` file. # -# (as of 2022-08-13) +# (as of 2022-09-29) let @@ -107,10 +107,10 @@ let unwrapped = stdenv.mkDerivation rec { name = "tsm-client-${version}-unwrapped"; - version = "8.1.15.1"; + version = "8.1.15.2"; src = fetchurl { url = mkSrcUrl version; - hash = "sha512-DURIMlWlmu+l2UT3bAMaFPlwO+UlrfgaYCsm/JonvvC0K0WallhNKFd7sp0amPkU+4QHE2fkFrTGE3/lY+fghQ=="; + hash = "sha512-ljygVoW7zR+LVHf4LSoBn3qEHISobsxheLxs9NyKWQiwPWpfhSgJO+bX4QRzAmrpSTNrETxHkuXqzGSHaaBlzg=="; }; inherit meta passthru; diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 44c75436908f0..2116fa45c3ef5 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "A script to handle Mozilla's mozlz4 files"; license = lib.licenses.bsd2; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + maintainers = [lib.maintainers.raskin lib.maintainers.pshirshov lib.maintainers.kira-bruneau]; + platforms = lib.platforms.unix; homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5"; }; } diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 4f26fc11a2617..69dab5554ea62 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cryfs"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-NV2xCC8TaJaWDZSghO8EFuygL8hJLOdx67BWaJ2NKRw="; + hash = "sha256-7luTCDjrquG8aBZ841VPwV9/ea8faHGLQtmRahqGTss="; }; postPatch = '' diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/tools/filesystems/eiciel/default.nix index 1e676dea77c77..bfec1dcf09931 100644 --- a/pkgs/tools/filesystems/eiciel/default.nix +++ b/pkgs/tools/filesystems/eiciel/default.nix @@ -3,16 +3,19 @@ , stdenv , acl , gnome -, gtkmm3 +, glibmm_2_68 +, gtkmm4 , meson , ninja , pkg-config -, wrapGAppsHook +, itstool +, wrapGAppsHook4 +, gtk4 }: stdenv.mkDerivation rec { pname = "eiciel"; - version = "0.9.13.1"; + version = "0.10.0-rc2"; outputs = [ "out" "nautilusExtension" ]; @@ -20,30 +23,32 @@ stdenv.mkDerivation rec { owner = "rofirrim"; repo = "eiciel"; rev = version; - sha256 = "0rhhw0h1hyg5kvxhjxkdz03vylgax6912mg8j4lvcz6wlsa4wkvj"; + sha256 = "+MXoT6J4tKuFaSvUTcM15cKWLUnS0kYgBfqH+5lz6KY="; }; nativeBuildInputs = [ meson ninja pkg-config - wrapGAppsHook + itstool + wrapGAppsHook4 + gtk4 ]; buildInputs = [ acl - gtkmm3 + glibmm_2_68 + gtkmm4 gnome.nautilus ]; mesonFlags = [ - "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0" + "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-4" ]; postPatch = '' + # https://github.com/rofirrim/eiciel/pull/9 substituteInPlace meson.build --replace "compiler.find_library('libacl')" "compiler.find_library('acl')" - chmod +x img/install_icons.sh - patchShebangs img/install_icons.sh ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index b3f7a26086ee5..0961ad904f3ff 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libconfuse, gettext }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libconfuse, gettext }: stdenv.mkDerivation rec { pname = "genimage"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-hp+WYtO3eMabHR/nDfZY4cnpCu2iart1P2/lXosMbnM="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libconfuse gettext ]; postInstall = '' diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index c5089515db4cc..4cb50a0b422d3 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.14.10"; + version = "0.15.2"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-izJMypTB7JCvSdTbsS85ez9HL7hM8DtPvnPXA0MvQC8="; + sha256 = "sha256-VCKdGFOjVIrXMIuv0yA7SZU2tYvT7WNYCXKY3Mo4nus="; }; - cargoSha256 = "sha256-3B1+pV7FyOD/e9fIKiAheIbb1vSFooc2qdnbL7LmzdQ="; + cargoSha256 = "sha256-wY5ouCel624nlG9OysqHgoWhJ1FHUjF4B6vFfOfCxgk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 39268c3ed98e3..7418e858b20c2 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urhm2dnWIbzt1mSFDsmqJe61E6D6FWRUG6CJPy/ExOI="; + sha256 = "sha256-JxN8p/935k+mWkGNSKrI7jCTxcGs5TcUXcmkDjwnzZg="; }; - vendorSha256 = "sha256-LvF/6YA/OVO2cyBM1c3YYhEjT26SVXcsepn+vglRKmE="; + vendorSha256 = "sha256-rYyzy6UQQu8q+ei4GAEEq+JPhAAUvHcRpIzNts150OA="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 122dfe8a8bf1b..f4d9e5b3c9104 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config -, gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp +, gtk, glib, pcre, libappindicator, libpthreadstubs, xorg , libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu , wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ gtk glib pcre libappindicator libpthreadstubs - libXdmcp libxkbcommon libepoxy at-spi2-core + xorg.libXdmcp libxkbcommon libepoxy at-spi2-core dbus libdbusmenu ]; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 4dd5889706e24..edebe1e60c2f0 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.0.0"; + version = "11.0.1"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4444"; - sha256 = "dnWZTTDMxyIJb3jGTByCzUfLGuG9wAN2nCkwVM8F5tE="; + rev = "4448"; + sha256 = "LWnEalfott+q/pcqhQYJ1ifJh+lZ2lZbpCMd+jR9/vQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index f2281bc5d35f4..919b99327110a 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ uri-canva ]; platforms = platforms.unix; - broken = stdenv.hostPlatform.system == "aarch64-darwin"; }; } diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index b0d30a58d48eb..d700dfb3ebd95 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, libXaw, freetype }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, xorg, freetype }: stdenv.mkDerivation rec { pname = "libotf"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ libXaw freetype ]; + buildInputs = [ xorg.libXaw freetype ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/tools/misc/arp-scan/default.nix index 720b0a875a802..1e0ad4079d6c0 100644 --- a/pkgs/tools/misc/arp-scan/default.nix +++ b/pkgs/tools/misc/arp-scan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "arp-scan"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "royhills"; repo = "arp-scan"; rev = version; - sha256 = "1mf7a4f9vzvnkiavc87aqyciswggsb4fpy7j05jxnvjyyxv3l7gp"; + sha256 = "sha256-zSihemqGaQ5z6XjA/dALoSJOuAkxF5/nnV6xE+GY7KI="; }; perlModules = with perlPackages; [ diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 0d4919599d930..3f68dfb2587fa 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -9,20 +9,20 @@ , oniguruma , libiconv , Security -, libxcb +, xorg , zlib }: rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.16.0"; + version = "1.16.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1R6Q1xRV8FG8IMwZ+u7BJBvIqT1Pgah3emA1oln5hS0="; + sha256 = "sha256-OiTZAQYVIMJmQXGQkqcMsUykCImbEOCnYcKmwXwXlpQ="; }; - cargoHash = "sha256-+Q5rdOEN7arIyj+2n2JRtr8kRQgXmlxq3jumpuDiYdE="; + cargoHash = "sha256-sPJ8NrnwAHuCPLPef8tCbU4nM5J04CzGwf58a9J5Gz4="; nativeBuildInputs = [ installShellFiles @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ libgit2 oniguruma libxcb ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ libiconv Security zlib diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 3fa25c6d86c96..1eca3b71db0ae 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-HXQdUxc622Pq9NoXa0MPk1yjmDvyYe67RxM6AJ8roN0="; + sha256 = "sha256-a7Qf0mKo1aWABftgIDgh94mJf49d7KAtBkemRNRash0="; }; - vendorSha256 = "sha256-A9l4YbZWdmhoAz6PqFufWGxSnY3TbZfVqXnu+ZWLnQA="; + vendorSha256 = "sha256-jqK115vnEYlER3sAFVFlMFGjpMnAIMlFM+4oN8Ujad4="; doCheck = false; diff --git a/pkgs/tools/misc/csv2latex/default.nix b/pkgs/tools/misc/csv2latex/default.nix index 035d2cb9702da..e297bc532dc12 100644 --- a/pkgs/tools/misc/csv2latex/default.nix +++ b/pkgs/tools/misc/csv2latex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "csv2latex"; - version = "0.22"; + version = "0.23.1"; src = fetchurl { url = "http://brouits.free.fr/csv2latex/csv2latex-${version}.tar.gz"; - sha256 = "09qih2zx6cvlii1n5phiinvm9xw1l8f4i60b5hg56pymzjhn97vy"; + sha256 = "sha256-k1vQyrVJmfaJ7jVaoW2dkPD7GO8EoDqJY5m8O2U/kYw="; }; installPhase = '' diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix index c184dc0b3dd36..09402111fb66d 100644 --- a/pkgs/tools/misc/edid-generator/default.nix +++ b/pkgs/tools/misc/edid-generator/default.nix @@ -1,12 +1,24 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , dos2unix , edid-decode , hexdump , zsh -, modelines ? [] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync +, modelines ? [ ] # Modeline "1280x800" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync +, clean ? false # should it skip all, but explicitly listed modelines? }: +# Usage: +# (edid-generator.override { +# clean = true; +# modelines = [ +# ''Modeline "PG278Q_2560x1440" 241.50 2560 2608 2640 2720 1440 1443 1448 1481 -hsync +vsync'' +# ''Modeline "PG278Q_2560x1440@120" 497.75 2560 2608 2640 2720 1440 1443 1448 1525 +hsync -vsync'' +# ''Modeline "U2711_2560x1440" 241.50 2560 2600 2632 2720 1440 1443 1448 1481 -hsync +vsync'' +# ]; +# }) + stdenv.mkDerivation rec { pname = "edid-generator"; version = "unstable-2018-03-15"; @@ -22,9 +34,15 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs modeline2edid + # allows makefile to discover prefixes and suffixes in addition to just `[0-9]*x[0-9]*.S` + awk -i inplace '/^SOURCES\t/ { print "SOURCES\t:= $(wildcard *[0-9]*x[0-9]**.S)"; next; }; { print; }' Makefile ''; - configurePhase = (lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines); + configurePhase = '' + test '${toString clean}' != 1 || rm *x*.S + ${lib.concatMapStringsSep "\n" (m: "./modeline2edid - <<<'${m}'") modelines} + make clean all + ''; installPhase = '' install -Dm 444 *.bin -t "$out/lib/firmware/edid" @@ -34,7 +52,7 @@ stdenv.mkDerivation rec { description = "Hackerswork to generate an EDID blob from given Xorg Modelines"; homepage = "https://github.com/akatrevorjay/edid-generator"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.flokli ]; + maintainers = with lib.maintainers; [ flokli nazarewk ]; platforms = lib.platforms.all; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/edid-generator.x86_64-darwin }; diff --git a/pkgs/tools/misc/edk2-uefi-shell/default.nix b/pkgs/tools/misc/edk2-uefi-shell/default.nix new file mode 100644 index 0000000000000..78e0ba28afb07 --- /dev/null +++ b/pkgs/tools/misc/edk2-uefi-shell/default.nix @@ -0,0 +1,33 @@ +{ lib +, edk2 +, util-linux +, nasm +, python3 +}: +edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: { + pname = "edk2-uefi-shell"; + inherit (edk2) version; + + nativeBuildInputs = [ util-linux nasm python3 ]; + strictDeps = true; + + # We only have a .efi file in $out which shouldn't be patched or stripped + dontPatchELF = true; + dontStrip = true; + + # GUID hardcoded to match ShellPkg.dsc + installPhase = '' + runHook preInstall + install -D -m0644 Build/Shell/RELEASE*/*/Shell_EA4BB293-2D7F-4456-A681-1F22F42CD0BC.efi $out/shell.efi + runHook postInstall + ''; + + passthru.efi = "${finalAttrs.finalPackage}/shell.efi"; + + meta = { + inherit (edk2.meta) license platforms; + description = "UEFI Shell from Tianocore EFI development kit"; + homepage = "https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg"; + maintainers = with lib.maintainers; [ LunNova ]; + }; +}) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index bad958bb82c5a..b8d3db41e1f8a 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -55,6 +55,7 @@ with python.pkgs; buildPythonApplication rec { protobuf pyserial pyyaml + requests tornado tzdata tzlocal diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 985cc47213814..b66a59c960f69 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazydocker"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "sha256-qtGPsfZVu5ZuCusO5nYgxR/qHiwyhzMmBMLMDpKzKDA="; + sha256 = "sha256-Ns758mqz4O8hKpu3LHFFm1U1vxF1TJZ4GKstWADXOl0="; }; vendorSha256 = null; diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index 5abe5673bf298..e7fb2b4da7996 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -1,27 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "sha256-m10LdtwBk1Lx31AJ4HixEYaCkT7EHpF9+tOV1rSA6VU="; + sha256 = "sha256-XX+XFd1ehahIUGONAx2iOxetU0s6vONc7m91zEOWz5o="; }; - patches = [ - # Work around https://github.com/anrieff/libcpuid/pull/102. - ./stdint.patch - # Fixes cross-compilation to NetBSD, remove me for libcpuid > 0.5.1 - (fetchpatch { - name = "use-popcount-from-libc.patch"; - url = "https://github.com/anrieff/libcpuid/commit/1acaf9980b55ae180cc08db218b9face28202519.patch"; - sha256 = "0lvsv9baq0sria1f1ncn1b2783js29lfs5fv8milp54pg1wd5b7q"; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { diff --git a/pkgs/tools/misc/libcpuid/stdint.patch b/pkgs/tools/misc/libcpuid/stdint.patch deleted file mode 100644 index beb8890c5a280..0000000000000 --- a/pkgs/tools/misc/libcpuid/stdint.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/libcpuid/libcpuid.h -+++ b/libcpuid/libcpuid.h -@@ -88 +88 @@ --#include "libcpuid_types.h" -+#include <stdint.h> diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix index fb5412a5866b1..9d5f9c445b49d 100644 --- a/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3 }: -stdenv.mkDerivation { - version = "2019-02-13"; +stdenv.mkDerivation rec { + version = "1.2.2"; pname = "nginx-config-formatter"; src = fetchFromGitHub { - owner = "1connect"; + owner = "slomkowski"; repo = "nginx-config-formatter"; - rev = "4ea6bbc1bdeb1d28419548aeca90f323e64e0e05"; - sha256 = "0h6pj9i0wim9pzkafi92l1nhlnl2a530vnm7qqi3n2ra8iwfyw4f"; + rev = "v${version}"; + sha256 = "sha256-EUoOfkoVsNpIAwDaQ4NH8MkRIJZI8qeuuHUDE6LuLiI="; }; buildInputs = [ python3 ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "nginx config file formatter"; maintainers = with maintainers; [ Baughn ]; license = licenses.asl20; - homepage = "https://github.com/1connect/nginx-config-formatter"; + homepage = "https://github.com/slomkowski/nginx-config-formatter"; }; } diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index ac3ff7a59b704..bebe77faaa7d4 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -2,31 +2,21 @@ , lib , buildGoModule , fetchFromGitHub -, fetchurl , Cocoa , installShellFiles }: buildGoModule rec { pname = "noti"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "variadico"; repo = "noti"; rev = version; - sha256 = "12r9wawwl6x0rfv1kahwkamfa0pjq24z60az9pn9nsi2z1rrlwkd"; + sha256 = "sha256-FhVpw6PJcm0aYQBlN7AUjOkJgCzleOHXIXumSegtxfA="; }; - patches = [ - # update golang.org/x/sys to fix building on aarch64-darwin - # using fetchurl because fetchpatch breaks the patch - (fetchurl { - url = "https://github.com/variadico/noti/commit/a90bccfdb2e6a0adc2e92f9a4e7be64133832ba9.patch"; - sha256 = "sha256-vSAwuAR9absMSFqGOlzmRZoOGC/jpkmh8CMCVjeleUo="; - }) - ]; - vendorSha256 = null; nativeBuildInputs = [ installShellFiles ]; @@ -39,8 +29,12 @@ buildGoModule rec { "-X github.com/variadico/noti/internal/command.Version=${version}" ]; + preCheck = '' + export PATH=$out/bin:$PATH + ''; + postInstall = '' - installManPage docs/man/* + installManPage docs/man/dist/* ''; meta = with lib; { @@ -48,7 +42,8 @@ buildGoModule rec { longDescription = '' Monitor a process and trigger a notification. - Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone. + Never sit and wait for some long-running process to finish. Noti can alert + you when it's done. You can receive messages on your computer or phone. ''; homepage = "https://github.com/variadico/noti"; license = licenses.mit; diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index 41a0e517ee400..6e415461c4953 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nvimpager"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "lucc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0guSL4RvYQFwok7zGuevhQY6DHjnETRLpEIEQfGslcg="; + sha256 = "sha256-tjnmY7dJUE5k8hlAfNKcHqmpw0ciS6T5WJOpDvvt2V0="; }; buildInputs = [ @@ -30,9 +30,10 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ lua51Packages.busted util-linux neovim ]; + # filter out one test that fails in the sandbox of nix checkPhase = '' runHook preCheck - script -c "busted --lpath './?.lua' test" + script -ec "busted --lpath './?.lua' --filter-out 'handles man' test" runHook postCheck ''; diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 83585f41149e5..f60ba249e87e7 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.61.0"; + version = "0.62.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-xJCxMWAp5qg00kUWssVyy+uLpDQ/CZjO4TXXoDosXxA="; + sha256 = "sha256-pNpCh2oe8hptXlDJsrfJOae8s6K4101lUFXFpXMdEmY="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-aEhNq/e3erW2e5tHMtoePiVFpIY6Mb25k+SVRhIWTr0="; + vendorSha256 = "sha256-sNJOPHGyppdoqYeiBL9LdC5UWHw50CWWp3FS9JlIM+4="; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 5e8a08b71013d..159c81a61ddd5 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.61.0"; + version = "0.62.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-NwkQDqacH1vZNkHy3OzvR1wmwxO2dAPXa/OkiNMcrjs="; + sha256 = "sha256-X0ltNJQEmw7Ifp1DB4Gp1PkdR1tdPzDU4skfxp5Q3ak="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-AFizQKKIMveCI9OiJ6wPxsNwDVn9XEWuPzyIqQSXbd4="; + vendorSha256 = "sha256-E/OB4n3R8B8pOpPVmGU4nzBRIeweNboTq6TBjfCgGQQ="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 06176efb01e77..6d1ca41e937b7 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -8,6 +8,7 @@ , gobject-introspection , gjs , nixosTests +, curl , glib , systemd , xz @@ -42,13 +43,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2022.5"; + version = "2022.6"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-kUxNmTvBEdfdMK6XIbb/6KtW6x/W6BsJewn0AMwbBT8="; + sha256 = "sha256-g170fZoLNaEMd//X8PvS4rh/fMy1iNonRCoF/3H/rYw="; }; patches = [ @@ -85,6 +86,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ + curl glib systemd e2fsprogs @@ -108,6 +110,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--with-curl" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators" "--enable-installed-tests" diff --git a/pkgs/tools/misc/pokemonsay/default.nix b/pkgs/tools/misc/pokemonsay/default.nix new file mode 100644 index 0000000000000..f61b93a874f22 --- /dev/null +++ b/pkgs/tools/misc/pokemonsay/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, cowsay +, coreutils +, findutils +}: + +stdenvNoCC.mkDerivation rec { + pname = "pokemonsay"; + version = "unstable-2021-10-05"; + + src = fetchFromGitHub { + owner = "HRKings"; + repo = "pokemonsay-newgenerations"; + rev = "baccc6d2fe1897c48f60d82ff9c4d4c018f5b594"; + hash = "sha256-IDTAZmOzkUg0kLUM0oWuVbi8EwE4sEpLWrNAtq/he+g="; + }; + + postPatch = '' + substituteInPlace pokemonsay.sh \ + --replace \ + 'INSTALL_PATH=''${HOME}/.bin/pokemonsay' \ + "" \ + --replace \ + 'POKEMON_PATH=''${INSTALL_PATH}/pokemons' \ + 'POKEMON_PATH=${placeholder "out"}/share/pokemonsay' \ + --replace \ + '$(find ' \ + '$(${findutils}/bin/find ' \ + --replace \ + '$(basename ' \ + '$(${coreutils}/bin/basename ' \ + --replace \ + 'cowsay -f ' \ + '${cowsay}/bin/cowsay -f ' \ + --replace \ + 'cowthink -f ' \ + '${cowsay}/bin/cowthink -f ' + + substituteInPlace pokemonthink.sh \ + --replace \ + './pokemonsay.sh' \ + "${placeholder "out"}/bin/pokemonsay" + ''; + + installPhase = '' + mkdir -p $out/{bin,share/pokemonsay} + cp pokemonsay.sh $out/bin/pokemonsay + cp pokemonthink.sh $out/bin/pokemonthink + cp pokemons/*.cow $out/share/pokemonsay + ''; + + checkPhase = '' + $out/bin/pokemonsay --list-pokemon + ''; + + meta = with lib; { + description = "Print pokemon in the CLI! An adaptation of the classic cowsay"; + homepage = "https://github.com/HRKings/pokemonsay-newgenerations"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 4c455d6fb2d7b..7fef96dae312e 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -142,6 +142,10 @@ buildPythonPackage rec { "test_install_existing_hooks_no_overwrite" "test_installed_from_venv" "test_uninstall_restores_legacy_hooks" + + # Expects `git commit` to fail when `pre-commit` is not in the `$PATH`, + # but we use an absolute path so it's not an issue. + "test_environment_not_sourced" ]; pythonImportsCheck = [ diff --git a/pkgs/tools/misc/pre-commit/hook-tmpl.patch b/pkgs/tools/misc/pre-commit/hook-tmpl.patch index 1d5fd17274baa..56aa59ef48320 100644 --- a/pkgs/tools/misc/pre-commit/hook-tmpl.patch +++ b/pkgs/tools/misc/pre-commit/hook-tmpl.patch @@ -1,15 +1,17 @@ diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl -index 53d29f9..66a8ad3 100755 +index 53d29f9..9b5dc2c 100755 --- a/pre_commit/resources/hook-tmpl +++ b/pre_commit/resources/hook-tmpl -@@ -10,9 +10,7 @@ ARGS=(hook-impl) +@@ -10,11 +10,4 @@ ARGS=(hook-impl) HERE="$(cd "$(dirname "$0")" && pwd)" ARGS+=(--hook-dir "$HERE" -- "$@") -if [ -x "$INSTALL_PYTHON" ]; then - exec "$INSTALL_PYTHON" -mpre_commit "${ARGS[@]}" -elif command -v pre-commit > /dev/null; then -+if command -v pre-commit > /dev/null; then - exec pre-commit "${ARGS[@]}" - else - echo '`pre-commit` not found. Did you forget to activate your virtualenv?' 1>&2 +- exec pre-commit "${ARGS[@]}" +-else +- echo '`pre-commit` not found. Did you forget to activate your virtualenv?' 1>&2 +- exit 1 +-fi ++exec @pre-commit@/bin/pre-commit "${ARGS[@]}" diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/tools/misc/pridefetch/default.nix index 9a93c6770e815..80fd1b0e9bc2d 100644 --- a/pkgs/tools/misc/pridefetch/default.nix +++ b/pkgs/tools/misc/pridefetch/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, python3, zip }: let - version = "1.0.0"; - sha256 = "sha256-/o4er8bO/3HUFXzP+sC+5DYv9EwmxW05o1RT5fEulEg="; + version = "1.1.0"; + sha256 = "sha256-563xOz63vto19yuaHtReV1dSw6BgNf+CLtS3lrPnaoc="; pname = "pridefetch"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index ccef6ee293d35..e894827ac337b 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -14,22 +14,24 @@ , CoreText , Security , fira-code +, fontconfig +, harfbuzz }: rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "sha256-yhs9BEMMFUtptd0cLsaUW02QZVhztvn8cB0nUqPnO+Y="; + sha256 = "sha256-RuzaRJr1n21MbHSeHBt8CjEm5AwbDbvX9Nw5PeBTl+w="; }; - cargoSha256 = "sha256-tj5HPE9EGC7JQ3dyeMPPI0/3r/idrShqfbpnVuaEtDk="; + cargoSha256 = "sha256-q+CoXoNZOxDmEJ+q1vPWxBJsfHQiCxAMlCZo8C49aQA="; - buildInputs = [ llvmPackages.libclang expat freetype fira-code ] + buildInputs = [ llvmPackages.libclang expat freetype fira-code fontconfig harfbuzz ] ++ lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ libiconv AppKit CoreText Security ]; @@ -38,10 +40,14 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + preCheck = '' + export HOME=$TMPDIR + ''; + meta = with lib; { description = "Create beautiful image of your source code"; homepage = "https://github.com/Aloxaf/silicon"; license = with licenses; [ mit /* or */ asl20 ]; - maintainers = with maintainers; [ evanjs ]; + maintainers = with maintainers; [ evanjs _0x4A6F ]; }; } diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index a56978e07281b..6992158e73c95 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.1.0"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "sha256-jmQ5QLsy0T2ytq1xYJkLBlEw5NxVTsAN+wckyV+68zg="; + sha256 = "sha256-qzlBgGPzQ3lnTBKVzQ8ZN3fwOcPgeT+GSUWXray4EYw="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index a16440fe4c362..fdee67de119b0 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6YpC6JDBYwP+RHQUYXmgOWUWa7DgvjowhGCpr2bNl4Q="; + sha256 = "sha256-90mh8C52uD68K5o1LE22gkbL1gy6FyMJTiiN9oV/3DE="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoSha256 = "sha256-skNvlifjRHTrJPMjpRv2E+M9/XA+3m6dHbb+gczaYoo="; + cargoSha256 = "sha256-Q1VY9RyHEsQAWRN/upeG5XJxJfrmzj5FQG6GBGrN0xU="; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index ee403eaa8e023..2fffa2ee8cc31 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "tfk8s"; - version = "0.1.7"; + version = "0.1.8"; tag = "v${version}"; src = fetchFromGitHub { owner = "jrhouston"; repo = "tfk8s"; rev = tag; - sha256 = "0mkfggwjrsp0rzh7ll6nmp9kqcw4fl8q81vk67z5mbd276dkyxrb"; + sha256 = "sha256-9k/1PZch5qUlCmD7Y1chw2NL6hKV6mUYAHgR7Sbv/qs="; }; - vendorSha256 = "sha256-6sMPpizrjM/UIxrAI2KQJy9uxzsjZGrSlQXjvL4wkQg="; + vendorSha256 = "sha256-eTADcUW9b6l47BkWF9YLxdcgvMbCzWTjLF28FneJHg8="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/todo/default.nix b/pkgs/tools/misc/todo/default.nix index c11961d0c4296..dc63a1c04b6a7 100644 --- a/pkgs/tools/misc/todo/default.nix +++ b/pkgs/tools/misc/todo/default.nix @@ -1,30 +1,21 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, stdenv -, openssl -}: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, stdenv, openssl }: rustPlatform.buildRustPackage rec { pname = "todo"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "sioodmy"; repo = "todo"; rev = version; - sha256 = "Z3kaCNZyknNHkZUsHARYh3iWWR+v//JhuYoMIrq54Wo="; + sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40="; }; - cargoSha256 = "82xB+9kiLBwCE6yC3tlmgzJJgA1cMDq6Mjc48GBZ9B8="; + cargoSha256 = "B0tecuBx/FFQokhfI6+xpppyG5DD8WS2+MkmPaZfMhI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - preFixup = '' - mv $out/bin/todo-bin $out/bin/todo - ''; meta = with lib; { description = "Simple todo cli program written in rust"; homepage = "https://github.com/sioodmy/todo"; diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/tools/misc/trackma/default.nix index ae63230c5e561..e3d6322b85eb8 100644 --- a/pkgs/tools/misc/trackma/default.nix +++ b/pkgs/tools/misc/trackma/default.nix @@ -24,13 +24,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "trackma"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "z411"; repo = "trackma"; rev = "v${version}"; - sha256 = "sha256-drc39ID4WYBQ/L2py57CB5OkQNfRKNigPQW0Lp8GIMc="; + sha256 = "sha256-BjZw/AYFlTYtgJTDFOALHx1d71ZQsYZ2TXnEUeQVvpw="; fetchSubmodules = true; # for anime-relations submodule }; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index d4c099feb1081..fa17625d592c7 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-q17YR95Iuw2382xDP1xA/X6u7NM6pW4OkJu4FpohtkA="; + sha256 = "sha256-03Y7966xB+3iJ1LSZPiuXMR7krhb6Wiri455ycA50SU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-8/nMf1NHGn4ITPnx5315XdirrMPkRtYd2IV9MvxVVAE="; + hash = "sha256-97yyOZCw4bJMpbH2ubyNtAJa7EwJY0AnPWMiUUzIM0M="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index ebf2f082db028..2fb2f82ba80f1 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -20,10 +20,10 @@ # nix has a problem with the `?` in the feature list # enabling kafka will produce a vector with no features at all , enableKafka ? false - # TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*" + # TODO investigate adding "vrl-cli" and various "vendor-*" # "disk-buffer" is using leveldb TODO: investigate how useful # it would be, perhaps only for massive scale? -, features ? ([ "sinks" "sources" "transforms" "vrl-cli" ] +, features ? ([ "api" "api-client" "sinks" "sources" "transforms" "vrl-cli" ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 8335e37f6e02f..756c474716d56 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-TRuTvaCALQPxilkzSODdeI2P4FuxTGg8UTHkMDiuYTU="; + sha256 = "sha256-m22Bj/Zj72OMZgmmX4cIuhb0JO/K9FopvXi9V9cMqDg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index d06eaeeee5f5d..556d748e69a1c 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wakatime"; - version = "1.55.1"; + version = "1.55.2"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-kfgMkVhiY/ftRtqT56OPHS+qfhFnNY0EJEbQsF9RvLg="; + sha256 = "sha256-Gp4whRxKhZfs0eFxTTrnrtqJAaWGX4ueKKoLUgbz4Ts="; }; vendorSha256 = "sha256-ANRcgeZYtcWGbK8c9KE8joo97d8LKvKA8/A+/rrjOoM="; diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index cb3eeca27af83..9ea514712331a 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -1,7 +1,7 @@ { appimageTools , fetchurl , lib -, libxkbfile +, xorg , udev , wooting-udev-rules }: @@ -26,7 +26,7 @@ appimageTools.wrapType2 rec { pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ udev wooting-udev-rules - libxkbfile + xorg.libxkbfile ]); extraInstallCommands = "mv $out/bin/{${name},${pname}}"; diff --git a/pkgs/tools/misc/wwcd/default.nix b/pkgs/tools/misc/wwcd/default.nix new file mode 100644 index 0000000000000..d18c72a25eeb6 --- /dev/null +++ b/pkgs/tools/misc/wwcd/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromSourcehut +, autoreconfHook +, pkg-config +, check +}: + +stdenv.mkDerivation rec { + pname = "wwcd"; + version = "unstable-2022-02-05"; + + src = fetchFromSourcehut { + owner = "~bitfehler"; + repo = pname; + rev = "cdf70bb18dc60c66c074d4810cb37b9e697811e5"; + sha256 = "sha256-laf1DEtdEs7q+rtp5Y5rb+7AGsKUv5T413CFWJiURWw="; + }; + + autoreconfFlags = "-if"; + nativeBuildInputs = [ + autoreconfHook pkg-config check + ]; + + meta = with lib; { + description = "What would cron do? Read crontab entries from stdin and print time of next execution(s)"; + homepage = "https://git.sr.ht/~bitfehler/wwcd"; + license = licenses.mit; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix new file mode 100644 index 0000000000000..dafff67ecfd2d --- /dev/null +++ b/pkgs/tools/misc/xq/default.nix @@ -0,0 +1,24 @@ +{ lib +, rustPlatform +, fetchCrate +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "xq"; + version = "0.2.39"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-eyQ38Ld/sVI5vvQRohGfu+cXNtS3nTOBwxiO9BqjxhM="; + }; + + cargoSha256 = "sha256-LajK6OaH6uwnwXvOSJCY/oTtAd2+mcFTWghxC5mVAjQ="; + + meta = with lib; { + description = "Pure rust implementation of jq"; + homepage = "https://github.com/MiSawa/xq"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/tools/misc/ytcast/default.nix b/pkgs/tools/misc/ytcast/default.nix new file mode 100644 index 0000000000000..a918f56fbedc1 --- /dev/null +++ b/pkgs/tools/misc/ytcast/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub, }: + +buildGoModule rec { + pname = "ytcast"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "MarcoLucidi01"; + repo = "ytcast"; + rev = "v${version}"; + sha256 = "0f45ai1s4njhcvbv088yn10i3vdvlm6wlfi0ijq5gak1dg02klma"; + }; + + vendorSha256 = null; + ldflags = [ "-X main.progVersion=${version}" ]; + + meta = with lib; { + description = "A tool to cast YouTube videos from the command-line"; + homepage = "https://github.com/MarcoLucidi01/ytcast"; + license = licenses.mit; + maintainers = with maintainers; [ waelwindows ]; + }; +} diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index d1f42cb6e3730..1e371546a520e 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "checkip"; - version = "0.40.4"; + version = "0.41.0"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KGRcHtrmgUN7yi6SmJuckFOUec0Bhgz0iL6AUgdCWVw="; + sha256 = "sha256-n8dKt18Ak+H+6NKMamUaeuaPKylOxFWrLAjMg5iqEdk="; }; vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM="; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 967bb66256dca..95fea4dac0f91 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -3,11 +3,11 @@ , fetchurl , meson , ninja -, gupnp -, gssdp +, gupnp_1_6 +, libsoup_3 +, gssdp_1_6 , pkg-config , gtk3 -, libuuid , gettext , gupnp-av , gtksourceview4 @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.10.3"; + version = "0.12.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RX9Nkjk1sHhBXNK6iNeNtgB5tyWSa37hBuRWXv4yBN4="; + sha256 = "XqdgfuNlZCxVWSf+3FteH+COdPBh0MPrCL2QG16yAII="; }; nativeBuildInputs = [ @@ -33,13 +33,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gupnp - libuuid - gssdp + gupnp_1_6 + libsoup_3 + gssdp_1_6 gtk3 gupnp-av gtksourceview4 - gnome.adwaita-icon-theme ]; passthru = { diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 88a0d0a180f0c..e03e013f9ba0a 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -1,14 +1,20 @@ { stdenv , lib , fetchurl + +# build time , autoreconfHook , pkg-config + +# runtime , boost -, botan2 , libmysqlclient , log4cplus +, openssl , postgresql , python3 + +# tests , nixosTests }: @@ -21,16 +27,25 @@ stdenv.mkDerivation rec { sha256 = "sha256-2n2QymKncmAtrG535QcxkDhCKJWtaO6xQvFIfWfVMdI="; }; - patches = [ ./dont-create-var.patch ]; + patches = [ + ./dont-create-var.patch + ]; postPatch = '' substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc" ''; + outputs = [ + "out" + "doc" + "man" + ]; + configureFlags = [ "--enable-perfdhcp" "--enable-shell" "--localstatedir=/var" + "--with-openssl=${lib.getDev openssl}" "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config" "--with-pgsql=${postgresql}/bin/pg_config" ]; @@ -38,20 +53,31 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config + ] ++ (with python3.pkgs; [ + sphinxHook + sphinx-rtd-theme + ]); + + sphinxBuilders = [ + "html" + "man" ]; + sphinxRoot = "doc/sphinx"; buildInputs = [ boost - botan2 libmysqlclient log4cplus + openssl python3 ]; enableParallelBuilding = true; passthru.tests = { - inherit (nixosTests) kea systemd-networkd-ipv6-prefix-delegation; + kea = nixosTests.kea; + prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation; + prometheus-exporter = nixosTests.prometheus-exporters.kea; }; meta = with lib; { diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 76459d6d82d08..4561661df5a09 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, fetchpatch , glib, udev, libgudev, polkit, ppp, gettext, pkg-config, python3 , libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: @@ -12,6 +13,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-FiVfginu6y3+y43RNwNg1G8QFeyF5vulwcvZ9DcdZes="; }; + patches = [ + # Fix tests with GLib 2.73.2 + # https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/601 + (fetchpatch { + url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/79a5a4eed2189ea87d25cbe00bc824a2572cad66.patch"; + sha256 = "egGXkCzAMyqPjeO6ro23sdTddTDEGJUkV7rH8sSlSGE="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/51a333cd9a6707de7c623fd4c94cb6032477572f.patch"; + sha256 = "1XyJ0GBmpBRwnsKPI4i/EBrF7W08HelL/PMDwmlQWcw="; + }) + ]; + nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index e8d4134f1b452..2d44895bdb870 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-phFkMJlzNUw5IrjXcAIGSWiGuRismNDuOQFqc5jJU5s="; + sha256 = "sha256-M+zuC0S1dbCC7udgnXe5Ksm4XbLRJoH9StinShDkDMU="; }; - vendorSha256 = "sha256-VyYw8Hp2qWoRBeOFsgtxmvFN2cYzuDeYmWAwC/+vjI0="; + vendorSha256 = "sha256-+jJUKp2EvtDxGsv+9B+s7FiIopvO8yH9jldeRZkrd20="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 00e68176c1072..5db28c427d1ed 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "libnma"; - version = "1.8.40"; + version = "1.10.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "hwp1+NRkHtDZD4Nq6m/1ESJL3pf/1W1git4um1rLKyI="; + sha256 = "T8PZxAS3sTMD2TlPlpYcUpjXGvqfH6evXk8PboQqCUA="; }; patches = [ diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index 93fd87b005b58..6b05dcdcd854a 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -6,7 +6,7 @@ , gnome , gtk3 , gtk4 -, intltool +, gettext , libnma , libnma-gtk4 , libsecret @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { pname = "NetworkManager-sstp"; - version = "1.3.0"; + version = "1.3.1"; name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "+IJw3jvOYs/+NDS9HvCrSQ6wxh1x1yqwiFij7UZb+rU="; + sha256 = "fQMSawiaCk/2ZeMHVVcM7PaFEKbP7bUS9Lh+htrGHX0="; }; nativeBuildInputs = [ file - intltool + gettext pkg-config ]; diff --git a/pkgs/tools/networking/phodav/2.0.nix b/pkgs/tools/networking/phodav/2.0.nix new file mode 100644 index 0000000000000..fa809d0595918 --- /dev/null +++ b/pkgs/tools/networking/phodav/2.0.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, libsoup +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "phodav"; + version = "2.5"; + + outputs = [ "out" "dev" "lib" ]; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; + sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; + }; + + patches = [ + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/ae9ac98c1b3db26070111661aba02594c62d2cef.patch"; + sha256 = "sha256-jIHG6aRqG00Q6aIQsn4tyQdy/b6juW6QiUPXLmIc3TE="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/560ab5ca4f836d82bddbbe66ea0f7c6b4cab6b3b.patch"; + sha256 = "sha256-2gP579qhEkp7fQ8DBGYbZcjb2Tr+WpJs30Z7lsQaz2g="; + }) + ]; + + mesonFlags = [ + "-Davahi=disabled" + "-Dsystemd=disabled" + "-Dgtk_doc=disabled" + "-Dudev=disabled" + ]; + + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + libsoup + ]; + + meta = with lib; { + description = "WebDav server implementation and library using libsoup 2"; + homepage = "https://wiki.gnome.org/phodav"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index fb2fce8bdeb12..7a3ce12b55fb2 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -1,48 +1,50 @@ -{ lib -, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , pkg-config -, libsoup +, libsoup_3 +, libxml2 , meson , ninja +, gnome }: -let - version = "2.5"; -in stdenv.mkDerivation rec { pname = "phodav"; - inherit version; + version = "3.0"; + + outputs = [ "out" "dev" "lib" ]; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; - sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; + url = "mirror://gnome/sources/phodav/${version}/phodav-${version}.tar.xz"; + sha256 = "OS7C0G1QMA3P8e8mmiqYUwTim841IAAvyiny7cHRONE="; }; - patches = [ - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/ae9ac98c1b3db26070111661aba02594c62d2cef.patch"; - sha256 = "sha256-jIHG6aRqG00Q6aIQsn4tyQdy/b6juW6QiUPXLmIc3TE="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/phodav/-/commit/560ab5ca4f836d82bddbbe66ea0f7c6b4cab6b3b.patch"; - sha256 = "sha256-2gP579qhEkp7fQ8DBGYbZcjb2Tr+WpJs30Z7lsQaz2g="; - }) + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + libsoup_3 + libxml2 ]; mesonFlags = [ "-Davahi=disabled" - "-Dsystemd=disabled" + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dgtk_doc=disabled" - "-Dudev=disabled" + "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" ]; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; - nativeBuildInputs = [ libsoup pkg-config meson ninja ]; - - outputs = [ "out" "dev" "lib" ]; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; # We need to do this in pre-configure before the data/ folder disappears. preConfigure = '' @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "WebDav server implementation and library using libsoup"; homepage = "https://wiki.gnome.org/phodav"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix new file mode 100644 index 0000000000000..ef54fba8a0e2a --- /dev/null +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pritunl-client"; + version = "1.3.3300.95"; + + src = fetchFromGitHub { + owner = "pritunl"; + repo = "pritunl-client-electron"; + rev = version; + sha256 = "sha256-kPZFfKdiIq45/uyfsllUJrCphfUV5VX5QwaEg8351GI="; + }; + + modRoot = "cli"; + vendorSha256 = "sha256-fI2RIzvfbqBgchsvY8hsiecXYItM2XX9h8oiP3zmfTA="; + + postInstall = '' + mv $out/bin/cli $out/bin/pritunl-client + ''; + + meta = with lib; { + description = "Pritunl OpenVPN client CLI"; + homepage = "https://github.com/pritunl/pritunl-client-electron/tree/master/cli"; + license = licenses.unfree; + maintainers = with maintainers; [ bigzilla ]; + }; +} diff --git a/pkgs/tools/networking/ripe-atlas-tools/default.nix b/pkgs/tools/networking/ripe-atlas-tools/default.nix index 5ca1cd41065d8..0c415c65b8ea3 100644 --- a/pkgs/tools/networking/ripe-atlas-tools/default.nix +++ b/pkgs/tools/networking/ripe-atlas-tools/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { ]; preBuild = '' - echo "RIPE Atlas Tools [NixOS ${lib.trivial.version}] ${version}" > ripe/atlas/tools/user-agent + echo "RIPE Atlas Tools [NixOS ${version}" > ripe/atlas/tools/user-agent ''; postInstall = '' diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 472c699a3d8c7..4142e2323ff74 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { markdown2 matrix-client minidb - pushbullet + pushbullet-py pycodestyle pyppeteer pyyaml diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/tools/nix/nix-output-monitor/default.nix index a79b41a4a5ddc..e0bde4d99119c 100644 --- a/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/pkgs/tools/nix/nix-output-monitor/default.nix @@ -10,9 +10,8 @@ testTarget = "unit-tests"; buildTools = [installShellFiles]; postInstall = '' - substitute "exe-sh/nom-build" "$out/bin/nom-build" \ - --replace 'unbuffer' '${expect}/bin/unbuffer' \ - --replace 'nom' "$out/bin/nom" + ln -s nom "$out/bin/nom-build" + ln -s nom "$out/bin/nom-shell" chmod a+x $out/bin/nom-build installShellCompletion --zsh --name _nom-build completions/completion.zsh ''; diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix index c95b839b4f635..922a7f4e39942 100644 --- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix +++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix @@ -15,6 +15,7 @@ fetchzip, filepath, generic-optics, + hermes-json, HUnit, lib, lock-file, @@ -31,17 +32,16 @@ terminal-size, text, time, - unix, - vector, + typed-process, wcwidth, word8, }: mkDerivation { pname = "nix-output-monitor"; - version = "1.1.3.0"; + version = "2.0.0.0"; src = fetchzip { - url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v1.1.3.0.tar.gz"; - sha256 = "085phr84m0b056mj3c09gzcwv7b1wax7nhsg2qscahfz0q8f4ym7"; + url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.0.tar.gz"; + sha256 = "033582nzyi0hfis062cnz8lgx918lk1bmzfimsd78a9zzxn20frg"; }; isLibrary = true; isExecutable = true; @@ -58,12 +58,12 @@ mkDerivation { extra filepath generic-optics + hermes-json lock-file MemoTrie mtl nix-derivation optics - random relude safe stm @@ -71,8 +71,6 @@ mkDerivation { terminal-size text time - unix - vector wcwidth word8 ]; @@ -89,12 +87,12 @@ mkDerivation { extra filepath generic-optics + hermes-json lock-file MemoTrie mtl nix-derivation optics - random relude safe stm @@ -102,8 +100,7 @@ mkDerivation { terminal-size text time - unix - vector + typed-process wcwidth word8 ]; @@ -120,6 +117,7 @@ mkDerivation { extra filepath generic-optics + hermes-json HUnit lock-file MemoTrie @@ -135,8 +133,6 @@ mkDerivation { terminal-size text time - unix - vector wcwidth word8 ]; diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/tools/package-management/nvd/default.nix index 2a00acff690ce..f2aa6e5f4916e 100644 --- a/pkgs/tools/package-management/nvd/default.nix +++ b/pkgs/tools/package-management/nvd/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { pname = "nvd"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitLab { owner = "khumba"; repo = pname; - # There is a 0.1.2 release but no tag yet - # https://gitlab.com/khumba/nvd/-/issues/7 - rev = "13d3ab1255e0de03693cecb7da9764c9afd5d472"; - sha256 = "1537s7j0m0hkahf0s1ai7bm94xj9fz6b9x78py0dn3cgnl9bfzla"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-kOPcQP2tSym69qSOBwVc2XFO8+uy7bgYIQq4L/orS+A="; }; buildInputs = [ python3 ]; diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index b06454e736c89..6de513ec92b43 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - version = "1.2.0"; +buildGoModule rec { pname = "2fa"; - - goPackagePath = "rsc.io/2fa"; + version = "1.2.0"; src = fetchFromGitHub { owner = "rsc"; @@ -13,10 +11,15 @@ buildGoPackage rec { sha256 = "sha256-cB5iADZwvJQwwK1GockE2uicFlqFMEAY6xyeXF5lnUY="; }; + deleteVendor = true; + vendorSha256 = "sha256-4h/+ZNxlJPYY0Kyu2vDE1pDXxC/kGE5JdnagWVOGzAE="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://rsc.io/2fa"; description = "Two-factor authentication on the command line"; - maintainers = with maintainers; [ rvolosatovs ]; license = licenses.bsd3; + maintainers = with maintainers; [ rvolosatovs ]; }; } diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/tools/security/cariddi/default.nix index 9d3f8f80b18da..cbfcb598f8aad 100644 --- a/pkgs/tools/security/cariddi/default.nix +++ b/pkgs/tools/security/cariddi/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cariddi"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "edoardottt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e6mB1Z/PqxD3TbcfoPpWUrgDebcD+nadiTtx3reGqvk="; + sha256 = "sha256-OW6AdT2sF85WrICHiYMBLRT1lUQSgNNsXvCCs4xQceE="; }; vendorSha256 = "sha256-mXzI3NF1afMvQ4STPpbehoarfOT35P01IotXPVYNnio="; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index badb6659c99fe..0389ad3c52b09 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.44.0"; + version = "3.45.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-ztkegcsMofCznNQpK8sfXvd+1CTfAs56S0SdbRIPpfE="; + sha256 = "sha256-kQio3l50gjPfywUpeTEt4Xon1p07XpgStNSmICPboXQ="; }; vendorSha256 = "sha256-evG1M0ZHfn9hsMsSncwxF5Hr/VJ7y6Ir0D2gHJaunBo="; diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 9850d317971c1..ed8ebf669c3df 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.14.1"; + version = "8.15.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UHl+bb7Szw+gB5oy0Wsc2fhEniXNnuIXFtV62kJy3f8="; + sha256 = "sha256-KqShYaUODClKkbLs3jaj55WXy9HyyBzvY5KdNOqEXPE="; }; vendorSha256 = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; diff --git a/pkgs/tools/security/gitsign/default.nix b/pkgs/tools/security/gitsign/default.nix index 9e741aff8bdec..f6d61ce25e09e 100644 --- a/pkgs/tools/security/gitsign/default.nix +++ b/pkgs/tools/security/gitsign/default.nix @@ -1,19 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, stdenv, makeWrapper, gitMinimal }: buildGoModule rec { pname = "gitsign"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jL39U7kmdy5lo/caetpFlFCLfby6ftMWDMPq6yt3nUk="; + sha256 = "sha256-hDVn7ZiZoY0FSgIsApZliMIq1xjuNdg+DMvKzP5kET0="; }; - vendorSha256 = "sha256-9tmENlR3vVELmT7JWcz7RhtIji7go2V/Bsu9nMrvHfs="; + vendorSha256 = "sha256-5hVcul5DlHZ0Gtw1LdBmxGpsmuD2bTtwPGysOUwe2k0="; + + nativeBuildInputs = [ makeWrapper ]; ldflags = [ "-s" "-w" "-buildid=" "-X github.com/sigstore/gitsign/pkg/version.gitVersion=${version}" ]; + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ gitMinimal ]} + done + ''; + meta = { homepage = "https://github.com/sigstore/gitsign"; changelog = "https://github.com/sigstore/gitsign/releases/tag/v${version}"; diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index e11e76cc971b0..2dda2d59da803 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -1,20 +1,20 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "gobuster"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "OJ"; repo = "gobuster"; rev = "v${version}"; - sha256 = "0nal2g5c6z46x6337yh0s6mqgnsigp91i7mp1l3sa91p5ihk71wr"; + hash = "sha256-rTduDHGo5V40OlBnwncSzCNYGsHg0uXnuI8JSwOqCSY="; }; - vendorSha256 = "1isp2jd6k4ppns5zi9irj09090imnc0xp6vcps135ymgp8qg4163"; + vendorHash = "sha256-OYQTVu3L2VxOMIYKMHmjiPCKU15RopLz0KL5+7Zb9WY="; meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index c86fcb7ace57b..59f7a6667068e 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "nsjail"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "google"; repo = "nsjail"; rev = version; fetchSubmodules = true; - sha256 = "sha256-ICJpD7iCT7tLRX+52XvayOUuO1g0L0jQgk60S2zLz6c="; + sha256 = "sha256-SFRnCEPawMKEIdmrOnJ45IIb17W1d4qCceuRdWTDTQU="; }; nativeBuildInputs = [ autoconf bison flex libtool pkg-config which installShellFiles ]; diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index dff64d7f18551..c8a1f730e049a 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "pass-genphrase"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { dontBuild = true; + buildInputs = [ python3 ]; + installTargets = [ "globalinstall" ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/security/please/default.nix b/pkgs/tools/security/please/default.nix new file mode 100644 index 0000000000000..40640ba4ed87e --- /dev/null +++ b/pkgs/tools/security/please/default.nix @@ -0,0 +1,50 @@ +{ lib +, rustPlatform +, fetchFromGitLab +, installShellFiles +, pam +, nixosTests +}: + +rustPlatform.buildRustPackage rec { + pname = "please"; + version = "0.5.3"; + + src = fetchFromGitLab { + owner = "edneville"; + repo = "please"; + rev = "v${version}"; + hash = "sha256-YL0yKIDoFD6Q5gVXOjHiqH2ub7jlhlE/uDKLK1FlE74="; + }; + + cargoHash = "sha256-noZsnFL6G1KcxGY0sn0PvY5nIdx5aOAMErMViIY/7bE="; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ pam ]; + + patches = [ ./nixos-specific.patch ]; + + postInstall = '' + installManPage man/* + ''; + + passthru.tests = { inherit (nixosTests) please; }; + + meta = with lib; { + description = "A polite regex-first sudo alternative"; + longDescription = '' + Delegate accurate least privilege access with ease. Express easily with a + regex and expose only what is needed and nothing more. Or validate file + edits with pleaseedit. + + Please is written with memory safe rust. Traditional C memory unsafety is + avoided, logic problems may exist but this codebase is relatively small. + ''; + homepage = "https://www.usenix.org.uk/content/please.html"; + changelog = "https://github.com/edneville/please/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/please/nixos-specific.patch b/pkgs/tools/security/please/nixos-specific.patch new file mode 100644 index 0000000000000..926f815cbfb4d --- /dev/null +++ b/pkgs/tools/security/please/nixos-specific.patch @@ -0,0 +1,13 @@ +diff --git i/src/lib.rs w/src/lib.rs +index fdd69f2..07c794e 100644 +--- i/src/lib.rs ++++ w/src/lib.rs +@@ -1667,7 +1667,7 @@ pub fn search_path(binary: &str) -> Option<String> { + } + } + +- for dir in "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin".split(':') { ++ for dir in "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin".split(':') { + let path_name = format!("{}/{}", &dir, &binary); + let p = Path::new(&path_name); + diff --git a/pkgs/tools/security/ruler/default.nix b/pkgs/tools/security/ruler/default.nix new file mode 100644 index 0000000000000..b6505533aa825 --- /dev/null +++ b/pkgs/tools/security/ruler/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ruler"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "sensepost"; + repo = pname; + rev = version; + hash = "sha256-cEYpK1LB9b65xr6MCMax1vUtSWefjJdXNs4sPgx65d0="; + }; + + vendorHash = "sha256-ITd3cvZmRBWK3922dDRvNHNH8KzHoVfIQI6S318ibxA="; + + meta = with lib; { + description = "Tool to abuse Exchange services"; + homepage = "https://github.com/sensepost/ruler"; + license = with licenses; [ cc-by-nc-40 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index d732ae9a07c62..9789fa3b09ae9 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.0"; + version = "2.36.1"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-Mux0n8uBnh9R+llA/XAVsfcDWIDxoaQkkSuhoSpIhl4="; + sha256 = "sha256-3kBxMC+xXienHOu6YnJNCXd9Tc8rF5WUQF827GkauhQ="; }; vendorSha256 = "sha256-cxfanKv25U8U6FQ1YfOXghAR8GYQB9PN0TkfLzG4UbI="; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index fd8f714e22853..e3016eacf7141 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.11.4"; + version = "1.12.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-t7mcnXOBP5fTnYVTLVfA2HOynKri88tQdkyl6p83aFQ="; + sha256 = "sha256-c2MIX4uDbHuiuZr12SkUV6jLsx2PS3Q+NngacT7AQO0="; }; - vendorSha256 = "sha256-4WbNrFK80uQPUrTvNHBRAYynqpOxAolj1t6XJ0Bb8I4="; + vendorSha256 = "sha256-BPIUIy1xEUzbh1ESldiOhDpYp4EdfUi/QkBNqk3U1UY="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index ccde88230463d..18a4036446022 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.11.4"; + version = "1.12.0"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-+txLeWsk63rj1iWOI3p9oP2aAEY/VYbvMOYtGQ6gHV8="; - aarch64-linux = "sha256-py8HF4uydQIIW1zu5W2c1VF6Dtp4yw+hUs8fPjIa7YQ="; - i686-linux = "sha256-87dmhr2HEBqjPDd4SrVGH5Fw7Rar9HqWxNRMK8Vg9yY="; - x86_64-darwin = "sha256-AsVYI5uM9b5NIaf0Qkb5/zbJ0WYxROBIa0nvbX08OcI="; - aarch64-darwin = "sha256-2Fqk5C9who8tV7+OnVODcK5DyJjE6V5akIR4oNhDQlA="; + x86_64-linux = "sha256-khDTpgezINAIZ8YFhOGoTSe6qzA6bkyhyX25VgcFAhU="; + aarch64-linux = "sha256-XOiuH9KmwXz8sR9FzH+wEIg0xzrMAIZaHVHf3TdJp10="; + i686-linux = "sha256-jCXQX04/Q1dHCIEcFlq60ICib/kjM8bE8ZKjF+0YPjE="; + x86_64-darwin = "sha256-fQaHI0ySer6lRdaEcNl7GN51IP+F5y/FR99Q66LQl3k="; + aarch64-darwin = "sha256-ME1u/g3l5Jqwvk9Qw4tTmbIvHOKkPMRayhRgPbZIYnA="; }; in fetchzip { @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { homepage = "https://www.vaultproject.io"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; - maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick ]; + maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick mkaito ]; mainProgram = "vault"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; }; diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/tools/system/jsvc/default.nix index fe53c368c90ba..e0c1ebee90b43 100644 --- a/pkgs/tools/system/jsvc/default.nix +++ b/pkgs/tools/system/jsvc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jsvc"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; - sha256 = "sha256-SSc3ocubCfBjZtyUHpCE6rDkF7UtAAWsUIa9fQ1gHts="; + sha256 = "sha256-Xd6J/TOGCDAtBl3baKJnOYnztJH+C+L2+e9RC0BUqEw="; }; buildInputs = [ commonsDaemon ]; diff --git a/pkgs/tools/system/rocm-smi/cmake.patch b/pkgs/tools/system/rocm-smi/cmake.patch new file mode 100644 index 0000000000000..2634ea46a1f82 --- /dev/null +++ b/pkgs/tools/system/rocm-smi/cmake.patch @@ -0,0 +1,89 @@ +diff --git a/rocm_smi-backward-compat.cmake b/rocm_smi-backward-compat.cmake +index aa8fd9c..59afce5 100644 +--- a/rocm_smi-backward-compat.cmake ++++ b/rocm_smi-backward-compat.cmake +@@ -72,7 +72,12 @@ function(generate_wrapper_header) + set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") + #set #include statement + get_filename_component(file_name ${header_file} NAME) +- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${ROCM_SMI}/${file_name}\"\n") ++ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") ++ else() ++ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") ++ endif() ++ set(include_statements "${include_statements}#include \"${include_dir}/${ROCM_SMI}/${file_name}\"\n") + configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${RSMI_WRAPPER_INC_DIR}/${file_name}) + unset(include_guard) + unset(include_statements) +@@ -90,7 +95,12 @@ function(generate_wrapper_header) + set(include_guard "${include_guard}COMGR_WRAPPER_INCLUDE_${INC_GAURD_NAME}_H") + #set #include statement + get_filename_component(file_name ${header_file} NAME) +- set(include_statements "${include_statements}#include \"../../../${CMAKE_INSTALL_INCLUDEDIR}/${OAM_TARGET_NAME}/${file_name}\"\n") ++ if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(include_dir "${CMAKE_INSTALL_INCLUDEDIR}") ++ else() ++ set(include_dir "../../../${CMAKE_INSTALL_INCLUDEDIR}") ++ endif() ++ set(include_statements "${include_statements}#include \"${include_dir}/${OAM_TARGET_NAME}/${file_name}\"\n") + configure_file(${RSMI_WRAPPER_DIR}/header.hpp.in ${OAM_WRAPPER_INC_DIR}/${file_name}) + unset(include_guard) + unset(include_statements) +@@ -123,11 +133,16 @@ function(create_library_symlink) + set(library_files "${LIB_RSMI}") + endif() + ++ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) ++ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") ++ else() ++ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") ++ endif() + foreach(file_name ${library_files}) + add_custom_target(link_${file_name} ALL + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E create_symlink +- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) ++ ${install_libdir}/${file_name} ${RSMI_WRAPPER_LIB_DIR}/${file_name}) + endforeach() + + file(MAKE_DIRECTORY ${OAM_WRAPPER_LIB_DIR}) +@@ -151,11 +166,16 @@ function(create_library_symlink) + set(library_files "${LIB_OAM}") + endif() + ++ if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) ++ set(install_libdir "${CMAKE_INSTALL_LIBDIR}") ++ else() ++ set(install_libdir "../../${CMAKE_INSTALL_LIBDIR}") ++ endif() + foreach(file_name ${library_files}) + add_custom_target(link_${file_name} ALL + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E create_symlink +- ../../${CMAKE_INSTALL_LIBDIR}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) ++ ${install_libdir}/${file_name} ${OAM_WRAPPER_LIB_DIR}/${file_name}) + endforeach() + + endfunction() +diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt +index c594eeb..d3ed39d 100755 +--- a/rocm_smi/CMakeLists.txt ++++ b/rocm_smi/CMakeLists.txt +@@ -105,10 +105,15 @@ endif () + #file reorganization changes + #rocm_smi.py moved to libexec/rocm_smi. so creating rocm-smi symlink + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) ++if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBEXECDIR}) ++ set(install_libexecdir "${CMAKE_INSTALL_LIBEXECDIR}") ++else() ++ set(install_libexecdir "../${CMAKE_INSTALL_LIBEXECDIR}") ++endif() + add_custom_target(link-rocm-smi ALL + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E create_symlink +- ../${CMAKE_INSTALL_LIBEXECDIR}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) ++ ${install_libexecdir}/${ROCM_SMI}/rocm_smi.py ${CMAKE_CURRENT_BINARY_DIR}/bin/rocm-smi) + + ## Add the install directives for the runtime library. + install(TARGETS ${ROCM_SMI_TARGET} diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 8f7859be7dcb2..7f3f1ef03531d 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,37 +2,18 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${version}"; - hash = "sha256-D3ZH6xJe2C9rUCsJPOf9QlStecU90/iYi4wrXVvPff0="; + hash = "sha256-UbGbkH2vhQ9gv3sSoG+mXap+MdcrP61TN5DcP5F/5nQ="; }; nativeBuildInputs = [ cmake wrapPython ]; - postPatch = '' - # Upstream ROCm is installed in an /opt directory. For this reason, - # it does not completely follow FHS layout, creating top-level - # rocm_smi, oam, and bindings top-level directories. Since rocm-smi - # is a package that is typically installed, we change the paths to - # follow FHS more closely. - - # rocm_smi libraries and headers go into lib and include. Bindings - # go into lib/rocm_smi/bindings. - substituteInPlace rocm_smi/CMakeLists.txt \ - --replace "DESTINATION rocm_smi/" "DESTINATION " \ - --replace "DESTINATION bindings" "DESTINATION lib/rocm_smi/bindings" \ - --replace "../rocm_smi/bindings/rsmiBindings.py" "../lib/rocm_smi/bindings/rsmiBindings.py" \ - --replace 'DESTINATION ''${ROCM_SMI}/' "DESTINATION " - - # oam libraries and headers go into lib and include. - substituteInPlace oam/CMakeLists.txt \ - --replace "DESTINATION oam/" "DESTINATION " \ - --replace 'DESTINATION ''${OAM_NAME}/' "DESTINATION " - ''; + patches = [ ./cmake.patch ]; postInstall = '' wrapPythonProgramsIn $out @@ -49,7 +30,7 @@ stdenv.mkDerivation rec { description = "System management interface for AMD GPUs supported by ROCm"; homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ lovesegfault ]; + maintainers = with maintainers; [ lovesegfault Flakebi ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index 3e156cf3132dc..15baee3c39d12 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "diffstat"; - version = "1.64"; + version = "1.65"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" ]; - sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w="; + sha256 = "sha256-jPJ0JJJt682FkhdVw5FVWSiCRL0QP2LXQNxrg7VXooo="; }; meta = with lib; { diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 305a9c20dde72..ec8b44648e2f9 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.36.1"; + version = "0.37.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-rBqw79+d14XFrInl++Z5+9jhh95OpYU2TgSQv0y/SU0="; + sha256 = "sha256-LwDoIvhZj/1fHg2eWgadwTcegeOKPpY8aCAugLfKtDE="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-soiYqdsBLirJQlVygKgEWGrS+k4NJ7aeIjzgwIbVlew="; + cargoSha256 = "sha256-u4zM4mmYxy1o1FXQ8SjLJB9YFhYI5SbUZH2Wca7Kjmg="; passthru.tests.version = testers.testVersion { package = difftastic; }; diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index 1977fcd4efe86..cf74ace516e8e 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, CoreServices }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = "v${version}"; - hash = "sha256-zXgXgcMF7MOa9Vx3rhv9aavqRCfMcyRLtaWEvYlyaTs="; + hash = "sha256-1w132lpkn0m2ZoMyFKFGjwn9Gd3UDksEKr5vq8l4ANQ="; }; - cargoPatches = [ - # https://github.com/badboy/mdbook-mermaid/pull/23 - (fetchpatch { - name = "update-mdbook-for-rust-1.64.patch"; - url = "https://github.com/badboy/mdbook-mermaid/commit/5a3432d1b28ef9a065dd37aa77b82a3593358793.patch"; - hash = "sha256-NkCxGmRdwJ+jdkgxp5gWfGpgpLpEpKUd44LyPx0kyEE="; - }) - ]; - - cargoHash = "sha256-IkMBnBuobrJzR6+030/Wfbu2ZCjvFnjBV+6sSWdiNUw="; + cargoHash = "sha256-OKE8RcCE4pIRtQDW7KNzUVrNpyZzWg6QHchJg0XWmYQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 87ac39fb56f8a..0b2a4acd0b592 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitea +, fetchFromGitHub , rustPlatform , pkg-config , asciidoctor @@ -14,9 +14,8 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; version = "0.28.0"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "flausch"; + src = fetchFromGitHub { + owner = "lunaryorn"; repo = "mdcat"; rev = "mdcat-${version}"; sha256 = "sha256-l64gRoWYYLbPA0n6vNQf14CCUtnkfMnQdqbetIbWvBU="; @@ -51,7 +50,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "cat for markdown"; - homepage = "https://codeberg.org/flausch/mdcat"; + homepage = "https://github.com/lunaryorn/mdcat"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/tools/toml2nix/default.nix b/pkgs/tools/toml2nix/default.nix deleted file mode 100644 index ac4de4eee1440..0000000000000 --- a/pkgs/tools/toml2nix/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by carnix 0.9.7: carnix generate-nix -{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: -with buildRustCrateHelpers; -let inherit (lib.lists) fold; - inherit (lib.attrsets) recursiveUpdate; -in -let crates = cratesIO; in -rec { - toml2nix = crates.crates.toml2nix."0.1.1" deps; - __all = [ (toml2nix {}) ]; - deps.serde."1.0.84" = {}; - deps.toml."0.4.10" = { - serde = "1.0.84"; - }; - deps.toml2nix."0.1.1" = { - toml = "0.4.10"; - }; -} diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index aefb6e647c890..0513035094bd6 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmark"; - version = "2.2.28"; + version = "2.2.30"; src = fetchFromGitHub { owner = "mmarkdown"; repo = "mmark"; rev = "v${version}"; - sha256 = "sha256-3+Wocaoma3dQnrqBcEWcTC+LNmDxssvmiDrir0gANyo="; + sha256 = "sha256-14SGA3a72i+HYptTEpxf4YiLXZzZ1R/t1agvm3ie4g8="; }; - vendorSha256 = "sha256-W1MOjV1P6jV9K6mdj8a+T2UiffgpiOpBKo9BI07UOz0="; + vendorSha256 = "sha256-GjR9cOGLB6URHQi+qcyNbP7rm0+y4wypvgUxgJzIgGQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index d0b40266547e5..b67b6c949d748 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shipyard"; - version = "0.4.12"; + version = "0.4.14"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-WTmkKWYdPfZGMTPsfzT/H6K+ob5zq5akTqf3viNfcW8="; + sha256 = "sha256-uXpFLUTRm0urNd9dAUGqoC3vRkTvZd2kG+C9NkXFt/4="; }; vendorSha256 = "sha256-ATXM3+mi/R+/jS6Ds89J75nDVnc3d8iOGhjD3KQZkkA="; diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/tools/wayland/mpvpaper/default.nix index dbc4a3cdba079..76598f4afea27 100644 --- a/pkgs/tools/wayland/mpvpaper/default.nix +++ b/pkgs/tools/wayland/mpvpaper/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "mpvpaper"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "GhostNaN"; repo = pname; rev = version; - sha256 = "sha256-1+noph6iXM5OSNMFQyta/ttGyZQ6F7bWDQi8W190G5E="; + sha256 = "sha256-0LjIwOY2hBUb0nziD3HLP2Ek5+8v3ntssRFD9eQgWkc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index 6a391a2744511..c42a9cbf9c4f6 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.20.1"; + version = "0.22.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayr-${version}"; - sha256 = "sha256-kHFo5FJMzPRlnYg5iER1ULThhfJ0pY5apJNXPyHrMzE="; + sha256 = "sha256-HThKeuFe4slqakQE1QAfu3SMUL/Gq9DodnAKcU/gTEY="; }; - cargoSha256 = "sha256-Tm+LSL13COfKyH2021oiKme2yO9jurQ/F+U2y9klz18="; + cargoSha256 = "sha256-c13u5EWRrTd9HbL6oLMd4xeQyAncrx5OjzW7FwPIBsE="; patches = [ ./icon-paths.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9a8e934cd8eaa..3be29c104b199 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -49,7 +49,7 @@ mapAliases ({ forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); - _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; # Added 2021-12-03 + _0x0 = throw "0x0 upstream is abandoned and no longer exists: https://gitlab.com/somasis/scripts/"; ### A ### @@ -63,65 +63,80 @@ mapAliases ({ aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22 airtame = throw "airtame has been removed due to being unmaintained"; # Added 2022-01-19 alarm-clock-applet = throw "'alarm-clock-applet' has been abandoned upstream and depends on deprecated GNOME2/GTK2"; # Added 2022-06-16 - alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2022-09-24 - alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2022-09-24 - alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2022-09-24 - alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2022-09-24 - alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2022-09-24 - alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2022-09-24 + aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream"; # Added 2020-11-30 + alsaLib = alsa-lib; # Added 2021-06-09 + alsaOss = alsa-oss; # Added 2021-06-10 + alsaPluginWrapper = alsa-plugins-wrapper; # Added 2021-06-10 + alsaPlugins = alsa-plugins; # Added 2021-06-10 + alsaTools = alsa-tools; # Added 2021-06-10 + alsaUtils = alsa-utils; # Added 2021-06-10 + amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained"; # Added 2020-10-30 aminal = throw "aminal was renamed to darktile"; # Added 2021-09-28 ammonite-repl = throw "'ammonite-repl' has been renamed to/replaced by 'ammonite'"; # Converted to throw 2022-02-22 amuleDaemon = throw "amuleDaemon was renamed to amule-daemon"; # Added 2022-02-11 amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11 + amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09 angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06 ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30 ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 + antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead"; # Added 2020-08-06 antimicroX = antimicrox; # Added 2021-10-31 apple-music-electron = throw "'apple-music-electron' is end of life and has been removed, you can use 'cider' instead"; # Added 2022-10-02 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 + arora = throw "arora has been removed"; # Added 2020-09-09 asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 asn1c = throw "asn1c has been removed: deleted by upstream"; # Added 2022-01-07 asterisk_13 = throw "asterisk_13: Asterisk 13 is end of life and has been removed"; # Added 2022-04-06 + asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed"; # Added 2020-10-07 asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 + aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26 audacity-gtk2 = throw "'audacity-gtk2' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30 - avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2022-09-24 + avldrums-lv2 = x42-avldrums; # Added 2020-03-29 + avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18 awesome-4-0 = awesome; # Added 2022-05-05 aws = throw "aws has been removed: abandoned by upstream. For the AWS CLI maintained by Amazon, see 'awscli' or 'awscli2'"; # Added 2022-09-21 awless = throw "awless has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-05-30 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05; axoloti = throw "axoloti has been removed: abandoned by upstream"; # Added 2022-05-13 azure-vhd-utils = throw "azure-vhd-utils has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 + azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02 ### B ### badtouch = authoscope; # Project was renamed, added 20210626 bar-xft = throw "'bar-xft' has been renamed to/replaced by 'lemonbar-xft'"; # Converted to throw 2022-02-22 bashCompletion = throw "'bashCompletion' has been renamed to/replaced by 'bash-completion'"; # Converted to throw 2022-02-22 - bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2022-09-24 - bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2022-09-24 + bashInteractive_5 = bashInteractive; # Added 2021-08-20 + bash_5 = bash; # Added 2021-08-20 bashburn = throw "bashburn has been removed: deleted by upstream"; # Added 2022-01-07 + bazaar = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 + bazaarTools = throw "bazaar has been deprecated by breezy"; # Added 2020-04-19 bazel_0 = throw "bazel 0 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_0_27 = throw "bazel 0.27 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_0_29 = throw "bazel 0.29 is past end of life as it is not an lts version"; # Added 2022-05-09 bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09 + bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22 beetsExternalPlugins = throw "beetsExternalPlugins has been deprecated, use beetsPackages.$pluginname"; # Added 2022-05-07 beret = throw "beret has been removed"; # Added 2021-11-16 bin_replace_string = throw "bin_replace_string has been removed: deleted by upstream"; # Added 2022-01-07 bird2 = bird; # Added 2022-02-21 bird6 = throw "bird6 was dropped. Use bird instead, which has support for both ipv4/ipv6"; # Added 2022-02-21 bitbucket-cli = throw "bitbucket-cli has been removed: abandoned by upstream"; # Added 2022-03-21 + bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # Added 2021-08-22 blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01 - bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2022-09-24 + bluezFull = bluez; # Added 2019-12-03 + bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10 botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15 - bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2022-09-24 + bpftool = bpftools; # Added 2021-05-03 + brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24 bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22 - bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2022-09-24 + bro = zeek; # Added 2019-09-29 btops = throw "btops has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 btrfsProgs = throw "'btrfsProgs' has been renamed to/replaced by 'btrfs-progs'"; # Converted to throw 2022-02-22 bud = throw "bud has been removed: abandoned by upstream"; # Added 2022-03-14 @@ -129,15 +144,17 @@ mapAliases ({ buttersink = throw "buttersink has been removed: abandoned by upstream"; # Added 2022-04-05 # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) - bitwarden_rs = throw "'bitwarden_rs' has been renamed to/replaced by 'vaultwarden'"; # Converted to throw 2022-09-24 - bitwarden_rs-mysql = throw "'bitwarden_rs-mysql' has been renamed to/replaced by 'vaultwarden-mysql'"; # Converted to throw 2022-09-24 - bitwarden_rs-postgresql = throw "'bitwarden_rs-postgresql' has been renamed to/replaced by 'vaultwarden-postgresql'"; # Converted to throw 2022-09-24 - bitwarden_rs-sqlite = throw "'bitwarden_rs-sqlite' has been renamed to/replaced by 'vaultwarden-sqlite'"; # Converted to throw 2022-09-24 - bitwarden_rs-vault = throw "'bitwarden_rs-vault' has been renamed to/replaced by 'vaultwarden-vault'"; # Converted to throw 2022-09-24 + bitwarden_rs = vaultwarden; + bitwarden_rs-mysql = vaultwarden-mysql; + bitwarden_rs-postgresql = vaultwarden-postgresql; + bitwarden_rs-sqlite = vaultwarden-sqlite; + bitwarden_rs-vault = vaultwarden-vault; blink = throw "blink has been removed from nixpkgs, it was unmaintained and required python2 at the time of removal"; # Added 2022-01-12 + bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies"; # Added 2021-01-02 bsod = throw "bsod has been removed: deleted by upstream"; # Added 2022-01-07 + btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # Added 2020-11-03 buildPerlPackage = throw "'buildPerlPackage' has been renamed to/replaced by 'perlPackages.buildPerlPackage'"; # Converted to throw 2022-02-22 buildkite-agent3 = throw "'buildkite-agent3' has been renamed to/replaced by 'buildkite-agent'"; # Converted to throw 2022-02-22 bundler_HEAD = throw "'bundler_HEAD' has been renamed to/replaced by 'bundler'"; # Converted to throw 2022-02-22 @@ -147,12 +164,22 @@ mapAliases ({ ### C ### c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10 + caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02 caffe2 = throw "caffe2 has been removed: subsumed under the PyTorch project"; # Added 2022-04-25 + calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13 + calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13 callPackage_i686 = pkgsi686Linux.callPackage; cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22 - catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2022-09-24 + cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11 + cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20 + casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; + catfish = xfce.catfish; # Added 2019-12-22 + ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12 + cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs"; # Added 2020-06-05 checkbashism = throw "'checkbashism' has been renamed to/replaced by 'checkbashisms'"; # Converted to throw 2022-02-22 + chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 + chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11 @@ -176,30 +203,44 @@ mapAliases ({ clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05 - claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-09-24 + claws-mail-gtk3 = claws-mail; # Added 2021-07-10 clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22 cldr-emoji-annotation = throw "'cldr-emoji-annotation' has been removed, as it was unmaintained; use 'cldr-annotations' instead"; # Added 2022-04-03 clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15 clementineUnfree = throw "clementineUnfree has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22 - codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2022-09-24 + cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05 + codimd = hedgedoc; # Added 2020-11-29 inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17 - compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2022-09-24 + compton = picom; # Added 2019-12-02 compton-git = throw "'compton-git' has been renamed to/replaced by 'compton'"; # Converted to throw 2022-02-22 - concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2022-09-24 + concurrencykit = libck; # Added 2021-03 conntrack_tools = throw "'conntrack_tools' has been renamed to/replaced by 'conntrack-tools'"; # Converted to throw 2022-02-22 container-linux-config-transpiler = throw "container-linux-config-transpiler is deprecated and archived by upstream"; # Added 2022-04-05 cool-old-term = throw "'cool-old-term' has been renamed to/replaced by 'cool-retro-term'"; # Converted to throw 2022-02-22 corsmisc = throw "corsmisc has been removed (upstream is gone)"; # Added 2022-01-24 + 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 coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12 corgi = throw "corgi has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02 cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22 + cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30 cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 crafty = throw "crafty has been removed: deleted by upstream"; # Added 2022-01-07 + cryptol = throw "cryptol was removed due to prolonged broken build"; # Added 2020-08-21 cryptpad = throw "cryptpad has been removed, because it was unmaintained in nixpkgs"; # Added 2022-07-04 ctl = throw "ctl has been removed: abandoned by upstream"; # Added 2022-05-13 # CUDA Toolkit + cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudatoolkit_9 = throw "cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_0 = throw "cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_1 = throw "cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 + cudatoolkit_9_2 = throw "cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 cudatoolkit_10 = throw "cudatoolkit_10 has been renamed to cudaPackages_10.cudatoolkit"; # Added 2022-04-04 cudatoolkit_10_0 = throw "cudatoolkit_10_0 has been renamed to cudaPackages_10_0.cudatoolkit"; # Added 2022-04-04 cudatoolkit_10_1 = throw "cudatoolkit_10_1 has been renamed to cudaPackages_10_1.cudatoolkit"; # Added 2022-04-04 @@ -213,9 +254,13 @@ mapAliases ({ cudatoolkit_11_6 = throw "cudatoolkit_11_6 has been renamed to cudaPackages_11_6.cudatoolkit"; # Added 2022-04-04 cudnn = throw "cudnn is now part of cudaPackages*"; # Added 2022-04-04 + cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 + cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # Added 2021-02-14 cudnn_7_4_cudatoolkit_10_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 + cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # Added 2021-02-14 cudnn_7_6_cudatoolkit_10_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_7_6_cudatoolkit_10_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 + cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # Added 2021-02-14 cudnn_8_1_cudatoolkit_10_2 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_8_1_cudatoolkit_11_0 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_8_1_cudatoolkit_11_1 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 @@ -230,6 +275,10 @@ mapAliases ({ cudnn_8_3_cudatoolkit_11_5 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_8_3_cudatoolkit_10 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 cudnn_8_3_cudatoolkit_11 = throw "cudnn* is now part of cudaPackages*"; # Added 2022-04-04 + cudnn_cudatoolkit_9 = throw "cudnn_cudatoolkit_9 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 + cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 cura_stable = throw "cura_stable was removed because it was broken and used Python 2"; # added 2022-06-05 curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04 @@ -243,27 +292,31 @@ mapAliases ({ cutensor_cudatoolkit_11_3 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 cutensor_cudatoolkit_11_4 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 - cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; # Added 2021-11-03 - cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; # Added 2021-11-03 + cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead"; # Added 2020-06-15 + cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; cupsBjnp = throw "'cupsBjnp' has been renamed to/replaced by 'cups-bjnp'"; # Converted to throw 2022-02-22 cups_filters = throw "'cups_filters' has been renamed to/replaced by 'cups-filters'"; # Converted to throw 2022-02-22 curlcpp = throw "curlcpp has been removed, no active maintainers and no usage within nixpkgs"; # Added 2022-05-10 curaByDagoma = throw "curaByDagoma has been removed from nixpkgs, because it was unmaintained and dependent on python2 packages"; # Added 2022-01-12 curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # Added 2021-10-23 cv = throw "'cv' has been renamed to/replaced by 'progress'"; # Converted to throw 2022-02-22 - cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2022-09-24 + cvs_fast_export = cvs-fast-export; # Added 2021-06-10 ### D ### d1x_rebirth = throw "'d1x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 d2x_rebirth = throw "'d2x_rebirth' has been renamed to/replaced by 'dxx-rebirth'"; # Converted to throw 2022-02-22 - dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2022-09-24 + dart_dev = throw "Non-stable versions of Dart have been removed"; # Added 2020-01-15 + dart_old = throw "Non-stable versions of Dart have been removed"; # Added 2020-01-15 + dart_stable = dart; # Added 2020-01-15 dat = nodePackages.dat; dashpay = throw "'dashpay' has been removed because it was unmaintained"; # Added 2022-05-12 dbus_daemon = throw "'dbus_daemon' has been renamed to/replaced by 'dbus.daemon'"; # Converted to throw 2022-02-22 dbus_glib = throw "'dbus_glib' has been renamed to/replaced by 'dbus-glib'"; # Converted to throw 2022-02-22 dbus_libs = throw "'dbus_libs' has been renamed to/replaced by 'dbus'"; # Converted to throw 2022-02-22 dbus_tools = throw "'dbus_tools' has been renamed to/replaced by 'dbus.out'"; # Converted to throw 2022-02-22 + dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20 dd-agent = throw "dd-agent has been removed in favor of the newer datadog-agent"; # Added 2022-04-26 ddar = throw "ddar has been removed: abandoned by upstream"; # Added 2022-03-18 deadbeef-mpris2-plugin = throw "'deadbeef-mpris2-plugin' has been renamed to/replaced by 'deadbeefPlugins.mpris2'"; # Converted to throw 2022-02-22 @@ -271,9 +324,21 @@ mapAliases ({ debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22 debugedit-unstable = debugedit; # Added 2021-11-22 + deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 + deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05 deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 - deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2022-09-24 + deltachat-electron = deltachat-desktop; # added 2021-07-18 + + deluge-1_x = throw '' + Deluge 1.x (deluge-1_x) is no longer supported. + Please use Deluge 2.x (deluge-2_x) instead, for example: + + services.deluge.package = pkgs.deluge-2_x; + + Note that it is NOT possible to switch back to Deluge 1.x after this change. + ''; # Added 2021-08-18 + demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 desktop_file_utils = throw "'desktop_file_utils' has been renamed to/replaced by 'desktop-file-utils'"; # Converted to throw 2022-02-22 devicemapper = throw "'devicemapper' has been renamed to/replaced by 'lvm2'"; # Converted to throw 2022-02-22 @@ -284,8 +349,9 @@ mapAliases ({ disper = throw "disper has been removed: abandoned by upstream"; # Added 2022-03-18 displaycal = throw "displaycal has been removed from nixpkgs, as it hasn't migrated to python3"; # Added 2022-01-12 dmtx = throw "'dmtx' has been renamed to/replaced by 'dmtx-utils'"; # Converted to throw 2022-02-22 - dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2022-09-24 + dnnl = oneDNN; # Added 2020-04-22 docbook5_xsl = throw "'docbook5_xsl' has been renamed to/replaced by 'docbook_xsl_ns'"; # Converted to throw 2022-02-22 + docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12 docbook_xml_xslt = throw "'docbook_xml_xslt' has been renamed to/replaced by 'docbook_xsl'"; # Converted to throw 2022-02-22 doh-proxy = throw "doh-proxy has been removed because upstream abandoned it and its depedencies where removed."; # Added 2022-03-30 docker_compose = throw "'docker_compose' has been renamed to/replaced by 'docker-compose'"; # Converted to throw 2022-02-22 @@ -296,9 +362,12 @@ mapAliases ({ dotnet-netcore = dotnet-runtime; # Added 2021-10-07 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10; + draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14 dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21 + dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22 - dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2022-09-24 + dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07 + dylibbundler = macdylibbundler; # Added 2021-04-24 ### E ### @@ -306,6 +375,8 @@ mapAliases ({ ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 ec2_api_tools = ec2-api-tools; # Added 2021-10-08 ec2-utils = amazon-ec2-utils; # Added 2022-02-01 + elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 + elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 # Electron electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2022-01-06 @@ -323,10 +394,10 @@ mapAliases ({ emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 - emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2022-09-24 - emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-09-24 + emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 + emacsPackagesNgFor = emacsPackagesFor; # Added 2019-08-07 emacsPackagesNgGen = throw "'emacsPackagesNgGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 - emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2022-09-24 + emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22 encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 @@ -335,6 +406,7 @@ mapAliases ({ enyo-doom = enyo-launcher; # Added 2022-09-09 epoxy = libepoxy; # Added 2021-11-11 epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15 + esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09 euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2"; # Added 2022-01-01 @@ -344,94 +416,137 @@ mapAliases ({ ### F ### - fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo_toolkit'"; # Converted to throw 2022-09-24 + 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 fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26 + fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'"; # Added 2021-04-13 feedreader = throw "feedreader is no longer activily maintained since 2019. The developer is working on a spiritual successor called NewsFlash."; # Added 2022-05-03 inherit (luaPackages) fennel; # Added 2022-09-24 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23"; ffmpeg_3 = throw "ffmpeg_3 was removed from nixpkgs, because it was an outdated and insecure release"; # added 2022-01-17 - finger_bsd = bsd-finger; # Added 2022-03-14 - fingerd_bsd = bsd-fingerd; # Added 2022-03-14 + finger_bsd = bsd-finger; + fingerd_bsd = bsd-fingerd; + firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25"; firefox-esr-wrapper = throw "'firefox-esr-wrapper' has been renamed to/replaced by 'firefox-esr'"; # Converted to throw 2022-02-22 firefoxWrapper = throw "'firefoxWrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 + fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 fishfight = jumpy; # Added 2022-08-03 flameGraph = throw "'flameGraph' has been renamed to/replaced by 'flamegraph'"; # Converted to throw 2022-02-22 + flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 + flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 + flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # Added 2021-06-31 flatbuffers_1_12 = throw "FlatBuffers version 1.12 has been removed, because upstream no longer maintains it"; # Added 2022-05-12 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 + flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # Added 2021-01-25 + flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15 + flutter-dev = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions"; # Added 2020-01-15 + flvtool2 = throw "flvtool2 has been removed"; # Added 2020-11-03 fme = throw "fme was removed, because it is old and uses Glade, a discontinued library"; # Added 2022-01-26 - foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2022-09-24 + foldingathome = fahclient; # Added 2020-09-03 font-awesome-ttf = throw "'font-awesome-ttf' has been renamed to/replaced by 'font-awesome'"; # Converted to throw 2022-02-22 + + fontconfig-penultimate = throw '' + fontconfig-penultimate has been removed. + It was a fork of the abandoned fontconfig-ultimate. + ''; # Added 2020-07-21 + + fontconfig_210 = throw '' + fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384 + and has only been used for old fontconfig caches. + ''; + foomatic_filters = throw "'foomatic_filters' has been renamed to/replaced by 'foomatic-filters'"; # Converted to throw 2022-02-22 fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl"; # Added 2021-11-07 + fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # Added 2022-01-15 fuse_exfat = throw "'fuse_exfat' has been renamed to/replaced by 'exfat'"; # Converted to throw 2022-02-22 fuseki = throw "'fuseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. + fwupdate = throw "fwupdate was merged into fwupd"; # Added 2020-05-19 ### G ### - g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2022-09-24 + g4py = python3Packages.geant4; # Added 2020-06-06 + gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 gammy = throw "'gammy' is deprecated upstream and has been replaced by 'gummy'"; # Added 2022-09-03 gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 + gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03 gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22 getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6"; # Added 2022-01-12 gettextWithExpat = throw "'gettextWithExpat' has been renamed to/replaced by 'gettext'"; # Converted to throw 2022-02-22 + gfm = throw "gfm has been removed"; # Added 2021-01-15 giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23 + giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 gitAndTools = self // { - darcsToGit = throw "'gitAndTools.darcsToGit' has been renamed to 'darcs-to-git'"; # Converted to throw 2022-09-24 - gitAnnex = throw "'gitAndTools.gitAnnex' has been renamed to 'git-annex'"; # Converted to throw 2022-09-24 - gitBrunch = throw "'gitAndTools.gitBrunch' has been renamed to 'git-brunch'"; # Converted to throw 2022-09-24 - gitFastExport = throw "'gitAndTools.gitFastExport' has been renamed to 'git-fast-export'"; # Converted to throw 2022-09-24 - gitRemoteGcrypt = throw "'gitAndTools.gitRemoteGcrypt' has been renamed to 'git-remote-gcrypt'"; # Converted to throw 2022-09-24 - svn_all_fast_export = throw "'gitAndTools.svn_all_fast_export' has been renamed to 'svn-all-fast-export'"; # Converted to throw 2022-09-24 - topGit = throw "'gitAndTools.topGit' has been renamed to 'top-git'"; # Converted to throw 2022-09-24 - }; + darcsToGit = darcs-to-git; + gitAnnex = git-annex; + gitBrunch = git-brunch; + gitFastExport = git-fast-export; + gitRemoteGcrypt = git-remote-gcrypt; + svn_all_fast_export = svn-all-fast-export; + topGit = top-git; + }; # Added 2021-01-14 gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # Added 2021-12-07 gitinspector = throw "gitinspector has been removed because it doesn't work with python3"; # Added 2022-01-12 gksu = throw "gksu has been removed"; # Added 2022-01-16 glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22 glimpse = throw "glimpse was removed, as the project was discontinued. You can use gimp instead."; # Added 2022-07-11 - gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2022-09-24 - gmic_krita_qt = throw "'gmic_krita_qt' has been renamed to/replaced by 'gmic-qt-krita'"; # Converted to throw 2022-09-24 + gmailieer = lieer; # Added 2020-04-19 + gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 + gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06 gnome-breeze = throw "gnome-breeze has been removed, use libsForQt5.breeze-gtk instead"; # Added 2022-04-22 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 - gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2022-09-24 + gnome-mpv = celluloid; # Added 2019-08-22 gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15 gnome-themes-standard = throw "'gnome-themes-standard' has been renamed to/replaced by 'gnome-themes-extra'"; # Converted to throw 2022-02-22 - gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2022-09-24 + gnome_user_docs = gnome-user-docs; # Added 2019-11-20 gnome_doc_utils = throw "'gnome_doc_utils' has been renamed to/replaced by 'gnome-doc-utils'"; # Converted to throw 2022-02-22 gnome_themes_standard = throw "'gnome_themes_standard' has been renamed to/replaced by 'gnome-themes-standard'"; # Converted to throw 2022-02-22 - gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2022-09-24 - gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2022-09-24 + + gnuradio-with-packages = gnuradio3_7.override { + extraPackages = lib.attrVals [ + "osmosdr" "ais" "gsm" "nacl" "rds" "limesdr" + ] gnuradio3_7Packages; + }; # Added 2020-10-16 + + gmock = gtest; # moved from top-level 2021-03-14 + + gnome3 = gnome; # Added 2021-05-07 + gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# Added 2020-07-12 gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16 - gnuradio-ais = throw "'gnuradio-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2022-09-24 - gnuradio-gsm = throw "'gnuradio-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2022-09-24 - gnuradio-limesdr = throw "'gnuradio-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2022-09-24 - gnuradio-nacl = throw "'gnuradio-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2022-09-24 - gnuradio-osmosdr = throw "'gnuradio-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2022-09-24 - gnuradio-rds = throw "'gnuradio-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2022-09-24 + gnuradio-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 + gnuradio-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 + gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 + gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 + gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 + gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 gnustep-make = throw "'gnustep-make' has been renamed to/replaced by 'gnustep.make'"; # Converted to throw 2022-02-22 - gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2022-09-24 + gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14 + gobby5 = gobby; # Added 2021-02-01 gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22 gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15 goklp = throw "goklp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 golly-beta = throw "golly-beta has been removed: use golly instead"; # Added 2022-03-21 goimports = throw "'goimports' has been renamed to/replaced by 'gotools'"; # Converted to throw 2022-02-22 + gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 googleAuthenticator = throw "'googleAuthenticator' has been renamed to/replaced by 'google-authenticator'"; # Converted to throw 2022-02-22 googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22 - google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2022-09-24 + google-gflags = gflags; # Added 2019-07-25 + google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 gosca = throw "gosca has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-30 google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16 go-langserver = throw "go-langserver has been replaced by gopls"; # Added 2022-06-30 @@ -440,26 +555,27 @@ mapAliases ({ go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17 - graalvm11 = graalvm11-ce; # Added 2021-10-15 + + graalvm11 = graalvm11-ce; graalvm8-ce = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 graalvm8 = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19 graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 - gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2022-09-24 + gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 - gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2022-09-24 + gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 - gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2022-09-24 - gr-nacl = throw "'gr-nacl' has been renamed to/replaced by 'gnuradio3_7.pkgs.nacl'"; # Converted to throw 2022-09-24 - gr-osmosdr = throw "'gr-osmosdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.osmosdr'"; # Converted to throw 2022-09-24 - gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2022-09-24 + gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 + gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 + gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 + gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16 grv = throw "grv has been dropped due to the lack of maintanence from upstream since 2019"; # Added 2022-06-01 gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22 gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01 - gtmess = throw "gtmess has been removed, because it was a MSN client."; # Added 2021-12-15 + gtmess = throw "gtmess has been removed, because it was a MSN client."; # add 2021-12-15 guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16 guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22 guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16 @@ -476,18 +592,20 @@ mapAliases ({ ### H ### + hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 hardlink = throw "hardlink was merged into util-linux since 2019-06-14."; # Added 2022-08-12 inherit (harePackages) hare harec; # Added 2022-08-10 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 - hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2022-09-24 + hepmc = hepmc2; # Added 2019-08-05 hicolor_icon_theme = throw "'hicolor_icon_theme' has been renamed to/replaced by 'hicolor-icon-theme'"; # Converted to throw 2022-02-22 holdingnuts = throw "holdingnuts was removed from nixpkgs, as the project is no longer developed"; # Added 2022-05-10 holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01 htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 - ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2022-09-24 + ht-rust = xh; # Added 2021-02-13 + hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra_unstable` now"; # Added 2020-04-06 hydra-unstable = hydra_unstable; # added 2022-05-10 hyperspace-cli = throw "hyperspace-cli is out of date, and has been deprecated upstream in favour of using the individual repos instead"; # Added 2022-08-29 @@ -495,34 +613,36 @@ mapAliases ({ i3cat = throw "i3cat has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22 + iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 ical2org = throw "ical2org has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02 icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15 - icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2022-09-24 - icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2022-09-24 + icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 + icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 icu59 = throw "icu59 has been removed, use a more recent version instead"; # Added 2022-05-14 icu65 = throw "icu65 has been removed, use a more recent version instead"; # Added 2022-05-14 idea = throw "'idea' has been renamed to/replaced by 'jetbrains'"; # Converted to throw 2022-02-22 imapproxy = throw "imapproxy has been removed because it did not support a supported openssl version"; # added 2021-12-15 - imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2022-09-24 - imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2022-09-24 - imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2022-09-24 + imagemagick7Big = imagemagickBig; # Added 2021-02-22 + imagemagick7 = imagemagick; # Added 2021-02-22 + imagemagick7_light = imagemagick_light; # Added 2021-02-22 impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27 + i-score = throw "i-score has been removed: abandoned upstream"; # Added 2020-11-21 inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped"; index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 - infiniband-diags = throw "'infiniband-diags' has been renamed to/replaced by 'rdma-core'"; # Converted to throw 2022-09-24 + infiniband-diags = rdma-core; # Added 2019-08-09 ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project"; # Added 2022-01-12 - inotifyTools = throw "'inotifyTools' has been renamed to/replaced by 'inotify-tools'"; # Converted to throw 2022-09-24 + inotifyTools = inotify-tools; intecture-agent = throw "intecture-agent has been removed, because it was no longer maintained upstream"; # added 2021-12-15 intecture-auth = throw "intecture-auth has been removed, because it was no longer maintained upstream"; # added 2021-12-15 intecture-cli = throw "intecture-cli has been removed, because it was no longer maintained upstream"; # added 2021-12-15 interfacer = throw "interfacer is deprecated and archived by upstream"; # Added 2022-04-05 - inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2022-09-24 + inter-ui = inter; # Added 2021-03-27 iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 ipfs = kubo; # Added 2022-09-27 ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 ipfs-migrator = kubo-migrator; # Added 2022-09-27 - iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2022-09-24 + iproute = iproute2; # moved from top-level 2021-03-14 iproute_mptcp = throw "'iproute_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 itch-setup = throw "itch-setup has benn removed, use itch instead"; # Added 2022-06-02 @@ -530,15 +650,22 @@ mapAliases ({ ### J ### - jack2Full = throw "'jack2Full' has been renamed to/replaced by 'jack2'"; # Converted to throw 2022-09-24 + jack2Full = jack2; # moved from top-level 2021-03-14 jami-client-gnome = throw "jami-client-gnome has been removed: abandoned upstream"; # Added 2022-05-15 jami-libclient = throw "jami-libclient has been removed: moved into jami-qt"; # Added 2022-07-29 + jamomacore = throw "jamomacore has been removed: abandoned upstream"; # Added 2020-11-21 + jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # Added 2021-03-15 jbuilder = throw "'jbuilder' has been renamed to/replaced by 'dune_1'"; # Converted to throw 2022-02-22 jd = throw "jd has been dropped due to the lack of maintenance from upstream since 2016"; # Added 2022-06-03 + jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead"; # Julia + julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15 + julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # Added 2021-03-13 + julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15 + julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13 julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02 julia_17-bin = throw "julia_17-bin has been deprecated in favor of the latest stable version"; # Added 2022-09-04 @@ -548,28 +675,35 @@ mapAliases ({ ### K ### k3d = throw "k3d has been removed because it was broken and has seen no release since 2016"; # Added 2022-01-04 + k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-11-06 kafkacat = kcat; # Added 2021-10-07 - kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2022-09-24 + kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # Added 2021-04-11 + kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 + kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 kdiff3-qt5 = throw "'kdiff3-qt5' has been renamed to/replaced by 'kdiff3'"; # Converted to throw 2022-02-22 keepass-keefox = throw "'keepass-keefox' has been renamed to/replaced by 'keepass-keepassrpc'"; # Converted to throw 2022-02-22 keepassx-community = throw "'keepassx-community' has been renamed to/replaced by 'keepassxc'"; # Converted to throw 2022-02-22 keepassx-reboot = throw "'keepassx-reboot' has been renamed to/replaced by 'keepassx-community'"; # Converted to throw 2022-02-22 keepassx2-http = throw "'keepassx2-http' has been renamed to/replaced by 'keepassx-reboot'"; # Converted to throw 2022-02-22 keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01 - kerberos = throw "'kerberos' has been renamed to/replaced by 'libkrb5'"; # Converted to throw 2022-09-24 + kerberos = libkrb5; # moved from top-level 2021-03-14 kexectools = kexec-tools; # Added 2021-09-03 - kexpand = throw "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 + kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 - keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.plasmaMobileGear.keysmith'"; # Converted to throw 2022-09-24 + keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14 kgx = gnome-console; # Added 2022-02-19 - kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2022-09-24 + kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + kicad-with-packages3d = kicad; # Added 2019-11-25 + kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download"; # Added 2021-03-09 + kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned"; # Added 2020-04-28 + kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25 knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned"; # Added 2022-01-01 kodestudio = throw "kodestudio has been removed from nixpkgs, as the nix package has been long unmaintained and out of date."; # Added 2022-06-07 - kodiGBM = throw "'kodiGBM' has been renamed to/replaced by 'kodi-gbm'"; # Converted to throw 2022-09-24 - kodiPlain = throw "'kodiPlain' has been renamed to/replaced by 'kodi'"; # Converted to throw 2022-09-24 - kodiPlainWayland = throw "'kodiPlainWayland' has been renamed to/replaced by 'kodi-wayland'"; # Converted to throw 2022-09-24 + kodiGBM = kodi-gbm; + kodiPlain = kodi; + kodiPlainWayland = kodi-wayland; kodiPlugins = kodiPackages; # Added 2021-03-09; - kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2022-09-24 + kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # Added 2021-03-23 krename-qt5 = throw "'krename-qt5' has been renamed to/replaced by 'krename'"; # Converted to throw 2022-02-22 krita-beta = krita; # moved from top-level 2021-12-23 kube-aws = throw "kube-aws is deprecated and archived by upstream"; # Added 2022-04-05 @@ -580,7 +714,7 @@ mapAliases ({ ### L ### lastfmsubmitd = throw "lastfmsubmitd was removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 - latinmodern-math = throw "'latinmodern-math' has been renamed to/replaced by 'lmmath'"; # Converted to throw 2022-09-24 + latinmodern-math = lmmath; letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22 libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22 @@ -589,8 +723,10 @@ mapAliases ({ libcanberra_gtk2 = throw "'libcanberra_gtk2' has been renamed to/replaced by 'libcanberra-gtk2'"; # Converted to throw 2022-02-22 libcanberra_gtk3 = throw "'libcanberra_gtk3' has been renamed to/replaced by 'libcanberra-gtk3'"; # Converted to throw 2022-02-22 libcap_manpages = throw "'libcap_manpages' has been renamed to/replaced by 'libcap.doc'"; # Converted to throw 2022-02-22 - libcap_pam = throw "'libcap_pam has been renamed to/replaced by 'libcap.pam'"; # Converted to throw 2022-09-24 + libcap_pam = if stdenv.isLinux then libcap.pam else null; # Added 2016-04-29 libcap_progs = throw "'libcap_progs' has been renamed to/replaced by 'libcap.out'"; # Converted to throw 2022-02-22 + libco-canonical = throw "libco-canonical: Canonical deleted the repo, libco-canonical is not used anymore"; # Added 2021-05-16 + libcroco = throw "libcroco has been removed as it's no longer used in any derivations"; # Added 2020-03-04 libdbusmenu-glib = throw "'libdbusmenu-glib' has been renamed to/replaced by 'libdbusmenu'"; # Converted to throw 2022-02-22 libdbusmenu_qt = throw "'libdbusmenu_qt' (Qt4) is deprecated and unused, use 'libsForQt5.libdbusmenu'"; # Added 2022-06-14 libdbusmenu_qt5 = throw "'libdbusmenu_qt5' has been renamed to/replaced by 'libsForQt5.libdbusmenu'"; # Converted to throw 2022-02-22 @@ -605,39 +741,45 @@ mapAliases ({ libgpgerror = libgpg-error; # Added 2021-09-04 libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 - libintlOrEmpty = "'libintlOrEmpty' has been renamed to/replace by 'gettext'"; # Converted to throw 2022-09-24 - libixp_hg = libixp; # Added 2022-04-25 - libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2022-09-24 + libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 + libixp_hg = libixp; + libjpeg_drop = libjpeg_original; # Added 2020-06-05 libjson_rpc_cpp = throw "'libjson_rpc_cpp' has been renamed to/replaced by 'libjson-rpc-cpp'"; # Converted to throw 2022-02-22 libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it"; # Added 2021-11-09 liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22 - liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2022-09-24 + liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 libmicrohttpd_0_9_70 = throw "'libmicrohttpd_0_9_70' has been removed because it is insecure, and has been replaced by 'libmicrohttpd_0_9_69' and 'libmicrohttpd_0_9_71'"; # Added 2022-10-10 libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 libnih = throw "'libnih' has been removed"; # Converted to throw 2022-05-17 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; + libpng_apng = throw "libpng_apng has been removed, because it is equivalent to libpng"; # Added 2021-03-21 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 + libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 - librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-09-24 + librdf = lrdf; # Added 2020-03-22 librecad2 = throw "'librecad2' has been renamed to/replaced by 'librecad'"; # Converted to throw 2022-02-22 libressl_3_2 = throw "'libressl_3_2' has reached end-of-life "; # Added 2022-03-19 librevisa = throw "librevisa has been removed because its website and source have disappeared upstream"; # Added 2022-09-23 - libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2022-09-24 + librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24 + libseat = seatd; # Added 2021-06-24 libspotify = throw "libspotify has been removed because Spotify stopped supporting it"; # added 2022-05-29 + libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used"; # Added 2020-06-22 libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtidy = throw "'libtidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22 - libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2022-09-24 - libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2022-09-24 - libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2022-09-24 + libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 + libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # Added 2020-12-20 + libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # Added 2020-12-20 + libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; + libtxc_dxtn_s2tc = throw "libtxc_dxtn_s2tc was removed 2020-03-16, now integrated in Mesa"; libudev = throw "'libudev' has been renamed to/replaced by 'udev'"; # Converted to throw 2022-02-22 - libungif = throw "'libungif' has been renamed to/replaced by 'giflib'"; # Converted to throw 2022-09-24 - libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2022-09-24 + libungif = giflib; # Added 2020-02-12 + libusb = libusb1; # Added 2020-04-28 libusb1-axoloti = throw "libusb1-axoloti has been removed: axoloti has been removed"; # Added 2022-05-13 libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 - libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2022-09-24 + libwnck3 = libwnck; lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15 lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2"; # Added 2022-01-14 @@ -691,15 +833,38 @@ mapAliases ({ linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; - linuxPackages_xen_dom0 = throw "'linuxPackages_xen_dom0' has been renamed to/replaced by 'linuxPackages'"; # Converted to throw 2022-09-24 - linuxPackages_latest_xen_dom0 = throw "'linuxPackages_latest_xen_dom0' has been renamed to/replaced by 'linuxPackages_latest'"; # Converted to throw 2022-09-24 - linuxPackages_xen_dom0_hardened = throw "'linuxPackages_xen_dom0_hardened' has been renamed to/replaced by 'linuxPackages_hardened'"; # Converted to throw 2022-09-24 - linuxPackages_latest_xen_dom0_hardened = throw "'linuxPackages_latest_xen_dom0_hardened' has been renamed to/replaced by 'linuxPackages_latest_hardened'"; # Converted to throw 2022-09-24 + # Added 2020-04-04 + linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; + linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; + + # Added 2021-04-04 + linuxPackages_xen_dom0 = linuxPackages; + linuxPackages_latest_xen_dom0 = linuxPackages_latest; + linuxPackages_xen_dom0_hardened = linuxPackages_hardened; + linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; - lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2022-09-24 + # Added 2021-08-16 + linuxPackages_latest_hardened = throw '' + The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches + frequently lag behind the upstream kernel. In some cases this meant that this attribute + had to refer to an older kernel[1] because the latest hardened kernel was EOL and + the latest supported kernel didn't have patches. + + If you want to use a hardened kernel, please check which kernel minors are supported + and use a versioned attribute, e.g. `linuxPackages_5_10_hardened'. + + [1] for more context: https://github.com/NixOS/nixpkgs/pull/133587 + ''; + linux_latest_hardened = linuxPackages_latest_hardened; + + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # Added 2020-05-22 + + loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + lobster-two = google-fonts; # Added 2021-07-22 love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 + lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # Added 2021-02-15 lttngTools = throw "'lttngTools' has been renamed to/replaced by 'lttng-tools'"; # Converted to throw 2022-02-22 lttngUst = throw "'lttngUst' has been renamed to/replaced by 'lttng-ust'"; # Converted to throw 2022-02-22 lua5_1_sockets = throw "'lua5_1_sockets' has been renamed to/replaced by 'lua51Packages.luasocket'"; # Converted to throw 2022-02-22 @@ -707,66 +872,83 @@ mapAliases ({ lua5_sec = throw "'lua5_sec' has been renamed to/replaced by 'luaPackages.luasec'"; # Converted to throw 2022-02-22 lumo = throw "lumo has been removed: abandoned by upstream"; # Added 2022-04-25 lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 - lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2022-09-24 + lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 + lzma = xz; # moved from top-level 2021-03-14 ### M ### m3d-linux = throw "'m3d-linux' has been renamed to/replaced by 'm33-linux'"; # Converted to throw 2022-02-22 + mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # Added 2021-08-21 mailpile = throw "mailpile was removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 man_db = throw "'man_db' has been renamed to/replaced by 'man-db'"; # Converted to throw 2022-02-22 manul = throw "manul has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-01 manpages = throw "'manpages' has been renamed to/replaced by 'man-pages'"; # Converted to throw 2022-02-22 + marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 marp = throw "marp has been removed from nixpkgs, as it's unmaintained and has security issues"; # Added 2022-06-04 - matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2022-09-24 + matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 + mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 + matrique = spectral; # Added 2020-01-27 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 + mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # Added 2020-05-23 mcomix3 = mcomix; # Added 2022-06-05 mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04 - meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2022-09-24 + meme = meme-image-generator; # Added 2021-04-21 memtest86 = throw "'memtest86' has been renamed to/replaced by 'memtest86plus'"; # Converted to throw 2022-02-22 mercurial_4 = throw "mercurial_4 has been removed as it's unmaintained"; # Added 2021-10-18 - mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2022-09-24 - metal = throw "metal has been removed due to lack of maintainers"; # Added 2022-06-30 + mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 + mess = mame; # Added 2019-10-30 + metal = throw "metal has been removed due to lack of maintainers"; mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12 midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 mime-types = mailcap; # Added 2022-01-21 mimms = throw "mimms has been removed from nixpkgs as the upstream project is stuck on python2"; # Added 2022-01-01 + minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 + minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # Added 2021-08-13 minetestclient_4 = throw "minetestclient_4 has been removed from Nixpkgs; current version is available at minetest or minetestclient"; # added 2022-02-01 minetestserver_4 = throw "minetestserver_4 has been removed from Nixpkgs; current version is available at minetestserver"; # added 2022-02-01 minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 + mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22 + moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead"; module_init_tools = throw "'module_init_tools' has been renamed to/replaced by 'kmod'"; # Converted to throw 2022-02-22 monero = monero-cli; # Added 2021-11-28 monodevelop = throw "monodevelop has been removed from nixpgks"; # Added 2022-01-15 + mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18 + mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18 mopidy-spotify = throw "mopidy-spotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 mopidy-spotify-tunigo = throw "mopidy-spotify-tunigo has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22 moz-phab = mozphab; # Added 2022-08-09 - mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2022-09-24 - mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2022-09-24 + mozart-binary = mozart2-binary; # Added 2019-09-23 + mozart = mozart2-binary; # Added 2019-09-23 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 - mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2022-09-24 + mpd_clientlib = libmpdclient; # Added 2021-02-11 mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 - mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2022-09-24 - murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2022-09-24 + mumble_git = pkgs.mumble; # Added 2019-08-01 + murmur_git = pkgs.murmur; # Added 2019-08-01 mutt-with-sidebar = mutt; # Added 2022-09-17 - mysql-client = throw "'mysql-client' has been renamed to/replaced by 'mariadb.client'"; # Converted to throw 2022-09-24 - mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2022-09-24 + mysql-client = hiPrio mariadb.client; + mysql = mariadb; # moved from top-level 2021-03-14 - mesa_drivers = throw "'mesa_drivers' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-09-24 + # floating point textures patents are expired, + # so package reduced to alias + mesa_drivers = mesa.drivers; mesa_noglu = throw "'mesa_noglu' has been renamed to/replaced by 'mesa'"; # Converted to throw 2022-02-22 - mpv-with-scripts = throw "'mpv-with-scripts' has been renamed to/replaced by 'self.wrapMpv'"; # Converted to throw 2022-09-24 + mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # Added 2020-05-22 mssys = throw "'mssys' has been renamed to/replaced by 'ms-sys'"; # Converted to throw 2022-02-22 multipath_tools = throw "'multipath_tools' has been renamed to/replaced by 'multipath-tools'"; # Converted to throw 2022-02-22 mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # Added 2021-11-18 mupen64plus1_5 = throw "'mupen64plus1_5' has been renamed to/replaced by 'mupen64plus'"; # Converted to throw 2022-02-22 mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15 + mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative"; # Added 2021-04-15 mysqlWorkbench = throw "'mysqlWorkbench' has been renamed to/replaced by 'mysql-workbench'"; # Converted to throw 2022-02-22 myxer = throw "Myxer has been removed from nixpkgs, as it has been unmaintained since Jul 31, 2021"; # Added 2022-06-08 @@ -777,11 +959,13 @@ mapAliases ({ nccl_cudatoolkit_10 = throw "nccl_cudatoolkit_10 has been renamed to cudaPackages_10.nccl"; # Added 2022-04-04 nccl_cudatoolkit_11 = throw "nccl_cudatoolkit_11 has been renamed to cudaPackages_11.nccl"; # Added 2022-04-04 - net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2022-09-24 - nagiosPluginsOfficial = throw "'nagiosPluginsOfficial' has been renamed to/replaced by 'monitoring-plugins'"; # Converted to throw 2022-09-24 + net_snmp = net-snmp; # Added 2019-12-21 + nagiosPluginsOfficial = monitoring-plugins; + navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 neochat = libsForQt5.plasmaMobileGear.neochat; # added 2022-05-10 + netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 nettools_mptcp = throw "'nettools_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 @@ -789,30 +973,33 @@ mapAliases ({ networkmanager_openconnect = throw "'networkmanager_openconnect' has been renamed to/replaced by 'networkmanager-openconnect'"; # Converted to throw 2022-02-22 networkmanager_openvpn = throw "'networkmanager_openvpn' has been renamed to/replaced by 'networkmanager-openvpn'"; # Converted to throw 2022-02-22 networkmanager_vpnc = throw "'networkmanager_vpnc' has been renamed to/replaced by 'networkmanager-vpnc'"; # Converted to throw 2022-02-22 + neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 nfsUtils = throw "'nfsUtils' has been renamed to/replaced by 'nfs-utils'"; # Converted to throw 2022-02-22 nginxUnstable = throw "'nginxUnstable' has been renamed to/replaced by 'nginxMainline'"; # Converted to throw 2022-02-22 nilfs_utils = throw "'nilfs_utils' has been renamed to/replaced by 'nilfs-utils'"; # Converted to throw 2022-02-22 - nix-direnv-flakes = nix-direnv; # Added 2021-11-09 - nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2022-09-24 - nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2022-09-24 + nix-direnv-flakes = nix-direnv; + nix-review = nixpkgs-review; # Added 2019-12-22 + nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 nixUnstable = nixVersions.unstable; # Added 2022-01-26 - nix_2_3 = nixVersions.nix_2_3; # Added 2022-01-26 - nix_2_4 = nixVersions.nix_2_4; # Added 2022-01-26 - nix_2_5 = nixVersions.nix_2_5; # Added 2022-01-26 - nix_2_6 = nixVersions.nix_2_6; # Added 2022-01-26 + nix_2_3 = nixVersions.nix_2_3; + nix_2_4 = nixVersions.nix_2_4; + nix_2_5 = nixVersions.nix_2_5; + nix_2_6 = nixVersions.nix_2_6; nixopsUnstable = nixops_unstable; # Added 2022-03-03 nixosTest = testers.nixosTest; # Added 2022-05-05 nixui = throw "nixui has been removed from nixpkgs, due to the project being unmaintained"; # Added 2022-05-23 - nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-09-24 + nmap-unfree = nmap; # Added 2021-04-06 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 + nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15 + now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05 ntdb = throw "ntdb has been removed: abandoned by upstream"; # Added 2022-04-21 nxproxy = throw "'nxproxy' has been renamed to/replaced by 'nx-libs'"; # Converted to throw 2022-02-22 @@ -820,27 +1007,35 @@ mapAliases ({ oathToolkit = oath-toolkit; # Added 2022-04-04 oci-image-tool = throw "oci-image-tool is no longer actively maintained, and has had major deficiencies for several years."; # Added 2022-05-14; + oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16 - oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2022-09-24 + oauth2_proxy = oauth2-proxy; # Added 2021-04-18 ocropus = throw "ocropus has been removed: abandoned by upstream"; # Added 2022-04-24 + octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set"; # Added 2021-01-24 + ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # Added 2021-07-12 odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25 + ofp = throw "ofp is not compatible with odp-dpdk"; + olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 opencl-icd = throw "'opencl-icd' has been renamed to/replaced by 'ocl-icd'"; # Converted to throw 2022-02-22 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 - openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2022-09-24 + openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # Added 2021-05-21 + openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22 - openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2022-09-24 - openjpeg_2 = throw "'openjpeg_2' has been renamed to/replaced by 'openjpeg'"; # Converted to throw 2022-09-24 + openisns = open-isns; # Added 2020-01-28 + openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24 + openjpeg_2 = openjpeg; # Added 2021-01-25 openmpt123 = libopenmpt; # Added 2021-09-05 opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 openssl_3_0 = openssl_3; # Added 2022-06-27 - orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2022-09-24 - osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2022-09-24 + orchis = orchis-theme; # Added 2021-06-09 + osxfuse = macfuse-stubs; # Added 2021-03-20 + otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 owncloudclient = throw "'owncloudclient' has been renamed to/replaced by 'owncloud-client'"; # Converted to throw 2022-02-22 ### P ### @@ -849,22 +1044,24 @@ mapAliases ({ p11_kit = throw "'p11_kit' has been renamed to/replaced by 'p11-kit'"; # Converted to throw 2022-02-22 packet-cli = metal-cli; # Added 2021-10-25 - paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2022-09-24 + paperless = paperless-ngx; # Added 2021-06-06 paperless-ng = paperless-ngx; # Added 2022-04-11 - parity = throw "'parity' has been renamed to/replaced by 'openethereum'"; # Converted to throw 2022-09-24 + parity = openethereum; # Added 2020-08-01 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09 pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 pbis-open = throw "pbis-open has been removed, because it is no longer maintained upstream"; # added 2021-12-15 pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project"; # Added 2022-01-01 + pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 + pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 pdfstudio = throw "'pdfstudio' has been replaced with 'pdfstudio<year>', where '<year>' is the year from the PDF Studio version number, because each license is specific to a given year"; # Added 2022-09-04 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 - pgadmin = pgadmin4; # Added 2022-01-14 + pgadmin = pgadmin4; pgadmin3 = throw "pgadmin3 was removed for being unmaintained, use pgadmin4 instead."; # Added 2022-03-30 pgp-tools = throw "'pgp-tools' has been renamed to/replaced by 'signing-party'"; # Converted to throw 2022-02-22 pg_tmp = throw "'pg_tmp' has been renamed to/replaced by 'ephemeralpg'"; # Converted to throw 2022-02-22 @@ -879,20 +1076,55 @@ mapAliases ({ php74Packages = php74; # Added 2022-05-24 php74Extensions = php74; # Added 2022-05-24 - php73Packages = throw "'php73Packages' has been renamed to/replaced by 'php73'"; # Converted to throw 2022-09-24 - php73Extensions = throw "'php73Extensions' has been renamed to/replaced by 'php73'"; # Converted to throw 2022-09-24 - - php73-embed = throw "'php73-embed' has been renamed to/replaced by 'php-embed'"; # Converted to throw 2022-09-24 - php74-embed = throw "'php74-embed' has been renamed to/replaced by 'php-embed'"; # Converted to throw 2022-09-24 - - php73Packages-embed = throw "'php73Packages-embed' has been renamed to/replaced by 'phpPackages-embed'"; # Converted to throw 2022-09-24 - php74Packages-embed = throw "'php74Packages-embed' has been renamed to/replaced by 'phpPackages-embed'"; # Converted to throw 2022-09-24 - - php73-unit = throw "'php73-unit' has been renamed to/replaced by 'php-unit'"; # Converted to throw 2022-09-24 - php74-unit = throw "'php74-unit' has been renamed to/replaced by 'php-unit'"; # Converted to throw 2022-09-24 - - php73Packages-unit = throw "'php73Packages-unit' has been renamed to/replaced by 'phpPackages-unit'"; # Converted to throw 2022-09-24 - php74Packages-unit = throw "'php74Packages-unit' has been renamed to/replaced by 'phpPackages-unit'"; # Converted to throw 2022-09-24 + php73 = throw "php73 has been dropped due to the lack of maintanence from upstream for future releases"; # Added 2021-06-03 + php73Packages = php73; # Added 2021-06-03 + php73Extensions = php73; # Added 2021-06-03 + + php-embed = throw '' + php*-embed has been dropped, you can build something similar + with the following snippet: + php74.override { embedSupport = true; apxs2Support = false; } + ''; # Added 2020-04-01 + php73-embed = php-embed; # Added 2020-04-01 + php74-embed = php-embed; # Added 2020-04-01 + + phpPackages-embed = throw '' + php*Packages-embed has been dropped, you can build something + similar with the following snippet: + (php74.override { embedSupport = true; apxs2Support = false; }).packages + ''; # Added 2020-04-01 + php73Packages-embed = phpPackages-embed; + php74Packages-embed = phpPackages-embed; + + php-unit = throw '' + php*-unit has been dropped, you can build something similar with + the following snippet: + php74.override { + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + } + ''; # Added 2020-04-01 + php73-unit = php-unit; # Added 2020-04-01 + php74-unit = php-unit; # Added 2020-04-01 + + phpPackages-unit = throw '' + php*Packages-unit has been dropped, you can build something + similar with this following snippet: + (php74.override { + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + }).packages + ''; # Added 2020-04-01 + php73Packages-unit = phpPackages-unit; + php74Packages-unit = phpPackages-unit; pidgin-with-plugins = throw "'pidgin-with-plugins' has been renamed to/replaced by 'pidgin'"; # Converted to throw 2022-02-22 pidginlatex = throw "'pidginlatex' has been renamed to/replaced by 'pidgin-latex'"; # Converted to throw 2022-02-22 @@ -906,11 +1138,12 @@ mapAliases ({ ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18 piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22 pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21 - pkgconfig = throw "'pkgconfig' has been renamed to/replaced by 'pkg-config'"; # Converted to throw 2022-09-24 + pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22 - pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2022-09-24 + planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02 + pleroma-otp = pleroma; # Added 2021-07-10 plexpy = throw "'plexpy' has been renamed to/replaced by 'tautulli'"; # Converted to throw 2022-02-22 - pltScheme = racket; # Added 20218-01-01 + pltScheme = racket; # just to be sure pmtools = throw "'pmtools' has been renamed to/replaced by 'acpica-tools'"; # Converted to throw 2022-02-22 pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24 polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 @@ -921,35 +1154,40 @@ mapAliases ({ portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10 # postgresql - postgresql96 = throw "'postgresql96' has been renamed to/replaced by 'postgresql_9_6'"; # Converted to throw 2022-09-24 + postgresql96 = postgresql_9_6; postgresql_9_6 = throw "postgresql_9_6 has been removed from nixpkgs, as this version is no longer supported by upstream"; # Added 2021-12-03 # postgresql plugins - cstore_fdw = throw "'cstore_fdw' has been renamed to/replaced by 'postgresqlPackages.cstore_fdw'"; # Converted to throw 2022-09-24 - pg_cron = throw "'pg_cron' has been renamed to/replaced by 'postgresqlPackages.pg_cron'"; # Converted to throw 2022-09-24 - pg_hll = throw "'pg_hll' has been renamed to/replaced by 'postgresqlPackages.pg_hll'"; # Converted to throw 2022-09-24 - pg_repack = throw "'pg_repack' has been renamed to/replaced by 'postgresqlPackages.pg_repack'"; # Converted to throw 2022-09-24 - pg_similarity = throw "'pg_similarity' has been renamed to/replaced by 'postgresqlPackages.pg_similarity'"; # Converted to throw 2022-09-24 - pg_topn = throw "'pg_topn' has been renamed to/replaced by 'postgresqlPackages.pg_topn'"; # Converted to throw 2022-09-24 - pgjwt = throw "'pgjwt' has been renamed to/replaced by 'postgresqlPackages.pgjwt'"; # Converted to throw 2022-09-24 - pgroonga = throw "'pgroonga' has been renamed to/replaced by 'postgresqlPackages.pgroonga'"; # Converted to throw 2022-09-24 - pgtap = throw "'pgtap' has been renamed to/replaced by 'postgresqlPackages.pgtap'"; # Converted to throw 2022-09-24 - plv8 = throw "'plv8' has been renamed to/replaced by 'postgresqlPackages.plv8'"; # Converted to throw 2022-09-24 - postgis = throw "'postgis' has been renamed to/replaced by 'postgresqlPackages.postgis'"; # Converted to throw 2022-09-24 + cstore_fdw = postgresqlPackages.cstore_fdw; + pg_cron = postgresqlPackages.pg_cron; + pg_hll = postgresqlPackages.pg_hll; + pg_repack = postgresqlPackages.pg_repack; + pg_similarity = postgresqlPackages.pg_similarity; + pg_topn = postgresqlPackages.pg_topn; + pgjwt = postgresqlPackages.pgjwt; + pgroonga = postgresqlPackages.pgroonga; + pgtap = postgresqlPackages.pgtap; + plv8 = postgresqlPackages.plv8; + postgis = postgresqlPackages.postgis; tilp2 = throw "tilp2 has been removed"; # Added 2022-01-15 timekeeper = throw "timekeeper has been removed"; # Added 2022-01-16 - timescaledb = throw "'timescaledb' has been renamed to/replaced by 'postgresqlPackages.timescaledb'"; # Converted to throw 2022-09-24 - tsearch_extras = throw "'tsearch_extras' has been renamed to/replaced by 'postgresqlPackages.tsearch_extras'"; # Converted to throw 2022-09-24 - - pinentry_curses = throw "'pinentry_curses' has been renamed to/replaced by 'pinentry-curses'"; # Converted to throw 2022-09-24 - pinentry_emacs = throw "'pinentry_emacs' has been renamed to/replaced by 'pinentry-emacs'"; # Converted to throw 2022-09-24 - pinentry_gnome = throw "'pinentry_gnome' has been renamed to/replaced by 'pinentry-gnome'"; # Converted to throw 2022-09-24 - pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2022-09-24 - pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2022-09-24 - pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2022-09-24 + timescaledb = postgresqlPackages.timescaledb; + tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; + tsearch_extras = postgresqlPackages.tsearch_extras; + + pinentry_curses = pinentry-curses; # Added 2019-10-14 + pinentry_emacs = pinentry-emacs; # Added 2019-10-14 + pinentry_gnome = pinentry-gnome; # Added 2019-10-14 + pinentry_gtk2 = pinentry-gtk2; # Added 2019-10-14 + pinentry_qt = pinentry-qt; # Added 2019-10-14 + pinentry_qt5 = pinentry-qt; # Added 2020-02-11 prboom = throw "prboom was removed because it was abandoned by upstream, use prboom-plus instead"; # Added 2022-04-24 - processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2022-09-24 + privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 + processing3 = processing; # Added 2019-08-16 procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22 + proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 + proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12 + prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 @@ -958,18 +1196,25 @@ mapAliases ({ pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01 pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22 - pulseeffects-pw = throw "'pulseeffects-pw' has been renamed to/replaced by 'easyeffects'"; # Converted to throw 2022-09-24 + pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13 + pulseeffects-pw = easyeffects; # Added 2021-07-07 py-wmi-client = throw "py-wmi-client has been removed: abandoned by upstream"; # Added 2022-04-26 pydb = throw "pydb has been removed: abandoned by upstream"; # Added 2022-04-22 + pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; + pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; + pybind11 = throw "pybind11 was removed because pythonPackages.pybind11 for the appropriate version of Python should be used"; # Added 2021-05-14 pybitmessage = throw "pybitmessage was removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 - pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2022-09-24 - pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2022-09-24 + pygmentex = texlive.bin.pygmentex; # Added 2019-12-15 + pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained"; # Added 2021-03-21 + pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd"; # Added 2020-10-24 + pyo3-pack = maturin; pyrex = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-12 pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2"; # Added 2022-01-01 python = python2; # Added 2022-01-11 python-swiftclient = swiftclient; # Added 2021-09-09 + python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead"; # Added 2021-03-08 pythonFull = python2Full; # Added 2022-01-11 pythonPackages = python.pkgs; # Added 2022-01-11 @@ -978,58 +1223,78 @@ mapAliases ({ QmidiNet = throw "'QmidiNet' has been renamed to/replaced by 'qmidinet'"; # Converted to throw 2022-02-22 qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22 qca2 = throw "qca2 has been removed, because it depended on qt4"; # Added 2022-05-26 - qcsxcad = throw "'qcsxcad' has been renamed to/replaced by 'libsForQt5.qcsxcad'"; # Converted to throw 2022-09-24 + qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 qflipper = qFlipper; # Added 2022-02-11 + qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 + qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14 + qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 qt5ct = libsForQt5.qt5ct; # Added 2021-12-27 - qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2022-09-24 + qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 + qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04 qtscriptgenerator = throw "'qtscriptgenerator' (Qt4) is unmaintained upstream and not used in nixpkgs"; # Added 2022-06-14 + quagga = throw "quagga is no longer maintained upstream"; # Added 2021-04-22 quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22 + quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09 + quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-03 + qvim = throw "qvim has been removed"; # Added 2020-08-31 + qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08 qwt6 = throw "'qwt6' has been renamed to/replaced by 'libsForQt5.qwt'"; # Converted to throw 2022-02-22 ### R ### - radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2022-09-24 + radare2-cutter = cutter; # Added 2021-03-30 railcar = throw "'railcar' has been removed, as the upstream project has been abandoned"; # Added 2022-06-27 + raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24 rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2"; # Added 2022-01-01 rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22 rdmd = throw "'rdmd' has been renamed to/replaced by 'dtools'"; # Converted to throw 2022-02-22 readline5 = throw "readline-5 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 readline62 = throw "readline-6.2 is no longer supported in nixpkgs, please use 'readline' for main supported version"; # Added 2022-02-20 + readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # Added 2021-04-22 + redkite = throw "redkite was archived by upstream"; # Added 2021-04-12 redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25 reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07 # 3 resholve aliases below added 2022-04-08; drop after 2022-11-30? - resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation"; # Added 2022-04-08 - resholveScript = throw "resholveScript has been renamed to resholve.writeScript"; # Added 2022-04-08 - resholveScriptBin = throw "resholveScriptBin has been renamed to resholve.writeScriptBin"; # Added 2022-04-08 + resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation"; + resholveScript = throw "resholveScript has been renamed to resholve.writeScript"; + resholveScriptBin = throw "resholveScriptBin has been renamed to resholve.writeScriptBin"; residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27 retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 - retroshare06 = throw "'retroshare06' has been renamed to/replaced by 'retroshare'"; # Converted to throw 2022-09-24 + retroshare06 = retroshare; + rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23 riak = throw "riak has been removed due to lack of maintainer to update the package"; # Added 2022-06-22 + riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14 rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 ring-daemon = jami-daemon; # Added 2021-10-26 + rkt = throw "rkt was archived by upstream"; # Added 2020-05-16 rls = throw "rls was discontinued upstream, use rust-analyzer instead"; # Added 2022-09-06 rng_tools = throw "'rng_tools' has been renamed to/replaced by 'rng-tools'"; # Converted to throw 2022-02-22 robomongo = throw "'robomongo' has been renamed to/replaced by 'robo3t'"; # Converted to throw 2022-02-22 rockbox_utility = rockbox-utility; # Added 2022-03-17 - rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2022-09-24 + rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 + rpiboot-unstable = rpiboot; # Added 2021-07-30 rr-unstable = rr; # Added 2022-09-17 rssglx = throw "'rssglx' has been renamed to/replaced by 'rss-glx'"; # Converted to throw 2022-02-22 - runCommandNoCC = throw "'runCommandNoCC' has been renamed to/replaced by 'runCommand'"; # Converted to throw 2022-09-24 - runCommandNoCCLocal = throw "'runCommandNoCCLocal' has been renamed to/replaced by 'runCommandLocal'"; # Converted to throw 2022-09-24 + rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # Added 2020-08-25 + rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # Added 2021-08-08 + rubyMinimal = throw "rubyMinimal was removed due to being unused"; + runCommandNoCC = runCommand; + runCommandNoCCLocal = runCommandLocal; + runwayml = throw "runwayml is now a webapp"; # Added 2021-04-17 rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # Added 2021-10-19 - rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2022-09-24 - rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2022-09-24 + rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 + rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix, # due to it being inside the linuxPackagesFor function. - rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2022-09-24 + rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14 ### S ### - s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2022-09-24 + s2n = s2n-tls; # Added 2021-03-03 s3gof3r = throw "s3gof3r has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-04 s6Dns = throw "'s6Dns' has been renamed to/replaced by 's6-dns'"; # Converted to throw 2022-02-22 s6LinuxUtils = throw "'s6LinuxUtils' has been renamed to/replaced by 's6-linux-utils'"; # Converted to throw 2022-02-22 @@ -1039,97 +1304,116 @@ mapAliases ({ salut_a_toi = throw "salut_a_toi was removed because it was broken and used Python 2"; # added 2022-06-05 sam = throw "'sam' has been renamed to/replaced by 'deadpixi-sam'"; # Converted to throw 2022-02-22 samsungUnifiedLinuxDriver = throw "'samsungUnifiedLinuxDriver' has been renamed to/replaced by 'samsung-unified-linux-driver'"; # Converted to throw 2022-02-22 - sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-09-24 + sane-backends-git = sane-backends; # Added 2021-02-19 saneBackends = throw "'saneBackends' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 saneBackendsGit = throw "'saneBackendsGit' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2022-02-22 saneFrontends = throw "'saneFrontends' has been renamed to/replaced by 'sane-frontends'"; # Converted to throw 2022-02-22 - scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # Added 2021-12-15 + scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # Added 2020-03-01 + scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15 scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22 scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13 scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 - sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2022-09-24 + sdlmame = mame; # Added 2019-10-30 + seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 - session-desktop-appimage = session-desktop; # Added 2022-08-22 + session-desktop-appimage = session-desktop; shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 - inherit (libsForQt5.mauiPackages) shelf; # Added 2022-05-17 + inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15 sickbeard = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01 sickrage = throw "sickbeard has been removed from nixpkgs, as it was unmaintained"; # Added 2022-01-01 sigurlx = throw "sigurlx has been removed (upstream is gone)"; # Added 2022-01-24 skrooge2 = throw "'skrooge2' has been renamed to/replaced by 'skrooge'"; # Converted to throw 2022-02-22 skype = throw "'skype' has been renamed to/replaced by 'skypeforlinux'"; # Converted to throw 2022-02-22 - slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2022-09-24 + skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2021-07-14 + skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired"; # Added 2020-10-31 + slack-dark = slack; # Added 2020-03-27 slic3r-prusa3d = throw "'slic3r-prusa3d' has been renamed to/replaced by 'prusa-slicer'"; # Converted to throw 2022-02-22 slurm-full = throw "'slurm-full' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-02-22 - slurm-llnl = throw "'slurm-llnl' has been renamed to/replaced by 'slurm'"; # Converted to throw 2022-09-24 - slurm-llnl-full = throw "'slurm-llnl-full' has been renamed to/replaced by 'slurm-full'"; # Converted to throw 2022-09-24 + slurm-llnl = slurm; # renamed July 2017 + slurm-llnl-full = slurm-full; # renamed July 2017 smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22 + smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04 snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21 soldat-unstable = opensoldat; # Added 2022-07-02 - solr_8 = throw "'solr_8' has been renamed to/replaced by 'solr'"; # Converted to throw 2022-09-24 + solr_8 = solr; # Added 2021-01-30 + # Added 2020-02-10 sourceHanSansPackages = { - japanese = throw "'sourceHanSansPackages.japanese' has been replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 - korean = throw "'sourceHanSansPackages.korean' has been replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 - simplified-chinese = throw "'sourceHanSansPackages.simplified-chinese' has been replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 - traditional-chinese = throw "'sourceHanSansPackages.traditional-chinese' has been replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 + japanese = source-han-sans; + korean = source-han-sans; + simplified-chinese = source-han-sans; + traditional-chinese = source-han-sans; }; - source-han-sans-japanese = throw "'source-han-sans-japanese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2022-09-24 - source-han-sans-korean = throw "'source-han-sans-korean' has been renamed to/replaced by 'source-han-sans;#'"; # Converted to throw 2022-09-24 - source-han-sans-simplified-chinese = throw "'source-han-sans-simplified-chinese' has been renamed to/replaced by 'source-han-sans;#'"; # Converted to throw 2022-09-24 - source-han-sans-traditional-chinese = throw "'source-han-sans-traditional-chinese' has been renamed to/replaced by 'source-han-sans;#'"; # Converted to throw 2022-09-24 + source-han-sans-japanese = source-han-sans; + source-han-sans-korean = source-han-sans; + source-han-sans-simplified-chinese = source-han-sans; + source-han-sans-traditional-chinese = source-han-sans; sourceHanSerifPackages = { - japanese = throw "'sourceHanSerifPackages.japanese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2022-09-24 - korean = throw "'sourceHanSerifPackages.korean' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2022-09-24 - simplified-chinese = throw "'sourceHanSerifPackages.simplified-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2022-09-24 - traditional-chinese = throw "'sourceHanSerifPackages.traditional-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2022-09-24 + japanese = source-han-serif; + korean = source-han-serif; + simplified-chinese = source-han-serif; + traditional-chinese = source-han-serif; }; - source-han-serif-japanese = throw "'source-han-serif-japanese' has been renamed to/replaced by 'source-han-serif;#'"; # Converted to throw 2022-09-24 - source-han-serif-korean = throw "'source-han-serif-korean' has been renamed to/replaced by 'source-han-serif;#'"; # Converted to throw 2022-09-24 - source-han-serif-simplified-chinese = throw "'source-han-serif-simplified-chinese' has been renamed to/replaced by 'source-han-serif;#'"; # Converted to throw 2022-09-24 - source-han-serif-traditional-chinese = throw "'source-han-serif-traditional-chinese' has been renamed to/replaced by 'source-han-serif;#'"; # Converted to throw 2022-09-24 + source-han-serif-japanese = source-han-serif; + source-han-serif-korean = source-han-serif; + source-han-serif-simplified-chinese = source-han-serif; + source-han-serif-traditional-chinese = source-han-serif; sourcetrail = throw "sourcetrail has been removed: abandoned by upstream"; # Added 2022-08-14 spaceOrbit = throw "'spaceOrbit' has been renamed to/replaced by 'space-orbit'"; # Converted to throw 2022-02-22 - spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2022-09-24 + spectral = neochat; # Added 2020-12-27 speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22 speedometer = throw "speedometer has been removed: abandoned by upstream"; # Added 2022-04-24 speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 sphinxbase = throw "sphinxbase has been removed: unmaintained"; # Added 2022-04-24 spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 spice_protocol = throw "'spice_protocol' has been renamed to/replaced by 'spice-protocol'"; # Converted to throw 2022-02-22 + 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_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead"; # Added 2021-03-21 spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead"; # added 2022-01-04 - spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2022-09-24 + # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell + spidermonkey = spidermonkey_78; # Added 2020-10-09 split2flac = throw "split2flac has been removed. Consider using the shnsplit command from shntool package or help packaging unflac."; # added 2022-01-13 - spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2022-09-24 + spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 - squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2022-09-24 + squid4 = squid; # added 2019-08-22 srcml = throw "'srcml' has been removed: abandoned by upstream"; # Added 2022-07-21 sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 ssmtp = throw "'ssmtp' has been removed due to the software being unmaintained. 'msmtp' can be used as a replacement"; # Added 2022-04-17 - steam-run-native = steam-run; # Added 2022-02-21 + stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 + steam-run-native = steam-run; # added 2022-02-21 stride = throw "'stride' aka. Atlassian Stride is dead since 2019 (bought by Slack)"; # added 2022-06-15 + stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # Added 2021-05-09 subversion_1_10 = throw "subversion_1_10 has been removed as it has reached its end of life"; # Added 2022-04-26 + subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # Added 2021-03-31 sudolikeaboss = throw "sudolikeaboss is no longer maintained by upstream"; # Added 2022-04-16 + sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; surf-webkit2 = throw "'surf-webkit2' has been renamed to/replaced by 'surf'"; # Converted to throw 2022-02-22 swec = throw "swec has been removed; broken and abandoned upstream"; # Added 2021-10-14 sweep-visualizer = throw "'sweep-visualizer' is abondoned upstream and depends on deprecated GNOME2/GTK2"; # Added 2022-06-15 - swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2022-09-24 - syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2022-09-24 + swfdec = throw "swfdec has been removed as broken and unmaintained"; # Added 2020-08-23 + swtpm-tpm2 = swtpm; # Added 2021-02-26 + syncthing-cli = syncthing; # Added 2021-04-06 synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # Added 2021-11-26 system_config_printer = throw "'system_config_printer' has been renamed to/replaced by 'system-config-printer'"; # Converted to throw 2022-02-22 + systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # Added 2020-07-12 + systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # Added 2020-07-12 systool = throw "'systool' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22 ### T ### tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22 - tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2022-09-24 + tangogps = foxtrotgps; # Added 2020-01-26 taplo-cli = taplo; # Added 2022-07-30 taplo-lsp = taplo; # Added 2022-07-30 + tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 + telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02 telepathy_farstream = throw "'telepathy_farstream' has been renamed to/replaced by 'telepathy-farstream'"; # Converted to throw 2022-02-22 telepathy_gabble = throw "'telepathy_gabble' has been renamed to/replaced by 'telepathy-gabble'"; # Converted to throw 2022-02-22 telepathy_glib = throw "'telepathy_glib' has been renamed to/replaced by 'telepathy-glib'"; # Converted to throw 2022-02-22 @@ -1140,6 +1424,8 @@ mapAliases ({ telepathy_qt = throw "'telepathy_qt' has been renamed to/replaced by 'telepathy-qt'"; # Converted to throw 2022-02-22 telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 + terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 + termonad-with-packages = throw "termonad-with-packages has been renamed to just 'termonad'"; # Added 2022-10-15 terraform-full = throw "terraform-full has been removed, it was an alias for 'terraform.full'"; # Added 2022-08-02 terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 @@ -1153,18 +1439,34 @@ mapAliases ({ tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22 textadept11 = textadept; # Added 2022-06-07 tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 + thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25"; + thunderbird-bin-68 = thunderbird-68; + timescale-prometheus = promscale; # Added 2020-09-29 timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09 - timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2022-09-24 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 tkcvs = tkrev; # Added 2022-03-07 + togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 tomboy = throw "tomboy is not actively developed anymore and was removed"; # Added 2022-01-27 + tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life"; # Added 2021-06-16 + tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life"; # Added 2021-06-16 + tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life"; # Added 2020-03-11 tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned"; # Added 2022-01-01 torbrowser = throw "'torbrowser' has been renamed to/replaced by 'tor-browser-bundle-bin'"; # Converted to throw 2022-02-22 + torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 + torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 trang = throw "'trang' has been renamed to/replaced by 'jing-trang'"; # Converted to throw 2022-02-22 transfig = fig2dev; # Added 2022-02-15 + transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 transmission_gtk = throw "'transmission_gtk' has been renamed to/replaced by 'transmission-gtk'"; # Converted to throw 2022-02-22 transmission_remote_gtk = throw "'transmission_remote_gtk' has been renamed to/replaced by 'transmission-remote-gtk'"; # Converted to throw 2022-02-22 + transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned"; + trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned"; + trilium = throw "trilium has been removed. Please use trilium-desktop instead"; # Added 2020-04-29 truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 + tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 + turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26 tychus = throw "tychus has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11 @@ -1172,41 +1474,46 @@ mapAliases ({ ### U ### uade123 = uade; # Added 2022-07-30 - uberwriter = throw "'uberwriter' has been renamed to/replaced by 'apostrophe'"; # Converted to throw 2022-09-24 - ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2022-09-24 + uberwriter = apostrophe; # Added 2020-04-23 + ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02 ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22 + ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11 ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22 - unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2022-09-24 - unifiStable = throw "'unifiStable' has been renamed to/replaced by 'unifi6'"; # Converted to throw 2022-09-24 + unicorn-emu = unicorn; # Added 2020-10-29 + unifiStable = unifi6; # Added 2020-12-28 unity3d = throw "'unity3d' is unmaintained, has seen no updates in years and depends on deprecated GTK2"; # Added 2022-06-16 - untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2022-09-24 - urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2022-09-24 - urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2022-09-24 - urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2022-09-24 - urxvt_perl = throw "'urxvt_perl' has been renamed to/replaced by 'rxvt-unicode-plugins.perl'"; # Converted to throw 2022-09-24 - urxvt_perls = throw "'urxvt_perls' has been renamed to/replaced by 'rxvt-unicode-plugins.perls'"; # Converted to throw 2022-09-24 - urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2022-09-24 - urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2022-09-24 - urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2022-09-24 + untrunc = untrunc-anthwlock; # Added 2021-02-01 + urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 + urxvt_bidi = rxvt-unicode-plugins.bidi; # Added 2020-02-02 + urxvt_font_size = rxvt-unicode-plugins.font-size; # Added 2020-02-02 + urxvt_perl = rxvt-unicode-plugins.perl; # Added 2020-02-02 + urxvt_perls = rxvt-unicode-plugins.perls; # Added 2020-02-02 + urxvt_tabbedex = rxvt-unicode-plugins.tabbedex; # Added 2020-02-02 + urxvt_theme_switch = rxvt-unicode-plugins.theme-switch; # Added 2020-02-02 + urxvt_vtwheel = rxvt-unicode-plugins.vtwheel; # Added 2020-02-02 usb_modeswitch = throw "'usb_modeswitch' has been renamed to/replaced by 'usb-modeswitch'"; # Converted to throw 2022-02-22 - usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2022-09-24 + usbguard-nox = usbguard; # Added 2019-09-04 util-linuxCurses = util-linux; # Added 2022-04-12 + utillinux = util-linux; # Added 2020-11-24 ### V ### - v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2022-09-24 - vamp = { - vampSDK = throw "'vamp.vampSDK' has been renamed to 'vamp-plugin-sdk'"; # Converted to throw 2022-09-24 - }; - vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; # Added 2022-01-15 + v4l_utils = v4l-utils; # Added 2019-08-07 + vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 + vapor = throw "vapor was removed because it was unmaintained and upstream service no longer exists"; + varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 + varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-07-26 + varnish65 = throw "varnish65 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release"; # Added 2021-09-15 varnish70 = throw "varnish70 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-03-17 - vdirsyncerStable = throw "vdirsyncerStable has been replaced by vdirsyncer"; # Converted to throw 2022-09-24 + vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 + venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 vgo2nix = throw "vgo2nix has been removed, because it was deprecated. Consider using gomod2nix instead"; # added 2022-08-24 vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22 + virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 virtuoso = throw "virtuoso has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-15 - virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2022-09-24 - virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2022-09-24 + virtmanager = virt-manager; # Added 2019-10-29 + virtmanager-qt = virt-manager-qt; # Added 2019-10-29 virtviewer = throw "'virtviewer' has been renamed to/replaced by 'virt-viewer'"; # Converted to throw 2022-02-22 vnc2flv = throw "vnc2flv has been removed: abandoned by upstream"; # Added 2022-03-21 vorbisTools = throw "'vorbisTools' has been renamed to/replaced by 'vorbis-tools'"; # Converted to throw 2022-02-22 @@ -1216,6 +1523,7 @@ mapAliases ({ ### W ### wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21 + way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21 webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22 @@ -1227,12 +1535,12 @@ mapAliases ({ wineStable = throw "'wineStable' has been renamed to/replaced by 'winePackages.stable'"; # Converted to throw 2022-02-22 wineStaging = throw "'wineStaging' has been renamed to/replaced by 'wine-staging'"; # Converted to throw 2022-02-22 wineUnstable = throw "'wineUnstable' has been renamed to/replaced by 'winePackages.unstable'"; # Converted to throw 2022-02-22 - wineWayland = wine-wayland; # Added 2022-01-03 + wineWayland = wine-wayland; winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name - wmii_hg = wmii; # Added 2022-04-25 + wmii_hg = wmii; ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31 wxcam = throw "'wxcam' has seen no updates in ten years, crashes (SIGABRT) on startup and depends on deprecated wxGTK28/GNOME2/GTK2, use 'gnome.cheese'"; # Added 2022-06-15 @@ -1240,43 +1548,58 @@ mapAliases ({ ### X ### x11 = throw "'x11' has been renamed to/replaced by 'xlibsWrapper'"; # Converted to throw 2022-02-22 + xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # Added 2020-06-24 xbmc = throw "'xbmc' has been renamed to/replaced by 'kodi'"; # Converted to throw 2022-02-22 xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # Added 2021-11-19 xbmcPlain = throw "'xbmcPlain' has been renamed to/replaced by 'kodiPlain'"; # Converted to throw 2022-02-22 xbmcPlugins = throw "'xbmcPlugins' has been renamed to/replaced by 'kodiPackages'"; # Converted to throw 2022-02-22 - xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2022-09-24 + xdg_utils = xdg-utils; # Added 2021-02-01 + xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # Added 2020-03-14 xfce4-14 = xfce; - xfceUnstable = throw "'xfceUnstable' has been renamed to/replaced by 'xfce4-14'"; # Converted to throw 2022-09-24 - xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2022-09-24 - xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2022-09-24 + xfceUnstable = xfce4-14; # Added 2019-09-17 + xineLib = xine-lib; # Added 2021-04-27 + xineUI = xine-ui; # Added 2021-04-27 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22 xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 + xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; xp-pen-g430 = throw "xp-pen-g430 has been renamed to xp-pen-g430-driver"; # Converted to throw 2022-06-23 xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26 xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22 + xf86_input_mtrack = throw '' + xf86_input_mtrack has been removed from nixpkgs as it is broken and + unmaintained. Working alternatives are libinput and synaptics. + ''; + xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs"; # Added 2020-01-20 xlibs = throw "'xlibs' has been renamed to/replaced by 'xorg'"; # Converted to throw 2022-02-22 xow = throw ( "Upstream has ended support for 'xow' and the package has been removed" + "from nixpkgs. Users are urged to switch to 'xone'." ); # Added 2022-08-02 xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 - xv = throw "'xv' has been renamed to/replaced by 'xxv'"; # Converted to throw 2022-09-24 - xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2022-09-24 + xv = xxv; # Added 2020-02-22 + xvfb_run = xvfb-run; # Added 2021-05-07 ### Y ### - yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2022-09-24 + yacc = bison; # moved from top-level 2021-03-14 yafaray-core = libyafaray; # Added 2022-09-23 yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # Added 2022-01-15 youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22 + ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; + yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead"; # Added 2021-03-08 yuzu-ea = yuzu-early-access; # Added 2022-08-18 - yuzu = throw "'yuzu' has been renamed to/replaced by 'yuzu-mainline'"; # Converted to throw 2022-09-24 + yuzu = yuzu-mainline; # Added 2021-01-25 ### Z ### + zabbix30 = throw "Zabbix 3.0.x is end of life, see https://www.zabbix.com/documentation/5.0/manual/installation/upgrade/sources for a direct upgrade path to 5.0.x"; # Added 2021-04-07 zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22 + zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions"; # Added 2021-03-28 zimwriterfs = throw "zimwriterfs is now part of zim-tools"; # Added 2022-06-10. + # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 + # branch-off + ocamlPackages_4_00_1 = throw "'ocamlPackages_4_00_1' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_00_1'"; # Converted to throw 2022-02-22 ocamlPackages_4_01_0 = throw "'ocamlPackages_4_01_0' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_01_0'"; # Converted to throw 2022-02-22 ocamlPackages_4_02 = throw "'ocamlPackages_4_02' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02'"; # Converted to throw 2022-02-22 @@ -1301,15 +1624,68 @@ mapAliases ({ ocamlformat_0_17_0 = throw "ocamlformat_0_17_0 has been removed in favor of newer versions"; # Added 2022-06-01 ocamlformat_0_18_0 = throw "ocamlformat_0_18_0 has been removed in favor of newer versions"; # Added 2022-06-01 - zeroc_ice = throw "'zeroc_ice' has been renamed to 'zeroc-ice'"; # Converted to throw 2022-09-24 - - dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2022-09-24 - gnatsd = throw "'gnatsd' has been renamed to/replaced by 'nats-server'"; # Converted to throw 2022-09-24 - - posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2022-09-24 + zabbix44 = throw '' + Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at + https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 + ''; # Added 2020-08-17 + + # Added 2019-09-06 + zeroc_ice = pkgs.zeroc-ice; + + # Added 2020-06-22 + zeromq3 = throw "zeromq3 has been deprecated by zeromq4"; + jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; + + avian = throw '' + The package doesn't compile anymore on NixOS and both development & + maintenance is abandoned by upstream. + ''; # Cleanup before 21.11, Added 2021-05-07 + ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula"; + dina-font-pcf = dina-font; # Added 2020-02-09 + dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2"; # Added 2020-02-02 + gcc-snapshot = throw "gcc-snapshot: Marked as broken for >2 years, additionally this 'snapshot' pointed to a fairly old one from gcc7"; + gnatsd = nats-server; # Added 2019-10-28 + + obs-gstreamer = throw '' + obs-gstreamer has been converted into a plugin for use with wrapOBS. + Its new location is obs-studio-plugins.obs-gstreamer. + ''; # Added 2021-06-01 + + obs-move-transition = throw '' + obs-move-transition has been converted into a plugin for use with wrapOBS. + Its new location is obs-studio-plugins.obs-move-transition. + ''; # Added 2021-06-01 + + obs-multi-rtmp = throw '' + obs-multi-rtmp has been converted into a plugin for use with wrapOBS. + Its new location is obs-studio-plugins.obs-multi-rtmp. + ''; # Added 2021-06-01 + + obs-ndi = throw '' + obs-ndi has been converted into a plugin for use with wrapOBS. + Its new location is obs-studio-plugins.obs-ndi. + ''; # Added 2021-06-01 + + obs-v4l2sink = throw "obs-v4l2sink is integrated into upstream OBS since version 26.1"; # Added 2021-06-01 + + obs-wlrobs = throw '' + wlrobs has been converted into a plugin for use with wrapOBS. + Its new location is obs-studio-plugins.wlrobs. + ''; # Added 2021-06-01 + + oraclejdk8psu = throw "The *psu versions of oraclejdk are no longer provided by upstream"; # Cleanup before 20.09 + oraclejre8psu = oraclejdk8psu; # Cleanup before 20.09 + oraclejdk8psu_distro = oraclejdk8psu; # Cleanup before 20.09 + posix_man_pages = man-pages-posix; # Added 2021-04-15 + riot-desktop = throw "riot-desktop is now element-desktop!"; # Cleanup before 21.05 + riot-web = throw "riot-web is now element-web"; # Cleanup before 21.05 + sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04 + todolist = throw "todolist is now ultralist"; # Added 2020-12-27 + tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 + tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 torchat = throw "torchat was removed because it was broken and requires Python 2"; # added 2022-06-05 - ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2022-09-24 - zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2022-09-24 + ttyrec = ovh-ttyrec; # Added 2021-01-02 + zplugin = zinit; # Added 2021-01-30 zyn-fusion = zynaddsubfx; # Added 2022-08-05 inherit (stdenv.hostPlatform) system; # Added 2021-10-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bc490922289a..ac51b9fcc46b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -763,6 +763,8 @@ with pkgs; run = callPackage ../development/tools/run { }; + ruler = callPackage ../tools/security/ruler { }; + mblock-mlink = callPackage ../development/tools/mblock-mlink { }; mod = callPackage ../development/tools/mod { }; @@ -1432,6 +1434,8 @@ with pkgs; use64 = true; }; + wwcd = callPackage ../tools/misc/wwcd { }; + writedisk = callPackage ../tools/misc/writedisk { }; xcd = callPackage ../tools/misc/xcd { }; @@ -1560,9 +1564,7 @@ with pkgs; libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; - maiko = callPackage ../applications/emulators/maiko { - inherit (xorg) libX11; - }; + maiko = callPackage ../applications/emulators/maiko { }; mame = libsForQt514.callPackage ../applications/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; @@ -1578,7 +1580,15 @@ with pkgs; melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; - mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; + mgba = callPackage ../applications/emulators/mgba { + ffmpeg = ffmpeg_4; + lua = lua5_4; + inherit (libsForQt5) + qtbase + qtmultimedia + qttools + wrapQtAppsHook; + }; mupen64plus = callPackage ../applications/emulators/mupen64plus { }; @@ -1817,10 +1827,11 @@ with pkgs; ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { - inherit (xorg) libXcursor libXxf86vm libXi; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; + blackbox-terminal = callPackage ../applications/terminal-emulators/blackbox-terminal { }; + contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { fmt = fmt_8; }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; @@ -1858,10 +1869,10 @@ with pkgs; microcom = callPackage ../applications/terminal-emulators/microcom { }; - mlterm = callPackage ../applications/terminal-emulators/mlterm { + mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { libssh2 = null; openssl = null; - inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; }; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; @@ -1907,9 +1918,7 @@ with pkgs; }; termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { }; - - termonad = termonad-with-packages; + termonad = callPackage ../applications/terminal-emulators/termonad { }; tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; @@ -2079,6 +2088,8 @@ with pkgs; arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; + arduino-language-server = callPackage ../development/embedded/arduino/arduino-language-server { }; + arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {}; apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; @@ -2445,6 +2456,8 @@ with pkgs; msr = callPackage ../os-specific/linux/msr { }; + ctre = callPackage ../development/libraries/ctre { }; + ctrtool = callPackage ../tools/archivers/ctrtool { }; crowbar = callPackage ../tools/security/crowbar { }; @@ -2594,6 +2607,8 @@ with pkgs; git-privacy = callPackage ../development/tools/git-privacy { }; + git-publish = python3Packages.callPackage ../applications/version-management/git-and-tools/git-publish { }; + git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; git-revise = with python3Packages; toPythonApplication git-revise; @@ -3180,7 +3195,6 @@ with pkgs; broot = callPackage ../tools/misc/broot { inherit (darwin.apple_sdk.frameworks) Security; - inherit (xorg) libxcb; }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; @@ -3249,7 +3263,8 @@ with pkgs; cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (haskell.lib.compose.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix); + cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables + (haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix); cabal2nix = symlinkJoin { inherit (cabal2nix-unwrapped) name meta; @@ -3678,7 +3693,7 @@ with pkgs; dbus-broker = callPackage ../os-specific/linux/dbus-broker { }; - dbx = python3Packages.callPackage ../applications/misc/dbx { }; + dbx = callPackage ../applications/misc/dbx { }; ioport = callPackage ../os-specific/linux/ioport {}; @@ -4487,9 +4502,7 @@ with pkgs; morsel = callPackage ../tools/text/morsel {}; - mousetweaks = callPackage ../applications/accessibility/mousetweaks { - inherit (xorg) libX11 libXtst libXfixes; - }; + mousetweaks = callPackage ../applications/accessibility/mousetweaks { }; mp3blaster = callPackage ../applications/audio/mp3blaster { }; @@ -4535,7 +4548,7 @@ with pkgs; nixel = callPackage ../tools/nix/nixel { }; - nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; + nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { haskellPackages = haskell.packages.ghc92; }; nix-template = callPackage ../tools/package-management/nix-template { inherit (darwin.apple_sdk.frameworks) Security; @@ -4744,6 +4757,8 @@ with pkgs; shisho = callPackage ../tools/security/shisho { }; + sigslot = callPackage ../development/libraries/sigslot { }; + siglo = callPackage ../applications/misc/siglo { }; simg2img = callPackage ../tools/filesystems/simg2img { }; @@ -4760,6 +4775,8 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; + srvc = callPackage ../applications/version-management/srvc { }; + ssmsh = callPackage ../tools/admin/ssmsh { }; stacs = callPackage ../tools/security/stacs { }; @@ -5340,9 +5357,7 @@ with pkgs; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; - libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { - inherit (xorg) libXaw; - }; + libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { }; netbird = callPackage ../tools/networking/netbird { inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit Kernel UserNotifications WebKit; @@ -5995,6 +6010,8 @@ with pkgs; edk2 = callPackage ../development/compilers/edk2 { }; + edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { }; + eff = callPackage ../development/interpreters/eff { }; eflite = callPackage ../applications/audio/eflite {}; @@ -6094,8 +6111,13 @@ with pkgs; timeline = callPackage ../applications/office/timeline { }; - tsm-client = callPackage ../tools/backup/tsm-client { }; - tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; }; + tsm-client = callPackage ../tools/backup/tsm-client { + openssl = openssl_1_1; + }; + tsm-client-withGui = callPackage ../tools/backup/tsm-client { + openssl = openssl_1_1; + enableGui = true; + }; tracker = callPackage ../development/libraries/tracker { }; @@ -6347,6 +6369,8 @@ with pkgs; expect = callPackage ../tools/misc/expect { }; + expected-lite = callPackage ../development/libraries/expected-lite { }; + exportarr = callPackage ../servers/monitoring/prometheus/exportarr { }; expliot = callPackage ../tools/security/expliot { }; @@ -7351,7 +7375,6 @@ with pkgs; gromit-mpx = callPackage ../tools/graphics/gromit-mpx { gtk = gtk3; libappindicator = libappindicator-gtk3; - inherit (xorg) libXdmcp; }; gron = callPackage ../development/tools/gron { }; @@ -7430,6 +7453,8 @@ with pkgs; gssdp = callPackage ../development/libraries/gssdp { }; + gssdp_1_6 = callPackage ../development/libraries/gssdp/1.6.nix { }; + gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; grype = callPackage ../tools/security/grype { }; @@ -7462,6 +7487,8 @@ with pkgs; gupnp = callPackage ../development/libraries/gupnp { }; + gupnp_1_6 = callPackage ../development/libraries/gupnp/1.6.nix { }; + gupnp-av = callPackage ../development/libraries/gupnp-av {}; gupnp-dlna = callPackage ../development/libraries/gupnp-dlna {}; @@ -7505,7 +7532,6 @@ with pkgs; pixz = callPackage ../tools/compression/pixz { }; plplot = callPackage ../development/libraries/plplot { - inherit (xorg) libX11; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -8612,7 +8638,9 @@ with pkgs; nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { }; + nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { + openssl = openssl_1_1; + }; nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; @@ -9424,7 +9452,8 @@ with pkgs; ngrep = callPackage ../tools/networking/ngrep { }; - neuron-notes = haskell.lib.compose.justStaticExecutables (haskell.lib.compose.generateOptparseApplicativeCompletion "neuron" haskellPackages.neuron); + neuron-notes = haskell.lib.compose.justStaticExecutables + (haskellPackages.generateOptparseApplicativeCompletions [ "neuron" ] haskellPackages.neuron); ngrok = callPackage ../tools/networking/ngrok { }; @@ -10162,6 +10191,8 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; + phodav_2_0 = callPackage ../tools/networking/phodav/2.0.nix { }; + photon-rss = callPackage ../applications/networking/feedreaders/photon { }; pim6sd = callPackage ../servers/pim6sd { }; @@ -10230,6 +10261,8 @@ with pkgs; playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { }; + please = callPackage ../tools/security/please { }; + plecost = callPackage ../tools/security/plecost { }; plujain-ramp = callPackage ../applications/audio/plujain-ramp { }; @@ -10364,6 +10397,8 @@ with pkgs; prettyping = callPackage ../tools/networking/prettyping { }; + pritunl-client = callPackage ../tools/networking/pritunl-client { }; + pritunl-ssh = callPackage ../tools/networking/pritunl-ssh { }; profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; @@ -11270,6 +11305,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; + boost-sml = callPackage ../development/libraries/boost-ext/boost-sml {}; + smu = callPackage ../tools/text/smu { }; smug = callPackage ../tools/misc/smug { }; @@ -11637,9 +11674,7 @@ with pkgs; squeekboard = callPackage ../applications/accessibility/squeekboard { }; - sx = callPackage ../tools/X11/sx { - inherit (xorg) xauth xorgserver; - }; + sx = callPackage ../tools/X11/sx { }; systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; @@ -11896,7 +11931,7 @@ with pkgs; toml2json = callPackage ../development/tools/toml2json { }; - toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; + toml2nix = callPackage ../development/tools/toml2nix { }; topgrade = callPackage ../tools/misc/topgrade { inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; @@ -11996,9 +12031,7 @@ with pkgs; trdl-client = callPackage ../tools/misc/trdl-client { }; - trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { - inherit (xorg) libXxf86vm; - }; + trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { }; trickle = callPackage ../tools/networking/trickle {}; @@ -12424,9 +12457,7 @@ with pkgs; woof = callPackage ../tools/misc/woof { }; - wootility = callPackage ../tools/misc/wootility { - inherit (xorg) libxkbfile; - }; + wootility = callPackage ../tools/misc/wootility { }; wormhole-william = callPackage ../tools/networking/wormhole-william { }; @@ -14721,7 +14752,9 @@ with pkgs; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; cratesIO = callPackage ../build-support/rust/crates-io.nix { }; - cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { }; + cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-web = callPackage ../development/tools/rust/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -14750,6 +14783,9 @@ with pkgs; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + cargo-clone = callPackage ../development/tools/rust/cargo-clone { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { inherit (darwin.apple_sdk.frameworks) Security; @@ -14758,7 +14794,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-deps = callPackage ../development/tools/rust/cargo-deps { }; - cargo-download = callPackage ../development/tools/rust/cargo-download { }; cargo-edit = callPackage ../development/tools/rust/cargo-edit { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14873,7 +14908,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; cargo-ui = callPackage ../development/tools/rust/cargo-ui { - inherit (xorg) libX11 libXcursor libXi libXrandr libxcb; inherit (darwin.apple_sdk.frameworks); }; @@ -14939,6 +14973,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; rust-analyzer = callPackage ../development/tools/rust/rust-analyzer/wrapper.nix { }; + rust-audit-info = callPackage ../development/tools/rust/rust-audit-info { }; rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { @@ -15862,7 +15897,6 @@ with pkgs; msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix { - inherit (buildPackages.xorg) lndir; newlib = newlibCross; }; @@ -16725,9 +16759,7 @@ with pkgs; flexcpp = callPackage ../development/tools/parsing/flexc++ { }; - geis = callPackage ../development/libraries/geis { - inherit (xorg) libX11 libXext libXi libXtst; - }; + geis = callPackage ../development/libraries/geis { }; gi-docgen = callPackage ../development/tools/documentation/gi-docgen { }; @@ -17012,7 +17044,9 @@ with pkgs; libwhich = callPackage ../development/tools/misc/libwhich { }; - linuxkit = callPackage ../development/tools/misc/linuxkit { }; + linuxkit = callPackage ../development/tools/misc/linuxkit { + inherit (darwin.apple_sdk_11_0.frameworks) Virtualization; + }; lit = callPackage ../development/tools/misc/lit { }; @@ -17444,7 +17478,6 @@ with pkgs; slimerjs = callPackage ../development/tools/slimerjs {}; slint-lsp = callPackage ../development/tools/misc/slint-lsp { - inherit (xorg) libXcursor libXi; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; @@ -17856,7 +17889,8 @@ with pkgs; at-spi2-core = callPackage ../development/libraries/at-spi2-core { }; - at-spi2-atk = callPackage ../development/libraries/at-spi2-atk { }; + # Not moved to aliases while we decide if we should split the package again. + at-spi2-atk = at-spi2-core; aqbanking = callPackage ../development/libraries/aqbanking { }; @@ -18419,7 +18453,6 @@ with pkgs; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { svt-av1 = if stdenv.isAarch64 then null else svt-av1; - rav1e = null; # We already have SVT-AV1 for faster encoding rtmpdump = null; # Prefer the built-in RTMP implementation # The following need to be fixed on Darwin libjack2 = if stdenv.isDarwin then null else libjack2; @@ -18497,6 +18530,7 @@ with pkgs; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; freeimage = callPackage ../development/libraries/freeimage { + inherit (darwin) autoSignDarwinBinariesHook; libraw = libraw_unstable; }; @@ -18571,6 +18605,8 @@ with pkgs; gcr = callPackage ../development/libraries/gcr { }; + gcr_4 = callPackage ../development/libraries/gcr/4.nix { }; + gdl = callPackage ../development/libraries/gdl { }; gdome2 = callPackage ../development/libraries/gdome2 { }; @@ -18595,6 +18631,10 @@ with pkgs; geocode-glib = callPackage ../development/libraries/geocode-glib {}; + geocode-glib_2 = geocode-glib.override { + libsoup = libsoup_3; + }; + geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; @@ -18932,6 +18972,8 @@ with pkgs; gsl_1 = callPackage ../development/libraries/gsl/gsl-1_16.nix { }; + gsl-lite = callPackage ../development/libraries/gsl-lite { }; + gsm = callPackage ../development/libraries/gsm {}; gsoap = callPackage ../development/libraries/gsoap { }; @@ -18968,7 +19010,8 @@ with pkgs; ace = callPackage ../development/libraries/ace { }; - atk = callPackage ../development/libraries/atk { }; + # Not moved to aliases while we decide if we should split the package again. + atk = at-spi2-core; atkmm = callPackage ../development/libraries/atkmm { }; @@ -19572,9 +19615,7 @@ with pkgs; libbytesize = callPackage ../development/libraries/libbytesize { }; - libcaca = callPackage ../development/libraries/libcaca { - inherit (xorg) libX11 libXext; - }; + libcaca = callPackage ../development/libraries/libcaca { }; libcacard = callPackage ../development/libraries/libcacard { }; @@ -19626,6 +19667,8 @@ with pkgs; libchamplain = callPackage ../development/libraries/libchamplain { }; + libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; }; + libchardet = callPackage ../development/libraries/libchardet { }; libchewing = callPackage ../development/libraries/libchewing { }; @@ -20359,9 +20402,7 @@ with pkgs; libopusenc = callPackage ../development/libraries/libopusenc { }; - libosinfo = callPackage ../development/libraries/libosinfo { - inherit (gnome) libsoup; - }; + libosinfo = callPackage ../development/libraries/libosinfo { }; libosip = callPackage ../development/libraries/osip {}; @@ -20818,7 +20859,9 @@ with pkgs; lirc = callPackage ../development/libraries/lirc { }; - liquid-dsp = callPackage ../development/libraries/liquid-dsp { inherit (darwin) cctools; }; + liquid-dsp = callPackage ../development/libraries/liquid-dsp { + inherit (darwin) autoSignDarwinBinariesHook cctools; + }; liquidfun = callPackage ../development/libraries/liquidfun { }; @@ -21615,10 +21658,10 @@ with pkgs; }; }; }); - libsForQt5_openssl_1_1 = recurseIntoAttrs (import ./qt5-packages.nix { + libsForQt5_openssl_1_1 = import ./qt5-packages.nix { inherit lib pkgs; qt5 = qt5_openssl_1_1; - }); + }; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt515; @@ -22110,6 +22153,8 @@ with pkgs; spice-gtk = callPackage ../development/libraries/spice-gtk { }; + spice-gtk_libsoup2 = spice-gtk.override { withLibsoup2 = true; }; + spice-protocol = callPackage ../development/libraries/spice-protocol { }; spice-up = callPackage ../applications/office/spice-up { }; @@ -22433,6 +22478,8 @@ with pkgs; vrpn = callPackage ../development/libraries/vrpn { }; + vsmtp = callPackage ../servers/mail/vsmtp { }; + vsqlite = callPackage ../development/libraries/vsqlite { }; vte = callPackage ../development/libraries/vte { @@ -22440,6 +22487,10 @@ with pkgs; stdenv = clangStdenv; }; + vte-gtk4 = vte.override { + gtkVersion = "4"; + }; + vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { @@ -23890,12 +23941,14 @@ with pkgs; postgresql_12 postgresql_13 postgresql_14 + postgresql_15 ; postgresql = postgresql_14.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; + postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; postgresql14Packages = postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -25741,7 +25794,7 @@ with pkgs; changie = callPackage ../development/tools/changie { }; - cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; + cherry = callPackage ../data/fonts/cherry { }; chonburi-font = callPackage ../data/fonts/chonburi { }; @@ -25775,13 +25828,11 @@ with pkgs; culmus = callPackage ../data/fonts/culmus { }; - clearlyU = callPackage ../data/fonts/clearlyU - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + clearlyU = callPackage ../data/fonts/clearlyU { }; cm_unicode = callPackage ../data/fonts/cm-unicode {}; - creep = callPackage ../data/fonts/creep - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + creep = callPackage ../data/fonts/creep { }; crimson = callPackage ../data/fonts/crimson {}; @@ -25793,8 +25844,7 @@ with pkgs; paths = [ dejavu_fonts.out ]; }; - dina-font = callPackage ../data/fonts/dina - { inherit (buildPackages.xorg) mkfontscale; }; + dina-font = callPackage ../data/fonts/dina { }; dns-root-data = callPackage ../data/misc/dns-root-data { }; @@ -25892,8 +25942,7 @@ with pkgs; encode-sans = callPackage ../data/fonts/encode-sans { }; - envypn-font = callPackage ../data/fonts/envypn-font - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + envypn-font = callPackage ../data/fonts/envypn-font { }; execline-man-pages = skawarePackages.execline-man-pages; @@ -25939,8 +25988,7 @@ with pkgs; geolite-legacy = callPackage ../data/misc/geolite-legacy { }; - gohufont = callPackage ../data/fonts/gohufont - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + gohufont = callPackage ../data/fonts/gohufont { }; gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { }; @@ -26384,8 +26432,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - profont = callPackage ../data/fonts/profont - { inherit (buildPackages.xorg) mkfontscale; }; + profont = callPackage ../data/fonts/profont { }; proggyfonts = callPackage ../data/fonts/proggyfonts { }; @@ -26535,8 +26582,7 @@ with pkgs; scientifica = callPackage ../data/fonts/scientifica { }; - siji = callPackage ../data/fonts/siji - { inherit (buildPackages.xorg) mkfontscale fonttosfnt; }; + siji = callPackage ../data/fonts/siji { }; sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; @@ -26555,7 +26601,7 @@ with pkgs; source-han-serif = sourceHanPackages.serif; source-han-mono = sourceHanPackages.mono; - spleen = callPackage ../data/fonts/spleen { inherit (buildPackages.xorg) mkfontscale; }; + spleen = callPackage ../data/fonts/spleen { }; stilo-themes = callPackage ../data/themes/stilo { }; @@ -26567,9 +26613,9 @@ with pkgs; taskspooler = callPackage ../tools/system/taskspooler { }; - tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; }; + tamsyn = callPackage ../data/fonts/tamsyn { }; - tamzen = callPackage ../data/fonts/tamzen { inherit (buildPackages.xorg) mkfontscale; }; + tamzen = callPackage ../data/fonts/tamzen { }; tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; @@ -26593,8 +26639,7 @@ with pkgs; tenderness = callPackage ../data/fonts/tenderness { }; - terminus_font = callPackage ../data/fonts/terminus-font - { inherit (buildPackages.xorg) mkfontscale; }; + terminus_font = callPackage ../data/fonts/terminus-font { }; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; @@ -26630,8 +26675,7 @@ with pkgs; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; - ucs-fonts = callPackage ../data/fonts/ucs-fonts - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + ucs-fonts = callPackage ../data/fonts/ucs-fonts { }; bront_fonts = callPackage ../data/fonts/bront { }; @@ -26643,8 +26687,7 @@ with pkgs; unfonts-core = callPackage ../data/fonts/unfonts-core { }; - uni-vga = callPackage ../data/fonts/uni-vga - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + uni-vga = callPackage ../data/fonts/uni-vga { }; unicode-character-database = callPackage ../data/misc/unicode-character-database { }; @@ -26652,14 +26695,13 @@ with pkgs; unihan-database = callPackage ../data/misc/unihan-database { }; - unifont = callPackage ../data/fonts/unifont - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + unifont = callPackage ../data/fonts/unifont { }; unifont_upper = callPackage ../data/fonts/unifont_upper { }; unscii = callPackage ../data/fonts/unscii { }; - uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { inherit (xorg) fonttosfnt mkfontdir; }; + uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { }; u001-font = callPackage ../data/fonts/u001 { }; @@ -27093,6 +27135,8 @@ with pkgs; bevelbar = callPackage ../applications/window-managers/bevelbar { }; + bfcal = libsForQt5.callPackage ../applications/misc/bfcal { }; + bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { @@ -27276,6 +27320,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; + cyan = callPackage ../applications/graphics/cyan {}; + cyanrip = callPackage ../applications/audio/cyanrip { }; centerim = callPackage ../applications/networking/instant-messengers/centerim { }; @@ -27327,9 +27373,7 @@ with pkgs; ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { }; - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { - inherit (xorg) libSM; - }; + claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { }; cligh = python3Packages.callPackage ../development/tools/github/cligh {}; @@ -27397,10 +27441,7 @@ with pkgs; inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AudioUnit CoreAudio CoreMIDI; }; - csound-manual = callPackage ../applications/audio/csound/csound-manual { - python = python27; - pygments = python27Packages.pygments; - }; + csound-manual = callPackage ../applications/audio/csound/csound-manual { }; csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { python = python27; @@ -27443,7 +27484,9 @@ with pkgs; ctop = callPackage ../tools/system/ctop { }; - cubicsdr = callPackage ../applications/radio/cubicsdr { }; + cubicsdr = callPackage ../applications/radio/cubicsdr { + inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; + }; cum = callPackage ../applications/misc/cum { }; @@ -27761,6 +27804,8 @@ with pkgs; inherit (gnome) empathy; + endeavour = callPackage ../applications/misc/endeavour { }; + enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; entangle = callPackage ../applications/video/entangle { @@ -27787,7 +27832,6 @@ with pkgs; epick = callPackage ../applications/graphics/epick { inherit (darwin.apple_sdk.frameworks) AppKit IOKit; - inherit (xorg) libX11 libXcursor libXi libXrandr libxcb; }; epr = callPackage ../applications/misc/epr { }; @@ -27857,6 +27901,8 @@ with pkgs; icesl = callPackage ../applications/misc/icesl { }; + karlender = callPackage ../applications/office/karlender { }; + keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; @@ -27865,6 +27911,7 @@ with pkgs; inherit (gnome) evince; evolution-data-server = gnome.evolution-data-server; + evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; 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 ]; }; @@ -28127,11 +28174,11 @@ with pkgs; grandorgue = callPackage ../applications/audio/grandorgue { }; greetd = recurseIntoAttrs { - greetd = callPackage ../os-specific/linux/greetd { }; - gtkgreet = callPackage ../os-specific/linux/gtkgreet { }; - dlm = callPackage ../os-specific/linux/dlm { }; - wlgreet = callPackage ../os-specific/linux/wlgreet { }; - tuigreet = callPackage ../os-specific/linux/tuigreet { }; + dlm = callPackage ../applications/display-managers/greetd/dlm.nix { }; + greetd = callPackage ../applications/display-managers/greetd { }; + gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { }; + tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { }; + wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { }; }; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { @@ -28557,6 +28604,8 @@ with pkgs; moe = callPackage ../applications/editors/moe { }; + pattypan = callPackage ../applications/misc/pattypan {}; + praat = callPackage ../applications/audio/praat { }; quvi = callPackage ../applications/video/quvi/tool.nix { @@ -28944,12 +28993,8 @@ with pkgs; }; wlroots = wlroots_0_15; - wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { - inherit (xorg) xcbutilrenderutil; - }; - wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix { - inherit (xorg) xcbutilrenderutil; - }; + wlroots_0_14 = callPackage ../development/libraries/wlroots/0.14.nix { }; + wlroots_0_15 = callPackage ../development/libraries/wlroots/0.15.nix { }; sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; @@ -28972,9 +29017,7 @@ with pkgs; tiramisu = callPackage ../applications/misc/tiramisu { }; - rlaunch = callPackage ../applications/misc/rlaunch { - inherit (xorg) libX11 libXft libXinerama; - }; + rlaunch = callPackage ../applications/misc/rlaunch { }; rootbar = callPackage ../applications/misc/rootbar {}; @@ -29034,9 +29077,7 @@ with pkgs; i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; - betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { - inherit (xorg) xdpyinfo xrandr xset; - }; + betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { }; multilockscreen = callPackage ../misc/screensavers/multilockscreen { }; @@ -29183,6 +29224,8 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; + imhex = callPackage ../applications/editors/imhex { }; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; inklingreader = callPackage ../tools/misc/inklingreader { }; @@ -29196,7 +29239,6 @@ with pkgs; inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); inlyne = callPackage ../applications/misc/inlyne { - inherit (xorg) libX11 libXcursor libXi libXrandr libxcb; inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security; }; @@ -29417,6 +29459,8 @@ with pkgs; kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; + kubedog = callPackage ../applications/networking/cluster/kubedog { }; + kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; kube-score = callPackage ../applications/networking/cluster/kube-score { }; @@ -29428,7 +29472,7 @@ with pkgs; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { buildGoModule = buildGo119Module; }; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; @@ -29881,7 +29925,6 @@ with pkgs; menumaker = callPackage ../applications/misc/menumaker { }; menyoki = callPackage ../applications/graphics/menyoki { - inherit (xorg) libX11 libXrandr; inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -30916,6 +30959,8 @@ with pkgs; poke = callPackage ../applications/editors/poke { }; + pokemonsay = callPackage ../tools/misc/pokemonsay { }; + polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { }; poezio = python3Packages.poezio; @@ -31020,7 +31065,7 @@ with pkgs; qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {}; qemu = callPackage ../applications/virtualization/qemu { - inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor; + inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor vmnet; inherit (darwin.stubs) rez setfile; inherit (darwin) sigtool; }; @@ -31526,9 +31571,7 @@ with pkgs; lightdm_qt = lightdm.override { withQt5 = true; }; - lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { - inherit (xorg) libX11 libXdmcp libpthreadstubs; - }; + lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { }; lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) xfce4-dev-tools; @@ -31775,6 +31818,8 @@ with pkgs; tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {}; + tagger = callPackage ../applications/audio/tagger {}; + tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; tailor = callPackage ../applications/version-management/tailor {}; @@ -32629,7 +32674,6 @@ with pkgs; xastir = callPackage ../applications/misc/xastir { rastermagick = imagemagick6; - inherit (xorg) libXt; }; xautomation = callPackage ../tools/X11/xautomation { }; @@ -32913,6 +32957,8 @@ with pkgs; ytarchive = callPackage ../tools/misc/ytarchive { }; + ytcast = callPackage ../tools/misc/ytcast { }; + ytcc = callPackage ../tools/networking/ytcc { }; ytmdesktop = callPackage ../applications/audio/ytmdesktop { }; @@ -33198,7 +33244,7 @@ with pkgs; oxen = callPackage ../applications/blockchains/oxen { stdenv = gcc10StdenvCompat; boost = boost17x; }; - masari = callPackage ../applications/blockchains/masari { boost = boost165; }; + masari = callPackage ../applications/blockchains/masari { boost = boost174; }; napari = with python3Packages; toPythonApplication napari; @@ -33241,6 +33287,12 @@ with pkgs; taro = callPackage ../applications/blockchains/taro { }; + inherit (callPackages ../applications/blockchains/teos { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }) + teos + teos-watchtower-plugin; + terra-station = callPackage ../applications/blockchains/terra-station { }; tessera = callPackage ../applications/blockchains/tessera { }; @@ -33705,7 +33757,6 @@ with pkgs; fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; jumpy = callPackage ../games/jumpy { - inherit (xorg) libX11 libXi; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; @@ -34268,6 +34319,8 @@ with pkgs; sollya = callPackage ../development/interpreters/sollya { }; + solicurses = callPackage ../games/solicurses { }; + # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -34600,7 +34653,7 @@ with pkgs; gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; - chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell { }; + gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { }; gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; @@ -36688,6 +36741,8 @@ with pkgs; xlockmore = callPackage ../misc/screensavers/xlockmore { }; + xq = callPackage ../tools/misc/xq { }; + xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { }; sailsd = callPackage ../misc/sailsd { }; @@ -36787,7 +36842,9 @@ with pkgs; soundmodem = callPackage ../applications/radio/soundmodem {}; - soundOfSorting = callPackage ../misc/sound-of-sorting { }; + soundOfSorting = callPackage ../misc/sound-of-sorting { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags; @@ -36869,8 +36926,7 @@ with pkgs; tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; - tewi-font = callPackage ../data/fonts/tewi - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + tewi-font = callPackage ../data/fonts/tewi { }; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; @@ -37614,4 +37670,6 @@ with pkgs; swaysettings = callPackage ../applications/misc/swaysettings { }; aitrack = libsForQt5.callPackage ../applications/misc/aitrack { }; + + widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ca3223703079a..cf5b4fcb59876 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -686,9 +686,6 @@ let lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; - lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { - inherit (pkgs.gnome2) libgnomecanvas gtksourceview; - }; lablgtk = callPackage ../development/ocaml-modules/lablgtk { inherit (pkgs.gnome2) libgnomecanvas gtksourceview; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5384881159288..6a18218966621 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19411,10 +19411,10 @@ let perlldap = buildPerlPackage { pname = "perl-ldap"; - version = "0.66"; + version = "0.68"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.66.tar.gz"; - hash = "sha256-CSY85hZugMmNaJ1B0JmVuBM4n9Bpt4RgH23Ff44rQQI="; + url = "mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.68.tar.gz"; + hash = "sha256-4vOJ/j56nkthSIaSkZrXI7mPO0ebUoj2ENqownmVs1E="; }; # ldapi socket location should match the one compiled into the openldap package postPatch = '' diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e41b075ce7103..5eda5fba31662 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -40,18 +40,21 @@ mapAliases ({ asyncio-nats-client = nats-py; # added 2022-02-08 Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 - bt_proximity = throw "'bt_proximity' has been renamed to/replaced by 'bt-proximity'"; # Converted to throw 2022-09-24 + blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 + bt_proximity = bt-proximity; # added 2021-07-02 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 - ConfigArgParse = throw "'ConfigArgParse' has been renamed to/replaced by 'configargparse'"; # Converted to throw 2022-09-24 + ConfigArgParse = configargparse; # added 2021-03-18 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 - dateutil = throw "'dateutil' has been renamed to/replaced by 'python-dateutil'"; # Converted to throw 2022-09-24 + dateutil = python-dateutil; # added 2021-07-03 demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 - diff_cover = throw "'diff_cover' has been renamed to/replaced by 'diff-cover'"; # Converted to throw 2022-09-24 - discogs_client = throw "'discogs_client' has been renamed to/replaced by 'discogs-client'"; # Converted to throw 2022-09-24 - djangorestframework-jwt = throw "'djangorestframework-jwt' has been renamed to/replaced by 'drf-jwt'"; # Converted to throw 2022-09-24 + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 + diff_cover = diff-cover; # added 2021-07-02 + discogs_client = discogs-client; # added 2021-07-02 + djangorestframework-jwt = drf-jwt; # added 2021-07-20 django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18 django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05 django_appconf = django-appconf; # added 2022-03-03 @@ -63,24 +66,28 @@ mapAliases ({ django_polymorphic = django-polymorphic; # added 2022-05-24 django_redis = django-redis; # added 2021-10-11 django_taggit = django-taggit; # added 2021-10-11 - dns = throw "'dns' has been renamed to/replaced by 'dnspython'"; # Converted to throw 2022-09-24 + dns = dnspython; # added 2017-12-10 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 email_validator = email-validator; # added 2022-06-22 + face_recognition = face-recognition; # added 2022-10-15 + face_recognition_models = face-recognition-models; # added 2022-10-15 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 + faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 garminconnect-ha = garminconnect; # added 2022-02-05 + gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 - google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2022-09-24 - googleapis_common_protos = throw "'googleapis_common_protos' has been renamed to/replaced by 'googleapis-common-protos'"; # Converted to throw 2022-09-24 + google_api_python_client = google-api-python-client; # added 2021-03-19 + googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10 graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09 - grpc_google_iam_v1 = throw "'grpc_google_iam_v1' has been renamed to/replaced by 'grpc-google-iam-v1'"; # Converted to throw 2022-09-24 + grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 - HAP-python = throw "'HAP-python' has been renamed to/replaced by 'hap-python'"; # Converted to throw 2022-09-24 + HAP-python = hap-python; # added 2021-06-01 hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 @@ -94,7 +101,7 @@ mapAliases ({ lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 - MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2022-09-24 + MechanicalSoup = mechanicalsoup; # added 2021-06-01 memcached = python-memcached; # added 2022-05-06 mailman = throw "Please use pkgs.mailman"; # added 2022-04-29 mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 @@ -112,9 +119,11 @@ mapAliases ({ poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 - prometheus_client = throw "'prometheus_client' has been renamed to/replaced by 'prometheus-client'"; # Converted to throw 2022-09-24 - prompt_toolkit = throw "'prompt_toolkit' has been renamed to/replaced by 'prompt-toolkit'"; # Converted to throw 2022-09-24 + privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 + prometheus_client = prometheus-client; # added 2021-06-10 + prompt_toolkit = prompt-toolkit; # added 2021-07-22 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 + pushbullet = pushbullet-py; # Added 2022-10-15 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 @@ -122,8 +131,10 @@ mapAliases ({ pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 pyjson5 = json5; # added 2022-08-28 + pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pyreadability = readability-lxml; # added 2022-05-24 pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pyroute2-ethtool = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 @@ -136,43 +147,48 @@ mapAliases ({ pysmart-smartx = pysmart; # added 2021-10-22 pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 pytest_6 = pytest; # added 2022-02-10 - pytestcov = throw "'pytestcov' has been renamed to/replaced by 'pytest-cov'"; # Converted to throw 2022-09-24 - pytest-pep8 = throw "'pytest-pep8' has been renamed to/replaced by 'pytestpep8'"; # Converted to throw 2022-09-24 + pytestcov = pytest-cov; # added 2021-01-04 + pytest-pep8 = pytestpep8; # added 2021-01-04 pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12 pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 - pytestquickcheck = throw "'pytestquickcheck' has been renamed to/replaced by 'pytest-quickcheck'"; # Converted to throw 2022-09-24 - pytestrunner = throw "'pytestrunner' has been renamed to/replaced by 'pytest-runner'"; # Converted to throw 2022-09-24 + pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + pytestquickcheck = pytest-quickcheck; # added 2021-07-20 + pytestrunner = pytest-runner; # added 2021-01-04 python-igraph = igraph; # added 2021-11-11 - python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2022-09-24 + python-lz4 = lz4; # added 2018-06-01 python_magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03 python-subunit = subunit; # added 2021-09-10 - pytest_xdist = throw "'pytest_xdist' has been renamed to/replaced by 'pytest-xdist'"; # Converted to throw 2022-09-24 - python_simple_hipchat = throw "'python_simple_hipchat' has been renamed to/replaced by 'python-simple-hipchat'"; # Converted to throw 2022-09-24 + pytest_xdist = pytest-xdist; # added 2021-01-04 + python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 pytorch = torch; # added 2022-09-30 pytorch-bin = torch-bin; # added 2022-09-30 pytorchWithCuda = torchWithCuda; # added 2022-09-30 pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30 pytwitchapi = twitchapi; # added 2022-03-07 + qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 repeated_test = throw "repeated_test is no longer maintained"; # added 2022-01-11 requests_oauthlib = requests-oauthlib; # added 2022-02-12 - requests_toolbelt = throw "'requests_toolbelt' has been renamed to/replaced by 'requests-toolbelt'"; # Converted to throw 2022-09-24 + requests_toolbelt = requests-toolbelt; # added 2017-09-26 roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15 - ROPGadget = throw "'ROPGadget' has been renamed to/replaced by 'ropgadget'"; # Converted to throw 2022-09-24 + ROPGadget = ropgadget; # added 2021-07-06 + rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 ruamel_base = ruamel-base; # added 2021-11-01 ruamel_yaml = ruamel-yaml; # added 2021-11-01 ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 sapi-python-client = kbcstorage; # added 2022-04-20 - scikitlearn = throw "'scikitlearn' has been renamed to/replaced by 'scikit-learn'"; # Converted to throw 2022-09-24 - setuptools_scm = throw "'setuptools_scm' has been renamed to/replaced by 'setuptools-scm'"; # Converted to throw 2022-09-24 + scikitlearn = scikit-learn; # added 2021-07-21 + selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 + setuptools_scm = setuptools-scm; # added 2021-06-03 sharkiqpy = sharkiq; # added 2022-05-21 - smart_open = throw "'smart_open' has been renamed to/replaced by 'smart-open'"; # Converted to throw 2022-09-24 - SPARQLWrapper = sparqlwrapper; # Added 2022-03-31 + smart_open = smart-open; # added 2021-03-14 + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + SPARQLWrapper = sparqlwrapper; sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 - sphinxcontrib_plantuml = throw "'sphinxcontrib_plantuml' has been renamed to/replaced by 'sphinxcontrib-plantuml'"; # Converted to throw 2022-09-24 + sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 @@ -180,12 +196,13 @@ mapAliases ({ tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 + tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 - websocket_client = throw "'websocket_client' has been renamed to/replaced by 'websocket-client'"; # Converted to throw 2022-09-24 + websocket_client = websocket-client; # added 2021-06-15 xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 - zc-buildout221 = throw "'zc-buildout221' has been renamed to/replaced by 'zc-buildout'"; # Converted to throw 2022-09-24 - zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; # Added 2021-12-08 + zc-buildout221 = zc-buildout; # added 2021-07-21 + zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b49f7e43e1b06..577e5b0b16a92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -291,6 +291,8 @@ in { aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; + aiocsv = callPackage ../development/python-modules/aiocsv { }; + aiocurrencylayer = callPackage ../development/python-modules/aiocurrencylayer { }; aiodiscover = callPackage ../development/python-modules/aiodiscover { }; @@ -3217,9 +3219,9 @@ in { facedancer = callPackage ../development/python-modules/facedancer { }; - face_recognition = callPackage ../development/python-modules/face_recognition { }; + face-recognition = callPackage ../development/python-modules/face-recognition { }; - face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; + face-recognition-models = callPackage ../development/python-modules/face-recognition/models.nix { }; factory_boy = callPackage ../development/python-modules/factory_boy { }; @@ -7474,7 +7476,7 @@ in { push-receiver = callPackage ../development/python-modules/push-receiver { }; - pushbullet = callPackage ../development/python-modules/pushbullet { }; + pushbullet-py = callPackage ../development/python-modules/pushbullet-py { }; pushover-complete = callPackage ../development/python-modules/pushover-complete { }; @@ -9632,6 +9634,8 @@ in { readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; + reactivex = callPackage ../development/python-modules/reactivex { }; + rebulk = callPackage ../development/python-modules/rebulk { }; recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; @@ -11957,6 +11961,8 @@ in { winsspi = callPackage ../development/python-modules/winsspi { }; + withings-api = callPackage ../development/python-modules/withings-api { }; + wktutils = callPackage ../development/python-modules/wktutils { }; wled = callPackage ../development/python-modules/wled { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0f9c461539e6c..61e577bb31aa1 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -248,7 +248,7 @@ let taffybar tamarin-prover taskell - termonad-with-packages + termonad tldr-hs tweet-hs update-nix-fetchgit @@ -359,13 +359,7 @@ let cabal2nix = released; cabal2nix-unstable = released; funcmp = released; - haskell-language-server = [ - compilerNames.ghc884 - compilerNames.ghc8107 - compilerNames.ghc902 - compilerNames.ghc924 - # https://github.com/haskell/haskell-language-server/issues/3190 - ]; + haskell-language-server = released; hoogle = released; hlint = [ compilerNames.ghc884 diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index b81d1bfd59695..6aaf5cdf3794e 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05l29mfa21gw4jd5yc8yb1hz984323qrybnr45rd0mp8gffwf03x"; + sha256 = "1271f7nyrmb0kk93zjsb3zyxng8jlzhhg9784pwfpwvrlclashlw"; type = "gem"; }; - version = "6.0.5.1"; + version = "6.0.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r8lsn429xx4c16g943mimfqrka6drgsvjgdb7mmi7wvlvj68b2q"; + sha256 = "091qjiv0mvmn5k9krqkv1lfg8983mgcmrf11gxa6xkchh74csr6a"; type = "gem"; }; - version = "6.0.5.1"; + version = "6.0.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -150,10 +150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v48f96xd995dybkz62fbjrznrqjr13k1ny2s5ag3ds3g69b36bq"; + sha256 = "0sk2bypzk4igvl1bx1blr6pvn5hxbm453vz1n9hgd0zrn6y9ckaq"; type = "gem"; }; - version = "1.17.7"; + version = "1.17.8"; }; cairo-gobject = { dependencies = ["cairo" "glib2"]; @@ -587,10 +587,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a3mcbjjbk6l2fzxh8ajn8nvny16b20wg6zg1gi1d2x8v836paj7"; + sha256 = "0f3v6ffikj694h925zvfzgx995q6l1ixnqpph3qpnjdsyjpsmbn8"; type = "gem"; }; - version = "0.23.5"; + version = "0.23.6"; }; concurrent-ruby = { groups = ["default"]; @@ -602,6 +602,16 @@ }; version = "1.1.10"; }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; + type = "gem"; + }; + version = "2.3.0"; + }; crass = { groups = ["default"]; platforms = []; @@ -689,10 +699,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pxfpf02ma8b2md9hz5v49zx4vaa7gy9x6sdsd6aigcrq7ymf9rb"; + sha256 = "0kqfwfz3pf6mb22r48ybbp7hkzy2qafdpp1bv1knjd74zyilv73h"; type = "gem"; }; - version = "7.3.1"; + version = "7.4.0"; }; dnsruby = { dependencies = ["simpleidn"]; @@ -814,10 +824,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdc76kgr4f1mq4jwbmq1qvr9c15hb4r1cx4dvrdra13vy9sckb5"; + sha256 = "0b3rfqy87yiv9xmh260nyddxxjqj0vy32xvajvyn5jnjx96jwa24"; type = "gem"; }; - version = "0.92.4"; + version = "0.93.0"; }; execjs = { groups = ["default"]; @@ -835,20 +845,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a6q8k82vfqyzlnrs6r6d82fyz5fminc8p57mr5xkdabs0m2y3mx"; + sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yicplzlh5da8pr64286zga3my86cjsb2y9dqlzsacpw8hbkmjvw"; + sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; ffi = { groups = ["default"]; @@ -1024,10 +1034,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11kc33j6m0nayppkb7645w0ldh8g18pgmxgb8wz39pd5vilr6qpv"; + sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.1"; }; glib2 = { dependencies = ["native-package-installer" "pkg-config"]; @@ -1074,15 +1084,15 @@ version = "3.4.3"; }; haml = { - dependencies = ["temple" "tilt"]; + dependencies = ["temple" "thor" "tilt"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf"; + sha256 = "19ynyc7wzl71hn7jw467xr188v0az679l54167slm3jh5mx6rijf"; type = "gem"; }; - version = "5.2.2"; + version = "6.0.7"; }; hashie = { groups = ["default"]; @@ -1140,10 +1150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w14wk9j375dcvh7cr833jqqsd8974x51ds30m26cr1pwxy8xgbh"; + sha256 = "180kjksi0sdlqb0aq0bhal96ifwqm25hzb3w709ij55j51qls7ca"; type = "gem"; }; - version = "2.14.2"; + version = "2.14.3"; }; http-accept = { groups = ["default"]; @@ -1763,10 +1773,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; mab = { groups = ["default"]; @@ -1907,10 +1917,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01sw335w8wl6rjz8raa8xkxnk36d7ib7zqkc9gdibmplar4x1fqg"; + sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; type = "gem"; }; - version = "1.5.6"; + version = "1.6.0"; }; multi_json = { groups = ["default"]; @@ -1928,10 +1938,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m70qz27mlv2rhk4j1li6pw797gmiwwqg02vcgxcxr1rq2v53rnb"; + sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd"; type = "gem"; }; - version = "2.0.2"; + version = "3.0.0"; }; mysql2 = { groups = ["default"]; @@ -2178,10 +2188,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; + sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; pkg-config = { groups = ["default"]; @@ -2209,10 +2219,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07pk37r7jvrkbxkc8bvd16gx46paif79d9cpsx9dcc95i44mv24s"; + sha256 = "1pxk8pl4gmdmvm4jjhi8apwc23cyqs7rgp5bi4q2gi93k927w3x8"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.2"; }; prettier_print = { groups = ["default"]; @@ -2273,10 +2283,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; + sha256 = "1yabmxmqprb2x58awiasidsiwpplscmyar9dzwh5l8jgaw4i3wra"; type = "gem"; }; - version = "5.6.5"; + version = "6.0.0"; }; racc = { groups = ["default"]; @@ -2304,10 +2314,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; + sha256 = "0jmixih0qrsdz60dhznkk29v50ks55cqq51jjf0yn3amqghh4bhk"; type = "gem"; }; - version = "2.2.2"; + version = "3.0.2"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -2356,10 +2366,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm"; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; type = "gem"; }; - version = "0.11.1"; + version = "0.11.2"; }; rb-inotify = { dependencies = ["ffi"]; @@ -2398,10 +2408,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mp264klwbzh80xwdf8spnicjmq7072bsf38l4jm0j0jha6hh7dx"; + sha256 = "0wd4j2irk88qcrxbhhbrsr6rswz8ckva7n0hsjyffnmx1ya60n8y"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; re2 = { groups = ["default"]; @@ -2435,14 +2445,26 @@ version = "3.5.1"; }; redis = { + dependencies = ["redis-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s2hvsq0nyxmh27cqv00zk0s6bb4dlxfhzng5x0w8qijpw0vx9h5"; + type = "gem"; + }; + version = "5.0.5"; + }; + redis-client = { + dependencies = ["connection_pool"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; + sha256 = "1hkwqi18cbiil787ivvh2s8i6csrn0z3qb4ccp2vhrc2w6ay6ncq"; type = "gem"; }; - version = "4.8.0"; + version = "0.10.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -2461,20 +2483,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0787fwmlvpx5k360dxlcs8r7vijgl2iyvh3zyvl7qyvgshw78k3v"; + sha256 = "1d78i6bfyh5zp5jli0r1qqfykfnh7f0ai2kkgcm9kg1jr4dn98jp"; type = "gem"; }; - version = "1.9.1"; + version = "1.3.0"; }; regexp_parser = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; + sha256 = "0mm5sykyblc61a82zz3dag6yy3mvflj2z47060kjzjj5793blqzi"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -2513,10 +2535,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bx98q7dbjzscv2yq5jjqrb9s4h3vk8v2vrfgib58kfjzvrd8b4a"; + sha256 = "0v269bx6bhnrlxpsmhr8xjv64dwnnykiw9hr58dwghsps1qb8ib7"; type = "gem"; }; - version = "4.2.6"; + version = "5.0.0"; }; rouge = { groups = ["default"]; @@ -2566,10 +2588,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53"; + sha256 = "0l1bzk6a68i1b2qix83vs40r0pbjawv67hixiq2qxsja19bbq3bc"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2587,10 +2609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03"; + sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rubocop = { dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -2598,10 +2620,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13fvwdx88v43q06frrkplspzl8ab4baspvnn9knl8pkxw9qg6p4x"; + sha256 = "1b7zc3gissn5ki7zz2szg1mlxn8zqhgb3bdv96cl25w4mgf4g3in"; type = "gem"; }; - version = "1.35.1"; + version = "1.36.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2620,10 +2642,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l87hrzjch2mdpwi0wf9b5nci7fmz5pfzqn5v44zi3rq80zawigf"; + sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c"; type = "gem"; }; - version = "1.14.3"; + version = "1.15.0"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -2808,20 +2830,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "029zk2w8d9lbxfj0aymrsw0fw675b1y4qd41chhjczj05kb7y8jb"; + sha256 = "1yzv7gn539aqwpada2mvfrnbdygr3d61ryp68ncp3kpx6nbz1x25"; type = "gem"; }; - version = "0.13.2"; + version = "0.16.0"; }; sequel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmmjqv29064zb2l2n38pxqgrcxpglx6lz301m0r2283d1jb13dy"; + sha256 = "1qg80fqxs1rabsg3xrkfkkicnn1z2p02xsb1lxv78a6iw5p17d73"; type = "gem"; }; - version = "5.59.0"; + version = "5.61.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2829,10 +2851,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ix56by4qvpmn042431lzgg613ss5p0d8snjvf33hdr9y2q645qn"; + sha256 = "15ndf1wr45vyqiyc3059f8zv0wp11i6xqfqclsa0v3qf739jb1zw"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2882,10 +2904,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mbjp75dy35q796iard8izsy7gk55g2c3q864r2p13my3yjmlcvz"; + sha256 = "0c2vmy0j5amy9fihs2gz2ssm4bdpqqh4llyjfl6qqqry7f87c6xz"; type = "gem"; }; - version = "2.2.2"; + version = "3.0.2"; }; slather = { dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"]; @@ -2903,10 +2925,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dgj8bjbfblk0lpwbz51sp1p98caxk420rcpz2kpijgk96kzmp2y"; + sha256 = "0cz9fpr7zya6d44070ya0ik4pwv7c8dlqgw4bxgxficzakdxy9kf"; type = "gem"; }; - version = "4.9.2"; + version = "4.9.3"; }; snappy = { groups = ["default"]; @@ -2934,20 +2956,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r8lr7gldwp57xqik4kims6w72q9ww34bral0j5z20a56s6gva8x"; + sha256 = "0smcpi3x87chkdqdclhgh36xlbwm7r44r58m3k1w4mcikdwlpjl7"; type = "gem"; }; - version = "0.46.0"; + version = "0.47.2"; }; sqlite3 = { + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z1wa639c278bsipczn6kv8b13fj85pi8gk7x462chqx6k0wm0ax"; + sha256 = "1i95rgfxdj2rhxifps27dz7fjfdih5iyl7b01di9gdmh9m04ylk6"; type = "gem"; }; - version = "1.4.4"; + version = "1.5.3"; }; syntax_tree = { dependencies = ["prettier_print"]; @@ -2955,10 +2978,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13qapwg7vqz2vw98ivj484wqp7dwcwj78mhd474wglpli3galw5q"; + sha256 = "1mp0b13gbkfz2chgn48ak28611yhgykdmx53p0yzby5j6ifsdirf"; type = "gem"; }; - version = "3.5.0"; + version = "3.6.3"; }; syntax_tree-haml = { dependencies = ["haml" "prettier_print" "syntax_tree"]; @@ -2966,10 +2989,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pax2garyxmj7gvprnb4p4rzazqplrvrp10im0xvrckfim66k513"; + sha256 = "137v6pwkqv6dcm9r7fl3i3l8hpalilr61vy08zx3ybb1bzp2fckb"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; syntax_tree-rbs = { dependencies = ["prettier_print" "rbs" "syntax_tree"]; @@ -2977,10 +3000,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03x7i1gc8zm0c22z95dm624wqg30ndwnzwza4nidcpjgaz8xr9hz"; + sha256 = "1fx8c9a40pvph8ffj3x8advdfimacx6xn7kvnba6yf4sw9aal7hx"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.1"; }; taglib-ruby = { groups = ["default"]; @@ -3038,7 +3061,7 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-AM0pP5ZafGRLF4/+BUsuA6DuNNc4wX2/OsTZeL4p6Io="; + sha256 = "12p856z7inf47azpvh9qswsfx8035r5hbzlg2x5n8z2sjqzjkk80"; type = "gem"; }; version = "0.17.0"; @@ -3195,10 +3218,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; + sha256 = "18hihq3hxs2ywxh3ixm366cawwy4k733mh680ldaa1vxjiraxj58"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.1"; }; ZenTest = { groups = ["default"]; |