diff options
Diffstat (limited to 'pkgs/applications')
285 files changed, 1991 insertions, 990 deletions
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index b2a74e23dc5ea..6e5c53091d7c6 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { # See http://www.baudline.com/faq.html#licensing_terms. # (Do NOT (re)distribute on hydra.) license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index ff7cce36712de..46b801bba331d 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.5"; + version = "6.2.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-LvTvNBo3aUGUD4vA04YtINFBjTplhmkxj3FlbTZDTA0="; + sha256 = "sha256-1kXYh2Qk0Wj0LgHTcRVAKro7LAPV/UM5i9VmHjmxTx0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 9739a88586ae0..0a99edd7b069c 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/BDK1PyRw4xOt+rzC9yX29aRQb1aDnDBIenSz+859OY="; + sha256 = "sha256-XSqcj8+X6QMBnIusPB9VNrgcbdiWhNMOYeFyKklGmO8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 5cfd9c7cbe898..17c8f936efd11 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -86,6 +86,7 @@ mkDerivation rec { homepage = "https://www.signalyst.com/custom.html"; description = "High-end upsampling multichannel software HD-audio player"; license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/applications/audio/losslessaudiochecker/default.nix b/pkgs/applications/audio/losslessaudiochecker/default.nix index 9fecf7b9ba924..b7150d6b67713 100644 --- a/pkgs/applications/audio/losslessaudiochecker/default.nix +++ b/pkgs/applications/audio/losslessaudiochecker/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation { meta = { description = "Utility to check whether audio is truly lossless or not"; homepage = "https://losslessaudiochecker.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ p-h ]; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index b58bd0b275726..8c34318191bcf 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit homepage; description = "Editor for the ${brand} ${type} digital mixer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index aca96ef5da351..7663d1745d2fb 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ StijnDW SuperSandro2000 ]; + maintainers = with maintainers; [ StijnDW ] ++ teams.c3d2.members; }; } diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 8fe6beebc4b8d..1bbbe3583f90a 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform, easy to use, fast and functional audio editor"; homepage = "https://www.ocenaudio.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ onny ]; diff --git a/pkgs/applications/audio/pocket-casts/default.nix b/pkgs/applications/audio/pocket-casts/default.nix index 46625253d0f6a..7b7bf50a2f83f 100644 --- a/pkgs/applications/audio/pocket-casts/default.nix +++ b/pkgs/applications/audio/pocket-casts/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Pocket Casts webapp, packaged for the Linux Desktop"; homepage = "https://github.com/felicianotech/pocket-casts-desktop-app"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 820475be0c65b..d186755eccea2 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer ]; diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/applications/audio/redux/default.nix index 45ee78917ace3..41254cc9e50ee 100644 --- a/pkgs/applications/audio/redux/default.nix +++ b/pkgs/applications/audio/redux/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sample-based instrument, with a powerful phrase sequencer"; homepage = "https://www.renoise.com/products/redux"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mihnea-s ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index acd1d80c86d57..1be3f53dce5f9 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "Modern tracker-based DAW"; homepage = "https://www.renoise.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = []; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix index 92d3151c835c0..06e711941a637 100644 --- a/pkgs/applications/audio/rymcast/default.nix +++ b/pkgs/applications/audio/rymcast/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Player for Mega Drive/Genesis VGM files"; homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ astsmtl ]; diff --git a/pkgs/applications/audio/soundwireserver/default.nix b/pkgs/applications/audio/soundwireserver/default.nix index db8d28989b27a..b296ebdad602a 100755 --- a/pkgs/applications/audio/soundwireserver/default.nix +++ b/pkgs/applications/audio/soundwireserver/default.nix @@ -35,6 +35,7 @@ qt5.mkDerivation { homepage = "https://georgielabs.net/"; maintainers = with maintainers; [ mkg20001 ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 14caa6db9c45f..ecbdaec7f28af 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -167,6 +167,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.spotify.com/"; description = "Play music from the Spotify music service"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ma27 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 503079b9ed4b8..1bde46cdc944c 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small, fast and powerful modular synthesizer with pattern-based sequencer"; license = licenses.unfreeRedistributable; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; homepage = "http://www.warmplace.ru/soft/sunvox/"; maintainers = with maintainers; [ puffnfresh ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix new file mode 100644 index 0000000000000..1befa966d3514 --- /dev/null +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -0,0 +1,119 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, makeWrapper +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, ffmpeg +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libappindicator-gtk3 +, libdbusmenu +, libdrm +, libnotify +, libpulseaudio +, libsecret +, libuuid +, libxkbcommon +, mesa +, nss +, pango +, systemd +, xdg-utils +, xorg +}: + +stdenv.mkDerivation rec { + pname = "tidal-hifi"; + version = "4.0.0"; + + src = fetchurl { + url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; + sha256 = "19gx9x3v5ywlvg5vyqgj6pghzwinby0i8isavfrix798pfr98j5z"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + ffmpeg + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + pango + systemd + mesa # for libgbm + nss + libuuid + libdrm + libnotify + libsecret + libpulseaudio + libxkbcommon + libappindicator-gtk3 + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libxshmfence + xorg.libXtst + ]; + + runtimeDependencies = + [ (lib.getLib systemd) libnotify libdbusmenu xdg-utils ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + runHook postInstall + ''; + + postFixup = '' + makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ + "''${gappsWrapperArgs[@]}" + ''; + + meta = with lib; { + description = "The web version of Tidal running in electron with hifi support thanks to widevine"; + homepage = "https://github.com/Mastermindzh/tidal-hifi"; + changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ alternateved ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index a0b3cf2879e6b..682627c0e8218 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass."; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 orivej ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 17b3b1197f458..9229cba4839a2 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ToneLib Jam – the learning and practice software for guitar players"; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix index 9acb6982c6a72..29c5cb6a3f24e 100644 --- a/pkgs/applications/audio/tonelib-metal/default.nix +++ b/pkgs/applications/audio/tonelib-metal/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index 41539503e0203..74fe8645acf3c 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; homepage = "https://tonelib.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index d10a0d8794180..06f0d47d8a2cd 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { conventional music players. ''; homepage = "https://www.seventhstring.com/xscribe/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index c1e41e41284d3..07f006aa0cc1a 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { + supported sound systems: ASIO, DirectSound, MME, ALSA, OSS, JACK, Audiobus, IAA. ''; homepage = "https://warmplace.ru/soft/ans/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.free; # I cannot test the Darwin version, so I'll leave it disabled platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index d13278b7deecd..654da25261d3f 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.exodus.io/"; description = "Top-rated cryptocurrency wallet with Trezor integration and built-in Exchange"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ mmahut rople380 ]; diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index bf43bac96958a..e3b54a7465634 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -225,6 +225,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability."; homepage = "https://sparrowwallet.com"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.asl20; maintainers = with maintainers; [ emmanuelrosa _1000101 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index df30302bc6c50..e4e97cae21a0d 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -43,6 +43,7 @@ buildDotnetModule rec { meta = with lib; { description = "Backend for the Wasabi Wallet"; homepage = "https://wasabiwallet.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index e3cea78629f41..71ee383282390 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Privacy focused Bitcoin wallet"; homepage = "https://wasabiwallet.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mmahut ]; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 325dfdd85d3b1..29c4bb6c884c9 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -86,6 +86,7 @@ let meta = with lib; { description = "A hackable text editor for the 21st Century"; homepage = "https://atom.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ offline ysndr ]; platforms = platforms.x86_64; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 39b94664f0475..19a2e378f30a7 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.eclipse.org/"; inherit description; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 65604926b8fda..1149117e67b24 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -74,6 +74,7 @@ stdenv.mkDerivation rec { homepage = "https://pinegrow.com"; description = "UI Web Editor"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; [ unfreeRedistributable ]; maintainers = with maintainers; [ gador ]; }; diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix index 9475f44170314..4b56698602382 100644 --- a/pkgs/applications/editors/quartus-prime/quartus.nix +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -89,6 +89,7 @@ in stdenv.mkDerivation rec { meta = with lib; { inherit homepage; description = "FPGA design and simulation software"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 3b169bf4e5331..52134d15da823 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/solemnwarning/rehex"; changelog = "https://github.com/solemnwarning/rehex/raw/${version}/CHANGES.txt"; license = licenses.gpl2Only; - maintainers = with maintainers; [ markus1189 SuperSandro2000 ]; + maintainers = with maintainers; [ markus1189 ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 074584e3360e5..6c9a43779f763 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { meta = { description = "Sophisticated text editor for code, markup and prose"; license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index a5cf2d560c015..e1d5b3d4d36e3 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -131,6 +131,7 @@ in stdenv.mkDerivation (rec { description = "Sophisticated text editor for code, markup and prose"; homepage = "https://www.sublimetext.com/"; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 81eaa442425bc..de9bf276aa5bf 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -142,6 +142,7 @@ in stdenv.mkDerivation (rec { description = "Sophisticated text editor for code, markup and prose"; homepage = "https://www.sublimetext.com/"; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "aarch64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index d8167f6098791..42a1b730fe15f 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, callPackage, ncurses, gettext, pkg-config +{ lib, stdenv, fetchurl, callPackage, ncurses, bash, gawk, gettext, pkg-config # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; @@ -18,9 +18,11 @@ stdenv.mkDerivation { inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; nativeBuildInputs = [ gettext pkg-config ]; - buildInputs = [ ncurses ] + buildInputs = [ ncurses bash gawk ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa ]; + strictDeps = true; + configureFlags = [ "--enable-multibyte" "--enable-nls" @@ -36,6 +38,13 @@ stdenv.mkDerivation { "vim_cv_memmove_handles_overlap=yes" ]; + # which.sh is used to for vim's own shebang patching, so make it find + # binaries for the host platform. + preConfigure = '' + export HOST_PATH + substituteInPlace src/which.sh --replace '$PATH' '$HOST_PATH' + ''; + postInstall = '' ln -s $out/bin/vim $out/bin/vi mkdir -p $out/share/vim diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b11d09063f8a9..f96dba825a6c5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-06-08"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "005a0377c95fe521a65a90af26aadb46085871c8"; - sha256 = "1yn541cn5m0jmwwhiygqlds9hvxsm9w6x70r24ig3nj2p9q41px3"; + rev = "7561d31e5e668333d7e453c063ded5a2805f0e41"; + sha256 = "0850akn3ik044dnz53d2ikdgw8b7yk6vhy58a346ac9cq1damz7r"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-06-07"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "d66173b58abe941966e0e4666e54963c7a2d7dc9"; - sha256 = "1cfz9xj5498n3mpw2f4fk0gxdp92d697dp7mm5vnz78h17p4px6y"; + rev = "b7e45f2b1db2bb7b1ec8d9713607c3579f43207c"; + sha256 = "12wkzf821fglinwacs2va28my5s8bf0xs9xzxifvcvbf5kp7k55x"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-04-02"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "3ededaed2f9923d50bf3860ba8dace0f7d2724cd"; - sha256 = "1n2h5wsp9vclsvzr40m1ffb6kjmcg0mccfj790giw77qa2i9s1rl"; + rev = "4237c4647ec30215223d597f6172c8c46b8b239e"; + sha256 = "17krclvg5y645g9vk43bpmhg1pzf4m8dlif5ar5h92qvbih8sw7i"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-06-05"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "2084c3ce26aba0aea0a450b35c5971b48f277574"; - sha256 = "0p9rsgk6ynikhic8r9iy5i5rklg4dmri0yrm4gslmrp2bdmn111k"; + rev = "dd35fd75c480da0e0239d69a607aac1347c395c6"; + sha256 = "02mqp20vc5jjrf8d1padldnp3fdks0wjanwd22zr56y8zphcaxvc"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -546,12 +546,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-06-08"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f10349b48b173d50b523ce009934bb4bfba04f7f"; - sha256 = "1s6ba5h0cv8y80x2nv9m98q724xv242nqzgxxh7bniakzp3jm4j4"; + rev = "91e8422d6d67f1b1139b57b8707945ea2531443e"; + sha256 = "1fwvxs7ifshdpvzkfqld66cdlhvbrp76bpm603w1qaskm88fj2pf"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -570,12 +570,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2022-04-22"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "4781fcfea5ddc1a92d41b32dc325132ed6fce7a8"; - sha256 = "03i75403lskpgaqv7xp5hk4v6kqb0sv15ciil9jyj735ylhry3qq"; + rev = "ef27a59e5b4d7b1c2fe1950da3fe5b1c5f3b4c94"; + sha256 = "0w4864v6lgyzjckrsim8si9d6g7w979n81y96hx2h840xgcj22iw"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -678,12 +678,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-03-08"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "9f8e50033cb724d8856907a5fbf4685eb3efda24"; - sha256 = "00j0fp57lqcn3qvkb392shj1mqfv9vmn5wjcsibf0y6vbcq17xxh"; + rev = "aa8a99e87e64276d52556f4d9d4f4a19afd37556"; + sha256 = "0r79iq6fl4rcpadwvwma70gxk57lri15bqb5p12xad67fxd40320"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -714,12 +714,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-06-09"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "0b16a5f1f0da15c4808fafbad5a1024140a598c7"; - sha256 = "0gfkvfpj97ijw9rbhy80hq3ly10c4zah4l5zzsw4xpnjwcx9gnxg"; + rev = "b19bbfe041c67f3f1144e4c88a1d88a7314bfa5b"; + sha256 = "0ha9b3612i42ldjkq4ip00pbwr7za5bfjrph745c4xdy5dhbx2m5"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -750,12 +750,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-05-06"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "7c9477614fb95b103c277a98bf3f588e337cd7ac"; - sha256 = "1d502bfkr6qxrqr0jxwngj22cz4bh7v36kakpb9g4qbxdd3h1r30"; + rev = "2c0103eb26b41cf4b58c3063d7549746d0f5fa73"; + sha256 = "0m93a89as399bj29mw8nnx0s9bn3kmy74bys97hv4r1n5nc720fy"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -798,12 +798,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-06-05"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "a6a6209d1f2f599553741bbb02ce940fe8a5661b"; - sha256 = "17851pqs1hr6vv86n2c7jz08xq0zm0iw9kbs393mfid2839clck9"; + rev = "d7123f0368aa7fdd10f587176ad60aedcdfa44de"; + sha256 = "1mqhhfaqd07ck0m6izqrf97a1vlkjcwvmjz5c5z2xssjlmcrx8pg"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -930,12 +930,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-06-05"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "c78b3ecf9539a719828bca82fc7ddb9b3ba0c353"; - sha256 = "03sf49s26nb9aqr16f776p58vs3dx9kyyach2jj4k1lp318w6ikp"; + rev = "88c742f4af988c98aee5ac1c92f056905c636aae"; + sha256 = "1nlxsg2nzkpxwj5jiwksg1hqp25g6hzj075zjvxbix72xdiv98lq"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1098,12 +1098,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2022-05-09"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "12463cfcd9b14052f9effccbf1d84caa7a2d57f0"; - sha256 = "11fbxw8rrhypazd256qwjvf8gg0laqb9b4h9yqdgvwj810y6n6wg"; + rev = "62fc67a2b0205136bc3e312664624ba2ab4a9323"; + sha256 = "0wcys2z1yw6raxr9x5nm19ac04q8gfri4pw9mfsh18smv4rnl8zs"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -1194,12 +1194,12 @@ final: prev: cmp-dap = buildVimPluginFrom2Nix { pname = "cmp-dap"; - version = "2022-04-27"; + version = "2022-06-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "cmp-dap"; - rev = "69f22863739482120f9240919db1ac7d4dea3278"; - sha256 = "03cxmnbr4sn69dzg1fg4r7rgja4invzfgpid123mhahq6sn7jir9"; + rev = "2c4cecbb9c4d255acc87ccaca727d1ad2f2b8c90"; + sha256 = "11wg62nf37ka40l9acwxcklzghapwiw3x549vnp397sl70r3w6b2"; }; meta.homepage = "https://github.com/rcarriga/cmp-dap/"; }; @@ -1302,12 +1302,12 @@ final: prev: cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; - version = "2021-09-10"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "kdheepak"; repo = "cmp-latex-symbols"; - rev = "29dc9e53d17cd1f26605888f85500c8ba79cebff"; - sha256 = "17qjw0yp0cmgyjy593qq6rfh7fgfwgb7mxg7a0kg1drjpncwv8gl"; + rev = "46e7627afa8c8ff57158d1c29d721d8efebbc39f"; + sha256 = "10354d12in7sr5hdamj0cw8hgja6pwl70i9lcxlnha5jzkx8xm03"; }; meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; @@ -1374,12 +1374,12 @@ final: prev: cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-signature-help"; - version = "2022-03-29"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-signature-help"; - rev = "8014f6d120f72fe0a135025c4d41e3fe41fd411b"; - sha256 = "1k61aw9mp012h625jqrf311vnsm2rg27k08lxa4nv8kp6nk7il29"; + rev = "007dd2740d9b70f2688db01a39d6d25b7169cd57"; + sha256 = "194i2b6qbl3z4j2p2s6sig2fac8i9kglkdwdc5h3x2q7avw70yrg"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; @@ -1638,24 +1638,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-11-11"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "60828294b9ba846c78893389d4772021043d2fa1"; - sha256 = "1y7rslksa558fdh3m4m626vpvs424pvxkkk70mr57is47cminm3m"; + rev = "44bcdc4c62a773a52f0a09cff074e61890870b59"; + sha256 = "1d0ryxqs6jx2vm5db6ca2aciqsl0559clbskif4kjp3j7ybnz9my"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-06-09"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "aa49b7ff2c7aa75aaa538479b552297e38952b38"; - sha256 = "0m0c8rg7lpaf6kpjaw9qxkrd4jj4n4kzxnmxksgww3s2hmnj8x5w"; + rev = "e956ff8a94bc73f5a315f0b103b7202fccedd848"; + sha256 = "0s7jq8xfvb8g24gpzc3s9wcy91l2fs1hl8h7kz79r4mljmqppzs8"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1710,12 +1710,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-06-05"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "b4d732a29b66c75e6d130cab296cc604a2d73bc4"; - sha256 = "08k7p189xh5rwyl9fjfmcg6z3yz6xmlyfpdf3a69vcvnixqg9ww6"; + rev = "87e5dd692ec8ed7be25b15449fd0ab15a48bfb30"; + sha256 = "17a7vg7yb1qxzz4a4b0bwqrh3mv1y31233xd1wihw81a0jzc5jkf"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1782,12 +1782,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-05-28"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "d554468ebee92c42adbbd1c6bf380eb668bd06d3"; - sha256 = "0npnj71jnk2vvsp56vvmh3vjfxqklxdg4fn585ikgygv53fndszq"; + rev = "81dba1e2741686514f466701ca62ce3831d49a08"; + sha256 = "0mmvdhxzj8nv38nw1vddzzg7xkair72x7lwk4lkd369yc3bbwv6g"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -1795,12 +1795,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-06-07"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "3c69bab36569d5d0321351ec956fc43a8d409fb0"; - sha256 = "0wfhj4i1ycwsdmpkk9jcfmq141mqlf40sl4ymqd0zqrwzb8yz5m5"; + rev = "2c26a00f32b190390b664e56e32fd5347613b9e2"; + sha256 = "1ii8vjmi73i7vq9w3g13b5m0g5z0sivivkr4mav831yq7qbxvgm2"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1963,36 +1963,36 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2022-06-07"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "aa9e451dda857c6615f531f8d4e4f201e43d7a03"; - sha256 = "1i272gzvm4psqynw7pqyb00zlmx9q0r8z9l5iswy6kjwgvzz9298"; + rev = "c2e75a3a7519c126c6fdb35984976df9ae13f564"; + sha256 = "0m65y0pvc7sdj2xc3r97nb5md1i0iqcyri6h83hvs88skrmwnpap"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "8303d9265567a10a57ee88ab674de77ca6661075"; - sha256 = "06jmbqrszb5n3lsjfk2q0fz7gyx9g3zb7ivrj4wprdnnws7nyl0a"; + rev = "78d1c7e607ee8aa417c989f1c811ac73ee5dab9c"; + sha256 = "128ajrr8zj3mpimvapn0i1g34sp42wammh83gkhvf8xrfrwbd1l1"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "7920ea2527f12620701c08c48e1f668e2ccd37b7"; - sha256 = "1xb590xs4n9gkrslb9v9apw7h3x3w48s6c6kkzphdabys2i9sdd4"; + rev = "3c17b7a8806e809e1707774cf56a459dc914e309"; + sha256 = "136lizq5hvvq99n23gjsjnhv8q3kkjx70axasva49abpjnbpaxms"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2011,12 +2011,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "fc168d99aeade7c3529b8883c12fdec17aad0f7c"; - sha256 = "02p72z384xk08a2hw8byasnxvl865wxngj08s7zp07cv2vzf3hw0"; + rev = "83a03e23da4bc52b8cf2fa13bcace18c192a32f8"; + sha256 = "0dz24pk9dr4wmm58iyvhr3iwcbv6pvwc04s3gmp26hzds37phws2"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2155,12 +2155,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-05-30"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "a36b3232c98616149784f2ca2654e77caea7a522"; - sha256 = "0106jhw9fg2zmk0fqnr126f9gnh5bw7sjrxldn06ajj15ll15p9p"; + rev = "6f5cb262141f41d4c603cc987cdb64bf1ea3b216"; + sha256 = "12lv8kwlb6bmk4bbp6vnym4w6ivasp3k9xgyhcm752wbf56zgzqy"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2529,12 +2529,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "ca297a7e526b42b1ea0e4bd6eebb36f2654125a7"; - sha256 = "1vr7yx7i863brmpbayxc7k9z14ai0naa030ck43cknib1bdilpkp"; + rev = "2e77bedfe11f52621fad1d8c20ffbddd8e36d137"; + sha256 = "0661163vkaqnsy49ha0vgx0wjy71zwi14j80q58mfgvmacc31zj9"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2589,24 +2589,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-06-04"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "2c7c3a1bfbd7ce1a62ef61e6cfdcdb9e8c04d1f0"; - sha256 = "0g3az80iisdbk5w6yqhpw8ws5jh82hzqwq8y6808n3f0ki1b5mz9"; + rev = "91ce1f39311ad74c1e3bcad1e78efcd4fa3bceaa"; + sha256 = "0gjqyvp8xfndgh6yljgm1cfvkgcayjxh07ljq14yijhmg86q00x2"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2022-01-22"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "a8e3e66deefb6122f476c27cee505aaae93f7109"; - sha256 = "19k6nii3p6a4vfyf7xxrkhj7wfamjivdp22bn1mhx4zcw8h01lkn"; + rev = "d354117b72b3b43b75a29b8e816c0f91af10efe9"; + sha256 = "12qvximadgb9z2i0hgvj4p4nxaqk0aqbnaqpafpma73xyb23hx5v"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2675,12 +2675,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-05-31"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "eca7c8c196215f687319295c81e6ba1d4e2f53a4"; - sha256 = "10jfag6ngarq2gnwlz4w7b0ckm9j899lppznz4sbrhisv35l4mjf"; + rev = "65ea4a8325d5d4f09bb76ddec7f2148314067eee"; + sha256 = "1ma7iq103k4gij070wi0wa2s9c92vxrg0nkmslryvc2l8rwqc4id"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2759,36 +2759,36 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-06-05"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "7ba49dd915c32ede51a6f6db3c4367748707a156"; - sha256 = "042kdnki0k6fyp951r054wlwdfm3a2wm4m4q6as9x8dikb80yn00"; + rev = "951a05d3f6ebc785db728ccfdf1759a2cf7c15ff"; + sha256 = "1d0g3cylci2ph7crmw888jjjpindbmab5h4z9y7qsvl5633aclk4"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2022-04-17"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "35757c7c9364d940efd8a46877acde04193819c2"; - sha256 = "0b8y7qailjg2366dw03pbfsr7lq9js8jzfcpw8ljyfim94fcj650"; + rev = "3d064304876941e4197db6b4264db6b72bd9f83d"; + sha256 = "1lkznmavw2f4ckh3yjjvdhja313ia0aayn5pkf6ygjny1089gcih"; }; meta.homepage = "https://github.com/wincent/ferret/"; }; fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-05-20"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "37d536bbbee47222ddfeca0e8186e8ee6884f9a2"; - sha256 = "1y0b1x2kl7dmc6kzg1pi1rb16kx8ggi5ybfli1y38hw398h9z7fi"; + rev = "46d1110435f1f023c22fa95bb10b3906aecd7bde"; + sha256 = "0v0jnzj288swbp0w8xa7287sbql1rfgziqdk1gbcgvzs7zlvczbr"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2856,12 +2856,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2022-06-08"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "bd6cd6744528425cead90d796ad7a96ae4d58b33"; - sha256 = "0b3fzsppilpjc33ql4b7rbxvh2ip5kbyhjvqmfmg0kvyvx8d2m3w"; + rev = "b17546f502c23447f462340ee126b1ce0023e943"; + sha256 = "1y8xgdflp0gpq97an6ichf5sl8w75hq363x697z3fdryfsa1ldfq"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -2988,24 +2988,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-05-16"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "0694c278f081958e48f3a6e136c130d15cf8576e"; - sha256 = "03bg2ld2sh08zarjn5h4c4ypnr51k03qxpj8rk13vm6f6zfg9dnj"; + rev = "f19d6902dfdecb3150a9dbe153599524ae080dd8"; + sha256 = "0rii15z51gz97vc688w5si0jb9vdnzq8vvz3yx52rghm535yv46y"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-06-09"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "343322108d2458994f64af3396efccd4875326b5"; - sha256 = "0lq9dk2iglphjn8n8ai70spyz63cin987mnjn8415g258nyfis8x"; + rev = "6a4392564b818061731c6a39fcc116ff9fc97dd0"; + sha256 = "02pidn8w9gkglmsmjqy8lp8wq0s91rxpj96bgpwq6f09hci8mazg"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3096,12 +3096,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-05-17"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "801570e3903b0aea86c7fcba44f680cc62dad077"; - sha256 = "09xxzs7bixli5jmbxnigsbwafvz83k63v56drm7lpvvfhl39lbwf"; + rev = "1bb73289929107309d2d90f7582ece5e9436bfd8"; + sha256 = "02ybfv5pm7m8mbciccz0j9k21bjhf6kjpp527y6m4r2mdc4q808r"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3154,14 +3154,14 @@ final: prev: meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; - gitsigns-nvim = buildVimPluginFrom2Nix { + gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-05-26"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "27aeb2e715c32cbb99aa0b326b31739464b61644"; - sha256 = "04m1767cndrx46xsa6frf77xv64hmr6w21dk2wh4s0sqjvqqm1r6"; + rev = "3543443eb3856fbe4a9d70f3fe8dc73e007199a1"; + sha256 = "00mrf5qwbzgh280lq2lc7xgqmgh8g18j2f46796lbwpcb4ciawh4"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3192,12 +3192,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-06-06"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "ef86fff7371974fd69aab1fd926bafb76893bb1b"; - sha256 = "03i21lrcqi53swbjwfmh21fbwxw3nxb9rcislzys5078j86wicvn"; + rev = "900042f7dda528cb980b7f1056ed7c21d4402826"; + sha256 = "05dhbxclnn5fz9wapa6gvf7p9qk88ir6ix72sahv0vpjcccr6gk6"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3300,24 +3300,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-06-02"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "8aba3586fdefbdad3f758e24799245b799ae5a6f"; - sha256 = "03hkgzirnjahi44xwbzmpcbzpj4lgydq07wva32cyyrv3h8qplar"; + rev = "5d2cec690bfa56b863a7b9d482152d873da7ba7a"; + sha256 = "0rhhxmpjml0w9rmvph1wn70yrybnai4w71x35gn8ig6dn446q4wb"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-06-06"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "8135da3a90b257a2c902614e71d9cbbef8308cad"; - sha256 = "1mcyamqxnbhqdg2skkyz6g229qa08a8c0ssbcjsbcy92d4qyx852"; + rev = "3352c12c083d0ab6285a9738b7679e24e7602411"; + sha256 = "044dvp03yw5r745qbs6kp2lni1psfn63807dsd6fw8k2z6m6sbx3"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3336,12 +3336,12 @@ final: prev: gv-vim = buildVimPluginFrom2Nix { pname = "gv.vim"; - version = "2021-10-19"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "386d770e916dd680d1d622e715b9eb3a77f21bd1"; - sha256 = "184kvydzz9nyg0sv3crn38v04s24km0ma8vfg4i3agmffb1riibk"; + rev = "1507838ee67f9b298def89cbfc404a0fee4a4b8c"; + sha256 = "0fkwhyywjhh2r6c8534kvfn3shv3rjvcc53wm2pz3yqk73b6r2c9"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -3408,11 +3408,11 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2022-03-13"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "7bd3ffb073dde94c8d86c1b49c47ef9d2f2bc605"; + rev = "d6d3ebe931529681c99aff18bc4d4c2487867e06"; sha256 = "0hld4cr09bd0y4k9yz1lls5dqdak605zf5rnv75zi5scbgwly19c"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; @@ -3432,24 +3432,24 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "03675eba34d416dd22ad49b2d0e52b6113b434ad"; - sha256 = "1aaniq2qd59n126v6j11gsl39c9h7nq0x2hidwpdz81yhas97ix2"; + rev = "a3cf6684bcb9fc974609ae81424f285f05280d90"; + sha256 = "0inrri38bkxsi936z2xa8n9lvzm9b7vl2wajyp8i6wr4byhprml3"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-05-31"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "21258d4194a606d8d53bf68d06cc25457b2e8449"; - sha256 = "0ily343jzx9ra2mxp1flmshsl5bara0wx10fgyrrps1cfag383jm"; + rev = "104aa65f9155d34629c9623d5dac39b5b2ad555c"; + sha256 = "0m0w69mmy471c2axr8n15c8spd7w8zdb0ri2cnf571kpmb68szxr"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3504,12 +3504,12 @@ final: prev: impatient-nvim = buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-06-09"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "7821524b7fefb02af8b8e4c4745532b039ebc8de"; - sha256 = "1nvx2b4qr55dxr9nf641flp7adcad3zp3dlwrb1zc7ay9m5ylg2w"; + rev = "969f2c5c90457612c09cf2a13fee1adaa986d350"; + sha256 = "10nlz4hq1bqjsnj9pkadi3xjj74wn36f2vr66hqp7wm2z7i5zbq3"; }; meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; @@ -3733,12 +3733,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-05-19"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "a6db77965a27ca893ea693d69cc3c152c000a627"; - sha256 = "1asq6a2mia695gmwa81ix4ijna8p9z8mifnqksnlk1kslz68bmdp"; + rev = "76df2251e813fdec244b2b593be62accea930119"; + sha256 = "0cnrnf44gm51jpmkf8kx9zfk6qxcg7725aav31n2w81zm1rr8d2s"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3805,24 +3805,24 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-05-10"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "1f9f372b9fc137b8123d12a78c22a26c0fa78f0a"; - sha256 = "1s4bpi7i86246p28pjk99rv1qj1gp7l7zwfch0f23nwnggm8s6pm"; + rev = "9c73fd69a4c1cb3b3fc35b741ac968e331642600"; + sha256 = "0mij8mrh7fmynhz7d3i11bbsvykf2pdp3ldk8w0sbi15cgfp8fr4"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-05-30"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "2be99e3fa33ab24beb035ed46c51b353fc373cd5"; - sha256 = "0235cc6wcir4qgv9yksrj3ycd3w44w2gkb1zn0yljd5ygi3xp2mz"; + rev = "9abfeae95ae8f51a21e384b97e006f139aeb4333"; + sha256 = "0lcxjr3n5g55i5brw0skvy9m1kp64wggah5j97mcl0r9x4h508lv"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3865,12 +3865,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-06-09"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "905c14e9b701cea1f05db755398ef0060f2c1fcc"; - sha256 = "0bv7fnbb4505ckfbd37h9gl1ss2jgargcf14b6kcx620xcw2adnn"; + rev = "f06d2fa627c66689ec0ef68fe95765f0af0ded88"; + sha256 = "00d27f9h4s83c1bsqskv48fhcyd2yf1fn7bpzqgqipbdsj7n04hn"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -3973,12 +3973,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-05-13"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "c5b93fc1d76a708cb698417326e04f4786a38d90"; - sha256 = "0lgk9i240mgzf7f3j3z93dkj00fi3rypn79zc60wqdyzhpg4r4lm"; + rev = "8fb5ebb2c18db13bc17556376526068dce0803b5"; + sha256 = "1mrj4x0bd68qp2g4hsmxnqr1dfv5d7c2kajkir8q78pq2csdci8j"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -4045,12 +4045,12 @@ final: prev: litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-05-21"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "92aa9f0f1fcda8cf1bca9f5ea296c4af74ba3928"; - sha256 = "1j9sgsia0w8cmkhd1qm59f0d2abh7rxwkl0nlsqcg9b1k0naqiay"; + rev = "3d3447816beea47ba93753afa7b717f5deb8a26c"; + sha256 = "0p4wp53lpm9awkbf6cwzxzxjbvqf5r272hlygbiwhv048lbz26xk"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; @@ -4140,24 +4140,24 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-05-26"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "9ccee20602a10843e3ea3ebc2536dfdcc6cee9a3"; - sha256 = "1l5naxm1mx8l3xwiqrm60w0avsbhhpxnbr4sgqpnmigb9p2150ip"; + rev = "49837977e210959c552bf357dc40ce18fadca501"; + sha256 = "07rywxx31wqxnw8i4irl2mq8di5dwj12bv0vqwi80vxhpvjqn1jk"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspcontainers-nvim = buildVimPluginFrom2Nix { pname = "lspcontainers.nvim"; - version = "2022-05-30"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "lspcontainers"; repo = "lspcontainers.nvim"; - rev = "3c9d2156a447eb111ec60f4358768eb7510c5d0d"; - sha256 = "043ylgpzl1ahcf62s6m0y65ddwlxcw79qksqr2304c4vhzv5sv8w"; + rev = "ed5ee65f7c71a7963b18cfd1644134f1a65b3d4b"; + sha256 = "01sh8jawp8k73l17zvs374pmciyjqqgll89bb228jls9vhqvwkdr"; }; meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; @@ -4176,12 +4176,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-06-02"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "e4beaeff66ae4f70d0b67fe045b70d78780bb947"; - sha256 = "1in3yhbr535xrzgnm6n8623xgqm73djphv2xnd1q84psr1lrkzb7"; + rev = "b4f345998fba6c894d5de3aa42cb71a71e6c6ee9"; + sha256 = "0bxkrjmf56axdhzdnw58dv1i7yqsp57yj675lmmp2agnfifmfvm9"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; @@ -4212,24 +4212,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-05-30"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "3362b28f917acc37538b1047f187ff1b5645ecdd"; - sha256 = "0pfkh7zhnwhbfdcild5vayymw4vqzcfb31nq1y33pk1zlvpwxksv"; + rev = "5113cdb32f9d9588a2b56de6d1df6e33b06a554a"; + sha256 = "07npk6x4ljq7f3wfcs3liaxpn23x4gdxr5jq8vglhd1xj3l99mh5"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-05-28"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "52f4aed58db32a3a03211d31d2b12c0495c45580"; - sha256 = "0drc847m55xwiha1wa2ykd5cwynmvd5ik2sys9v727fb4fbqmpa0"; + rev = "a12441e0598e93e67235eba67c8e6fbffc896f06"; + sha256 = "055y9bm8npn8n1xysk83l7ghf0760f8037jm32zf9fc8zk1ki98d"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -4248,12 +4248,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-05-30"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "aa4eea49179852376fb9e5716aa5d03d4707373b"; - sha256 = "1xb6pc96jq9haa02h6zmp5gaqq95yxlqnniz5f31554vrhab51kd"; + rev = "6923ccef17c5276bc5d3cca907082e19ee165d55"; + sha256 = "0jyq8dszbncrqfbsajbwb3j59jj8gyngi2nmz0hg902kaif4cjib"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -4308,12 +4308,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-05-26"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "f24cc6cf1dcd34350769b9cb28254b3f28973cf7"; - sha256 = "1sgpips6s2rxb2vnm6zbqmggra8qbb63nws1y1c60rqw249dw513"; + rev = "33d764439816ad80ded0f60b4bd8c038c9f96f43"; + sha256 = "154hhvh44408m8n7vy9js7xakqv62qh0m8ffnvb65w63k1fjmwhs"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4332,24 +4332,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-06-02"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "6adaf4c42455c093f00d0df3882ab48838423a57"; - sha256 = "0198f7818m58h2bxgdnfnx5nm7vxi2psssx105dn6ndg55yf2qsx"; + rev = "cc8fb168b95620ec1611916a6d2a74e6a5cdcbdb"; + sha256 = "1v7j8s19r20ljlyha9d10vpaarxlqsfn6ns4qc2p3z2ihbcaapq5"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-05-09"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "5d44fe7a3a5f7041c4220a71e8fe83d8c8498042"; - sha256 = "04rqv8c5g1fs8pymlf2fcbm09k64bvpiqmjilf59m843vkvgk1xf"; + rev = "a9f47afe1032d119a1ceff2714d47e4055564d07"; + sha256 = "1ihx2vhrwyj3zmhnzwdcq54kygm5zic14ccyld995s7vjc4d15ig"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -4692,12 +4692,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-06-01"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "441c23d355b77f4067a1ad018c5dba64efd7ff7f"; - sha256 = "0yay92x3jmvpgqhx0hv0w19fjisakmmdzd286m656v5g26hmfxj1"; + rev = "2b33d2edba011799c496a2dc7c77ebbe1b3c5b76"; + sha256 = "10si9k7ybf1spw5jf8iizisx5xivzljk12ixarjrx359d9nzbi46"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4752,23 +4752,23 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-06-07"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "c0ebefa516aa9e93431f0a55e033db0dec072857"; - sha256 = "0x9qpybjj7h6b6l10bkfmwf3qn54fcbbb5spx8n1hkny40npvnn5"; + rev = "efc10f915ec53bbc8179ae591397b61aecf8f393"; + sha256 = "0cdrpmlx9riz1gkpgfnnk1hry19l2iggdkmf6c1zsdmbjs56c45s"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { pname = "neoscroll.nvim"; - version = "2022-01-13"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "07242b9c29eed0367cb305d41851b2e04de9052e"; + rev = "71c8fadd60362383e5e817e95f64776f5e2737d8"; sha256 = "1xcj3dmrcnqrk2dzzr137n0g0crfyg3zk3220202v6b4vylairnh"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; @@ -4812,12 +4812,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-06-05"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "621b5eeaf9b5c1b7affb327df3889f869b3c2893"; - sha256 = "172pxda6168a3b6xx2ba8njq72y3y5bybg5a983zncxvn00qpi9a"; + rev = "ad1e6b8cc25062ee426cd8690d28f82cfe840f58"; + sha256 = "1khn5kvmjh42i17hsvjs03bz4523kvshdw2mwa5g4jn7292lf4z8"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4872,12 +4872,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-10-29"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "eed488b1cd1867bd25f19f90e10440c5cc7d6424"; - sha256 = "0hlyn2l9ppjn92zaiw51i6d15li15z5083m13m0710giqx05qrak"; + rev = "fc85a6f07c2cd694be93496ffad75be126240068"; + sha256 = "02z32hrh4ykv4waq22y9ng8hwxxm8s5f2kxqm57pkixyy6b8zvzi"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -5028,24 +5028,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-05-06"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "abdbfab89f307151db83b1a5147cd390ef27ff99"; - sha256 = "0z49sfnsr7hmfr4vrd82f1m6kvswfqq31n4fsdmjy9h4qmjb0w5f"; + rev = "0f590b762416bcf2c93621f77a21aa8b8e23d7d1"; + sha256 = "16z5fqw606ngkbvscw2cpxwm3lki5igqkslyc0hxdagnwiqm1p7p"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-06-09"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "5d5cba15594c1b093a2177b339f34b3e3468fb46"; - sha256 = "0pr8xxcsv6aahgcfqls3sp5k58dsq8bgvdhh8b6zsmrpaxsh3rz3"; + rev = "ff40739e5be6581899b43385997e39eecdbf9465"; + sha256 = "1snnh6fsn89fx7l5bjbfg1kh3cbadg2qg1rin889f4xka1yqa4x6"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5088,12 +5088,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-06-09"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "84cde3547e9a8b16db0bfe523e98e19b7be5148b"; - sha256 = "0hkfa28lcldacsxfccp99wbp42qp3cxffh5rg5s2brkkr3xdp3yl"; + rev = "4a95b3982be7397cd8e1370d1a09503f9b002dbf"; + sha256 = "18vn3wy83nscd0znagq9gw7bzf9ljkqiny04xbk5p2l85w4xya7k"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5124,12 +5124,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-06-06"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "1a58f72ac731a3cf17708301ddf094c2033ebc4e"; - sha256 = "0iy4kfd7a5pmsr63gjaplpxgw4nsrhsric7r3dhl3zisdzpn9kzm"; + rev = "d4bc26ce482bd980fb90b7171fe7dece7411b01b"; + sha256 = "05m1607rycqfwd23gr92ds5bkvcr68cjdpqxzma5wrac0cssdx6x"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5160,12 +5160,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-06-09"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "15c7bf7c0dfb7c75eb526c53f9574633c13dc22d"; - sha256 = "0fncx8cr915p5wxjb2wqmc5l3p1mjy0vwmkik4alz422c9zh436z"; + rev = "df6734aa018d6feb4d76ba6bda94b1aeac2b378a"; + sha256 = "0i6icap7x0p8f6i0vgrnqz2rhwc05qgsiflwndmca5dxarmxysxx"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5256,24 +5256,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-06-09"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "8092586db723beb41312f288e38a7d8edc6459d9"; - sha256 = "01rf6jl4b9amhkdjw8ayyx55njmklrbyb98kf4ybbcsgdjj587y7"; + rev = "014ebd53612cfd42ac8c131e6cec7c194572f21d"; + sha256 = "0qp15ihgwxamnly9ng6qmf051rz6yjg86p00dz39ffy02f8fvr60"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-06-06"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "d76d6594374fb54abf2d94d6a320f3fd6e9bb2f7"; - sha256 = "1yibykhd0kilzz67rmn392l27mmjmrcw62vmcilmyldnymxlqg85"; + rev = "52f4840cb95e6638f18a74b71b536c3bd12e9fd8"; + sha256 = "1vbhmz5hkgbb9z03g1552wbmzmnfgyr3x45qhrlnv50fkl2rrj8v"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5328,24 +5328,24 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-05-31"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "713e333d3d5cecaaee20c1e4d55fb5a344b5ca2e"; - sha256 = "19jm1i5z1y3bfyp92rwjmbxjalhp3anbmfafhrp10f7sd3mbcxhf"; + rev = "c617a18561f710c22f521f7efd05c1374a1b8073"; + sha256 = "1rk2z7ibrsh9gqrxisf13ybx846rxhlrx6s3piabhhr5x7m3h79n"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-06-09"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "c1e561d2937048174916667af0349bc4b7b3d2e9"; - sha256 = "0g2r45yx2vx2j7yx5n2gc4v36629vz0ngaz3q1hmwpcr15qxbb3v"; + rev = "be4bb5b903af81f04b316425b8ba8142504d023f"; + sha256 = "0n8a0lnf8jbfds29mk5xxk68cp7i4rb8xsfa1qk50i662l570knn"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -5364,12 +5364,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-04-03"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "1944094111217db8d40aac697ffc71f16136d9ec"; - sha256 = "0f0lqldrgzi72qrafzwqk3i71v74xvsrhgrfnidnbnvd3jc7sa0b"; + rev = "6cd78e73b28af4618cf67a470e53e13d59899914"; + sha256 = "0g2xvgw1bxz76hil5iiy37gpv69xjqy2s2q79lqc1pcr54c3392i"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5388,12 +5388,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-06-02"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "72a40cdcde653df645644375307b4ea0cb658281"; - sha256 = "180v9810bmnh9xf74sq7nrgv98iva5xpka9yyhqp7n9li7c7xp93"; + rev = "3a148dac526396678f141a033270961d0d9ccb88"; + sha256 = "1fbxgssd9s0vfa6w00hhvqzmc48dgk271z0rchnch0b317q88vr2"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5448,12 +5448,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-06-08"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "28a5f3e24ccc9f70026629e9b87670ab893a870f"; - sha256 = "11dhxa18djf2rmbnrfm60z9pcmjnblha62yl6sc8d137fj87jppp"; + rev = "14f12733599d8feb4b3c6b9fc9e945e0bede59c2"; + sha256 = "1prhnjk78pl3cvaydv9i4jyz8j8y7za0lwkyhwax1n0qgv1m9kq6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5472,12 +5472,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-06-09"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4eac16e87f24ad26738e632446e29766e87141ae"; - sha256 = "0shpjy5p316yxs6d8028s93z1i7rv5fafpr8vk2zvgrhnvza6q1k"; + rev = "c55e830aa18bd15f36f7534947ec7471f2b43af7"; + sha256 = "0625rsaw5ba92fszk5bvkcg5misj7bacrlma9k8i09hbg81f3w28"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5496,24 +5496,24 @@ final: prev: nvim-luapad = buildVimPluginFrom2Nix { pname = "nvim-luapad"; - version = "2022-04-10"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "rafcamlet"; repo = "nvim-luapad"; - rev = "3f0d7453987c7bef87d55b8051f252578853399c"; - sha256 = "0h97hqbx7kbwkqhbq76k5l6rcr2bmdm17g0dps2g82lizmyhpfk0"; + rev = "171e204ed65dc9308833ff80026fc6b7cec22825"; + sha256 = "1k7zly9xpdrxf6221w2x898fdapagzwjcf8sf6agis7flqhp3j8f"; }; meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-06-02"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "6738fe3c0e2142de01c753f8b7c18281d11488ce"; - sha256 = "19k330fv68z9icdlbf6bjn8ckwrjkdn9k9hl4r4ss95lm7sfgzd8"; + rev = "58ecfb61e4617139d3954138ccccc4c0befa89e0"; + sha256 = "0qcz1ijm62ys0d7gzbgq9h537pcfyzqmnmm3gv6gxzvfbqr4mcwq"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5544,12 +5544,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-06-06"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "8252aaedfd57ad010d9fee2f620924eac063537d"; - sha256 = "1p7hwqsxryqc25mazdxvl9q7b1w57qn1sfqg5p9ksln7zh9qs44l"; + rev = "7caeaaef257ecbe95473ec79e5a82757b544f1fd"; + sha256 = "1k4p358hasbcwihx4prm7arz3frvj0s17imqx865nm2bsh0gpf3j"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5580,24 +5580,24 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-05-01"; + version = "2022-05-29"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "a4512c9a9c0de83494fac66d02e04ff4f0805cae"; - sha256 = "0vaabj2m84ba3ryl6n5s5rryjg06kjk571z6cmdgccff4lvq9d4v"; + rev = "b13352f259c383cb1c921a1d5f2f98b072e53539"; + sha256 = "0cs0ir8xhivkqij25y4gf6zddq3c4j0qcdmv81k8lr1awfbr3017"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; - version = "2022-05-13"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "a6af3a33cfe78c97f3adb2d86d3165bb25fb0ec3"; - sha256 = "1z7wi72dqrw0fgsnm0s7zmxb72cq564dqvvpl1cqgizf4ab2a42a"; + rev = "faba49ba6b53759b89fc34d12ed7319f8c2e27e0"; + sha256 = "1kfbad6v7azk8lhsjpsli2ba2x5wncjac35iazjhdx6dbv0gw90l"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; @@ -5628,36 +5628,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-06-07"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "1caca6285427ebd2b4f0eb10f4d1ae3956ff09c0"; - sha256 = "13m893pjn816fp5b0s423vbgk5f6fdhbiqwbbxzz2311ijg72nhh"; + rev = "79258f1d670277016523e13c0a88daa25070879f"; + sha256 = "1wrq3g6n82lyxzgbkfgpsi908ghwzp773fslrfyxk3mwgvdj396s"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-06-09"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "a3cef7881ca8e2b8843a4500df44f94311bcc3df"; - sha256 = "1yfhc1yhrnv7k0l1p38zydl2xrjfzbwixz0iawpmybw5vmnyl0vi"; + rev = "8eccd820afb012df6ae22678aa01d4053ab84365"; + sha256 = "0465y4c7i33rn5yq921viik1kmv22pii9fr7nm678hkmhwi2qhwx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-06-09"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "81116dc03abf35ca99c7910f9f779961042dea12"; - sha256 = "150r80ik8i11a5dxn71j55gmgpfivlfmnvkqdxjwz6c14asi4ycj"; + rev = "b05cd9cbb972f48b583b581615a046f814ccaca0"; + sha256 = "07pxlms3j4kcd7ybmyjjkvjkkjxz084g3lm6kfv015pnca78wjj2"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -5724,12 +5724,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-05-28"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "18cb3a45e0ff843d48e8637a36b9cc6cd89d71b0"; - sha256 = "0w8gzxps0rn20cr92ib5zk3xw6l2i8032081r0v34rry1xahdam6"; + rev = "837167f63445821c55e6eed9dbdac1b0b29afa92"; + sha256 = "104rvha3bqsn5rnrii0z023x7a4ph3rljlmqjgaki27crfnxx8sj"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5820,12 +5820,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-06-08"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "71d4dcfe56d4c45b7f1a1520d65ef5a86d2bc9bd"; - sha256 = "020k4nni9kqq4sqh86rsca3vkf49b56pllxk81yriwyazn8m3y2r"; + rev = "f56b3f81661925e6487c2483ca8350c7287c70d1"; + sha256 = "005vxvy87hfmsvg0ksmc035md99b0qykgzlwj4nhcvv1pwpjbazx"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5856,12 +5856,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-06-09"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "52b1ebd80831dd1232b396b82a77fba977fb6e2c"; - sha256 = "173y7gwwwf7wdd07kgs95p5iznl202p022vyzzwc4zz41z50zzpa"; + rev = "af5595a5bf2358ef8611ab98f5e3c058b321c38f"; + sha256 = "0sd2isramda96kmb7inif3n3dn2p5qrccw0b3apj6pwxf3ridsf5"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -5880,12 +5880,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-05-26"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "06e9020c4b014a56547dbea53163cdd1c6c0c1ec"; - sha256 = "1biylhq7n0l7kac26ibv0zqwvfynqa1g3pn3qf9yz7ndrfqfwddk"; + rev = "5d13f02a8ba579d68be02f877a8c38bac9ff17ed"; + sha256 = "1f9p7crgkq68ql2ri8mjfkp5r6dhq9pmsl3073pg2hzgirb08fgl"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5928,24 +5928,24 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-06-07"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "d5907359eba50a9f0017043fb220d542e17c5e1f"; - sha256 = "0wqwxh13vh1hxcajb6zw2js36264zab8mxjnr0bkxmk821h68rwb"; + rev = "d3b95d2036d57f67a0f78ec975c7ef10e9134908"; + sha256 = "0yfdfpqygk77rhbyi28makmghq58rzl5aah8lpqihr604j1l54z5"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-02-18"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "10de4d0d50ec1d4d26118c4aa067a9d09e370c9c"; - sha256 = "1mhhff6knqqq6pgmd3w6vfljcig37yyxvmrvhb205y67igy3vcr2"; + rev = "45e409c69063a057250833a747e52e2ff00dd722"; + sha256 = "048rzckb35d4s96kmk6yhbv756yhhcv6kl7nc3y96w18qjjh5ymy"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -6072,12 +6072,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-06-08"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "9c3239bc5f99b85be1123107f7290d16a68f8e64"; - sha256 = "1d948hq5aa8wbr1lvpi3c54mlgh8z6yk25bfn4ckbs1g1giar8ih"; + rev = "968a4b9afec0c633bc369662e78f8c5db0eba249"; + sha256 = "05x9hnz960ljcb2psqycxgdmh99j36y16vbb9l92wjv5szkz37x5"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6181,12 +6181,12 @@ final: prev: purescript-vim = buildVimPluginFrom2Nix { pname = "purescript-vim"; - version = "2021-04-21"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "purescript-contrib"; repo = "purescript-vim"; - rev = "d493b57406d2742f6f6c6545de5a3492f2e5b888"; - sha256 = "1qnf8lg4a6xxn335z57nqb4yp7ij62yr408nbc8m6xwnznck3wa7"; + rev = "af5fae0b43241e9fc3e0442782272728844bec3f"; + sha256 = "05v81i4ialja4wq3rp1fy09zjh7rvwb6pjhig7zg9pfddd015pki"; }; meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; @@ -6350,12 +6350,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "21b47bda407194fbe1f603256e101c26c0dbe589"; - sha256 = "0ggd17mmvxpym4ablhy3s46yw9a3xavn9rzvla3j83skpmqyhmmk"; + rev = "7328413fdafeff52731e5f4961a574ad2fa0837d"; + sha256 = "07jwjcys9h2sjnh7vlf3rjjl254b7qh0axwck66d5hk0i7xviqhm"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -6518,12 +6518,12 @@ final: prev: scrollbar-nvim = buildVimPluginFrom2Nix { pname = "scrollbar.nvim"; - version = "2021-11-16"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "scrollbar.nvim"; - rev = "590b23af866a32277cf803aca0fd770d5b39c2e7"; - sha256 = "1dvlmmxykf3vyhyvv5aiqbz8fd7zvpw4xq1nxnf3wyj371caawaq"; + rev = "bc97c132e8367efecb2ecb937d385e7dc04eb5a1"; + sha256 = "14g2q9nzdh9ffp2b8z3sdicrn4xq3ksq8mjxdi7cm44rlfyzfs04"; }; meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; @@ -6699,12 +6699,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-05-31"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "c2f8a7259e4b67fb4d0242afababbb1dda3285a3"; - sha256 = "1ni8b2b3cqqmi8lr4dh2f5bwnxwcdwqdjfvvds4m8jq2s3kql4bh"; + rev = "e72e59d3e2cad8af17a1e2a0f6772ea56af32e2c"; + sha256 = "0yw98fj4b7vm5p5kvzvpgnmlgc3p54gdh1znlhpz5jkq4r59ggsa"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6723,12 +6723,12 @@ final: prev: space-vim = buildVimPluginFrom2Nix { pname = "space-vim"; - version = "2022-05-22"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "space-vim"; - rev = "79f8ddcfe1312e48595d2aed3eae8c021137db2f"; - sha256 = "1diqpkaspjcqlnbwpawh4yhls56776mndbskkcf7x69m1kfwkzip"; + rev = "b5bd319aa4c7bede97ec1eaf1dffaf7fbc9aa8a8"; + sha256 = "0hbxqs548z9zjjzizcz0g7h894sg4jyw97qwg8fahy0pvi976694"; }; meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; @@ -6771,12 +6771,12 @@ final: prev: spellsitter-nvim = buildVimPluginFrom2Nix { pname = "spellsitter.nvim"; - version = "2022-06-02"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "spellsitter.nvim"; - rev = "430a25393abbf482bddf03c224cd5b8eeb27b5e1"; - sha256 = "1cypvpyaarn9ckin2cgf2hpsq5qj517pz64imvyckzg22x9cf6yi"; + rev = "c1b318f8b959e015f5cc7941624d1ca0f84705dd"; + sha256 = "17v7scc6574afmjfhhzawpxhhh31fz118xzbjg1l8qnbdnb159bh"; }; meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/"; }; @@ -6832,12 +6832,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-06-07"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "de2cc544127d6dfd7f6ff3d4960b21dd6db4f1dd"; - sha256 = "1mj4m1fk9y4l6418zamiqln09dg2h4cw9k9bywv55gd735gwfapp"; + rev = "1ed8bff0f7522bbcb79428f91a5cacacb3ae0331"; + sha256 = "0ckvl97v1jhr7wrrmvvgbi23z5bl29ng7f0l7hvrmm5m6c4cpkny"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; @@ -6952,12 +6952,12 @@ final: prev: sved = buildVimPluginFrom2Nix { pname = "sved"; - version = "2021-10-22"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "peterbjorgensen"; repo = "sved"; - rev = "2f98472720d0e0c7da5a93b4ab4574f75747f693"; - sha256 = "070fzga0b039wjhfzb7s0s422kv3as7ifv94ma6vh62ml6zm6mpl"; + rev = "7da91cb0eacdaae5e1a41722e95800c98d4ca675"; + sha256 = "0rp5pklym8bnl1npgglh096i9ssrdbn2r99arh42sbdca71spbiw"; }; meta.homepage = "https://github.com/peterbjorgensen/sved/"; }; @@ -7025,12 +7025,12 @@ final: prev: tabline-nvim = buildVimPluginFrom2Nix { pname = "tabline.nvim"; - version = "2022-04-19"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "kdheepak"; repo = "tabline.nvim"; - rev = "2eb56826bf7b85b9090aff73a696e0e803bf89ae"; - sha256 = "10fqssr8la7y54q7iz2kgx1axv2rwmv0mjvnz0yvadcfz80q2ksv"; + rev = "5d76dc8616b4b7b892229cc05cd0f4cd0200077a"; + sha256 = "0k9yk7drxbjfwjfqmg7iam2vaz05rk3shd5lap8qakwvayvas258"; }; meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; }; @@ -7303,12 +7303,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-04-28"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "4658d78523a5a005af80243f1d0b4e7e2a118dae"; - sha256 = "0fpq6jfycl5hmz7ch5ris72qjabvhvbaj6wm9gwgl7ids99982p7"; + rev = "8cd22b696e14b353fe8ea9648a03364cb56c39d4"; + sha256 = "1qrk2i7yvvrqg4yjma1q6c26wdlapc60yriiqx5mhfam9xh28s24"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -7387,12 +7387,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-06-06"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e6b69b1488c598ff7b461c4d9cecad57ef708f9b"; - sha256 = "060149lbhsbn0vfdivng5pc48lnfhpjwsdc0ppvvvl45b5in7k27"; + rev = "d88b44ddf14670cffa9fdb1eaca7a0429a973653"; + sha256 = "11ahi16nd21p9413d3rdw25bgzjkp3k83p6a1jwka3pk15c87nl0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7495,12 +7495,12 @@ final: prev: tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; - version = "2021-07-17"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "tomtom"; repo = "tlib_vim"; - rev = "70c4e222464020edc2809c932b488daaf891eeef"; - sha256 = "1amx220nbh1s51z35pkhvl3110pbha5qj2rdgxvg8dbqha7py9fx"; + rev = "223c696eab4a3a59a33352531e42c74c721510e7"; + sha256 = "1x9s9ypk934lkqpcyvycij5803y1vz5i3q8p8di6d6jv04ylvgvl"; }; meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; @@ -7568,12 +7568,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-06-07"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "50f88d316261bfe56854cb75b9d092061c38b21e"; - sha256 = "1cf6vqjcn5nk2ymjpflpxr9ic2k0y4bnxzy24n0q8vp05dp69qv2"; + rev = "8f2e78d0256eba4896c8514aa150e41e63f7d5b2"; + sha256 = "0mrjha2vadxc8n0q4kqq8x8xf03b2k0yksi68j6r1lbkd1i0rwmx"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7808,12 +7808,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-06-04"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "d2e2a1fbed196e3bb273fe87bbd821a7e80be298"; - sha256 = "00jvhicwa9wmf1pbd4fi4423jh02x5i7h5bgi21avfgyfxrvlaaj"; + rev = "8f8fd1731c614a76a41fda43b5405b35ffdae3a6"; + sha256 = "1gh5pa754mfnh5nsayq6gf6daz3ysbghd85drj35692x6jz8fpif"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8288,12 +8288,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2022-06-08"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "fc8eb893db0c3c7eb204066d1954a59bc78819b9"; - sha256 = "0c8d84pgg6rck6pxm12w46k1smsaw0d83hs899ws78zcamamp7y2"; + rev = "00df1ac5df05247238cb2ae2a0770b62209e3aa7"; + sha256 = "11k6s5qzwd6fcd2hjr6p3w08yqfh0mrnpl3nkyfz8lf8jpd6ps1b"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -8516,12 +8516,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "181524923fe04c554e37fc5acab51545b2a4715e"; - sha256 = "0355hn1v5k1j86k8bw61vjb84cbgsg214ax07l5jrfk5dzh1avcl"; + rev = "48b7b60c6743f4bc82d3edf61978c1c593276cc2"; + sha256 = "02sr55jqly1b8cllhaw124ig9q3p5m3v7s2vprfqrfyy3w681xfm"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8576,12 +8576,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2022-05-27"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "97ef6f96bd95c3dbd725946607e7290be0266153"; - sha256 = "03f506y3gv1hx0y66xjpg1v0nli63fh1qrvp05dwjki2vdzxmz03"; + rev = "caf254ffa59b91c41851024a58d1eaa806a81bc9"; + sha256 = "0ympd38yf9wlm37sgamyxi8nal0k7imd173xxfp617sj7lrnnx5q"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -8780,36 +8780,36 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2022-06-03"; + version = "2022-06-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "c2495b008f1adce6d21745b2c4c576eecc985959"; - sha256 = "1zj1bab5ck9k9c11cmyszmlnfw3sis79kmlag2a0c0p035rzsl35"; + rev = "136d82e1884f86b9f9bbbcc88bab6d199928a46e"; + sha256 = "1chbvrpykswcmph3yjpv17j5j47azvb90i1a4j0pwc2mmak6gnjq"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2022-03-06"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "1c60988abf17f426b87a1ce2de6b6eabfd5d6b2b"; - sha256 = "0b6mgmaak6vh2adkzdh9s5b5js362hv2hg14zwrb5846cjpbs21i"; + rev = "22ef15e7103b78850473b57ef48233aaec8d9f64"; + sha256 = "1ibr1db06b9bxa7jnspix6wmf1z8fl3g5rrxskgfhfpdb2blwihm"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-05-02"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "7bd114b88da4bf8115bd85d70fb531e4b6d72eb7"; - sha256 = "0mb74z2kr85wd17kbhf8qx02iciq31aqg7y12k1isvmxkv4i0hhw"; + rev = "50cbfc825bd58081f916f989d7ae78e5320e858b"; + sha256 = "0y2cnafw3ahxfvjc5g39nrpiwn502hp3xarnp8c3pg85hzf13jrc"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -9224,12 +9224,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-06-03"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "875c404da92bb716fdfb33d4948277651ff345a9"; - sha256 = "0gkbd8vvyiln3v1f0hgx34ixhbqda8ggivqfgpnb7vlx5j9za706"; + rev = "e3f2d94d722603f8b65088ea1d7e0329951985bd"; + sha256 = "0d7r5g1wrcbq6ahd3hbwpjw54qk8k471wm704cmpdlgfjbjxdfqf"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -9296,12 +9296,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-06-07"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "92c73bb0507338441733198d630a1fe5e7fdac3a"; - sha256 = "0skxvlxnxcwj22qwh166i1kkn7iir3jndw1ixwvh3iipq46910zq"; + rev = "8b39d29d947618913ba1db32de605a6335875b99"; + sha256 = "0zmn09rh17zjq0pkf6nmmpwkchfvj8ycr2559ndjc5vdw8r10x70"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -9368,12 +9368,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2022-05-18"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "0e571394d9c17026917235fc3df8f8d9184bc4d0"; - sha256 = "11bifrm9b5i89yg94368npw0la57icw8v9074ry7rp5f5r3jg3k8"; + rev = "5143bea9ed17bc32163dbe3ca706344d79507b9d"; + sha256 = "02vk8lgl6zswg6bdg1qy4qrh47bwflil601z8i33yjx5q2qrq0ra"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -10054,12 +10054,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2022-05-25"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "ca55491ce36f30263a56b0dbd2bcb4a26be34154"; - sha256 = "0pamfqjxiqk7rs5cn8s81197f8rilr01ka11hpbzamflz9v2lz9c"; + rev = "78fdcae8cab810892c82d555a63bdcd20b8e1397"; + sha256 = "0wr56azflkjx4v7xw44c960byfcak7kjgkk9a482rj19iywk9141"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -10162,12 +10162,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-05-27"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "9458f6e2d49112958499f0c82e1d6f18baa70248"; - sha256 = "099rlqfw45gr4szi2f1zdzayrsw504ihqpn6a7byg5h89a617kwy"; + rev = "74e458bc9c7532ff1959b2443a1d73494e3673b6"; + sha256 = "15m00ihfka0nlvn86q6flmxcwxf64ahykh4g7x9gb030gr6miflp"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -10198,12 +10198,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2022-04-22"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "fe631a85b0a1e1a709a55ef0947c9c0813f41edb"; - sha256 = "166fgfxh6k4v2ypzjmn6hicr92xgcsi5bi930f74xv5fzm0gw9l8"; + rev = "80b47c5f636c0ed0915af378b47428a83346a699"; + sha256 = "1fmq4zcx8shrkw1p2sjhncy3g7j4zka4rvr97jplf8fv40yqql1i"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -10246,12 +10246,12 @@ final: prev: vim-markdown-composer = buildVimPluginFrom2Nix { pname = "vim-markdown-composer"; - version = "2022-05-04"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "euclio"; repo = "vim-markdown-composer"; - rev = "5b79f425ebd28216d9aa472be3ba07cda41d9b24"; - sha256 = "0i4m2x2cw604aczp1ijnrv0wvh1b9bxg9zh0zmf8kk7b00zc1k5c"; + rev = "e6f99bc20cfcb277c63041b1f766e6d5940bcc76"; + sha256 = "0ljv8cvca8nk91g67mnzip81say04b1wbj9bzcgzy8m6qkz1r2h3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; @@ -10391,12 +10391,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2022-01-30"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "595ee332719f397c2441d85f79608113957cc78f"; - sha256 = "0kwiw877izpjqfj4gp4km8ivj6iy2c2jxyiqgxrvjqna62kic0ap"; + rev = "b9a6adbcfacc1ffe42ef3aa888f7c828a0b63746"; + sha256 = "0x0xjijadzk3z3f4bs0k3rbhb760qcdczvn0c8m9gx678wfjshyd"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -10655,12 +10655,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2022-05-21"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "ebcb47da66329d2c654e380d87879a935576c176"; - sha256 = "17l3ghjicf0llf7341vkhgaxs53pj2fgrsli2rpkqnm2qd041gyv"; + rev = "360ccdc01b18cd434588c34e15e5ea382b436de8"; + sha256 = "14phavx432h16bdm7m99a21xz2gb1s47fd5g8v2b5ig12l4yss92"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -11123,12 +11123,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2022-05-11"; + version = "2022-06-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "ab0d42bb31b3317aa66dd1c0b506837cc6ca2835"; - sha256 = "0qv2ppmxpy72gb8ivz5cx19b4y8si4v428d9mmlx9q7mv9q4wmhq"; + rev = "f8b70f5ef3b315af1148ef9dcc2a9afb02bc8c79"; + sha256 = "1cgxaaizx9l11s3gs7d1gvlq2c1l42548fmdkqgqnl8z777h065k"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -11183,12 +11183,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-05-14"; + version = "2022-06-12"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "17266bab12c4f2ca9ce871f706176d971613487e"; - sha256 = "1zp7zkgphlavspyfha62rwhsxn0w4fp2ciylv3vq76j54xyxkqyj"; + rev = "e114a5e0c90aefed3d2a48ca326eff9d39bc90a9"; + sha256 = "0kqn9kzwhh1zhymvmpnbkrccj4nn5lda3fwj1hyd4z3iaffxxk9a"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -11363,12 +11363,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-05-11"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "6e4b81303968f37346925d6907b96ef07788cc82"; - sha256 = "1z0nmfmn7ijj3hih4dbi1iq3dc6gpprck3fmidhmkv6vms041nx4"; + rev = "93d202278004fbc8eb3ec9d734916214e6c7f034"; + sha256 = "1nnv2kkq06d72wfsyliqvyrp735j5kg7y9c1r9lypjw2y7548spf"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -11399,12 +11399,12 @@ final: prev: vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2022-05-28"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "4206594ee4d4c6689bd41f5ee8e3617642d3b295"; - sha256 = "1fr7bvl22p021wpwaadfczpg16qh2r2apjwq9bkcwlsg5l80qfdn"; + rev = "df1e324e9f3395c630c1c523d0555a01d2eb1b7e"; + sha256 = "1c87zc954wk76h9klxyygv19jp729fms2f5m18gwzskars3px076"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -11435,24 +11435,24 @@ final: prev: vim-snipmate = buildVimPluginFrom2Nix { pname = "vim-snipmate"; - version = "2021-06-04"; + version = "2022-06-11"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "ed3c5426a20bf1c06d7980946ada34fd9f93320e"; - sha256 = "0bxaalza02sgm045cj4vciy3qhmj7pj1rp9bdwm5837ldq8paj1h"; + rev = "525f331320427bf7aeb07651e2536b1f8a23df03"; + sha256 = "0qfai0x9zg52n43ikgxx5x9y1nl3x420q8564csxirnbhnbn5xgx"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-05-29"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "11c771065bfadcc0583b9711d3932c765f168bb4"; - sha256 = "18x5y4cc1d4z5ciqhrb1554abv5ixz7jcvldjgsnlnvkx5b616s7"; + rev = "222cf7b44bb569c9a046a9891000c898bd4c43c9"; + sha256 = "0xksa854c8rjp9y2xvhk78z5ha9p8c3pvpzvddii2aay22cfkn8h"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -11531,12 +11531,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-05-30"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "a8ab56f30c603f8022f5fb6a436f5183beeb7b27"; - sha256 = "1xlb8q93ff9qdlk17b76sbrz2adixj7zxf8b9ccvafki8diaqkj9"; + rev = "82c8a5491e13fa307fb2cb47182a30560f930377"; + sha256 = "05bj0cs5m829bdcm9zgmla2ha2nwg5cn1qs9r75haway42dza3s6"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -11868,12 +11868,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-05-16"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "b83d430697d268a690240ec932630b8aed211aba"; - sha256 = "0wy31h8f7j433h4anrwi7658g8plaja4gjsykgsdsgvm1zanq0dw"; + rev = "7945984fd56bd69506c73f68bb300aaceae72e82"; + sha256 = "1w6ifhkjjdfksmywf9r6hnvljbki0vdj440zj3ihbp2jpmhyb09q"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -11928,12 +11928,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-05-05"; + version = "2022-06-18"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "6978fd32e3ca2c1c5591884eea0d57a7ee43d212"; - sha256 = "19dphm7xgfc0xvxrlys21zkp7ixbx62p11x6ms6xmwm8cjjh64pc"; + rev = "c93eb128332f8245776b753407ab6c4432c4c556"; + sha256 = "1y686xrcvkwqmc263syh84a396xanqka39axc460ibl9zav7z4nn"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -12000,12 +12000,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2022-05-06"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "046d0d5ac5fb2888447d1dd8b7e52fd0314f9766"; - sha256 = "17masfjxrhjcfqmlgf1jpmmz18j8vb4n88dl34rry6c3abiraprj"; + rev = "e23b98a8852255766e54bf7723a9d61fb5ab3143"; + sha256 = "1zxdbcd4qsqdfrgvn76r0a187hs0krb7w4r39dr10wwgzq69d2vf"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -12108,12 +12108,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2022-06-07"; + version = "2022-06-19"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "d7d451daa66154031dd9fb24c1798b4d07a820d9"; - sha256 = "0f7rcmlnp24zag9ypfwd0i6bsikm0ndd58jnpv008qq8hl80rps1"; + rev = "931260e7816ff8eeb26843f859f86dac09912add"; + sha256 = "030ljq24lxqac3hphr5phw06lgcjg7jsrc6yxbgxx2m28v54isi6"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -12360,12 +12360,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-06-04"; + version = "2022-06-17"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "44eeaebd8cf8514de2b503e8698f2f341b5f23ad"; - sha256 = "197l41s256z6iyb1pym6h9m4046k7m0jiwlrgfbf60yy2fxka7f3"; + rev = "541cedd19bc22b5c00648352f0afe604113db32a"; + sha256 = "1ra6jr5qvgclazaj3332kiwlc5kvpvi2dj9g2vfgd84140036cas"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12373,12 +12373,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-06-05"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "754bf6c97272e9bf479057b44cc968c4dad34753"; - sha256 = "1igkd96171rhw0xdqikjhg99527jkkg7i6ri10p83v1fx9a7bk5y"; + rev = "fcdf28ae2c7f5e0aabeead8b78bd112141ef26f8"; + sha256 = "0d9g9cdrjhs0zwr3mc8r4dr1sf6jjhx3gywl8vfzk7xbrlyn6vcs"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -12505,12 +12505,12 @@ final: prev: winshift-nvim = buildVimPluginFrom2Nix { pname = "winshift.nvim"; - version = "2021-11-15"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "sindrets"; repo = "winshift.nvim"; - rev = "aaa04b97640165eb0877bfc04943f4282887470b"; - sha256 = "0rg7ci0m1hm9jbhjwckvjnfl0w3bl2wfr7wq67k0wdj5vnlzz6w3"; + rev = "7014fdac39082977f11a9bed4b5486a7c04e4202"; + sha256 = "1q21fh3rzrcl598z406nfr3gnfayy3ry3av9g41z872hx8r49kjf"; }; meta.homepage = "https://github.com/sindrets/winshift.nvim/"; }; @@ -12565,12 +12565,12 @@ final: prev: xptemplate = buildVimPluginFrom2Nix { pname = "xptemplate"; - version = "2020-06-29"; + version = "2022-06-10"; src = fetchFromGitHub { owner = "drmingdrmer"; repo = "xptemplate"; - rev = "359ffe4d426bce2e95f5866b682856b25555396f"; - sha256 = "1rj5k58n1ybcc7qxsxlh09p2v4cps5xyzxmvjfrixy1qm2f85kd5"; + rev = "d8500403b35d5597441773074e3976238b5e8b2c"; + sha256 = "0dpdzx46rrwq9i2rymn0if7ci9h2b5hmdxqfw0dmdiyn1byj2wph"; }; meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; @@ -12686,36 +12686,36 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-05-30"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "773d339cbd307fe218cf7b3ea04eac26b345a3b7"; - sha256 = "005r3nmjd3s0gbf319xwrvighjg391j3qh79sfc2568z53wxj8r0"; + rev = "d46425163dad4cc74910c0c81eeedb00cadf8a61"; + sha256 = "1iqjlvr9d1nlf5bpafd15zz0y9r6vrfgp5mwld7kwv9ipr3gw0sd"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-06-06"; + version = "2022-06-20"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "eaac7edb19ff11ce049513ac184fff7493817c1f"; - sha256 = "181jfbw3msf1pccykabnniqry28ikassj39rc36hyz1vii1dq1d0"; + rev = "e2fdf27b0f28f7e285beb377d2fc6936957c2122"; + sha256 = "098blx6c2mzh6ghlvm6cv62bi8cfiys9r867msfw2h7r01gqz2hf"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-06-09"; + version = "2022-06-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "9565764a38a6ad352b6daaf40aaec1ec6aae67a4"; - sha256 = "0frcfxnf6zzsslcpslsgpcb04ylxcf50lr3yg0gcap38gwwhna6p"; + rev = "1efa6229ab08d4620a8aa546bfd5103bd98a74e0"; + sha256 = "0mksvj0vswg6wbxfrr9rg6miv0kr700z3q8xcrria43rf06la32l"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -12782,12 +12782,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-06-02"; + version = "2022-06-16"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "04fb9d3bf29755a0cd6e53373e5750ca78a8d37c"; - sha256 = "14zdlm3rpfkkg0y94071i6qx4bk3vp2wd2f5v7503mdc3p684amq"; + rev = "3f0a6c06da29c7b0f3fa49a313ae4d56f0dc58b8"; + sha256 = "01r34bkfs8kvaw72852sfk5jr1ngg2qf6a3dlpsppkb8l4lwi1k3"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a9d89a4f1ed65..f7e1645d707fd 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -191,6 +191,10 @@ self: super: { dependencies = with self; [ nvim-cmp ]; }); + cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-cmp pandoc plenary-nvim ]; }); @@ -212,22 +216,18 @@ self: super: { ''; }); - cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: { - dependencies = with self; [ nvim-cmp ]; - }); - cmp-tmux = super.cmp-tmux.overrideAttrs (old: { dependencies = with self; [ nvim-cmp tmux ]; }); - cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: { - dependencies = with self; [ nvim-cmp vimwiki ]; - }); - cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (old: { dependencies = with self; [ nvim-cmp vim-lsp ]; }); + cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp vimwiki ]; + }); + cmp-zsh = super.cmp-zsh.overrideAttrs (old: { dependencies = with self; [ nvim-cmp zsh ]; }); @@ -328,15 +328,15 @@ self: super: { }; }); - diffview-nvim = super.diffview-nvim.overrideAttrs (oa: { + diffview-nvim = super.diffview-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; doInstallCheck = true; nvimRequireCheck = "diffview"; }); - direnv-vim = super.direnv-vim.overrideAttrs (oa: { - preFixup = oa.preFixup or "" + '' + direnv-vim = super.direnv-vim.overrideAttrs (old: { + preFixup = old.preFixup or "" + '' substituteInPlace $out/autoload/direnv.vim \ --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" @@ -376,7 +376,7 @@ self: super: { patches = [ (substituteAll { src = ./patches/fruzzy/get_version.patch; - version = old.version; + inherit (old) version; }) ]; configurePhase = '' @@ -445,31 +445,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); - - plenary-nvim = super.plenary-nvim.overrideAttrs (old: { - postPatch = '' - sed -Ei lua/plenary/curl.lua \ - -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' - ''; - - doInstallCheck = true; - nvimRequireCheck = "plenary"; - }); - gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { dependencies = with self; [ lush-nvim ]; }); - jedi-vim = super.jedi-vim.overrideAttrs (old: { - # checking for python3 support in vim would be neat, too, but nobody else seems to care - buildInputs = [ python3.pkgs.jedi ]; - meta = { - description = "code-completion for python using python-jedi"; - license = lib.licenses.mit; - }; - }); - himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; inherit (himalaya) src version; @@ -485,6 +464,15 @@ self: super: { ''; }; + jedi-vim = super.jedi-vim.overrideAttrs (old: { + # checking for python3 support in vim would be neat, too, but nobody else seems to care + buildInputs = [ python3.pkgs.jedi ]; + meta = { + description = "code-completion for python using python-jedi"; + license = lib.licenses.mit; + }; + }); + LanguageClient-neovim = let version = "0.1.161"; @@ -659,7 +647,19 @@ self: super: { configurePhase = "cd vim"; }); - parinfer-rust = parinfer-rust; + inherit parinfer-rust; + + # plenary-nvim = super.toVimPlugin(luaPackages.plenary-nvim); + + plenary-nvim = super.plenary-nvim.overrideAttrs (old: { + postPatch = '' + sed -Ei lua/plenary/curl.lua \ + -e 's@(command\s*=\s*")curl(")@\1${curl}/bin/curl\2@' + ''; + + doInstallCheck = true; + nvimRequireCheck = "plenary"; + }); range-highlight-nvim = super.range-highlight-nvim.overrideAttrs (old: { dependencies = with self; [ cmd-parser-nvim ]; @@ -676,7 +676,7 @@ self: super: { skim = buildVimPluginFrom2Nix { pname = "skim"; - version = skim.version; + inherit (skim) version; src = skim.vim; }; @@ -789,16 +789,16 @@ self: super: { dependencies = with self; [ sqlite-lua telescope-nvim ]; }); - telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { - dependencies = with self; [ telescope-nvim ]; - }); - telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; buildPhase = "make"; meta.platforms = lib.platforms.all; }); + telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { dependencies = with self; [ telescope-nvim ]; preFixup = @@ -974,7 +974,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-XmQTRmOO/tyA0F6FQQRxZPcVXCYZkEAiNIzU/ismjc0="; + cargoSha256 = "sha256-9Vr1gpggfAQlMgM/s8j6FTTYFppHql2PQ7cPtg1wNmo="; }; in '' @@ -1103,13 +1103,13 @@ self: super: { vim-markdown-composer = let - vim-markdown-composer-bin = rustPlatform.buildRustPackage rec { + vim-markdown-composer-bin = rustPlatform.buildRustPackage { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "0q0i6kyihswrjrfdj4p3z54b779sdg2wz38z943ypj6dqphhcklx"; + cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4="; }; in - super.vim-markdown-composer.overrideAttrs (oldAttrs: rec { + super.vim-markdown-composer.overrideAttrs (old: { preFixup = '' substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \ --replace "s:plugin_root . '/target/release/markdown-composer'" \ @@ -1287,9 +1287,9 @@ self: super: { "coc-smartf" "coc-snippets" "coc-solargraph" + "coc-sqlfluff" "coc-stylelint" "coc-sumneko-lua" - "coc-sqlfluff" "coc-tabnine" "coc-texlab" "coc-toml" diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index f63bd867f3682..1214e36372a62 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -116,13 +116,7 @@ class VimEditor(pluginupdate.Editor): def main(): global luaPlugins - - # whitelist - luaPlugins = run_nix_expr(GET_PLUGINS_LUA) + [ - "diffview-nvim", - "marks-nvim", - "nvim-biscuits" - ] + luaPlugins = run_nix_expr(GET_PLUGINS_LUA) editor = VimEditor("vim", ROOT, GET_PLUGINS) parser = editor.create_parser() diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ae65dc33d613e..d4a542bb99e4e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1041,6 +1041,22 @@ let }; }; + grapecity.gc-excelviewer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gc-excelviewer"; + publisher = "grapecity"; + version = "4.2.55"; + sha256 = "sha256-yHl6ZTGIKOEsqmyeYtgDUhNAN9uRpoFApA7FKkPWW3E="; + }; + meta = with lib; { + description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=grapecity.gc-excelviewer"; + homepage = "https://github.com/jjuback/gc-excelviewer"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + humao.rest-client = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "humao"; @@ -1495,6 +1511,23 @@ let }; }; + mattn.lisp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "lisp"; + publisher = "mattn"; + version = "0.1.12"; + sha256 = "sha256-x6aFrcX0YElEFEr0qA669/LPlab15npmXd5Q585pIEw="; + }; + meta = with lib; { + description = "Lisp syntax for vscode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mattn.lisp"; + homepage = "https://github.com/mattn/vscode-lisp"; + changelog = "https://marketplace.visualstudio.com/items/mattn.lisp/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { name = "git-graph"; diff --git a/pkgs/applications/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix index 37e0d83f14060..c1f685827047a 100644 --- a/pkgs/applications/emulators/atari800/default.nix +++ b/pkgs/applications/emulators/atari800/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "atari800"; - version = "4.2.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "atari800"; repo = "atari800"; rev = "ATARI800_${replaceChars ["."] ["_"] version}"; - sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; + sha256 = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix index e8feb1ea7ed50..1b95dec89face 100644 --- a/pkgs/applications/emulators/kega-fusion/default.nix +++ b/pkgs/applications/emulators/kega-fusion/default.nix @@ -72,6 +72,7 @@ in stdenv.mkDerivation { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; homepage = "https://www.carpeludum.com/kega-fusion/"; maintainers = with maintainers; [ abbradar ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" ]; }; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 7788b13b4ecb5..e3875e130a189 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -191,6 +191,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { inherit version; homepage = "https://www.winehq.org/"; license = with lib.licenses; [ lgpl21Plus ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode # mono, gecko + ]; description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ]; diff --git a/pkgs/applications/finance/cryptowatch/default.nix b/pkgs/applications/finance/cryptowatch/default.nix index 09531e4650e8f..4bf7a1a0b4f35 100644 --- a/pkgs/applications/finance/cryptowatch/default.nix +++ b/pkgs/applications/finance/cryptowatch/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://cryptowat.ch"; description = "Application for visualising real-time cryptocurrency market data"; platforms = platforms.linux; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ livnev ]; }; diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix index b939cf05e754a..808b70ed5ec93 100644 --- a/pkgs/applications/gis/udig/default.nix +++ b/pkgs/applications/gis/udig/default.nix @@ -18,6 +18,7 @@ let meta = with lib; { description = "User-friendly Desktop Internet GIS"; homepage = "http://udig.refractions.net/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = with licenses; [ epl10 bsd3 ]; maintainers = with maintainers; [ sikmir ]; platforms = builtins.attrNames srcs; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 4d2db993b8d1f..a6a3563743b36 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -99,6 +99,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://avocode.com/"; description = "The bridge between designers and developers"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ megheaiulian ]; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 08cd0aad8156e..85d201f32dcd8 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -95,6 +95,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A desktop application for creating diagrams"; homepage = "https://about.draw.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with maintainers; [ darkonion0 ]; diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 270132eca940a..039eb45a29670 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -66,7 +66,10 @@ stdenv.mkDerivation rec { homepage = "https://imagej.net/software/fiji/"; description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis"; platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; maintainers = with maintainers; [ zane ]; }; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 8f5404cf3ae92..c05f3502aec32 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -48,13 +48,13 @@ mkDerivation rec { pname = "freecad"; - version = "0.19.2"; + version = "0.20"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = version; - hash = "sha256-XZ+fRl3CPCIFu3nHeMTLibwwFBlG/cWpKJlI58hTAuU="; + hash = "sha256-Em4XVxDfvVG1Kf7q+6uHNA/VcMGLKMTv5TCh2XF/BtQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 1c4609ac55b73..6286e64e3efe8 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://hexler.net/products/kodelife"; description = "Real-time GPU shader editor"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 05a99527e5f71..50b1cb37ffaf2 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Layout, editing, and control software for your laser cutter"; homepage = "https://lightburnsoftware.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix index b99902954572a..3a089febc3df3 100644 --- a/pkgs/applications/graphics/odafileconverter/default.nix +++ b/pkgs/applications/graphics/odafileconverter/default.nix @@ -46,6 +46,7 @@ in mkDerivation { meta = with lib; { description = "For converting between different versions of .dwg and .dxf"; homepage = "https://www.opendesign.com/guestfiles/oda_file_converter"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ nagisa ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index 5c5557d6d6016..ffd31bf7325ac 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -99,6 +99,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "GUI prototyping/mockup tool"; homepage = "https://pencil.evolus.vn/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2; # Commercial license is also available maintainers = with maintainers; [ bjornfor prikhi mrVanDalo ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/applications/graphics/pixeluvo/default.nix index 0c90b786baca9..f3b40b515183a 100644 --- a/pkgs/applications/graphics/pixeluvo/default.nix +++ b/pkgs/applications/graphics/pixeluvo/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Beautifully Designed Image and Photo Editor for Windows and Linux"; homepage = "http://www.pixeluvo.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index 6a59af40cc18e..f54aef75ac15a 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -124,6 +124,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Scientific image processing program for astrophotography"; homepage = "https://pixinsight.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.sheepforce ]; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index ea70224a932a0..ec8efcc27c2a6 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { description = "Brother brscan4 sane backend driver"; homepage = "http://www.brother.com"; platforms = [ "i686-linux" "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ jraygauthier ]; }; diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index 4d276bd57bc3d..59daa9eb09ab8 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation rec { description = "Brother brscan5 sane backend driver"; homepage = "https://www.brother.com"; platforms = [ "i686-linux" "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ mattchrist ]; }; diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index 8a01f70c6b00f..93e179d867d93 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Brother DSSeries SANE backend driver"; homepage = "http://www.brother.com"; platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ callahad ]; }; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 68744831538c4..e0605ad81e43f 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -7,6 +7,7 @@ , at-spi2-core , cairo , dbus +, eigen , freetype , fontconfig , glew @@ -18,6 +19,7 @@ , libpng , libselinux , libsepol +, libspnav , libthai , libxkbcommon , pangomm @@ -29,13 +31,13 @@ stdenv.mkDerivation rec { pname = "solvespace"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE="; + hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA="; fetchSubmodules = true; }; @@ -49,6 +51,7 @@ stdenv.mkDerivation rec { at-spi2-core cairo dbus + eigen freetype fontconfig glew @@ -60,6 +63,7 @@ stdenv.mkDerivation rec { libpng libselinux libsepol + libspnav libthai libxkbcommon pangomm diff --git a/pkgs/applications/graphics/unigine-heaven/default.nix b/pkgs/applications/graphics/unigine-heaven/default.nix index 2ce05a52812ef..1677e4d65eef4 100644 --- a/pkgs/applications/graphics/unigine-heaven/default.nix +++ b/pkgs/applications/graphics/unigine-heaven/default.nix @@ -100,6 +100,7 @@ stdenv.mkDerivation { description = "The Unigine Heaven GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/heaven"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/unigine-sanctuary/default.nix b/pkgs/applications/graphics/unigine-sanctuary/default.nix index 25d10d6166783..4b3f3ab547c66 100644 --- a/pkgs/applications/graphics/unigine-sanctuary/default.nix +++ b/pkgs/applications/graphics/unigine-sanctuary/default.nix @@ -90,6 +90,7 @@ stdenv.mkDerivation rec{ meta = { description = "The Unigine Heaven GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/sanctuary"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix index 768089d1a0c4f..b1261bb52f23f 100644 --- a/pkgs/applications/graphics/unigine-superposition/default.nix +++ b/pkgs/applications/graphics/unigine-superposition/default.nix @@ -139,6 +139,7 @@ buildFHSUserEnv { meta = { description = "The Unigine Superposition GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/superposition"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix index 1057c2fa6cad7..f0d5101b4be02 100644 --- a/pkgs/applications/graphics/unigine-tropics/default.nix +++ b/pkgs/applications/graphics/unigine-tropics/default.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation { meta = { description = "The Unigine Heaven GPU benchmarking tool"; homepage = "https://benchmark.unigine.com/tropics"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 9b51373178e44..ee1c9e6c15f89 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { meta = { description = "The Unigine Valley GPU benchmarking tool"; homepage = "https://unigine.com/products/benchmarks/valley/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ lib.maintainers.kierdavis ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index eb5033a4a97c4..fb44d36f62a6d 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.18"; + version = "0.0.20"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-Ur1X5FhOa87jbjWBXievBfCHW+qP/8bqLiyKAC8+KU4="; + sha256 = "sha256-WsG6mjO90QQNsAarxdupZvXubdy06JjQmVYUzygl8l4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index ca8cebb2ec0c6..be20635c50018 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -54,6 +54,7 @@ mkDerivation rec { meta = with lib; { homepage = "http://www.styluslabs.com/"; description = "Write is a word processor for handwriting"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = lib.licenses.unfree; maintainers = with maintainers; [ oyren ]; diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index 306a914dc19eb..9f0d9d62e053b 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -129,6 +129,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform password manager"; homepage = "https://1password.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 7ffc4a5fc7fac..e39450e5bef07 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -131,6 +131,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform password manager"; homepage = "https://1password.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 6231e62bc2dcb..0d18b3dd37a3e 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.4.1"; + version = "2.5.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-ANRYE1BoezrcDxZrQYp/OPdtn4J+FmC/PLSIP5Amm18=" "zip"; - i686-linux = fetch "linux_386" "sha256-w3anr76uj/Z+ilZ+LUGOB1CoKkvxcD+v8c8lVADPwRY=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-axZ+XDIMJlAicnYTIXgcaoT+Zcg6xvHlchl/ng7V9GY=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-/DnrQ4fwbc2ELtsEClvzA9kTrse3pMgGLbhiKZ3gphA=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip"; + i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; @@ -48,6 +48,7 @@ stdenv.mkDerivation { ''; postInstall = '' + HOME=$TMPDIR installShellCompletion --cmd ${mainProgram} \ --bash <($out/bin/${mainProgram} completion bash) \ --fish <($out/bin/${mainProgram} completion fish) \ @@ -67,6 +68,7 @@ stdenv.mkDerivation { homepage = "https://developer.1password.com/docs/cli/"; downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; maintainers = with maintainers; [ joelburget marsam ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; inherit mainProgram platforms; }; diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index bbe37b5ed743b..fdd2970fdac7b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -27,7 +27,8 @@ in postInstall = '' patchShebangs node_modules/ npm run build - ln -s $out/lib/node_modules/asf-ui/dist $out/lib/dist + cp -r $out/lib/node_modules/asf-ui/dist $out/lib/dist + rm -rf $out/lib/node_modules/ ''; meta = with lib; { diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 2bce30365f08c..1a164f578a016 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = "http://www.adobe.com/products/reader"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; knownVulnerabilities = [ "Numerous unresolved vulnerabilities" diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 07cbee42694d9..6e28c58798e79 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.25.4"; + version = "0.26.1"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-v6Zecv/m1GvPJk/SmLlxHFyeYbNbIB+x17+AKCI45AM="; + sha256 = "sha256-lPzeYZzerFa0T77uaavvBQkMn4PUEfVj4SPlErqM9DI="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index c448b86d0c4d0..ca243f4437071 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.authy.com"; description = "Twilio Authy two factor authentication desktop application"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ iammrinal0 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index aa7150bb6b0b5..0261f983ac79d 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -166,6 +166,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ xavierzwirtz ]; description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index d5d6f6b5358ea..15e3c51e9ad4c 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "binance"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ="; + sha256 = "sha256-Q1cvEQ/yxytzrPfiyeTZSCPecnmSdhy+ds/gtie4vwo="; }; nativeBuildInputs = [ @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Binance Cryptoexchange Official Desktop Client"; homepage = "https://www.binance.com/en/desktop-download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index fb89d2a7e373d..84095c4165417 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,22 +1,20 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, mkDerivation, fetchurl, qtbase, qmake }: -let version = "0.6.4"; in -stdenv.mkDerivation { +mkDerivation rec { pname = "confclerk"; - inherit version; + version = "0.7.1"; src = fetchurl { url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; - sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; + sha256 = "0l5i4d6lymh0k6gzihs41x4i8v1dz0mrwpga096af0vchpvlcarg"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qtbase ]; + nativeBuildInputs = [ qmake ]; - nativeBuildInputs = [ qmake4Hook ]; - - installPhase = '' + postInstall = '' mkdir -p $out/bin - cp src/bin/confclerk $out/bin + mv $out/confclerk $out/bin/ ''; meta = { diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 3f54826fc52af..abde33b730c03 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -127,6 +127,10 @@ PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access, Teradata, Firebird, Derby, etc. ''; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # dependencies from maven + ]; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ jojosch mkg20001 ]; diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 20d47e204f7cc..560afe32b8a19 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.87"; + version = "0.88"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-7O2AY7tWYiOIy4ImFBxWu6S+ljc3VmqS/j4KyEzVVIA="; + sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY="; }; postPatch = '' diff --git a/pkgs/applications/misc/foxitreader/default.nix b/pkgs/applications/misc/foxitreader/default.nix index b206d14323b1c..c6ed7bc1ad3ff 100644 --- a/pkgs/applications/misc/foxitreader/default.nix +++ b/pkgs/applications/misc/foxitreader/default.nix @@ -73,6 +73,7 @@ mkDerivation rec { meta = with lib; { description = "A viewer for PDF documents"; homepage = "https://www.foxitsoftware.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ p-h rhoriguchi ]; diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix index 9b335b1aedae4..8c68f8672c3b5 100644 --- a/pkgs/applications/misc/gometer/default.nix +++ b/pkgs/applications/misc/gometer/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Analytic-Tracking tool for GoLance"; homepage = "https://golance.com/download-gometer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; }; diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 950cb236ecbfa..dd6964318e77d 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -115,6 +115,7 @@ mkDerivation rec { meta = with lib; { description = "A world sphere viewer"; homepage = "https://www.google.com/earth/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ friedelino shamilton ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix new file mode 100644 index 0000000000000..f3b721bc49597 --- /dev/null +++ b/pkgs/applications/misc/hollywood/default.nix @@ -0,0 +1,94 @@ +{ stdenv +, fetchFromGitHub +, makeWrapper +, lib +, coreutils +, apg +, atop +, bmon +, cmatrix +, pygments +, moreutils +, util-linux +, jp2a +, man +, mplayer +, openssh +, tree +, mlocate +, findutils +, ccze +, ncurses +, python3 +, wget +, libcaca +, newsboat +, rsstail +, w3m +, ticker +, tmux +}: + +stdenv.mkDerivation { + pname = "hollywood"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "dustinkirkland"; + repo = "hollywood"; + rev = "35275a68c37bbc39d8b2b0e4664a0c2f5451e5f6"; + sha256 = "sha256-faIm1uXERvIDZ6SK6uarVkWGNJskAroHgq5Cg7nUZc4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ ./nixos-paths.patch ]; + postPatch = '' + rm lib/hollywood/speedometer + rm bin/wallstreet + rm -r lib/wallstreet + ''; + + dontBuild = true; + + installPhase = + let pathDeps = [ + tmux + coreutils + ncurses + jp2a + mlocate + apg + atop + bmon + cmatrix + pygments + moreutils + util-linux + jp2a + man + mplayer + openssh + tree + findutils + ccze + ]; + in '' + runHook preInstall + + mkdir -p $out + cp -r bin $out/bin + cp -r lib $out/lib + cp -r share $out/share + wrapProgram $out/bin/hollywood --prefix PATH : ${lib.makeBinPath pathDeps} + + runHook postInstall + ''; + + meta = { + description = "Fill your console with Hollywood melodrama technobabble"; + homepage = "https://a.hollywood.computer/"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.anselmschueler ]; + }; +} diff --git a/pkgs/applications/misc/hollywood/nixos-paths.patch b/pkgs/applications/misc/hollywood/nixos-paths.patch new file mode 100644 index 0000000000000..d280a6b003c1e --- /dev/null +++ b/pkgs/applications/misc/hollywood/nixos-paths.patch @@ -0,0 +1,67 @@ +diff --git a/bin/hollywood b/bin/hollywood +index 6f1ee68..09bc4ea 100755 +--- a/bin/hollywood ++++ b/bin/hollywood +@@ -74,7 +74,7 @@ if [ -z "$TMUX" ]; then + else + tmux_launcher=tmux + fi +- $tmux_launcher new-session -d -s $PKG "/bin/bash" ++ $tmux_launcher new-session -d -s $PKG "/usr/bin/env bash" + $tmux_launcher send-keys -t $PKG "$0 $1" + $tmux_launcher send-keys -t $PKG Enter + exec $tmux_launcher attach-session -t $PKG +diff --git a/lib/hollywood/code b/lib/hollywood/code +index 532ce73..3448447 100755 +--- a/lib/hollywood/code ++++ b/lib/hollywood/code +@@ -19,7 +19,7 @@ command -v view >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*.java" "/usr/*.c" "/usr/*.cpp" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*.java" "/run/current-system/sw/*.java" "/usr/*.c" "/run/current-system/sw/*.c" "/usr/*.cpp" "/run/current-system/sw/*.cpp" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/hexdump b/lib/hollywood/hexdump +index f2fb0bd..db059f5 100755 +--- a/lib/hollywood/hexdump ++++ b/lib/hollywood/hexdump +@@ -19,8 +19,8 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- for f in $(ls /usr/bin/ | sort -R); do +- head -c 4096 "/usr/bin/$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" ++ for f in $(find /usr/bin/ /run/current-system/sw/bin/ | sort -R); do ++ head -c 4096 "$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" + sleep 0.7 + done + done +diff --git a/lib/hollywood/jp2a b/lib/hollywood/jp2a +index e87b950..6541f80 100755 +--- a/lib/hollywood/jp2a ++++ b/lib/hollywood/jp2a +@@ -19,7 +19,7 @@ command -v jp2a >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*jpg" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*jpg" "/run/current-system/sw/*jpg" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/man b/lib/hollywood/man +index 2d42513..f4d8bbb 100755 +--- a/lib/hollywood/man ++++ b/lib/hollywood/man +@@ -19,7 +19,7 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(ls /usr/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) ++ FILES=$(ls /usr/share/man/man1/ /run/current-system/sw/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) + for f in $FILES; do + man "$f" | ccze -A + sleep 0.2 diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 44169f6a539e2..390f756beb101 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Time tracking software"; homepage = "https://hubstaff.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus srghma ]; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index ae049699121ed..1a079ab8274c3 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GPU-accelerated procedural modeler and slicer for 3D printing"; homepage = "https://icesl.loria.fr/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.inria-icesl; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ mgttlinger ]; diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix index 1e20a0d6faf04..619a821a32c69 100644 --- a/pkgs/applications/misc/ideamaker/default.nix +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.raise3d.com/ideamaker/"; description = "Raise3D's 3D slicer software"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lovesegfault ]; diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 120affb988c01..ecad4bd9821b0 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Supermicro IPMI configuration tool"; homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 579890c78ba3e..fbc436c882cfc 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -72,7 +72,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; maintainers = with maintainers; [ vlaci ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/join-desktop/default.nix b/pkgs/applications/misc/join-desktop/default.nix index 0b09911ddb24b..369aae0386336 100644 --- a/pkgs/applications/misc/join-desktop/default.nix +++ b/pkgs/applications/misc/join-desktop/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/joaomgcd/JoinDesktop/"; description = "Desktop app for Join"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # on https://joaoapps.com/join/desktop/ "Join Desktop is an open source app" but no license license = licenses.free; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 67807887ec615..d35a526dfdb3b 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18427"; + version = "18463"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-SsoeKfpWi41sd77LfaQW0OcHnyf8iLolKWF74dhalpY="; + sha256 = "sha256-++8XtzAykJ+85Kvzy3xgaZoKaVlJwz+Ct1xb/QkC1Gc="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-cz3OT03StvJy9XYBiPxx+nz36O0cg+XrL/uc52/G/1c="; + sha256 = "sha256-n7GlUWYOAXw4G59SBsO8HZ1OaiUWwzOsiURPFBYq31E="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index b50bc7e561147..64044693203e7 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.jottacloud.com/"; downloadPage = "https://repo.jotta.us/archives/linux/"; maintainers = with maintainers; [ evenbrenden ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix index 8ee8337bea2a9..05d1c98e56ac8 100644 --- a/pkgs/applications/misc/kdbplus/default.nix +++ b/pkgs/applications/misc/kdbplus/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "Analytics and time-series database"; homepage = "http://www.kx.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "i686-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index e2480dd18bded..b428690b7a403 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/koreader/koreader"; description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = intersectLists platforms.x86_64 platforms.linux; license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 68453252ba539..de131b7ce63f0 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Master PDF Editor"; homepage = "https://code-industry.net/free-pdf-editor/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/applications/misc/masterpdfeditor4/default.nix b/pkgs/applications/misc/masterpdfeditor4/default.nix index b4b9a4d624469..befb11a0a48b3 100644 --- a/pkgs/applications/misc/masterpdfeditor4/default.nix +++ b/pkgs/applications/misc/masterpdfeditor4/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Master PDF Editor - version 4, without watermark"; homepage = "https://code-industry.net/free-pdf-editor/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index afdfc6c905e04..2d5b6ee8f2ae6 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.5.0c"; + version = "1.5.1"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-JHuGkf6TBOZMvoP7Izm5/T9AWxyjaqrxR99x4bm7tVE="; + sha256 = "sha256-qOXw/KGt3DyWQGBe/pbMujQITCMItHobxuK+1r00ZIs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index 62c1834d26ad7..198d170bd89ca 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Morphological analysis of Russian text"; homepage = "https://yandex.ru/dev/mystem/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ae82d4023247d..822f2c13cbeae 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -311,8 +311,8 @@ in src = fetchFromGitHub { owner = "jneilliii"; repo = "OctoPrint-STLViewer"; - rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + rev = "refs/tags/${version}"; + sha256 = "sha256-S7zjEbyo59OJpa7INCv1o4ybQ+Sy6a3EJ5AJ6wiBe1Y="; }; meta = with lib; { diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 0930edbd4158b..c44fc41a5c650 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -8,7 +8,6 @@ , which , python3 , rsync -, makeWrapper , qtbase , qtsvg , libGLU @@ -20,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.05.31-10"; + version = "2022.06.18-2"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc="; + sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI="; fetchSubmodules = true; }; @@ -45,7 +44,6 @@ mkDerivation rec { which python3 rsync - makeWrapper ]; # Most dependencies are vendored @@ -64,16 +62,6 @@ mkDerivation rec { bash ./configure.sh ''; - # Tell the program that the read-only and the read-write data locations - # are different, and create the read-write one. - # https://github.com/organicmaps/organicmaps/issues/2387 - postInstall = '' - wrapProgram $out/bin/OMaps \ - --add-flags "-resources_path $out/share/organicmaps/data" \ - --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \ - --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' - ''; - meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 745796098e8cc..e4626ef3c947c 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -42,6 +42,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/torakiki/pdfsam"; description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.agpl3; platforms = platforms.all; maintainers = with maintainers; [ _1000101 ]; diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix index 8c034d6636b32..047d9e4190fcb 100644 --- a/pkgs/applications/misc/pdfstudio/common.nix +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -88,6 +88,10 @@ buildFHSUserEnv { homepage = "https://www.qoppa.com/${pname}/"; description = "An easy to use, full-featured PDF editing software"; longDescription = longDescription; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; mainProgram = pname; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 58d45d19bee58..669f25e1509eb 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -142,6 +142,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "GUI for managing Windows programs under linux"; homepage = "https://www.playonlinux.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.pasqui23 ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 8fcd9e1a04fe9..1c286d611e6be 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -122,6 +122,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://getpolarized.io/"; description = "Personal knowledge repository for PDF and web content supporting incremental reading and document annotation"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.noneucat ]; diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/applications/misc/premid/default.nix index d2b8663d24531..3fe8c64f20be5 100644 --- a/pkgs/applications/misc/premid/default.nix +++ b/pkgs/applications/misc/premid/default.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { description = "A simple, configurable utility to show your web activity as playing status on Discord"; homepage = "https://premid.app"; downloadPage = "https://premid.app/downloads"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; [ natto1784 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 1488538cc55ed..679b77157cd05 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,8 +1,39 @@ -{ stdenv, lib, fetchFromGitHub, cmake, copyDesktopItems, makeDesktopItem -, pkg-config, wrapGAppsHook, boost, cereal, cgal_5, curl, dbus, eigen, expat -, glew, glib, gmp, gtest, gtk3, hicolor-icon-theme, ilmbase, libpng, mpfr, nlopt -, openvdb, pcre, qhull, systemd, tbb, wxGTK31-gtk3, xorg, fetchpatch -, wxGTK31-gtk3-override ? null }: +{ stdenv +, lib +, binutils +, fetchFromGitHub +, cmake +, copyDesktopItems +, makeDesktopItem +, pkg-config +, wrapGAppsHook +, boost +, cereal +, cgal_5 +, curl +, dbus +, eigen +, expat +, glew +, glib +, gmp +, gtest +, gtk3 +, hicolor-icon-theme +, ilmbase +, libpng +, mpfr +, nlopt +, openvdb +, pcre +, qhull +, systemd +, tbb +, wxGTK31-gtk3 +, xorg +, fetchpatch +, wxGTK31-gtk3-override ? null +}: let wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec { pname = "wxwidgets-prusa3d-patched"; @@ -16,7 +47,8 @@ let }; }); wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "prusa-slicer"; version = "2.4.2"; @@ -28,6 +60,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ + binutils boost cereal cgal_5 @@ -58,6 +91,16 @@ in stdenv.mkDerivation rec { url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch"; sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6"; }) + # Fix compile error with boost 1.79. See https://github.com/prusa3d/PrusaSlicer/issues/8238 + # Can be removed with the next version update + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4.patch"; + sha256 = "sha256-vzEPjLE3Yy5szawPn2Yp3i7MceWewpdnLUPVu9+H3W8="; + }) + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff.patch"; + sha256 = "sha256-tAEgubeGGKFWY7r7p/6pmI2HXUGKi2TM1X5ILVZVT20="; + }) ]; doCheck = true; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 69f0b26b9ec41..273b2d6046ed8 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -53,6 +53,7 @@ in mkDerivation rec { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; maintainers = with maintainers; [ cstrahan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 81219fc752697..ae32aac267e17 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://robomongo.org/"; description = "Query GUI for mongodb. Formerly called Robomongo"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ eperuffo ]; }; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index e26a40667da9c..23684142a09b4 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -48,6 +48,7 @@ description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; homepage = "https://github.com/SideQuestVR/SideQuest"; downloadPage = "https://github.com/SideQuestVR/SideQuest/releases"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ joepie91 rvolosatovs ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/signumone-ks/default.nix b/pkgs/applications/misc/signumone-ks/default.nix index eb0af95d58d59..f183fbed3d2e4 100644 --- a/pkgs/applications/misc/signumone-ks/default.nix +++ b/pkgs/applications/misc/signumone-ks/default.nix @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Digital signature tool for Costa Rican electronic invoicing"; homepage = "https://signum.one/download.html"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index f723ba27beb8d..35f153393518c 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -27,6 +27,7 @@ let description = "The simplest way to keep notes"; homepage = "https://github.com/Automattic/simplenote-electron"; license = licenses.gpl2; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ kiwi ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 0f331ef6e2ce4..2ec034e882e18 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,12 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: +{ lib +, fetchFromGitHub +, gobject-introspection +, gtk3 +, gtksourceview3 +, webkitgtk +, wrapGAppsHook +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -8,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; + hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; }; buildInputs = [ @@ -20,9 +28,16 @@ python3Packages.buildPythonApplication rec { # any Pokemon, and clicking Stats and Moves tab. webkitgtk ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ + cairosvg natsort + ndspy packaging pycairo pygal @@ -36,6 +51,7 @@ python3Packages.buildPythonApplication rec { skytemple-files skytemple-icons skytemple-ssb-debugger + tilequant ]; doCheck = false; # there are no tests diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index b5bcbabf8674b..6a9c8843c09a3 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Snapmaker Luban is an easy-to-use 3-in-1 software tailor-made for Snapmaker machines"; homepage = "https://github.com/Snapmaker/Luban"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.simonkampe ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 85f4ffec5f16b..90aab7987b389 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line client for the Snowflake database"; homepage = "https://www.snowflake.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ andehen ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index 42f4d36eea5d5..c9d845574ff0b 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mastodon/Misskey Client for PC"; homepage = "https://thedesk.top"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 34cc97023989e..0b1bed6785755 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Online freelancing platform desktop application for time tracking"; homepage = "https://www.upwork.com/ab/downloads/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zakkor wolfangaukang ]; diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index f49b14e8fc48f..3972d7a17230c 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -82,6 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electron based Mastodon, Pleroma and Misskey client for Windows, Mac and Linux"; homepage = "https://whalebird.social"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ wolfangaukang colinsane ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 70543b5fa186c..539a0f7d1a1d8 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qt4 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation rec { pname = "xkblayout-state"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo="; }; - buildInputs = [ qt4 ]; + buildInputs = [ libX11 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index a395ffd521f53..17134dcd3892b 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -85,7 +85,10 @@ stdenv.mkDerivation rec { and save to Evernote. ''; homepage = "https://www.xmind.net/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix index 5f78b244ca412..62dbae082d9a1 100644 --- a/pkgs/applications/networking/aether/default.nix +++ b/pkgs/applications/networking/aether/default.nix @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { description = "Peer-to-peer ephemeral public communities"; homepage = "https://getaether.net/"; downloadPage = "https://getaether.net/download/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; maintainers = with maintainers; [ maxhille ]; # other platforms could be supported by building from source diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 8b20c1aac6b0c..4a9c0da726fa2 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Eclipse-based LDAP browser and directory client"; homepage = "https://directory.apache.org/studio/"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.asl20; # Upstream supports macOS and Windows too. platforms = platforms.linux; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index 7e4c5cfac888d..d6f21aa04237a 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -151,6 +151,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Appgate SDP (Software Defined Perimeter) desktop client"; homepage = "https://www.appgate.com/support/software-defined-perimeter-support"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ ymatsiuk ]; diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index 2f2a708455e17..0f25fd0a8ec98 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.18"; + version = "0.19"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rFHDoNrEmMSNEc3RLdSeRk9mF05drUYfJFQKHAk5alE="; + sha256 = "sha256-jOOakRuiNbdCGmbaQFuHcLsHhV26jaQY+1GgDj9ocs0="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-rrqDjh5e3KX5+saYjnMPG0bhr5YEOPfz0QCRf6omNZI="; + vendorSha256 = "sha256-fsMBL9qyhIrV6eAsqpSaNniibMdYRVBnl2KCzStvMGQ="; meta = with lib; { description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7833722c4d928..2d131b4279a6e 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -200,6 +200,7 @@ stdenv.mkDerivation rec { chew up your bandwidth, and invade your privacy. Brave lets you contribute to your favorite creators automatically. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with maintainers; [ uskudnik rht jefflabonte nasirhm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index cfd6b122d6cc7..1cfc90dd4f145 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,10 +160,6 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ optionals (versionRange "102" "103") [ - # https://dawn-review.googlesource.com/c/dawn/+/88582 - # Wrap get_gitHash in try-catch to prevent failures in tarball builds. - ./patches/m102-fix-dawn_version_generator-failure.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch b/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch deleted file mode 100644 index e9391541e435c..0000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/m102-fix-dawn_version_generator-failure.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e9ffd084ec1ff9f7bfc86879732953dc58256958 Mon Sep 17 00:00:00 2001 -From: Loko Kung <lokokung@google.com> -Date: Tue, 3 May 2022 00:28:53 +0000 -Subject: [PATCH] Wrap get_gitHash in try-catch to prevent failures in tarball - builds. - -Bug: chromium:1321370 -Change-Id: If39d2236d1b4d965f7bd189f6bd1cdc70436c41d -Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/88582 -Commit-Queue: Loko Kung <lokokung@google.com> -Reviewed-by: Austin Eng <enga@chromium.org> -Kokoro: Kokoro <noreply+kokoro@google.com> -(cherry picked from commit 03ddfbb81fb4127ca37ea53e70fcb34fe851e24e) ---- - third_party/dawn/generator/dawn_version_generator.py | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/third_party/dawn/generator/dawn_version_generator.py b/third_party/dawn/generator/dawn_version_generator.py -index 1907e88da..3c1927bee 100644 ---- a/third_party/dawn/generator/dawn_version_generator.py -+++ b/third_party/dawn/generator/dawn_version_generator.py -@@ -23,11 +23,14 @@ def get_git(): - - - def get_gitHash(dawnDir): -- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'], -- stdout=subprocess.PIPE, -- cwd=dawnDir) -- if result.returncode == 0: -- return result.stdout.decode('utf-8').strip() -+ try: -+ result = subprocess.run([get_git(), "rev-parse", "HEAD"], -+ stdout=subprocess.PIPE, -+ cwd=dawnDir) -+ if result.returncode == 0: -+ return result.stdout.decode("utf-8").strip() -+ except Exception: -+ return "" - # No hash was available (possibly) because the directory was not a git checkout. Dawn should - # explicitly handle its absenece and disable features relying on the hash, i.e. caching. - return '' --- -2.36.0 diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 0516b1d65bd39..f661e64bac7f8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "102.0.5005.115", - "sha256": "1rj7vy824vn513hiivc90lnxvxyi2s0qkdmfqsdssv9v6zjl079h", - "sha256bin64": "0b32sscbjnvr98lk962i9k2srckv2s7fp9pifmsv5jlwndjhzm7y", + "version": "103.0.5060.53", + "sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf", + "sha256bin64": "19wxd4jl6fyjpcpy2331ckz6dgzrfj52wvdkp0kb18n0sym17fyn", "deps": { "gn": { - "version": "2022-04-14", + "version": "2022-05-11", "url": "https://gn.googlesource.com/gn", - "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167", - "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h" + "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", + "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" }, "ungoogled-patches": { - "rev": "102.0.5005.115-1", - "sha256": "1z2xkxxviggyyksga74cqa4v73gynlgzi22ckg8yv84qxrklik6p" + "rev": "103.0.5060.53-1", + "sha256": "1g5ciwzrhg9g13gvhrwqf19djk9jhj1d6nx2f6a8d5ch1mhi2z8s" } } } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 153bd31a5e725..1b8e3c879676e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -97,12 +97,15 @@ let nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []); + requiresSigning = browser ? MOZ_REQUIRE_SIGNING + -> toString browser.MOZ_REQUIRE_SIGNING != ""; + # Check that every extension has a unqiue .name attribute # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" - else if ! (lib.hasSuffix "esr" browser.name) then - throw "Nix addons are only supported in Firefox ESR" + else if requiresSigning && !lib.hasSuffix "esr" browser.name then + throw "Nix addons are only supported without signature enforcement (eg. Firefox ESR)" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 962113a2ace5d..26b408ffdecc0 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Additional support for proprietary codecs for Vivaldi"; homepage = "https://ffmpeg.org/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.lgpl21; maintainers = with maintainers; [ betaboon cawilliamson lluchs ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 740e325fca4e9..65c58775874b1 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Widevine support for Vivaldi"; homepage = "https://www.widevine.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ betaboon ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/applications/networking/cisco-packet-tracer/7.nix index f7e7317131202..422ccd05cffcb 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/7.nix @@ -83,6 +83,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Network simulation tool from Cisco"; homepage = "https://www.netacad.com/courses/packet-tracer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ lucasew ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix index 9bc8900174547..0dd31aea0619d 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -125,6 +125,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Network simulation tool from Cisco"; homepage = "https://www.netacad.com/courses/packet-tracer"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ lucasew ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index f0c81ab5ca5fb..212e024b98790 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-U3i3shXsItQQlkFl/DrGdSHY2AAhaYV5WX3B+6TlOPw="; + sha256 = "sha256-zc99YKh5hNa4oRoKJcGWqNrDb3LqIwXWzYOsmGKVsL8="; }; vendorSha256 = "sha256-j/35tvfUCcuFN8NGIjWgna1W0Q4CyhMLcOlepTAUl0w="; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 648b0048e3e29..076b7f2a94c70 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,22 +2,39 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.11.7"; + version = "0.11.10"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4+4E7v/b74DDekqymH8PR7/GfH3GGzSQFQk24VJisQ0="; + sha256 = "sha256-BkcnChxUceWGG5hBOHvzZokgcw8T/vvNwIEtHkLfUJA="; }; vendorSha256 = null; + subPackages = [ "cmd/cilium" ]; + + ldflags = [ + "-s" "-w" + "-X github.com/cilium/cilium-cli/internal/cli/cmd.Version=${version}" + ]; + + + # Required to workaround install check error: + # 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied + HOME = "$TMPDIR"; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/cilium version | grep ${version} > /dev/null + ''; + meta = with lib; { description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; license = licenses.asl20; homepage = "https://www.cilium.io/"; - maintainers = with maintainers; [ humancalico ]; + maintainers = with maintainers; [ humancalico bryanasdev000 ]; mainProgram = "cilium"; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 358803a3cf379..1afb2b7a5e1f3 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.31.1"; - sha256 = "1dhs96r9yi37i5q9wqg7198f6kl59jlj3g1q76r0snqyl16g2jwf"; - manifestsSha256 = "0wwlwai1hhz69kgaccw3w8ad6bwdd46pm4ns8nqm04927b0b2dqb"; + version = "0.31.2"; + sha256 = "1w373gwxxvnqsfm5r63r1bcmlrii5wy6yhbs5li0bw2anhnb0iir"; + manifestsSha256 = "0lqfrry1kg52ikyhzgwg57zqzq24aspp2d7whyzir3dglvf999lb"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-sPyz6ISFLe+6CJoAcG17KSfo63vuTj30IWw+S2NCszY="; + vendorSha256 = "sha256-Z7O/ReEZwmK5KKAHzi4B3d31ynA51XzbTKsrzCXAFPo="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 1d3c9f43e906b..cdd6c68a76fba 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.8.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw="; + sha256 = "sha256-V7Qw20PPoAEXl/XAMj/WSM73fLdp/gH4G3ipx49p06o="; }; vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw="; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 8ed8cd5689136..5cbd307a3d73d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,11 +1,11 @@ -{ stdenv -, lib +{ lib +, buildGoModule , fetchFromGitHub , which -, go , makeWrapper , rsync , installShellFiles +, runtimeShell , kubectl , nixosTests @@ -19,7 +19,7 @@ ] }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubernetes"; version = "1.23.8"; @@ -30,23 +30,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-mu+jBSypoMNxOugLbS3foH4C4AqSZnlic4Bf1v9dYc8="; }; - nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; + vendorSha256 = null; + + doCheck = false; + + nativeBuildInputs = [ makeWrapper which rsync installShellFiles ]; outputs = [ "out" "man" "pause" ]; patches = [ ./fixup-addonmanager-lib-path.patch ]; - postPatch = '' - substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - patchShebangs ./hack - ''; - WHAT = lib.concatStringsSep " " ([ "cmd/kubeadm" ] ++ components); - postBuild = '' + buildPhase = '' + runHook preBuild + substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${runtimeShell}" + patchShebangs ./hack ./cluster/addons/addon-manager + make "SHELL=${runtimeShell}" "WHAT=$WHAT" ./hack/update-generated-docs.sh + runHook postBuild ''; installPhase = '' @@ -69,7 +73,6 @@ stdenv.mkDerivation rec { --subst-var out chmod +x $out/bin/kube-addons - patchShebangs $out/bin/kube-addons wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh @@ -80,10 +83,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - disallowedReferences = [ go ]; - - GOFLAGS = [ "-trimpath" ]; - meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index 6a6f9042124b8..754bca32511c1 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, kubernetes }: +{ lib, buildGoModule, kubernetes }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubectl"; inherit (kubernetes) - disallowedReferences - GOFLAGS + buildPhase + doCheck nativeBuildInputs - postBuild - postPatch src + vendorSha256 version ; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { WHAT = lib.concatStringsSep " " [ "cmd/kubectl" "cmd/kubectl-convert" - ]; + ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 70c255790790d..733e4c04a9cca 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { introspective tooling, cluster navigation, and object management along with a plugin system to further extend its capabilities. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ jk ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index a3c8bc706613e..7350a8bd460b4 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; description = "Amazon SSM Session Manager Plugin"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mbaillie ]; }; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index da240b337bfc2..42d451bd44db4 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,42 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -let - # look for GO_LDFLAGS getting set in the Makefile - version = "1.0.6"; - sha256 = "sha256-4cUaQWqVndp06eFgqInOMMGITbTdZO5BOqXW2XEpuWU="; - vendorSha256 = "sha256-7q35d+jbIDe7fAy6nL5FWdSovBb/f64HYLHGL+zE6bI="; - pkgsVersion = "v1.0.0-25-gcf9709e"; - extrasVersion = "v1.0.0-4-g05b0920"; -in +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: + buildGoModule rec { pname = "talosctl"; - inherit version vendorSha256; - # nixpkgs-update: no auto update + version = "1.1.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - inherit sha256; + sha256 = "sha256-52WzQ5LWgIX/XBJPNvWV0tAPnw1AiINDL/7D3UYvvn4="; }; - ldflags = - let - versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG - imagesPkgs = "github.com/talos-systems/talos/pkg/images"; # IMAGES_PKGS - mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG - in - [ - "-X ${versionPkg}.Name=Client" - "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do - "-X ${versionPkg}.Tag=${src.rev}" - "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS - "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS - "-X ${imagesPkgs}.Username=siderolabs" # USERNAME - "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY - "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS - "-s" - "-w" - ]; + vendorSha256 = "sha256-iluI4UGw5cZ70wmC9jDiGttvxZ7xFyqcL9IZX4ubJqs="; + + ldflags = [ "-s" "-w" ]; + + GOWORK = "off"; subPackages = [ "cmd/talosctl" ]; @@ -56,5 +35,8 @@ buildGoModule rec { homepage = "https://www.talos.dev/"; license = licenses.mpl20; maintainers = with maintainers; [ flokli ]; + # requires >= 10.14 SDK https://github.com/NixOS/nixpkgs/issues/101229 + # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 49d64283ca0f0..0d326d5ad458a 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -1,26 +1,17 @@ -{ lib, fetchFromGitHub, fetchpatch, buildGoModule, testers, temporal-cli }: +{ lib, fetchFromGitHub, buildGoModule, testers, temporal-cli }: buildGoModule rec { pname = "temporal-cli"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - sha256 = "sha256-WNdu/62/VmxTmzAvzx3zIlcAAlEmpN0yKzQOSUtrL8s="; + sha256 = "sha256-KLcCFQJlFeioIhqrbkhgoNPcbAYvy1ESG8x9Y/I7+nw="; }; - patches = [ - # Fix tests - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/temporalio/tctl/pull/203/commits/2b113da137a3a925e8fbd7c18bdaaefc31397db4.patch"; - sha256 = "sha256-HFPwbmLZ2uPHzaHvYoB4MTZvMVyzvUKggA76/bh50DQ="; - }) - ]; - - vendorSha256 = "sha256-WF3T+HNisfR0JoKkHCC77kmHmsGZ9NfQ7UCwOmpCG/o="; + vendorSha256 = "sha256-kczmoP32/V0HHeC3Mr+giuMB+McVTNeC2F+t1ohY4/U="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 88c3a31fd2d77..5685b0b65072c 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,23 +2,25 @@ buildGoModule rec { pname = "velero"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58="; + sha256 = "sha256-zoHMyOhHEunJ8LirUxOT1qNY3jB28BEiQ+3GdqriTtQ="; }; ldflags = [ "-s" "-w" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorSha256 = "sha256-DyQ+MHRNZFg80Yz/SCxhnF4NVbIsyhz4mApx0+kgHoA="; + vendorSha256 = "sha256-PDXufnddHEA0qCfzJ0O+h3u50gWNkQAnWMZjSVQ0oHc="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index bcd43d71fc8a7..d677b2d96dfdd 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.114"; + version = "1.2.117"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-+QCKVXuROd7QB6P5tSSINWtdw5OvVnmE1+ttoBnCO1g="; + sha256 = "sha256-bh+4Z4+BU1exOv113ScIw9VsGM+jRireyb9lArg/Zg4="; }; - vendorSha256 = "sha256-VuburDiYqePFvS7/aTM+krkK2UhTHhfbvGOLY3I3DN8="; + vendorSha256 = "sha256-cW9sjMRLslEhgyI5Z7ypUtGgzCDASQ4m9yr6DoQKoz8="; proxyVendor = true; diff --git a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix index 9bb34ffbbd709..22bd33b87717f 100644 --- a/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix +++ b/pkgs/applications/networking/feedreaders/indigenous-desktop/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IndieWeb app with extensions for sharing to/reading from micropub endpoints"; homepage = "https://indigenous.realize.be/indigenous-desktop"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 0a4cea6288152..071ac5b7aa273 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.17"; + version = "3.3.18"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-xVHk6fQBY8EQsZJDZYoQ+WXDpLGJrRTVR6xhF1DWv0I="; + hash = "sha256-vZOeWxCcrTRT28Bn2r/I7/ojQ6uUV3xZlAZLbrAH5tc="; }; postPatch = '' diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix index 64a237480c651..5417cc6fda145 100644 --- a/pkgs/applications/networking/hpmyroom/default.nix +++ b/pkgs/applications/networking/hpmyroom/default.nix @@ -50,6 +50,7 @@ mkDerivation rec { meta = { description = "Client for HPE's MyRoom web conferencing solution"; maintainers = with lib.maintainers; [ johnazoidberg ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; homepage = "https://myroom.hpe.com"; # TODO: A Darwin binary is available upstream diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 51279394df5c8..ff97cb55a5563 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Video-conferencing application, specialized in virtual online meetings, seminars, training sessions and conferences"; homepage = "https://alfaview.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang hexchen ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index c902a7e67c57e..ddecac0735268 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -127,6 +127,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; homepage = "https://www.bluejeans.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 35266eff90092..a6e31573ae816 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-uDuSx+tWv6DV93/99QUcUKZaWA9kNW8phHZhetYlG/M="; + hash = "sha256-vwgXfoyZOCSMnRAB6bFSrtYlSrpMa9OOcmxYTqhU+lA="; }; postPatch = '' @@ -83,6 +83,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "XMPP and SMS messaging via libpurple and ModemManager"; homepage = "https://source.puri.sm/Librem5/chatty"; + changelog = "https://source.puri.sm/Librem5/chatty/-/blob/${src.rev}/NEWS"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda tomfitzhenry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index 4bc9ac98df1f6..494a7e6a44283 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, undmg }: +{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg }: stdenv.mkDerivation { inherit pname version src meta; @@ -8,7 +8,15 @@ stdenv.mkDerivation { sourceRoot = "."; installPhase = '' + runHook preInstall + mkdir -p $out/Applications cp -r "${desktopName}.app" $out/Applications + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString (openasar != null) '' + cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar ''; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index ab471ef47fb78..71606f2dcaddb 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,6 +1,5 @@ -{ branch ? "stable", pkgs, lib, stdenv }: +{ branch ? "stable", callPackage, fetchurl, lib, stdenv, withOpenASAR ? false }: let - inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { stable = "0.0.18"; ptb = "0.0.29"; @@ -55,14 +54,18 @@ let description = "All-in-one cross-platform voice and text chat for gamers"; homepage = "https://discordapp.com/"; downloadPage = "https://discordapp.com/download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ldesgoui MP2E devins2518 ]; platforms = [ "x86_64-linux" "x86_64-darwin" ] ++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ]; }; package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; + + openasar = if withOpenASAR then callPackage ./openasar.nix { } else null; + packages = (builtins.mapAttrs - (_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; })) + (_: value: callPackage package (value // { inherit src version openasar; meta = meta // { mainProgram = value.binaryName; }; })) { stable = rec { pname = "discord"; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 74e424aaf1dfa..28c1d353ff610 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook +{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook , makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk , at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf , glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,opt/${binaryName},share/pixmaps,share/icons/hicolor/256x256/apps} mv * $out/opt/${binaryName} @@ -95,6 +97,12 @@ stdenv.mkDerivation rec { ln -s $out/opt/${binaryName}/discord.png $out/share/icons/hicolor/256x256/apps/${pname}.png ln -s "${desktopItem}/share/applications" $out/share/ + + runHook postInstall + ''; + + postInstall = lib.strings.optionalString (openasar != null) '' + cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar ''; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix new file mode 100644 index 0000000000000..e378f490c0f45 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages }: + +stdenv.mkDerivation rec { + version = "unstable-2022-06-10"; + pname = "openasar"; + + src = fetchFromGitHub { + owner = "GooseMod"; + repo = "OpenAsar"; + rev = "c6f2f5eb7827fea14cb4c54345af8ff6858c633a"; + sha256 = "m6e/WKGgkR8vjKcHSNdWE25MmDQM1Z3kgB24OJgbw/w="; + }; + + buildPhase = '' + runHook preBuild + + bash scripts/injectPolyfills.sh + substituteInPlace src/index.js --replace 'nightly' '${version}' + ${nodejs}/bin/node scripts/strip.js + ${nodePackages.asar}/bin/asar pack src app.asar + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install app.asar $out + + runHook postInstall + ''; + + doCheck = false; + + meta = with lib; { + description = "Open-source alternative of Discord desktop's \"app.asar\"."; + homepage = "https://openasar.dev"; + license = licenses.mit; + maintainers = with maintainers; [ pedrohlc ]; + platforms = nodejs.meta.platforms; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 90ab331426a09..edd05a83ad639 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -26,6 +26,7 @@ mkFranzDerivation' rec { meta = with lib; { description = "Combine your favorite messaging services into one application"; homepage = "https://getferdi.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ davidtwco ma27 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index b3d9194c6fe4b..a910105fde808 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -11,6 +11,7 @@ mkFranzDerivation rec { meta = with lib; { description = "A free messaging app that combines chat & messaging services into one application"; homepage = "https://meetfranz.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.free; maintainers = [ maintainers.davidtwco ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 8ed85cba8546f..04d8909f3d892 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -94,6 +94,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Where developers come to talk"; downloadPage = "https://gitter.im/apps"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = [ maintainers.imalison ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 6a677c9e0d612..8debefa0c11c4 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -81,6 +81,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Desktop client for HipChat services"; homepage = "http://www.hipchat.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 9646738780802..0ef6b2e74d7b8 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -65,7 +65,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://jitsi.org/"; description = "Open Source Video Calls and Chat"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = teams.jitsi.members; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index ba806409e05c6..bb900654d1e8a 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -84,6 +84,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Mattermost Desktop client"; homepage = "https://about.mattermost.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.joko ]; diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix index ef9dad66b5d65..39403ba774fa3 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix @@ -25,6 +25,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Desktop chat client for Slack and Discord"; homepage = "https://cancel.fm/ripcord/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # See: https://cancel.fm/ripcord/shareware-redistribution/ license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mikroskeem ]; diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 7379d769288bd..7fd0bd9bb1d34 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -60,6 +60,7 @@ mkDerivation rec { meta = with lib; { description = "Desktop chat client for Slack and Discord"; homepage = "https://cancel.fm/ripcord/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # See: https://cancel.fm/ripcord/shareware-redistribution/ license = licenses.unfreeRedistributable; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 71379039de6f2..d854414a36b63 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Official Desktop client for Rocket.Chat"; homepage = "https://github.com/RocketChat/Rocket.Chat.Electron"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ gbtb ]; platforms = platforms.x86_64; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c8f57d20ec11a..7d18a8d29252f 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.46.0"; # Please backport all updates to the stable channel. + version = "5.47.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-zy9nETD82KguML0MXe8hlB4m+fBCMmJ1z/2Neq6QvEU="; + sha256 = "sha256-aQpylo4/pbHP2an1w6DEhRmU3uvntN/tnYhvaWtNGGg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix index 464d4d77f9461..e949625875e58 100644 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -59,6 +59,7 @@ mkDerivation rec { meta = { description = "Lync & Skype for Business on Linux"; homepage = "https://tel.red/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 024ac9a143182..515290ab91559 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -120,6 +120,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Linux client for skype"; homepage = "https://www.skype.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ panaeon jraygauthier ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 86ed37e54dc00..953d5134377be 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -80,6 +80,7 @@ let meta = with lib; { description = "Desktop client for Slack"; homepage = "https://slack.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mmahut maxeaubrey ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 07462b4cc26f8..d7831d3fd5386 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -28,6 +28,7 @@ let description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; downloadPage = "https://teams.microsoft.com/downloads"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ liff tricktron ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 83139c30075d1..5a0a9006e0df5 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The TeamSpeak voice communication tool"; homepage = "https://teamspeak.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = { fullName = "Teamspeak client license"; url = "https://www.teamspeak.com/en/privacy-and-terms/"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index e027ed656e01a..577589f6a40b0 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -58,6 +58,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "TeamSpeak voice communication server"; homepage = "https://teamspeak.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ arobyn gerschtli ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0ee0bef5e233e..212092d8a1ff1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -71,7 +71,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.0.0"; + version = "4.0.2"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -80,7 +80,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "16j5rvlqr2bb1dkc7cc920ylhw3sp4qnqvm1aznnnjzcimqb8xf0"; + sha256 = "07fhm36394171w0rvay1x9x1br3z36z4dlpi57bkq23dvi331pxj"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 0951f1d3d8e7d..852abe8e6dc45 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "threema-desktop"; - version = "1.2.0"; + version = "1.2.13"; src = fetchurl { # As Threema only offers a Latest Release url, the plan is to upload each # new release url to web.archive.org until their Github releases page gets populated. - url = "https://web.archive.org/web/20220408213031if_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; - sha256 = "7c8e1e76ad82a0cf776eb8b0a683a41a00dc8752bb79a24b0ae9d795fdedcde6"; + url = "https://web.archive.org/web/20220621152620id_/https://releases.threema.ch/web-electron/v1/release/Threema-Latest.deb"; + sha256 = "sha256-X16GMxUIKUloj0FxhzWQKUBf4zwfSBVg0cwLgGxHPHE="; }; nativeBuildInputs = [ @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop client for Threema, a privacy-focused end-to-end encrypted mobile messenger"; homepage = "https://threema.ch"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index f8e048edc4b02..be19ec257424b 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation { meta = { homepage = "https://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ jagajaga ]; diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix index bb34fd7534c95..a22437bf8da00 100644 --- a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A console (ncurses) client for vk.com written in D"; homepage = "https://github.com/vk-cli/vk"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 5fb0f14f36a04..1d249794d4431 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -24,6 +24,7 @@ let meta = with lib; { description = "Simple and Convenient Messaging App for VK"; homepage = "https://vk.com/messenger"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ ]; platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4d7a2218e7dfa..304d1bf4255c8 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -47,6 +47,7 @@ let ''; homepage = "https://wire.com/"; downloadPage = "https://wire.com/download/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ arianvp diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 06f9a2d3e8ee7..37f3c99251067 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -183,6 +183,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://zoom.us/"; description = "zoom.us video conferencing application"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ danbst tadfisher doronbehar ]; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 380aad6c32914..5992453975d94 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = { platforms = ["x86_64-linux"]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.benley ]; homepage = "https://www.insynchq.com"; diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index 49a5b892111e5..5efffab51c6cd 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = ["x86_64-linux"]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ benley ]; homepage = "https://www.insynchq.com"; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 4bc80b84b8470..539e69069f35d 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. Mailspring's sync engine runs locally, but its source is not open. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ toschmidt doronbehar ]; homepage = "https://getmailspring.com"; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index e4e5332e07f33..ba4edfd916f46 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -206,6 +206,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = "http://www.mozilla.org/thunderbird/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with lib.maintainers; [ lovesegfault ]; platforms = builtins.attrNames mozillaPlatforms; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index cf22d8804068d..97dc48f6e0d06 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mullvad/mullvadvpn-app"; description = "Client for Mullvad VPN"; changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Br1ght0ne ymarkus flexagoon ]; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 8de78c580aaee..fd5424cee3424 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.7"; + version = "6.9.8"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; + sha256 = "sha256-gslNdvxA4rGKg0bjf2KWw7w9NMp3zqrii144AfKsV4s="; }; nativeBuildInputs = [ makeWrapper ]; @@ -35,7 +35,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-linux"]; diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index a760a0f96c35c..df314b6591c20 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index f166f6d0e29f2..fa459137f1994 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ autoconf-archive autoreconfHook diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 0d2fc0fd833cd..c281756bed357 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -52,6 +52,7 @@ mkDerivation rec { meta = with lib; { description = "Official Qt SoulSeek client"; homepage = "https://www.slsknet.org"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 9a0cc70c1999e..bafbb443458aa 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Torrent client"; homepage = "http://www.tixati.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 50a26ef50f6a3..4cb3a43640cca 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -104,6 +104,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition"; homepage = "https://www.pcloud.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ patryk27 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 54d7c5c6813aa..69276c229b3c2 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -18,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh"; + sha256 = "k85nQH2FWyEXDgB+Pd4yStfNCjkiIGE2vA/YTXLaK4o="; }; passthru = { @@ -85,6 +85,7 @@ in stdenv.mkDerivation rec { meta = with lib; { inherit description; homepage = "https://www.anydesk.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ shyim ]; diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix index 48b44656ff0af..4eea552810b51 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client for Amazon WorkSpaces, a managed, secure Desktop-as-a-Service (DaaS) solution"; homepage = "https://clients.amazonworkspaces.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; # TODO Mac support maintainers = [ maintainers.mausch ]; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 1ecf805944e25..5051d2308f02c 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -206,6 +206,7 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.unfree; description = "Citrix Workspace"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = with maintainers; [ pmenke michaeladler ]; inherit homepage; diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 20b850328875b..23b2727d695d6 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "High-performance remote display protocol"; homepage = "https://aws.amazon.com/hpc/dcv/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ rmcgibbo ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index ba6d3d3c0f854..5aa6d62209579 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -96,6 +96,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://www.teamviewer.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index bbce0e1d350e3..35b4fa3aef43a 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Automatically sync files via secure, distributed technology"; homepage = "https://www.resilio.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 6dca196948d7a..1f340a703611b 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services"; homepage = "https://www.scaleft.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jloyet ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 401d6dfa32cdb..558c7ef864611 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.10"; + version = "1.5.0"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es="; + sha256 = "sha256-GxC9+O72GHE8Tc6FReO7EdpZTSaqn9mBpZCYaKybJls="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index 8c0fdfa3b9a7d..0bfc62ccfbb2b 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -53,6 +53,7 @@ in stdenv.mkDerivation { meta = { homepage = "https://spideroak.com"; description = "Secure online backup and sychronization"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ amorsillo ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index a76be3d318c3c..7b6316631e89c 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.17"; + version = "2.4.19"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA="; + hash = "sha256-7kX7gC/1jSZGgV3ZhfebMIn/Y5gXkz22GDP2zpiwUZ4="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/syncthing-gtk/paths.patch b/pkgs/applications/networking/syncthing-gtk/paths.patch deleted file mode 100644 index 0ba5a4f2db84e..0000000000000 --- a/pkgs/applications/networking/syncthing-gtk/paths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/syncthing_gtk/configuration.py -+++ b/syncthing_gtk/configuration.py -@@ -30,7 +30,7 @@ - "autokill_daemon" : (int, 2), # 0 - never kill, 1 - always kill, 2 - ask - "daemon_priority" : (int, 0), # uses nice values - "max_cpus" : (int, 0), # 0 for all cpus -- "syncthing_binary" : (str, "/usr/bin/syncthing"), -+ "syncthing_binary" : (str, "@syncthing@"), - "syncthing_arguments" : (str, ""), - "minimize_on_start" : (bool, False), - "folder_as_path" : (bool, True), ---- a/syncthing_gtk/tools.py -+++ b/syncthing_gtk/tools.py -@@ -303,7 +303,7 @@ - return False - # signal 0 doesn't kill anything, but killall exits with 1 if - # named process is not found -- p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) -+ p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) - p.communicate() - return p.returncode == 0 - else: diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 3184c192b127f..69468c0a4df0d 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -7,6 +7,7 @@ let meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jcouyang MoritzBoehme ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 0d4824fb55875..6a8960367be76 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { description = "A cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; downloadPage = "https://termius.com/linux/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ Br1ght0ne th0rgal ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/tetrd/default.nix b/pkgs/applications/networking/tetrd/default.nix index 937992a63d718..a9ccf1d2774ff 100644 --- a/pkgs/applications/networking/tetrd/default.nix +++ b/pkgs/applications/networking/tetrd/default.nix @@ -78,6 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Share your internet connection from your device to your PC and vice versa through a USB cable"; homepage = "https://tetrd.app"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Madouura ]; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 821447fdfa265..82ae850065d89 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open-source alternative to Notion"; homepage = "https://www.appflowy.io/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${version}"; maintainers = with maintainers; [ darkonion0 ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 4ebfd7965954a..8d1f639622da9 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Open source bibliography reference manager"; homepage = "https://www.jabref.org"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6244b0fbc8cd4..a75c094521352 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -121,7 +121,7 @@ let optional optionals optionalString; jre' = jre_minimal.override { - modules = [ "java.base" "java.desktop" "java.logging" ]; + modules = [ "java.base" "java.desktop" "java.logging" "java.sql" ]; }; importVariant = f: import (./. + "/src-${variant}/${f}"); diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 3b9963d8dbc7d..e204e04008ca8 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -139,6 +139,7 @@ mkDerivation { meta = with lib; { homepage = "https://www.mendeley.com"; description = "A reference manager and academic social network"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 4038f5fd435a0..742e4dc9e2930 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -114,6 +114,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Moneyplex online banking software"; maintainers = with maintainers; [ tstrobel ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = licenses.unfree; downloadPage = "http://matrica.de/download/download.html"; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index e3390e54ee397..0e5332b953e59 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "All-in-one Calendars, Tasks and Scheduler"; homepage = "https://morgen.so/download"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index 214b8376d8d6b..8e1b7eb790204 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -171,6 +171,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Plus; maintainers = with maintainers; [ nh2 gtrunsec ]; }; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 12d7dc0dcbf30..30da3b3520459 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.58.4"; + version = "0.58.5"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-Png9OcO5dzoeKp826FwdM7zkovuOnSYMnGw5weT2eJU="; + sha256 = "sha256-7olUx0JmztNb6uFsxKwOkBqkbMEiy2vb+iHqBe5I1PM="; }; nativeBuildInputs = [ @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple tool to calculate the overall performance of an investment portfolio"; homepage = "https://www.portfolio-performance.info/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; maintainers = with maintainers; [ elohmeier oyren shawn8901 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 3fd9c3410693a..7df8a607f4dfa 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.5.0"; + version = "22.6.1"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd"; + sha256 = "c5b2075d42298d28f901ad2df8eb65f5a61aa59727fae9eeb1f92dac1b63d8ba"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 3c139e1eead73..6162aa2326062 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -122,6 +122,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "An office suite with a word processor, spreadsheet and presentation program"; homepage = "https://www.softmaker.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 46f2569b13ab2..d909b26526a90 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://www.wps.com/"; platforms = [ "x86_64-linux" ]; hydraPlatforms = []; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mlatus th0rgal ]; }; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b39fe00f2e091..b5c1467f69182 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -149,6 +149,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ i077 ]; diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 989722fdc3ecd..d607823bfeec4 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "6"; + minor = "7"; patch = "0"; } }: let - sourceSha256 = "sha256-0JODgv9MNOkHDQYTVCZMzjr/G542+NvGP9wlH9iwLeg="; + sourceSha256 = "sha256-6HEvQsV2JCkgNvBYsy1jfSTUIwEnrKJTzXNIVcPeWFQ="; featuresInfo = { # Needed always basic = { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 14a4763259fa9..8a9ca156ec1a8 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "2"; + minor = "3"; patch = "0"; } }: let - sourceSha256 = "sha256-WcfmW39wHhFdpbdBSjOfuDkxL8/fuMjjJoLUyCUud/o="; + sourceSha256 = "sha256-pH0nvZBUto9jXSN6fXD5vP1lIBwCMuFAvF2qT5dYsHU="; featuresInfo = { # Needed always basic = { diff --git a/pkgs/applications/radio/js8call/cmake.patch b/pkgs/applications/radio/js8call/cmake.patch new file mode 100644 index 0000000000000..04552eac40ecc --- /dev/null +++ b/pkgs/applications/radio/js8call/cmake.patch @@ -0,0 +1,69 @@ +diff --git a/CMake/Modules/Findhamlib.cmake b/CMake/Modules/Findhamlib.cmake +index 1590f05..e797851 100644 +--- a/CMake/Modules/Findhamlib.cmake ++++ b/CMake/Modules/Findhamlib.cmake +@@ -47,7 +47,7 @@ if (NOT PC_HAMLIB_FOUND) + + # libusb-1.0 has no pkg-config file on Windows so we have to find it + # ourselves +- find_library (LIBUSB NAMES usb-1.0 PATH_SUFFIXES MinGW32/dll) ++ find_library (LIBUSB NAMES libusb-1.0 usb-1.0 PATH_SUFFIXES MinGW32/dll) + if (LIBUSB) + set (hamlib_EXTRA_LIBRARIES ${LIBUSB} ${hamlib_EXTRA_LIBRARIES}) + get_filename_component (hamlib_libusb_path ${LIBUSB} PATH) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 75b80b3..7c04265 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -558,7 +558,6 @@ find_package (FFTW3 COMPONENTS double single threads REQUIRED) + # + # libhamlib setup + # +-set (hamlib_STATIC 1) + find_package (hamlib 3 REQUIRED) + find_program (RIGCTL_EXE rigctl) + find_program (RIGCTLD_EXE rigctld) +@@ -576,6 +576,7 @@ message (STATUS "hamlib_LIBRARY_DIRS: ${hamlib_LIBRARY_DIRS}") + find_package (Qt5Widgets 5 REQUIRED) + find_package (Qt5Multimedia 5 REQUIRED) + find_package (Qt5PrintSupport 5 REQUIRED) ++find_package (Qt5SerialPort 5 REQUIRED) + + if (WIN32) + add_definitions (-DQT_NEEDS_QTMAIN) +@@ -849,7 +850,7 @@ target_link_libraries (qcp Qt5::Widgets Qt5::PrintSupport) + add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS}) + # set wsjtx_udp exports to static variants + target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE) +-target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network) ++target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network Qt5::SerialPort) + target_include_directories (wsjt_qt BEFORE PRIVATE ${hamlib_INCLUDE_DIRS}) + if (WIN32) + target_link_libraries (wsjt_qt Qt5::AxContainer Qt5::AxBase) +@@ -959,7 +960,6 @@ else () + ) + endif () + endif () +-qt5_use_modules (js8call SerialPort) # not sure why the interface link library syntax above doesn't work + + # if (UNIX) + # if (NOT WSJT_SKIP_MANPAGES) +@@ -1292,3 +1292,5 @@ configure_file ("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in" + set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CMakeCPackOptions.cmake") + + include (CPack) ++ ++add_definitions (-DJS8_USE_HAMLIB_THREE) +diff --git a/Configuration.cpp b/Configuration.cpp +index 8258f97..63a29bb 100644 +--- a/Configuration.cpp ++++ b/Configuration.cpp +@@ -160,7 +160,7 @@ + #include <QFont> + #include <QFontDialog> + #include <QColorDialog> +-#include <QSerialPortInfo> ++#include <QtSerialPort/QSerialPortInfo> + #include <QScopedPointer> + #include <QDateTimeEdit> + #include <QProcess> diff --git a/pkgs/applications/radio/js8call/default.nix b/pkgs/applications/radio/js8call/default.nix new file mode 100644 index 0000000000000..e89d3445697f4 --- /dev/null +++ b/pkgs/applications/radio/js8call/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromBitbucket +, wrapQtAppsHook +, pkg-config +, hamlib +, libusb1 +, cmake +, gfortran +, fftw +, fftwFloat +, qtbase +, qtmultimedia +, qtserialport +}: + +stdenv.mkDerivation rec { + pname = "js8call"; + version = "2.2.0"; + + src = fetchFromBitbucket { + owner = "widefido"; + repo = pname; + rev = "v${version}-ga"; + sha256 = "sha256-mFPhiAAibCiAkLrysAmIQalVCGd9ips2lqbAsowYprY="; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + gfortran + pkg-config + cmake + ]; + + buildInputs = [ + hamlib + libusb1 + fftw + fftwFloat + qtbase + qtmultimedia + qtserialport + ]; + + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/share/applications" "$out/share/applications" \ + --replace "/usr/share/pixmaps" "$out/share/pixmaps" \ + --replace "/usr/bin/" "$out/bin" + ''; + + patches = [ ./cmake.patch ]; + + meta = with lib; { + description = "Weak-signal keyboard messaging for amateur radio"; + longDescription = '' + JS8Call is software using the JS8 Digital Mode providing weak signal + keyboard to keyboard messaging to Amateur Radio Operators. + ''; + homepage = "http://js8call.com/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ melling ]; + }; +} diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index 441ff1cf0f3d3..699389dd2d34b 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -44,6 +44,7 @@ in stdenv.mkDerivation rec { https://www.sdrplay.com/docs/SDRplay_API_Specification_v${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}.pdf ''; homepage = "https://www.sdrplay.com/downloads/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = [ maintainers.pmenke ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/applications/science/biology/flywheel-cli/default.nix index 7db8b0066263a..7d74b51f6066f 100644 --- a/pkgs/applications/science/biology/flywheel-cli/default.nix +++ b/pkgs/applications/science/biology/flywheel-cli/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library and command line interface for interacting with a Flywheel site"; homepage = "https://gitlab.com/flywheel-io/public/python-cli"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ rbreslow ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix index ed3fc116ddaba..0a33c97673196 100644 --- a/pkgs/applications/science/biology/quast/default.nix +++ b/pkgs/applications/science/biology/quast/default.nix @@ -49,6 +49,10 @@ pythonPackages.buildPythonApplication rec { meta = with lib ; { description = "Evaluates genome assemblies by computing various metrics"; homepage = "https://github.com/ablab/quast"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode # source bundles binary dependencies + ]; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.all; diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 49415ea048413..2018878773ef0 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -24,6 +24,7 @@ let meta = with lib; { homepage = "http://bitscope.com/software/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 5b4c8eb790fe6..6302c2dbfa384 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -73,6 +73,7 @@ let meta = with lib; { description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)"; homepage = "https://www.autodesk.com/products/eagle/overview"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ ]; diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 7db5cceebbaf6..596f220242bb2 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -41,6 +41,7 @@ let ''; meta = with lib; shared_meta lib // { + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; description = "library for picotech oscilloscope software"; }; }) { }; @@ -132,6 +133,7 @@ in stdenv.mkDerivation rec { PicoScope for Linux, PicoScope for macOS and PicoScope for Windows users, or exported in text, CSV and MathWorks MATLAB 4 formats. ''; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 9e5d40be2c6d5..009af3463a25a 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -47,10 +47,15 @@ in stdenv.mkDerivation rec { sha256 = "0jfaqckhg388jh9b4msrpkv6wrd6xzlw18m0bngbby8k8ywalp9i"; }; - buildInputs = [ polyml z3 veriT vampire eprover-ho ] - ++ lib.optionals (!stdenv.isDarwin) [ nettools java ]; + buildInputs = [ polyml z3 veriT vampire eprover-ho nettools ] + ++ lib.optionals (!stdenv.isDarwin) [ java ]; - sourceRoot = dirname; + sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; + + postUnpack = if stdenv.isDarwin then '' + mv $sourceRoot ${dirname} + sourceRoot=${dirname} + '' else null; postPatch = '' patchShebangs . @@ -112,6 +117,9 @@ in stdenv.mkDerivation rec { --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' rm -r heaps + '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' + substituteInPlace lib/scripts/isabelle-platform \ + --replace 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do @@ -178,9 +186,13 @@ in stdenv.mkDerivation rec { formulas in a logical calculus. ''; homepage = "https://isabelle.in.tum.de/"; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode # source bundles binary dependencies + ]; license = licenses.bsd3; maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } // { withComponents = f: diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/applications/science/logic/nuXmv/default.nix index 710cfdad39a8d..ad40902e92808 100644 --- a/pkgs/applications/science/logic/nuXmv/default.nix +++ b/pkgs/applications/science/logic/nuXmv/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Symbolic model checker for analysis of finite and infinite state systems"; homepage = "https://nuxmv.fbk.eu/pmwiki.php"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ siraben ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index df99d067f08c8..b6291bfae3698 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation { meta = { description = "Tools for software verification and analysis"; homepage = "https://saw.galois.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 3c53e66c8bd9f..86c3db9942a1e 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -97,6 +97,7 @@ stdenv.mkDerivation rec { ''; # http://lamport.azurewebsites.net/tla/license.html license = with lib.licenses; [ mit ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; maintainers = [ ]; }; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 9c91eaddfc47e..5df511ebaa8e7 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { # Also, it is unclear what is covered by "verbatim" - we will edit configs hydraPlatforms = []; platforms = platforms.all; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; }; } diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index c610256ccaef8..a1f5ec65a3be3 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; homepage = "https://people.cs.kuleuven.be/~bart.jacobs/verifast/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix index a3d6c16fb7df2..857bbbdee5d00 100644 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/pkgs/applications/science/logic/z3/4.4.0.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; enableParallelBuilding = true; + CXXFLAGS = if stdenv.isDarwin then "-std=gnu++98" else null; + configurePhase = "python scripts/mk_make.py --prefix=$out && cd build"; # z3's install phase is stupid because it tries to calculate the diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index 9438cd972f95b..97cad175ac17f 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -51,6 +51,7 @@ in stdenv.mkDerivation rec { meta = { platforms = lib.platforms.linux; description = "Starcraft II headless linux client for machine learning research"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = { fullName = "BLIZZARD® STARCRAFT® II AI AND MACHINE LEARNING LICENSE"; url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html"; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index a570e7e9c6d1e..ddc950b30664b 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.ibm.com/be-en/marketplace/ibm-ilog-cplex"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ bfortz ]; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index b7eb8b11ecdc8..43d1a3e2068b9 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -29,6 +29,10 @@ let homepage = "https://www.geogebra.org/"; maintainers = with maintainers; [ sikmir imsofi ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode # some jars include native binaries + ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; }; diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 76d178b7e490d..e1b5bbaedc2b1 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -48,7 +48,7 @@ let }; darwinPkg = stdenv.mkDerivation { - inherit pname version meta; + inherit pname version; src = fetchurl { urls = [ @@ -66,6 +66,10 @@ let install -dm755 $out/Applications unzip $src -d $out/Applications ''; + + meta = meta // { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; }; in if stdenv.isDarwin diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 574d849d955c2..536d520058a2d 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimization solver for mathematical programming"; homepage = "https://www.gurobi.com"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix index 762216a97a444..1c0152b7bfc77 100644 --- a/pkgs/applications/science/math/hmetis/default.nix +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "hMETIS is a set of programs for partitioning hypergraphs"; homepage = "http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index 0f4819172cea9..b081640c97d5b 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -121,6 +121,8 @@ in stdenv.mkDerivation { "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" # Fix xkeyboard config path for Qt "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" + # wayland isn't supported + "--set QT_QPA_PLATFORM xcb" ] ++ lib.optionals cudaSupport [ "--set CUDA_PATH ${cudaEnv}" "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so" diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 65d8c145bef6f..327472e88c752 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.scilab.org/"; description = "Scientific software package for numerical computations (Matlab lookalike)"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # see http://www.scilab.org/legal_notice license = "Scilab"; }; diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index cf9364ffac174..acb92766910d0 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -140,6 +140,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Wolfram Engine computational software system"; homepage = "https://www.wolfram.com/engine/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ fbeffa ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index 0eb89b63e475f..b08acc77c640c 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation { meta = { description = "Medical imaging software with 2D, 3D and 4D capabilities"; homepage = "https://www.aliza-dicom-viewer.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index d0955a4d70c45..702dd3242e649 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -3,8 +3,8 @@ libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let - majorVersion = "7.18"; - minorVersion = "1"; + majorVersion = "7.20"; + minorVersion = "0"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "BOINC"; repo = "boinc"; rev = "client_release/${majorVersion}/${version}"; - sha256 = "sha256-ijkfWTFwwJXvh6f0P5hkzWODxU+Ugz6iQUK+5jEpWXQ="; + sha256 = "sha256-W8+ALVO2OHxxBi80ZFgc8RxXneGINCHYNeMXimp9TIw="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index cc3d5445b594d..6ebc72cc7da41 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -52,6 +52,7 @@ buildFHSUserEnv { meta = { description = "Folding@home client"; homepage = "https://foldingathome.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index e5cc02edcfbe6..a64c973914c66 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -1,5 +1,4 @@ { lib, stdenv -, autoPatchelfHook , dpkg , fahviewer , fetchurl diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 75e900a0a72c5..7f28c8d1b1463 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "Folding@home viewer"; homepage = "https://foldingathome.org/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.zimbatm ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index bc67c30aa61cf..f7b12342a6659 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation { homepage = "https://cocotec.io/fdr/"; description = "The CSP refinement checker"; license = licenses.unfreeRedistributable; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = with maintainers; [ nickhu ]; }; diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 5065723995245..271274126b754 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.7.2"; + version = "10.8.0"; src = fetchurl { - url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip"; - sha256 = "sha256-FDmtFRUupPKiHeF3Xvh/VagqMo+FJi8I7mhTz0VDs3o="; + url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip"; + sha256 = "sha256-Xn0ga2Z1UKd++TriL47ulV6idVTNBR8uiSW7FnL7r1g="; }; nativeBuildInputs = [ wrapGAppsHook unzip ]; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; homepage = "https://github.com/betaflight/betaflight/wiki"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index ca486006fecba..112049d7c0169 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { The application allows you to configure the Emuflight software running on any supported Emuflight target. ''; homepage = "https://github.com/emuflight/EmuConfigurator"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ beezow ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/applications/science/robotics/inav-configurator/default.nix index ec605a3a97e95..a0b694f295415 100644 --- a/pkgs/applications/science/robotics/inav-configurator/default.nix +++ b/pkgs/applications/science/robotics/inav-configurator/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { quadcopters, hexacopters, octocopters and fixed-wing aircraft. ''; homepage = "https://github.com/iNavFlight/inav/wiki"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ tilcreator wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/applications/terminal-emulators/dterm/default.nix b/pkgs/applications/terminal-emulators/dterm/default.nix new file mode 100644 index 0000000000000..69b1f67d629a9 --- /dev/null +++ b/pkgs/applications/terminal-emulators/dterm/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchurl +, readline +}: + +stdenv.mkDerivation rec { + pname = "dterm"; + version = "0.5"; + + src = fetchurl { + url = "http://www.knossos.net.nz/downloads/dterm-${version}.tgz"; + hash = "sha256-lFM7558e7JZeWYhtXwCjXLZ1xdsdiUGfJTu3LxQKvds="; + }; + + buildInputs = [ readline ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' + ''; + + preInstall = "mkdir -p $out/bin"; + + installFlags = [ "BIN=$(out)/bin/" ]; + + meta = with lib; { + homepage = "http://www.knossos.net.nz/resources/free-software/dterm/"; + description = "A simple terminal program"; + longDescription = '' + dterm is a simple terminal emulator, which doesn’t actually emulate any + particular terminal. Mainly, it is designed for use with xterm and + friends, which already do a perfectly good emulation, and therefore don’t + need any special help; dterm simply provides a means by which keystrokes + are forwarded to the serial line, and data forwarded from the serial line + appears on the terminal. + ''; + license = licenses.gpl2Only; + maintainers = with maintainers; [ auchter ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 2266e884454b2..031d49d2458d9 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { description = "A terminal built on web technologies"; homepage = "https://hyper.is/"; maintainers = with maintainers; [ puffnfresh fabiangd ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 8f15a38111c8f..4fed03db0dd08 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220408-101518-b908e2dd"; + version = "20220624-141144-bd1b7c5d"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-kuuoD+hqgj7QXFRIxa112oc4idtcK0ptFACDpI0bzGY="; + sha256 = "sha256-7VuNOJ4xqTxumLft7wRj4zdN8Y2ZSYtXr/KuqaLNOgw="; }; postPatch = '' @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-iIb2zLUZpn23ooEiOP+yQMYUUmvef/KqvjzgLOFmjs0="; + cargoSha256 = "sha256-YvQ0APyPiYwISE/pDD2s+UgYFj4CKPdolb14FrNpocU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 57adae69db037..bed85a37f544d 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -86,6 +86,7 @@ let You can then merge the changes, synchronize your files, and generate reports for your records. ''; homepage = "https://www.scootersoftware.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ ktor arkivm ]; platforms = builtins.attrNames srcs; diff --git a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix index b8743b7ea9022..4b4319f8cd7cc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix @@ -10,15 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "git-quickfix"; - version = "0.0.5"; + version = "0.1.0"; src = fetchFromGitHub { owner = "siedentop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg="; + sha256 = "sha256-IAjet/bDG/Hf/whS+yrEQSquj8s5DEmFis+5ysLLuxs="; }; + doCheck = false; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security @@ -26,7 +28,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE="; + cargoSha256 = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI="; meta = with lib; { description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index fbf0138ce5aa7..2cddeea816204 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -12,8 +12,6 @@ , nixosTests }: -with lib; - buildGoPackage rec { pname = "gitea"; version = "1.16.8"; @@ -36,19 +34,18 @@ buildGoPackage rec { ]; postPatch = '' - patchShebangs . substituteInPlace modules/setting/setting.go --subst-var data ''; nativeBuildInputs = [ makeWrapper ]; - buildInputs = optional pamSupport pam; + buildInputs = lib.optional pamSupport pam; preBuild = let - tags = optional pamSupport "pam" - ++ optional sqliteSupport "sqlite sqlite_unlock_notify"; - tagsString = concatStringsSep " " tags; + tags = lib.optional pamSupport "pam" + ++ lib.optional sqliteSupport "sqlite sqlite_unlock_notify"; + tagsString = lib.concatStringsSep " " tags; in '' export buildFlagsArray=( @@ -66,14 +63,14 @@ buildGoPackage rec { cp -R ./go/src/${goPackagePath}/options/locale $out/locale wrapProgram $out/bin/gitea \ - --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} + --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; goPackagePath = "code.gitea.io/gitea"; passthru.tests.gitea = nixosTests.gitea; - meta = { + meta = with lib; { description = "Git with a cup of tea"; homepage = "https://gitea.io"; license = licenses.mit; diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 6017d105fed71..7c07dc17c2ee9 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI for managing Git and GitHub."; homepage = "https://desktop.github.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ dan4ik605743 ]; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index a0bc7477c6110..c8ca224a952b1 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -36,6 +36,7 @@ let meta = { homepage = "https://www.gitkraken.com/"; description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.attrNames srcs; maintainers = with maintainers; [ xnwdd evanjs arkivm ]; diff --git a/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch b/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch new file mode 100644 index 0000000000000..968e618f3121f --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch @@ -0,0 +1,69 @@ +From 7d833508e3bc4c737834e9edf1c429d36f67a38c Mon Sep 17 00:00:00 2001 +From: "M. A" <mak@nyantec.com> +Date: Sat, 25 Jun 2022 13:34:42 +0000 +Subject: [PATCH] Remove geo from database.yml + +--- + config/database.yml.postgresql | 28 ---------------------------- + 1 file changed, 28 deletions(-) + +diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql +index 5329a8e9fd7..a4daab1fd0c 100644 +--- a/config/database.yml.postgresql ++++ b/config/database.yml.postgresql +@@ -18,13 +18,6 @@ production: + # port: 8600 + # record: secondary.postgresql.service.consul + # interval: 300 +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_production +- username: git +- password: "secure password" +- host: localhost + + # + # Development specific +@@ -39,13 +32,6 @@ development: + host: localhost + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_development +- username: postgres +- password: "secure password" +- host: localhost + + # + # Staging specific +@@ -58,13 +44,6 @@ staging: + username: git + password: "secure password" + host: localhost +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_staging +- username: git +- password: "secure password" +- host: localhost + + # Warning: The database defined as "test" will be erased and + # re-generated from your development database when you run "rake". +@@ -80,10 +59,3 @@ test: &test + prepared_statements: false + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_test +- username: postgres +- password: +- host: localhost +-- +2.36.0 + diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index c2f3092a7fabc..3cfdc2a11c771 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.0.2", - "repo_hash": "sha256-B5zD8yBY6d+jkIghuxShsR73+2X7Jd9mai1ouraEM44=", - "yarn_hash": "1a8k3x3b9sirzicqkwmr10m27n593iljfh8awdc9700akbj155lr", + "version": "15.1.0", + "repo_hash": "sha256-vOPI9kxdJlQNmI/DZueFcbvZPy2/0d+2CYM/RBAkIcU=", + "yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.0.2-ee", + "rev": "v15.1.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.0.2", - "GITLAB_PAGES_VERSION": "1.58.0", - "GITLAB_SHELL_VERSION": "14.3.0", - "GITLAB_WORKHORSE_VERSION": "15.0.2" + "GITALY_SERVER_VERSION": "15.1.0", + "GITLAB_PAGES_VERSION": "1.59.0", + "GITLAB_SHELL_VERSION": "14.7.4", + "GITLAB_WORKHORSE_VERSION": "15.1.0" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index e5765bb78423c..73a02673471f4 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -59,9 +59,17 @@ let nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ]; - # Since version 12.6.0, the rake tasks need the location of git, - # so we have to apply the location patches here too. - patches = [ ./remove-hardcoded-locations.patch ]; + patches = [ + # Since version 12.6.0, the rake tasks need the location of git, + # so we have to apply the location patches here too. + ./remove-hardcoded-locations.patch + + # Gitlab edited the default database config since [1] and the + # installer complains about valid keywords only being "main" and "ci". + # + # [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028 + ./Remove-geo-from-database.yml.patch + ]; # One of the patches uses this variable - if it's unset, execution # of rake tasks fails. GITLAB_LOG_PATH = "log"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index cc5344f8e87af..3616864ad7e6d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -115,7 +115,7 @@ GEM minitest (5.15.0) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.13.3) + nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) @@ -249,4 +249,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.1.4 + 2.3.15 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index e38a24213b0ef..b8c1ecf6704e6 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,8 +11,8 @@ let gemdir = ./.; }; - version = "15.0.2"; - package_version = "v14"; + version = "15.1.0"; + package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; in @@ -24,10 +24,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-jwPXar16FOq0xCg3xUXH72YPmoVa91ae3bgz95ZmYo4="; + sha256 = "sha256-rhMQRskum4c5bQL1sE7O4gMxIGX7q3bntuV1HkttA8M="; }; - vendorSha256 = "sha256-/tHKWo09ZV31TSIqlOk36V3y7gNikziUJHf+nS1gHEw="; + vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index ccf444330af36..1697a9f90200c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -493,10 +493,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.6"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 3888b0ba1104b..37d66c3a7f656 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.3.0"; + version = "14.7.4"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-SFoNtWcY0iJREsA+vZRsVJHmNb2vNvOiBJnochxA/Us="; + sha256 = "sha256-kLIjlMwoK1AlhvP38OspXnIWbdOcaLl4r05PiUmqnWw="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-eSzJon8o7ktV3rFuTE1A4tzdkBzWBZf1JxnrcMj5s00="; + vendorSha256 = "sha256-f2IkdkTZhve/cYKSH+N2Y5bXFSHuQ8t4hjfReyKTPUU="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 89d82cc8dd569..b59909dd041a1 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.0.2"; + version = "15.1.0"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-7hNwBCDMdiiOliZa/lkYLo8gyAksAU0HanCSyaAMYLs="; + vendorSha256 = "sha256-cF2wVii/uBqlUQvrbDyPlv4tnfKA45deb/sE0c9U7Tk="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index cbb4d6f90c0fb..9f5c0e4cbfd8d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'rails', '~> 6.1.4.7' -gem 'bootsnap', '~> 1.9.4', require: false +gem 'bootsnap', '~> 1.12.0', require: false # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -17,7 +17,7 @@ gem 'view_component', '~> 2.50.0' gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.1' +gem 'pg', '~> 1.3.0' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.0' @@ -55,7 +55,7 @@ gem 'omniauth-authentiq', '~> 0.3.3' gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect' gem 'omniauth-salesforce', '~> 1.0.5' gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.16.0' +gem 'rack-oauth2', '~> 1.19.0' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only @@ -97,10 +97,10 @@ gem 'net-ldap', '~> 0.16.3' # API gem 'grape', '~> 1.5.2' gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' +gem 'rack-cors', '~> 1.1.0', require: 'rack/cors' # GraphQL API -gem 'graphql', '~> 1.11.10' +gem 'graphql', '~> 1.13.12' gem 'graphiql-rails', '~> 1.8' gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] @@ -121,7 +121,7 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.12' +gem 'fog-aws', '~> 3.14' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' @@ -130,7 +130,7 @@ gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm' +gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm' # for Google storage gem 'google-api-client', '~> 0.33' @@ -167,10 +167,10 @@ gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.5.0', require: false -gem 'rouge', '~> 3.27.0' +gem 'rouge', '~> 3.29.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.12' +gem 'nokogiri', '~> 1.13.6' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -181,9 +181,9 @@ gem 'diffy', '~> 3.3' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.3' -# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' +gem 'rack', '~> 2.2.3.0' +# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually +gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base' group :puma do gem 'puma', '~> 5.6.2', require: false @@ -219,7 +219,7 @@ gem 'ruby-progressbar', '~> 1.10' gem 'settingslogic', '~> 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.2.0' +gem 're2', '~> 1.4.0' # Misc @@ -301,7 +301,7 @@ gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 2.1.0' # Protect against bruteforcing -gem 'rack-attack', '~> 6.3.0' +gem 'rack-attack', '~> 6.6.0' # Sentry integration gem 'sentry-raven', '~> 3.1' @@ -311,12 +311,12 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.1' +gem 'pg_query', '~> 2.1.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.22.0' +gem 'gitlab-labkit', '~> 0.23.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -344,7 +344,7 @@ gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client' gem 'warning', '~> 1.2.0' group :development do - gem 'lefthook', '~> 0.7.0', require: false + gem 'lefthook', '~> 0.8.0', require: false gem 'rubocop' gem 'solargraph', '~> 0.44.3', require: false @@ -381,7 +381,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 7.0.0', require: false + gem 'gitlab-styles', '~> 7.1.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -402,10 +402,12 @@ group :development, :test do gem 'test_file_finder', '~> 0.1.3' gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' + + gem 'pact', '~> 1.12' end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.0', require: false + gem 'gitlab-dangerfiles', '~> 3.4.0', require: false end group :development, :test, :coverage do @@ -477,13 +479,13 @@ gem 'sys-filesystem', '~> 1.4.3' gem 'net-ntp' # SSH keys support -gem 'ssh_data', '~> 1.2' +gem 'ssh_data', '~> 1.3' # Spamcheck GRPC protocol definitions gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.10.0-rc1' +gem 'gitaly', '~> 15.1.0-rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -503,7 +505,7 @@ gem 'gitlab-experiment', '~> 0.7.1' # Structured logging gem 'lograge', '~> 0.5' -gem 'grape_logging', '~> 1.7' +gem 'grape_logging', '~> 1.8' # DNS Lookup gem 'gitlab-net-dns', '~> 0.9.1' @@ -545,3 +547,5 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' gem 'ipynbdiff', '0.4.7' + +gem 'ed25519', '~> 1.3.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 4f5d0e36ab33e..535e470372c6d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -143,8 +143,8 @@ GEM rack (>= 0.9.0) bindata (2.4.10) binding_ninja (0.2.3) - bootsnap (1.9.4) - msgpack (~> 1.0) + bootsnap (1.12.0) + msgpack (~> 1.2) bootstrap_form (4.2.0) actionpack (>= 5.0) activemodel (>= 5.0) @@ -214,10 +214,10 @@ GEM creole (0.5.0) crystalball (0.7.0) git - css_parser (1.7.0) + css_parser (1.11.0) addressable daemons (1.3.1) - danger (8.5.0) + danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -306,6 +306,7 @@ GEM e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) + ed25519 (1.3.0) elasticsearch (7.13.3) elasticsearch-api (= 7.13.3) elasticsearch-transport (= 7.13.3) @@ -360,7 +361,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.2.0) + faraday-http-cache (2.4.0) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.3) @@ -387,6 +388,8 @@ GEM rake ffi-yajl (2.3.4) libyajl2 (~> 1.2) + filelock (1.1.1) + find_a_port (1.0.1) flipper (0.21.0) flipper-active_record (0.21.0) activerecord (>= 5.0, < 7) @@ -402,11 +405,10 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.12.0) + fog-aws (3.14.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - ipaddress (~> 0.8) fog-core (2.1.0) builder excon (~> 0.58) @@ -458,7 +460,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.10.0.pre.rc1) + gitaly (15.1.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -466,21 +468,21 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.0.0) + gitlab-dangerfiles (3.4.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.2.0) + gitlab-fog-azure-rm (1.3.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.22.0) + gitlab-labkit (0.23.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (>= 1.37) @@ -505,7 +507,7 @@ GEM openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.8.0) sidekiq (~> 6.1) - gitlab-styles (7.0.0) + gitlab-styles (7.1.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.10) @@ -564,7 +566,7 @@ GEM grape (~> 1.3) rake (> 12) ruby2_keywords (~> 0.0.2) - grape_logging (1.8.3) + grape_logging (1.8.4) grape rack graphiql-rails (1.8.0) @@ -574,7 +576,7 @@ GEM faraday (>= 1.0) faraday_middleware graphql-client - graphql (1.11.10) + graphql (1.13.12) graphql-client (0.17.0) activesupport (>= 3.0) graphql (~> 1.10) @@ -715,7 +717,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (0.7.5) + lefthook (0.8.0) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -777,7 +779,7 @@ GEM faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) - msgpack (1.5.1) + msgpack (1.5.2) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) @@ -798,7 +800,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.3) + nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -852,8 +854,8 @@ GEM addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) omniauth (~> 1.2) - omniauth-dingtalk-oauth2 (1.0.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-dingtalk-oauth2 (1.0.1) + omniauth-oauth2 (~> 1.7) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.4.0) @@ -908,22 +910,45 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.1) - parallel (1.20.1) - parser (3.0.3.2) + pact (1.59.0) + pact-mock_service (~> 3.0, >= 3.3.1) + pact-support (~> 1.15) + rack-test (>= 0.6.3, < 2.0.0) + rspec (~> 3.0) + term-ansicolor (~> 1.0) + thor (>= 0.20, < 2.0) + webrick (~> 1.3) + pact-mock_service (3.6.2) + filelock (~> 1.1) + find_a_port (~> 1.0.1) + json + pact-support (~> 1.12, >= 1.12.0) + rack (~> 2.0) + rspec (>= 2.14) + term-ansicolor (~> 1.0) + thor (>= 0.19, < 2.0) + webrick (~> 1.3) + pact-support (1.15.1) + awesome_print (~> 1.1) + randexp (~> 0.1.7) + rspec (>= 2.14) + term-ansicolor (~> 1.0) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.2.3) - pg_query (2.1.1) - google-protobuf (>= 3.17.1) + pg (1.3.5) + pg_query (2.1.3) + google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) - premailer (1.11.1) + premailer (1.16.0) addressable css_parser (>= 1.6.0) htmlentities (>= 4.0.0) @@ -947,7 +972,7 @@ GEM pry (~> 0.13.0) tty-markdown tty-prompt - public_suffix (4.0.6) + public_suffix (4.0.7) puma (5.6.2) nio4r (~> 2.0) puma_worker_killer (0.3.1) @@ -956,14 +981,14 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) racc (1.6.0) - rack (2.2.3) + rack (2.2.3.1) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (6.3.0) + rack-attack (6.6.1) rack (>= 1.0, < 3) - rack-cors (1.0.6) - rack (>= 1.6.0) - rack-oauth2 (1.16.0) + rack-cors (1.1.1) + rack (>= 2.0.0) + rack-oauth2 (1.19.0) activesupport attr_required httpclient @@ -973,7 +998,7 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rack-timeout (0.5.2) + rack-timeout (0.6.0) rails (6.1.4.7) actioncable (= 6.1.4.7) actionmailbox (= 6.1.4.7) @@ -1007,8 +1032,9 @@ GEM method_source rake (>= 0.13) thor (~> 1.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) + randexp (0.1.7) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1019,7 +1045,7 @@ GEM rbtree (0.4.4) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.2.0) + re2 (1.4.0) recaptcha (4.13.1) json recursive-open-struct (1.1.3) @@ -1035,7 +1061,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) - regexp_parser (2.2.1) + regexp_parser (2.5.0) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) @@ -1057,7 +1083,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (3.27.0) + rouge (3.29.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1112,11 +1138,11 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) + rubocop-ast (1.18.0) + parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.13.0) + rubocop-graphql (0.14.3) rubocop (>= 0.87, < 2) rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) @@ -1253,7 +1279,7 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.4.2) - ssh_data (1.2.0) + ssh_data (1.3.0) ssrf_filter (1.0.7) stackprof (0.2.15) state_machines (0.5.0) @@ -1272,11 +1298,14 @@ GEM activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) + sync (0.5.0) sys-filesystem (1.4.3) ffi (~> 1.1) sysexits (1.2.0) tanuki_emoji (0.6.0) temple (0.8.2) + term-ansicolor (1.7.1) + tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) terser (1.0.2) @@ -1295,6 +1324,8 @@ GEM timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) + tins (1.31.0) + sync toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) @@ -1341,7 +1372,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) unicode_utils (1.4.0) uniform_notifier (1.13.0) unleash (3.2.2) @@ -1403,7 +1434,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.1) yard (0.9.26) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby @@ -1435,7 +1466,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) - bootsnap (~> 1.9.4) + bootsnap (~> 1.12.0) bootstrap_form (~> 4.2.0) browser (~> 4.2) bullet (~> 6.1.3) @@ -1464,6 +1495,7 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) + ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) elasticsearch-model (~> 7.2) elasticsearch-rails (~> 7.2) @@ -1481,7 +1513,7 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.21.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.12) + fog-aws (~> 3.14) fog-core (= 2.1.0) fog-google (~> 1.15) fog-local (~> 0.6) @@ -1492,13 +1524,13 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.10.0.pre.rc1) + gitaly (~> 15.1.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.0) + gitlab-dangerfiles (~> 3.4.0) gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.2.0) - gitlab-labkit (~> 0.22.0) + gitlab-fog-azure-rm (~> 1.3.0) + gitlab-labkit (~> 0.23.0) gitlab-license (~> 2.1.0) gitlab-license_finder (~> 6.0) gitlab-mail_room (~> 0.0.9) @@ -1506,7 +1538,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.9.0) gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 7.0.0) + gitlab-styles (~> 7.1.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) @@ -1516,10 +1548,10 @@ DEPENDENCIES grape (~> 1.5.2) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.0) - grape_logging (~> 1.7) + grape_logging (~> 1.8) graphiql-rails (~> 1.8) graphlient (~> 0.5.0) - graphql (~> 1.11.10) + graphql (~> 1.13.12) graphql-docs (~> 1.6.0) grpc (~> 1.42.0) gssapi @@ -1547,7 +1579,7 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.2) - lefthook (~> 0.7.0) + lefthook (~> 0.8.0) letter_opener_web (~> 2.0.0) licensee (~> 9.14.1) lockbox (~> 0.6.2) @@ -1563,7 +1595,7 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - nokogiri (~> 1.12) + nokogiri (~> 1.13.6) oauth2 (~> 1.4) octokit (~> 4.15) ohai (~> 16.10) @@ -1588,11 +1620,12 @@ DEPENDENCIES omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0) org-ruby (~> 0.9.12) + pact (~> 1.12) parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.1) - pg_query (~> 2.1) + pg (~> 1.3.0) + pg_query (~> 2.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.15.0) @@ -1601,19 +1634,19 @@ DEPENDENCIES pry-shell (~> 0.5.0) puma (~> 5.6.2) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.3) - rack-attack (~> 6.3.0) - rack-cors (~> 1.0.6) - rack-oauth2 (~> 1.16.0) + rack (~> 2.2.3.0) + rack-attack (~> 6.6.0) + rack-cors (~> 1.1.0) + rack-oauth2 (~> 1.19.0) rack-proxy (~> 0.7.2) - rack-timeout (~> 0.5.1) + rack-timeout (~> 0.6.0) rails (~> 6.1.4.7) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.2.0) + re2 (~> 1.4.0) recaptcha (~> 4.11) redis (~> 4.4.0) redis-actionpack (~> 5.2.0) @@ -1622,7 +1655,7 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 3.27.0) + rouge (~> 3.29.0) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) rspec-parameterized @@ -1665,7 +1698,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) - ssh_data (~> 1.2) + ssh_data (~> 1.3) stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 87791ff567532..5f11d60987854 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -577,10 +577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19i4x2nascd74ahcvmrsnf03cygh1y4c9yf8rcv91fv0mcxpvb9n"; + sha256 = "0yza43f42v0ys81y6jzbqfkdykf40h6l3yyvadwq32fswrbpwvbc"; type = "gem"; }; - version = "1.9.4"; + version = "1.12.0"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -930,10 +930,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.7.0"; + version = "1.11.0"; }; daemons = { groups = ["default" "development"]; @@ -951,10 +951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmckbl41v27x9ri6snrl01alsbwxcqsfc4a1nfhgx0py6y0dmjg"; + sha256 = "1n6zbkkinlv2hp4ig5c170d1ckbbdf8rgxmykfm3m3gn865vapnr"; type = "gem"; }; - version = "8.5.0"; + version = "8.6.1"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1283,6 +1283,16 @@ }; version = "0.3.0"; }; + ed25519 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; + type = "gem"; + }; + version = "1.3.0"; + }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; groups = ["default"]; @@ -1537,14 +1547,14 @@ }; faraday-http-cache = { dependencies = ["faraday"]; - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; + sha256 = "143cpzdrnyqyfv1jasr0qjqgm57dhv46nsf5f2s06ndxccfr13rq"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; faraday-httpclient = { groups = ["danger" "default" "development" "test"]; @@ -1712,6 +1722,26 @@ }; version = "2.3.4"; }; + filelock = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "085vrb6wf243iqqnrrccwhjd4chphfdsybkvjbapa2ipfj1ja1sj"; + type = "gem"; + }; + version = "1.1.1"; + }; + find_a_port = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sswgpvn38yav4i21adrr7yy8c8299d7rj065gd3iwg6nn26lpb0"; + type = "gem"; + }; + version = "1.0.1"; + }; flipper = { groups = ["default"]; platforms = []; @@ -1767,15 +1797,15 @@ version = "0.3.3"; }; fog-aws = { - dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + dependencies = ["fog-core" "fog-json" "fog-xml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cl9b93mwhzm9fp0lmac1vzz359g3sq52k06kn0a0vnvxrxnhzjm"; + sha256 = "1gsb26a1jp0k7hclry0dai2a9m77a9h6ybc17x0i98z2ivzjsi07"; type = "gem"; }; - version = "3.12.0"; + version = "3.14.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1967,10 +1997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ls4x3h1c3axx9kqmvs1mpcmjqchl297sh1bzzl5zjgdz25w24di"; + sha256 = "0ygf5di1sl8b3gs7ascn3r9carf6v8d9c3damc10sh81sm7bwc0z"; type = "gem"; }; - version = "14.10.0.pre.rc1"; + version = "15.1.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -2010,10 +2040,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kyp5kxp0jsk224y2nq4yg37wnn824ialdjvsf8fv3a20q9w4k7i"; + sha256 = "13c7k36xq042fbf7d9jwgfc30zq9dfziwvqfi88h2199v9dkylix"; type = "gem"; }; - version = "3.0.0"; + version = "3.4.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2032,10 +2062,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi9v0zy863gnk17w0fp1ks2kr1s2z6q0bkx5wdbq6yawycjs94h"; + sha256 = "1d8plrl69q5mcsgz8ywhw7k9q0g31y3gm6h90gw9apsisqbm7vrg"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2043,10 +2073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vs5q1lfk5i953gv2xvz6h5x6ycllr8hdzg81zsrz7hy3aygxknj"; + sha256 = "0kiz2m3dw6ld2z6dsl8jh2ycw061wv8wiy34flymb5zqjiyyzw8l"; type = "gem"; }; - version = "0.22.0"; + version = "0.23.0"; }; gitlab-license = { groups = ["default"]; @@ -2127,10 +2157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10fmvx2vx2v0mbwv5d4wcpc2iyp5y8lwxn9hjpzkk5bvxkk4c493"; + sha256 = "0xp2f1bbx8i7a89xjwy6b5rhxr9g1vnms68chcnxdd95csxhxpzp"; type = "gem"; }; - version = "7.0.0"; + version = "7.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2280,10 +2310,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x6cmmj0wi1m689r8d4yhyhpl8dwj5skn8b29igm4xvw3swkg94x"; + sha256 = "1lcjqwal3wc2r41wsi01d09cyhxhglxp6y7hd0564pdx5lr3xk7g"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.4"; }; graphiql-rails = { dependencies = ["railties" "sprockets-rails"]; @@ -2312,10 +2342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qb6bk8gflwid4qrk2i9ndzs5fxycdjvxmhy9w547lglzb5jx19b"; + sha256 = "1hvsv6ig6d8syr4vasa8vcc090kbawwflk5m1j6kl681y9n6d0hx"; type = "gem"; }; - version = "1.11.10"; + version = "1.13.12"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2899,10 +2929,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07r76qlzxcz9y4dmkqf8k4khkfq7s2v22dcq6b0w0v4cfiwqva3h"; + sha256 = "05ykgpj6cka9vprvrk37ixyhj2pdw7a9m6bq645yai6ihghahlf0"; type = "gem"; }; - version = "0.7.5"; + version = "0.8.0"; }; letter_opener = { dependencies = ["launchy"]; @@ -3226,10 +3256,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; + sha256 = "1hpj9mm31a5aw5qys2kglfl8jv74bkwkc5pfrpp3als89hgkznqy"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.2"; }; multi_json = { groups = ["default"]; @@ -3401,10 +3431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.6"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3574,10 +3604,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sflfy1jvn9wqpral7gcfmbys7msvykp6rlnl33r8qgnbksn54y8"; + sha256 = "16qkd51f1ab1hw4az27qj3vk958aal67by8djsplwd1q3h7nfib5"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; @@ -3803,15 +3833,48 @@ }; version = "1.1.1"; }; + pact = { + dependencies = ["pact-mock_service" "pact-support" "rack-test" "rspec" "term-ansicolor" "thor" "webrick"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ngwc4zrp6jxpb8s0y07xxic492a1n0akjxd7x4hks2fbsiwwwk2"; + type = "gem"; + }; + version = "1.59.0"; + }; + pact-mock_service = { + dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0izmf5h0n1mcrfk6qlz61rhzdjs6h0bkqrx6ndp8nhmfhja254fc"; + type = "gem"; + }; + version = "3.6.2"; + }; + pact-support = { + dependencies = ["awesome_print" "randexp" "rspec" "term-ansicolor"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07qxvxy48im9vlswqspsh2k6fy6rsmi3409863ww8y7yx5pmjr63"; + type = "gem"; + }; + version = "1.15.1"; + }; parallel = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.20.1"; + version = "1.22.1"; }; parser = { dependencies = ["ast"]; @@ -3819,10 +3882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di"; + sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; type = "gem"; }; - version = "3.0.3.2"; + version = "3.1.2.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3861,10 +3924,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.5"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -3872,10 +3935,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r"; + sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.3"; }; plist = { groups = ["default"]; @@ -3914,10 +3977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xrhmialxn5vlp1nmf40a4db9gji4h2wbzd7f43sz64z8lvrjj6h"; + sha256 = "11j7d6abxivj15yax47z3f751wz4pnl02qszzc9swswf8hn41r03"; type = "gem"; }; - version = "1.11.1"; + version = "1.16.0"; }; premailer-rails = { dependencies = ["actionmailer" "premailer"]; @@ -4000,14 +4063,14 @@ version = "0.5.0"; }; public_suffix = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; puma = { dependencies = ["nio4r"]; @@ -4062,14 +4125,14 @@ version = "1.6.0"; }; rack = { - groups = ["default" "development" "kerberos" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.3.1"; }; rack-accept = { dependencies = ["rack"]; @@ -4088,10 +4151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15b8lk54j2abqhpn588b1wvbzwmxwa7iql6241kxpjc0gyb51p0z"; + sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; type = "gem"; }; - version = "6.3.0"; + version = "6.6.1"; }; rack-cors = { dependencies = ["rack"]; @@ -4099,10 +4162,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07dppmm1ah1gs31sb5byrkkady9vqzwjmpd92c8425nc6yzwknik"; + sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.1"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -4110,10 +4173,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k"; + sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; rack-proxy = { dependencies = ["rack"]; @@ -4142,10 +4205,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d4dgbf8rgqx03lwsm8j6i20lzawk1bsvzfj5bhzrsycfyfk25aj"; + sha256 = "16ahj3qz3xhfrwvqb4nf6cfzvliigg0idfsp5jyr8qwk676d2f30"; type = "gem"; }; - version = "0.5.2"; + version = "0.6.0"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -4214,14 +4277,14 @@ version = "6.1.4.7"; }; rainbow = { - groups = ["default" "development" "test"]; + groups = ["coverage" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.1"; }; rake = { groups = ["default" "development" "test"]; @@ -4233,6 +4296,16 @@ }; version = "13.0.6"; }; + randexp = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j742j7g107jgkvpsfq2b10d5xhsni5s8vxrp518d3karw7529ih"; + type = "gem"; + }; + version = "0.1.7"; + }; rb-fsevent = { groups = ["default" "development" "test"]; platforms = []; @@ -4300,10 +4373,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16q71cc9wx342c697q18pkz19ym4ncjd97hcw4v6f1mgflkdv400"; + sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; }; recaptcha = { dependencies = ["json"]; @@ -4395,10 +4468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; type = "gem"; }; - version = "2.2.1"; + version = "2.5.0"; }; regexp_property_values = { groups = ["default"]; @@ -4510,10 +4583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; + sha256 = "17dhzc9hfzd8x18hfsvn9rsp4jg18wdfsdy3a5p99y5dhfh1321r"; type = "gem"; }; - version = "3.27.0"; + version = "3.29.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4674,10 +4747,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; + sha256 = "1b3p4wy68jkyq8vhm5y568wlhsihy3ilnp2c6ig18xcw1slnkypl"; type = "gem"; }; - version = "1.4.1"; + version = "1.18.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4696,10 +4769,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18md69dkz0s5xm93c4psmvy4c0nx3a7yi61vfjn46cw6yk54fm7b"; + sha256 = "1yam7fdm77y0x6b6i7v14iiji9020mvdd9h1ainvv88zbv8yd4wq"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.3"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -5330,10 +5403,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3vaq2fbmlphphqr0yjc5cyzzxjizq4zbxbbw3j2vpgdcmpi6bs"; + sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; ssrf_filter = { groups = ["default"]; @@ -5419,6 +5492,16 @@ }; version = "1.3.0"; }; + sync = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; + type = "gem"; + }; + version = "0.5.0"; + }; sys-filesystem = { dependencies = ["ffi"]; groups = ["default"]; @@ -5460,6 +5543,17 @@ }; version = "0.8.2"; }; + term-ansicolor = { + dependencies = ["tins"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; + type = "gem"; + }; + version = "1.7.1"; + }; terminal-table = { dependencies = ["unicode-display_width"]; groups = ["default" "development"]; @@ -5584,6 +5678,17 @@ }; version = "0.8.3"; }; + tins = { + dependencies = ["sync"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153q7j2nj7y43iscbfcihmwlcydx6sbd65azs27kain0gncymd90"; + type = "gem"; + }; + version = "1.31.0"; + }; toml-rb = { dependencies = ["citrus"]; groups = ["default"]; @@ -5776,14 +5881,14 @@ version = "0.0.8"; }; unicode-display_width = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; unicode_utils = { groups = ["default"]; @@ -6084,9 +6189,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; + sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; type = "gem"; }; - version = "2.5.4"; + version = "2.6.0"; }; } diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index f8f58cdcaba29..88af6b0ceae5e 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , gettext , itstool , python3 @@ -19,32 +18,15 @@ python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.21.1"; + version = "3.21.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI="; + sha256 = "IV+odABTZ5TFllddE6nIfijxjdNyW43/mG2y4pM6cU4="; }; - patches = [ - # Pull upstream fix for meson-0.60: - # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78 - (fetchpatch { - name = "meson-0.60.patch"; - url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; - sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; - }) - - # Fix view not rendering with adwaita-icon-theme 42 due to removed icons. - # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/83 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/meld/-/commit/f850cdf3eaf0f08abea003d5fae118a5e92a3d61.patch"; - sha256 = "PaK8Rpv79UwMUligm9pIY16JW/dm7eVXntAwTV4hnbE="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 7091f0fbc6f9c..4f61be6669aa1 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Command-Line Client"; homepage = "https://www.perforce.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ corngood ]; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 2e0e01e5c9862..9c804a7459b49 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -76,6 +76,7 @@ in stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; homepage = "https://www.perforce.com"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ nathyong nioncode ]; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 28c7350ae39b5..17f36ab4161b4 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -121,6 +121,7 @@ in stdenv.mkDerivation (rec { description = "Git client from the makers of Sublime Text"; homepage = "https://www.sublimemerge.com"; maintainers = with maintainers; [ zookatron ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index 8bf1bf7b3ba58..45f7d099056d5 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://filebot.net"; changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ gleber felschr ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/flirc/default.nix b/pkgs/applications/video/flirc/default.nix index 6285094c461a4..58de5ceab099a 100644 --- a/pkgs/applications/video/flirc/default.nix +++ b/pkgs/applications/video/flirc/default.nix @@ -39,6 +39,7 @@ mkDerivation rec { homepage = "https://flirc.tv/more/flirc-usb"; description = "Use any Remote with your Media Center"; maintainers = with maintainers; [ aanderse ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 6bec6e25533f1..b01af67cd68e6 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -85,6 +85,7 @@ in buildFHSUserEnv { meta = { description = "Professional Non-Linear Video Editor"; homepage = "https://www.lwks.com/"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ antonxy vojta001 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 2c15513d4d65e..c3d758268917c 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -79,6 +79,7 @@ in mkDerivation { can always download the latest version from makemkv.com that will reset the expiration date. ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 395da881ea9f5..7459d08d59531 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -124,6 +124,7 @@ stdenv.mkDerivation rec { longDescription = "Browse Twitch.tv and watch streams in your videoplayer of choice"; homepage = "https://streamlink.github.io/streamlink-twitch-gui/"; downloadPage = "https://github.com/streamlink/streamlink-twitch-gui/releases"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = with maintainers; [ rileyinman ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 700730a57fc97..770fe2cea3ee2 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -34,6 +34,7 @@ , libmtp , liboggz , libopus +, libplacebo , libpulseaudio , libraw1394 , librsvg @@ -123,6 +124,7 @@ stdenv.mkDerivation rec { libmtp liboggz libopus + libplacebo libpulseaudio libraw1394 librsvg diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 1236775ac67df..2a9f1a27c3d5a 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WxRMY43Z9OytY1kc91VVmqLn5cl0UC/0Zj8x3vpsaBQ="; + sha256 = "sha256-KDAm+Djk1AaA3zXhxywT6HknT0tVCEZLS27nO9j/WgM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 98af8ebf7fb53..583a3e50a1f59 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-Fg99ugaqH/jL3KUZ5Vh/SJnqzEyOaR/KuPFwt2oqXxM="; + sha256 = "sha256-D3+qDWxg3e5/3UIMz8FZDuxmQHmTv0NJVT/otGYedtw="; }; - vendorSha256 = "sha256-7uNQNO+EI90J2Btz2tnumKqd+AtVWON+Csh6tkTNKNA="; + vendorSha256 = "sha256-WxLQfu65Gr+ao/pM8B2uiS88sNT72Klhz7ZIrEadW5g="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index ef8ec062e4d88..8ba02d940216c 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation { ''; homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; maintainers = [ maintainers.tstrobel ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 2c2cd90f1c26f..0cf8e06c3115b 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation { description = "Windows SPICE Drivers"; homepage = "https://www.spice-space.org/"; license = [ licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 642c4b1390f46..4e07d92d661d4 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -230,6 +230,10 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode + ]; license = licenses.gpl2; homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9c012750bf10c..da9f32b9c6856 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -155,6 +155,7 @@ in stdenv.mkDerivation rec { This add-on provides support for dynamic resizing of the X Display, shared host/guest clipboard support and guest OpenGL support. ''; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = "GPL"; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 58cd4092a95d5..247fb3bd6eac2 100755 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -334,6 +334,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Industry standard desktop hypervisor for x86-64 architecture"; homepage = "https://www.vmware.com/products/workstation-pro.html"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ deinferno ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index c3d8d96bba4e1..ddc4383fbd73c 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.10"; + version = "0.22.0"; src = fetchFromGitHub { owner = "greshake"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HtPgl52ysE/CVX706YeKBFc6CgGpHzvHwZoS+DzHADY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-9Fp5k14QkV1CwLSL1nUUu6NYIpjfvI9vNJRYNqvyr3M="; }; - cargoSha256 = "sha256-ini0AIYwvTskNFMSC+Gy23ohL75PTET95e1mjpjCsWE="; + cargoSha256 = "sha256-MzosatZ4yPHAdANqOBPVW2wpjnojLo9B9N9o4DtU0Iw="; nativeBuildInputs = [ pkg-config makeWrapper ]; |