diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-18 20:16:19 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-18 20:16:19 +0200 |
| commit | f822b2ba5c97189cd5cfcf6364dbf5318cfcba27 (patch) | |
| tree | c2f3cb8822e4aea4748557d0fe24299e03c26d0e /pkgs/applications | |
| parent | 6c80237e35b92d7ade0edf5bffa53b1663d8b7ed (diff) | |
| parent | f19b23c0757d4cc9e66a9b99cc03b5d5f1f9883b (diff) | |
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts: - pkgs/development/python-modules/langsmith/default.nix - pkgs/development/python-modules/rich-pixels/default.nix - pkgs/servers/teleport/generic.nix
Diffstat (limited to 'pkgs/applications')
116 files changed, 1670 insertions, 2392 deletions
diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index a918797e2de28..ff8e5626f63ac 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jjsullivan5196/wvkbd"; description = "On-screen keyboard for wlroots"; - maintainers = [ maintainers.elohmeier ]; platforms = platforms.linux; license = licenses.gpl3Plus; mainProgram = "wvkbd-mobintl"; diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/applications/audio/CHOWTapeModel/default.nix deleted file mode 100644 index 29c1b82d9d0e1..0000000000000 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ alsa-lib -, at-spi2-core -, cmake -, curl -, dbus -, libepoxy -, fetchFromGitHub -, freeglut -, freetype -, gtk3 -, lib -, libGL -, libXcursor -, libXdmcp -, libXext -, libXinerama -, libXrandr -, libXtst -, libdatrie -, libjack2 -, libpsl -, libselinux -, libsepol -, libsysprof-capture -, libthai -, libuuid -, libxkbcommon -, lv2 -, pcre -, pcre2 -, pkg-config -, python3 -, sqlite -, gcc11Stdenv -, webkitgtk -}: -let - # JUCE version in submodules is incompatible with GCC12 - # See here: https://forum.juce.com/t/build-fails-on-fedora-wrong-c-version/50902/2 - stdenv = gcc11Stdenv; -in -stdenv.mkDerivation rec { - pname = "CHOWTapeModel"; - version = "2.11.4"; - - src = fetchFromGitHub { - owner = "jatinchowdhury18"; - repo = "AnalogTapeModel"; - rev = "v${version}"; - sha256 = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - - buildInputs = [ - alsa-lib - at-spi2-core - curl - dbus - libepoxy - freeglut - freetype - gtk3 - libGL - libXcursor - libXdmcp - libXext - libXinerama - libXrandr - libXtst - libdatrie - libjack2 - libpsl - libselinux - libsepol - libsysprof-capture - libthai - libuuid - libxkbcommon - lv2 - pcre - pcre2 - python3 - sqlite - webkitgtk - ]; - - # Link-time-optimization fails without these - cmakeFlags = [ - "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" - "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" - "-DCMAKE_NM=${stdenv.cc.cc}/bin/gcc-nm" - ]; - - cmakeBuildType = "Release"; - - postPatch = "cd Plugin"; - - installPhase = '' - mkdir -p $out/lib/lv2 $out/lib/vst3 $out/lib/clap $out/bin $out/share/doc/CHOWTapeModel/ - cd CHOWTapeModel_artefacts/${cmakeBuildType} - cp -r LV2/CHOWTapeModel.lv2 $out/lib/lv2 - cp -r VST3/CHOWTapeModel.vst3 $out/lib/vst3 - cp -r CLAP/CHOWTapeModel.clap $out/lib/clap - cp Standalone/CHOWTapeModel $out/bin - cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/ - ''; - - # JUCE dlopens these, make sure they are in rpath - # Otherwise, segfault will happen - NIX_LDFLAGS = (toString [ - "-lX11" - "-lXext" - "-lXcursor" - "-lXinerama" - "-lXrandr" - ]); - - meta = with lib; { - homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel"; - description = - "Physical modelling signal processing for analog tape recording. LV2, VST3, CLAP, and standalone"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.linux; - # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'? - # error: no matching function for call to 'juce::dsp::SIMDRegister<double>::SIMDRegister(xsimd::simd_batch_traits<xsimd::batch<double, 2> >::batch_bool_type)' - broken = stdenv.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 - mainProgram = "CHOWTapeModel"; - }; -} diff --git a/pkgs/applications/audio/ChowCentaur/default.nix b/pkgs/applications/audio/ChowCentaur/default.nix deleted file mode 100644 index 80f5768dc1578..0000000000000 --- a/pkgs/applications/audio/ChowCentaur/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon -, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor -, alsa-lib, libjack2, lv2, gcc-unwrapped }: - -stdenv.mkDerivation rec { - pname = "ChowCentaur"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "jatinchowdhury18"; - repo = "KlonCentaur"; - rev = "v${version}"; - sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - cairo - libxkbcommon - xcbutilcursor - xcbutilkeysyms - xcbutil - libXrandr - libXinerama - libXcursor - alsa-lib - libjack2 - lv2 - ]; - - cmakeFlags = [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" - "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" - ]; - - installPhase = '' - mkdir -p $out/lib/lv2 $out/lib/vst3 - cd ChowCentaur/ChowCentaur_artefacts/Release - cp -r LV2/ChowCentaur.lv2 $out/lib/lv2 - cp -r VST3/ChowCentaur.vst3 $out/lib/vst3 - ''; - - meta = with lib; { - description = - "Digital emulation of the Klon Centaur guitar pedal using RNNs, Wave Digital Filters, and more"; - homepage = "https://github.com/jatinchowdhury18/KlonCentaur"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ magnetophon ]; - }; -} diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/applications/audio/ChowKick/default.nix deleted file mode 100644 index 0eec7ea32d32a..0000000000000 --- a/pkgs/applications/audio/ChowKick/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ alsa-lib -, at-spi2-core -, brotli -, cmake -, curl -, dbus -, libepoxy -, fetchFromGitHub -, freeglut -, freetype -, gtk2-x11 -, lib -, libGL -, libXcursor -, libXdmcp -, libXext -, libXinerama -, libXrandr -, libXtst -, libdatrie -, libjack2 -, libpsl -, libselinux -, libsepol -, libsysprof-capture -, libthai -, libxkbcommon -, lv2 -, pcre -, pkg-config -, python3 -, sqlite -, stdenv -, util-linuxMinimal -, webkitgtk -}: - -stdenv.mkDerivation rec { - pname = "ChowKick"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "Chowdhury-DSP"; - repo = pname; - rev = "v${version}"; - sha256 = "0amnp0p7ckbbr9dcbdnld1ryv46kvza2dj8m6hzmi7c1s4df8x5q"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - pkg-config - cmake - ]; - buildInputs = [ - alsa-lib - at-spi2-core - brotli - curl - dbus - libepoxy - freeglut - freetype - gtk2-x11 - libGL - libXcursor - libXdmcp - libXext - libXinerama - libXrandr - libXtst - libdatrie - libjack2 - libpsl - libselinux - libsepol - libsysprof-capture - libthai - libxkbcommon - lv2 - pcre - python3 - sqlite - util-linuxMinimal - webkitgtk - ]; - - cmakeFlags = [ - "-DCMAKE_AR=${stdenv.cc.cc}/bin/gcc-ar" - "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib" - ]; - - installPhase = '' - mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin - cp -r ChowKick_artefacts/Release/LV2//${pname}.lv2 $out/lib/lv2 - cp -r ChowKick_artefacts/Release/VST3/${pname}.vst3 $out/lib/vst3 - cp ChowKick_artefacts/Release/Standalone/${pname} $out/bin - ''; - - meta = with lib; { - homepage = "https://github.com/Chowdhury-DSP/ChowKick"; - description = "Kick synthesizer based on old-school drum machine circuits"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.linux; - mainProgram = "ChowKick"; - }; -} diff --git a/pkgs/applications/audio/ChowPhaser/default.nix b/pkgs/applications/audio/ChowPhaser/default.nix deleted file mode 100644 index a828a1e1d0410..0000000000000 --- a/pkgs/applications/audio/ChowPhaser/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut -, freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext -, libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux -, libsepol, libsysprof-capture, libthai, libxkbcommon, pcre, pkg-config -, python3, sqlite, stdenv }: - -stdenv.mkDerivation rec { - pname = "ChowPhaser"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "jatinchowdhury18"; - repo = "ChowPhaser"; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ="; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - - buildInputs = [ - alsa-lib - at-spi2-core - curl - dbus - libepoxy - freeglut - freetype - gtk3 - libGL - libXcursor - libXdmcp - libXext - libXinerama - libXrandr - libXtst - libdatrie - libjack2 - libpsl - libselinux - libsepol - libsysprof-capture - libthai - libxkbcommon - pcre - python3 - sqlite - gcc-unwrapped - ]; - - cmakeFlags = [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" - "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" - ]; - - installPhase = '' - mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/ChowPhaser/ - cd ChowPhaserMono_artefacts/Release - cp libChowPhaserMono_SharedCode.a $out/lib - cp -r VST3/ChowPhaserMono.vst3 $out/lib/vst3 - cp Standalone/ChowPhaserMono $out/bin - cd ../../ChowPhaserStereo_artefacts/Release - cp libChowPhaserStereo_SharedCode.a $out/lib - cp -r VST3/ChowPhaserStereo.vst3 $out/lib/vst3 - cp Standalone/ChowPhaserStereo $out/bin - ''; - - meta = with lib; { - homepage = "https://github.com/jatinchowdhury18/ChowPhaser"; - description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix deleted file mode 100644 index 7aec4cff35580..0000000000000 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ladspaH -}: - -stdenv.mkDerivation rec { - pname = "FIL-plugins"; - version = "0.3.0"; - - src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - hash = "sha256-HAvycSEZZfZwoVp3g7QWcwfbdyZKwWJKBuVmeWTajuk="; - }; - - buildInputs = [ ladspaH ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace /usr/lib/ladspa "$out/lib/ladspa" \ - --replace g++ "$CXX" - ''; - - preInstall = '' - mkdir -p "$out/lib/ladspa" - ''; - - meta = { - description = "Four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed"; - longDescription = '' - Each section has an active/bypass switch, frequency, bandwidth and gain controls. - There is also a global bypass switch and gain control. - The 2nd order resonant filters are implemented using a Mitra-Regalia style lattice filter. - All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises. - This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. - ''; - version = version; - homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/audio/LibreArp/default.nix b/pkgs/applications/audio/LibreArp/default.nix deleted file mode 100644 index 0736745aaaf40..0000000000000 --- a/pkgs/applications/audio/LibreArp/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, cairo, libxkbcommon -, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor -, alsa-lib, libjack2, lv2, gcc-unwrapped, curl}: - -stdenv.mkDerivation rec { - pname = "LibreArp"; - version = "2.4"; - - src = fetchFromGitLab { - owner = "LibreArp"; - repo = "LibreArp"; - rev = version; - hash = "sha256-jEpES68NuHhelUq/L46CxEeadk3LbuPZ72JaGDbw8fg="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - cairo - libxkbcommon - xcbutilcursor - xcbutilkeysyms - xcbutil - libXrandr - libXinerama - libXcursor - alsa-lib - libjack2 - lv2 - curl - ]; - - cmakeFlags = [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" - "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" - ]; - - installPhase = '' - mkdir -p $out/lib/vst3 - cd LibreArp_artefacts/Release - cp -r VST3/LibreArp.vst3 $out/lib/vst3 - ''; - - meta = with lib; { - description = - "A pattern-based arpeggio generator plugin."; - homepage = "https://librearp.gitlab.io/"; - license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ magnetophon ]; - }; -} diff --git a/pkgs/applications/audio/LibreArp/lv2.nix b/pkgs/applications/audio/LibreArp/lv2.nix deleted file mode 100644 index b723683b7ec6b..0000000000000 --- a/pkgs/applications/audio/LibreArp/lv2.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, lib, fetchFromGitLab, cmake, pkg-config, cairo, libxkbcommon -, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor -, alsa-lib, libjack2, lv2, gcc-unwrapped, curl}: - -stdenv.mkDerivation rec { - pname = "LibreArp-lv2"; - version = "2.4"; - - src = fetchFromGitLab { - owner = "LibreArp"; - repo = "LibreArp"; - rev = "${version}-lv2"; - hash = "sha256-x+ZPiU/ZFzrXb8szMS9Ts4JEEyXYpM8CLZHT4lNJWY8="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - cairo - libxkbcommon - xcbutilcursor - xcbutilkeysyms - xcbutil - libXrandr - libXinerama - libXcursor - alsa-lib - libjack2 - lv2 - curl - ]; - - cmakeFlags = [ - "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" - "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" - "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" - ]; - - installPhase = '' - mkdir -p $out/lib/lv2 - cd LibreArp_artefacts/Release - cp -r LV2/LibreArp.lv2 $out/lib/lv2 - ''; - - meta = with lib; { - description = - "A pattern-based arpeggio generator plugin."; - homepage = "https://librearp.gitlab.io/"; - license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ magnetophon ]; - }; -} diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index 3d7b0563ac222..b858edf29bca5 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , ffmpeg , glfw +, libglvnd , libogg , libvorbis , makeWrapper @@ -23,13 +24,13 @@ let in buildDotnetModule rec { pname = "famistudio"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; rev = "refs/tags/${version}"; - hash = "sha256-ydEWLL05B86672j3MVo/90tgDHg8FJ2EZaesqrBZy4A="; + hash = "sha256-WYy/6cWQg3Ayok/eAdnvlWAvdcuhy/sdlWOVvaYcPkc="; }; postPatch = let @@ -89,6 +90,10 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; + runtimeDeps = lib.optionals stdenv.hostPlatform.isLinux [ + libglvnd + ]; + executables = [ "FamiStudio" ]; postInstall = '' diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midivisualizer/default.nix index a7a8843f46e69..10a2a5de6a096 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midivisualizer/default.nix @@ -20,14 +20,14 @@ , Kernel }: -stdenv.mkDerivation rec { - pname = "MIDIVisualizer"; +stdenv.mkDerivation (finalAttrs: { + pname = "midivisualizer"; version = "7.0"; src = fetchFromGitHub { owner = "kosua20"; - repo = pname; - rev = "v${version}"; + repo = "MIDIVisualizer"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE="; }; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.ericdallo ]; }; -} +}) diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index 16e1a24343c53..3234a719e3c00 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "x42-avldrums"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "x42"; repo = "avldrums.lv2"; rev = "v${version}"; - hash = "sha256-NNqBZTWjIM97qsXTW/+6T7eOAELi/OwXh4mCYPD/C6I="; + hash = "sha256-AZKHjzgw0TtLHh4TF+yOUSa+GlNVwyHCpJWAZikXTy4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 7385d4bd9c455..7e995ad60a8c6 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "27.0"; + version = "27.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "9c1ee651d3b157baccc3388be28b8cf3bfcefcd2493b943725ad6040ca6b146b"; + sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da"; }; nativeBuildInputs = diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index b236ed5da4424..cb6774fdc3fc1 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lndhub-go"; - version = "0.14.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = version; - sha256 = "sha256-m+Sc/rsYIbvd1oOqG4OT+wPtSxlgFq8m03n28eZIWJU="; + sha256 = "sha256-PHBzM/lYYu6hXa5jiFQR/K5j+vmxaYH7xuoxOhFbhMk="; }; - vendorHash = "sha256-a4yVuEfhLNM8IEYnafWf///SNLqQL5XZfGgJ5AZLx3c="; + vendorHash = "sha256-Vo29w04cRW0syD2tjieKVeZ3srFNuEC3T17birVWn6k="; doCheck = false; # tests require networking diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 626f85e8b0ce5..35ecdef1364c3 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -294,6 +294,9 @@ name = "arbitrary" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "ark-bls12-377" @@ -808,6 +811,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -894,6 +898,7 @@ dependencies = [ "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", + "frame-metadata-hash-extension", "frame-support", "frame-system", "pallet-asset-conversion", @@ -939,6 +944,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -1896,7 +1902,7 @@ dependencies = [ "bp-parachains", "bp-polkadot-core", "bp-runtime", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "finality-grandpa", "parity-scale-codec", "sp-application-crypto", @@ -2096,6 +2102,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "tuplex", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -2256,6 +2263,7 @@ dependencies = [ "testnet-parachains-constants", "tuplex", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -2363,9 +2371,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2-sys" @@ -2507,6 +2515,32 @@ dependencies = [ ] [[package]] +name = "chain-spec-guide-runtime" +version = "0.0.0" +dependencies = [ + "docify", + "pallet-balances", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "parity-scale-codec", + "polkadot-sdk-frame", + "sc-chain-spec", + "scale-info", + "serde", + "serde_json", + "sp-application-crypto", + "sp-core", + "sp-genesis-builder", + "sp-keyring", + "sp-runtime", + "sp-std 14.0.0", + "staging-chain-spec-builder", + "substrate-wasm-builder", +] + +[[package]] name = "chrono" version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2603,15 +2637,6 @@ dependencies = [ ] [[package]] -name = "ckb-merkle-mountain-range" -version = "0.6.0" -source = "git+https://github.com/paritytech/merkle-mountain-range.git?branch=master#537f0e3f67c5adf7afff0800bbb81f02f17570a1" -dependencies = [ - "cfg-if", - "itertools 0.10.5", -] - -[[package]] name = "clang-sys" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2874,6 +2899,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -3129,6 +3155,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -3225,6 +3252,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -3289,6 +3317,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -4363,6 +4392,7 @@ dependencies = [ "sp-std 14.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "substrate-wasm-builder", ] @@ -4689,6 +4719,17 @@ dependencies = [ ] [[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4961,9 +5002,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek 4.1.2", "ed25519 2.2.2", @@ -5345,9 +5386,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fastrlp" @@ -5783,6 +5824,27 @@ dependencies = [ ] [[package]] +name = "frame-metadata-hash-extension" +version = "0.1.0" +dependencies = [ + "array-bytes", + "docify", + "frame-metadata", + "frame-support", + "frame-system", + "log", + "merkleized-metadata", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-tracing 16.0.0", + "sp-transaction-pool", + "substrate-test-runtime-client", + "substrate-wasm-builder", +] + +[[package]] name = "frame-omni-bencher" version = "0.1.0" dependencies = [ @@ -6160,9 +6222,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" @@ -7234,123 +7296,15 @@ checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" name = "kitchensink-runtime" version = "3.0.0-dev" dependencies = [ - "frame-benchmarking", - "frame-benchmarking-pallet-pov", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", "log", "node-primitives", - "pallet-alliance", - "pallet-asset-conversion", - "pallet-asset-conversion-ops", - "pallet-asset-conversion-tx-payment", - "pallet-asset-rate", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-beefy", - "pallet-beefy-mmr", - "pallet-bounties", - "pallet-broker", - "pallet-child-bounties", - "pallet-collective", - "pallet-contracts", - "pallet-conviction-voting", - "pallet-core-fellowship", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", "pallet-example-mbm", "pallet-example-tasks", - "pallet-fast-unstake", - "pallet-glutton", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-insecure-randomness-collective-flip", - "pallet-lottery", - "pallet-membership", - "pallet-message-queue", - "pallet-migrations", - "pallet-mixnet", - "pallet-mmr", - "pallet-multisig", - "pallet-nft-fractionalization", - "pallet-nfts", - "pallet-nfts-runtime-api", - "pallet-nis", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-parameters", - "pallet-preimage", - "pallet-proxy", - "pallet-ranked-collective", - "pallet-recovery", - "pallet-referenda", - "pallet-remark", - "pallet-root-testing", - "pallet-safe-mode", - "pallet-salary", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-skip-feeless-payment", - "pallet-society", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-staking-runtime-api", - "pallet-state-trie-migration", - "pallet-statement", - "pallet-sudo", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-transaction-storage", - "pallet-treasury", - "pallet-tx-pause", - "pallet-uniques", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", "parity-scale-codec", + "polkadot-sdk", "primitive-types", "scale-info", "serde_json", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-mixnet", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-statement-store", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-transaction-pool", - "sp-version", "static_assertions", "substrate-wasm-builder", ] @@ -7626,7 +7580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "log", "multiaddr", "multihash 0.17.0", @@ -8049,8 +8003,9 @@ dependencies = [ [[package]] name = "litep2p" -version = "0.3.0" -source = "git+https://github.com/paritytech/litep2p?rev=e03a6023882db111beeb24d8c0ceaac0721d3f0f#e03a6023882db111beeb24d8c0ceaac0721d3f0f" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316" dependencies = [ "async-trait", "bs58 0.4.0", @@ -8062,7 +8017,7 @@ dependencies = [ "hex-literal", "indexmap 2.2.3", "libc", - "mockall", + "mockall 0.12.1", "multiaddr", "multihash 0.17.0", "network-interface", @@ -8347,6 +8302,20 @@ dependencies = [ ] [[package]] +name = "merkleized-metadata" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f313fcff1d2a4bcaa2deeaa00bf7530d77d5f7bd0467a117dde2e29a75a7a17a" +dependencies = [ + "array-bytes", + "blake3", + "frame-metadata", + "parity-scale-codec", + "scale-decode", + "scale-info", +] + +[[package]] name = "merlin" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8409,7 +8378,7 @@ dependencies = [ "pallet-minimal-template", "polkadot-sdk-docs", "polkadot-sdk-frame", - "simple-mermaid", + "simple-mermaid 0.1.1", ] [[package]] @@ -8558,12 +8527,27 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", + "mockall_derive 0.11.4", "predicates 2.1.5", "predicates-tree", ] [[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive 0.12.1", + "predicates 3.0.3", + "predicates-tree", +] + +[[package]] name = "mockall_derive" version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8576,6 +8560,18 @@ dependencies = [ ] [[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "multiaddr" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8963,10 +8959,12 @@ dependencies = [ "sc-sync-state-rpc", "sc-transaction-pool-api", "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-consensus-beefy", "sp-keystore", "sp-runtime", "sp-statement-store", @@ -9001,6 +8999,7 @@ dependencies = [ name = "node-testing" version = "3.0.0-dev" dependencies = [ + "frame-metadata-hash-extension", "frame-system", "fs_extra", "futures", @@ -9756,7 +9755,7 @@ dependencies = [ "bp-beefy", "bp-runtime", "bp-test-utils", - "ckb-merkle-mountain-range 0.5.2", + "ckb-merkle-mountain-range", "frame-support", "frame-system", "log", @@ -9877,6 +9876,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std 14.0.0", + "sp-tracing 16.0.0", ] [[package]] @@ -10131,6 +10131,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", + "pallet-nomination-pools", "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", @@ -10482,7 +10483,7 @@ dependencies = [ [[package]] name = "pallet-identity" -version = "28.0.0" +version = "29.0.0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -10804,6 +10805,7 @@ dependencies = [ "frame-system", "pallet-bags-list", "pallet-balances", + "pallet-delegated-staking", "pallet-nomination-pools", "pallet-staking", "pallet-staking-reward-curve", @@ -10844,7 +10846,32 @@ dependencies = [ ] [[package]] -name = "pallet-nomination-pools-test-staking" +name = "pallet-nomination-pools-test-delegate-stake" +version = "1.0.0" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "pallet-bags-list", + "pallet-balances", + "pallet-delegated-staking", + "pallet-nomination-pools", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std 14.0.0", + "sp-tracing 16.0.0", +] + +[[package]] +name = "pallet-nomination-pools-test-transfer-stake" version = "1.0.0" dependencies = [ "frame-election-provider-support", @@ -11798,6 +11825,7 @@ dependencies = [ "docify", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -11959,9 +11987,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.11" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b5927e4a9ae8d6cdb6a69e4e04a0ec73381a358e21b8a576f44769f34e7c24" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -11974,11 +12002,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.82", "quote 1.0.35", "syn 1.0.109", @@ -12300,6 +12328,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -12400,6 +12429,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -12647,6 +12677,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", "rand 0.8.5", + "rstest", "sc-network", "schnellru", "sp-core", @@ -12663,7 +12694,6 @@ version = "7.0.0" dependencies = [ "assert_matches", "async-trait", - "env_logger 0.11.3", "fatality", "futures", "futures-timer", @@ -12679,17 +12709,29 @@ dependencies = [ "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", "rand 0.8.5", + "rstest", "sc-network", "schnellru", "sp-application-crypto", "sp-core", "sp-keyring", + "sp-tracing 16.0.0", "thiserror", "tokio", "tracing-gum", ] [[package]] +name = "polkadot-ckb-merkle-mountain-range" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b44320e5f7ce2c18227537a3032ae5b2c476a7e8eddba45333e1011fc31b92" +dependencies = [ + "cfg-if", + "itertools 0.10.5", +] + +[[package]] name = "polkadot-cli" version = "7.0.0" dependencies = [ @@ -12801,6 +12843,7 @@ dependencies = [ "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", + "quickcheck", "reed-solomon-novelpoly", "sp-core", "sp-trie", @@ -13447,6 +13490,7 @@ dependencies = [ "async-trait", "bitvec", "derive_more", + "fatality", "futures", "orchestra", "polkadot-node-jaeger", @@ -13489,6 +13533,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pin-project", + "polkadot-erasure-coding", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -13539,7 +13584,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.12.0" +version = "1.13.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13710,10 +13755,12 @@ dependencies = [ "sc-sync-state-rpc", "sc-transaction-pool-api", "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-consensus-beefy", "sp-keystore", "sp-runtime", "substrate-frame-rpc-system", @@ -13849,9 +13896,396 @@ dependencies = [ ] [[package]] +name = "polkadot-sdk" +version = "0.1.0" +dependencies = [ + "asset-test-utils", + "assets-common", + "binary-merkle-tree", + "bp-asset-hub-rococo", + "bp-asset-hub-westend", + "bp-bridge-hub-cumulus", + "bp-bridge-hub-kusama", + "bp-bridge-hub-polkadot", + "bp-bridge-hub-rococo", + "bp-bridge-hub-westend", + "bp-header-chain", + "bp-kusama", + "bp-messages", + "bp-parachains", + "bp-polkadot", + "bp-polkadot-bulletin", + "bp-polkadot-core", + "bp-relayers", + "bp-rococo", + "bp-runtime", + "bp-test-utils", + "bp-westend", + "bp-xcm-bridge-hub", + "bp-xcm-bridge-hub-router", + "bridge-hub-common", + "bridge-hub-test-utils", + "bridge-runtime-common", + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-client-consensus-relay-chain", + "cumulus-client-network", + "cumulus-client-parachain-inherent", + "cumulus-client-pov-recovery", + "cumulus-client-service", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-parachain-system-proc-macro", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-solo-to-para", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-ping", + "cumulus-primitives-aura", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", + "cumulus-primitives-storage-weight-reclaim", + "cumulus-primitives-timestamp", + "cumulus-primitives-utility", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "cumulus-relay-chain-rpc-interface", + "cumulus-test-relay-sproof-builder", + "emulated-integration-tests-common", + "fork-tree", + "frame-benchmarking", + "frame-benchmarking-cli", + "frame-benchmarking-pallet-pov", + "frame-election-provider-solution-type", + "frame-election-provider-support", + "frame-executive", + "frame-metadata-hash-extension", + "frame-remote-externalities", + "frame-support", + "frame-support-procedural", + "frame-support-procedural-tools", + "frame-support-procedural-tools-derive", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "generate-bags", + "mmr-gadget", + "mmr-rpc", + "pallet-alliance", + "pallet-asset-conversion", + "pallet-asset-conversion-ops", + "pallet-asset-conversion-tx-payment", + "pallet-asset-rate", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-atomic-swap", + "pallet-aura", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-broker", + "pallet-child-bounties", + "pallet-collator-selection", + "pallet-collective", + "pallet-collective-content", + "pallet-contracts", + "pallet-contracts-mock-network", + "pallet-contracts-proc-macro", + "pallet-contracts-uapi", + "pallet-conviction-voting", + "pallet-core-fellowship", + "pallet-delegated-staking", + "pallet-democracy", + "pallet-dev-mode", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-glutton", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-insecure-randomness-collective-flip", + "pallet-lottery", + "pallet-membership", + "pallet-message-queue", + "pallet-migrations", + "pallet-mixnet", + "pallet-mmr", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-nis", + "pallet-node-authorization", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-paged-list", + "pallet-parameters", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-remark", + "pallet-root-offences", + "pallet-root-testing", + "pallet-safe-mode", + "pallet-salary", + "pallet-scheduler", + "pallet-scored-pool", + "pallet-session", + "pallet-session-benchmarking", + "pallet-skip-feeless-payment", + "pallet-society", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-staking-reward-fn", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-statement", + "pallet-sudo", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-storage", + "pallet-treasury", + "pallet-tx-pause", + "pallet-uniques", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub", + "pallet-xcm-bridge-hub-router", + "parachains-common", + "parachains-runtimes-test-utils", + "polkadot-approval-distribution", + "polkadot-availability-bitfield-distribution", + "polkadot-availability-distribution", + "polkadot-availability-recovery", + "polkadot-cli", + "polkadot-collator-protocol", + "polkadot-core-primitives", + "polkadot-dispute-distribution", + "polkadot-erasure-coding", + "polkadot-gossip-support", + "polkadot-network-bridge", + "polkadot-node-collation-generation", + "polkadot-node-core-approval-voting", + "polkadot-node-core-av-store", + "polkadot-node-core-backing", + "polkadot-node-core-bitfield-signing", + "polkadot-node-core-candidate-validation", + "polkadot-node-core-chain-api", + "polkadot-node-core-chain-selection", + "polkadot-node-core-dispute-coordinator", + "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", + "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", + "polkadot-node-core-pvf-checker", + "polkadot-node-core-pvf-common", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", + "polkadot-node-core-runtime-api", + "polkadot-node-jaeger", + "polkadot-node-metrics", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-types", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-rpc", + "polkadot-runtime-common", + "polkadot-runtime-metrics", + "polkadot-runtime-parachains", + "polkadot-sdk-frame", + "polkadot-service", + "polkadot-statement-distribution", + "polkadot-statement-table", + "rococo-runtime-constants", + "sc-allocator", + "sc-authority-discovery", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-chain-spec-derive", + "sc-cli", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-babe-rpc", + "sc-consensus-beefy", + "sc-consensus-beefy-rpc", + "sc-consensus-epochs", + "sc-consensus-grandpa", + "sc-consensus-grandpa-rpc", + "sc-consensus-manual-seal", + "sc-consensus-pow", + "sc-consensus-slots", + "sc-executor", + "sc-executor-common", + "sc-executor-polkavm", + "sc-executor-wasmtime", + "sc-informant", + "sc-keystore", + "sc-mixnet", + "sc-network", + "sc-network-common", + "sc-network-gossip", + "sc-network-light", + "sc-network-statement", + "sc-network-sync", + "sc-network-transactions", + "sc-network-types", + "sc-offchain", + "sc-proposer-metrics", + "sc-rpc", + "sc-rpc-api", + "sc-rpc-server", + "sc-rpc-spec-v2", + "sc-service", + "sc-state-db", + "sc-statement-store", + "sc-storage-monitor", + "sc-sync-state-rpc", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-tracing-proc-macro", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sc-utils", + "slot-range-helper", + "snowbridge-beacon-primitives", + "snowbridge-core", + "snowbridge-ethereum", + "snowbridge-outbound-queue-merkle-tree", + "snowbridge-outbound-queue-runtime-api", + "snowbridge-pallet-ethereum-client", + "snowbridge-pallet-ethereum-client-fixtures", + "snowbridge-pallet-inbound-queue", + "snowbridge-pallet-inbound-queue-fixtures", + "snowbridge-pallet-outbound-queue", + "snowbridge-pallet-system", + "snowbridge-router-primitives", + "snowbridge-runtime-common", + "snowbridge-runtime-test-common", + "snowbridge-system-runtime-api", + "sp-api", + "sp-api-proc-macro", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-consensus-grandpa", + "sp-consensus-pow", + "sp-consensus-slots", + "sp-core", + "sp-core-hashing", + "sp-core-hashing-proc-macro", + "sp-crypto-ec-utils 0.10.0", + "sp-crypto-hashing", + "sp-crypto-hashing-proc-macro", + "sp-database", + "sp-debug-derive 14.0.0", + "sp-externalities 0.25.0", + "sp-genesis-builder", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-keystore", + "sp-maybe-compressed-blob", + "sp-metadata-ir", + "sp-mixnet", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-panic-handler", + "sp-rpc", + "sp-runtime", + "sp-runtime-interface 24.0.0", + "sp-runtime-interface-proc-macro 17.0.0", + "sp-session", + "sp-staking", + "sp-state-machine", + "sp-statement-store", + "sp-std 14.0.0", + "sp-storage 19.0.0", + "sp-timestamp", + "sp-tracing 16.0.0", + "sp-transaction-pool", + "sp-transaction-storage-proof", + "sp-trie", + "sp-version", + "sp-version-proc-macro", + "sp-wasm-interface 20.0.0", + "sp-weights", + "staging-chain-spec-builder", + "staging-node-inspect", + "staging-parachain-info", + "staging-tracking-allocator", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "subkey", + "substrate-bip39", + "substrate-build-script-utils", + "substrate-frame-rpc-support", + "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", + "substrate-rpc-client", + "substrate-state-trie-migration-rpc", + "substrate-wasm-builder", + "testnet-parachains-constants", + "tracing-gum", + "tracing-gum-proc-macro", + "westend-runtime-constants", + "xcm-emulator", + "xcm-fee-payment-runtime-api", + "xcm-procedural", + "xcm-simulator", +] + +[[package]] name = "polkadot-sdk-docs" version = "0.0.1" dependencies = [ + "chain-spec-guide-runtime", "cumulus-client-service", "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -13859,6 +14293,7 @@ dependencies = [ "cumulus-primitives-storage-weight-reclaim", "docify", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "kitchensink-runtime", @@ -13885,7 +14320,9 @@ dependencies = [ "pallet-uniques", "pallet-utility", "parity-scale-codec", + "polkadot-sdk", "polkadot-sdk-frame", + "sc-chain-spec", "sc-cli", "sc-client-db", "sc-consensus-aura", @@ -13900,10 +14337,11 @@ dependencies = [ "sc-rpc-api", "sc-service", "scale-info", - "simple-mermaid", + "simple-mermaid 0.1.1", "sp-api", "sp-arithmetic", "sp-core", + "sp-genesis-builder", "sp-io", "sp-keyring", "sp-offchain", @@ -13915,6 +14353,7 @@ dependencies = [ "staging-xcm", "subkey", "substrate-wasm-builder", + "xcm-docs", ] [[package]] @@ -13960,6 +14399,7 @@ dependencies = [ "env_logger 0.11.3", "frame-benchmarking", "frame-benchmarking-cli", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-rpc-runtime-api", @@ -14097,6 +14537,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "polkadot-subsystem-bench", "rand_chacha 0.3.1", "sc-keystore", "sc-network", @@ -14161,6 +14602,7 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "polkadot-primitives-test-helpers", + "polkadot-statement-distribution", "prometheus", "pyroscope", "pyroscope_pprofrs", @@ -14185,6 +14627,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", + "strum 0.24.1", "substrate-prometheus-endpoint", "tokio", "tracing-gum", @@ -14652,15 +15095,6 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - -[[package]] -name = "proc-macro-crate" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" @@ -15481,6 +15915,7 @@ dependencies = [ "jsonpath_lib", "log", "num-traits", + "parking_lot 0.12.1", "serde_json", "sp-runtime", "substrate-prometheus-endpoint", @@ -15720,6 +16155,7 @@ dependencies = [ "bitvec", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-remote-externalities", "frame-support", "frame-system", @@ -16326,10 +16762,12 @@ name = "sc-chain-spec" version = "28.0.0" dependencies = [ "array-bytes", + "clap 4.5.3", "docify", "log", "memmap2 0.9.3", "parity-scale-codec", + "regex", "sc-chain-spec-derive", "sc-client-api", "sc-executor", @@ -16474,7 +16912,7 @@ dependencies = [ "futures", "futures-timer", "log", - "mockall", + "mockall 0.11.4", "parking_lot 0.12.1", "sc-client-api", "sc-network-types", @@ -16656,6 +17094,7 @@ dependencies = [ "sc-rpc", "serde", "serde_json", + "sp-application-crypto", "sp-consensus-beefy", "sp-core", "sp-runtime", @@ -16999,7 +17438,7 @@ dependencies = [ "linked_hash_set", "litep2p", "log", - "mockall", + "mockall 0.11.4", "multistream-select", "once_cell", "parity-scale-codec", @@ -17137,7 +17576,7 @@ dependencies = [ "futures-timer", "libp2p", "log", - "mockall", + "mockall 0.11.4", "parity-scale-codec", "prost 0.12.4", "prost-build 0.12.4", @@ -17221,12 +17660,15 @@ name = "sc-network-types" version = "0.10.0" dependencies = [ "bs58 0.5.0", + "ed25519-dalek 2.1.1", "libp2p-identity", "litep2p", "multiaddr", "multihash 0.17.0", + "quickcheck", "rand 0.8.5", "thiserror", + "zeroize", ] [[package]] @@ -17722,6 +18164,29 @@ dependencies = [ ] [[package]] +name = "scale-bits" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" +dependencies = [ + "parity-scale-codec", + "scale-type-resolver", +] + +[[package]] +name = "scale-decode" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12ebca36cec2a3f983c46295b282b35e5f8496346fb859a8776dad5389e5389" +dependencies = [ + "derive_more", + "parity-scale-codec", + "scale-bits", + "scale-type-resolver", + "smallvec", +] + +[[package]] name = "scale-info" version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -17748,6 +18213,12 @@ dependencies = [ ] [[package]] +name = "scale-type-resolver" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb" + +[[package]] name = "schannel" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -17856,9 +18327,9 @@ dependencies = [ [[package]] name = "sctp-proto" -version = "0.1.7" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f64cef148d3295c730c3cb340b0b252a4d570b1c7d4bf0808f88540b0a888bc" +checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24" dependencies = [ "bytes", "crc", @@ -18364,6 +18835,11 @@ dependencies = [ [[package]] name = "simple-mermaid" +version = "0.1.0" +source = "git+https://github.com/kianenigma/simple-mermaid.git?branch=main#e48b187bcfd5cc75111acd9d241f1bd36604344b" + +[[package]] +name = "simple-mermaid" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18" @@ -18422,9 +18898,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol" @@ -19500,7 +19976,7 @@ name = "sp-io" version = "30.0.0" dependencies = [ "bytes", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "libsecp256k1", "log", "parity-scale-codec", @@ -19573,9 +20049,9 @@ name = "sp-mmr-primitives" version = "26.0.0" dependencies = [ "array-bytes", - "ckb-merkle-mountain-range 0.6.0", "log", "parity-scale-codec", + "polkadot-ckb-merkle-mountain-range", "scale-info", "serde", "sp-api", @@ -19654,7 +20130,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "simple-mermaid", + "simple-mermaid 0.1.1", "sp-api", "sp-application-crypto", "sp-arithmetic", @@ -19801,6 +20277,7 @@ dependencies = [ name = "sp-state-machine" version = "0.35.0" dependencies = [ + "arbitrary", "array-bytes", "assert_matches", "hash-db", @@ -19826,7 +20303,7 @@ version = "10.0.0" dependencies = [ "aes-gcm", "curve25519-dalek 4.1.2", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "hkdf", "parity-scale-codec", "rand 0.8.5", @@ -20113,7 +20590,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-chain-spec-builder" -version = "3.0.0" +version = "1.6.1" dependencies = [ "clap 4.5.3", "log", @@ -20131,101 +20608,26 @@ dependencies = [ "clap 4.5.3", "clap_complete", "criterion", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", "futures", "jsonrpsee", "kitchensink-runtime", "log", - "mmr-gadget", "nix 0.28.0", "node-primitives", "node-rpc", "node-testing", - "pallet-asset-conversion-tx-payment", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-balances", - "pallet-contracts", - "pallet-glutton", - "pallet-im-online", - "pallet-root-testing", - "pallet-skip-feeless-payment", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-treasury", "parity-scale-codec", "platforms", + "polkadot-sdk", "rand 0.8.5", "regex", - "sc-authority-discovery", - "sc-basic-authorship", - "sc-block-builder", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-consensus-babe", - "sc-consensus-beefy", - "sc-consensus-epochs", - "sc-consensus-grandpa", - "sc-consensus-slots", - "sc-executor", - "sc-keystore", - "sc-mixnet", - "sc-network", - "sc-network-common", - "sc-network-statement", - "sc-network-sync", - "sc-offchain", - "sc-rpc", - "sc-service", "sc-service-test", - "sc-statement-store", - "sc-storage-monitor", - "sc-sync-state-rpc", - "sc-sysinfo", - "sc-telemetry", - "sc-transaction-pool", - "sc-transaction-pool-api", "scale-info", "serde", "serde_json", "soketto", - "sp-api", - "sp-application-crypto", - "sp-authority-discovery", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-crypto-hashing", - "sp-externalities 0.25.0", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-keystore", - "sp-mixnet", - "sp-mmr-primitives", - "sp-runtime", - "sp-state-machine", - "sp-statement-store", - "sp-timestamp", - "sp-tracing 16.0.0", - "sp-transaction-storage-proof", - "sp-trie", "staging-node-inspect", - "substrate-build-script-utils", "substrate-cli-test-utils", - "substrate-rpc-client", "tempfile", "tokio", "tokio-util", @@ -20374,17 +20776,17 @@ dependencies = [ [[package]] name = "str0m" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f10d3f68e60168d81110410428a435dbde28cc5525f5f7c6fdec92dbdc2800" +checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d" dependencies = [ "combine", "crc", + "fastrand 2.1.0", "hmac 0.12.1", "once_cell", "openssl", "openssl-sys", - "rand 0.8.5", "sctp-proto", "serde", "sha-1 0.10.1", @@ -20709,6 +21111,7 @@ version = "2.0.0" dependencies = [ "array-bytes", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-rpc-runtime-api", @@ -20800,13 +21203,22 @@ dependencies = [ name = "substrate-wasm-builder" version = "17.0.0" dependencies = [ + "array-bytes", "build-helper", "cargo_metadata", "console", "filetime", + "frame-metadata", + "merkleized-metadata", + "parity-scale-codec", "parity-wasm", "polkavm-linker", + "sc-executor", + "sp-core", + "sp-io", "sp-maybe-compressed-blob", + "sp-tracing 16.0.0", + "sp-version", "strum 0.26.2", "tempfile", "toml 0.8.8", @@ -21046,7 +21458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand 2.1.0", "redox_syscall 0.4.1", "rustix 0.38.21", "windows-sys 0.48.0", @@ -21078,6 +21490,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] +name = "test-log" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" +dependencies = [ + "env_logger 0.11.3", + "test-log-macros", + "tracing-subscriber 0.3.18", +] + +[[package]] +name = "test-log-macros" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "test-parachain-adder" version = "1.0.0" dependencies = [ @@ -21216,9 +21650,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] @@ -21245,9 +21679,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -21491,9 +21925,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -21501,7 +21935,6 @@ dependencies = [ "futures-sink", "pin-project-lite 0.2.12", "tokio", - "tracing", ] [[package]] @@ -21547,17 +21980,6 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.3", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" @@ -22734,6 +23156,7 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-executive", + "frame-metadata-hash-extension", "frame-remote-externalities", "frame-support", "frame-system", @@ -22752,6 +23175,7 @@ dependencies = [ "pallet-beefy-mmr", "pallet-collective", "pallet-conviction-voting", + "pallet-delegated-staking", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", @@ -23302,6 +23726,31 @@ dependencies = [ ] [[package]] +name = "xcm-docs" +version = "0.1.0" +dependencies = [ + "docify", + "pallet-balances", + "pallet-message-queue", + "pallet-xcm", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-parachains", + "polkadot-sdk-frame", + "scale-info", + "simple-mermaid 0.1.0", + "sp-io", + "sp-runtime", + "sp-std 14.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "test-log", + "xcm-simulator", +] + +[[package]] name = "xcm-emulator" version = "0.5.0" dependencies = [ @@ -23399,12 +23848,16 @@ name = "xcm-simulator" version = "7.0.0" dependencies = [ "frame-support", + "frame-system", "parity-scale-codec", "paste", "polkadot-core-primitives", "polkadot-parachain-primitives", + "polkadot-primitives", "polkadot-runtime-parachains", + "scale-info", "sp-io", + "sp-runtime", "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index cfc66da2d586f..9b18e6d13de18 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-v${version}"; - hash = "sha256-/m7Tg+9JHbnwKwWPY8gWIJkIHktGFlqcrbLLgNWjfwU="; + hash = "sha256-9ZjiKv+05//Kf6q3mL1P5kOCOm1KCGmQIZkrD54pyeI="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -48,10 +48,9 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc="; - "ckb-merkle-mountain-range-0.6.0" = "sha256-oTe1l406lTpgOefPai664JYwzezLjkIDXpiZTfjbd28="; "common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o="; "fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo="; - "litep2p-0.3.0" = "sha256-y0my2vi0+2CWNOtCh/vtsUbIcU1iNSFAJbLiCktEcOc="; + "simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w="; "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8="; "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI="; }; diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index 5c16de8597d2f..07be7664acba2 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2024.04"; + version = "2024.06"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - hash = "sha256-hh8D4IZX6RS/RXdhVONhgetqp89kpTC2IwDQ2KHdKsE="; + hash = "sha256-5fuRdVayvmM+yK1WsdtWlCZpxz7KKBs+ZRfnueP0Ny0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index f0863b771eba7..87b7a99833dec 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,7 +1,7 @@ { channel, pname, version, sha256Hash }: { alsa-lib -, bash +, runtimeShell , buildFHSEnv , cacert , coreutils @@ -65,6 +65,7 @@ , zlib , makeDesktopItem , tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper +, androidenv }: let @@ -214,17 +215,52 @@ let '') ]; }; -in runCommand - drvName - { - startScript = '' - #!${bash}/bin/bash - ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" + mkAndroidStudioWrapper = {androidStudio, androidSdk ? null}: runCommand drvName { + startScript = let + hasAndroidSdk = androidSdk != null; + androidSdkRoot = lib.optionalString hasAndroidSdk "${androidSdk}/libexec/android-sdk"; + in '' + #!${runtimeShell} + ${lib.optionalString hasAndroidSdk '' + echo "=== nixpkgs Android Studio wrapper" >&2 + + # Default ANDROID_SDK_ROOT to the packaged one, if not provided. + ANDROID_SDK_ROOT="''${ANDROID_SDK_ROOT-${androidSdkRoot}}" + + if [ -d "$ANDROID_SDK_ROOT" ]; then + export ANDROID_SDK_ROOT + # Legacy compatibility. + export ANDROID_HOME="$ANDROID_SDK_ROOT" + echo " - ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >&2 + + # See if we can export ANDROID_NDK_ROOT too. + ANDROID_NDK_ROOT="$ANDROID_SDK_ROOT/ndk-bundle" + if [ ! -d "$ANDROID_NDK_ROOT" ]; then + ANDROID_NDK_ROOT="$(ls "$ANDROID_SDK_ROOT/ndk/"* 2>/dev/null | head -n1)" + fi + + if [ -d "$ANDROID_NDK_ROOT" ]; then + export ANDROID_NDK_ROOT + echo " - ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT" >&2 + else + unset ANDROID_NDK_ROOT + fi + else + unset ANDROID_SDK_ROOT + unset ANDROID_HOME + fi + ''} + exec ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" ''; preferLocalBuild = true; allowSubstitutes = false; - passthru = { + passthru = let + withSdk = androidSdk: mkAndroidStudioWrapper { inherit androidStudio androidSdk; }; + in { unwrapped = androidStudio; + full = withSdk androidenv.androidPkgs.androidsdk; + inherit withSdk; + sdk = androidSdk; }; meta = with lib; { description = "Official IDE for Android (${channel} channel)"; @@ -245,9 +281,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ alapshin ]; - beta = [ alapshin ]; - canary = [ alapshin ]; + stable = [ alapshin numinit ]; + beta = [ alapshin numinit ]; + canary = [ alapshin numinit ]; dev = canary; }."${channel}"; mainProgram = pname; @@ -261,4 +297,5 @@ in runCommand ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${pname}.png ln -s ${desktopItem}/share/applications $out/share/applications - '' + ''; +in mkAndroidStudioWrapper { inherit androidStudio; } diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix deleted file mode 100644 index e41edcdd66b89..0000000000000 --- a/pkgs/applications/editors/aseprite/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, cmake, ninja, pkg-config -, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib -, harfbuzzFull, glib, fontconfig, pcre -, libX11, libXext, libXcursor, libXxf86vm, libGL, libXi -, cmark -}: - -# Unfree version is not redistributable: -# https://dev.aseprite.org/2016/09/01/new-source-code-license/ -# Consider supporting the developer: https://aseprite.org/#buy - -let - skia = callPackage ./skia.nix {}; -in -stdenv.mkDerivation rec { - pname = "aseprite"; - version = "1.3.6"; - - src = fetchFromGitHub { - owner = "aseprite"; - repo = "aseprite"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-17f6pIGsOIswnyY63pjHKEEYuCo43kf25mPLBv4vQAs="; - }; - - nativeBuildInputs = [ - cmake pkg-config ninja - ]; - - buildInputs = [ - curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib - libX11 libXext libXcursor libXxf86vm - cmark - harfbuzzFull glib fontconfig pcre - skia libGL libXi - ]; - - patches = [ - ./shared-libwebp.patch - ./shared-skia-deps.patch - ]; - - postPatch = '' - sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" - ''; - - cmakeFlags = [ - "-DENABLE_UPDATER=OFF" - "-DUSE_SHARED_CURL=ON" - "-DUSE_SHARED_FREETYPE=ON" - "-DUSE_SHARED_GIFLIB=ON" - "-DUSE_SHARED_JPEGLIB=ON" - "-DUSE_SHARED_LIBPNG=ON" - "-DUSE_SHARED_LIBWEBP=ON" - "-DUSE_SHARED_PIXMAN=ON" - "-DUSE_SHARED_TINYXML=ON" - "-DUSE_SHARED_ZLIB=ON" - "-DUSE_SHARED_CMARK=ON" - "-DUSE_SHARED_HARFBUZZ=ON" - "-DUSE_SHARED_WEBP=ON" - # Disable libarchive programs. - "-DENABLE_CAT=OFF" - "-DENABLE_CPIO=OFF" - "-DENABLE_TAR=OFF" - # UI backend. - "-DLAF_WITH_EXAMPLES=OFF" - "-DLAF_OS_BACKEND=skia" - "-DENABLE_DESKTOP_INTEGRATION=ON" - "-DSKIA_DIR=${skia}" - "-DSKIA_LIBRARY_DIR=${skia}/out/Release" - ]; - - postInstall = '' - # Install desktop icons. - src="$out/share/aseprite/data/icons" - for size in 16 32 48 64; do - dst="$out"/share/icons/hicolor/"$size"x"$size" - install -Dm644 "$src"/ase"$size".png "$dst"/apps/aseprite.png - install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png - done - # Delete unneeded artifacts of bundled libraries. - rm -rf "$out"/include "$out"/lib - ''; - - passthru = { inherit skia; }; - - meta = with lib; { - homepage = "https://www.aseprite.org/"; - description = "Animated sprite editor & pixel art tool"; - license = licenses.unfree; - longDescription = - ''Aseprite is a program to create animated sprites. Its main features are: - - - Sprites are composed by layers & frames (as separated concepts). - - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. - - Load/save sequence of PNG files and GIF animations (and FLC, FLI, JPG, BMP, PCX, TGA). - - Export/import animations to/from Sprite Sheets. - - Tiled drawing mode, useful to draw patterns and textures. - - Undo/Redo for every operation. - - Real-time animation preview. - - Multiple editors support. - - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - - Onion skinning. - - This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/ - Consider supporting the developer: https://aseprite.org/#buy - ''; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/editors/aseprite/shared-libwebp.patch b/pkgs/applications/editors/aseprite/shared-libwebp.patch deleted file mode 100644 index 20191f46b8b16..0000000000000 --- a/pkgs/applications/editors/aseprite/shared-libwebp.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index af077f6..fed17ff 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,6 +58,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) - option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) - option(USE_SHARED_FREETYPE "Use shared FreeType library" off) - option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) -+option(USE_SHARED_WEBP "Use your installed copy of webp" off) - option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) - option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) - option(ENABLE_NEWS "Enable the news in Home tab" on) -@@ -328,14 +351,17 @@ add_subdirectory(laf) - # libwebp - if(ENABLE_WEBP) - # Use libwebp from Skia -- if(LAF_BACKEND STREQUAL "skia") -+ if(USE_SHARED_WEBP) -+ find_library(WEBP_LIBRARY NAMES webp) -+ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux) -+ find_library(WEBPMUX_LIBRARY NAMES webpmux) -+ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) -+ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) -+ else() - find_library(WEBP_LIBRARIES webp - NAMES libwebp # required for Windows - PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) - set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src") -- else() -- set(WEBP_LIBRARIES webp webpdemux libwebpmux) -- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) - endif() - include_directories(${WEBP_INCLUDE_DIR}) - endif() -diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt -index 4839d4097c..e8c3e83cbc 100644 ---- a/third_party/CMakeLists.txt -+++ b/third_party/CMakeLists.txt -@@ -32,7 +32,7 @@ if(NOT USE_SHARED_GIFLIB) - add_subdirectory(giflib) - endif() - --if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia") -+if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia" AND NOT USE_SHARED_WEBP) - set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") - add_subdirectory(libwebp) - endif() \ No newline at end of file diff --git a/pkgs/applications/editors/aseprite/shared-skia-deps.patch b/pkgs/applications/editors/aseprite/shared-skia-deps.patch deleted file mode 100644 index a6ab472bbe95b..0000000000000 --- a/pkgs/applications/editors/aseprite/shared-skia-deps.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src/laf/cmake/FindSkia.cmake.orig 2022-01-08 02:15:13.417619266 +0100 -+++ src/laf/cmake/FindSkia.cmake 2022-01-08 02:15:43.603960491 +0100 -@@ -32,14 +32,18 @@ - # SkShaper module + freetype + harfbuzz - find_library(SKSHAPER_LIBRARY skshaper PATH "${SKIA_LIBRARY_DIR}") - -+if(NOT USE_SHARED_FREETYPE) - set(FREETYPE_FOUND ON) - find_library(FREETYPE_LIBRARY freetype2 PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) - set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY}) - set(FREETYPE_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/freetype/include") -+endif() - -+if(NOT USE_SHARED_HARFBUZZ) - find_library(HARFBUZZ_LIBRARY harfbuzz PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) - set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY}) - set(HARFBUZZ_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/harfbuzz/src") -+endif() - - set(SKIA_LIBRARIES - ${SKIA_LIBRARY} \ No newline at end of file diff --git a/pkgs/applications/editors/aseprite/skia-deps.nix b/pkgs/applications/editors/aseprite/skia-deps.nix deleted file mode 100644 index 3c92c649bebf3..0000000000000 --- a/pkgs/applications/editors/aseprite/skia-deps.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchgit }: -{ - angle2 = fetchgit { - url = "https://chromium.googlesource.com/angle/angle.git"; - rev = "8718783526307a3fbb35d4c1ad4e8101262a0d73"; - sha256 = "0c90q8f4syvwcayw58743sa332dcpkmblwh3ffkjqn5ygym04xji"; - }; - dng_sdk = fetchgit { - url = "https://android.googlesource.com/platform/external/dng_sdk.git"; - rev = "c8d0c9b1d16bfda56f15165d39e0ffa360a11123"; - sha256 = "1nlq082aij7q197i5646bi4vd2il7fww6sdwhqisv2cs842nyfwm"; - }; - piex = fetchgit { - url = "https://android.googlesource.com/platform/external/piex.git"; - rev = "bb217acdca1cc0c16b704669dd6f91a1b509c406"; - sha256 = "05ipmag6k55jmidbyvg5mkqm69zfw03gfkqhi9jnjlmlbg31y412"; - }; - sfntly = fetchgit { - url = "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git"; - rev = "b55ff303ea2f9e26702b514cf6a3196a2e3e2974"; - sha256 = "1qi5rfzmwfrji46x95g6dsb03i1v26700kifl2hpgm3pqhr7afpz"; - }; -} diff --git a/pkgs/applications/editors/aseprite/skia-make-deps.sh b/pkgs/applications/editors/aseprite/skia-make-deps.sh deleted file mode 100755 index bee69cc40d9d8..0000000000000 --- a/pkgs/applications/editors/aseprite/skia-make-deps.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -FILTER=$1 -OUT=skia-deps.nix -REVISION=861e4743af6d9bf6077ae6dda7274e5a136ee4e2 -DEPS=$(curl -s https://raw.githubusercontent.com/aseprite/skia/$REVISION/DEPS) -THIRD_PARTY_DEPS=$(echo "$DEPS" | grep third_party | grep "#" -v | sed 's/"//g') - -function write_fetch_defs () -{ - while read -r DEP; do - NAME=$(echo "$DEP" | cut -d: -f1 | cut -d/ -f3 | sed 's/ //g') - URL=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f1 | sed 's/ //g') - REV=$(echo "$DEP" | cut -d: -f2- | cut -d@ -f2 | sed 's/[ ,]//g') - - echo "Fetching $NAME@$REV" - PREFETCH=$(nix-prefetch-git --rev "$REV" "$URL") - -( -cat <<EOF - $NAME = fetchgit { - url = "$URL"; - rev = "$REV"; - sha256 = $(echo $PREFETCH | jq '.sha256'); - }; -EOF -) >> "$OUT" - - echo "----------" - echo - done <<< "$1" -} - -echo "{ fetchgit }:" > "$OUT" -echo "{" >> "$OUT" -write_fetch_defs "$(echo "$THIRD_PARTY_DEPS" | grep -E "$FILTER")" -echo "}" >> "$OUT" diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix deleted file mode 100644 index 03487aa8941ef..0000000000000 --- a/pkgs/applications/editors/aseprite/skia.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, python3, gn, ninja -, fontconfig, expat, icu, libglvnd, libjpeg, libpng, libwebp, zlib -, mesa, libX11, harfbuzzFull -}: - -let - # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' - depSrcs = import ./skia-deps.nix { inherit fetchgit; }; -in -stdenv.mkDerivation { - pname = "skia"; - version = "aseprite-m102"; - - src = fetchFromGitHub { - owner = "aseprite"; - repo = "skia"; - # latest commit from aseprite-m102 branch - rev = "861e4743af6d9bf6077ae6dda7274e5a136ee4e2"; - hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0="; - }; - - nativeBuildInputs = [ python3 gn ninja ]; - - buildInputs = [ - fontconfig expat icu libglvnd libjpeg libpng libwebp zlib - mesa libX11 harfbuzzFull - ]; - - preConfigure = with depSrcs; '' - mkdir -p third_party/externals - ln -s ${angle2} third_party/externals/angle2 - ln -s ${dng_sdk} third_party/externals/dng_sdk - ln -s ${piex} third_party/externals/piex - ln -s ${sfntly} third_party/externals/sfntly - ''; - - configurePhase = '' - runHook preConfigure - gn gen out/Release --args="is_debug=false is_official_build=true extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - ninja -C out/Release skia modules - runHook postBuild - ''; - - installPhase = '' - mkdir -p $out - - # Glob will match all subdirs. - shopt -s globstar - - # All these paths are used in some way when building aseprite. - cp -r --parents -t $out/ \ - include/codec \ - include/config \ - include/core \ - include/effects \ - include/gpu \ - include/private \ - include/utils \ - include/third_party/skcms/*.h \ - out/Release/*.a \ - src/gpu/**/*.h \ - src/core/*.h \ - modules/skshaper/include/*.h \ - third_party/externals/angle2/include \ - third_party/skcms/**/*.h - ''; - - meta = with lib; { - description = "Skia is a complete 2D graphic library for drawing Text, Geometries, and Images"; - homepage = "https://skia.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 386076cbd7d72..62048d867619c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "e5cf0b704274d3deae8f4a3b6a3d0664a176bc8b"; + rev = "152431c0b1d731d0302e1849690e2361f3caf7c1"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240609.1553"; + version = "20240615.2321"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-96GgMJPLFoabhlvjTMWKtEpGuctjlcRuChvzDziaq8g="; + hash = "sha256-LIjqr1IntQ6WTFOO3b6cAuB6LslG1HzVa9C+GYUyQOU="; }; commit = rev; diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix deleted file mode 100644 index 75067585653bf..0000000000000 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, msgpack, neovim, python3Packages, qtbase, qtsvg }: - -mkDerivation rec { - pname = "neovim-qt-unwrapped"; - version = "0.2.18"; - - src = fetchFromGitHub { - owner = "equalsraf"; - repo = "neovim-qt"; - rev = "v${version}"; - sha256 = "sha256-BitFHHwL2aqBUpY/8eHaZIFvnDCeABC6w33Vmbx0z2g="; - }; - - cmakeFlags = [ - "-DUSE_SYSTEM_MSGPACK=1" - "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found - ]; - - buildInputs = [ - neovim.unwrapped # only used to generate help tags at build time - qtbase - qtsvg - ] ++ (with python3Packages; [ - jinja2 python msgpack - ]); - - nativeBuildInputs = [ cmake doxygen ]; - - preCheck = '' - # The GUI tests require a running X server, disable them - sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d' - ''; - - doCheck = true; - - meta = with lib; { - description = "Neovim client library and GUI, in Qt5"; - homepage = "https://github.com/equalsraf/neovim-qt"; - license = licenses.isc; - mainProgram = "nvim-qt"; - maintainers = with maintainers; [ peterhoeg ]; - inherit (neovim.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix deleted file mode 100644 index 728c364d40061..0000000000000 --- a/pkgs/applications/editors/neovim/qt.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, makeWrapper, neovim, neovim-qt-unwrapped }: - -let - unwrapped = neovim-qt-unwrapped; -in -stdenv.mkDerivation { - pname = "neovim-qt"; - version = unwrapped.version; - buildCommand = if stdenv.isDarwin then '' - mkdir -p $out/Applications - cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications - - chmod -R a+w $out/Applications/nvim-qt.app/Contents/MacOS - wrapProgram $out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt \ - --prefix PATH : ${neovim}/bin - '' else '' - makeWrapper ${unwrapped}/bin/nvim-qt $out/bin/nvim-qt \ - --prefix PATH : ${neovim}/bin - - # link .desktop file - mkdir -p $out/share/pixmaps - ln -s ${unwrapped}/share/applications $out/share/applications - ln -s ${unwrapped}/share/icons $out/share/icons - ''; - - preferLocalBuild = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - passthru = { - inherit unwrapped; - }; - - inherit (unwrapped) meta; -} diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix deleted file mode 100644 index 1e64c5950798a..0000000000000 --- a/pkgs/applications/editors/orbiton/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config -, withGui ? true, vte -}: - -buildGoModule rec { - pname = "orbiton"; - version = "2.65.11"; - - src = fetchFromGitHub { - owner = "xyproto"; - repo = "orbiton"; - rev = "v${version}"; - hash = "sha256-eb7Ku1hgvYdmRgemXcEZMl53oNXYcomh4wYHpRzLTUc="; - }; - - vendorHash = null; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace "-Wl,--as-needed" "" - - # Requires impure pbcopy and pbpaste - substituteInPlace v2/pbcopy_test.go \ - --replace TestPBcopy SkipTestPBcopy - ''; - - nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; - - buildInputs = lib.optional withGui vte; - - preBuild = "cd v2"; - - postInstall = '' - cd .. - installManPage o.1 - mv $out/bin/{orbiton,o} - '' + lib.optionalString withGui '' - make install-gui PREFIX=$out - wrapProgram $out/bin/og --prefix PATH : $out/bin - ''; - - meta = with lib; { - description = "Config-free text editor and IDE limited to VT100"; - homepage = "https://orbiton.zip"; - license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; - mainProgram = "o"; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c35a968394a5c..7507faa4e81ec 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5915,6 +5915,18 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; + lz-n = buildNeovimPlugin { + pname = "lz.n"; + version = "2024-06-16"; + src = fetchFromGitHub { + owner = "nvim-neorocks"; + repo = "lz.n"; + rev = "ffd6633cbe2145177bd522fa340104fa44afbc1c"; + sha256 = "sha256-aV+m4+8oWwIPTQhilXfHOUyYqQGl4NRnk7HvEQYMp0Y="; + }; + meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; + }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 67ef3f6dc8ffb..2c8147cfce73c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -457,15 +457,17 @@ dependencies = with self; [ copilot-lua plenary-nvim ]; }; - copilot-vim = super.copilot-vim.overrideAttrs { + copilot-vim = super.copilot-vim.overrideAttrs (old: { postInstall = '' substituteInPlace $out/autoload/copilot/client.vim \ --replace " let node = get(g:, 'copilot_node_command', ''\'''\')" \ " let node = get(g:, 'copilot_node_command', '${nodejs}/bin/node')" ''; - meta.license = lib.licenses.unfree; - }; + meta = old.meta // { + license = lib.licenses.unfree; + }; + }); coq_nvim = super.coq_nvim.overrideAttrs { passthru.python3Dependencies = ps: diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 65f9937deec04..25b19fcf8f8d7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1,5 +1,4 @@ repo,branch,alias -https://codeberg.org/FelipeLema/cmp-async-path/,, https://github.com/euclidianAce/BetterLua.vim/,, https://github.com/vim-scripts/BufOnly.vim/,, https://github.com/jackMort/ChatGPT.nvim/,HEAD, @@ -132,11 +131,8 @@ https://github.com/laytan/cloak.nvim/,HEAD, https://github.com/asheq/close-buffers.vim/,HEAD, https://github.com/Civitasv/cmake-tools.nvim/,, https://github.com/winston0410/cmd-parser.nvim/,, -<<<<<<< HEAD https://github.com/tzachar/cmp-ai/,HEAD, https://codeberg.org/FelipeLema/cmp-async-path/,, -======= ->>>>>>> 8c49439301ad (vimPlugins.nvim-genghis: init at 2024-05-21) https://github.com/crispgm/cmp-beancount/,HEAD, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, @@ -500,6 +496,7 @@ https://github.com/l3mon4d3/luasnip/,, https://github.com/alvarosevilla95/luatab.nvim/,, https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, +https://github.com/nvim-neorocks/lz.n/,, https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD, https://github.com/winston0410/mark-radar.nvim/,HEAD, https://github.com/iamcco/markdown-preview.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md index 656ea1bdb3ae0..12ac4f5f5bb2e 100644 --- a/pkgs/applications/editors/vscode/extensions/README.md +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -20,6 +20,11 @@ - `description` should mention it is a Visual Studio Code extension. - `downloadPage` is the VSCode marketplace URL. - `homepage` is the source-code URL. + - `maintainers`: + - optionally consider adding yourself as a maintainer to be notified of updates, breakages and help with upkeep. + - recommended format is: + - a `non-nested with`, such as: `with lib.maintainers; [ your-username ];`. + - maintainers are listed in alphabetical order. - verify `license` in upstream. * On commit messages: diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 77f122eb2c58b..d0b27457b68a0 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -5,7 +5,7 @@ callPackage, }: let - version = "1.52.0"; + version = "1.54.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then @@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - hash = "sha256-3H7JgdmrGMdirVpT08wmwy4G6QLt0H65d3l7o/DuvpI="; + hash = "sha256-c7TJED5YpHRwn7Ooq8sG+N99b7tH6TOgeC9TTYdb4JA="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1d36707027730..b8ee9984adc4a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.15.2"; - hash = "sha256-gurh2DSLH/gM/EZCUACHGlzOf0LPwkc+zYxw7AOcb1E="; + version = "1.17.2"; + hash = "sha256-IA09vUleY7hazu65kadES4iq3XojyJ3sXOOGaw0vJnU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -542,6 +542,22 @@ let betterthantomorrow.calva = callPackage ./betterthantomorrow.calva { }; + bierner.comment-tagged-templates = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "comment-tagged-templates"; + publisher = "bierner"; + version = "0.3.3"; + hash = "sha256-M2XdMQ2l6oMYiHTdfRJ/n/Ys3LecEPwAozQtLBcn7FY="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.comment-tagged-templates/changelog"; + description = "VS Code extension that adds basic syntax highlighting for JavaScript and TypeScript tagged template strings using language identifier comments"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.comment-tagged-templates"; + homepage = "https://github.com/mjbvz/vscode-comment-tagged-templates"; + license = lib.licenses.mit; + }; + }; + bierner.docs-view = buildVscodeMarketplaceExtension { mktplcRef = { name = "docs-view"; @@ -570,6 +586,22 @@ let }; }; + bierner.github-markdown-preview = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "github-markdown-preview"; + publisher = "bierner"; + version = "0.3.0"; + hash = "sha256-7pbl5OgvJ6S0mtZWsEyUzlg+lkUhdq3rkCCpLsvTm4g="; + }; + meta = { + description = "A VSCode extension that changes the markdown preview to support GitHub markdown features"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.github-markdown-preview"; + homepage = "https://github.com/mjbvz/vscode-github-markdown-preview"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + bierner.markdown-checkbox = buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-checkbox"; @@ -594,6 +626,23 @@ let }; }; + bierner.markdown-footnotes = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-footnotes"; + publisher = "bierner"; + version = "0.1.1"; + hash = "sha256-h/Iyk8CKFr0M5ULXbEbjFsqplnlN7F+ZvnUTy1An5t4="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-footnotes/changelog"; + description = "Adds [^1] footnote syntax support to VS Code's built-in Markdown preview"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-footnotes"; + homepage = "https://github.com/mjbvz/vscode-markdown-footnotes"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + bierner.markdown-mermaid = buildVscodeMarketplaceExtension { mktplcRef = { name = "markdown-mermaid"; @@ -606,14 +655,59 @@ let }; }; + bierner.markdown-preview-github-styles = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-preview-github-styles"; + publisher = "bierner"; + version = "2.0.4"; + hash = "sha256-jJulxvjMNsqQqmsb5szQIAUuLWuHw824Caa0KArjUVw="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-preview-github-styles/changelog"; + description = "Changes VS Code's built-in markdown preview to match GitHub's styling"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-preview-github-styles"; + homepage = "https://github.com/mjbvz/vscode-github-markdown-preview-style"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + + biomejs.biome = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "biome"; + publisher = "biomejs"; + version = "2024.5.251958"; + hash = "sha256-Pxbvj6e3nRwuLKmPEtE02JdHmZbyuXNh4T+FZKjBkWo="; + }; + meta = { + changelog = "https://github.com/biomejs/biome-vscode/blob/main/CHANGELOG.md"; + description = "Biome LSP extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=biomejs.biome"; + homepage = "https://github.com/biomejs/biome-vscode"; + license = with lib.licenses; [ + mit + # or + asl20 + ]; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + bmalehorn.vscode-fish = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-fish"; publisher = "bmalehorn"; - version = "1.0.35"; - hash = "sha256-V51Qe6M1CMm9fLOSFEwqeZiC8tWCbVH0AzkLe7kR2vY="; + version = "1.0.38"; + hash = "sha256-QEifCTlzYMX+5H6+k2o1lsQrhW3vxVpn+KFg/3WVVFo="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/bmalehorn.vscode-fish/changelog"; + description = "Fish syntax highlighting and formatting for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bmalehorn.vscode-fish"; + homepage = "https://github.com/bmalehorn/vscode-fish"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; }; - meta.license = lib.licenses.mit; }; bmewburn.vscode-intelephense-client = buildVscodeMarketplaceExtension { @@ -948,26 +1042,26 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-GQH+KKteWbCz18AlTWjLWrVpPRxumi+iDPS5n+5xy/0="; + hash = "sha256-ZlbPRFQwvZNCp8K/rbHqVa3coXa2dT4nOrNChC9naC8="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-xBwuAtvRdOgYkfxP0JaxhAQZx5AJWymDVQ50piTx608="; + hash = "sha256-hSRdvno8VZNi48rckaqWbAgDXT6RXEcPnkNOT8DV1wA="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-oLLKnNZ+E06PbUrhj5Y0HOdHhUs/fXd+3lZXX/P2C10="; + hash = "sha256-rimE7dKT6zajHo6E42z7IyfP35xBXThIwMHhZjaZwHk="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-nWuyqOIELp8MrjzCFH3yu4pWm5KsNxmx3eacgStWKG0="; + hash = "sha256-7TeUAZLiEnqi5i5nHLhtv5aMxIcw7iiABOAkwP1YYqM="; }; }; in { name = "continue"; publisher = "Continue"; - version = "0.8.25"; + version = "0.8.40"; } // sources.${stdenv.system}; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; @@ -1628,6 +1722,23 @@ let }; }; + fabiospampinato.vscode-open-in-github = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-open-in-github"; + publisher = "fabiospampinato"; + version = "2.3.0"; + hash = "sha256-vrW6uZyeEJipGtfz7BEeeAwiwtBlfQLjC7jAP1v5GoE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/fabiospampinato.vscode-open-in-github/changelog"; + description = "VS Code extension to open the current project or file in github.com"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=fabiospampinato.vscode-open-in-github"; + homepage = "https://github.com/fabiospampinato/vscode-open-in-github"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + file-icons.file-icons = buildVscodeMarketplaceExtension { meta = { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; @@ -1731,6 +1842,23 @@ let }; }; + fortran-lang.linter-gfortran = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "linter-gfortran"; + publisher = "fortran-lang"; + version = "3.4.2024061701"; + hash = "sha256-i357EzQ8cm8NPsMBbsV5ToMoBDa59Bh6ylC9tNjMY6s="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/fortran-lang.linter-gfortran/changelog"; + description = "Fortran language support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=fortran-lang.linter-gfortran"; + homepage = "https://github.com/fortran-lang/vscode-fortran-support"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + foxundermoon.shell-format = callPackage ./foxundermoon.shell-format { }; freebroccolo.reasonml = buildVscodeMarketplaceExtension { @@ -1767,6 +1895,22 @@ let }; }; + garlicbreadcleric.pandoc-markdown-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pandoc-markdown-syntax"; + publisher = "garlicbreadcleric"; + version = "0.0.2"; + hash = "sha256-YAMH5smLyBuoTdlxSCTPyMIKOWTSIdf2MQVZuOO2V1w="; + }; + meta = { + description = "A VSCode extension that adds syntax highlighting for Pandoc-flavored Markdown"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=garlicbreadcleric.pandoc-markdown-syntax"; + homepage = "https://github.com/garlicbreadcleric/vscode-pandoc-markdown"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension { mktplcRef = { name = "html-slim-scss-css-class-completion"; @@ -2564,6 +2708,23 @@ let }; }; + kravets.vscode-publint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-publint"; + publisher = "Kravets"; + version = "0.0.1"; + hash = "sha256-6nG5Yqi8liumQ2K9ynV8mNXiXGaGo/cp4Cib1kqdp1c="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/Kravets.vscode-publint/changelog"; + description = "Lint packaging errors in VS Code with publint"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Kravets.vscode-publint"; + homepage = "https://github.com/kravetsone/vscode-publint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { mktplcRef = { name = "nickel-syntax"; @@ -2576,6 +2737,22 @@ let }; }; + lapo.asn1js = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "asn1js"; + publisher = "lapo"; + version = "0.1.4"; + hash = "sha256-utbIKlwNHnJZj/51f8hEDmUA/A26De/gY73iT4tXKRU="; + }; + meta = { + description = "Decode ASN.1 content inside VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=lapo.asn1js"; + homepage = "https://github.com/lapo-luchini/vscode-asn1js"; + maintainers = with lib.maintainers; [ katexochen ]; + license = lib.licenses.isc; + }; + }; + llvm-org.lldb-vscode = llvmPackages.lldb; llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { @@ -2736,6 +2913,23 @@ let }; }; + meganrogge.template-string-converter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "template-string-converter"; + publisher = "meganrogge"; + version = "0.6.1"; + hash = "sha256-w0ppzh0m/9Hw3BPJbAKsNcMStdzoH9ODf3zweRcCG5k="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/meganrogge.template-string-converter/changelog"; + description = "VS Code extension to autocorrect from quotes to backticks"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=meganrogge.template-string-converter"; + homepage = "https://github.com/meganrogge/template-string-converter"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; mhutchie.git-graph = buildVscodeMarketplaceExtension { @@ -3118,6 +3312,22 @@ let ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; + ms-vscode-remote.remote-ssh-edit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-ssh-edit"; + publisher = "ms-vscode-remote"; + version = "0.86.0"; + hash = "sha256-JsbaoIekUo2nKCu+fNbGlh5d1Tt/QJGUuXUGP04TsDI="; + }; + meta = { + description = "A Visual Studio Code extension that complements the Remote SSH extension with syntax colorization, keyword intellisense, and simple snippets when editing SSH configuration files"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh-edit"; + homepage = "https://code.visualstudio.com/docs/remote/ssh"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; mshr-h.veriloghdl = buildVscodeMarketplaceExtension { @@ -3212,6 +3422,23 @@ let }; }; + nefrob.vscode-just-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-just-syntax"; + publisher = "nefrob"; + version = "0.3.0"; + hash = "sha256-WBoqH9TNco9lyjOJfP54DynjmYZmPUY+YrZ1rQlC518="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog"; + description = "Justfile syntax support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nefrob.vscode-just-syntax"; + homepage = "https://github.com/nefrob/vscode-just"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + njpwerner.autodocstring = buildVscodeMarketplaceExtension { mktplcRef = { name = "autodocstring"; @@ -3943,8 +4170,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "4.0.2"; - hash = "sha256-k3FxRAtW9Fdhm7jD3ingFXONiBsOia1Whs7OPeDmlSw="; + version = "4.0.3"; + hash = "sha256-CEGwbw5RpFsfB/g2inScIqWB7/3oxgxz7Yuc6V3OiHg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -4476,6 +4703,23 @@ let }; }; + vitaliymaz.vscode-svg-previewer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-svg-previewer"; + publisher = "vitaliymaz"; + version = "0.7.0"; + hash = "sha256-iX+Js2Pqz1gLDwrihuYtDwQG4ek7GiOhL3M0j3jHF/Y="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/vitaliymaz.vscode-svg-previewer/changelog"; + description = "Preview SVGs in VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vitaliymaz.vscode-svg-previewer"; + homepage = "https://github.com/vitaliymaz/vscode-svg-previewer"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + vlanguage.vscode-vlang = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-vlang"; @@ -4590,8 +4834,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.2.0"; - sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz"; + version = "12.8.0"; + hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM="; }; meta = { description = "Bring real icons to your Visual Studio Code"; @@ -4792,6 +5036,22 @@ let }; }; + yoavbls.pretty-ts-errors = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pretty-ts-errors"; + publisher = "yoavbls"; + version = "0.5.3"; + hash = "sha256-JSCyTzz10eoUNu76wNUuvPVVKq4KaVKobS1CAPqgXUA="; + }; + meta = { + description = "Make TypeScript errors prettier and human-readable in VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoavbls.pretty-ts-errors"; + homepage = "https://github.com/yoavbls/pretty-ts-errors"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + yzhang.dictionary-completion = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "yzhang"; @@ -4829,6 +5089,22 @@ let }; }; + zaaack.markdown-editor = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-editor"; + publisher = "zaaack"; + version = "0.1.10"; + hash = "sha256-K1nczR059BsiHpT1xdtJjpFLl5krt4H9+CrEsIycq9U="; + }; + meta = { + description = "Visual Studio Code extension for WYSIWYG markdown editing"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zaaack.markdown-editor"; + homepage = "https://github.com/zaaack/vscode-markdown-editor"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + zainchen.json = buildVscodeMarketplaceExtension { mktplcRef = { name = "json"; @@ -4845,6 +5121,22 @@ let }; }; + zguolee.tabler-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tabler-icons"; + publisher = "zguolee"; + version = "0.3.4"; + hash = "sha256-0XvB9UXqKHbL/ejUfciSvFzZ3GacaQ7pq6hJqRaxq+8="; + }; + meta = { + description = "Tabler product icon theme for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=zguolee.tabler-icons"; + homepage = "https://github.com/zguolee/vscode-tabler-icons"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + zhuangtongfa.material-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "material-theme"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 7bcbcc11a89da..780b0e12896ea 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.5.1"; - hash = "sha256-w+T4dySTt2RpdBYd1Nnxh8RR9wqEu9pkS4R1Ay7Fn+8="; + version = "2024.6.1"; + hash = "sha256-NOx0WJC32MUm6TmLkiN67FHKwBmB0S3feFVIQNxR2PQ="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index ea2276c7e7a3e..99878c88568e7 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-etPjbmcBhS1dgq5wEoRIekZlRxYoC6KrsV/+owjHu4I="; + hash = "sha256-Oama8FkRhEY4yza77RpWHg0Aeo9WFhveucJqJvCYMJQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index a74f934705f7d..07616924d18a0 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -3,15 +3,15 @@ stdenv, vscode-utils, autoPatchelfHook, - libxcrypt-legacy, + zlib, }: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.16.0"; - hash = "sha256-SHgS2C+ElTJW4v90Wg0QcsSL2FoSz+SxZQpgq2J4JiU="; + version = "1.19.0"; + hash = "sha256-Wit2ozgaVwINL3PvPfmZWQ4WN7seQMWfXwXGgEKecn0="; }; postPatch = '' @@ -24,7 +24,7 @@ vscode-utils.buildVscodeMarketplaceExtension { buildInputs = [ stdenv.cc.cc.lib - libxcrypt-legacy + zlib ]; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index f383ef7dfb4ad..f56f477c8560d 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -13,19 +13,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-CPUlJ1QzGiZKd4r46Iioc5svw0oLsMsYnc0KxT1p0zM="; + hash = "sha256-fvDzsFOG1pdmpC3RDY8zGP0yL/TzX6i00LnIX+yceVU="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-qSTCZHL7nfB300qwuqgl/4u+SYNMA2BFCrD+yQEgN/c="; + hash = "sha256-3yRZzOTuiTbkUUz1D3mZo7G5vayM6W9YBbJxTiVou9g="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-FcZH2bB5B3wnu6F76kGp9FBdD3yZtr57TQ5xaUfRcmY="; + hash = "sha256-fKvR2bea4UxvnZ+LlWR/ahpKe8mk5f4mZrjqTFpsC5A="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-3HdK4x2WNdb9Zxqjtn9lmbgrMOzz14rH0ZF0x9B0BHY="; + hash = "sha256-nkK3BH+MRi6KdThq4kYR9ZAfnuSkC2r/lKWpEtmD7Ak="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -37,7 +37,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.18"; + version = "0.1.19"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index bf97add669060..3461744ec6ebf 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1zmgvadhsnsbmqb559kvf66i7h6iq7vw99m7vdxcfmdl6c1pwyvb"; - x86_64-darwin = "061h423vay3d28d2015llz7pwlqcrjy0lmw47xgy3iy6hfadrra2"; - aarch64-linux = "0n288h6369bazykp6jyapi6yz0k7nivql6wz68fgkagfdyxzl1yb"; - aarch64-darwin = "13k9hvbzj8xyfi29g0x4nz80gmjq3s693zi5fi4lbf4bj7jmcamq"; - armv7l-linux = "19p6k1rgy83vs76hksjx5d4v32jq31r6aw5kzcc8gsq114xj9c2a"; + x86_64-linux = "1r76ikfikagg9v278pgiqhnjsv7pqn0xi372y1l0wsashlxl7kb0"; + x86_64-darwin = "156604xzazmb54p0rdkv5wy9livg0xz2jviycdizablmvsxybs57"; + aarch64-linux = "0cp120pcjpgf9qvmks9f8l2caxqlvnqvmxa7fh9mf83zpkdmnsnl"; + aarch64-darwin = "1k06648jx64irshs0v4qy6xlkd9mk514xf21dlfhvic4aj89kcx9"; + armv7l-linux = "0jy8hkbxh1969kskggg2y86cphly9l9gs7y4plj90jmlvlzjjjxm"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.0.24158"; + version = "1.90.1.24165"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/applications/emulators/c64-debugger/default.nix index fcd3a0aa9b527..ad0da506b4ffb 100644 --- a/pkgs/applications/emulators/c64-debugger/default.nix +++ b/pkgs/applications/emulators/c64-debugger/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation { - name = "c64-debugger"; + pname = "c64-debugger"; version = "0.64.58.6"; src = fetchgit { diff --git a/pkgs/applications/emulators/cemu/cmakelists.patch b/pkgs/applications/emulators/cemu/cmakelists.patch deleted file mode 100644 index a337484277ef8..0000000000000 --- a/pkgs/applications/emulators/cemu/cmakelists.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4b2b789..48d9be0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,6 +92,7 @@ find_package(pugixml REQUIRED) - find_package(RapidJSON REQUIRED) - find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED) - find_package(libzip REQUIRED) -+find_package(SPIRV-Tools-opt REQUIRED) - find_package(glslang REQUIRED) - find_package(ZLIB REQUIRED) - find_package(zstd MODULE REQUIRED) # MODULE so that zstd::zstd is available diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix deleted file mode 100644 index c5860d3b0b265..0000000000000 --- a/pkgs/applications/emulators/cemu/default.nix +++ /dev/null @@ -1,151 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, addOpenGLRunpath -, wrapGAppsHook3 -, cmake -, glslang -, nasm -, pkg-config - -, SDL2 -, boost -, cubeb -, curl -, fmt_9 -, glm -, gtk3 -, hidapi -, imgui -, libpng -, libusb1 -, libzip -, libXrender -, pugixml -, rapidjson -, vulkan-headers -, wayland -, wxGTK32 -, zarchive -, gamemode -, vulkan-loader - -, nix-update-script -}: - -let - # cemu doesn't build with imgui 1.90.2 or newer: - # error: 'struct ImGuiIO' has no member named 'ImeWindowHandle' - imgui' = imgui.overrideAttrs rec { - version = "1.90.1"; - src = fetchFromGitHub { - owner = "ocornut"; - repo = "imgui"; - rev = "v${version}"; - sha256 = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; - }; - }; - -in stdenv.mkDerivation rec { - pname = "cemu"; - version = "2.0-85"; - - src = fetchFromGitHub { - owner = "cemu-project"; - repo = "Cemu"; - rev = "v${version}"; - hash = "sha256-uMVbKJhdHLLKsJnj7YFIG+S5pm7rSZfBSWebhTP01Y8="; - }; - - patches = [ - # glslangTargets want SPIRV-Tools-opt to be defined: - # > The following imported targets are referenced, but are missing: - # > SPIRV-Tools-opt - ./cmakelists.patch - ]; - - nativeBuildInputs = [ - addOpenGLRunpath - wrapGAppsHook3 - cmake - glslang - nasm - pkg-config - ]; - - buildInputs = [ - SDL2 - boost - cubeb - curl - fmt_9 - glm - gtk3 - hidapi - imgui' - libpng - libusb1 - libzip - libXrender - pugixml - rapidjson - vulkan-headers - wayland - wxGTK32 - zarchive - ]; - - cmakeFlags = [ - "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG" - "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG" - "-DENABLE_VCPKG=OFF" - "-DENABLE_FERAL_GAMEMODE=ON" - - # PORTABLE: - # "All data created and maintained by Cemu will be in the directory where the executable file is located" - "-DPORTABLE=OFF" - ]; - - preConfigure = with lib; let - tag = last (splitString "-" version); - in '' - rm -rf dependencies/imgui - # cemu expects imgui source code, not just header files - ln -s ${imgui'.src} dependencies/imgui - substituteInPlace src/Common/version.h --replace " (experimental)" "-${tag} (experimental)" - substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" - ''; - - installPhase = '' - runHook preInstall - - install -Dm755 ../bin/Cemu_release $out/bin/Cemu - ln -s $out/bin/Cemu $out/bin/cemu - - mkdir -p $out/share/applications - substitute ../dist/linux/info.cemu.Cemu.desktop $out/share/applications/info.cemu.Cemu.desktop \ - --replace "Exec=Cemu" "Exec=$out/bin/Cemu" - - install -Dm644 ../dist/linux/info.cemu.Cemu.metainfo.xml -t $out/share/metainfo - install -Dm644 ../src/resource/logo_icon.png $out/share/icons/hicolor/128x128/apps/info.cemu.Cemu.png - - runHook postInstall - ''; - - preFixup = let - libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs; - in '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" - ) - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Cemu is a Wii U emulator"; - homepage = "https://cemu.info"; - license = licenses.mpl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zhaofengli baduhai ]; - mainProgram = "cemu"; - }; -} diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 6c5269fb53c8f..249d3db287034 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,20 +55,20 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "0eb4b423452da40dbf4393e09d4126c3090a1210", - "hash": "sha256-PhhItDKvlvx3uBDx+xEUVr0sW2Y9HiTR/IvsnXVNAqo=" + "rev": "3d91a940b3a48254152a8789b79616ceefe4067f", + "hash": "sha256-6zXl49Rns6wCZmcEUWkWqYeSH6W1+qs6Sb998pQ/+Lo=" }, - "version": "unstable-2024-05-17" + "version": "unstable-2024-06-14" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "414149d335ce2a3284db6cdffbb8ed2ce42dbe5f", - "hash": "sha256-sta71o4NJIPDZlQkAFLzx+XlHVA8MmUjuZ17MuCKhOY=" + "rev": "a653bbbdc5cf2bf960e614efdcf9446a9aa8cdf9", + "hash": "sha256-ty4Uluo8D8x+jB7fOqI/AgpTxdttzpbeARiICd3oh9c=" }, - "version": "unstable-2024-05-17" + "version": "unstable-2024-06-14" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "b8e10a3039391db6e4fbdc96720d3428a2dbd039", - "hash": "sha256-F38lUBhe9JR3dPwkLqhAAlvLtAeas8bnPuiK6eOpUuU=" + "rev": "6e881f9939dd9b33fb5f5587745524a0828c9ef4", + "hash": "sha256-mFIqsybkpSF17HmrfReazYUqVLzuDGwCjzaV7BTLKJ8=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "e3f68c1311d4684a5a59d3d1662d5c4f32662c02", - "hash": "sha256-jTO2SDOefpB+cfahiPkReYID0pjP437h53hZElSLsdY=" + "rev": "29b2a6e12c13d623ad94dcb64e1cb341d93ff02d", + "hash": "sha256-sbpCG3QsSn8NOjWC0snvsd7jZYClSbKI79QUnigQwzc=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "beetle-vb": { "fetcher": "fetchFromGitHub", @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "44f6ce5dedb138ded8e59d71df18cae5b0655eba", - "hash": "sha256-7iB2VQ3f8YVOV3C+Rkviaj7USoZdO/riDnT9kCdzc8k=" + "rev": "9131a4c705e18f7b96e7dbfcfe70b158d10afed1", + "hash": "sha256-NotqQMBHV6E3LSXJHQ5FqIbq2OQbXx6xCbLYV9g12kQ=" }, - "version": "unstable-2024-05-31" + "version": "unstable-2024-06-16" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -297,21 +297,21 @@ "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "bc9d865f9427384e40084cb090d94d72d4970e78", - "hash": "sha256-/g7gRNWDbW5LFZ+uBkIf5DMELas0/ilqbmUbvq8YSsE=" + "rev": "fe4a4f8a53cc7f91278f393710abb4f32c4e0a8f", + "hash": "sha256-/rZoARZf3SfN8E0o0qm34FYCYscqeEcLg3eYSXenK8s=" }, - "version": "unstable-2024-06-09" + "version": "unstable-2024-06-15" }, "flycast": { "fetcher": "fetchFromGitHub", "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "4cd62781043cd9193c6c5ec04f6a8084375bed0d", - "hash": "sha256-EKK9PNFHWm1Jakq0E6fIqmcDiiiOSgHEbixB3X/H77g=", + "rev": "ca613db70d8897e06562fe089e3e9543b41526a0", + "hash": "sha256-wYKHC+EvLnq+PnL1/hNcrhDyCY+4kaiSjIUKJ9SGPHc=", "fetchSubmodules": true }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-06-11" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -338,30 +338,30 @@ "src": { "owner": "libretro", "repo": "fuse-libretro", - "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", - "hash": "sha256-jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" + "rev": "9fc41a5f153e1f2fa2dbcfdd215c7ec97d98a29c", + "hash": "sha256-eEgPnSIpKC7s+4JoEHDGPlwYPa5Y8EpoxmNhyOIIcU8=" }, - "version": "unstable-2023-06-23" + "version": "unstable-2024-06-16" }, "gambatte": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "e2031a4010463adcd00ce3f34acbbb6db2ad1266", - "hash": "sha256-yFj9ZkvDliaTO43l0fjg8FwD17MxjV4wszY7AVjTiNY=" + "rev": "863002046a812758da6064daaf579fef1cec19a3", + "hash": "sha256-7rkyMcaKDNOESNrmwYCKM71x3WM8eSN9LBX0xOQRhJ0=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "60955a01f601ef73c02b07581dd7d5aa3b6a4788", - "hash": "sha256-h0T6i1kiN58TagFo5XHzXMLaEwkGGTyuZpyS1QGNrb8=" + "rev": "4e54d585d540d461ecc412c91ca4a79e2338f3b6", + "hash": "sha256-7P6w6pXplOfpP7w+JztNd49FdKBPM8eQeSh93YAG0Y4=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-14" }, "gpsp": { "fetcher": "fetchFromGitHub", @@ -408,11 +408,11 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "4ee35952a8fdb1332e970fa14c3e79c8c968050c", - "hash": "sha256-UIAMq8AIdLKX8SIF2V0+Vc6kHPJ0rmdx4BeqoSrCfFE=", + "rev": "db65a583bd2da39514a544c58362a6ac170179ac", + "hash": "sha256-FTsoLsx7IhyAw/pdaGAeNzysc7vZ3CcyXKWcBJ0pOb8=", "fetchSubmodules": true }, - "version": "unstable-2024-05-21" + "version": "unstable-2024-06-13" }, "mame2000": { "fetcher": "fetchFromGitHub", @@ -550,10 +550,10 @@ "src": { "owner": "libretro", "repo": "neocd_libretro", - "rev": "71ebe5044639b825e5bd1bd590fef3e918133b80", - "hash": "sha256-YVxt3bJ54DD91VHkeQyYdo/BEq//lnBKd9Y42Vby3qc=" + "rev": "c5a266254ffbaa2730d2814195f60e7be153fc86", + "hash": "sha256-MJhUYFNrtt2SSLun75OXKrT7nZzLBtyslqG9mziQuRk=" }, - "version": "unstable-2024-02-01" + "version": "unstable-2024-06-16" }, "nestopia": { "fetcher": "fetchFromGitHub", @@ -611,10 +611,10 @@ "src": { "owner": "libretro", "repo": "parallel-n64", - "rev": "1b57f9199b1f8a4510f7f89f14afa9cabf9b3bdd", - "hash": "sha256-L20RGav0FJfydOICCNhAMGxIuIvPABDtCs5tWzrh768=" + "rev": "330fa5efd306ad116c44faf6833a8108ed4144b0", + "hash": "sha256-pltPoWfXFh9OhWnQ+XMhHVZCo6BCGr6jCDhiL5T7LNM=" }, - "version": "unstable-2024-01-15" + "version": "unstable-2024-06-10" }, "pcsx2": { "fetcher": "fetchFromGitHub", @@ -631,43 +631,43 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "1f8c6be323aa8fad329e38682158197e822d27c1", - "hash": "sha256-f1U7hmSywECmXwRi6vhAFjG971XsDXhsYzSAKMa2ZVY=" + "rev": "1cdeae2b66fc3ef486ec8016ed5fad437f1a4409", + "hash": "sha256-Zw5CWDeAy3pUV4qXFIfs6kFlEaYhNhl+6pu5fOx34j0=" }, - "version": "unstable-2024-05-30" + "version": "unstable-2024-06-17" }, "picodrive": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "picodrive", - "rev": "ad93670449a28825d4b2cebf2eeff72cf03377a9", - "hash": "sha256-AGupXJVUkOt7XjXE1s5Y3SzZjZBAujaAAsR0CgxfKe0=", + "rev": "535217f16bc2848ec70985c41e1d131709352641", + "hash": "sha256-K96eN3Erw1G+vQa8pag72hrtgf+tttoNIMXdgCGNy6k=", "fetchSubmodules": true }, - "version": "unstable-2024-03-26" + "version": "unstable-2024-06-15" }, "play": { "fetcher": "fetchFromGitHub", "src": { "owner": "jpd002", "repo": "Play-", - "rev": "2f3d8252a2ba398078538abfe8a633b667a858a4", - "hash": "sha256-Trr+xJWcWfQW5TnSTxqAsUK3HSMsoLaAkz7UIwp6L4c=", + "rev": "a5753e582963e8555985abdfe6b5692bac52d701", + "hash": "sha256-OabW7OYitDzMh2bbAokfM+HwMaLo2cY3/FB78/ouvrY=", "fetchSubmodules": true }, - "version": "unstable-2024-06-04" + "version": "unstable-2024-06-10" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "5dec3ca2db10943dcdf5e483cc8c28e0524d1a43", - "hash": "sha256-B9/0uGpBrM+qndvO2BC9sQCNkSK3qR2fUtWx5Vx16xU=", + "rev": "cfcca0ed13ca86eb6e1ee7bb4161aabee6c2af06", + "hash": "sha256-K96Ajh/jXxILiKXBaTiNh6FwptPQQG39jGq45aQ7veY=", "fetchSubmodules": true }, - "version": "unstable-2024-06-09" + "version": "unstable-2024-06-16" }, "prboom": { "fetcher": "fetchFromGitHub", @@ -754,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "c7b77d4a763e8fa3ee2c4ef63b3974527056b7ad", - "hash": "sha256-a9IKbuSrlzrhrRrLRFAnhHWBhaYIf58oRFYjWSqbNTU=" + "rev": "a9e64edf73f36fb1a4ac616b11131f6380d8e968", + "hash": "sha256-3m2YTy1Y/ENhI4qmH3FQBZMEKNHsDJVZeOOLRrLj8lw=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-06-13" }, "snes9x2002": { "fetcher": "fetchFromGitHub", @@ -794,10 +794,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "1c2dceab2b74980effb8d6497ea64fc3bd6b0be3", - "hash": "sha256-UeuSHHAZV798sSws32PhcBq9q2bGfX758mR+mIEnX+I=" + "rev": "b477cb56bc6fd8b6977dcee279f16de01348bdae", + "hash": "sha256-jGyEah9eBEvNB4HewL60yXZvpHseeScYrHsRtzUtjN8=" }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-06-15" }, "stella2014": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index bd6b5e4d080d0..9abb44fd61a4e 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.10"; + version = "9.11"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-r8NLSRv6FMYsP99ifdK13Kxefp8/FFrbFDMleK+M8cA="; + hash = "sha256-36AMJk6nEWnQKoSagz5Iyudh+whCKgDfhkTr1nv4ckA="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-ZqajfgPSKTcNBiDWEc9UgZWWmvkJvTA0S+j98Qz/y08="; + hash = "sha256-vqlikMatRlGxvWJ6BJu2HyBclV4x+vzNPNe8py7jKqo="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/applications/graphics/brlcad/default.nix index f30a6acbbbee7..91b063f8fc935 100644 --- a/pkgs/applications/graphics/brlcad/default.nix +++ b/pkgs/applications/graphics/brlcad/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , fontconfig , libX11 @@ -11,15 +12,25 @@ stdenv.mkDerivation rec { pname = "brlcad"; - version = "7.34.2"; + version = "7.38.2"; src = fetchFromGitHub { owner = "BRL-CAD"; - repo = pname; + repo = "brlcad"; rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-oafu255xElEIk8p4yvNyR2maykUfxQui/L5MkicA+JA="; + hash = "sha256-23UTeH4gY2x/QGYZ64glAkf6LmsXBAppIOHgoUdxgpo="; }; + patches = [ + # This commit was bringing an impurity in the rpath resulting in: + # RPATH of binary /nix/store/rq2hjvfgq2nvh5zxch51ij34rqqdpark-brlcad-7.38.0/bin/tclsh contains a forbidden reference to /build/ + (fetchpatch { + url = "https://github.com/BRL-CAD/brlcad/commit/fbdbf042b2db4c7d46839a17bbf4985cdb81f0ae.patch"; + revert = true; + hash = "sha256-Wfihd7TLkE8aOpLdDtYmhhd7nZijiVGh1nbUjWr/BjQ="; + }) + ]; + nativeBuildInputs = [ cmake ]; @@ -36,11 +47,19 @@ stdenv.mkDerivation rec { "-DBRLCAD_ENABLE_STRICT=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + meta = with lib; { homepage = "https://brlcad.org"; description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system"; + changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${src.rev}"; license = with licenses; [ lgpl21 bsd2 ]; maintainers = with maintainers; [ GaetanLepage ]; platforms = platforms.linux; + # error Exactly one of ON_LITTLE_ENDIAN or ON_BIG_ENDIAN should be defined. + broken = stdenv.system == "aarch64-linux"; }; } diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 115233dd2641c..3678b9760c812 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,6 +1,9 @@ { lib, stdenv , mkDerivation , fetchurl +, autoconf +, automake +, libtool , pkg-config , djvulibre , qtbase @@ -12,14 +15,19 @@ mkDerivation rec { pname = "djview"; - version = "4.10.6"; + version = "4.12"; + + outputs = [ "out" "man" ]; src = fetchurl { url = "mirror://sourceforge/djvu/${pname}-${version}.tar.gz"; - sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"; + hash = "sha256-VnPGqLfhlbkaFyCyQJGRW4FF3jSHnbEVi8k2sQDq8+M="; }; nativeBuildInputs = [ + autoconf + automake + libtool pkg-config qttools ]; @@ -31,24 +39,24 @@ mkDerivation rec { libtiff ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + configureFlags = [ "--disable-silent-rules" "--disable-dependency-tracking" "--with-x" "--with-tiff" - # NOTE: 2019-09-19: experimental "--enable-npdjvu" fails + "--disable-nsdejavu" # 2023-11-14: modern browsers have dropped support for NPAPI ] ++ lib.optional stdenv.isDarwin "--enable-mac"; - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - meta = with lib; { broken = stdenv.isDarwin; description = "Portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; mainProgram = "djview"; homepage = "https://djvu.sourceforge.net/djview4.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha ]; longDescription = '' diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 7c334fb804558..ce23bd8ee3f18 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.1.24"; + version = "6.0.3.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-IgsiL5YUeOWQ/WIaTfs0Kmv2XFori8ntGZhrx7xeMkg="; + hash = "sha256-qYB94SJYCwcUrXdKtD+ZdiPRpwXg3rOHVmFWD+Y1ZXg="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; @@ -26,22 +26,20 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; projectFile = "ArchiSteamFarm.sln"; - executables = [ "ArchiSteamFarm" ]; + executable = "ArchiSteamFarm"; dotnetFlags = [ - "-p:PublishSingleFile=true" - "-p:PublishTrimmed=true" + "-p:UseAppHost=false" ]; dotnetInstallFlags = [ "--framework=net8.0" ]; - selfContainedBuild = true; runtimeDeps = [ libkrb5 zlib openssl ]; doCheck = true; preBuild = '' - export projectFile=(ArchiSteamFarm) + dotnetProjectFiles=(ArchiSteamFarm) ''; preInstall = '' @@ -58,11 +56,17 @@ buildDotnetModule rec { dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \ -p:UseAppHost=false - } + } - buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher - buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator - buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher + buildPlugin ArchiSteamFarm.OfficialPlugins.MobileAuthenticator + buildPlugin ArchiSteamFarm.OfficialPlugins.Monitoring + buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper + + chmod +x $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll + wrapDotnetProgram $out/lib/ArchiSteamFarm/ArchiSteamFarm.dll $out/bin/ArchiSteamFarm + substituteInPlace $out/bin/ArchiSteamFarm \ + --replace-fail "exec " "exec dotnet " ''; passthru = { diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index cc47f6d75949f..79ed6cdf624a5 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -57,10 +57,14 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.36.2"; sha256 = "02d658sjxd853lmqhhh13yhycm9nlmghl3p3fdn6iwmwhkly9qvy"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; sha256 = "0pcysg74pvhqs13087dh5r90xnixklmnz7bwv02304927mkv5345"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; sha256 = "0h5qkhmazlvwvjmxxj9pp2404rmvk55yf6npwcmlskv9mgfkli4r"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "05y1xb5fw8lzvb4si77a5qwfwfz1855crqbphrwky6x9llivbhkx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "18zdbcb2bn7wy1dp14z5jyqiiwr9rkad1lcb158r5ikjfq1rg5iw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "1nbxzmj6cnccylxis67c54c0ik38ma4rwdvgg6sxd6r04219maqm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1wqkbjd1ywv9w397l7rsb89mijc5n0hv7jq9h09xfz6wn9qsp152"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; sha256 = "0s0v7jmrq85n356xv7zixvwa4z94fszjcr5vll8x4im1a2lp00f9"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) @@ -76,54 +80,60 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.0"; sha256 = "0nigij1vz1biw1sl64mflx68fgm34lmnvq47z2n5p0qs534kvkhb"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.0"; sha256 = "025ixbv7jq294n8yw4y1bbd92iz08q4jqnnzqp0s8lgi49sk9dad"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.0"; sha256 = "1qyyfxww980s7xzw048kc8iqzarzbaj11cb5lrsisv777ccipma5"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.0"; sha256 = "0ns56pws3zlwjk8mjyfr02zl3nnhzka76wabfabplfci62bgi3h0"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.0"; sha256 = "18g4j9n47387k4ym3kl2dzhhhs6fs5rq96757fc4lcdql2rpkmp0"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.0"; sha256 = "11znwbbg44hhz3ly6j6q81qz83yqf97jj5zhpldng5zq0h791srl"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.0"; sha256 = "1slkzygcn4abpqip4rmi73h9096ihjkkaiwgmkaiba9pidn9lzlx"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.0"; sha256 = "1blj1ayw9qpjpsnb4k95s03pdkin0032mxgznfaw1z1qhhiqdnsi"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; sha256 = "13g8fwl09li8fc71nk13dgkb7gahd4qhamyg2xby7am63nlchhdf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "0gwqmkmr7jy3sjh9gha82amlry41gp8nwswy2iqfw54f28db63n7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "042cjvnwrrjs3mw5q8q5kinh0cwkks33i3n1vyifaid2jbr3wlc0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "06ndp4wh1cap01dql3nixka4g56bf6ipmqys7xaxvg4xisf79x8d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1kh5bnaf6h9mr4swcalrp304625frjiw6mlz1052rxwzsdq98a96"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.2"; sha256 = "00psv2mvynd2bz8xnzvqvb32qr33glqxg4ni5j91b93k84yjy5ma"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.0.2"; sha256 = "09yn3hi9npgi8rs2vyfyzcl8vbfa1lqcl6lgpymw5d7lg0hc511w"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.2"; sha256 = "0c65fsc23xxw648xh83sjcmrn9hvs9q58l5lb36wflvaajbsjf2r"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.2"; sha256 = "0bq46f4v2r4nzwly7g0dsakyc1lcql9nh85sp59d1fwzaknf1n94"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.2"; sha256 = "1vjqrpqjx3z1irqgy0ckmkgyvrzqqqcikxs36q6gadyj643ra1c5"; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; sha256 = "1wr8crmjg4gznm3jqgz9s9p285vrwb8a6baqc6gz3b58rn4m88km"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; sha256 = "1a6hyd3szjjpjkbr0ncfria0x2qijv3lwr4drhxm15xamfy23azw"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; sha256 = "19309m0b9cjy1642m99ipjvr6gxq6qb008bam3l10m1mz8m81j31"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; sha256 = "1bly8375zng21yjbfdi08c14lgapngv06p1dlzbryimxicqzxixx"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; sha256 = "0zlbqmvdb1vxnvmxh6lk65mz57c7mz6dqb1s8in0cfww8kxg058k"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; sha256 = "07674xnhc84h36pvzswx6ibjy0bgfi2bxhqm1zyq9fidmim0ch07"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; sha256 = "07j69cw8r39533w4p39mnj00kahazz38760in3jfc45kmlcdb26x"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; sha256 = "1bl471s7fx9jycr0cc8rylwf34mrvlg9qn1an6l86nisavfcyb7v"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest"; version = "3.2.2"; sha256 = "19pkywdlmgccv2ri52gbpb3pgci1ymb2ba5qhyp9j19vks6gf6cj"; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.2.2"; sha256 = "1ap7imbqxmz2namgli796pxj91gyn01k6xxnllldpwwbxpd0ijgd"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.2"; sha256 = "14nrxg1cd3lzaxw7zz8z91168sgnsf1xxnrpdy7wkd6ggk22hi19"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.2"; sha256 = "0igdrjr300bqz5lnibf9vl8pkaky1l27f889gza3a9xs83mpd06p"; }) + (fetchNuGet { pname = "MSTest"; version = "3.4.3"; sha256 = "070avma2zdxdpn23a9chgz9n1kglxh8nbb1g2ggzk3xxi5sdjj0n"; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; sha256 = "14a6rzh4cvaf9bw63qlxw242fbmk4agyx9qgl19swpciqcaq7pxi"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; sha256 = "0hsslndnfyb6shgkmgy10f1c9p6b47ry20zr2l1msagmkrk49s5q"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; sha256 = "0hviglzfv16dd3aczny455sy1k0rikzd5w34smfpjyxc0wqx6xvp"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.8"; sha256 = "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.8"; sha256 = "05a6bzvdf63lbnn6sj3yfggxcgv96j91kdbcw0ac5hxl58df58r6"; }) + (fetchNuGet { pname = "NLog"; version = "5.3.2"; sha256 = "01qnzmwvc93yywhvy5g29fb8jnalfi82az7296nblyqjalhbzz3g"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; sha256 = "0j276q0a14qk9nc3f03265jl5wp38bnm7dyyx0s4kxkyb3kx3z8c"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; sha256 = "17xvaj54liyk9zq0f80z1ai6wq4rgj6xy93znvsdcnldmin1icz9"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.0-rc.1"; sha256 = "0scpylqwqmp7lpmixci88v6zf7jzf3zrcbrhl30bd4p7r4alw2lp"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0"; sha256 = "099yivazj5078076xydssf38r71c5nk3n7hy0lr51p80gln1vdha"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0-rc.1"; sha256 = "0rnl9pkwbz2srkss3ay05jjrfkyzibxa6vx0hg7rzfpyjinhaycs"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0"; sha256 = "1j7bxhpwpcrjr4am7s4mavjjpasikv4kp8glmxiw5x9zvc0x0ix7"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0-rc.1"; sha256 = "18r7m4zjimkkwjqw8hd9xa85lnj1fy45xyd338fbpp9nm73j9r2g"; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.8.0-rc.1"; sha256 = "0fiz7qpzn64by4dlc5r9ha2qrp1j9w9lm6c7bzpvshzwz8ifamv7"; }) - (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.0-rc.1"; sha256 = "0p5sybp1b8fkccibhlmjlvdnhryscqh9f435c34bwp6vvllxf17z"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.7.1"; sha256 = "19r12csxwdrvl5yx88mv68rzj2cy43004pwldy6q89v42sr01kyi"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.7.1"; sha256 = "0mvrcz2mg3caf4lcwi1ai7i7ldb27p4y2qx9vckfjal203bps352"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.7.0"; sha256 = "0klyd24akymj2hpjlnzmz7x9kggj4amhaqx1zh9nxjvlmmy64gxy"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; sha256 = "0y16qp3xrypk48f27pfvccic47p9wpl4qx8mar4rf2b78ca21c9p"; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; sha256 = "1slyjdzbiv179sq91bq6bhbqw20jmk6j9x1g5fhvnqsymfqmnmq2"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; sha256 = "1i09vjjrimg0bwraamsjdqx886apscwj72skds3ysvc9c7n0hpl2"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0"; sha256 = "0s402mz4gz1chlg29159awawpi6ms4ln5gdds01y38wx6cia6lb9"; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; sha256 = "0c2dvnnnizn5g50js336lkgfxh6klcdb0h8pppf68v3liwlhxly5"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; sha256 = "1ayy2q9cg6482ahvz3cx7a3cikjrnmr5kr7yk9qnbbwy0wfmb6gw"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0"; sha256 = "1vhl02w068ynhpak0pyjn2xmrnisl9m73lmsckwkncrhinplw7hz"; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; sha256 = "0lys1l0qsna2h82j2rbxi5fc8barrq43fs0lradr85r7sy3x91cg"; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; sha256 = "1777nbj78yppmqmwvv0bsl4l0vp8lfc5fpsdmknf6wl354f0z1f8"; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; sha256 = "01vi9sqb2j25i6926c581w067nadf4q4hs0hkwjg8wpzhxz0n3xq"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.8.1"; sha256 = "0s5kxqjhmwm2p2sblmmsavvmknqb8yr0b07ngq8hk0w8b48kyc0h"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.8.1"; sha256 = "0p3mw08vi9ljf06239n8b1hfj0cqqb198qn89sf39mdjsy13ca95"; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.8.1"; sha256 = "0j2i01378848nvib1krk948lp74x8ykgspka05g37a3s284p1nyd"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; sha256 = "08bjdn8dbqpzn5c9fw89y5766irwplgyzhyxcrjzpywkwpj75r4i"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; sha256 = "01mgw4s0b2vxf55v6fa3n5l9jwk6bkl60aaqv7azl198wwslkjhq"; }) (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; sha256 = "01lrbkbpfqdkhba9hsfg9fqyh1sa9r2cp54r2wlb83zfr3f5q8l8"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.5.0"; sha256 = "0k61chpz5j59s1yax28vx0mppx20ff8vg8grwja112hfrzj1f45n"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.5.0"; sha256 = "00n8s45xwbayj3p6x3awvs87vqvmzypny21nqc61m7a38d1asijv"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; sha256 = "0lq774iggpvsmykbrplvv2a5z2ylsslv5wynmvpnlznd4lvgxb4h"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; sha256 = "1snz71ws87kr8pz4c3zcla51mqbly015ib6b0y20xvkj25qx7gl8"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; sha256 = "0j93y0krn5fzvji0k7g4cxi22b7j8n3brxw4698pjq2pqqf2d8qy"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; sha256 = "00lar7246mncidflm15xz5b9hpni9bf8wj37dc0l2sj3hhv9nvwj"; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; sha256 = "0w0h2cs8n5avczzm5plzmkvkc6xn0pj425f4400fk21h8ysvhg8h"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; }) @@ -141,5 +151,4 @@ (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) - (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 26c3cc5d2d7a5..004aadbe781ea 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "f70253c96e76fff5c5537c7be57a57de4e273eb8"; + version = "78188871dfce90fb04096e9fd0b6ce2411312dae"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-hw6M8O486vnWqdO4DqljOoGEevykpxhez3QL745VfIk="; + hash = "sha256-NBxN3pQFiDsRYp2Ro0WwWdGzKVjPTKx4/xWQrMNuv0M="; }; - npmDepsHash = "sha256-GpGVM9c5yaLHi77qpShm30/uObg1TdLFCIhmFvLEhaU="; + npmDepsHash = "sha256-9pLbSOMfKwkWtzmKNmeKNrgdtzh3riWWJlrbuoDRUrw="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix deleted file mode 100644 index bca7697f758ae..0000000000000 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ buildPackages -, fetchzip -, javaOpts ? "-XX:+UseZGC" -, jdk -, jre_headless -, lib -, makeWrapper -, stdenvNoCC -, -}: -stdenvNoCC.mkDerivation rec { - pname = "HentaiAtHome"; - version = "1.6.3"; - - src = fetchzip { - url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; - hash = "sha512-kBB5mn9MwpkZ0z+Fl5ABs4YWBkXkMRcADYSAPkeifyhbYQQPOnijXKYZCkzE4UB3uQ1j6Kj6WnpO/4jquYEiOQ=="; - stripRoot = false; - }; - - nativeBuildInputs = [ jdk makeWrapper ]; - - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc") - "${buildPackages.glibcLocales}/lib/locale/locale-archive"; - - buildPhase = '' - make all - ''; - - installPhase = '' - mkdir -p $out/share/java - cp build/HentaiAtHome.jar $out/share/java - - mkdir -p $out/bin - makeWrapper ${jre_headless}/bin/java $out/bin/HentaiAtHome \ - --add-flags "${javaOpts} -jar $out/share/java/HentaiAtHome.jar" - ''; - - doInstallCheck = true; - installCheckPhase = '' - pushd $(mktemp -d) - $out/bin/HentaiAtHome - popd - ''; - - strictDeps = true; - - meta = with lib; { - homepage = "https://ehwiki.org/wiki/Hentai@Home"; - description = - "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; - license = licenses.gpl3; - maintainers = with maintainers; [ terrorjack ]; - mainProgram = "HentaiAtHome"; - }; -} diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index d00e45bdeb1e2..4da7bd97ec2f4 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -118,7 +118,7 @@ mkDerivation rec { homepage = "https://www.google.com/earth/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ friedelino shamilton ]; + maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; knownVulnerabilities = [ "Includes vulnerable versions of bundled libraries: openssl, ffmpeg, gdal, and proj." ]; }; diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix index fe7bcf3dcb71a..eaf0fc44d29dd 100644 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ b/pkgs/applications/misc/gpu-burn/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation { homepage = "http://wili.cc/blog/gpu-burn.html"; description = "Multi-GPU CUDA stress test"; platforms = platforms.linux; - maintainers = with maintainers; [ elohmeier ]; license = licenses.bsd2; mainProgram = "gpu_burn"; }; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 8ff55fda8e2b5..0501d9f707e69 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.21"; + version = "13.22"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-rg4czTni8toAwzppgNdi/lfUDudKkEqZUZziiIiyJm0="; + hash = "sha256-5YoFO1NHduV8qKZ8GPaFnKfRQRlhlG5swZo74SfOpZY="; }; buildInputs = [ diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 4fbcad6b8d3d5..23b12f032bd9f 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - name = "holochain-launcher"; + pname = "holochain-launcher"; version = "0.11.5"; prerelease = "beta-2"; diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock index 33ea0c352d293..554a818901516 100644 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ b/pkgs/applications/misc/mission-center/Cargo.lock @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.5.1" +version = "0.5.2" dependencies = [ "dbus", "errno-sys", diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index e13774cf3c881..9188df9e5b3b4 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -1,38 +1,39 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchFromGitHub -, cargo -, libxml2 -, meson -, ninja -, pkg-config -, python311 -, rustPlatform -, symlinkJoin -, rustc -, wrapGAppsHook4 -, appstream-glib -, blueprint-compiler -, cairo -, cmake -, dbus -, desktop-file-utils -, gdk-pixbuf -, gettext -, glib -, graphene -, gtk4 -, libGL -, libadwaita -, libdrm -, mesa -, pango -, sqlite -, udev -, wayland -, dmidecode -, vulkan-loader +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + cargo, + libxml2, + meson, + ninja, + pkg-config, + python311, + rustPlatform, + symlinkJoin, + rustc, + wrapGAppsHook4, + appstream-glib, + blueprint-compiler, + cairo, + cmake, + dbus, + desktop-file-utils, + gdk-pixbuf, + gettext, + glib, + graphene, + gtk4, + libGL, + libadwaita, + libdrm, + mesa, + pango, + sqlite, + udev, + wayland, + dmidecode, + vulkan-loader, }: let @@ -45,28 +46,23 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-I/UkHXDGbKiOcn7R0nQVKcgdvyV4ycgQGNoHA6QMAnw="; + hash = "sha256-84D+CttolY5hleCJbDiN3mlk0+nlwwJUJhGoKGVT/lw="; }; cargoDeps = symlinkJoin { name = "cargo-vendor-dir"; paths = [ - (rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }) - (rustPlatform.importCargoLock { - lockFile = ./gatherer-Cargo.lock; - }) + (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }) + (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; }) ]; }; - nativeBuildInputs = [ blueprint-compiler cargo @@ -139,6 +135,7 @@ stdenv.mkDerivation rec { meta = { description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; homepage = "https://gitlab.com/mission-center-devs/mission-center"; + changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index 927b9f29c8169..d6ad543585a4f 100644 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -383,7 +383,7 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.5.1" +version = "0.5.2" dependencies = [ "anyhow", "arrayvec", diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 40530d16391ff..a73767492f3fe 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4919"; + version = "4921"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-WMFZEGTXVAaBlEKUqclmkw3pKnWSdbvulDvSi7TQn8k="; + sha256 = "sha256-s7EKHXh3UNMDzBmWUTZaLR1P21e27cWJNYRlFcpJu50="; }; patches = [ diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix deleted file mode 100644 index c7091b00c7dc5..0000000000000 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, fetchFromGitHub -, python3Packages, wrapGAppsHook3, gobject-introspection -, gtk-layer-shell, pango, gdk-pixbuf, atk -# Extra packages called by various internal nwg-panel modules -, hyprland # hyprctl -, sway # swaylock, swaymsg -, systemd # systemctl -, wlr-randr # wlr-randr -, nwg-menu # nwg-menu -, brightnessctl # brightnessctl -, pamixer # pamixer -, pulseaudio # pactl -, libdbusmenu-gtk3 # tray -, playerctl -}: - -python3Packages.buildPythonApplication rec { - pname = "nwg-panel"; - version = "0.9.32"; - - src = fetchFromGitHub { - owner = "nwg-piotr"; - repo = "nwg-panel"; - rev = "refs/tags/v${version}"; - hash = "sha256-7UROYXmDDWW/NFmKy3h1PfkQGB74DogcgTQXGXojY4U="; - }; - - # No tests - doCheck = false; - - # Because of wrapGAppsHook3 - strictDeps = false; - dontWrapGApps = true; - - buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ]; - nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; - propagatedBuildInputs = (with python3Packages; - [ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ]) - # Run-time GTK dependency required by the Tray module - ++ [ libdbusmenu-gtk3 ]; - - postInstall = '' - mkdir -p $out/share/{applications,pixmaps} - cp $src/nwg-panel-config.desktop nwg-processes.desktop $out/share/applications/ - cp $src/nwg-shell.svg $src/nwg-panel.svg nwg-processes.svg $out/share/pixmaps/ - ''; - - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - --prefix XDG_DATA_DIRS : "$out/share" - --prefix PATH : "${lib.makeBinPath [ brightnessctl hyprland nwg-menu pamixer pulseaudio sway systemd wlr-randr ]}" - ) - ''; - - meta = with lib; { - homepage = "https://github.com/nwg-piotr/nwg-panel"; - description = "GTK3-based panel for Sway window manager"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ ludovicopiero ]; - mainProgram = "nwg-panel"; - }; -} diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index ccd283b6d5f06..24ff669e4f22a 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -17,7 +17,7 @@ }: python3Packages.buildPythonApplication rec { - name = "polychromatic"; + pname = "polychromatic"; version = "0.9.1"; format = "other"; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 5882057988a4e..14b2f19ccd4bb 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.6.5"; + version = "3.30.0.0"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-2x3np1cmjJ/IN/vSqKX6mTQbtFROxPzhXPjeJ6mxe9k="; + hash = "sha256-KpY/GjagRx0XkH18dDJcf6JfkT/0V8ZHJ5DHtAEUaF4="; }; patches = [ diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 87925d732e89a..44ba291f31e98 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -18,11 +18,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.6"; + version = "2.1.8"; src = fetchPypi { inherit pname version; - hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM="; + hash = "sha256-65U/j6P6X4JzhL0aEOnzKa/Al6SYprOOxix2dtcusJQ="; }; postPatch = '' diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix deleted file mode 100644 index a83742cf937cc..0000000000000 --- a/pkgs/applications/networking/Sylk/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ appimageTools, fetchurl, lib }: - -let - pname = "Sylk"; - version = "3.0.1"; -in - -appimageTools.wrapType2 rec { - inherit pname version; - - src = fetchurl { - url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-VgepO7LHFmNKq/H0RFcIkafgtiVGt8K/LdiCO5Dw2s4="; - }; - - profile = '' - export LC_ALL=C.UTF-8 - ''; - - meta = with lib; { - description = "Sylk WebRTC client"; - homepage = "https://sylkserver.com/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ zimbatm ]; - platforms = [ "i386-linux" "x86_64-linux" ]; - mainProgram = "Sylk"; - }; -} diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 004bd8920eb04..746cc6d6068bb 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-05-13"; }; ungoogled-patches = { - hash = "sha256-2Yt91vWR5SYLBTO+PIEgFswkvwxJsNpKidOwxUBgLeg="; - rev = "126.0.6478.55-1"; + hash = "sha256-vQrUQMmNSw+b9nPzP1RmkncQHasmZvnxNHjfiPoMUXo="; + rev = "126.0.6478.61-1"; }; }; - hash = "sha256-nXRzISkU37TIgV8rjO0qgnhq8uM37M6IpMoGHdsOGIM="; - version = "126.0.6478.55"; + hash = "sha256-cB2jrasrtaFWM8tpG9leuC+jUAvoU8g5977cn4r7rbw="; + version = "126.0.6478.61"; }; } diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 9541153d8cc1a..ff36607709bc3 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.13.3"; + packageVersion = "11.14.1"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -15,14 +15,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.12.0"; + version = "115.13.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-9EDTVckSqv/nyDi4qjMd54I69WiqM8v6om7zQLT+pQc="; + hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; }; extraConfigureFlags = [ @@ -31,6 +31,13 @@ "--with-unsigned-addon-scopes=app,system" ]; + extraPostPatch = '' + # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin + # https://github.com/NixOS/nixpkgs/issues/314115 + substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ + --replace-fail /usr/bin/floorp floorp + ''; + updateScript = ./update.sh; meta = { diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 147eda18aa9c3..c52cb3f44fad7 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "126.0.2592.36"; + version = "126.0.2592.53"; revision = "1"; - hash = "sha256-u9gcTjener35uKt99T27+LK0A4SYNdWCW5FSHWEnaNA="; + hash = "sha256-d1zqZUhk5C/jrdZngQQlGplrSssE/LUR3/AybStNavE="; }; dev = import ./browser.nix { channel = "dev"; - version = "127.0.2620.3"; + version = "127.0.2638.2"; revision = "1"; - hash = "sha256-x5reGA7XZTN3FsCHf7oXstltCDSVANR8VegIuO201qs="; + hash = "sha256-Bv0X30ilcNBI9pblnrO1QA7ElTPMO5/JmIZIjhldO7Y="; }; stable = import ./browser.nix { channel = "stable"; - version = "125.0.2535.85"; + version = "125.0.2535.92"; revision = "1"; - hash = "sha256-4GD/1jAw+nIwI5AOwrkuPNF5zAnnzje9oEQnaHOapPg="; + hash = "sha256-DuVz6+BzGTWZJ4smizIK2dV1OTmv0uTIQpD+yclHDN8="; }; } diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index ade1527b6e426..60d3be84451d1 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-WJ5vIfQQguwjInS5p+bUYorM90MUAbH8endV/nkgQ00="; + sha256 = "sha256-b1oaLVwom06XUCjMF3/O/SdLt2s0MFuF+et6+MO2jBQ="; }; - vendorHash = "sha256-vBSS1KMfloK5pvVc8nHE5B8PsVZTS/iA9GyrLaeR6ps="; + vendorHash = "sha256-38BLPNc6en70+UxlldmrwtRTMRLh/fCPL6FtuA2ODGM="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index e66bfb0a9a10b..61bd14cdc45b7 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.7"; + version = "3.5.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-OJkC+uqOuXA6NBpVxmQAFs+N99d4Zonh9dcZnuB26Ts="; + hash = "sha256-BYUP/Gu+N8KK9mfjRAXupXqrwfZMZlYPxxuZCmUDFfE="; }; - vendorHash = "sha256-O7Lv5RLcqB4JbdXHKXFWkg/dvids8QH619urpeACuN8="; + vendorHash = "sha256-pVOTeH6fq4Gqarjvi7w2wYJ3FSqV6yNZERmOmbVGxLM="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index d5079b36886f9..9ea1600bc06ae 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cni"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - hash = "sha256-32rmfBjPtc9w+B8PIb8sFOIlzZ7PnS6XSZRNLreMVl4="; + hash = "sha256-aS7THDTpfNQPw+70ZgFzvurpq/vMKE6xSxJ19ERbtOA="; }; - vendorHash = "sha256-JWaQacekMQGT710U5UgiIpmEYgyUCh1uks5eSV5nhWc="; + vendorHash = "sha256-5VsJ3Osm9w09t3x0dItC2iWwbPMf/IIBOSqUfcbQKK4="; subPackages = [ "./cnitool" diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index b0cd31e9de019..830ef080492b2 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-gJp1w2H+hPSSu1Y4BY9Sa8lLnhpiZJu2Dz9OenYlQFo="; + hash = "sha256-Veuv7DwwnSUnz2p5gemqQB9pr05nLLQ6gG4JvqFbZ/U="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix deleted file mode 100644 index 14e75829e401c..0000000000000 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "kontemplate"; - version = "1.8.0"; - goPackagePath = "github.com/tazjin/kontemplate"; - goDeps = ./deps.nix; - - src = fetchFromGitHub { - owner = "tazjin"; - repo = "kontemplate"; - rev = "v${version}"; - sha256 = "123mjmmm4hynraq1fpn3j5i0a1i87l265kkjraxxxbl0zacv74i1"; - }; - - meta = with lib; { - description = "Extremely simple Kubernetes resource templates"; - mainProgram = "kontemplate"; - homepage = "http://kontemplate.works"; - downloadPage = "https://github.com/tazjin/kontemplate/releases"; - license = licenses.gpl3; - maintainers = with maintainers; [ mbode tazjin ]; - platforms = platforms.unix; - - longDescription = '' - Kontemplate is a simple CLI tool that can take sets of - Kubernetes resource files with placeholders and insert values - per environment. - - It can be used as a simple way of deploying the same set of - resources to different Kubernetes contexts with context-specific - configuration. - ''; - }; -} diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix deleted file mode 100644 index 7693968bd550b..0000000000000 --- a/pkgs/applications/networking/cluster/kontemplate/deps.nix +++ /dev/null @@ -1,111 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/Masterminds/goutils"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/goutils"; - rev = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"; - sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; - }; - } - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "5bc3b9184d48f1412b300b87a200cf020d9254cf"; - sha256 = "1vdfm653v50jf63cw0kg2hslx50cn4mk6lj3p51bi11jrg48kfng"; - }; - } - { - goPackagePath = "github.com/Masterminds/sprig"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "6f509977777c33eae63b2136d97f7b976cb971cc"; - sha256 = "05h9k6fhjxnpwlihj3z02q9kvqvnq53jix0ab84sx0666bci3cdh"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "c3de453c63f4bdb4dadffab9805ec00426c505f7"; - sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"; - sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "c2e93f3ae59f2904160ceaab466009f965df46d6"; - sha256 = "0zw8fvl6jqg0fmv6kmvhss0g4gkrbvgyvl2zgy5wdbdlgp4fja0h"; - }; - } - { - goPackagePath = "github.com/huandu/xstrings"; - fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "8bbcf2f9ccb55755e748b7644164cd4bdce94c1d"; - sha256 = "1ivvc95514z63k7cpz71l0dwlanffmsh1pijhaqmp41kfiby8rsx"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "4c317f2286be3bd0c4f1a0e622edc6398ec4656d"; - sha256 = "0bihha1qsgfjk14yv1hwddv3d8dzxpbjlaxwwyys6lhgxz1cr9h9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "9756ffdc24725223350eb3266ffb92590d28f278"; - sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 1d4c38bdff30c..b888cecc927c2 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.3.62"; + version = "52.3.68"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-mYFjs/6aO7tzopOZij9rNoOu2a/UUQqpDg16gCoeR8w="; + hash = "sha256-GDK+GR3MUYUgfY3cgaxWIYSE3uiEscp9DeeY36/zOYo="; }; vendorHash = "sha256-0WRmAqslZj63m+kCFKIBgoRX47ZyRuU7ZihmF6wmZy4="; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 86c1d41d05dca..f9becbdf5bad2 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-vJ9HXpvkuZWOZtsoJhcpM0KGGiyd+D5HTQBHwb8l/II="; + hash = "sha256-TVtE1mdOai2G2+KCp9r5G+E9QhGQ5TmUFCN9x5EKM7o="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 9fc07b6c19ff0..57d16d577dfc6 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.5.5"; - sha256 = "0lgpqx672ics998830y8qklchdmbj272xfbs5r414hqlznbbi8w1"; - vendorHash = "sha256-PV0HbsIcO6FjdczCWJgR6X5THUREDht2R4NJ7HxkBNw="; + version = "24.6.2"; + sha256 = "0qghp8v4lz51yv5j5k8dps4qv58hjdjdc3jzrrq3g239x8b2h6ys"; + vendorHash = "sha256-7Q6V9DKROkSTxU7n511aOpaMDRfhP88p6PJ89Sr6kOQ="; } diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 4e28f0750e49d..1c2402f6495b3 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.36"; + version = "3.11.37"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-6WZALdKORsa0wahPKgkpzjlktJQxnbiiJLXGv3E9MXM="; + hash = "sha256-bZd/iLEGF5+Zt4kKAvUmjHiPKA1v1FWf5/BEcsLy9MU="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix deleted file mode 100644 index de70f49fe6040..0000000000000 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost }: - -stdenv.mkDerivation rec { - pname = "SkypeExport"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "Temptin"; - repo = "SkypeExport"; - rev = "v${version}"; - sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; - }; - - patches = [ - (fetchpatch { - name = "boost167.patch"; - url = "https://github.com/Temptin/SkypeExport/commit/ef60f2e4fc9e4a5764c8d083a73b585457bc10b1.patch"; - sha256 = "sha256-t+/v7c66OULmQCD/sNt+iDJeQ/6UG0CJ8uQY2PVSFQo="; - }) - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; - - preConfigure = "cd src/SkypeExport/_gccbuild/linux"; - installPhase = "install -Dt $out/bin SkypeExport"; - - meta = with lib; { - description = "Export Skype history to HTML"; - mainProgram = "SkypeExport"; - homepage = "https://github.com/Temptin/SkypeExport"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ yana ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 67d875ca7a94b..d43320558b2a8 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -176,10 +176,10 @@ stdenv.mkDerivation { # Wrap feishu and vulcan # Feishu is the main executable, vulcan is the builtin browser for executable in $out/opt/bytedance/feishu/{feishu,vulcan/vulcan}; do + # FIXME: Add back NIXOS_OZONE_WL support once upstream fixes the crash on native Wayland (see #318035) wrapProgram $executable \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ ${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"} done diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 20dc2bfafb800..8a1052d04df4f 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, electron_28 +, electron , makeWrapper }: @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - makeWrapper '${lib.getExe electron_28}' $out/bin/${pname} \ + makeWrapper '${lib.getExe electron}' $out/bin/${pname} \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/${pname}/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 5f84fa7dd9aa8..f982124cb8436 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.12.0-beta.2"; + version = "7.13.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-Hpg9pkRXbwF5uKhLzn1cfHTzlYmsZd5tndtwVFcL7iU="; + hash = "sha256-DvYRvIA+rg4RKXbqWjWj7oFnfLboEiMeP7HgGYkRBDM="; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 8bc0f6f93b442..1889c1825d8c3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2023-12-21"; + version = "0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60"; - sha256 = "sha256-/1cghoxmm+6uFEUgCjh1Xhb0CTnd1XAq1M21FruDRek="; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 8536cd145f145..78aa173867692 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "229.240517.0"; + version = "230.240603.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-NVr9OOq5YdqvCkrtjTRIfWWquxJ/sN8MhSlw3RvZVFs="; + hash = "sha256-pgRqlaUbEDEAd4frooSloeiNEX02VESPhqIzRIuQshI="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index 350e2fc245297..065749554ea10 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -17,7 +17,6 @@ , nodejs , yarn , yarn2nix-moretea -, v8 , cacert , redis }: @@ -83,7 +82,7 @@ let }; mini_racer = attrs: { buildFlags = [ - "--with-v8-dir=\"${v8}\"" + "--with-v8-dir=\"${nodejs.libv8}\"" ]; dontBuild = false; postPatch = '' diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 9d6b95754c612..39c160c771d8b 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -46,10 +46,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # fix build with openssl 3.0 - (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-p2p/transmission/files/transmission-3.00-openssl-3.patch"; - hash = "sha256-peVrkGck8AfbC9uYNfv1CIu1alIewpca7A6kRXjVlVs="; - }) + ./transmission-3.00-openssl-3.patch ]; outputs = [ "out" "apparmor" ]; diff --git a/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch b/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch new file mode 100644 index 0000000000000..f288298cbf3d4 --- /dev/null +++ b/pkgs/applications/networking/p2p/transmission/transmission-3.00-openssl-3.patch @@ -0,0 +1,37 @@ +From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 15 May 2022 10:54:38 -0400 +Subject: [PATCH] openssl: load "legacy" provider for RC4 + +--- + libtransmission/crypto-utils-openssl.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c +index 45fd71913..14d680654 100644 +--- a/libtransmission/crypto-utils-openssl.c ++++ b/libtransmission/crypto-utils-openssl.c +@@ -20,6 +20,9 @@ + #include <openssl/rand.h> + #include <openssl/ssl.h> + #include <openssl/x509.h> ++#if OPENSSL_VERSION_MAJOR >= 3 ++#include <openssl/provider.h> ++#endif + + #include "transmission.h" + #include "crypto-utils.h" +@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle) + + tr_rc4_ctx_t tr_rc4_new(void) + { ++#if OPENSSL_VERSION_MAJOR >= 3 ++ OSSL_PROVIDER_load(NULL, "default"); ++ OSSL_PROVIDER_load(NULL, "legacy"); ++#endif + EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new(); + + if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1))) +-- +2.35.1 + diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index d5db07a819aca..08cdc3498811d 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,13 +38,13 @@ let pname = "pcloud"; - version = "1.14.5"; - code = "XZ0AMJ0ZdrENNeVMNI4Tz3lO1nxr577ryOMV"; + version = "1.14.6"; + code = "XZQDbs0Z4ET1VL0SIUuzr5ewR9LYuf6ssLRk"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-a577iWPrke3EizG03m0+hjSoPzA4wDai/QMX2Zl7MF0="; + hash = "sha256-3HUVIDxeq7svzeWyZrxlE4TjZ8lOwT8bYgyRFRzGnmU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 00c1ff878b960..1b0826c4d2bdf 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -44,6 +44,17 @@ let x86hash = ""; x64suffix = "65"; x86suffix = ""; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest12.html"; + }; + + "24.05.0" = { + major = "24"; + minor = "5"; + patch = "0"; + x64hash = "sha256-pye2JOilSbp8PFCpVXFkrRW98E8klCqoisVSWjR38nE="; + x86hash = ""; + x64suffix = "76"; + x86suffix = ""; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/networking/sync/lcsync/default.nix b/pkgs/applications/networking/sync/lcsync/default.nix index ac4731d8536a5..9ba34ab6319c0 100644 --- a/pkgs/applications/networking/sync/lcsync/default.nix +++ b/pkgs/applications/networking/sync/lcsync/default.nix @@ -7,7 +7,7 @@ stdenv }: stdenv.mkDerivation (finalAttrs: { - name = "lcsync"; + pname = "lcsync"; version = "0.3.0"; src = fetchFromGitea { diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 28ffe6d11bbe5..d679b168e24ff 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -47,7 +47,7 @@ , libGLU , libGL , bsh -, CoinMP +, coinmp , libwps , libabw , libargon2 @@ -288,7 +288,7 @@ in stdenv.mkDerivation (finalAttrs: { # See: https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg334080.html (libpng.override { apngSupport = false; }) perlPackages.ArchiveZip - CoinMP + coinmp perlPackages.IOCompress abseil-cpp ant diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index d14fd28d9db14..7bae5b5388d7a 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-l4wHCapIvD3kZk1DqLNWDLjwg6j7g0+qMB/KuMzH+pQ="; + hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 622f088d596bf..72cf6cbb57523 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://www.portfolio-performance.info/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; - maintainers = with maintainers; [ elohmeier kilianar oyren shawn8901 ]; + maintainers = with maintainers; [ kilianar oyren shawn8901 ]; mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index eb28bf2dfd920..8ada870912eb9 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -8,6 +8,7 @@ , libcanberra-gtk3 , poppler_gi , withGstreamer ? stdenv.isLinux +, gst_all_1 , withVLC ? stdenv.isLinux }: @@ -29,7 +30,16 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 poppler_gi - ] ++ lib.optional withGstreamer libcanberra-gtk3; + ] ++ lib.optionals withGstreamer [ + libcanberra-gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + (gst_all_1.gst-plugins-good.override {gtkSupport = true;}) + gst_all_1.gst-libav + gst_all_1.gst-vaapi + ]; propagatedBuildInputs = with python3Packages; [ pycairo diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 5f2a117198965..941f34231ca94 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-4J3Xjm22HQG5MhEI/t7bzNbsCrNS3Vuv24sEHw73npk="; + hash = "sha256-fv+bH0fjcuVrs2nx2+GP5JEBeJtea8/beJDgNGtkE4M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index 746a46e2d4a13..2510d42b9a82a 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "2.0.10"; + version = "2.0.20"; src = fetchurl { url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-wign7U1p4HX6/RwnMm2iVSNaYRhn8Ia6QQd5X6m3B0E="; + hash = "sha256-5w50QMSMmkpuhSOqv3LjrcQQDwaD7pIdKUo+8YUgvpk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 400e073f69057..56cfa5168a486 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "kent"; - version = "465"; + version = "466"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = pname; rev = "v${version}_base"; - hash = "sha256-QeHqXSbad5LCmQ8DfLxl2pyXJvKV4G7uLXBtRd7LME0="; + hash = "sha256-zoDZ+8G0SHKfWmkXBqp+WSjQXtmkcTIZjrjPhUIJw1c="; }; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix deleted file mode 100644 index 27a1b7ed38416..0000000000000 --- a/pkgs/applications/science/biology/poretools/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, python2Packages, fetchFromGitHub }: - -python2Packages.buildPythonPackage rec { - pname = "poretools"; - version = "unstable-2016-07-10"; - - src = fetchFromGitHub { - repo = pname; - owner = "arq5x"; - rev = "e426b1f09e86ac259a00c261c79df91510777407"; - sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am"; - }; - - propagatedBuildInputs = [ python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas ]; - - meta = { - description = "Toolkit for working with nanopore sequencing data from Oxford Nanopore"; - license = lib.licenses.mit; - homepage = "https://poretools.readthedocs.io/en/latest/"; - maintainers = [ lib.maintainers.rybern ]; - broken = true; # Build error: h5py-3.9.0 not supported for interpreter python2.7 - }; -} diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix deleted file mode 100644 index 0b0491a71aaef..0000000000000 --- a/pkgs/applications/science/biology/spades/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, cmake, python3 }: - -stdenv.mkDerivation rec { - pname = "SPAdes"; - version = "3.15.5"; - - src = fetchurl { - url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FVw2QNVx8uexmgUDHR/Q0ZvYLfeF04hw+5O9JBsSu/o="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ zlib bzip2 python3 ]; - - doCheck = true; - - sourceRoot = "${pname}-${version}/src"; - - env.CXXFLAGS = toString [ - # GCC 13: error: 'uint32_t' does not name a type - "-include cstdint" - ]; - - meta = with lib; { - description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines"; - license = licenses.gpl2Only; - homepage = "http://cab.spbu.ru/software/spades/"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.bzizou ]; - }; -} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 68b424b32fb4a..af672d500fa6a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -58,6 +58,7 @@ let "8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4="; "8.19.0".sha256 = "sha256-ixsYCvCXpBHqJ71hLQklphlwoOO3i/6w2PJjllKqf9k="; "8.19.1".sha256 = "sha256-kmZ8Uk8jpzjOd67aAPp3C+vU2oNaBw9pr7+Uixcgg94="; + "8.19.2".sha256 = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index ade5239762518..7f0e70c642134 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.13.0"; + version = "8.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Xd8mZ8tsemJ53hAMED2biRyDlEw/gG/Hh1iZSwSB1vY="; + hash = "sha256-6oguN4u4OUDXpDsbueSBNwtWgLCaKmgq3w/d/MsMh7Y="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index edc517b54d59e..62489b6ee2498 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.11.3"; + version = "0.12.1"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-tJJxCtCNuPtoQYABEViS1G6aHrMTLn+r3hlTTkaJvCg="; + hash = "sha256-iDnTjrVDH8qBYkvNjLHYmTaK8vScluDM4+W/5Rdo+Xc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/applications/version-management/gitmux/default.nix index cd5a214464ed0..8bb5277dc4ec7 100644 --- a/pkgs/applications/version-management/gitmux/default.nix +++ b/pkgs/applications/version-management/gitmux/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, buildGoModule, lib, testers, gitmux }: +{ fetchFromGitHub, buildGoModule, lib, testers, gitmux, git }: buildGoModule rec { pname = "gitmux"; @@ -13,9 +13,8 @@ buildGoModule rec { vendorHash = "sha256-PHY020MIuLlC1LqNGyBJRNd7J+SzoHbNMPAil7CKP/M="; - # GitHub source does contain a regression test for the module - # but it requires networking as it git clones a repo from github - doCheck = false; + nativeCheckInputs = [ git ]; + doCheck = true; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index d3909c3799bcb..fef1a9ae80f08 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,24 +21,21 @@ , qtwebchannel , qtwebengine , qtx11extras -, jellyfin-web , withDbus ? stdenv.isLinux }: mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-l1jNrEUrDCc4R1CZ0b0Omjka6wTryjWqnEJbfCSJ0ZE="; + sha256 = "sha256-Jsn4kWQzUaQI9MpbsLJr6JSJk9ZSnMEcrebQ2DYegSU="; }; patches = [ - # fix the location of the jellyfin-web path - ./fix-web-path.patch # disable update notifications since the end user can't simply download the release artifacts to update ./disable-update-notifications.patch ]; @@ -77,11 +74,6 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - preConfigure = '' - # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch) - ln -s ${jellyfin-web}/share/jellyfin-web . - ''; - postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch deleted file mode 100644 index 250a5c0695450..0000000000000 --- a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5abca9b..d09176b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -107,10 +107,8 @@ endif() - set(RESOURCE_ROOT .) - if(APPLE) - set(RESOURCE_ROOT Resources) -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DEST ${RESOURCE_ROOT}/web-client/desktop) -- endif() -- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension) -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop) -+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension) - endif() - - if(NOT APPLE) -@@ -123,9 +121,7 @@ if(NOT APPLE) - install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources) - endif() - endforeach() -- if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/../dist/) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../dist/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) -- endif() -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension) - endif() - diff --git a/pkgs/applications/video/kodi/addons/formula1/default.nix b/pkgs/applications/video/kodi/addons/formula1/default.nix new file mode 100644 index 0000000000000..0d374dc65be1b --- /dev/null +++ b/pkgs/applications/video/kodi/addons/formula1/default.nix @@ -0,0 +1,29 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests }: + +buildKodiAddon rec { + pname = "formula1"; + namespace = "plugin.video.formula1"; + version = "2.0.2"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-aClAgkJKvixeKzrwgEsfDhPXiFv9+ULLmb8c9QTaUgM="; + }; + + propagatedBuildInputs = [ + requests + ]; + + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.formula1"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/jaylinski/kodi-addon-formula1"; + description = "Videos from the Formula 1 website"; + license = licenses.mit; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/infotagger/default.nix b/pkgs/applications/video/kodi/addons/infotagger/default.nix index da4528ed0afc5..7ac5e48071073 100644 --- a/pkgs/applications/video/kodi/addons/infotagger/default.nix +++ b/pkgs/applications/video/kodi/addons/infotagger/default.nix @@ -2,13 +2,13 @@ buildKodiAddon rec { pname = "infotagger"; namespace = "script.module.infotagger"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "jurialmunkey"; repo = namespace; rev = "v${version}"; - hash = "sha256-Us7ud0QORGn+ALB4uyISekp0kUYY8nN8uFNg8MlxEB0="; + hash = "sha256-Ns1OjrYLKz4znXRxqUErDLcmC0HBjBFVYI9GFqDVurY="; }; passthru = { diff --git a/pkgs/applications/video/kodi/addons/plugin-cache/default.nix b/pkgs/applications/video/kodi/addons/plugin-cache/default.nix new file mode 100644 index 0000000000000..c21f5e136e41e --- /dev/null +++ b/pkgs/applications/video/kodi/addons/plugin-cache/default.nix @@ -0,0 +1,26 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "plugin-cache"; + namespace = "script.common.plugin.cache"; + version = "3.0.0"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-5QcMNmWOEw2C26OXlvAvxqDxTpjIMBhwmaIFwVgHuIU="; + }; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.plugin-cache"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/anxdpanic/script.common.plugin.cache"; + description = "Common plugin cache"; + license = licenses.gpl3Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/raiplay/default.nix b/pkgs/applications/video/kodi/addons/raiplay/default.nix new file mode 100644 index 0000000000000..ab5bcfedccfdb --- /dev/null +++ b/pkgs/applications/video/kodi/addons/raiplay/default.nix @@ -0,0 +1,30 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, inputstreamhelper, plugin-cache }: + +buildKodiAddon rec { + pname = "raiplay"; + namespace = "plugin.video.raitv"; + version = "4.1.2"; + + propagatedBuildInputs = [ + plugin-cache + inputstreamhelper + ]; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-9aR1kkl+0+nhP0bOTnaKCgSfuPvJzX5TWHU0WJZIvSM="; + }; + + passthru = { + updateScript = addonUpdateScript { + attrPath = "kodi.packages.raiplay"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/maxbambi/plugin.video.raitv/"; + description = "Live radio and TV channels, latest 7 days of programming, broadcast archive, news"; + license = licenses.gpl3Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/simplecache/default.nix b/pkgs/applications/video/kodi/addons/simplecache/default.nix new file mode 100644 index 0000000000000..35c2cc5a1a336 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/simplecache/default.nix @@ -0,0 +1,26 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "simplecache"; + namespace = "script.module.simplecache"; + version = "2.0.2"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-xdOBIi99nspcDIKkjxcW1r/BqL8O9NxdDViTuvMtUmo="; + }; + + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.simplecache"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/kodi-community-addons/script.module.simplecache"; + description = "A simple object cache for Kodi addons"; + license = licenses.asl20; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/upnext/default.nix b/pkgs/applications/video/kodi/addons/upnext/default.nix new file mode 100644 index 0000000000000..dccfce4c3f0f6 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/upnext/default.nix @@ -0,0 +1,26 @@ +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "upnext"; + namespace = "service.upnext"; + version = "1.1.9+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-oNUk80MEzK6Qssn1KjT6psPTazISRoUif1IMo+BKJxo="; + }; + + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.upnext"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/im85288/service.upnext"; + description = "Up Next - Proposes to play the next episode automatically"; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix index 9b3a91b9d029a..12b8205eec343 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix @@ -1,7 +1,7 @@ { lib , stdenvNoCC , fetchurl -, undmg +, _7zz , pname , version , hash @@ -19,15 +19,18 @@ in stdenvNoCC.mkDerivation { inherit pname version src; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "LosslessCut.app"; installPhase = '' - mkdir -p "$out/Applications/LosslessCut.app" - cp -R . "$out/Applications/LosslessCut.app" + runHook preInstall + mkdir -p "$out/Applications" + cd .. + mv "$sourceRoot" "$out/Applications" mkdir -p "$out/bin" - ln -s "$out/Applications/LosslessCut.app/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" + ln -s "$out/Applications/$(basename "$sourceRoot")/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" + runHook postInstall ''; meta = metaCommon // (with lib; { diff --git a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix b/pkgs/applications/video/losslesscut-bin/build-from-windows.nix index ddaf873806448..e6520e4a54b99 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-windows.nix @@ -19,15 +19,20 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ p7zip ]; unpackPhase = '' - 7z x $src -oLosslessCut-win-x64 + runHook preUnpack + 7z x "$src" -o"$sourceRoot" + runHook postUnpack ''; sourceRoot = "LosslessCut-win-x64"; installPhase = '' - mkdir -p $out/bin $out/libexec - (cd .. && mv LosslessCut-win-x64 $out/libexec) - ln -s "$out/libexec/LosslessCut-win-x64/LosslessCut.exe" "$out/bin/LosslessCut.exe" + runHook preInstall + mkdir -p "$out/bin" "$out/libexec" + cd .. + mv "$sourceRoot" "$out/libexec" + ln -s "$out/libexec/$(basename "$sourceRoot")/LosslessCut.exe" "$out/bin/LosslessCut.exe" + runHook postInstall ''; meta = metaCommon // (with lib; { diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 745f481c6d5d4..c3ed6b306beb3 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -6,7 +6,7 @@ let pname = "losslesscut"; - version = "3.58.0"; + version = "3.61.1"; metaCommon = with lib; { description = "Swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; @@ -17,22 +17,22 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - hash = "sha256-wmOdW5LdGLs6Wrt/VBlbC1ScFZBmd5gVQaj/cYADnWc="; + hash = "sha256-wKhEB+MfOsBvZRTIt3hLofw37+YO+hWKowlSi1OxSAU="; inherit (buildPackages) makeWrapper; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-ZNUkzxpFTmsFcdC4oJWDxvqunpaBKz7Fnmrsa4W12Bg="; + hash = "sha256-yZYmM533D9VzM+a0bnYz/aqocaEJVFOTgLWjbQGOQR0="; isAarch64 = false; }; aarch64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-PpQF31qsn9TOIRVzOdDoLUqti+m1uRpBQrrqKtxFleE="; + hash = "sha256-/qa2P0R7xRzDgnPKqkeKN6lrDbPg9WuZ/Nnc51NTzaM="; isAarch64 = true; }; x86_64-windows = callPackage ./build-from-windows.nix { inherit pname version metaCommon; - hash = "sha256-AgWvLU9m2q7fxZYXgHGMgEj1WLP5XzERq7tWcin2/30="; + hash = "sha256-0awYmSGxm8M12X0WQftlapRF9m3GGCZivNwBtRjSa4E="; }; in ( diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix deleted file mode 100644 index 9340d174162df..0000000000000 --- a/pkgs/applications/video/media-downloader/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ aria2 -, cmake -, fetchFromGitHub -, ffmpeg -, lib -, python3 -, qtbase -, stdenv -, wrapQtAppsHook -, yt-dlp -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "media-downloader"; - version = "4.7.0"; - - src = fetchFromGitHub { - owner = "mhogomchungu"; - repo = "media-downloader"; - rev = finalAttrs.version; - hash = "sha256-ykPYxRgzKZrA0KwS1FoxZOkSL+7TbLgy0yLfs7Iqpf4="; - }; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - - buildInputs = [ - qtbase - ]; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ - aria2 - ffmpeg - python3 - yt-dlp - ]}" - ]; - - meta = { - description = "Qt/C++ GUI front end for yt-dlp and others"; - homepage = "https://github.com/mhogomchungu/media-downloader"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ zendo ]; - platforms = lib.platforms.linux; - mainProgram = "media-downloader"; - }; -}) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 79ab2a32e26f1..e464079da93c7 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-wvPtcYW++PmDvCpgTIppvwg4Zibrg384yth9da11fMk="; + sha256 = "sha256-LZL9f/pX74rKW+wnNHGKwGuuISOTcFVr6W9h/JEK0U4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 6c104cef676d2..acb652e33cb77 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.16"; + version = "1.7.18"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-OApJaH11iTvjW4gZaANSCVcxw/VHG7a/6OnYcUcHFME="; + hash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; }; vendorHash = null; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index 413de25764114..859ddf6dcecc0 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -22,27 +22,27 @@ let plugins = { hy3 = { fetchFromGitHub, cmake, hyprland }: - mkHyprlandPlugin hyprland { + mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl0.40.0"; - hash = "sha256-Y9bIML3C5xyKKv+Yel4LUfSkScwGunOVZkg+Z1dPwHI="; + rev = "hl${version}"; + hash = "sha256-gEEWWlQRvejSR2RRg78Lubz6siIgknqj6CslveyyIP4="; }; nativeBuildInputs = [ cmake ]; dontStrip = true; - meta = with lib; { + meta = { homepage = "https://github.com/outfoxxed/hy3"; description = "Hyprland plugin for an i3 / sway like manual tiling layout"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.aacebedo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aacebedo ]; }; }; }; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix deleted file mode 100644 index 958e84ac78f0e..0000000000000 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, makeWrapper -, meson -, cmake -, ninja -, binutils -, cairo -, epoll-shim -, git -, hyprcursor -, hyprland-protocols -, hyprlang -, hyprwayland-scanner -, jq -, libGL -, libdrm -, libexecinfo -, libinput -, libuuid -, libxkbcommon -, mesa -, pango -, pciutils -, pkgconf -, python3 -, systemd -, tomlplusplus -, wayland -, wayland-protocols -, wayland-scanner -, xwayland -, hwdata -, seatd -, libdisplay-info -, libliftoff -, xorg -, debug ? false -, enableXWayland ? true -, legacyRenderer ? false -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, wrapRuntimeDeps ? true - # deprecated flags -, nvidiaPatches ? false -, hidpiXWayland ? false -, enableNvidiaPatches ? false -}: -assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; -assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; -assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; - -stdenv.mkDerivation (finalAttrs: { - pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.40.0-unstable-2024-05-05"; - - src = fetchFromGitHub { - owner = "hyprwm"; - repo = finalAttrs.pname; - fetchSubmodules = true; - rev = "f15513309b24790099d42974274eb23f66f7c985"; - hash = "sha256-zKOfgXPTlRqCR+EME4qjN9rgAnC3viI5KWx10dhKszw="; - }; - - postPatch = '' - # Fix hardcoded paths to /usr installation - sed -i "s#/usr#$out#" src/render/OpenGL.cpp - ''; - - # used by version.sh - DATE = "2024-05-05"; - HASH = finalAttrs.src.rev; - - depsBuildBuild = [ - # to find wayland-scanner when cross-compiling - pkg-config - ]; - - nativeBuildInputs = [ - hwdata - hyprwayland-scanner - jq - makeWrapper - cmake - meson # for wlroots - ninja - pkg-config - wayland-scanner - python3 # for udis86 - ]; - - outputs = [ - "out" - "man" - "dev" - ]; - - buildInputs = [ - cairo - git - hyprcursor - hyprland-protocols - hyprlang - libGL - libdrm - libinput - libuuid - libxkbcommon - mesa - wayland - wayland-protocols - pango - pciutils - tomlplusplus - # for subproject wlroots-hyprland - seatd - libliftoff - libdisplay-info - xorg.xcbutilerrors - xorg.xcbutilrenderutil - ] - ++ lib.optionals stdenv.hostPlatform.isBSD [ epoll-shim ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ libexecinfo ] - ++ lib.optionals enableXWayland [ - xorg.libxcb - xorg.libXdmcp - xorg.xcbutil - xorg.xcbutilwm - xwayland - ] - ++ lib.optionals withSystemd [ systemd ]; - - cmakeBuildType = - if debug - then "Debug" - else "RelWithDebInfo"; - - - cmakeFlags = [ - (lib.cmakeBool "NO_XWAYLAND" (!enableXWayland)) - (lib.cmakeBool "LEGACY_RENDERER" legacyRenderer) - (lib.cmakeBool "NO_SYSTEMD" (!withSystemd)) - ]; - - postInstall = '' - ${lib.optionalString wrapRuntimeDeps '' - wrapProgram $out/bin/Hyprland \ - --suffix PATH : ${lib.makeBinPath [binutils pciutils pkgconf]} - ''} - ''; - - passthru.providedSessions = [ "hyprland" ]; - - meta = with lib; { - homepage = "https://github.com/hyprwm/Hyprland"; - description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; - license = licenses.bsd3; - maintainers = with maintainers; [ wozeparrot fufexan ]; - mainProgram = "Hyprland"; - platforms = lib.platforms.linux; - }; -}) |