diff options
Diffstat (limited to 'pkgs/applications')
250 files changed, 2982 insertions, 2623 deletions
diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index 847002c6d7114..5426f2c8fdd08 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { The features can be activated and configured through the Universal Access panel of the GNOME Control Center. ''; - homepage = "https://wiki.gnome.org/Projects/Mousetweaks"; + homepage = "https://gitlab.gnome.org/Archive/mousetweaks"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.johnazoidberg ]; diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 2b8e0a5e76a6d..c7ea8b34a66f6 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.22.0"; + version = "1.38.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -32,23 +32,15 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - hash = "sha256-Rk6LOCZ5bhoo5ORAIIYWENrKUIVypd8bnKjyyBSbUYg="; + hash = "sha256-ZVSnLH2wLPcOHkU2pO0BgIdGmULMNiacIYMRmhN+bZ8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - cargoUpdateHook = '' - cat Cargo.toml.in Cargo.deps.newer > Cargo.toml - cp Cargo.lock.newer Cargo.lock - ''; name = "${pname}-${version}"; - hash = "sha256-DygWra4R/w8KzkFzIVm4+ePpUpjiYGaDx2NQm6o+tWQ="; + hash = "sha256-tcn1tRuRlHVTYvc8T/ePfCEPNjih6B9lo/hdX+WwitQ="; }; - mesonFlags = [ - "-Dnewer=true" - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 5ebc2caf0f715..5f955334fef20 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -8,7 +8,7 @@ , qtbase , qttools , qtwayland -, rtaudio +, rtaudio_6 , rtmidi , wrapQtAppsHook }: @@ -43,16 +43,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase + rtaudio_6 rtmidi ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ qt5compat - ] ++ rtaudio.buildInputs; + ]; qmakeFlags = [ - # we don't have RtAudio 6 yet: https://github.com/NixOS/nixpkgs/pull/245075 - # "CONFIG+=system_rtaudio" + "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 3ec595e3e8bbc..d6bb4edfabd26 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.1.6"; + version = "5.1.8"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-U1Qp7/7kAr1IEcv256I2J/sb5MYxfR20Pi5N8WaVh2U="; + sha256 = "sha256-KxNLae/uTYL1m/X+/7wr7hhKfw31NpB9Mw9RzfrTuus="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/cmus/option-debugging.patch b/pkgs/applications/audio/cmus/option-debugging.patch deleted file mode 100644 index 84115e1480e13..0000000000000 --- a/pkgs/applications/audio/cmus/option-debugging.patch +++ /dev/null @@ -1,42 +0,0 @@ -Shows build and link errors in configure for ease of debugging which -options require what. -diff --git a/scripts/checks.sh b/scripts/checks.sh -index 64cbbf3..fab4d9b 100644 ---- a/scripts/checks.sh -+++ b/scripts/checks.sh -@@ -425,7 +425,7 @@ try_compile() - echo "$1" > $__src || exit 1 - shift - __cmd="$CC -c $CFLAGS $@ $__src -o $__obj" -- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CC -c $CFLAGS "$@" $__src -o $__obj - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -433,7 +433,7 @@ try_compile() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj" -- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CXX -c $CXXFLAGS "$@" $__src -o $__obj - ;; - esac - return $? -@@ -451,7 +451,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@" -- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null -+ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -459,7 +459,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@" -- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null -+ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" - ;; - esac - return $? diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 6d3fd8f1d17d7..6366721a35653 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "View and edit tags for various audio files"; mainProgram = "easytag"; - homepage = "https://wiki.gnome.org/Apps/EasyTAG"; + homepage = "https://gitlab.gnome.org/GNOME/easytag"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix index 5168d084af72a..e0e35bae6df09 100644 --- a/pkgs/applications/audio/feishin/default.nix +++ b/pkgs/applications/audio/feishin/default.nix @@ -1,8 +1,10 @@ { lib, + stdenv, buildNpmPackage, fetchFromGitHub, electron_27, + darwin, copyDesktopItems, makeDesktopItem, ... @@ -21,8 +23,7 @@ let electron = electron_27; in buildNpmPackage { - pname = "feishin"; - inherit version; + inherit pname version; inherit src; npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE="; @@ -32,17 +33,25 @@ buildNpmPackage { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - nativeBuildInputs = [ copyDesktopItems ]; + nativeBuildInputs = + lib.optionals (stdenv.isLinux) [ copyDesktopItems ] + ++ lib.optionals stdenv.isDarwin [ darwin.autoSignDarwinBinariesHook ]; - postPatch = '' - # release/app dependencies are installed on preConfigure - substituteInPlace package.json \ - --replace-fail "electron-builder install-app-deps &&" "" + postPatch = + '' + # release/app dependencies are installed on preConfigure + substituteInPlace package.json \ + --replace-fail "electron-builder install-app-deps &&" "" - # https://github.com/electron/electron/issues/31121 - substituteInPlace src/main/main.ts \ - --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" - ''; + # Don't check for updates. + substituteInPlace src/main/main.ts \ + --replace-fail "autoUpdater.checkForUpdatesAndNotify();" "" + '' + + lib.optionalString stdenv.isLinux '' + # https://github.com/electron/electron/issues/31121 + substituteInPlace src/main/main.ts \ + --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" + ''; preConfigure = let @@ -67,40 +76,59 @@ buildNpmPackage { done ''; - postBuild = '' - npm exec electron-builder -- \ - --dir \ - -c.electronDist=${electron}/libexec/electron \ - -c.electronVersion=${electron.version} \ - -c.npmRebuild=false - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/feishin - pushd release/build/*/ - cp -r locales resources{,.pak} $out/share/feishin - popd - - # Code relies on checking app.isPackaged, which returns false if the executable is electron. - # Set ELECTRON_FORCE_IS_PACKAGED=1. - # https://github.com/electron/electron/issues/35153#issuecomment-1202718531 - makeWrapper ${lib.getExe electron} $out/bin/feishin \ - --add-flags $out/share/feishin/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set ELECTRON_FORCE_IS_PACKAGED=1 \ - --inherit-argv0 - - for size in 32 64 128 256 512 1024; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - ln -s \ - $out/share/feishin/resources/assets/icons/"$size"x"$size".png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png - done - - runHook postInstall - ''; + postBuild = + lib.optionalString stdenv.isDarwin '' + # electron-builder appears to build directly on top of Electron.app, by overwriting the files in the bundle. + cp -r ${electron}/Applications/Electron.app ./ + find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw + + # Disable code signing during build on macOS. + # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos + export CSC_IDENTITY_AUTO_DISCOVERY=false + sed -i "/afterSign/d" package.json + '' + + '' + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${if stdenv.isDarwin then "./" else "${electron}/libexec/electron"} \ + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false + ''; + + installPhase = + '' + runHook preInstall + '' + + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/{Applications,bin} + cp -r release/build/**/Feishin.app $out/Applications/ + makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin + '' + + lib.optionalString stdenv.isLinux '' + mkdir -p $out/share/feishin + pushd release/build/*/ + cp -r locales resources{,.pak} $out/share/feishin + popd + + # Code relies on checking app.isPackaged, which returns false if the executable is electron. + # Set ELECTRON_FORCE_IS_PACKAGED=1. + # https://github.com/electron/electron/issues/35153#issuecomment-1202718531 + makeWrapper ${lib.getExe electron} $out/bin/feishin \ + --add-flags $out/share/feishin/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set ELECTRON_FORCE_IS_PACKAGED=1 \ + --inherit-argv0 + + for size in 32 64 128 256 512 1024; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + ln -s \ + $out/share/feishin/resources/assets/icons/"$size"x"$size".png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + done + '' + + '' + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { @@ -125,6 +153,9 @@ buildNpmPackage { license = licenses.gpl3Plus; platforms = platforms.unix; mainProgram = "feishin"; - maintainers = with maintainers; [ onny ]; + maintainers = with maintainers; [ + onny + jlbribeiro + ]; }; } diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/applications/audio/g4music/default.nix index bbb31c1146599..0cc1987c356d0 100644 --- a/pkgs/applications/audio/g4music/default.nix +++ b/pkgs/applications/audio/g4music/default.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "g4music"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "neithern"; repo = "g4music"; rev = "v${finalAttrs.version}"; - hash = "sha256-4UM1CspevlDHpuyvSekMM73XyxVqpdUDtJ7im7hnxHY="; + hash = "sha256-ljSXTEp+f4HMXhGWDGHdX6whm90Vo5KWOQunU2hHwo8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index bba557913297f..55ffb370d60aa 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Listen to your favorite podcasts"; mainProgram = "gnome-podcasts"; - homepage = "https://wiki.gnome.org/Apps/Podcasts"; + homepage = "https://apps.gnome.org/Podcasts/"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 54bd0cad3593e..9e519510eb721 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.14.1-1"; + version = "3.14.2-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-EyMTWsaqJX7H7aCbu5ww9tQBMwJ7BzobWMWg5Y/ZgJE="; + hash = "sha256-FHM8fFUga9poGhojKBTF4gsJ6L4XEksueVxfMbngvks="; }; postPatch = '' diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index 5a7ef4417876b..9f633fc8d0793 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; - hash = "sha256-QHhSrmBNvUTffPzjns670Tn3Z3UDcDvarq605Qx9k4w="; + hash = "sha256-z3SVpPCWZqCVXPKbPxZAKGtk8Z/Tf5PULn0dWsKlVrE="; }; - cargoHash = "sha256-vtU439Pd3zWx+qakh1xTENQhun7S+WsJMndXqPWrPWU="; + cargoHash = "sha256-eCdUrxt9edJm6K3f8V8bjgYWMq3mgj/ZfUZYWE3ZBqw="; nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index d3cb9fcfab019..b575f717be747 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { pname = "littlegptracker"; - version = "unstable-2020-11-26"; + version = "0-unstable-2020-11-26"; src = fetchFromGitHub { owner = "Mdashdotdashn"; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 34dbf0318a71c..3fb5e7efa7981 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -102,7 +102,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; - homepage = "https://wiki.gnome.org/Apps/Lollypop"; + homepage = "https://gitlab.gnome.org/World/lollypop"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index da7f4ddcab3ec..d9197abd04dc9 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "mmlgui"; - version = "unstable-2024-04-15"; + version = "210420-preview-unstable-2024-04-15"; src = fetchFromGitHub { owner = "superctr"; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index c68d14b28f990..0018c99bc1af5 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.60"; + version = "10.71"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-llOo9G65UDDCzaSahq5qssw6SmOJ5C9qS2bdXB/pKF0="; + hash = "sha256-YHPC+dHfvRSr6GldWSlgCGt/wuO/WXQGRliarnM8/AU="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 58b5f852a4c95..4b6fe17e8225f 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "unstable-2024-02-27"; + version = "4.1.1-unstable-2024-02-27"; src = fetchFromGitHub { owner = "mopidy"; @@ -22,7 +22,9 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "mopidy_spotify" ]; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { homepage = "https://github.com/mopidy/mopidy-spotify"; diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index cae2a3b7f1a9c..d0273e1c69508 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "14.1.2"; + version = "15.0.1"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-CMqH9iy9U85bKj7YLcYsKFs5CDePGBEfUWL+sb7WzBw="; + sha256 = "sha256-rZfpGvxDV8KWGfQJ+mXsxLI8DIMSM0D9A3yrEZ+Zc38="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 427d9f48c1fd3..943c5ab0b974a 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; - hash = "sha256-knqo5yCkcO/bFmM++z+SdiWzpDKK9ooV0wqlcIKj7so="; + hash = "sha256-5qdnvGFgFEk+00tjnVhqW29AyyjCfiFQOyYyVmAjHnM="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 0867919ab47e7..60ac9cb81b795 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.6.3"; + version = "0.7.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-mTWmXHC9KkXgUIO5CIcGOoYYLx+5si/LETSmHFhmrRE="; + sha256 = "sha256-mtW+dbjdp7as0N5+iacMSNrJ4jm8HWYqJP6G+lutucc="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 714a66f6e2c8c..88ec50acc6dee 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "qsynth"; - version = "0.9.13"; + version = "0.9.90"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - hash = "sha256-SvgZrdS6BwWhNgbovcfhpQKVcu0iwr4dDqeIckuo1fk="; + hash = "sha256-5lqmoUku4/8oKxlQio1nJtMu1kn42iK8mi0K3s9y70M="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 9929a32aabbfa..c14638912af21 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Rhythmbox"; + homepage = "https://gitlab.gnome.org/GNOME/rhythmbox"; description = "A music playing application for GNOME"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index c54726d058d45..042666d2e1c7a 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.30.9"; + version = "5.31.1"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "sha256-gyitOq/HTDruP4nY6B7y1E+pL43yRhldyiiXEjKyogU="; + sha256 = "sha256-n1Ohja6Hpg/TNoxQKF1VCDkVj0UDCefr1x5ArIsgs2A="; }; dontUnpack = true; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 782a558649145..d3add0f604f73 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,32 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, libopus, soxr , IOKit, AudioToolbox , aixlog, popl , pulseaudioSupport ? false, libpulseaudio , nixosTests }: -assert pulseaudioSupport -> libpulseaudio != null; - stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "sha256-dlK1xQQqst4VQjioC7MZzqXwMC+JfqtvnD5lrOqGhYI="; + sha256 = "sha256-XxpiLojs1TI3qM7yXS+OPcHKo6pLcfJ+Eop7GjQ4HQw="; }; - patches = [ - # Can be removed with next release after 0.27.0 - (fetchpatch { - name = "include-cstdint.patch"; - url = "https://github.com/badaix/snapcast/commit/481f08199ca31c60c9a3475f1064e6b06a503d12.patch"; - hash = "sha256-klpvmBpBAlBMtcgnNfW6X6vDbJFnOuOsPUDXcNf5tGc="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index c35a2a80643cc..bc1c72cf746e6 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-s9B3OBwiUdCJyxbeQXeidv38pzmvC442Byl+llabqp0="; + hash = "sha256-JMextQY0jLShWmqRQoVAbqIzDhA1mOzI7vfsG7+jjX0="; }; mixFodDeps = beamPackages.fetchMixDeps { diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 261de6e48450d..65a12c423b3f3 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Gnome CD Ripper"; mainProgram = "sound-juicer"; - homepage = "https://wiki.gnome.org/Apps/SoundJuicer"; + homepage = "https://gitlab.gnome.org/GNOME/sound-juicer"; maintainers = [ maintainers.bdimcheff ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index c086436de09ff..8f107ee2cb9c3 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -250,6 +250,7 @@ stdenv.mkDerivation rec { # no-derivatives clause license = with licenses; [ gpl3Plus cc-by-nc-40 unfreeRedistributable ]; maintainers = with maintainers; [ nathyong jpotier ddelabru ]; + mainProgram = "Rack"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/vgmplay-libvgm/default.nix b/pkgs/applications/audio/vgmplay-libvgm/default.nix index 75701682e1283..ebf227d21074c 100644 --- a/pkgs/applications/audio/vgmplay-libvgm/default.nix +++ b/pkgs/applications/audio/vgmplay-libvgm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { pname = "vgmplay-libvgm"; - version = "unstable-2024-01-03"; + version = "0.51.1-unstable-2024-01-03"; src = fetchFromGitHub { owner = "ValleyBell"; diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index a14d5c5a37e23..4bec1952e03eb 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "virtual-ans"; - version = "3.0.2c"; + version = "3.0.3"; src = fetchzip { url = "https://warmplace.ru/soft/ans/virtual_ans-${version}.zip"; - sha256 = "03r1v3l7rd59dakr7ndvgsqchv00ppkvi6sslgf1ng07r3rsvb1n"; + sha256 = "sha256-tqR7icgURUFOyLJ8+mS17JRf2gK53I2FW/2m8IJPtJE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index c56e2ba4c48fc..642ba8e3fc0ff 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-JOmcfe7xrKRaxJwj2No3e99HBYbX+ROTjHl5Frc2P9Q="; + hash = "sha256-nxpctEG4XoxW6jOAxGdgTEYr6YnhFRR8+5HUQLxRJB0="; }; pnpmDeps = stdenvNoCC.mkDerivation { @@ -47,10 +47,10 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = true; outputHashMode = "recursive"; outputHash = { - x86_64-linux = "sha256-K2yJdoi+bJpz0Xf2MHlFzQXbP+H3uVE2hYfkzoB7vBE="; - aarch64-linux = "sha256-ZiA6XKPnkoAl9m2vEJth2wyDxj61Efye4cUk+76znnM="; - x86_64-darwin = "sha256-wh5Y47c5qD2PctROP9AWqLDs7H5S2/8X0zxkSMkr1xQ="; - aarch64-darwin = "sha256-e2h4bLVnSEtZcHERsfkNmawgxQHQXxgXrNlFKB+IRTw="; + x86_64-linux = "sha256-bujlQxP6Lr3qPUDxYXKyb702ZJY/xbuCsu3wVDhcb+8="; + aarch64-linux = "sha256-0kyjjttpXpFVhdza5NAjGrRn++qc/N5/u2dQl7VufLE="; + x86_64-darwin = "sha256-Q37QJt/mhfpSguOlkJGKFTCrIOrpbG3OBwaD/Bg09Us="; + aarch64-darwin = "sha256-wbfjzoGa/6vIlOOVX3bKNQ2uxzph3WSofo3MGXqA6yQ="; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); }; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 49c5cadc89f2d..bb5c3c0c980fd 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { of backing up the Right Way (encrypted, off-site, and regular) \ and uses duplicity as the backend. ''; - homepage = "https://wiki.gnome.org/Apps/DejaDup"; + homepage = "https://apps.gnome.org/DejaDup/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 7adaa00d60781..3d919449be3ee 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-yxr98CJuu15TGiIXCBhU2bOgvct6jQ5xAraD9Z0sL2Q="; + hash = "sha256-Z9vRuz5PwOhJ3DQD9zvCilgTMww7bRL4aR6fRoHIayI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ce8SdBvRdFp1BU9OPcByoJjCiSrAkQqtmfCeJ3B+Piw="; + hash = "sha256-hcfkwxwLOUBMj6rvhI5F4OO9UaSP7CAE0JNOGlh2lVY="; }; patches = [ diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 1cc43a059e204..948645d60006b 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.2"; + version = "0.29.3"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-og9hMQdDXGdUQN+A+z0064E6svF+qPd9CWtDQsdvNYQ="; + hash = "sha256-hYA0O7nDT8J1EnpW4i1+eBzkNw77JC6M7GwO3BdBh3U="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index 78389b28c9543..4e6e685316bf4 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -14,7 +14,6 @@ , miniupnpc , zeromq , zlib -, db53 , sqlite , qrencode , qtbase ? null @@ -33,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - version = "26.0"; + version = "27.0"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "00qvaf53jszsk1rr029zmq60v8w0r92192ab65k2krkmh7ybla9l"; + sha256 = "0f6vi2k5xvjrhiazfjcd4aj246dfcg51xsnqb9wdjl41cg0ckwmf"; }; nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] @@ -49,7 +48,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ lib.optionals withWallet [ db53 sqlite ] + ++ lib.optionals withWallet [ sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 73bd7f3afc276..077ff6b11f45c 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.17.4-beta"; + version = "0.17.5-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-O6cGK4UMKrZpYqtghjjqqLBStLG5GEi/Q5liR557I8s="; + hash = "sha256-q/mzF6LPW/ThgqfGgjtax8GvoC3JEpg0IetfSTo1XYk="; }; - vendorHash = "sha256-eaQmM5bfsUmzTiUALX543VBQRJK+TqW2i28npwSrn3Q="; + vendorHash = "sha256-unT0zJrOEmKHpoUsrBHKfn5IziGlaqEtMfkeo/74Rfc="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix index 5c4a7cc8b3549..54ecd28550c2b 100644 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -5,6 +5,7 @@ , bash , makeWrapper , electron +, asar }: let @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper asar ]; dontConfigure = true; dontBuild = true; @@ -48,6 +49,13 @@ stdenv.mkDerivation rec { cp -a usr/share/* $out/share cp -a "opt/Terra Station/"{locales,resources} $out/share/${pname} + # patch pre-built node modules + asar e $out/share/${pname}/resources/app.asar asar-unpacked + find asar-unpacked -name '*.node' -exec patchelf \ + --add-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + {} \; + asar p asar-unpacked $out/share/${pname}/resources/app.asar + substituteInPlace $out/share/applications/station-electron.desktop \ --replace "/opt/Terra Station/station-electron" ${pname} diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index 888b6f8d2b97e..c602a88dc7bd2 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -7,6 +7,7 @@ , gperf , libmicrohttpd , libsodium +, lz4 , openssl , readline , secp256k1 @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2024.03"; + version = "2024.04"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - hash = "sha256-AVg33aZAyedmNIFqQJm4Nn6luLxK4mKgnIRmNU7j2C0="; + hash = "sha256-hh8D4IZX6RS/RXdhVONhgetqp89kpTC2IwDQ2KHdKsE="; fetchSubmodules = true; }; @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { gperf libmicrohttpd libsodium + lz4 openssl readline secp256k1 diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix index cb4cec172bac1..f8a0ec28a3a2e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix @@ -16,9 +16,8 @@ let inherit (melpaStablePackages) tree-sitter-langs; - libSuffix = if stdenv.isDarwin then "dylib" else "so"; langName = g: lib.removeSuffix "-grammar" (lib.removePrefix "tree-sitter-" g.pname); - soName = g: langName g + "." + libSuffix; + soName = g: langName g + stdenv.hostPlatform.extensions.sharedLibrary; grammarDir = runCommand "emacs-tree-sitter-grammars" { # Fake same version number as upstream language bundle to prevent triggering runtime downloads diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix index 1b48776f75606..0f9da8136214c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://git.sr.ht/~casouri/xapian-lite"; description = "A minimal Emacs dynamic module for Xapian"; - maintainers = [ ]; + maintainers = [ lib.maintainers.kotatsuyaki ]; license = lib.licenses.gpl3Plus; inherit (emacs.meta) platforms; }; diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 179cbb0fdbf63..618ea2f471a2d 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "focuswriter"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "gottcode"; repo = "focuswriter"; rev = "v${version}"; - hash = "sha256-z3DQaMgaTjzj2Oh1QI7A5v9G7GxjlGj/7jInxH/tDaY="; + hash = "sha256-op76oHVo6yCpXzRFYAYXMCEslCgDA6jXPcgWdTeGJ+E="; }; nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index eb985016b1783..9ec2d3329c1dc 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -9,9 +9,9 @@ , gtk3 , gtk-mac-integration , glib -, tepl , libgedit-amtk , libgedit-gtksourceview +, libgedit-tepl , libpeas , libxml2 , gsettings-desktop-schemas @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "46.2"; + version = "47.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "wIZkErrRR+us4tKC/8u1oOmjBLIP1VZAvuIcgebVAe8="; + sha256 = "+kpZfjTHbUrJFDG1rm4ZHJbGsK8XAuCJmrNRme36G/o="; }; patches = [ @@ -65,13 +65,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - tepl glib gsettings-desktop-schemas gspell gtk3 libgedit-amtk libgedit-gtksourceview + libgedit-tepl libpeas ] ++ lib.optionals stdenv.isDarwin [ gtk-mac-integration diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index b1360f2a147e7..e689f9ee7d069 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -176,7 +176,7 @@ stdenv.mkDerivation rec { currently recommend running gnome-builder inside a nix-shell with appropriate dependencies loaded. ''; - homepage = "https://wiki.gnome.org/Apps/Builder"; + homepage = "https://apps.gnome.org/Builder/"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 8962629c8bdc4..f78407731d264 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , autoreconfHook , gtk-doc , vala @@ -8,10 +9,9 @@ , wrapGAppsHook , gsettings-desktop-schemas , gspell -, libgedit-amtk , libgedit-gtksourceview +, libgedit-tepl , libgee -, tepl , gnome , glib , pkg-config @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { sha256 = "1nVVY5sqFaiuvVTzNTVORP40MxQ648s8ynqOJvgRKto="; }; + patches = [ + # Adapt for Tepl -> libgedit-tepl rename + (fetchpatch { + url = "https://gitlab.gnome.org/swilmet/gnome-latex/-/commit/41e532c427f43a5eed9081766963d6e29a9975a1.patch"; + hash = "sha256-gu8o/er4mP92dE5gWg9lGx5JwTHB8ytk3EMNlwlIpq4="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook @@ -45,11 +53,10 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gspell - libgedit-amtk libgedit-gtksourceview + libgedit-tepl libgee libxml2 - tepl ]; configureFlags = [ @@ -66,7 +73,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; + homepage = "https://gitlab.gnome.org/swilmet/gnome-latex"; description = "A LaTeX editor for the GNOME desktop"; maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a88785e708178..fb57331cc3b46 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -113,6 +113,17 @@ rec { xz ]; }).overrideAttrs (attrs: { + postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' + ( + cd $out/clion + + for dir in plugins/clion-radler/DotFiles/linux-*; do + rm -rf $dir/dotnet + ln -s ${dotnet-sdk_7} $dir/dotnet + done + ) + ''; + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' ( cd $out/clion diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 51a1a2925e92d..2b3ee40951755 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -3,6 +3,7 @@ , withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit unstick supportedDevices withQuesta; } +, extraProfile ? "" }: let @@ -114,7 +115,7 @@ in buildFHSEnv rec { if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi - ''; + '' + extraProfile; # Run the wrappers directly, instead of going via bash. runScript = ""; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index e61f57c76448c..bc44c8e9f6200 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -4,6 +4,9 @@ , dpkg , makeWrapper , electron +, libsecret +, asar +, glib , desktop-file-utils , callPackage }: @@ -28,16 +31,28 @@ stdenv.mkDerivation rec { dontBuild = true; - nativeBuildInputs = [ makeWrapper dpkg desktop-file-utils ]; + nativeBuildInputs = [ makeWrapper dpkg desktop-file-utils asar ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; - installPhase = '' + installPhase = let + libPath = lib.makeLibraryPath [ + libsecret + glib + stdenv.cc.cc.lib + ]; + in + '' runHook preInstall mkdir -p $out/bin $out/share/standardnotes cp -R usr/share/{applications,icons} $out/share cp -R opt/Standard\ Notes/resources/app.asar $out/share/standardnotes/ + asar e $out/share/standardnotes/app.asar asar-unpacked + find asar-unpacked -name '*.node' -exec patchelf \ + --add-rpath "${libPath}" \ + {} \; + asar p asar-unpacked $out/share/standardnotes/app.asar makeWrapper ${electron}/bin/electron $out/bin/standardnotes \ --add-flags $out/share/standardnotes/app.asar diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5eb772dccf052..e477fa1f520ec 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5590,6 +5590,18 @@ final: prev: meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; + llm-nvim = buildVimPlugin { + pname = "llm.nvim"; + version = "2024-02-22"; + src = fetchFromGitHub { + owner = "huggingface"; + repo = "llm.nvim"; + rev = "51b76dac9c33c0122adfe28daf52ceaa31c4aa02"; + sha256 = "07i1ixbiby4c81lkydwvygz6vxs1xhqnwzcsad3xzcaz7zdl00kx"; + }; + meta.homepage = "https://github.com/huggingface/llm.nvim/"; + }; + lsp-colors-nvim = buildVimPlugin { pname = "lsp-colors.nvim"; version = "2023-02-27"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ee4484a3cb628..24435666c0768 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -246,7 +246,7 @@ }; cmp-git = super.cmp-git.overrideAttrs { - dependencies = with self; [ nvim-cmp ]; + dependencies = with self; [ nvim-cmp plenary-nvim ]; }; cmp-greek = super.cmp-greek.overrideAttrs { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 62d8b5a519dd7..faf446c70f415 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -468,6 +468,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, https://github.com/ldelossa/litee.nvim/,, https://github.com/smjonas/live-command.nvim/,HEAD, +https://github.com/huggingface/llm.nvim/,HEAD, https://github.com/folke/lsp-colors.nvim/,, https://github.com/lukas-reineke/lsp-format.nvim/,HEAD, https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD, @@ -937,6 +938,7 @@ https://github.com/xiyaowong/transparent.nvim/,HEAD, https://github.com/Wansmer/treesj/,main, https://github.com/tremor-rs/tremor-vim/,, https://github.com/cappyzawa/trim.nvim/,, +https://github.com/simonclean/triptych.nvim/,HEAD, https://github.com/folke/trouble.nvim/,, https://github.com/Pocco81/true-zen.nvim/,, https://github.com/tesaguri/trust.vim/,HEAD, diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix deleted file mode 100644 index 479a475e07416..0000000000000 --- a/pkgs/applications/editors/vis/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper -, copyDesktopItems, makeDesktopItem -, ncurses, libtermkey, lua, tre -, acl, libselinux -}: - -let - luaEnv = lua.withPackages(ps: [ ps.lpeg ]); -in -stdenv.mkDerivation rec { - pname = "vis"; - version = "0.8"; - - src = fetchFromGitHub { - rev = "v${version}"; - sha256 = "sha256-XvWj6fZxzXeRA5oCAqIIwlfjrJcHnDrjeiPExEQKSkY="; - repo = "vis"; - owner = "martanne"; - }; - - nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; - - buildInputs = [ - ncurses - libtermkey - luaEnv - tre - ] ++ lib.optionals stdenv.isLinux [ - acl - libselinux - ]; - - postInstall = '' - wrapProgram $out/bin/vis \ - --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH ';' "${luaEnv}/share/lua/${lua.luaversion}/?.lua" \ - --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" - ''; - - desktopItems = [ - (makeDesktopItem { - name = "vis"; - exec = "vis %U"; - type = "Application"; - icon = "accessories-text-editor"; - comment = meta.description; - desktopName = "vis"; - genericName = "Text editor"; - categories = [ "Application" "Development" "IDE" ]; - mimeTypes = [ "text/plain" "application/octet-stream" ]; - startupNotify = false; - terminal = true; - }) - ]; - - meta = with lib; { - description = "A vim like editor"; - homepage = "https://github.com/martanne/vis"; - license = licenses.isc; - maintainers = with maintainers; [ vrthra ramkromberg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 4ab87219a7cf3..983ae07bb196e 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -1,22 +1,21 @@ -{ lib -, vscode-utils }: +{ lib, vscode-utils }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; in - buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vscode-wakatime"; - publisher = "WakaTime"; - version = "18.0.5"; - hash = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; - }; +buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-wakatime"; + publisher = "WakaTime"; + version = "18.0.5"; + hash = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; + }; - meta = { - description = '' - Visual Studio Code plugin for automatic time tracking and metrics generated - from your programming activity - ''; - license = lib.licenses.bsd3; - }; - } + meta = { + description = '' + Visual Studio Code plugin for automatic time tracking and metrics generated + from your programming activity + ''; + license = lib.licenses.bsd3; + }; +} 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 5717ac0c12b57..fadcfe758a553 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -1,11 +1,19 @@ -{ lib, stdenv, vscode-utils, callPackage }: +{ + lib, + stdenv, + vscode-utils, + callPackage, +}: let version = "1.50.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" - else throw "Unsupported system: ${stdenv.system}"; + if stdenv.isLinux then + "linux" + else if stdenv.isDarwin then + "darwin" + else + throw "Unsupported system: ${stdenv.system}"; analysisDir = "server/analysis_binaries/${arch}"; in vscode-utils.buildVscodeMarketplaceExtension rec { @@ -23,7 +31,10 @@ vscode-utils.buildVscodeMarketplaceExtension rec { meta = { description = "The official VSCode plugin for ReScript"; homepage = "https://github.com/rescript-lang/rescript-vscode"; - maintainers = [ lib.maintainers.dlip lib.maintainers.jayesh-bhoot ]; + maintainers = [ + lib.maintainers.dlip + lib.maintainers.jayesh-bhoot + ]; license = lib.licenses.mit; }; } diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 9ab9e4f165ddc..9a00fb31cd41e 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, bash, ocaml, ocamlPackages, dune_3, version }: +{ + lib, + stdenv, + fetchFromGitHub, + bash, + ocaml, + ocamlPackages, + dune_3, + version, +}: stdenv.mkDerivation { pname = "rescript-editor-analysis"; @@ -11,7 +20,11 @@ stdenv.mkDerivation { hash = "sha256-+Ht8qWwxtFWHFMiV/aoZIs2S3SxkOWgdwSKN+akp/LU="; }; - nativeBuildInputs = [ ocaml dune_3 ocamlPackages.cppo ]; + nativeBuildInputs = [ + ocaml + dune_3 + ocamlPackages.cppo + ]; # Skip testing phases because they need to download and install node modules postPatch = '' @@ -28,7 +41,10 @@ stdenv.mkDerivation { meta = { description = "Analysis binary for the ReScript VSCode plugin"; homepage = "https://github.com/rescript-lang/rescript-vscode"; - maintainers = [ lib.maintainers.dlip lib.maintainers.jayesh-bhoot ]; + maintainers = [ + lib.maintainers.dlip + lib.maintainers.jayesh-bhoot + ]; license = lib.licenses.mit; }; } diff --git a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix index 5ba82c59fee56..9202ddb72b16d 100644 --- a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix +++ b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix @@ -1,8 +1,9 @@ -{ graphviz -, jre -, lib -, makeWrapper -, vscode-utils +{ + graphviz, + jre, + lib, + makeWrapper, + vscode-utils, }: vscode-utils.buildVscodeMarketplaceExtension rec { @@ -13,13 +14,9 @@ vscode-utils.buildVscodeMarketplaceExtension rec { hash = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs="; }; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - graphviz - ]; + buildInputs = [ graphviz ]; postInstall = '' wrapProgram $out/share/vscode/extensions/contextmapper.context-mapper-vscode-extension/lsp/bin/context-mapper-lsp \ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 07d8e5430a7b7..260711bd4880b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -970,7 +970,7 @@ let version = "0.8.25"; } // sources.${stdenv.system}; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; meta = { description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; @@ -1822,7 +1822,7 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.14.2024032901"; # compatible with vscode 1.88.1 + version = "0.14.2024032901"; # compatible with vscode 1.88.1 hash = "sha256-+6N7IGO5j0wP5Zg8CwapHeKGWiZzc43VM4jCtqJDJIQ="; }; meta = { @@ -2853,6 +2853,22 @@ let ms-python.python = callPackage ./ms-python.python { }; + ms-python.debugpy = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "debugpy"; + publisher = "ms-python"; + version = "2023.3.13121011"; + hash = "sha256-owYUEyQl2FQytApfuI97N4y9p7/dL0lu6EBk/AzSMjw="; + }; + meta = { + description = "Python debugger (debugpy) extension for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.debugpy"; + homepage = "https://github.com/Microsoft/vscode-python-debugger"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.carlthome ]; + }; + }; + ms-python.vscode-pylance = callPackage ./ms-python.vscode-pylance { }; ms-toolsai.datawrangler = buildVscodeMarketplaceExtension { @@ -3430,6 +3446,8 @@ let }; }; + reditorsupport.r = callPackage ./reditorsupport.r { }; + reloadedextensions.reloaded-cpp = buildVscodeMarketplaceExtension { mktplcRef = { name = "reloaded-cpp"; @@ -3498,8 +3516,8 @@ let mktplcRef = { name = "wikitext"; publisher = "RoweWilsonFrederiskHolme"; - version = "3.8.0"; - sha256 = "30540a85163e797028eec9bc3db1866bbf473e98615bf6ade6d1d672017ebe52"; + version = "3.8.1"; + hash = "sha256-piwS3SPjx10nsjN5axC+EN0MEDf0r2lVFllqQzciOfc="; }; meta = { description = "Extension that helps users view and write MediaWiki's Wikitext files"; @@ -4555,6 +4573,22 @@ let }; }; + vue.volar = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "volar"; + publisher = "Vue"; + version = "2.0.16"; + hash = "sha256-RTBbF7qahYP4L7SZ/5aCM/e5crZAyyPRcgL48FVL1jk="; + }; + meta = { + changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; + description = "The official Vue VSCode extension"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Vue.volar"; + homepage = "https://github.com/vuejs/language-tools"; + license = lib.licenses.mit; + }; + }; + vspacecode.whichkey = buildVscodeMarketplaceExtension { mktplcRef = { name = "whichkey"; @@ -4567,6 +4601,22 @@ let }; }; + vue.vscode-typescript-vue-plugin = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-typescript-vue-plugin"; + publisher = "Vue"; + version = "1.8.27"; + hash = "sha256-ym1+WPKBcn4h9lqSFVehfiDoGUEviOSEVXVLhHcYvfc="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/Vue.vscode-typescript-vue-plugin/changelog"; + description = "Vue VSCode extension for TypeScript"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin"; + homepage = "https://github.com/vuejs/language-tools"; + license = lib.licenses.mit; + }; + }; + waderyan.gitblame = buildVscodeMarketplaceExtension { mktplcRef = { name = "gitblame"; diff --git a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix index f84f625779b39..ba20cb5b3bbe4 100644 --- a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix @@ -1,6 +1,4 @@ -{ lib -, vscode-utils -}: +{ lib, vscode-utils }: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix index a73da886437f0..dca2a081d92be 100644 --- a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix +++ b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix @@ -1,4 +1,8 @@ -{ lib, vscode-utils, terraform-ls }: +{ + lib, + vscode-utils, + terraform-ls, +}: vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; diff --git a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix index 0f11ddc5ed2cb..afe4cd7bdb742 100644 --- a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix @@ -1,4 +1,10 @@ -{ lib, vscode-utils, plantuml, jq, moreutils }: +{ + lib, + vscode-utils, + plantuml, + jq, + moreutils, +}: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { @@ -7,7 +13,10 @@ vscode-utils.buildVscodeMarketplaceExtension { version = "2.17.4"; hash = "sha256-fnz6ubB73i7rJcv+paYyNV1r4cReuyFPjgPM0HO40ug="; }; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ + jq + moreutils + ]; postInstall = '' cd "$out/$installPrefix" jq '.contributes.configuration.properties."plantuml.java".default = "${plantuml}/bin/plantuml"' package.json | sponge package.json @@ -15,13 +24,10 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = { description = "A Visual Studio Code extension for supporting Rich PlantUML"; - downloadPage = - "https://marketplace.visualstudio.com/items?itemName=jebbs.plantuml"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jebbs.plantuml"; homepage = "https://github.com/qjebbs/vscode-plantuml"; - changelog = - "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog"; + changelog = "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog"; license = lib.licenses.mit; maintainers = [ lib.maintainers.victormignot ]; }; } - diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix index 3c3253e2c3da6..6c522acaa1fd2 100644 --- a/pkgs/applications/editors/vscode/extensions/language-packs.nix +++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix @@ -4,7 +4,12 @@ with vscode-utils; let - buildVscodeLanguagePack = { language, version ? "1.76.2023030809", sha256 }: + buildVscodeLanguagePack = + { + language, + version ? "1.76.2023030809", + sha256, + }: buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-language-pack-${language}"; @@ -15,7 +20,6 @@ let license = lib.licenses.mit; }; }; - in # See list of core language packs at https://github.com/Microsoft/vscode-loc diff --git a/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix index 6c7ba096f6c58..4f947a493542f 100644 --- a/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix +++ b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix @@ -1,4 +1,11 @@ -{ publisher, name, version, arch ? "", sha256 ? "", hash ? "" }: +{ + publisher, + name, + version, + arch ? "", + sha256 ? "", + hash ? "", +}: let archurl = (if arch == "" then "" else "?targetPlatform=${arch}"); in diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index e8f5f60ee9edc..50480e3460a95 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -1,56 +1,59 @@ -{ lib -, icu -, openssl -, patchelf -, stdenv -, vscode-utils +{ + lib, + icu, + openssl, + patchelf, + stdenv, + vscode-utils, }: let inherit (stdenv.hostPlatform) system; inherit (vscode-utils) buildVscodeMarketplaceExtension; - extInfo = { - x86_64-linux = { - arch = "linux-x64"; - hash = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8="; - binaries = [ - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller" - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost" - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-x64/Microsoft.VisualStudio.Reliability.Monitor" - "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-server.linux-x64/Microsoft.VisualStudio.Code.Server" - ]; - }; - aarch64-linux = { - arch = "linux-arm64"; - hash = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw="; - binaries = [ - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller" - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost" - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-arm64/Microsoft.VisualStudio.Reliability.Monitor" - "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-server.linux-arm64/Microsoft.VisualStudio.Code.Server" - ]; - }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM="; - binaries = [ - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller" - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost" - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-x64/Microsoft.VisualStudio.Reliability.Monitor" - "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-server.darwin-x64/Microsoft.VisualStudio.Code.Server" - ]; - }; - aarch64-darwin = { - arch = "darwin-arm64"; - hash = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw="; - binaries = [ - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller" - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost" - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-arm64/Microsoft.VisualStudio.Reliability.Monitor" - "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-server.darwin-arm64/Microsoft.VisualStudio.Code.Server" - ]; - }; - }.${system} or (throw "Unsupported system: ${system}"); + extInfo = + { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8="; + binaries = [ + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller" + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost" + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-x64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-server.linux-x64/Microsoft.VisualStudio.Code.Server" + ]; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw="; + binaries = [ + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller" + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost" + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.linux-arm64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-server.linux-arm64/Microsoft.VisualStudio.Code.Server" + ]; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM="; + binaries = [ + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller" + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost" + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-x64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-server.darwin-x64/Microsoft.VisualStudio.Code.Server" + ]; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw="; + binaries = [ + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller" + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost" + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-reliability-monitor.darwin-arm64/Microsoft.VisualStudio.Reliability.Monitor" + "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-server.darwin-arm64/Microsoft.VisualStudio.Code.Server" + ]; + }; + } + .${system} or (throw "Unsupported system: ${system}"); in buildVscodeMarketplaceExtension { mktplcRef = { @@ -61,50 +64,55 @@ buildVscodeMarketplaceExtension { }; sourceRoot = "extension"; # This has more than one folder. - nativeBuildInputs = [ - patchelf - ]; + nativeBuildInputs = [ patchelf ]; - postPatch = '' - declare ext_unique_id - ext_unique_id="$(basename "$out" | head -c 32)" + postPatch = + '' + declare ext_unique_id + ext_unique_id="$(basename "$out" | head -c 32)" - patchelf_add_icu_as_needed() { - declare elf="''${1?}" - declare icu_major_v="${ - lib.head (lib.splitVersion (lib.getVersion icu.name)) - }" + patchelf_add_icu_as_needed() { + declare elf="''${1?}" + declare icu_major_v="${lib.head (lib.splitVersion (lib.getVersion icu.name))}" - for icu_lib in icui18n icuuc icudata; do - patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" - done - } + for icu_lib in icui18n icuuc icudata; do + patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" + done + } - patchelf_common() { - declare elf="''${1?}" + patchelf_common() { + declare elf="''${1?}" - patchelf_add_icu_as_needed "$elf" - patchelf --add-needed "libssl.so" "$elf" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${lib.makeLibraryPath [stdenv.cc.cc openssl icu.out]}:\$ORIGIN" \ - "$elf" - } + patchelf_add_icu_as_needed "$elf" + patchelf --add-needed "libssl.so" "$elf" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${ + lib.makeLibraryPath [ + stdenv.cc.cc + openssl + icu.out + ] + }:\$ORIGIN" \ + "$elf" + } - substituteInPlace dist/extension.js \ - --replace 'e.extensionPath,"cache"' 'require("os").tmpdir(),"'"$ext_unique_id"'"' \ - --replace 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=i.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.ServiceHub.Controller"),n=i.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),r=[(0,a.getServerPath)(e),t,n,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(r.map((e=>(0,o.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}' + substituteInPlace dist/extension.js \ + --replace 'e.extensionPath,"cache"' 'require("os").tmpdir(),"'"$ext_unique_id"'"' \ + --replace 't.setExecuteBit=async function(e){if("win32"!==process.platform){const t=i.join(e[a.SERVICEHUB_CONTROLLER_COMPONENT_NAME],"Microsoft.ServiceHub.Controller"),n=i.join(e[a.SERVICEHUB_HOST_COMPONENT_NAME],(0,a.getServiceHubHostEntrypointName)()),r=[(0,a.getServerPath)(e),t,n,(0,c.getReliabilityMonitorPath)(e)];await Promise.all(r.map((e=>(0,o.chmod)(e,"0755"))))}}' 't.setExecuteBit=async function(e){}' - '' - + (lib.concatStringsSep "\n" (map - (bin: '' - chmod +x "${bin}" - '') - extInfo.binaries)) - + lib.optionalString stdenv.isLinux (lib.concatStringsSep "\n" (map - (bin: '' - patchelf_common "${bin}" - '') - extInfo.binaries)); + '' + + (lib.concatStringsSep "\n" ( + map (bin: '' + chmod +x "${bin}" + '') extInfo.binaries + )) + + lib.optionalString stdenv.isLinux ( + lib.concatStringsSep "\n" ( + map (bin: '' + patchelf_common "${bin}" + '') extInfo.binaries + ) + ); meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.csdevkit/changelog"; @@ -112,6 +120,11 @@ buildVscodeMarketplaceExtension { downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit"; license = lib.licenses.unfree; maintainers = [ lib.maintainers.ggg ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 213ce3550f45c..189804e981781 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -1,11 +1,11 @@ -{ lib -, vscode-utils -, patchelf -, icu -, stdenv -, openssl -, coreutils -, +{ + lib, + vscode-utils, + patchelf, + icu, + stdenv, + openssl, + coreutils, }: let inherit (stdenv.hostPlatform) system; @@ -26,31 +26,32 @@ let ".debugger/x86_64/vsdbg" ]; in - { - x86_64-linux = { - arch = "linux-x64"; - hash = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE="; - binaries = linuxBins; - }; - aarch64-linux = { - arch = "linux-arm64"; - hash = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA="; - binaries = linuxBins; - }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI="; - binaries = darwinBins; - }; - aarch64-darwin = { - arch = "darwin-arm64"; - hash = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0="; - binaries = darwinBins ++ [ - ".debugger/arm64/vsdbg-ui" - ".debugger/arm64/vsdbg" - ]; - }; - }.${system} or (throw "Unsupported system: ${system}"); + { + x86_64-linux = { + arch = "linux-x64"; + hash = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE="; + binaries = linuxBins; + }; + aarch64-linux = { + arch = "linux-arm64"; + hash = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA="; + binaries = linuxBins; + }; + x86_64-darwin = { + arch = "darwin-x64"; + hash = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI="; + binaries = darwinBins; + }; + aarch64-darwin = { + arch = "darwin-arm64"; + hash = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0="; + binaries = darwinBins ++ [ + ".debugger/arm64/vsdbg-ui" + ".debugger/arm64/vsdbg" + ]; + }; + } + .${system} or (throw "Unsupported system: ${system}"); in buildVscodeMarketplaceExtension { mktplcRef = { @@ -60,16 +61,13 @@ buildVscodeMarketplaceExtension { inherit (extInfo) hash arch; }; - nativeBuildInputs = [ - patchelf - ]; + nativeBuildInputs = [ patchelf ]; - postPatch = '' + postPatch = + '' patchelf_add_icu_as_needed() { declare elf="''${1?}" - declare icu_major_v="${ - lib.head (lib.splitVersion (lib.getVersion icu.name)) - }" + declare icu_major_v="${lib.head (lib.splitVersion (lib.getVersion icu.name))}" for icu_lib in icui18n icuuc icudata; do patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" @@ -82,7 +80,13 @@ buildVscodeMarketplaceExtension { patchelf_add_icu_as_needed "$elf" patchelf --add-needed "libssl.so" "$elf" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${lib.makeLibraryPath [stdenv.cc.cc openssl icu.out]}:\$ORIGIN" \ + --set-rpath "${ + lib.makeLibraryPath [ + stdenv.cc.cc + openssl + icu.out + ] + }:\$ORIGIN" \ "$elf" } @@ -90,22 +94,29 @@ buildVscodeMarketplaceExtension { --replace 'uname -m' '${lib.getExe' coreutils "uname"} -m' '' - + (lib.concatStringsSep "\n" (map - (bin: '' + + (lib.concatStringsSep "\n" ( + map (bin: '' chmod +x "${bin}" - '') - extInfo.binaries)) - + lib.optionalString stdenv.isLinux (lib.concatStringsSep "\n" (map - (bin: '' - patchelf_common "${bin}" - '') - extInfo.binaries)); + '') extInfo.binaries + )) + + lib.optionalString stdenv.isLinux ( + lib.concatStringsSep "\n" ( + map (bin: '' + patchelf_common "${bin}" + '') extInfo.binaries + ) + ); meta = { description = "Official C# support for Visual Studio Code"; homepage = "https://github.com/dotnet/vscode-csharp"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ggg ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 25091b95efc4b..67a96652b6ed6 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -1,19 +1,20 @@ -{ lib -, vscode-utils -, icu -, python3 +{ + lib, + vscode-utils, + icu, + python3, # When `true`, the python default setting will be fixed to specified. # Use version from `PATH` for default setting otherwise. # Defaults to `false` as we expect it to be project specific most of the time. -, pythonUseFixed ? false + pythonUseFixed ? false, # For updateScript -, writeScript -, bash -, curl -, coreutils -, gnused -, jq -, nix + writeScript, + bash, + curl, + coreutils, + gnused, + jq, + nix, }: vscode-utils.buildVscodeMarketplaceExtension rec { @@ -33,33 +34,37 @@ vscode-utils.buildVscodeMarketplaceExtension rec { jedi-language-server ]; - postPatch = '' - # remove bundled python deps and use libs from nixpkgs - rm -r pythonFiles/lib - mkdir -p pythonFiles/lib/python/ - ln -s ${python3.pkgs.debugpy}/lib/*/site-packages/debugpy pythonFiles/lib/python/ - buildPythonPath "$propagatedBuildInputs" - for i in pythonFiles/*.py; do - patchPythonScript "$i" - done - '' + lib.optionalString pythonUseFixed '' - # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. - substituteInPlace "./package.json" \ - --replace "\"default\": \"python\"" "\"default\": \"${python3.interpreter}\"" - ''; + postPatch = + '' + # remove bundled python deps and use libs from nixpkgs + rm -r pythonFiles/lib + mkdir -p pythonFiles/lib/python/ + ln -s ${python3.pkgs.debugpy}/lib/*/site-packages/debugpy pythonFiles/lib/python/ + buildPythonPath "$propagatedBuildInputs" + for i in pythonFiles/*.py; do + patchPythonScript "$i" + done + '' + + lib.optionalString pythonUseFixed '' + # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. + substituteInPlace "./package.json" \ + --replace "\"default\": \"python\"" "\"default\": \"${python3.interpreter}\"" + ''; passthru.updateScript = writeScript "update" '' #! ${bash}/bin/bash set -eu -o pipefail - export PATH=${lib.makeBinPath [ - curl - coreutils - gnused - jq - nix - ]} + export PATH=${ + lib.makeBinPath [ + curl + coreutils + gnused + jq + nix + ] + } api=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \ -H 'accept: application/json;api-version=3.0-preview.1' \ @@ -82,7 +87,14 @@ vscode-utils.buildVscodeMarketplaceExtension rec { homepage = "https://github.com/Microsoft/vscode-python"; changelog = "https://github.com/microsoft/vscode-python/releases"; license = lib.licenses.mit; - platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; - maintainers = [ lib.maintainers.jraygauthier lib.maintainers.jfchevrette ]; + platforms = [ + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; + maintainers = [ + lib.maintainers.jraygauthier + lib.maintainers.jfchevrette + ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index 99de6b59b1761..41803cadb3a79 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -1,4 +1,9 @@ -{ lib, vscode-utils, jq, moreutils }: +{ + lib, + vscode-utils, + jq, + moreutils, +}: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix index 63e351f69b4a3..3872aad7ea4b8 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode-remote.remote-ssh/default.nix @@ -1,7 +1,8 @@ -{ lib -, nixosTests -, vscode-utils -, useLocalExtensions ? false +{ + lib, + nixosTests, + vscode-utils, + useLocalExtensions ? false, }: # Note that useLocalExtensions requires that vscode-server is not running # on host. If it is, you'll need to remove $HOME/.vscode-server, @@ -92,7 +93,9 @@ buildVscodeMarketplaceExtension { --replace '# Start the server\n' '${patch}' ''; - passthru.tests = { inherit (nixosTests) vscode-remote-ssh; }; + passthru.tests = { + inherit (nixosTests) vscode-remote-ssh; + }; meta = { description = "Use any remote machine with a SSH server as your development environment."; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index bd1d6bf66e755..731bddc3553c5 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -1,8 +1,19 @@ -{ lib, vscode-utils -, fetchurl, writeScript, runtimeShell -, jq, clang-tools -, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. -, autoPatchelfHook, makeWrapper, stdenv, lttng-ust, libkrb5, zlib +{ + lib, + vscode-utils, + fetchurl, + writeScript, + runtimeShell, + jq, + clang-tools, + gdbUseFixed ? true, + gdb, # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. + autoPatchelfHook, + makeWrapper, + stdenv, + lttng-ust, + libkrb5, + zlib, }: /* @@ -32,11 +43,11 @@ let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; supported = { x86_64-linux = { - hash = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg="; + hash = "sha256-p8WFmkQKdzXF0FTWHabyeFMkwXa2RkDRM9SvvkBIOLY="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-Kjl8mEpayA1xMHEAMJ5k3Ctk3l48KlUBU5w3dL4pGWM="; + hash = "sha256-HISE8/M9IpeI8iX0mmw9owExnpgiwpesE7YG/+QFYgc="; arch = "linux-arm64"; }; }; @@ -47,7 +58,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.17.3"; + version = "1.20.2"; }; nativeBuildInputs = [ @@ -94,7 +105,13 @@ vscode-utils.buildVscodeMarketplaceExtension { description = "The C/C++ extension adds language support for C/C++ to Visual Studio Code, including features such as IntelliSense and debugging."; homepage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.jraygauthier lib.maintainers.stargate01 ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = [ + lib.maintainers.jraygauthier + lib.maintainers.stargate01 + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix index 0f70451c4652e..180490e60a655 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare.vsliveshare/default.nix @@ -1,4 +1,8 @@ -{ lib, vscode-utils, xsel }: +{ + lib, + vscode-utils, + xsel, +}: vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix new file mode 100644 index 0000000000000..de1759d7b0e46 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -0,0 +1,42 @@ +{ + lib, + vscode-utils, + jq, + moreutils, + python311Packages, + R, + rPackages, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "r"; + publisher = "reditorsupport"; + version = "2.8.2"; + hash = "sha256-FPL/JjW452KRchcQ0iHXRJarZXvS3B8PvZhXjf3rMhQ="; + }; + nativeBuildInputs = [ + jq + moreutils + ]; + buildInputs = [ + python311Packages.radian + R + rPackages.languageserver + ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."r.rpath.mac".default = "${lib.getExe' R "R"}"' package.json | sponge package.json + jq '.contributes.configuration.properties."r.rpath.linux".default = "${lib.getExe' R "R"}"' package.json | sponge package.json + jq '.contributes.configuration.properties."r.rterm.mac".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json + jq '.contributes.configuration.properties."r.rterm.linux".default = "${lib.getExe python311Packages.radian}"' package.json | sponge package.json + ''; + meta = { + changelog = "https://marketplace.visualstudio.com/items/REditorSupport.r/changelog"; + description = "A Visual Studio Code extension for the R programming language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=REditorSupport.r"; + homepage = "https://github.com/REditorSupport/vscode-R"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pandapip1 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 056904390c3ea..6fd65c9ae9b4a 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -1,16 +1,17 @@ -{ lib -, fetchFromGitHub -, vscode-utils -, jq -, rust-analyzer -, nodePackages -, moreutils -, esbuild -, pkg-config -, libsecret -, stdenv -, darwin -, setDefaultServerPath ? true +{ + lib, + fetchFromGitHub, + vscode-utils, + jq, + rust-analyzer, + nodePackages, + moreutils, + esbuild, + pkg-config, + libsecret, + stdenv, + darwin, + setDefaultServerPath ? true, }: let @@ -29,26 +30,32 @@ let hash = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE="; }; - build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"; + build-deps = + nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"; # FIXME: Making a new derivation to link `node_modules` and run `npm run package` # will cause a build failure. vsix = build-deps.override { src = "${src}/editors/code"; - outputs = [ "vsix" "out" ]; + outputs = [ + "vsix" + "out" + ]; inherit releaseTag; - nativeBuildInputs = [ - jq - moreutils - esbuild - # Required by `keytar`, which is a dependency of `vsce`. - pkg-config - libsecret - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.Security - ]; + nativeBuildInputs = + [ + jq + moreutils + esbuild + # Required by `keytar`, which is a dependency of `vsce`. + pkg-config + libsecret + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Security + ]; # Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65 postRebuild = '' @@ -65,7 +72,6 @@ let echo y | npx vsce package -o $vsix/${pname}.zip ''; }; - in vscode-utils.buildVscodeExtension { inherit version vsix; @@ -75,7 +81,10 @@ vscode-utils.buildVscodeExtension { vscodeExtPublisher = publisher; vscodeExtName = pname; - nativeBuildInputs = lib.optionals setDefaultServerPath [ jq moreutils ]; + nativeBuildInputs = lib.optionals setDefaultServerPath [ + jq + moreutils + ]; preInstall = lib.optionalString setDefaultServerPath '' jq '.contributes.configuration.properties."rust-analyzer.server.path".default = $s' \ @@ -86,9 +95,11 @@ vscode-utils.buildVscodeExtension { meta = { description = "An alternative rust language server to the RLS"; homepage = "https://github.com/rust-lang/rust-analyzer"; - license = [ lib.licenses.mit lib.licenses.asl20 ]; + license = [ + lib.licenses.mit + lib.licenses.asl20 + ]; maintainers = [ ]; platforms = lib.platforms.all; }; } - diff --git a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix index a6a33854d3b1a..4a8db2db4be54 100644 --- a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix @@ -1,6 +1,7 @@ -{ lib -, vscode-utils -, lua-language-server +{ + lib, + vscode-utils, + lua-language-server, }: vscode-utils.buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/editors/vscode/extensions/updateSettings.nix b/pkgs/applications/editors/vscode/extensions/updateSettings.nix index 443b409302796..fe23e099b536d 100644 --- a/pkgs/applications/editors/vscode/extensions/updateSettings.nix +++ b/pkgs/applications/editors/vscode/extensions/updateSettings.nix @@ -1,39 +1,43 @@ # Updates the vscode setting file base on a nix expression # should run from the workspace root. -{ writeShellScriptBin -, lib -, jq +{ + writeShellScriptBin, + lib, + jq, }: ##User Input -{ settings ? {} -# if marked as true will create an empty json file if does not exist -, createIfDoesNotExists ? true -, vscodeSettingsFile ? ".vscode/settings.json" -, userSettingsFolder ? "" -, symlinkFromUserSetting ? false +{ + settings ? { }, + # if marked as true will create an empty json file if does not exist + createIfDoesNotExists ? true, + vscodeSettingsFile ? ".vscode/settings.json", + userSettingsFolder ? "", + symlinkFromUserSetting ? false, }: let updateVSCodeSettingsCmd = '' - ( - echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' - oldSettings=$(cat ${vscodeSettingsFile}) - echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} - )''; + ( + echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' + oldSettings=$(cat ${vscodeSettingsFile}) + echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} + )''; createEmptySettingsCmd = ''mkdir -p .vscode && echo "{}" > ${vscodeSettingsFile}''; fileName = builtins.baseNameOf vscodeSettingsFile; - symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting - '' && mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; + symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting ''&& mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; in - writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' - (lib.optionalString (settings != {}) - (if createIfDoesNotExists then '' - [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} - ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} - '' - else ''[ -f "${vscodeSettingsFile}" ] && ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} - '' - ) +writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' ( + lib.optionalString (settings != { }) ( + if createIfDoesNotExists then + '' + [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} + ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} + '' + else + '' + [ -f "${vscodeSettingsFile}" ] && ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} + '' ) +) diff --git a/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix b/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix index 097b9cad16616..f12350077590d 100644 --- a/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix +++ b/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix @@ -1,5 +1,5 @@ -with import <nixpkgs>{}; -callPackage (import ./updateSettings.nix) {} { +with import <nixpkgs> { }; +callPackage (import ./updateSettings.nix) { } { settings = { a = "fdsdf"; }; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index b6e47094d57a9..70f4cbd833deb 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -1,5 +1,20 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, runCommand, rustPlatform, makeWrapper, llvmPackages -, buildNpmPackage, cmake, nodejs, unzip, python3, pkg-config, libsecret, darwin +{ + pkgs, + lib, + stdenv, + fetchFromGitHub, + runCommand, + rustPlatform, + makeWrapper, + llvmPackages, + buildNpmPackage, + cmake, + nodejs, + unzip, + python3, + pkg-config, + libsecret, + darwin, }: assert lib.versionAtLeast python3.version "3.5"; let @@ -31,9 +46,7 @@ let nativeBuildInputs = [ makeWrapper ]; - env = lib.optionalAttrs stdenv.isDarwin { - NIX_LDFLAGS = "-llldb -lc++abi"; - }; + env = lib.optionalAttrs stdenv.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; buildAndTestSubdir = "adapter"; @@ -76,12 +89,15 @@ let pkg-config ]; - buildInputs = [ - libsecret - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Security - AppKit - ]); + buildInputs = + [ libsecret ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Security + AppKit + ] + ); dontNpmBuild = true; @@ -103,14 +119,25 @@ let "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" else "${lldb.out}/bin/lldb-server"; - -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "vscode-extension-${publisher}-${pname}"; - inherit src version vscodeExtUniqueId vscodeExtPublisher vscodeExtName; + inherit + src + version + vscodeExtUniqueId + vscodeExtPublisher + vscodeExtName + ; installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; - nativeBuildInputs = [ cmake nodejs unzip makeWrapper ]; + nativeBuildInputs = [ + cmake + nodejs + unzip + makeWrapper + ]; patches = [ ./cmake-build-extension-only.patch ]; @@ -120,12 +147,14 @@ in stdenv.mkDerivation { --replace "1.9.2" ${version} ''; - postConfigure = '' - cp -r ${nodeDeps}/lib/node_modules . - '' + lib.optionalString stdenv.isDarwin '' - export HOME="$TMPDIR/home" - mkdir $HOME - ''; + postConfigure = + '' + cp -r ${nodeDeps}/lib/node_modules . + '' + + lib.optionalString stdenv.isDarwin '' + export HOME="$TMPDIR/home" + mkdir $HOME + ''; cmakeFlags = [ # Do not append timestamp to version. diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix index 9c5ce50fa245a..7708c52c80b03 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/lldb.nix @@ -1,5 +1,9 @@ # Patched lldb for Rust language support. -{ fetchFromGitHub, runCommand, llvmPackages }: +{ + fetchFromGitHub, + runCommand, + llvmPackages, +}: let llvmSrc = fetchFromGitHub { owner = "vadimcn"; @@ -8,8 +12,9 @@ let rev = "4c267c83cbb55fedf2e0b89644dc1db320fdfde7"; hash = "sha256-jM//ej6AxnRYj+8BAn4QrxHPT6HiDzK5RqHPSg3dCcw="; }; -in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec { - passthru = (oldAttrs.passthru or {}) // { +in +(llvmPackages.lldb.overrideAttrs (oldAttrs: rec { + passthru = (oldAttrs.passthru or { }) // { inherit llvmSrc; }; @@ -23,7 +28,8 @@ in (llvmPackages.lldb.overrideAttrs (oldAttrs: rec { echo "'lldb --version' returns: $versionOutput" echo "$versionOutput" | grep -q 'rust-enabled' ''; -})).override({ - monorepoSrc = llvmSrc; - libllvm = llvmPackages.libllvm.override({ monorepoSrc = llvmSrc; }); -}) +})).override + ({ + monorepoSrc = llvmSrc; + libllvm = llvmPackages.libllvm.override ({ monorepoSrc = llvmSrc; }); + }) diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 940a39a217624..d457b156aa97e 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -1,77 +1,101 @@ -{ stdenv, lib, buildEnv, writeShellScriptBin, fetchurl, vscode, unzip, jq }: +{ + stdenv, + lib, + buildEnv, + writeShellScriptBin, + fetchurl, + vscode, + unzip, + jq, +}: let - buildVscodeExtension = a@{ - name, - src, - # Same as "Unique Identifier" on the extension's web page. - # For the moment, only serve as unique extension dir. - vscodeExtPublisher, - vscodeExtName, - vscodeExtUniqueId, - configurePhase ? '' - runHook preConfigure - runHook postConfigure - '', - buildPhase ?'' - runHook preBuild - runHook postBuild - '', - dontPatchELF ? true, - dontStrip ? true, - nativeBuildInputs ? [], - passthru ? { }, - ... - }: - stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { - - name = "vscode-extension-${name}"; - - passthru = passthru // { - inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; - }; - - inherit configurePhase buildPhase dontPatchELF dontStrip; - - # Some .vsix files contain other directories (e.g., `package`) that we don't use. - # If other directories are present but `sourceRoot` is unset, the unpacker phase fails. - sourceRoot = "extension"; - - installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; - - nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; - - installPhase = '' - - runHook preInstall - - mkdir -p "$out/$installPrefix" - find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/$installPrefix/" - - runHook postInstall - ''; - - }); - - fetchVsixFromVscodeMarketplace = mktplcExtRef: - fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef); - - buildVscodeMarketplaceExtension = a@{ - name ? "", - src ? null, - vsix ? null, - mktplcRef, - ... - }: assert "" == name; assert null == src; - buildVscodeExtension ((removeAttrs a [ "mktplcRef" "vsix" ]) // { - name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}"; - version = mktplcRef.version; - src = if (vsix != null) - then vsix - else fetchVsixFromVscodeMarketplace mktplcRef; - vscodeExtPublisher = mktplcRef.publisher; - vscodeExtName = mktplcRef.name; - vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; - }); + buildVscodeExtension = + a@{ + name, + src, + # Same as "Unique Identifier" on the extension's web page. + # For the moment, only serve as unique extension dir. + vscodeExtPublisher, + vscodeExtName, + vscodeExtUniqueId, + configurePhase ? '' + runHook preConfigure + runHook postConfigure + '', + buildPhase ? '' + runHook preBuild + runHook postBuild + '', + dontPatchELF ? true, + dontStrip ? true, + nativeBuildInputs ? [ ], + passthru ? { }, + ... + }: + stdenv.mkDerivation ( + (removeAttrs a [ "vscodeExtUniqueId" ]) + // { + + name = "vscode-extension-${name}"; + + passthru = passthru // { + inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; + }; + + inherit + configurePhase + buildPhase + dontPatchELF + dontStrip + ; + + # Some .vsix files contain other directories (e.g., `package`) that we don't use. + # If other directories are present but `sourceRoot` is unset, the unpacker phase fails. + sourceRoot = "extension"; + + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; + + nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; + + installPhase = '' + + runHook preInstall + + mkdir -p "$out/$installPrefix" + find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/$installPrefix/" + + runHook postInstall + ''; + } + ); + + fetchVsixFromVscodeMarketplace = + mktplcExtRef: fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef); + + buildVscodeMarketplaceExtension = + a@{ + name ? "", + src ? null, + vsix ? null, + mktplcRef, + ... + }: + assert "" == name; + assert null == src; + buildVscodeExtension ( + (removeAttrs a [ + "mktplcRef" + "vsix" + ]) + // { + name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}"; + version = mktplcRef.version; + src = if (vsix != null) then vsix else fetchVsixFromVscodeMarketplace mktplcRef; + vscodeExtPublisher = mktplcRef.publisher; + vscodeExtName = mktplcRef.name; + vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; + } + ); mktplcRefAttrList = [ "name" @@ -82,14 +106,18 @@ let "arch" ]; - mktplcExtRefToExtDrv = ext: - buildVscodeMarketplaceExtension (removeAttrs ext mktplcRefAttrList // { - mktplcRef = builtins.intersectAttrs (lib.genAttrs mktplcRefAttrList (_: null)) ext; - }); + mktplcExtRefToExtDrv = + ext: + buildVscodeMarketplaceExtension ( + removeAttrs ext mktplcRefAttrList + // { + mktplcRef = builtins.intersectAttrs (lib.genAttrs mktplcRefAttrList (_: null)) ext; + } + ); extensionFromVscodeMarketplace = mktplcExtRefToExtDrv; - extensionsFromVscodeMarketplace = mktplcExtRefList: - builtins.map extensionFromVscodeMarketplace mktplcExtRefList; + extensionsFromVscodeMarketplace = + mktplcExtRefList: builtins.map extensionFromVscodeMarketplace mktplcExtRefList; vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib extensionsFromVscodeMarketplace writeShellScriptBin; @@ -102,7 +130,13 @@ let }; vscodeEnv = import ./vscodeEnv.nix { - inherit lib buildEnv writeShellScriptBin extensionsFromVscodeMarketplace jq; + inherit + lib + buildEnv + writeShellScriptBin + extensionsFromVscodeMarketplace + jq + ; vscodeDefault = vscode; }; @@ -139,9 +173,16 @@ let toExtensionJson = extensions: builtins.toJSON (map toExtensionJsonEntry extensions); in { - inherit fetchVsixFromVscodeMarketplace buildVscodeExtension - buildVscodeMarketplaceExtension extensionFromVscodeMarketplace - extensionsFromVscodeMarketplace - vscodeWithConfiguration vscodeExts2nix vscodeEnv - toExtensionJsonEntry toExtensionJson; + inherit + fetchVsixFromVscodeMarketplace + buildVscodeExtension + buildVscodeMarketplaceExtension + extensionFromVscodeMarketplace + extensionsFromVscodeMarketplace + vscodeWithConfiguration + vscodeExts2nix + vscodeEnv + toExtensionJsonEntry + toExtensionJson + ; } diff --git a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix index db00ba13e3c84..37b82075e7518 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix @@ -1,47 +1,58 @@ #Use vscodeWithConfiguration and vscodeExts2nix to create a vscode executable. When the executable exits, it updates the mutable extension file, which is imported when evaluated by Nix later. -{ lib -, buildEnv -, writeShellScriptBin -, extensionsFromVscodeMarketplace -, vscodeDefault -, jq +{ + lib, + buildEnv, + writeShellScriptBin, + extensionsFromVscodeMarketplace, + vscodeDefault, + jq, }: ##User input -{ vscode ? vscodeDefault -, nixExtensions ? [] -, vscodeExtsFolderName ? ".vscode-exts" -# will add to the command updateSettings (which will run on executing vscode) settings to override in settings.json file -, settings ? {} -, createSettingsIfDoesNotExists ? true -, launch ? {} -, createLaunchIfDoesNotExists ? true -# will add to the command updateKeybindings(which will run on executing vscode) keybindings to override in keybinding.json file -, keybindings ? {} -, createKeybindingsIfDoesNotExists ? true -, user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir'' -# if file exists will use it and import the extensions in it into this derivation else will use empty extensions list -# this file will be created/updated by vscodeExts2nix when vscode exists -, mutableExtensionsFile +{ + vscode ? vscodeDefault, + nixExtensions ? [ ], + vscodeExtsFolderName ? ".vscode-exts", + # will add to the command updateSettings (which will run on executing vscode) settings to override in settings.json file + settings ? { }, + createSettingsIfDoesNotExists ? true, + launch ? { }, + createLaunchIfDoesNotExists ? true, + # will add to the command updateKeybindings(which will run on executing vscode) keybindings to override in keybinding.json file + keybindings ? { }, + createKeybindingsIfDoesNotExists ? true, + user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir'', + # if file exists will use it and import the extensions in it into this derivation else will use empty extensions list + # this file will be created/updated by vscodeExts2nix when vscode exists + mutableExtensionsFile, }: let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = lib.optionals (builtins.pathExists mutableExtensionsFile) (import mutableExtensionsFilePath); - vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { - inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; - vscodeDefault = vscode; - } - { - inherit nixExtensions mutableExtensions vscodeExtsFolderName user-data-dir; - }; + mutableExtensions = lib.optionals (builtins.pathExists mutableExtensionsFile) ( + import mutableExtensionsFilePath + ); + vscodeWithConfiguration = + import ./vscodeWithConfiguration.nix + { + inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; + vscodeDefault = vscode; + } + { + inherit + nixExtensions + mutableExtensions + vscodeExtsFolderName + user-data-dir + ; + }; updateSettings = import ./updateSettings.nix { inherit lib writeShellScriptBin jq; }; - userSettingsFolder = "${ user-data-dir }/User"; + userSettingsFolder = "${user-data-dir}/User"; updateSettingsCmd = updateSettings { settings = { - "extensions.autoCheckUpdates" = false; - "extensions.autoUpdate" = false; - "update.mode" = "none"; + "extensions.autoCheckUpdates" = false; + "extensions.autoUpdate" = false; + "update.mode" = "none"; } // settings; inherit userSettingsFolder; createIfDoesNotExists = createSettingsIfDoesNotExists; @@ -62,14 +73,16 @@ let symlinkFromUserSetting = (user-data-dir != ""); }; - vscodeExts2nix = import ./vscodeExts2nix.nix { - inherit lib writeShellScriptBin; - vscodeDefault = vscodeWithConfiguration; - } - { - extensionsToIgnore = nixExtensions; - extensions = mutableExtensions; - }; + vscodeExts2nix = + import ./vscodeExts2nix.nix + { + inherit lib writeShellScriptBin; + vscodeDefault = vscodeWithConfiguration; + } + { + extensionsToIgnore = nixExtensions; + extensions = mutableExtensions; + }; code = writeShellScriptBin "code" '' ${updateSettingsCmd}/bin/vscodeNixUpdate-settings ${updateLaunchCmd}/bin/vscodeNixUpdate-launch @@ -81,5 +94,11 @@ let in buildEnv { name = "vscodeEnv"; - paths = [ code vscodeExts2nix updateSettingsCmd updateLaunchCmd updateKeybindingsCmd ]; + paths = [ + code + vscodeExts2nix + updateSettingsCmd + updateLaunchCmd + updateKeybindingsCmd + ]; } diff --git a/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix index 19a9edbf1afe4..2bca1608d2574 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix @@ -1,11 +1,13 @@ -with import <nixpkgs>{}; -callPackage (import ./vscodeEnv.nix) { - extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace; - vscodeDefault = vscode; -} { - mutableExtensionsFile = ./extensions.nix; - settings = { - a = "fdsdf"; - t = "test"; - }; -} +with import <nixpkgs> { }; +callPackage (import ./vscodeEnv.nix) + { + extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace; + vscodeDefault = vscode; + } + { + mutableExtensionsFile = ./extensions.nix; + settings = { + a = "fdsdf"; + t = "test"; + }; + } diff --git a/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix b/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix index 58cbe663c9013..96b892911b06d 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix @@ -1,14 +1,16 @@ # based on the passed vscode will stdout a nix expression with the installed vscode extensions -{ lib -, vscodeDefault -, writeShellScriptBin +{ + lib, + vscodeDefault, + writeShellScriptBin, }: ##User input -{ vscode ? vscodeDefault -, extensionsToIgnore ? [] -# will use those extensions to get sha256 if still exists when executed. -, extensions ? [] +{ + vscode ? vscodeDefault, + extensionsToIgnore ? [ ], + # will use those extensions to get sha256 if still exists when executed. + extensions ? [ ], }: let mktplcExtRefToFetchArgs = import ./mktplcExtRefToFetchArgs.nix; @@ -17,22 +19,32 @@ writeShellScriptBin "vscodeExts2nix" '' echo '[' for line in $(${vscode}/bin/code --list-extensions --show-versions \ - ${lib.optionalString (extensionsToIgnore != []) '' - | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : "${e.publisher}.${e.name}") extensionsToIgnore}\)' - ''} + ${ + lib.optionalString (extensionsToIgnore != [ ]) '' + | grep -v -i '^\(${ + lib.concatMapStringsSep "\\|" (e: "${e.publisher}.${e.name}") extensionsToIgnore + }\)' + '' + } ) ; do [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]] name=''${BASH_REMATCH[2]} publisher=''${BASH_REMATCH[1]} version=''${BASH_REMATCH[3]} - extensions="${lib.concatMapStringsSep "." (e : "${e.publisher}${e.name}@${e.sha256}") extensions}" + extensions="${lib.concatMapStringsSep "." (e: "${e.publisher}${e.name}@${e.sha256}") extensions}" reCurrentExt=$publisher$name"@([^.]*)" if [[ $extensions =~ $reCurrentExt ]]; then sha256=''${BASH_REMATCH[1]} else sha256=$( - nix-prefetch-url "${(mktplcExtRefToFetchArgs {publisher = ''"$publisher"''; name = ''"$name"''; version = ''"$version"'';}).url}" 2> /dev/null + nix-prefetch-url "${ + (mktplcExtRefToFetchArgs { + publisher = ''"$publisher"''; + name = ''"$name"''; + version = ''"$version"''; + }).url + }" 2> /dev/null ) fi diff --git a/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix b/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix index 39479d7c2f2ce..6e2fd767a792e 100644 --- a/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix +++ b/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix @@ -1,54 +1,61 @@ # wrapper over vscode to control extensions per project (extensions folder will be created in execution path) -{ lib -, writeShellScriptBin -, extensionsFromVscodeMarketplace -, vscodeDefault +{ + lib, + writeShellScriptBin, + extensionsFromVscodeMarketplace, + vscodeDefault, }: ## User input -{ vscode ? vscodeDefault -# extensions to be symlinked into the project's extensions folder -, nixExtensions ? [] -# extensions to be copied into the project's extensions folder -, mutableExtensions ? [] -, vscodeExtsFolderName ? ".vscode-exts" -, user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"'' +{ + vscode ? vscodeDefault, + # extensions to be symlinked into the project's extensions folder + nixExtensions ? [ ], + # extensions to be copied into the project's extensions folder + mutableExtensions ? [ ], + vscodeExtsFolderName ? ".vscode-exts", + user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"'', }: let nixExtsDrvs = extensionsFromVscodeMarketplace nixExtensions; mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; - mutableExtsPaths = lib.forEach mutExtsDrvs ( e: - { + mutableExtsPaths = lib.forEach mutExtsDrvs (e: { origin = "${e}/share/vscode/extensions/${e.vscodeExtUniqueId}"; - target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; - } - ); + target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${ + (lib.findSingle ( + ext: "${ext.publisher}.${ext.name}" == e.vscodeExtUniqueId + ) "" "m" mutableExtensions).version + }''; + }); #removed not defined extensions - rmExtensions = lib.optionalString (nixExtensions++mutableExtensions != []) '' + rmExtensions = lib.optionalString (nixExtensions ++ mutableExtensions != [ ]) '' find ${vscodeExtsFolderName} -mindepth 1 -maxdepth 1 ${ - lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name} ") nixExtensions - + - lib.concatMapStringsSep " " (e : "! -iname ${e.publisher}.${e.name}-${e.version} ") mutableExtensions - } -exec rm -rf {} \; + lib.concatMapStringsSep " " (e: "! -iname ${e.publisher}.${e.name} ") nixExtensions + + lib.concatMapStringsSep " " ( + e: "! -iname ${e.publisher}.${e.name}-${e.version} " + ) mutableExtensions + } -exec rm -rf {} \; ''; #copy mutable extension out of the nix store cpExtensions = '' - ${lib.concatMapStringsSep "\n" (e : "ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/") nixExtsDrvs} - ${lib.concatMapStringsSep "\n" (ePath : '' + ${lib.concatMapStringsSep "\n" ( + e: "ln -sfn ${e}/share/vscode/extensions/* ${vscodeExtsFolderName}/" + ) nixExtsDrvs} + ${lib.concatMapStringsSep "\n" (ePath: '' if [ ! -d ${ePath.target} ]; then cp -a ${ePath.origin} ${ePath.target} chmod -R u+rwx ${ePath.target} fi - '') mutableExtsPaths} + '') mutableExtsPaths} ''; in - writeShellScriptBin "code" '' - if ! [[ "$@" =~ "--list-extension" ]]; then - mkdir -p "${vscodeExtsFolderName}" - ${rmExtensions} - ${cpExtensions} - fi - ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ - lib.optionalString (user-data-dir != "") "--user-data-dir ${user-data-dir}" - } "$@" - '' +writeShellScriptBin "code" '' + if ! [[ "$@" =~ "--list-extension" ]]; then + mkdir -p "${vscodeExtsFolderName}" + ${rmExtensions} + ${cpExtensions} + fi + ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ + lib.optionalString (user-data-dir != "") "--user-data-dir ${user-data-dir}" + } "$@" +'' diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 12c86c3680f83..9ad54f00d4e8e 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -1,10 +1,8 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , callPackage , patchelf -, unzip , poco , openssl , SDL2 @@ -16,18 +14,18 @@ }: let - version = "2.8.1"; + version = "2.8.2"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - hash = "sha256-8bl83AOIWtUQ06F2unYEF08VT13o9EGo9YDZpdNxd8w="; + hash = "sha256-Kv0supnYKWLaVqOeZAzQNd3tQRP2KJugZqytyoj8QtY="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; rev = "v${version}"; - hash = "sha256-aCRJ3idSrRM8ydt8hP8nA1RR0etPnWpQKphXcOGgTfk="; + hash = "sha256-5ZsLsqrkO02NLJCzsgf0k/ifsqNybTi4DcB9GLmWDHw="; }; in @@ -39,7 +37,7 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - hash = "sha256-iQCv4EDdqmnU0fYxMwpCZ2Z5p43P0MGBNIG/dZrWndg="; + hash = "sha256-ozebHgUgwdqYtWAyL+EdwpjEvZC+PkWcLYCPWz2FjSw="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 3f77dcd105f91..568f43d3564cc 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -202,7 +202,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ - MP2E ashkitten ivar ]; diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 7c409692d939d..b4698480a962d 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten Madouura ]; + maintainers = with maintainers; [ ashkitten Madouura ]; broken = stdenv.isDarwin; platforms = platforms.unix; }; diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index c61b1662a6c4d..4ba40b417c8cb 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.264"; + version = "0.265"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-0UWMBKM//XWm8PFl60JvTLGaDBMVZFnVrbX4omy2F4I="; + hash = "sha256-jXGmABFeoT8g2UtVV159gUpdWcBvb9aX3uiFi2neVQI="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/pkgs/applications/emulators/retroarch/retroarch-assets.nix index 29f58b99653f2..b97d551a6c868 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-assets.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-assets.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation { pname = "retroarch-assets"; - version = "unstable-2024-04-24"; + version = "1.17.0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "libretro"; @@ -24,7 +24,9 @@ stdenvNoCC.mkDerivation { dontBuild = true; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Assets needed for RetroArch"; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index fbcc5ebcf4785..fe100492a95cd 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Access, organize and share your photos"; mainProgram = "gnome-photos"; - homepage = "https://wiki.gnome.org/Apps/Photos"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-photos"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 79793c6887116..ca9406044fc92 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Gthumb"; + homepage = "https://gitlab.gnome.org/GNOME/gthumb"; description = "Image browser and viewer for GNOME"; mainProgram = "gthumb"; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index d546baa98415f..e2a0d62acae6f 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -8,23 +8,26 @@ , python3Packages , qtbase , qtcharts +, makeDesktopItem +, copyDesktopItems }: python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "566"; + version = "572"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-0vz2UnfU7yZIy1S+KOXLFrlQDuPCbpSw1GYEK8YZ/Qc="; + hash = "sha256-mLb4rUsoMDxl7lPrrRJq/bWSqZlgg94efHJzgykZJ/g="; }; nativeBuildInputs = [ wrapQtAppsHook python3Packages.mkdocs-material + copyDesktopItems ]; buildInputs = [ @@ -32,6 +35,20 @@ python3Packages.buildPythonPackage rec { qtcharts ]; + desktopItems = [ + (makeDesktopItem { + name = "hydrus-client"; + exec = "hydrus-client"; + desktopName = "Hydrus Client"; + icon = "hydrus-client"; + comment = meta.description; + terminal = false; + type = "Application"; + categories = [ "FileTools" "Utility" ]; + }) + ]; + + propagatedBuildInputs = with python3Packages; [ beautifulsoup4 cbor2 @@ -104,6 +121,8 @@ python3Packages.buildPythonPackage rec { outputs = [ "out" "doc" ]; installPhase = '' + runHook preInstall + # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} mv {hydrus,static,db} $out/${python3Packages.python.sitePackages} @@ -118,12 +137,18 @@ python3Packages.buildPythonPackage rec { mkdir -p $out/bin install -m0755 hydrus_server.py $out/bin/hydrus-server install -m0755 hydrus_client.py $out/bin/hydrus-client + + # desktop item + mkdir -p "$out/share/icons/hicolor/scalable/apps" + ln -s "$doc/share/doc/hydrus/assets/hydrus-white.svg" "$out/share/icons/hicolor/scalable/apps/hydrus-client.svg" '' + lib.optionalString enableSwftools '' mkdir -p $out/${python3Packages.python.sitePackages}/bin # swfrender seems to have to be called sfwrender_linux # not sure if it can be loaded through PATH, but this is simpler # $out/python3Packages.python.sitePackages/bin is correct NOT .../hydrus/bin ln -s ${swftools}/bin/swfrender $out/${python3Packages.python.sitePackages}/bin/swfrender_linux + '' + '' + runHook postInstall ''; dontWrapQtApps = true; diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 25df4c69c66c0..d6243bdbffac3 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/OCRFeeder"; + homepage = "https://gitlab.gnome.org/GNOME/ocrfeeder"; description = "Complete Optical Character Recognition and Document Analysis and Recognition program"; maintainers = with maintainers; [ doronbehar ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index d7e322f39588d..3c571a2adf768 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.18"; + version = "0.8.19"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-TLY6ydYeRuT93jjUeE7EaFNNllwla4h563UhXAxSyko="; + hash = "sha256-oCgnz1WMg7YypIT8Tjk2m+f/43Aj88rDVCxQ92aL3RY="; }; - cargoHash = "sha256-RKJE09Z4XxRLWQ95Om3tru4rI2TD7XmxoHhPHFirREo="; + cargoHash = "sha256-vlU7egAht+kgA5Vx0HAwQOIax9qD4FLRo1ZUNx4RieY="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index e6d6eb41b9e08..df056d92fbe49 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -35,8 +35,6 @@ , gsettings-desktop-schemas }: -# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling - stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; version = "0.32.6"; @@ -97,9 +95,9 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Popular photo organizer for the GNOME desktop"; mainProgram = "shotwell"; - homepage = "https://wiki.gnome.org/Apps/Shotwell"; + homepage = "https://gitlab.gnome.org/GNOME/shotwell"; license = licenses.lgpl21Plus; - maintainers = with maintainers; []; + maintainers = with maintainers; [ bobby285271 ]; platforms = platforms.linux; }; }) diff --git a/pkgs/applications/graphics/texturepacker/default.nix b/pkgs/applications/graphics/texturepacker/default.nix index ccae60f1433e8..fdf1d2b9fa6c7 100644 --- a/pkgs/applications/graphics/texturepacker/default.nix +++ b/pkgs/applications/graphics/texturepacker/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "texturepacker"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb"; - hash = "sha256-64aAg8V61MwJjFLYcf/nv5Bp7W0+cQBZac2e1HzkJBw="; + hash = "sha256-0i6LDrLBvTFKC5kW2PXP3Be6boUIJZ0fd1JG6FoS1kQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 35677f56cccbc..48e663fe796c3 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small GTK application to allow to keep a diary of your life"; mainProgram = "almanah"; - homepage = "https://wiki.gnome.org/Apps/Almanah_Diary"; + homepage = "https://gitlab.gnome.org/GNOME/almanah"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = teams.gnome.members; diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index e35939536a614..1fda517675416 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-W0XbNZDSeSK6oxOD1JeLNF+c6/6cy/WQrrmQbSKeqk4="; + sha256 = "sha256-aAhceExz5SENL+FhPHyx8HmaNOWjNsynv81Rj2cS5M8="; }; - cargoHash = "sha256-IM2SKovb8FYwA/c4R3N7M+oVuGfuc5sK+r6FP9YMk+I="; + cargoHash = "sha256-vw7fGsTSEVO8s1LzilKJN5lGzOfQcms1h7rnTOyE4Kw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/fead/default.nix b/pkgs/applications/misc/fead/default.nix index 73907a1758817..d18ff21801d77 100644 --- a/pkgs/applications/misc/fead/default.nix +++ b/pkgs/applications/misc/fead/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromSourcehut, python3, help2man }: +{ lib, stdenv, fetchzip, python3, help2man }: stdenv.mkDerivation rec { pname = "fead"; - version = "0.1.3"; + version = "1.0.0"; - src = fetchFromSourcehut { - owner = "~cnx"; - repo = pname; - rev = version; - sha256 = "sha256-cW0GxyvC9url2QAAWD0M2pR4gBiPA3eeAaw77TwMV/0="; + src = fetchzip { + url = "https://trong.loang.net/~cnx/fead/snapshot/fead-${version}.tar.gz"; + hash = "sha256-cbU379Zz+mwRqEHiDUlGvWheLkkr0YidHeVs/1Leg38="; }; nativeBuildInputs = [ help2man ]; @@ -29,9 +27,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Advert generator from web feeds"; - homepage = "https://git.sr.ht/~cnx/fead"; + homepage = "https://trong.loang.net/~cnx/fead"; license = licenses.agpl3Plus; - changelog = "https://git.sr.ht/~cnx/fead/refs/${version}"; + changelog = "https://trong.loang.net/~cnx/fead/tag?h=${version}"; maintainers = with maintainers; [ McSinyx ]; mainProgram = "fead"; }; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index b4cca2f3bf63b..0a37cadb8e2cb 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for writing an ISO file to multiple USB devices at once"; mainProgram = "gnome-multi-writer"; - homepage = "https://wiki.gnome.org/Apps/MultiWriter"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-multi-writer"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index dc4df70bc00e4..d1680cdbaee2b 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Recipe management application for GNOME"; mainProgram = "gnome-recipes"; - homepage = "https://wiki.gnome.org/Apps/Recipes"; + homepage = "https://gitlab.gnome.org/GNOME/recipes"; maintainers = teams.gnome.members; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 293c3c5691ecf..44e96cb9085a9 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "23.2"; + version = "24"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-r2iw1vINWgqxoW0Zc8Sloa+wN/GUbUQfJ0e2BSP9vxM="; + sha256 = "sha256-gMwTdwYjYJt1j5MpHw6UD1wqmF7q3ikzjVSOGakIP30="; }; dontUnpack = true; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index ee7d7d3a95b95..eccb7df29166b 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.7.1"; + version = "3.7.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-uiJy4kfcTFUymyE0DxP6GlMX7ONogLFrx6K9IcgwTSE="; + sha256 = "sha256-lIrqMvI/sYGu36X3jNptoIz7mPVomk8YCIR/6y8mpEc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index b85e00d095ed0..258079f61c93d 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-NgMEgSfHVLCEKZ3MmNV571ySMUD8wj+kq5EccGrxtZc="; + hash = "sha256-TpLaZ/935S57K60NdgJXVY+YQEedralZMoQHWRgkH+A="; }; - vendorHash = "sha256-fmc6nbS/Xmn/YRwToRH7EhP4SFRMf8hjZ/rLtaP/USo="; + vendorHash = "sha256-UgpOHZ/CEnGsmUTyNrhh+qDmKEplr18b/OrO2qcIhF4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 23da5323e21f2..b2239298d1a29 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.15.98319"; + version = "0.15.107955"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-0gc3uXBByBR2shKhtUElEiz2saCwmH9vxWFf/WZm6hw="; + sha256 = "sha256-qCG3yi0ACmqOnn+gaCN8GedciUobpOww50Kz5AdknqU="; stripRoot = false; }; diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index 842499f845a68..c33ca9bd2a68e 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2023-07-23"; + version = "2.1-unstable-2023-07-23"; src = fetchFromGitLab { owner = "snakedye"; @@ -13,6 +13,7 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = unstableGitUpdater { url = "https://gitlab.com/snakedye/kile.git"; + tagPrefix = "v"; }; cargoLock = { diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 35be59a3166e5..5fe74bbe204a7 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -5,6 +5,7 @@ , makeWrapper # graphs will not sync without matching upstream's major electron version , electron_27 +, autoPatchelfHook , git , nix-update-script }: @@ -30,7 +31,8 @@ in { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 0d1e5e5f737cc..c7d88edef8678 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - hash = "sha256-+Hc3f8rf0ymddIu52vLtdqNZO4ODW9JnPlyneSZt/OQ="; + hash = "sha256-ai1UHMeLvCba6WV6f6dGc53CxPP7bJaPgo8Tm7ddkOM="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index 9fbe6d0f4aa38..8823744bf3a1f 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -20,6 +20,8 @@ appimageTools.wrapType2 { --replace 'Icon=net.davidotek.pupgui2' 'Icon=${pname}' ''; + extraPkgs = pkgs: with pkgs; [ zstd ]; + meta = with lib; { homepage = "https://davidotek.github.io/protonup-qt/"; description = "Install and manage Proton-GE and Luxtorpeda for Steam and Wine-GE for Lutris with this graphical user interface."; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index e67a96fe7cd3d..c36068e65962d 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.4.1"; + version = "3.29.6.2"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U="; + hash = "sha256-NKWuvhVGtlhWOfV0MWyViTgk0luA8mvnwQS0TZj7Ulc="; }; patches = [ diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 639c46b9bd374..555af71d37257 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-qHNB+jRLQoiHPuTblpCHg2+6e5j8W6YPsuygRlTidtE="; + hash = "sha256-G8p1eaHebUH2lFNyC2njUzZacE6rayApCb7PBFcpKLk="; }; - cargoHash = "sha256-T+fXSca1u9+c305yuKOF+soxnSZ1YbBs57wco5TLpQw="; + cargoHash = "sha256-iM5PsgCUxBbjeWGEIohZwMiCIdXqj/bhFoL0GtVKKq4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 3715ef27524e9..2247344ba765a 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "urlscan"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OzcoOIgEiadWrsUPIxBJTuZQYjScJBYKyqCu1or6fz8="; + hash = "sha256-nyq4BrpfbZwK/nOnB8ZEN1wlM8CssYVRvV7ytpX7k40="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index df33a2bbe7571..a59efb64d9356 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -248,8 +248,8 @@ let # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. ./patches/chromium-121-rust.patch - ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "125") [ - # M124 shipped with broken --ozone-platform-hint flag handling, which we rely on + ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "124.0.6367.118") [ + # M124 < 124.0.6367.118 shipped with broken --ozone-platform-hint flag handling, which we rely on # for our NIXOS_OZONE_WL (wayland) environment variable. # See <https://issues.chromium.org/issues/329678163>. # This is the commit for the fix that landed in M125, which applies clean on M124. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index c3ef4848ee44e..345370868d715 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,9 +15,9 @@ version = "2024-03-14"; }; }; - hash = "sha256-tajZtdiXgs5lRLTmDmgNTM2vD+N+LuWpBS0dYzxUsMA="; - hash_deb_amd64 = "sha256-CyCbZQ5ce8WLTt2JVSqbDkLDboE4BloiZ8pJff3dmSY="; - version = "124.0.6367.91"; + hash = "sha256-+r/48dxipSAo74v1deMuKalW+Hj85hCun63ZcgLYDLk="; + hash_deb_amd64 = "sha256-H3bv6WiVBl4j38ROZ80+SD9UO9ok+xxcKFxDd9yjWNY="; + version = "124.0.6367.118"; }; ungoogled-chromium = { deps = { diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 4b9270b7d5180..409319493a64f 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -72,7 +72,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A new GNOME web browser"; mainProgram = "eolie"; - homepage = "https://wiki.gnome.org/Apps/Eolie"; + homepage = "https://gitlab.gnome.org/World/eolie"; license = licenses.gpl3Plus; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 60be29607787b..3f53923897578 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "125.0.2"; + version = "125.0.3"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ach/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ach/firefox-125.0.3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "c1e0c0a2c0d8604408c1a6deef3619afdee63e3ec6ed2a372b620eaf69becae8"; + sha256 = "1811a9f5618f725b80dbda41568985c051b987dca7c2e207a039668a0d48d42d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/af/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/af/firefox-125.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "eb3a8dda25571e621e8b4b44e521f514bf9dc42341d6658212c05b35854d311e"; + sha256 = "5cca7823582d1be336a25278d02bad75d77f37111b43b56e4168b61edab8986a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/an/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/an/firefox-125.0.3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "592d708dcfff3902a3a07d20d43927f43126a82ee8fb17e15841454aee490b48"; + sha256 = "d38de568b16d3553402dac58f11c494b0e093523d74c20fcaad172fd87d41ad3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ar/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ar/firefox-125.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f9111fb9b0fcfd44e8dac53e714f44512a4738077eece31c542b9013e1d05e96"; + sha256 = "9c643e7791c50c99a8e983e972ff721955af638c2d24a6421e82b0a7dd66f68d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ast/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ast/firefox-125.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f7eb76354add218b6fe8c30cd3a61c30ffbe4fb9a80d27c5d16420c0e61e79d8"; + sha256 = "7cb20ed5898279ef7f96aa33ff931438b553f964d12d94ffaee1925b9523c8cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/az/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/az/firefox-125.0.3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8745fb82e0807bf888a6cce399cbb7700d7b720123ce4a6972caff5ccb677c67"; + sha256 = "1ae2d85a6bb4dbcefd0cd518af75614cce6af43c641c49dbfe7c4bacef6691d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/be/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/be/firefox-125.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d6725d8fe67b309058dfcf33951619e0f0b57b05e8dcdbf3d5f9462e3c903684"; + sha256 = "84d7aed6ac1f46390b378ce432ecc00723a70caf5b34e33adac9449fb704ebf9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/bg/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/bg/firefox-125.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c66ec00ce77d7c0743c0ac98029b064b4cf21d70ff3b1f07b7611e60a4e9b575"; + sha256 = "9071fc64447f3772c88469385eef3fcc1f36188628c18b929ba1320b4bc01d1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/bn/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/bn/firefox-125.0.3.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9cf7401bf5fc8be7cf30e3dbcd97fc51c8a8948f3ab31d9d311fc5dccd2628d2"; + sha256 = "c8ccaf292b17f5d89b9c7af28b79a5a9d5edc53d3a7cff92be8cfb5166481ba4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/br/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/br/firefox-125.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6648ecdfc1e7931caff9e3cb2fec9984d83a1f1b5298f3ea0f72b0bbfdb2abcb"; + sha256 = "4cae7d705d2161603b35dcdfb2cd92c3a80922bba95bdc3f5945a59a1b19a011"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/bs/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/bs/firefox-125.0.3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "f2892526f0fa826666549bbf7412c0ad42a4bc74841a3c3c53f1965c24246f54"; + sha256 = "cb74e00873abd0466c97f500ff5de4ab914beb7e0714f8f07ad7f72eeb300013"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ca-valencia/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ca-valencia/firefox-125.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "0ba73ee9bb67921fa1ab4ede7c8803a50e1f9991de703a0b0340d6d95e62b906"; + sha256 = "2995878a5d1b127fa68fdc196f74c4173b14d48e13bfeb28252515ace585ceb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ca/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ca/firefox-125.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "445306c9e98bdf82942560d91b367fa623641c860531531e47062956bb12d944"; + sha256 = "47180f3814da29da56848baf7f050184face647f42f2e0b6dac9d9979979028d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/cak/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/cak/firefox-125.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b008e29144aaea98bb7617903df3d99af922482d03ff45d0079daf68977b44f8"; + sha256 = "ab400636a09114d9b79a42a375aa2eefeef0e191aa69aa0ee12ee2caaf5e72f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/cs/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/cs/firefox-125.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "60eddd9dd435f828416c8612d42b64cde2d095a29dd0e38112a1467aae211797"; + sha256 = "5506a162fbde8afa5e255a657b87c840202d5d02784e6a78ac68c02a1affdbfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/cy/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/cy/firefox-125.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b01de57e45b6d6c887a7c0caed9681a59799bf8864d6a30d999622c64758518e"; + sha256 = "5dc8e2177e509c4f5d971b89c6b95b89a2d33d2bfdcc70533bc226d41d2b28cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/da/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/da/firefox-125.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1d855f06c7967a4ffbace2f65b14290a4cb9cfd59bd57660c6f98697d897a982"; + sha256 = "d8ca13cba46ddb0ba0f10d99ebac9f75da7e9ee5b3858b50315d0f3212d86ef0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/de/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/de/firefox-125.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "88bf1866dcb4afd25cfa55f67e316f09d75ddda0012ba8d2188183c72e55f83f"; + sha256 = "74aec53ca8eccfa25fa1925a1d26323d481c7b0457fbde0be32eb4210e8daea9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/dsb/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/dsb/firefox-125.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0637ff08956b7c76f36f8f3e7f3811acb3f8dc36a3948b9d318dd3330ba75148"; + sha256 = "f6725093e244d296bcb048998ed9bcb70dd58a9864e45f28bfa5cd833e265c1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/el/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/el/firefox-125.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "805d626a871401ae319f98f0cd0809ce4718d6c5511d521e8d15479a5bcf2469"; + sha256 = "9cadc42340a199d5f5744d55dcd403584cf06e7853be6d6a030767ca5590a872"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/en-CA/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/en-CA/firefox-125.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f0f564282dfd392ee25fef3fe0e6a2057cc3d1490a0c63834cb9e066bc4324ce"; + sha256 = "02e518fb52863d60edeb31e5b21e77eb15a153e7058d23757eb4c8902edc10e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/en-GB/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/en-GB/firefox-125.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c869f6573e388c13650b1103f0d445be8e96c9b1cec4723d53e544669138af1e"; + sha256 = "ea6539089c86b53df22c02179a8988a0ca66b854ceca5d2aa8ff6885d9bbc7b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/en-US/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/en-US/firefox-125.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ecd3d99be21bc2c3afb6f1a89fc587adb3dcd2a4ef22f95350d461f86251ae7b"; + sha256 = "2fb91b8dd196a8ee47238d82d6b7afef3dd1bb3212b29122ab1c3897052d8a49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/eo/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/eo/firefox-125.0.3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "9aa8fd5f10d5464f7d3fd15aab706848dcc8885dacb5c3de9401c8ff23d7ba46"; + sha256 = "3ffa103c2a31f729d7e38637762a8e8e9885fadd819afbe2448db795519ae239"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/es-AR/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/es-AR/firefox-125.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ae54789a38235c25f7147b61b661f552f109afbb2f21027392bbf14bc30d3790"; + sha256 = "6f03108c3500c4328f074477bb6dbf303d9ec4c654afa7acc109407fe1682787"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/es-CL/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/es-CL/firefox-125.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "7624f5b01d859f6017f57b2913681b7c0ad92fecedb86a5a5282e172ee108afc"; + sha256 = "630476e38a0f9119f794933dea000c591687f13be94693917e457f8dfa8dca52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/es-ES/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/es-ES/firefox-125.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "af56a3bda1dcc4be8dd16418be567c47625ae1880026d5e3bb35550352e50b45"; + sha256 = "87603bce7aac62d12725b922b74d6376365074c110dfaf01706dc0b31c05a9ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/es-MX/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/es-MX/firefox-125.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e488a67b04e315f8e924b423e5a0f6779952737a057ed8f8e3cdd3b29bce02d9"; + sha256 = "ddfa1aa04be68932659439d93bb61de2ab0542f04677808eaa91f12e6e72714a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/et/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/et/firefox-125.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "3083bd8c49fae0155b7dc607bf176263998fe9926e4a3c2bc2d8a380190b37a7"; + sha256 = "817596c186d4f8aaf51434b7abbe63b06256987b9187fc28cada01977574baa3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/eu/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/eu/firefox-125.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "cdf4f8928fd7c9a8ae55ef5fb0bf90667f19a77ebdd04d9cf1a15a70b07b67b5"; + sha256 = "f49aa967f260c08f8af7da05d57580e4c0e0804cc36bf6f702bca849cf8754c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fa/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fa/firefox-125.0.3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "bb77300367b2a59defc1ca8cdd2754398f5d5a669cf77dbe4b6ba96656d221ab"; + sha256 = "d770af123d38d3dec2d5a35537b0f4bed9d980be810f12e5036cf665e93dac56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ff/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ff/firefox-125.0.3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "526daa29ae65ba57fefe639c5b18d140fad7bd04093071e4b7513937bc39486d"; + sha256 = "70f1e5026f00ecea44209a88239ba3ea68d5f10cccc8ed20cd4de2bd0194c7f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fi/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fi/firefox-125.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c642f7803b2f9aace0ecc500c3664ba7209c1ab4fc7f7c3bf62a4f368f5097bb"; + sha256 = "9ecc9c29c701d3b2e298e191cec6f1764168e6831c9fa9472a82d15b2b29a169"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fr/firefox-125.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "32345e02fb215813bab7c689d95138e6a93f4937345e75b4cc01bdbb9c607de2"; + sha256 = "07d5f4dbba19bc643a995dc6cd06456cab9342ab2563c0274ac742d02c7aa674"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fur/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fur/firefox-125.0.3.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "24ad3d7a2877aff268ff03c6ac08e0d0005accc1c22dc50d48fe7740f083f3d5"; + sha256 = "707d814ea0ea3a7c5c5455f678e496e4b0b14fcdd6872e81b5fc82241cb2b12f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/fy-NL/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fy-NL/firefox-125.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4b11a2d6372e4ad66375681491abc94075ef05a8009f4adbe7a81762029ab5ae"; + sha256 = "3fea1cf498eb47c4038b6a76a61e37d5d354f2457fc5a9198e5943df227aaa09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ga-IE/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ga-IE/firefox-125.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7bc49b1edb7300b362264c212076d7f75e7fd3feed8ab12dc5bc4b4ec3022c78"; + sha256 = "8790df138ec92eb83891a7f5ae575c63e181041cb06a24789ec347411c948c40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/gd/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/gd/firefox-125.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4d2ae49ae50da5e093426220dcb5ff8e6e007503fd5526f4acd498b31c9770b2"; + sha256 = "b2de6dfb77b655befa785938da00cb71da490ca88fe01d568e86bd037faeabef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/gl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/gl/firefox-125.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "1a349bb943eea8eada319a3fd42ebb258664fbcf410dd7ee3bb3552200043b80"; + sha256 = "15ac0bb2b9d61dcbb81243954123d79a0025d480fd66e1703ad1906c3ca09c28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/gn/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/gn/firefox-125.0.3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4683096c6963ae79480829f2bcfc24346cfb0ff89554b1de2237c2926f2f6402"; + sha256 = "5c6e43ab908a99692b9702531b8639d8f503d3396c51e4c3f8a12f5e143bed26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/gu-IN/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/gu-IN/firefox-125.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ce3ccfeccc8626d78b6ca5119d907960d7b415a4f6eb0cb1e8b1ce697234c9f4"; + sha256 = "0a140f0beb0112b88c058bd8d4d4fc8990c6146c60def24f4c15bb85daadd164"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/he/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/he/firefox-125.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6319f2446945e15aa2918b45236d57690e3b4ceed65a847915d92f228eef4f10"; + sha256 = "ce9251aee641a5a4c1cd2a55ac8c7f8d33ea444a746ec5eb783b6d7a5ab4735a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hi-IN/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hi-IN/firefox-125.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "fb6848985b5c27d80eca2c8c6b877ca287c095d3b9319bee5ba4b72dbf5e00ca"; + sha256 = "35a9d216fed5fddd71f1801b0a2a1178c8c646a4d879502d0f56daa2675deea4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hr/firefox-125.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "defb3c3e05b58525dde6bc5d8c2b0ffa096d6e86f320882234acd3564f394c4d"; + sha256 = "b7d62b7ba3261f76e1f6a8c9df79dbbb7a2e2c9efb56a4d30f6be1b37a6f1f1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hsb/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hsb/firefox-125.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a4fe13dc42bc37262e34c0f9a63e63e79b0e91614cfda5c84cbeed928e9c8800"; + sha256 = "b6e5031ea996de5449c362d476afacbd7a7310f22cfc108dbab0e745897459c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hu/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hu/firefox-125.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f50c9778a1c83c30e31926f15bc00caa405041eb9f686a10463b64178159f0dd"; + sha256 = "fbc3cdadb14dd5755ad6e64dda7350df60f43c576dcba09ed082fabda2a5a130"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/hy-AM/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hy-AM/firefox-125.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "39684d30a43a314aef722ae757d6e2fd58af76c9861a708455b9df8eacbf2d5b"; + sha256 = "d37f52f64d3a56cf043ce1f198485228877419c4231a8b1816af7d2efb7c9156"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ia/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ia/firefox-125.0.3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "8e99811b2ee15adaf78eaecebb59c506e45b0402a052353d6007f5da7ba6461a"; + sha256 = "1abb3b691d218da98df54b08228181d201ebcdd397b23bd438761c26e91d70b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/id/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/id/firefox-125.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a53d77bcb75cfe8c0c7951711f9b11681fa5aaf20a2bb8ec6cf2198572624980"; + sha256 = "e003f96e908abb817efaa518ad4d4da3724077b0e478eec311b065f5a1ef6a26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/is/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/is/firefox-125.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c5b85b3e16e2d6300ed4f1196325630b53eb9edbc4688ee8187d6a77b641a339"; + sha256 = "09ea5c1828d9bb6d9eb89cce854892ff5300641e3eec69bec251937d442caea6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/it/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/it/firefox-125.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3a70bc2b11b133b170482c88981b726cb734b9f5eaf0115bc4e65734f7862ce8"; + sha256 = "ab3e1df035e7198a70a6ad5dbcbf13915a5a98a554497438980a56adb550b45c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ja/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ja/firefox-125.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a490ced3f87b4b89d717365b196b8c0a311da50ad0392a056190466ac399e178"; + sha256 = "1d9cac5e97b86c76b908fef1c8f981476a054cfd6d365cf7d9d3a7cd2800d56f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ka/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ka/firefox-125.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "02749be6732a88fa5593d4c1dae76a2626bb5ce516cee98c205900aa4b785ec4"; + sha256 = "518b72d8e5188f01e0ea0eb90d4760b98b0dd7f1e74a0cde8e9809e25117d9f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/kab/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/kab/firefox-125.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3a26d92fabc60ad584c98d8b21eb46cad94a4d69dd3a5a1c30b73d72a73dc507"; + sha256 = "eac92cceaae9348cfae57ad891fae6827f25ec03df649e2d7a3c7186fcbab01d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/kk/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/kk/firefox-125.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0c68d4db9fec3dbfd240c211179fcc72a18fe44f6f4526f1520b9f77eca497e6"; + sha256 = "c2dfc1d48cc5386c9925de7a33cf368b2040accea7dfcc67038d2394d828b3e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/km/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/km/firefox-125.0.3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "a823adbc5ed6d00c6611cef7278766ab67095d05df28f4feea74ac36bb35159d"; + sha256 = "f032f51e6c6b655ac6ab7ed1605f701c99f71bc316d76f06c2fa6fb111c61276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/kn/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/kn/firefox-125.0.3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4acfaf770e803a9f95d6538169864af173efdca5979b5e53e255e246b5bdfddc"; + sha256 = "8d47dd21f7968cd1151d25609fa2276cf3e9b8bc7cbfab307a2efa84f541e5ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ko/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ko/firefox-125.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d7f9f882a33f3024173243960dd65165062a3e5fb72b76b413ba0225f0e82171"; + sha256 = "de7b527a436ba0f27175ee7f8e6ed9238bbcb716ebb26f9b0c9cc5b30a3240eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/lij/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/lij/firefox-125.0.3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "a6991f8be2d09111a545e39a1114ade9b51f1a4667f62267719b4d99f8312ab3"; + sha256 = "809675ae60d9885fe20e4053d0d0686cc6d22cb6fc6fbcbb76c76579e47d97f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/lt/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/lt/firefox-125.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "952de896927ede1f4650ee45e1fcb3bb5ea28f81b9ae711ec8d72e6a15a37649"; + sha256 = "cb512ed0fef4a1d544c4a74d81e6872091ccee8a2356c5c5f18d6edd1a601c06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/lv/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/lv/firefox-125.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1beaef01e6dc993450d0f787f80ad5a50c8d5288e816775d1c0ced012cea81ba"; + sha256 = "5d693ca8c453c37baa6a1c284041a380815e48f6e728b4ead06f6afcb27f0558"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/mk/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/mk/firefox-125.0.3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "38ab05672f75133480c02c69e89364ea75c7fddc5cce4b38e26d2bbc49720f52"; + sha256 = "352daa1a8995c40803bf34f1e00afa6ed95a2b98582992d1a34b0d6331e1c893"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/mr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/mr/firefox-125.0.3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "e4bccdf8b86959ae7037468886bf1b8bd0ce2e72b78fd284c2a9d01d7594b488"; + sha256 = "a5bb5ea7fc2a3f5f0f71f14cba8b594bff15da10a3a879fb14311ea25b12ccb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ms/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ms/firefox-125.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "781b8993cb31223f01eef9e1c1736fd65f88def01d5163015496c57c80a952d7"; + sha256 = "c544e324549f84337d9a7e0e863c1b0be6f3435d9cf890a6a73fff62ce9ab8ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/my/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/my/firefox-125.0.3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4de4a0f5c23f2ecf715da6d53a5db187f0f3a24ec96da65f3c3326fafc90f4cd"; + sha256 = "9de9d7f95e75f733666599de2b57b487ac3ca545487101ab3d097e85dd9f2daf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/nb-NO/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/nb-NO/firefox-125.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c3d5174d3b9bc06832f1db0ec52597ded859b10c93a8393f326798b9ca9a9092"; + sha256 = "c1a5ce764dbb1f090c01330991af161745d4df945d51346a571f24dae6dc0353"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ne-NP/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ne-NP/firefox-125.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "74e4887923e23e564c8c9760f9000febea221a1a1719923fb35b5e8a274bc537"; + sha256 = "7c04f1b49e4d301533e1e15c08a88a768c536677a55f1d2cc9f4fa7d3bd1f26a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/nl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/nl/firefox-125.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "06e98ab97d45d4f76ebd5f16059a87591de279b189dada428eaa31be5edb9e58"; + sha256 = "a81916a67375d43a2883111474858ca8aed787a12cee1d503fae5ec2413cc778"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/nn-NO/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/nn-NO/firefox-125.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "d4dd1f483f9f4a74efcfe70fd25473ae1162a6fbd30bd2dabc7da38d49dafd32"; + sha256 = "282e7e2dcd7d01c1bb8c3861511aaa989a1e23e79c7ad5958956a3725c595650"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/oc/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/oc/firefox-125.0.3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2d2b7e612cd3c10fa390f08fcd5bfe7808c4563e79dec1391f4d88e103bcecde"; + sha256 = "aad97d4a4bb4229017ef8e84ce79597e5ffe0108c1898c4188ffc1baf2368bf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/pa-IN/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/pa-IN/firefox-125.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "287d1f46526bc07d74a3317f7bbc7b781622cab1929f9265a439cf724d275cbd"; + sha256 = "1ae4b77596984e0daf341ee562d78aa653914b8e20627dc568d86ec2bc87a7bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/pl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/pl/firefox-125.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "61a04f0b259841d6855f27ce1272b8a5cb5bb63171d6b59185760f91ba55f228"; + sha256 = "979b3892b3f7056ea173946e5950f71e0ea8a740f4016ae9aeb4a58edb0fb679"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/pt-BR/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/pt-BR/firefox-125.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "bd7981044c90498ed6b69058c526378edac609456ee5bd17a27e2d5ab8aeea2c"; + sha256 = "7aa3b0e46f6c0c36443c61b43b15db420e509d6793f6ff63759ee0e9eed3d6c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/pt-PT/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/pt-PT/firefox-125.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "845063d62e92923afdfce5f8cdaf830fc861e3e80d0f0a9e87944054c3af078c"; + sha256 = "ecbeb1dc3292eeecdad0cd302b70445e9fa4fa6a6f9c83a698e5193f2f4c543e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/rm/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/rm/firefox-125.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "11729b87358cdd32d374bb7097625d94d49c0f491085e0a338170da2fd5ff78e"; + sha256 = "17dfd6e52f056481d4c5ef45ffae76a8005034fdcfdca046d12966b316852b91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ro/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ro/firefox-125.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "5480b2d8bc4a3d820104c3faee11240ac8c1ff002ed5b784ed2ae3a39e813deb"; + sha256 = "03e3bb8b8d6f6752aee13b445f79cbcb5999224359165deb565c00e79505aee7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ru/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ru/firefox-125.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "be35c75aaaeeb2b8dc07a807ea906b82032e01e800e91b044a7c559039883e3a"; + sha256 = "b3f3bc5db58106f7ce085aa13422974ec2a77fc1289e6ccecce66731194b1885"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sat/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sat/firefox-125.0.3.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "2b63b616bfba962a9c2382c59182bd4acb0ca44c693ccfde911449db2730820c"; + sha256 = "de73c27a3eddba12687edcc6cb18cd1e7d055eb0f19e13b019901a8e21ade74c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sc/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sc/firefox-125.0.3.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "478c94327cb3d4e51981a0a3adddd0b7f00ce8b54fd21e0b233277f0131941ea"; + sha256 = "a5444d59372a88fc3fa7eef03d8ed5840b07b3cb5845ac96b2cbcab404cff35b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sco/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sco/firefox-125.0.3.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "84721bbb09ac8036013d2ebd7d053b20531c1873004c67e8723bb7986fa18641"; + sha256 = "a4cab5bb51709ae5f3a6ac1b4c113dd9adcc973aee3bc480b763d89677b4b75c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/si/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/si/firefox-125.0.3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fce4cdd335e52207980f1329ba3190ef224188679a9c2cd0c81b87b663953874"; + sha256 = "8d4b2d9d5de196db515c4852fe6bc0b866c7bdaae7f734053fd6f0fabaab8054"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sk/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sk/firefox-125.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "9ebc5c03aed1b417efaf40103bcf41ef59d06bef081a37c40fe6f9ea55e625c2"; + sha256 = "58b4b780317ad6e88b824fc31fd1777425abc673ce76a578dbfbae3db1247599"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sl/firefox-125.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f13472ed1ba867350e5255e3d70f83e0925116575e02a6846d814c59ab071837"; + sha256 = "c6663467611b7b9bed4d3bb0bf70465ed7812038067a6d034f70ec59af3c937f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/son/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/son/firefox-125.0.3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "6cbf423f1f464835d4f076f0cdb0910e7c152271884d686d988db048dd06992c"; + sha256 = "066b5c9ffd986a56460bba1021272a42b66e1c93f601664f8f6a0e939314f22f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sq/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sq/firefox-125.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4bfa8c3be90651e0ecbac820fa1acc38ae5dd0916fe18250c2b2cf2c8f6d401e"; + sha256 = "d9d696c0748b1cc3238c39cc3f7b69e6ef2970402d68494084e6897f947d1493"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sr/firefox-125.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b2405bdf08213345271a52e80270e45298ef66776e04947a5a38985a048b93a6"; + sha256 = "73411b25f8abebd15a4e716c2ee3a861670df257d7b1497ccfbc92aa055b8af2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/sv-SE/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sv-SE/firefox-125.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c45ab928dae8b4ead94cf977fb441df786aa6b80aa63a27ca6cabc66e8853b91"; + sha256 = "a877cf095668f7492a762d4fcebfe9ce154d0594e3a4a105d5c9046e1f9ee26c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/szl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/szl/firefox-125.0.3.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "3a7c420f68614ec9b2a2d60aa9027b43ad38b67f9317de24bda551a8d1af261d"; + sha256 = "45477dba947128e7e4902715ee1ac7898422c34551c308f6f2388df8bc3f8982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ta/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ta/firefox-125.0.3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "1847f9234956a76365207d7b9ecacd594f67896a1beeeb3792038ef24b51a2fd"; + sha256 = "acb5eefe0aafcd146946ce390a9df077c477c029f0cfda6da3da00a3a6e844cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/te/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/te/firefox-125.0.3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "13411399d0cb4993cec0cb5bd1d1dc2c24073620b9cb36d390a3606f4a251047"; + sha256 = "98e43739bbe0117a5b875d5e66863e76a45d45f8a9b7b7afdfcd9d858402c075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/tg/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/tg/firefox-125.0.3.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "7c477ad4e273bfd23a91e018cee8955e7b7605dccdbc8585285902b7f0cfdd6e"; + sha256 = "8c6f9dce430b7207665cdfd442cbd1bdaa1978651e745eec3b77c8eb52963aa1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/th/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/th/firefox-125.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "dc66bbd288067fb256c16cd83025f3c5dda45a2e8bbbccc3deda72a62bed56f0"; + sha256 = "2a18d85e28fb7d415ab71f9a966b6799dd6c2fdeeff5f4b0e65dbea449a77fa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/tl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/tl/firefox-125.0.3.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d198857dace1d8798a2ef09cfbb80e80dd5dfd5d6cf2d4427260b72726972ba5"; + sha256 = "4517393fdbcba061dd7a667b92ba7b44e69ee73036ab36624e5681195a372a6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/tr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/tr/firefox-125.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ffb9b7ffef7385bbfe53f2b18c8fff5c6ba1bc44c89a52e4db21d46b9bd4b87d"; + sha256 = "5bff1a8d3044d5ce9195d5cd9aba3e02b21d4e23bf84870ac3b288777c5001c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/trs/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/trs/firefox-125.0.3.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "21078973238b093474fbc34c1b411f3a0ec4293da44215f99eb65e70d09585f4"; + sha256 = "8c75284765e4e4778a8dcba326369f7f8d62627bcf95f4384ab68b2339f245b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/uk/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/uk/firefox-125.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "625e545c4daed88fb87173bed12ac2d1927e0d38b2623b6e4a9ea1e170af3d8f"; + sha256 = "6ad348a509db7651e96ad6a4015dad3b7e4073d02a6936eac0b15aab9216feef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/ur/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ur/firefox-125.0.3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "f507fc9d121691404f427394736cde58fc57223c1fc2e49628560beb2834c3c4"; + sha256 = "71714780ef8d0d7bd072744dc450f4d3db43e8eaca8df76ebf0471debe8fdbb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/uz/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/uz/firefox-125.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0a4a7ab783abf28c72d8dc05fb89d1c595e9cb6c4230162ffa61e56f9cd4a900"; + sha256 = "c8e095e7259f14c6b98a32fba83154c6f83b2dbe8e19f7876434b22d3529fe4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/vi/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/vi/firefox-125.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c11b780a90868ad2a352c724eed2308e8f8348ed854773370dab467dfae1a037"; + sha256 = "82b8321d1e5d321f65ca1977a24d67b5663866c883fecae1553dc2d6a2b70304"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/xh/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/xh/firefox-125.0.3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "196ba78639720766d7f199ebd0cfcaf7dd47ca81c15e19fece45a7c90ba41659"; + sha256 = "06a67bbcedf238921f3211b2d36ebe02ee123cac3cb90820fd06eba7316fdaab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/zh-CN/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/zh-CN/firefox-125.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "861c2b6a384976ab9b134ff62518e7bd9d52298c2020f7e8e93298f306bbb2d6"; + sha256 = "074fadec864960fafa5aafb41f05e638a97b37c00a26e8f9e838357f484c523b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-x86_64/zh-TW/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/zh-TW/firefox-125.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "a1994e5d0fab6cd4ec2e7ceb7406955bcbf3aae240cb8c5dcf2c10325a50d1d9"; + sha256 = "01cf02595225f172ab77ad12c3c7d61456703f3e80d88e38e4fbd5d047f2c0f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ach/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ach/firefox-125.0.3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c5fd729c3397225d4c34dcc3980ce7db50c4983e2d6b03480f1ba8c34bbfdccb"; + sha256 = "051c3f7ed00fd372275aea30306469f732aa7ec59fc08f98e04606d2cca1ae6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/af/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/af/firefox-125.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2dd3e6ed95ed3ee56acbb8798b6d4ad0a4609b1e8cc711a778942b1f2ef91161"; + sha256 = "6d1ee2379de68187991326d0d89e13edd733424adab5a7d6cf5e9aaf3368feb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/an/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/an/firefox-125.0.3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "15be5f74f58a8e6b34adec1554e0be02ddd115cc4f44d1935cb9bdf187b90e2c"; + sha256 = "0ecfa115508f05a7066be1927159faf3e02fe338df61d9c823a1936a56aabe95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ar/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ar/firefox-125.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d225f582cc7f4805815c5207961992019196b6c044a9c9722abae0e7f1a75810"; + sha256 = "af4cb6ee6c7215be5e199d9ca64867484de7e693a013d9a33eb410e8d9feaa0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ast/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ast/firefox-125.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6e94ecae9a7567f997f885c9e4d332b97c4f1cbc7df2f3c7cdeb61231aca5f80"; + sha256 = "04647b722d70f11d32f6a49dc4fda2f57560c96c3a098680b8e1964324cd9a18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/az/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/az/firefox-125.0.3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "decbc3404707ebdef7f231adf6f4185f38fbef581b8def1ff4bb587e8973f0a1"; + sha256 = "499cd8960c5e21956372fcdcdbba8ce59929fdf3c199c94b604be235834fec9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/be/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/be/firefox-125.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "8422388e348bdff5dd6af1656a2e6270697b1427da851e09dd5a62e45eb14b50"; + sha256 = "215c1fda1f502d87c8685a8dfeb23d2b34b51c569de96cf52ba6a8179cdca4d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/bg/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/bg/firefox-125.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b14c60a8ff41875d183608fc9763e9dd24975f078e08797c7589f6ed1769d1e5"; + sha256 = "d24acc50c74d070c9c3fcea8030914e08ec98f77a373f0c640f5c5644b52868e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/bn/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/bn/firefox-125.0.3.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "941a7fc7677cb3488608c81c727ce5799a651bf1b76727977af81c31bd3f3e95"; + sha256 = "c0f5570e5f05996e105485fa73580da3c4d3b7a0eb5db8cd1c6dd316b770d4f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/br/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/br/firefox-125.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "1e19bd29b6361aafdaf09fe6a9299434db0b240a68f3ad934cde2c8c4c03c790"; + sha256 = "7adc8a1c0397bc7e3390a598bb064d6abb318a2689be7e99a90f31c3346f557e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/bs/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/bs/firefox-125.0.3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "7432eed3e1a2c8480d7610e209f7b55ab8c9084dfcae453adfba40e0d43a6fda"; + sha256 = "43d74f20af450faa633216821af7c1d37bb1a1c6a6ceeb75a0474adbf9b015ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ca-valencia/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ca-valencia/firefox-125.0.3.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "68fa72fa1145aeba1c40b8d1971f985814161ae63a502f68183dea627b36e3bd"; + sha256 = "1416a98df2841c0e9d3a783fd236f8e8c7f3dc4e17fe027e4cf04b8b0bde187b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ca/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ca/firefox-125.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "9f57ea19e727b409aee9783cdf0992918d9b586c87e59ba2d88b7b4cb8de182f"; + sha256 = "1c09a6d5ed0dfcae1d25fb9876c08663218f8a83bdc9f15ad52e39cd22428c5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/cak/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/cak/firefox-125.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a35a688ab4192a3b14c08c2a0ba70a36a98c9228ac74b8782be835761c84a930"; + sha256 = "6fbec6115cccaca619389d68cb917c331faeb19ca165f5b9e5425b78ffabf0d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/cs/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/cs/firefox-125.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b52f8d472fbdc98c571e1915da8ece00f6b66b2d4f2fb3cfc9a0a87f96ec32fa"; + sha256 = "d1da5d44dd511d94341837c578eaa9d5aed5e2d63afc502b2b76b049d6110ece"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/cy/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/cy/firefox-125.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "6f10274a2ecd6358eba51cd9ca0d2548a30c1a9af074c92e00c8702385f2e2db"; + sha256 = "eddafcccca339deee2cd0e67885692217f7c49141ffc64ca1a998bb935d45636"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/da/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/da/firefox-125.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6ffc7d1e7ba3549fd68eb225a870b84807cf4c8277490a9ff5efa8118b629daf"; + sha256 = "d5a3a9ee1927f26b18ccf696aee7ebde30dd3ba439c9a376b4a6072d04756ca2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/de/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/de/firefox-125.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2530ca9be98f115521c34f6dbf2c7d8cf1e4b4a65ce087f702f390fd091ea27e"; + sha256 = "2d61def83c8a52b94828b14c2c8697c1b77106a4c16a7df1e9e258212d23b583"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/dsb/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/dsb/firefox-125.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "1f6d8d87a4c0504fe2c076eaba0683dfd145df33101dd66bf422dcc1b08ec600"; + sha256 = "09f25336d1a46ec5cae5301d35e0573b205ccb3e1482c79b2f76db02045a9d18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/el/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/el/firefox-125.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8d428453a25947a39236766e8896c84e264e5e0e79636eca5ad66de24dc4dacd"; + sha256 = "4e055eda0cbc2d8c71ce472982b26ef0c0ebc20f72dbd0a1d6b4f0d50a4966df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/en-CA/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/en-CA/firefox-125.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "518d40beac437ef3974884572b504ecef611927f471bbd2673bac3ae79b524f6"; + sha256 = "5ab7b3ac4d84e949c47da2d3a77708847fe73214bd641562017359f71e254dc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/en-GB/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/en-GB/firefox-125.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "2f306743cb4d570058cd25adb6cc674ec21b98459a4127523d4748c694428481"; + sha256 = "dc793c9a3161974ed1120572d6b65d3ca5a5d8947e53cf1d31da33d4bba6ca82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/en-US/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/en-US/firefox-125.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "08ccf11fbd664b80f2f5f71da98e486b1bfed34e1fc5f85027810b0cdbde8962"; + sha256 = "1a7a16c2e75bfbd0e318095c259ab63fa0c097005b872d93885539c9f186ef80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/eo/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/eo/firefox-125.0.3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "6f3c5a5c92e19c8ee9371296604d354d1725ee52546d5d627c7b0039b72c77ff"; + sha256 = "bc78e75ccaa66dea4f2b8585dd2ec8217ac065058defcb991dc6628acb16c3cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/es-AR/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/es-AR/firefox-125.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e75e034b2e797eed918474f0ec6aad44a4b562f367ac4d3ae953676b4c58d1ef"; + sha256 = "da954c777d0441c30c6b292ebf8fe316e7b52d75a76602bf6502ba4677c1cb64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/es-CL/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/es-CL/firefox-125.0.3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "113e48f98b738dccca3f11ef7eeccbe740c3a6019d91c8cb0505f3c2faf6682c"; + sha256 = "c4282cba4b588da12708921ed5c3998f24d4d81790a677090c38529c297867bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/es-ES/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/es-ES/firefox-125.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a8beea1049c77a48b098fe8fe2121d0b0eb83edb471b53733dd1183effdc0bcd"; + sha256 = "15a1fed207e2c14e962c4e2eb8abe3cbc62d0621656b254675befe3d974d3cb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/es-MX/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/es-MX/firefox-125.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "796759fd53e134559142d88d2a0d242feca6120660345468665f0a9b08e49999"; + sha256 = "a962e53d6902ec7017ca3a8521c6b5730e7a7ae5244356c4d6d9117e50b37ebd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/et/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/et/firefox-125.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3bea5fc06a710e69c23998f729463c767200bd0e0528d4ed89dadb55f20ab53d"; + sha256 = "9e58939f49650dcf0f0267d586919a3144eeec53ae58ef548613311bde905eb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/eu/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/eu/firefox-125.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "57e0087f574ab13a3aac00c732dfaaf5aa768fba8a56d086c56e19dcdc24de33"; + sha256 = "b5427601b225370def60f93e2f8cefe9600898183f0c184487bd95f8f86d2894"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fa/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fa/firefox-125.0.3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "af7cad609b5a4b155b19c227c8664f6b9136655c804b44e7fa3c9100fe371baa"; + sha256 = "38fb2703b0e7fa9788aaa42dd1a89eadf616924c116f1b67b07f3d5df0963962"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ff/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ff/firefox-125.0.3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "3148f266c40bc08bdac8fe3ea0f458c4a01b1bca60f5c2101d00901e0de4775d"; + sha256 = "a7b764758d16c901511062065eaa6e16414d777d8eea315424f19eecf54ef5e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fi/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fi/firefox-125.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "423be151b922259c88d36c92e54a60dea2f6328bfd086d32dc74cd1a6d0eedd6"; + sha256 = "153ce3d7f4ced7a280bbb5bd539913a55f6c0790fe756e8b5335539ac651f7e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fr/firefox-125.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "946fa92a4e746e6755a6af0ca404135b8ba0388f57c8abb1f69963f3cf606811"; + sha256 = "b5aa0cff2a5493bbb816ae12f43ff79354a4946c1649173de767b1cf543a427e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fur/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fur/firefox-125.0.3.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "931b5d7bfc87228770624e7ce6c437337fec17e54d4f3dfd03bead3692844d43"; + sha256 = "d4884765fa3c28e7236a6624aaff5f874c4a155b26d0b70d481109fea5159c84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/fy-NL/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fy-NL/firefox-125.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "8c0745e61f0465ce452a13ec02c13bf1fdf497e2abc66d357b3c5aaf5a8b9ac2"; + sha256 = "49ebbe560e1960d34a2ab3258c05913ccc1d5bb60b3644dce6f4370733d7a59b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ga-IE/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ga-IE/firefox-125.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b2c1b6dd41a56fab2f7aaf049ed4afa4af80d1458ca3b3a56f630a9f39174edc"; + sha256 = "13d06ed7c8c73ecdeeb071a02d7aab98796927812127527be5f3b5fbcd9ea487"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/gd/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/gd/firefox-125.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8701d32ecd572560bf26609857a0d7af6b5946774bbb820e49a54c55e175bc83"; + sha256 = "2435d0910e347581e1ff60217fd517b78e0464adc0d2b35b803bf8f83bf6d993"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/gl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/gl/firefox-125.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a85edef215b2f9beaba5b3c396cfc248157dd7819eedde7fa420b8cd306ba816"; + sha256 = "cac5e02326f5ccdfb88e9cc1bdecc1060585b3274028f9050422834ea5559ede"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/gn/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/gn/firefox-125.0.3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "49a3b8909d29f5609a1da6477a43f719fe20ac178ac7d69299f8f21126f7f739"; + sha256 = "addcb8beed0a341c6eafc4894d11a6b3e8ff9c69c60442d674cac5dfa4552eb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/gu-IN/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/gu-IN/firefox-125.0.3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "44ea127c78193c5dc83f5bf8e5f2adca93d91e2ccc0266ca68b9d17c8f8cbc74"; + sha256 = "2342dc7b3996019edf66375533e5dd46e94db1cb7e37635002f3f7826c7b35cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/he/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/he/firefox-125.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "2df30f0cdeed80e2d2dc1113db666b7340893fa52337d913ac6255e9823a6a2f"; + sha256 = "a6026c597c8f917006893da69998586b704b5ea89687a5a4f57f4fd1c6060c22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hi-IN/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hi-IN/firefox-125.0.3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "051e5df71df66353f8fe940efcffb8ec9b1586057d9118685387b713dea255d0"; + sha256 = "12d8bc4072ce6118f50aea48f1d0cf19ac2cde7a43b169dce92088058ee135c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hr/firefox-125.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "0525bb2435c8e829534886e405f4e5802641a6659ad5276980d1bf5378903436"; + sha256 = "fa93237908e0a30fd911a2208cb1734d0480e9514877625fc7bb8a0a4f5eda89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hsb/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hsb/firefox-125.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "902793e7d135940797a44a4285cbae3f1b3a579740f386b1de463065d566d603"; + sha256 = "4936df4e7258830565e0718fe89375c8876d5318d65e92995a104498a0353846"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hu/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hu/firefox-125.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "127db71d94fd41770ffc4715d16fa2e7e9f9aed77db8ff21c566e74a3fa67931"; + sha256 = "2e87fc4c2965f25a0826348b1bb8296bb037c9213cfa4a7d86e65421b36c4527"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/hy-AM/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hy-AM/firefox-125.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6479e62315e8402655a06f6e58765c8d8b71a1635af582f32e75a06d98603ebd"; + sha256 = "8a7660e5a5f5755daab77fe4bea805bef9124b3d7e1ede72f3f2b3ca0094b5db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ia/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ia/firefox-125.0.3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5cb8656e668d2efc8c35228640a99696afd72f23d1a3702da25b3a5e8fe9d1ec"; + sha256 = "883a6bae7c4e2f72cb4bb1bee676058e9093d7069bccad29fab329d873d68075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/id/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/id/firefox-125.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "acf5464fe544b9b72ac650830bb4337acc851f037f9937e0d2932e2056fe06f9"; + sha256 = "0a2de5d0a841481f351d2f4e26fb4cf56592d580075b5ff08054b661e17bbacf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/is/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/is/firefox-125.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "28475ce33fbf59db4cb84775a2a7c39b641b3bea67dd1e7e49d5ace1878f306a"; + sha256 = "33376b28936467ff5c3fff5898ae1eeee882dd15d34d8d42b9010981cd27d53b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/it/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/it/firefox-125.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0b79a518da5b28aa74d22d3df117310c39521114b0e627d3d42bd694e06e6d90"; + sha256 = "37cc5b95d46d637633d7c368350683ab2e63871e7b8f574bb50cadec80adc558"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ja/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ja/firefox-125.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e99dee56181843e5c1b1af336f1fb68c2c2eb7eeebed885c067bb57a5a62d56d"; + sha256 = "4feb22e07f2a536bf18c5cd9dd82a1b60e9d846f81d08326b119b19212088ba9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ka/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ka/firefox-125.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a4657d7a0f8e2c445837cb42171780fa221ea528eddb7d17d23ba3afbd7592c5"; + sha256 = "e786417de882825c05b8385855eee0580cad0f64a14eec53966d90108c42d524"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/kab/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/kab/firefox-125.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b36b00e250f6b1f1abbd816f7e0038f711b75e5a017bee285c3fa2995ac1ebc4"; + sha256 = "b58f6d29cb6ebac1407cf46bce238f80f56c60e4b400fc6beb9fefdaff19aede"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/kk/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/kk/firefox-125.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f66c2b7364f0b2742efe8e532dca7884b72a2811b72e3b0de0d8260ae007ec92"; + sha256 = "8d868c1553a1c8708f166d6b99cf0fede333366994c46d490014cf15330046e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/km/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/km/firefox-125.0.3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "d137d33268cb376423d4395be1193af2bb73bee0e0b7726abe7e70d7b6d96ed5"; + sha256 = "deafa1829c27ed270718effd342cd9bc26453e5e6f64cdd7c83f0a86dec3533a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/kn/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/kn/firefox-125.0.3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "ac3aff36240512506a51543a9766bd85a796a2fb137666207fe221a0e17152e1"; + sha256 = "9a19b06844c60e9d4d6348c6b207273378228a59f1a831c9eb99e1073eba2a16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ko/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ko/firefox-125.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2af68d3e380de18efc36937193dfaadd8c438be39b45a297edf3fd9c73fff7be"; + sha256 = "bf79f74b659344291a745fa62aa726401f8c84369a96c0a13eb66be9bff2368d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/lij/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/lij/firefox-125.0.3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "5c708d6c2c1b55b90c0728c7567132c61b6ceb64ed0c7be71c26218653e143bf"; + sha256 = "41c8b57d4426251b33c7d528cb23e635b22d3b81c4188c6844a39e87800fb9bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/lt/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/lt/firefox-125.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7f2e33013772b3bf042415c45c1d75d407fe007167f628dcd14aaecc6855f088"; + sha256 = "34c57fa25ef83b9f6747e61eaeb4a98b312ffda9bcfdfb761392c94565e41348"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/lv/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/lv/firefox-125.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "1a736f61f8ca876ea12221fb23c54d3166f9c4d0edbe90839300ed1fef7d4c92"; + sha256 = "173afd7c09962de9af491917b7c14d245e02e6c109f69b9b7330466515dd1549"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/mk/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/mk/firefox-125.0.3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "c688a25f9113b2c688da4f4e9290f30a1fd2d2a23b54dadefb219f5d95d30bc2"; + sha256 = "b2ace494099bffc7d70d074197d1e4b0a9a387e553e4fffb31efce7d5f89053d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/mr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/mr/firefox-125.0.3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "b46aabecf664d093a1928f6004d21dc81b2ffc195926652f6af276661900abd4"; + sha256 = "1d4075ee01d742d9d846a9cce63847baf5ad749d260e7d2018391719e3478200"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ms/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ms/firefox-125.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "22efdbdc9ea35b8d9fe3f26f08a971361c4931abec59758f077a6d12e6f6f4fa"; + sha256 = "aa9012aa1dab8a1da2b4d21743fb01e2cae1322873cd67113f0d3298cc7b62e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/my/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/my/firefox-125.0.3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "c4577d22565386ce731612103ee797d8a01df494cab95442d412cb2163a012ca"; + sha256 = "a52f0bddf09a9381616ee91246a2bbf02112bbe7d8e651a75bf71bb4ff0a55ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/nb-NO/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/nb-NO/firefox-125.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "dfe7b1164522e0d16444efec1f59269fef971d0362cbfe9f612f7fa5cad7c88f"; + sha256 = "9c221603c7cbe51e53e03bceb2bfa64b51bda3935f8d59f995270297dfe435b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ne-NP/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ne-NP/firefox-125.0.3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "6686fdc0c953696a0d33dd52d30ade52bd8c9eb3f0ece2c2c0c05aacba0e5e6b"; + sha256 = "026fa9b87a1fb8cfc347aee7edd09cf07433d2febb6bc7284c90942aeea886cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/nl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/nl/firefox-125.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "122d6f234ae9b8459117e64658ca322e98d19a2c52df92d6152baf9b36aea82a"; + sha256 = "5454546bf2eea2e8785ec994302e9d8d9f3468a89cc5be1eaf491132f8449deb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/nn-NO/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/nn-NO/firefox-125.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d1db5f3b8433275b521e3f51afdd62180ae255446f199bd5a474a59a30fa432c"; + sha256 = "a71e340f55985cf76a5e768ee63c5d9fe5f5a68334642f34062324211cc48b2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/oc/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/oc/firefox-125.0.3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "9175fb84d455f5f3b31d3dc646451644c12df19f930420e7e408e89ed86e595c"; + sha256 = "441a44314d02b9e54e86b0fa1b8049ceaad7bab7b66e54c0a841f8d624ce76aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/pa-IN/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/pa-IN/firefox-125.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bdf66cc8ecd0f924f0dafba2e242f696fe9be86a7e69d67d44aba4e4868da951"; + sha256 = "b72d31b37d4f6d7798e96c6685512814c991a987253767aad79cf515012b057f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/pl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/pl/firefox-125.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "3595e0cc555c55f28f5bec95959517ac6687421319aeb549c15bf50faa38b43d"; + sha256 = "1ae017de12a7faf49b06c9c4bab7e20e776e5fad1430fb0e7f9af519739659cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/pt-BR/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/pt-BR/firefox-125.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "bf5ea226f5bf1c4113ef0d6885a1b74af83f38591972ee4d2c6d1063869a934d"; + sha256 = "6a5f5afb1b3e4f71dffa20ed5ebd3037b63bf127cf9daf09291bf62d9e8a093d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/pt-PT/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/pt-PT/firefox-125.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "54e2d124625715c63c224b8914f53a1e06052ad7bd9c06acaaaa0b61a996f018"; + sha256 = "64763768287dd897705be573e01a61c06c916bd413f8d6a1fd47a64f0d918c09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/rm/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/rm/firefox-125.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "24371d9664b00363d02e3881b89e86732f53e9bd989b5fca2a2a70c9d998b836"; + sha256 = "4ef4a5c3180e3432f7b9380deb84df9f816eaf4ca333c93cfce8e0a52a1cd39b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ro/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ro/firefox-125.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "7a47f911a297375cd3bcf407f876c56c6cb88ca5020d218cf4077c780c1732e7"; + sha256 = "a89a97ae37721ea57f0e087c430dea88ffdb43b1a4b823cd9fff6e40faa46d81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ru/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ru/firefox-125.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fc5ad6b89224b862b586692bf3536205786c90230c595cda8e8b37c64839aa27"; + sha256 = "93dfb081232b4af62d9cd4826501832dcd90f1a91dbafa9efa5be2a094eb2df7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sat/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sat/firefox-125.0.3.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "bbfd0aaee2266aae2a0b30f2b35770eb2fb51e46dba75d737aadbb31da243d39"; + sha256 = "33292fec9a1ac64f7e0b18758de38af19a19d9dbc437e8fce7f8fa20bf58da98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sc/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sc/firefox-125.0.3.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "c09414e2609fbbe64157c2ed19a8f4b079a35847a4b418d84451a813b5b8dd63"; + sha256 = "368600cf67e645dc9eed1835ead1eeebda974b1fc2ff5ca8ce3a65047da402f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sco/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sco/firefox-125.0.3.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "c2a8ba393c85956e7e9b4f778b7a6d15bb6ccfd3784e3e0f25d8ab0cbea53dec"; + sha256 = "20db2d38c151893b43727af5016b7f48684aeac4e66386a99cdb7f640678970f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/si/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/si/firefox-125.0.3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "431670b3f074ad1cfb91033cd115b7d7dc0145a138fa7ec258afa8ea9de8759a"; + sha256 = "56f3baecb795a6f99f52ac4749d9b7e69222f43a847fa5e26363a656fdfad8e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sk/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sk/firefox-125.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0022b74c8688325113aff06ddcad2a008195c093a86b26c0344a6c5377a990f9"; + sha256 = "7c7c25a7426b1f3b98d5aa86433237bb4e7d9f4d4c74d3302966783985a6a067"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sl/firefox-125.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ee6eb7ece377119e362c2ffc85ea6ac9f7a03ded3ae44b148f73e708600ccf40"; + sha256 = "43d59e1d98e772336eafd0a2d9eeb5ddb17ffe2e21b41ec8501d5f92d01e33bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/son/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/son/firefox-125.0.3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "17075b61d96ce5bf6e9d5131c00c4cee84a3bf97e81a0672ca292c8c24318006"; + sha256 = "561fb6ac615a92d24229f33be1bec0c40c593eb46bdd8c5b0f916ce72c7ae0c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sq/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sq/firefox-125.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "758b50ad050464f67afe3615826b2e8c36ef852f911abb3f85dba198b452e9f9"; + sha256 = "b58d25f1a89ffda900b77bda85b8a0b4013009d07756f1e80c2f464b4f00e9dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sr/firefox-125.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b63320cdac54d79d9c192df4732f63795718bd72a8d69a7b08d03a444d913d44"; + sha256 = "6efb25e0762457b7738ce878830a236543d8ac3e27eb26fd92038f83031980ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/sv-SE/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sv-SE/firefox-125.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "bfc3854d763a26231884c31e938ab699fc267eaada2fba59825ae4978addb6ea"; + sha256 = "01e408103e812278d0c81b3acef7045636d64999237dfeb74024e63f640084aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/szl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/szl/firefox-125.0.3.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "59142a86da4d79a9045e3402f5dc08ad1bb4fd0da19c38678e23ec28fe0d17e9"; + sha256 = "940138fe1ec2f707f153147db6b6e5eca9dce191ae8765a52662cc89d9e18fe1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ta/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ta/firefox-125.0.3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "10f81b53ab382c3d886cccdcbc358d88913047c2d3b46f3b5ede8e6e37e49f4b"; + sha256 = "d90039aef7fc7e56e948d4af079f3edef5b65588ad5fd650cb70f59188c758fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/te/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/te/firefox-125.0.3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "cfc670b083d0833f12009fb7a5900005b587f8810703fe1524eff4a8d7324924"; + sha256 = "1ad8d8e42c691566cf1d082464f5c32e8ecef628182ff4dbebb4482e2eb33465"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/tg/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/tg/firefox-125.0.3.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "85639be530c9646f3585da1e016baaa5da94ea5f013fb000e9701f24ef0f1a6f"; + sha256 = "4c6974fcdc6d55662073b259b4891472eae22f79aa718ba6f13e73e54f97ca42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/th/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/th/firefox-125.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "fad792259e305d54f79a96cb7531a1715e005550a38f1270c8c7c87bfafde1f6"; + sha256 = "6725c41f5465bf1a1731154654bd6e0a8aa9b5175e1e7f64ae719e8b1fed0057"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/tl/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/tl/firefox-125.0.3.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "3e99c9479f4b3cf56b50c42b8795a6b33fbbc691fa590a37154e7cce060e4a86"; + sha256 = "6e7dee9256a30aec0c7fa67cff5d3b295bd45f417a0d02f34cdafd2fabffa6b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/tr/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/tr/firefox-125.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "ed87d470ba9002b8dad1602903a7e09ffbfc060f07a18c0add678b598734c375"; + sha256 = "fc1f91da8f5b30301a0f3238b6dde5e0accd314f6fe43d18715b786a2917d8e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/trs/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/trs/firefox-125.0.3.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "06828e917ef4af7d21e9f029089786c83e8fd68566791fe7e4c3864e86c3e6f5"; + sha256 = "ab8cf88696df73b802f6dd6f42c33172c35685af462e92e2fd161ed3307c5fae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/uk/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/uk/firefox-125.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "b25acede364fe39902fa28246598f98f84a7dc3165360aa9c64cf1561fa15ef6"; + sha256 = "40fd34bcbef5937190065db1769227ae05fe29d7df65cab96b4b47b68acfd0f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/ur/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ur/firefox-125.0.3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a4cea15d11709f4d6dcbded2dc4148a0fb898714ccc25a04cbcbbcd95ee71cc5"; + sha256 = "360c8abcfc50fa78f1115973f152785ee52f1ab9a8e512183df7e7f6f9099ae9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/uz/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/uz/firefox-125.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "0391b07c6610249fdb6b9d97f7740be9eef58e17839226aec92824288c470f27"; + sha256 = "ac301677aa02e5e8f4ebbf382b511b9a7ee07036e7f74726ec23dfae2b82614f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/vi/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/vi/firefox-125.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a5ae2a1f2742cccddee2b5f38410420c70819bc50690036f70751cd167652148"; + sha256 = "78964ade29f3d8c3d664be9a634ab6f2e7c33100d08936de4b813b7718946d39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/xh/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/xh/firefox-125.0.3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ecfb3185448cb3f41dc1cf0ac21cdb44bfb01c26a84630376090749c8148af5a"; + sha256 = "3692b2d980105d1d1640c0dfaec52df29cc5c5b3868250aee6c011d9e3a95963"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/zh-CN/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/zh-CN/firefox-125.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4b4fdcf285ac82083c4b1ca18d91884bceaf9fdbf407266a6aade2ecf7f3c6ba"; + sha256 = "b9c137726f279abef9f86e8f2889465d1f9f2bfd34cb7008471a5c7e5222fd78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.2/linux-i686/zh-TW/firefox-125.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/zh-TW/firefox-125.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "8f3be757fb5212e849a31a98f7b1ec874a19d14e8d9af186d36c070759005e23"; + sha256 = "a7cd7f510e92be7608a405ee7048becf1e2866dc0153434e465fa3f381921ad1"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 76a5074a8c8bf..4823ceab0eacd 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "125.0.2"; + version = "125.0.3"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f6d5fff7c5c532d2e41a246d0403bdd746981cfcb7c43f9d3d8ec85a7acc3310a52043d1e18848475cef1b63c24769e81b2b06d68ae007b68016ee51436032f1"; + sha512 = "18e705a3093290311ccb5f27f01e43fe243ece94c1769a9ccc4fa53d370e32a1ec6a107cdeb531e9468b9aca1a1fe668161adb7acc1ec65fd383837882c7d484"; }; extraPatches = [ diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index fc81be7124416..3be88d290040c 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -11,6 +11,7 @@ , cmake , ninja , libxcrypt +, python3 , qt6Packages , nixosTests , AppKit @@ -103,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = with qt6Packages; [ cmake ninja + python3 wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 9edb3d882acb3..a34b5022a7a39 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -208,8 +208,8 @@ stdenv.mkDerivation rec { # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf - sed -i "$FONTCONFIG_FILE" \ - -e "s,<dir>fonts</dir>,<dir>$MB_IN_STORE/fonts</dir>," + substituteInPlace "$FONTCONFIG_FILE" \ + --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$MB_IN_STORE/fonts</dir>" mkdir -p $out/bin diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 851f2c49f280b..91456e85e6f7e 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -199,8 +199,8 @@ stdenv.mkDerivation rec { ''} # Fixup paths to pluggable transports. - sed -i TorBrowser/Data/Tor/torrc-defaults \ - -e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g" + substituteInPlace TorBrowser/Data/Tor/torrc-defaults \ + --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser" # Fixup obfs transport. Work around patchelf failing to set # interpreter for pre-compiled Go binaries by invoking the interpreter @@ -263,8 +263,8 @@ stdenv.mkDerivation rec { # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 # indicates the system fonts.conf being used instead. FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf - sed -i "$FONTCONFIG_FILE" \ - -e "s,<dir>fonts</dir>,<dir>$TBB_IN_STORE/fonts</dir>," + substituteInPlace "$FONTCONFIG_FILE" \ + --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>" # Hard-code paths to geoip data files. TBB resolves the geoip files # relative to torrc-defaults_path but if we do not hard-code them diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 7f3265cbd8bf4..761e7f0d1d7b1 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.10.7"; + version = "2.10.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-0C8lVQrFxrk9ym4aCz0PhUS2iByx9rj5Id0xFIq4Efc="; + hash = "sha256-VzEgZshzIHXI0J172W1zI1E8dU8iYJq0lO01LpI8Y+U="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 39c14e95c60d4..2ad7f717252b5 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.9"; + version = "0.11.10"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-TJja4FL440ZG5VsCfJsKUYeM2YPlMSl2+ejjlgyP5IY="; + hash = "sha256-Uw+/pVhbGYjFTcrh90Gstu5KddlkXKuzL2lbQ7CFLGs="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 3eccd57c68f94..2bfa0662dba8c 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-pG0jr+LCKMwJGDndEZw6vho3zylsoGBVdXqruSS7SDQ="; + hash = "sha256-e+Ut6xoNUY9cJjjJ43P0siEa+G1igllcb8veirk1UX0="; }; vendorHash = "sha256-ALRnccGjPGuAITtuz79Cao95NhvSczAzspSMXytlw+A="; @@ -29,6 +29,7 @@ buildGoModule rec { installShellCompletion --cmd clusterctl \ --bash <($out/bin/clusterctl completion bash) \ + --fish <($out/bin/clusterctl completion fish) \ --zsh <($out/bin/clusterctl completion zsh) ''; @@ -38,12 +39,12 @@ buildGoModule rec { version = "v${version}"; }; - meta = with lib; { + meta = { changelog = "https://github.com/kubernetes-sigs/cluster-api/releases/tag/${src.rev}"; description = "Kubernetes cluster API tool"; mainProgram = "clusterctl"; homepage = "https://cluster-api.sigs.k8s.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ qjoly ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ qjoly ]; }; } diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index feb1b03d26fe8..14c92f1b773e7 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "cmctl"; - version = "1.14.4"; + version = "1.14.5"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - hash = "sha256-iUXN+8ueCxGsFnwhC2WjrQQSXV7TGUR80xaKqjxcC6o="; + hash = "sha256-WitYq3/veaARZQHoseJnT5h0AGmXVlLzRe8KCOJuY0w="; }; sourceRoot = "${src.name}/cmd/ctl"; - vendorHash = "sha256-ViKsqqM6l/tQSGgj8Yt2L57x+eE1Pd3xCVPuWpIjWOQ="; + vendorHash = "sha256-27XvT33S/vgGo5MQDpHzTN+K1nNPR6OOFggzLhatygI="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/helm/plugins/default.nix b/pkgs/applications/networking/cluster/helm/plugins/default.nix index 1a6aa12a91e5b..8ac059e98a249 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -1,17 +1,17 @@ { callPackage }: { + helm-cm-push = callPackage ./helm-cm-push.nix { }; helm-diff = callPackage ./helm-diff.nix { }; helm-git = callPackage ./helm-git.nix { }; - helm-cm-push = callPackage ./helm-cm-push.nix { }; + helm-mapkubeapis = callPackage ./helm-mapkubeapis.nix { }; helm-s3 = callPackage ./helm-s3.nix { }; helm-secrets = callPackage ./helm-secrets.nix { }; helm-unittest = callPackage ./helm-unittest.nix { }; - } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index d04faf4400812..032ccfe8f96a5 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , coreutils , findutils -, git +, gitMinimal , gnugrep , gnused , makeWrapper @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patchShebangs $out/helm-git/helm-git{,-plugin.sh} wrapProgram $out/helm-git/helm-git \ - --prefix PATH : ${lib.makeBinPath [ coreutils findutils git gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils findutils gitMinimal gnugrep gnused ]} runHook postInstall ''; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix new file mode 100644 index 0000000000000..21cb8b065e7ee --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix @@ -0,0 +1,34 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "helm-mapkubeapis"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "helm"; + repo = "helm-mapkubeapis"; + rev = "v${version}"; + hash = "sha256-6NeePXTdp5vlBLfIlWeXQZMZ0Uz/e1ZCgZmJvBJfaFw="; + }; + + vendorHash = "sha256-rVrQqeakPQl3rjzmqzHw74ffreLEVzP153wWJ8TEOIM="; + + # NOTE: Remove the install and upgrade hooks. + postPatch = '' + sed -i '/^hooks:/,+2 d' plugin.yaml + ''; + + postInstall = '' + install -dm755 $out/helm-mapkubeapis + mv $out/bin $out/helm-mapkubeapis/ + install -m644 -Dt $out/helm-mapkubeapis/config/ config/Map.yaml + install -m644 -Dt $out/helm-mapkubeapis plugin.yaml + ''; + + meta = { + description = "A Helm plugin which maps deprecated or removed Kubernetes APIs in a release to supported APIs"; + homepage = "https://github.com/helm/helm-mapkubeapis"; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ aos ]; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 78ff59860bb82..f768404e08fa2 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-unittest"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-C1aHnKNXgzlPT1qMngRcPZ6hYUOenU1xpeYLnhrvtnc="; + hash = "sha256-DGmvF4U+yqXWm/L96ph+/OrLZ7q+JG4PQQFxC7pH710="; }; - vendorHash = "sha256-nm1LFy2yqfQs+HmrAR1EsBjpm9w0u4einLbVFW1UitI="; + vendorHash = "sha256-BRFKrrJ9PhwMrfr3ON4/sm+BQ1ufeyP5PtfJQRksrj0="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 3a5f18cbf581d..3face97137cca 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-irMipYDYMyA0l9d7tI1wS7XsxGWjBzTvxmhpKM1gLW8="; + sha256 = "sha256-sUMQrBAOhpMxMawOdvLFSUrcU9od6pmT7NabSywoQn8="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index 1869cc83d9165..589b93cd2f725 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1gEEmF9RRMwFAvmhLwidkVh+lnibs6x5ZHy/nJRum9E="; + sha256 = "sha256-9fL1zuhQ1B8QpJXcGVxg8mqIQoM5ZhwuE000rDcrrw0="; }; vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q="; diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 7aa35405f01c8..a5fc3b5a42da7 100644 --- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-pNyXi3IjEMwAUdNzDw8WttQzmtHja2YfTHntowLrQOo="; + hash = "sha256-sh9ogECNEZ6AYhdJD87ELnr8E0iWPLhDu3Qkdpb2194="; }; vendorHash = "sha256-3yh6b0dB2JC0t2EwykWiLk6glyKUhTpqmqvfFZ4RekE="; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 9a1acd4809fb7..cde60aa4f9a73 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,14 +15,14 @@ buildGoModule rec { inherit pname; - version = "2.7.1"; + version = "2.7.2"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-jTKGJe498eEI0re6gEAKW81IjAJ4VmqjetoKp8A7Cz0="; + hash = "sha256-Y9JejIKENIyn2EyRHXLm6CZqlP4MwvPSMRlciYl+a30="; }; vendorHash = "sha256-ne62twZXac5GfQ8JcWElIMqc+Vpvn0Y9XSNgAtF62q0="; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index f40dc62474764..17e252c9c161b 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.4.4"; - sha256 = "07p4cgl4myv7kv9pxvxrvsqnl3vkd9ay5hngx5g6xds2sc8va306"; - vendorHash = "sha256-bLTummNoDfGMYvtfSLxICgCFZEymPJcRWkQyWOSzKR8="; + version = "24.4.5"; + sha256 = "0cxjilxsvbwahqh3wb3cw4z8fmq6lhxi531abrncs74kgasgcfam"; + vendorHash = "sha256-YxavLLYppV991AgFb2WaQDbqnsr3UfrvWefvkSf+W1Q="; } diff --git a/pkgs/applications/networking/cluster/nomad-pack/default.nix b/pkgs/applications/networking/cluster/nomad-pack/default.nix index d576979f569ec..a7a0ddf71391d 100644 --- a/pkgs/applications/networking/cluster/nomad-pack/default.nix +++ b/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nomad-pack"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4v5CAJkpeIZ64w5LDcK9Jn8qDqIXrtXgVyB3K/PiZQw="; + sha256 = "sha256-b7M2I+R39txtTdk/FOYvKfZxXbGEtDrzgpB64594Gqc="; }; - vendorHash = "sha256-kHZWciRZYk1E1NVega0F/ZljyEl1SmXUveb2E7a9j34="; + vendorHash = "sha256-bhWySn5p1aPbYSCY7GqFteYmm22Jeq/Rf/a2ZTjyZQ4="; # skip running go tests as they require network access doCheck = false; diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index a378a7486b713..2d9b07a3f88dc 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,22 +14,22 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-CYiwn2NDIAx30J8tmbrV45dbCIGoA3U+yBdMj4RX5Ho="; + hash = "sha256-e0u8aFua3oMsBafwRPYuWQ9M6DtC7f9LlCDGJ5vdAWE="; }; - vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk="; + vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q="; ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ]; postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ - --replace "/bin/stty" "${coreutils}/bin/stty" + --replace-fail "/bin/stty" "${coreutils}/bin/stty" ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 5585b373df351..fd4b70de5acd8 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stern"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-Lx5f2dqjdhgMXky1Pv2ik9i56ugsQmZK/ag4veC9Dac="; + sha256 = "sha256-8Tvhul7GwVbRJqJenbYID8OY5zGzFhIormUwEtLE0Lw="; }; - vendorHash = "sha256-6jI/I7Nw/vJwKNvgH/35uHYu51SBX+WFH5s0WKfCqBo="; + vendorHash = "sha256-RLcF7KfKtkwB+nWzaQb8Va9pau+TS2uE9AmJ0aFNsik="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 3651d4652fc70..5a46b80749b08 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.6.5"; + version = "1.7.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-TEQnbQux+rN2WdlIbxh836Lx/ipqTDkoUsjQP8Ubl6s="; + hash = "sha256-E5pu37R2y0hQezM/p6LJXZv2L6QnV89Ir2HoKaqcOqI="; }; - vendorHash = "sha256-xdcHd/LvIm4rawwXtsGMF8Es9pMGMaJJaZ6UQwc24ZU="; + vendorHash = "sha256-5vWAZsLQxPZGpTiT/OowCLNPdE5e+HrAGXpFRw6jgbU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index b077379bee79e..49094fa960429 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-4e8z4k7loL9vVYe5jut1X/5qDboChQxZtPO1ZBHNb7o="; + hash = "sha256-yu5EfW5ThTJx6ouCBoEEq9wU4MtlFGqqRaHMgIPaRqY="; }; - vendorHash = "sha256-4xwdVFE0CGcOA8Efj4ECionPP9rbzT02zyr2HR143AM="; + vendorHash = "sha256-INmc/qbayjI+umkoGL8ih/iC7xqUkO1kfIZN5cQn/bw="; excludedPackages = [ "./build" ]; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index fce490fa8caba..5f06e15b1e50a 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-fCXQ9jVZqpyLzQsmpoKbha40KfCrKffmbt9RDj+lIUM="; + hash = "sha256-CUz2LBba5elWWqMab6I/n1eGKRi8q9im/jEwZI3k7WU="; }; vendorHash = "sha256-WMmL0jjzzaDtNmx+kvHFONqwhz7mjFCM4rT6YoL+XkA="; diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index a9540226d0024..cd3f502156908 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "unstable-2024-03-12"; + version = "0-unstable-2024-04-27"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "5805f6605efe63fc887e850bcc5d107070eb2c1a"; - hash = "sha256-IzVDxylrR0X8HLWTelSBq2+uu2h2Jd6iaNUXh9zQ9Yk="; + rev = "d76a7db668900a7fc41ead7db194e20f126071ac"; + hash = "sha256-uEMz7n0IFTGK1fZC1/vuwJpyySGdTUIMUjunCmycnzM="; }; - vendorHash = "sha256-6pCQHr/O2pfR1v8YI+htwGZ8RFStEEUctIEpgblXvjY="; + vendorHash = "sha256-hSrGN3NHPpp5601l4KcmNHVYOGWfLjFeWWr9g11nM3I="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 38c5220563761..a922d70cd68fd 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -12,7 +12,7 @@ }: let - version = "2023.09.06"; + version = "2024.04.17"; dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { @@ -23,7 +23,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2"; - hash = "sha256-kZMwj8Fn8Hf58C57wE025TlmiSs5TaKMGEzvb2QjgSw="; + hash = "sha256-pqCYzxaqR0f0CBaseT1Z436K47cIDQswYR1sK4Zj8sE="; }; strictDeps = true; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 66947266d2026..75a64404db930 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -85,6 +85,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; description = "Multipurpose automation tool for all of your media"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pbsds ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 7211d540896b4..b4e0aca9cc58a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,14 +2,14 @@ let versions = if stdenv.isLinux then { - stable = "0.0.50"; - ptb = "0.0.80"; - canary = "0.0.357"; + stable = "0.0.51"; + ptb = "0.0.81"; + canary = "0.0.369"; development = "0.0.17"; } else { - stable = "0.0.301"; - ptb = "0.0.109"; - canary = "0.0.477"; + stable = "0.0.302"; + ptb = "0.0.110"; + canary = "0.0.486"; development = "0.0.39"; }; version = versions.${branch}; @@ -17,15 +17,15 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-6VXdVLk7Z8NGQMiSdgBRd8NIueUktkId6BXYKNABb+4="; + hash = "sha256-w8zLeaqJXdbI67X/UDxSLQxZei5eraa/BkMZa+GDpYk="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-y/ntnHIYcY35Jszh0PrFy395eJ5dBWwLNpzHMoSZuNA="; + hash = "sha256-/kM23y4Hx/0HwIOQvd+4Y429s/6Q+coa27hgI2U3EcU="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-sDwC5kPzAfvQmsrq6M/GPFtUaT9pNAEB4uGI5Mn3oXs="; + hash = "sha256-Ohfp5ypvdmjr5rYR1usdVoEuVwOALRozysIjT/v75Qs="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -35,15 +35,15 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-h7C1wCKtUGcMFUhoKVdD7Vq9TGUaXfmjlVhwmRdhqYw="; + hash = "sha256-Xt0ef+ogGlPA4ebxuAsGQKeMVDoTB58jCRcyM1fHjYE="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-xxLnzELuI0X2r/weP1K2Bb51uRh1JjR72p7cXzy12Kc="; + hash = "sha256-hkRO/4YD1j4gsp+r3+md3ND/xtNmdutJiXlY3UIecIY="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-xEDtEtZNhOTtz+zRLLQBSeLbntlVAVQsocAGyAaVePM="; + hash = "sha256-c7KNWsV+pultD+HqRNonSOW9PCGx1AajCfnc94Dokwc="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; @@ -60,7 +60,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ]; + maintainers = with maintainers; [ Scrumplex artturin infinidoge jopejoe1 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "discord"; }; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 99562f4054ae7..d2a43e989bb83 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -18,13 +18,13 @@ let in flutter.buildFlutterApplication (rec { pname = "fluffychat-${targetFlutterPlatform}"; - version = "1.18.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "krille-chan"; repo = "fluffychat"; rev = "refs/tags/v${version}"; - hash = "sha256-xm3+zBqg/mW2XxqFDXxeC+gIc+TgeciJmQf8w1kcW5Y="; + hash = "sha256-eHwzvWKWJ9Q2OgCvgZTt+Bcph2w2pTqyOtwXFbZ4LEg="; }; inherit pubspecLock; @@ -32,7 +32,6 @@ flutter.buildFlutterApplication (rec { gitHashes = { flutter_shortcuts = "sha256-4nptZ7/tM2W/zylk3rfQzxXgQ6AipFH36gcIb/0RbHo="; keyboard_shortcuts = "sha256-U74kRujftHPvpMOIqVT0Ph+wi1ocnxNxIFA1krft4Os="; - wakelock_windows = "sha256-Dfwe3dSScD/6kvkP67notcbb+EgTQ3kEYcH7wpra2dI="; }; inherit targetFlutterPlatform; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json b/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json index b6df5968cd9a4..2c11ebced2b85 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json +++ b/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json @@ -1,24 +1,44 @@ { "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "67.0.0" + }, "adaptive_dialog": { "dependency": "direct main", "description": { "name": "adaptive_dialog", - "sha256": "30dc6deee139cde31e5d10a1d05e1a2a1bb6d592cf0eea27b978884b1ff03405", + "sha256": "817ff9b4bb441434d1fcb39a8d4492e50be456cd3507e4f19c5c7455c9e279e0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.1.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" }, "animations": { "dependency": "direct main", "description": { "name": "animations", - "sha256": "ef57563eed3620bd5d75ad96189846aca1e033c0c45fc9a7d26e80ab02b88a70", + "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "2.0.11" }, "ansicolor": { "dependency": "transitive", @@ -44,21 +64,21 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b", + "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.9" + "version": "3.4.10" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.0" }, "async": { "dependency": "direct main", @@ -74,11 +94,11 @@ "dependency": "transitive", "description": { "name": "audio_session", - "sha256": "6fdf255ed3af86535c96452c33ecff1245990bb25a605bfb1958661ccc3d467f", + "sha256": "a49af9981eec5d7cd73b37bacb6ee73f8143a6a9f9bd5b6021e6c346b9b6cf4e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.18" + "version": "0.1.19" }, "badges": { "dependency": "direct main", @@ -90,6 +110,16 @@ "source": "hosted", "version": "3.1.2" }, + "barbecue": { + "dependency": "transitive", + "description": { + "name": "barbecue", + "sha256": "e3a0afaf9005e466887d6c87411a2ddd8d72fc46db3caabf278ee600f1e2f92c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, "base58check": { "dependency": "transitive", "description": { @@ -184,21 +214,21 @@ "dependency": "direct main", "description": { "name": "chewie", - "sha256": "ccfce3350ae9fd419cd336cdf3380f77a08e45171e1e3cb3d499d204de5e7ea8", + "sha256": "e53da939709efb9aad0f3d72a69a8d05f889168b7a138af60ce78bab5c94b135", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.7.1" + "version": "1.8.1" }, "cli_util": { "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.0" + "version": "0.4.1" }, "clock": { "dependency": "transitive", @@ -220,6 +250,16 @@ "source": "hosted", "version": "1.18.0" }, + "colorize": { + "dependency": "transitive", + "description": { + "name": "colorize", + "sha256": "584746cd6ba1cba0633b6720f494fe6f9601c4170f0666c1579d2aa2a61071ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, "console": { "dependency": "transitive", "description": { @@ -240,15 +280,25 @@ "source": "hosted", "version": "3.1.1" }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.2" + }, "cross_file": { "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5", + "sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+7" + "version": "0.3.4+1" }, "crypto": { "dependency": "transitive", @@ -274,21 +324,21 @@ "dependency": "direct main", "description": { "name": "cupertino_icons", - "sha256": "d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.6" + "version": "1.0.8" }, "dart_webrtc": { "dependency": "transitive", "description": { "name": "dart_webrtc", - "sha256": "5897a3bdd6c7fded07e80e250260ca4c9cd61f9080911aa308b516e1206745a9", + "sha256": "b3a4f109c551a10170ece8fc79b5ca1b98223f24bcebc0f971d7fe35daad7a3b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.4.4" }, "dbus": { "dependency": "transitive", @@ -334,11 +384,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "0042cb3b2a76413ea5f8a2b40cec2a33e01d0c937e91f0f7c211fde4f7739ba6", + "sha256": "eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.1" + "version": "10.1.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -354,21 +404,21 @@ "dependency": "direct main", "description": { "name": "dynamic_color", - "sha256": "8b8bd1d798bd393e11eddeaa8ae95b12ff028bf7d5998fc5d003488cd5f4ce2f", + "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.8" + "version": "1.7.0" }, "emoji_picker_flutter": { "dependency": "direct main", "description": { "name": "emoji_picker_flutter", - "sha256": "8506341d62efd116d6fb1481450bffdbac659d3d90d46d9cc610bfae5f33cc54", + "sha256": "839200a2bd1af9a65d71133a5a246dbf5b24f7e4f6f4c5390130c2e0ed5f85af", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.4" + "version": "2.2.0" }, "emoji_proposal": { "dependency": "direct main", @@ -424,11 +474,11 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.2" }, "file": { "dependency": "transitive", @@ -444,11 +494,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6", + "sha256": "45c70b43df893027e441a6fa0aacc8f484fb9f9c60c746dc8f1dc4f774cf55cd", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.1" + "version": "8.0.2" }, "file_selector_linux": { "dependency": "transitive", @@ -474,11 +524,11 @@ "dependency": "transitive", "description": { "name": "file_selector_platform_interface", - "sha256": "0aa47a725c346825a2bd396343ce63ac00bda6eff2fbc43eabe99737dede8262", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.6.2" }, "file_selector_windows": { "dependency": "transitive", @@ -490,6 +540,16 @@ "source": "hosted", "version": "0.9.3+1" }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, "flutter": { "dependency": "direct main", "description": "flutter", @@ -506,25 +566,15 @@ "source": "hosted", "version": "1.5.0" }, - "flutter_blurhash": { - "dependency": "direct main", - "description": { - "name": "flutter_blurhash", - "sha256": "5e67678e479ac639069d7af1e133f4a4702311491188ff3e0227486430db0c06", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.2" - }, "flutter_cache_manager": { "dependency": "direct main", "description": { "name": "flutter_cache_manager", - "sha256": "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba", + "sha256": "395d6b7831f21f3b989ebedbb785545932adb9afe2622c1ffacf7f4b53a7e544", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.3.2" }, "flutter_driver": { "dependency": "transitive", @@ -532,25 +582,15 @@ "source": "sdk", "version": "0.0.0" }, - "flutter_file_dialog": { - "dependency": "direct main", - "description": { - "name": "flutter_file_dialog", - "sha256": "9344b8f07be6a1b6f9854b723fb0cf84a8094ba94761af1d213589d3cb087488", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, "flutter_foreground_task": { "dependency": "direct main", "description": { "name": "flutter_foreground_task", - "sha256": "e48d2d810a2d643362e64de41146ed8e95d4dd282bae6abbb32309d9f0bf5d67", + "sha256": "d40a1ddd5f275450d2e32055e7f884796c028a02ac26c751c20916576f79e132", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.2.0" }, "flutter_highlighter": { "dependency": "direct main", @@ -586,11 +626,11 @@ "dependency": "transitive", "description": { "name": "flutter_keyboard_visibility", - "sha256": "4983655c26ab5b959252ee204c2fffa4afeb4413cd030455194ec0caa3b8e7cb", + "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.1" + "version": "6.0.0" }, "flutter_keyboard_visibility_linux": { "dependency": "transitive", @@ -646,11 +686,11 @@ "dependency": "transitive", "description": { "name": "flutter_layout_grid", - "sha256": "3529b7aa7ed2cb9861a0bbaa5c14d4be2beaf5a070ce0176077159f80c5de094", + "sha256": "962a7ec8c7ea46c3b10606dac9c964f9143d10daa5ca28e40f4ce14eeef85b2a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "2.0.6" }, "flutter_linkify": { "dependency": "direct main", @@ -666,21 +706,21 @@ "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7", + "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "flutter_local_notifications": { "dependency": "direct main", "description": { "name": "flutter_local_notifications", - "sha256": "c18f1de98fe0bb9dd5ba91e1330d4febc8b6a7de6aae3ffe475ef423723e72f3", + "sha256": "8cdc719114ab1c86c64bb7a86d3a679674c3637edd229e3a994797d4a1504ce4", "url": "https://pub.dev" }, "source": "hosted", - "version": "16.3.2" + "version": "17.1.0" }, "flutter_local_notifications_linux": { "dependency": "transitive", @@ -696,11 +736,11 @@ "dependency": "transitive", "description": { "name": "flutter_local_notifications_platform_interface", - "sha256": "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef", + "sha256": "340abf67df238f7f0ef58f4a26d2a83e1ab74c77ab03cd2b2d5018ac64db30b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0+1" + "version": "7.1.0" }, "flutter_localizations": { "dependency": "direct main", @@ -712,11 +752,11 @@ "dependency": "direct main", "description": { "name": "flutter_map", - "sha256": "52c65a977daae42f9aae6748418dd1535eaf27186e9bac9bf431843082bc75a3", + "sha256": "cda8d72135b697f519287258b5294a57ce2f2a5ebf234f0e406aad4dc14c9399", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "6.1.0" }, "flutter_math_fork": { "dependency": "direct main", @@ -732,11 +772,11 @@ "dependency": "direct dev", "description": { "name": "flutter_native_splash", - "sha256": "c4d899312b36e7454bedfd0a4740275837b99e532d81c8477579d8183db1de6c", + "sha256": "edf39bcf4d74aca1eb2c1e43c3e445fd9f494013df7f0da752fefe72020eedc0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.6" + "version": "2.4.0" }, "flutter_olm": { "dependency": "direct main", @@ -762,11 +802,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da", + "sha256": "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.17" + "version": "2.0.19" }, "flutter_ringtone_player": { "dependency": "direct main", @@ -853,11 +893,11 @@ "dependency": "transitive", "description": { "name": "flutter_svg", - "sha256": "d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.9" + "version": "2.0.10+1" }, "flutter_test": { "dependency": "direct dev", @@ -869,31 +909,31 @@ "dependency": "direct main", "description": { "name": "flutter_typeahead", - "sha256": "b9942bd5b7611a6ec3f0730c477146cffa4cd4b051077983ba67ddfc9e7ee818", + "sha256": "d64712c65db240b1057559b952398ebb6e498077baeebf9b0731dade62438a6d", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.0" + "version": "5.2.0" }, "flutter_web_auth_2": { "dependency": "direct main", "description": { "name": "flutter_web_auth_2", - "sha256": "ea57000909d0002824179f1e4907c074f39538e86a9e4d93a74b7c37dbaee242", + "sha256": "3ea3a0cc539ca74319f4f2f7484f62742fe5b2ff9a0fca37575426d6e6f07901", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.4" + "version": "3.1.1" }, "flutter_web_auth_2_platform_interface": { "dependency": "transitive", "description": { "name": "flutter_web_auth_2_platform_interface", - "sha256": "9124824cbd21e12680bf58190e27b77f251c897e80ec81cd557ec1fde9aecabf", + "sha256": "e8669e262005a8354389ba2971f0fc1c36188481234ff50d013aaf993f30f739", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.1.0" }, "flutter_web_plugins": { "dependency": "transitive", @@ -905,11 +945,21 @@ "dependency": "direct main", "description": { "name": "flutter_webrtc", - "sha256": "8522e9f347aed9f03ec591d05fc286a698c1b11a1a6d3e994e92727d24c6f352", + "sha256": "20eac28848a2dffb26cc2b2870a5164613904511a0b7e8f4825e31a2768175d2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.46" + "version": "0.10.3" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" }, "fuchsia_remote_debug_protocol": { "dependency": "transitive", @@ -981,11 +1031,11 @@ "dependency": "transitive", "description": { "name": "get_it", - "sha256": "f79870884de16d689cf9a7d15eedf31ed61d750e813c538a6efb92660fea83c3", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.6.4" + "version": "7.7.0" }, "glob": { "dependency": "transitive", @@ -1001,11 +1051,11 @@ "dependency": "direct main", "description": { "name": "go_router", - "sha256": "07ee2436909f749d606f53521dc1725dd738dc5196e5ff815bc254253c594075", + "sha256": "466425a64508ca00983882f523400d9169365cb9b464e2e2419f3b6545ff9c51", "url": "https://pub.dev" }, "source": "hosted", - "version": "13.1.0" + "version": "14.0.1" }, "gradient_borders": { "dependency": "transitive", @@ -1071,11 +1121,21 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", + "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.6" + "version": "1.2.1" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" }, "http_parser": { "dependency": "transitive", @@ -1088,54 +1148,54 @@ "version": "4.0.2" }, "image": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "image", - "sha256": "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271", + "sha256": "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.3" + "version": "4.1.7" }, "image_picker": { "dependency": "direct main", "description": { "name": "image_picker", - "sha256": "7d7f2768df2a8b0a3cefa5ef4f84636121987d403130e70b17ef7e2cf650ba84", + "sha256": "fe9ee64ccb8d599a5dfb0e21cc6652232c610bcf667af4e79b9eb175cc30a7a5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.1.0" }, "image_picker_android": { "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "d6a6e78821086b0b737009b09363018309bbc6de3fd88cc5c26bc2bb44a4957f", + "sha256": "8e75431a62b7feb4fd55cb4a5c6f0ac4564460ec5dc09f9c4a0d50a5ce7c4cb9", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.8+2" + "version": "0.8.10" }, "image_picker_for_web": { "dependency": "transitive", "description": { "name": "image_picker_for_web", - "sha256": "50bc9ae6a77eea3a8b11af5eb6c661eeb858fdd2f734c2a4fd17086922347ef7", + "sha256": "5d6eb13048cd47b60dbf1a5495424dea226c5faf3950e20bf8120a58efb5b5f3", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.4" }, "image_picker_ios": { "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "76ec722aeea419d03aa915c2c96bf5b47214b053899088c9abb4086ceecf97a7", + "sha256": "f74064bc548b5164a033ec05638e23c91be1a249c255e0f56319dddffd759794", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.8+4" + "version": "0.8.10+1" }, "image_picker_linux": { "dependency": "transitive", @@ -1161,11 +1221,11 @@ "dependency": "transitive", "description": { "name": "image_picker_platform_interface", - "sha256": "ed9b00e63977c93b0d2d2b343685bed9c324534ba5abafbb3dfbd6a780b1b514", + "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.1" + "version": "2.10.0" }, "image_picker_windows": { "dependency": "transitive", @@ -1237,21 +1297,21 @@ "dependency": "transitive", "description": { "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.1" + "version": "4.9.0" }, "just_audio": { "dependency": "direct main", "description": { "name": "just_audio", - "sha256": "b607cd1a43bac03d85c3aaee00448ff4a589ef2a77104e3d409889ff079bf823", + "sha256": "b7cb6bbf3750caa924d03f432ba401ec300fd90936b3f73a9b33d58b1e96286b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.36" + "version": "0.9.37" }, "just_audio_platform_interface": { "dependency": "transitive", @@ -1288,11 +1348,11 @@ "dependency": "direct main", "description": { "name": "latlong2", - "sha256": "08ef7282ba9f76e8495e49e2dc4d653015ac929dce5f92b375a415d30b407ea0", + "sha256": "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.2" + "version": "0.9.1" }, "leak_tracker": { "dependency": "transitive", @@ -1324,6 +1384,16 @@ "source": "hosted", "version": "2.0.1" }, + "license_checker": { + "dependency": "direct dev", + "description": { + "name": "license_checker", + "sha256": "eea27638e42bc98fd91a6a8187eb57e5617e2c3c8b313a5d51b14bec7a8685e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, "linkify": { "dependency": "direct main", "description": { @@ -1364,6 +1434,16 @@ "source": "hosted", "version": "1.0.1" }, + "logger": { + "dependency": "transitive", + "description": { + "name": "logger", + "sha256": "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, "logging": { "dependency": "transitive", "description": { @@ -1378,31 +1458,31 @@ "dependency": "transitive", "description": { "name": "macos_ui", - "sha256": "cc499122655c61728185561e9006af4b239f9526f98d7b2cbf42124e9044a0ff", + "sha256": "d351f0bada7e5b0cee8cf394299878a6c04e5cfcd784fa1d40e44299501124d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.2" + "version": "2.0.5" }, "macos_window_utils": { "dependency": "transitive", "description": { "name": "macos_window_utils", - "sha256": "b3dfd47bbc605f0e315af684b50370a8f84932267aaa542098063fa384d593bd", + "sha256": "230be594d26f6dee92c5a1544f4242d25138a5bfb9f185b27f14de3949ef0be8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "markdown": { "dependency": "transitive", "description": { "name": "markdown", - "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd", + "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.1" + "version": "7.2.2" }, "matcher": { "dependency": "transitive", @@ -1428,21 +1508,11 @@ "dependency": "direct main", "description": { "name": "matrix", - "sha256": "84e5745dd41468a2870d119e597529e6471f3ce2f400e4b35d5bd6a036a98692", + "sha256": "36c7e13d5d7420898f2597d6f5f0611a9da8114a0fde11f41b9e54cd1140b05f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.25.7" - }, - "matrix_api_lite": { - "dependency": "transitive", - "description": { - "name": "matrix_api_lite", - "sha256": "62bdd1dffb956e956863ba21e52109157502342b749e4728f4105f0c6d73a254", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.7.2" + "version": "0.27.0" }, "meta": { "dependency": "transitive", @@ -1468,21 +1538,21 @@ "dependency": "transitive", "description": { "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "msix": { "dependency": "direct dev", "description": { "name": "msix", - "sha256": "957d04eee260e4bd15bec1fdb988dfc73718285e201cf89d97ef01ef38e66d4c", + "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.6" + "version": "3.16.7" }, "native_imaging": { "dependency": "direct main", @@ -1504,6 +1574,16 @@ "source": "hosted", "version": "1.0.0" }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "olm": { "dependency": "transitive", "description": { @@ -1528,11 +1608,11 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79", + "sha256": "cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.1" + "version": "6.0.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -1544,6 +1624,16 @@ "source": "hosted", "version": "2.0.1" }, + "pana": { + "dependency": "transitive", + "description": { + "name": "pana", + "sha256": "3fc3fe8e7a9fd4827fa4d625a423eec95d305b2bc3538a3adf7fd6c49217af97", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.21.45" + }, "pasteboard": { "dependency": "direct main", "description": { @@ -1555,7 +1645,7 @@ "version": "0.2.0" }, "path": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "path", "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", @@ -1578,31 +1668,31 @@ "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa", + "sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.3" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72", + "sha256": "a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.4" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d", + "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "path_provider_linux": { "dependency": "transitive", @@ -1618,11 +1708,11 @@ "dependency": "transitive", "description": { "name": "path_provider_platform_interface", - "sha256": "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "path_provider_windows": { "dependency": "transitive", @@ -1638,71 +1728,71 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78", + "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.1.0" + "version": "11.3.1" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6", + "sha256": "1acac6bae58144b442f11e66621c062aead9c99841093c38f5bcdcc24c1c3474", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.1" + "version": "12.0.5" }, "permission_handler_apple": { "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306", + "sha256": "e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.0" + "version": "9.4.4" }, "permission_handler_html": { "dependency": "transitive", "description": { "name": "permission_handler_html", - "sha256": "d96ff56a757b7f04fa825c469d296c5aebc55f743e87bd639fef91a466a24da8", + "sha256": "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.0+1" + "version": "0.1.1" }, "permission_handler_platform_interface": { "dependency": "transitive", "description": { "name": "permission_handler_platform_interface", - "sha256": "d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1", + "sha256": "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.2.1" }, "permission_handler_windows": { "dependency": "transitive", "description": { "name": "permission_handler_windows", - "sha256": "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.1" }, "petitparser": { "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "6.0.2" }, "platform": { "dependency": "transitive", @@ -1728,31 +1818,61 @@ "dependency": "transitive", "description": { "name": "plugin_platform_interface", - "sha256": "f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.7" + "version": "2.1.8" }, "pointer_interceptor": { "dependency": "transitive", "description": { "name": "pointer_interceptor", - "sha256": "adf7a637f97c077041d36801b43be08559fd4322d2127b3f20bb7be1b9eebc22", + "sha256": "bd18321519718678d5fa98ad3a3359cbc7a31f018554eab80b73d08a7f0c165a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.3+7" + "version": "0.10.1" + }, + "pointer_interceptor_ios": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_ios", + "sha256": "2e73c39452830adc4695757130676a39412a3b7f3c34e3f752791b5384770877", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.0+2" + }, + "pointer_interceptor_platform_interface": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_platform_interface", + "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.0+1" + }, + "pointer_interceptor_web": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_web", + "sha256": "a6237528b46c411d8d55cdfad8fcb3269fc4cbb26060b14bff94879165887d1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.2" }, "pointycastle": { "dependency": "transitive", "description": { "name": "pointycastle", - "sha256": "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c", + "sha256": "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.7.3" + "version": "3.9.0" }, "polylabel": { "dependency": "transitive", @@ -1764,6 +1884,26 @@ "source": "hosted", "version": "1.0.1" }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pretty_qr_code": { + "dependency": "direct main", + "description": { + "name": "pretty_qr_code", + "sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0" + }, "process": { "dependency": "transitive", "description": { @@ -1788,11 +1928,11 @@ "dependency": "direct main", "description": { "name": "provider", - "sha256": "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.1" + "version": "6.1.2" }, "pub_semver": { "dependency": "transitive", @@ -1844,16 +1984,6 @@ "source": "hosted", "version": "1.0.1" }, - "qr_flutter": { - "dependency": "direct main", - "description": { - "name": "qr_flutter", - "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.0" - }, "quiver": { "dependency": "transitive", "description": { @@ -1954,6 +2084,16 @@ "source": "hosted", "version": "0.0.10" }, + "retry": { + "dependency": "transitive", + "description": { + "name": "retry", + "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, "rxdart": { "dependency": "transitive", "description": { @@ -1964,6 +2104,16 @@ "source": "hosted", "version": "0.27.7" }, + "safe_url_check": { + "dependency": "transitive", + "description": { + "name": "safe_url_check", + "sha256": "49a3e060a7869cbafc8f4845ca1ecbbaaa53179980a32f4fdfeab1607e90f41d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, "scroll_to_index": { "dependency": "direct main", "description": { @@ -1998,51 +2148,51 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "f74fc3f1cbd99f39760182e176802f693fa0ec9625c045561cfad54681ea93dd", + "sha256": "ef3489a969683c4f3d0239010cc8b7a2a46543a8d139e111c06c558875083544", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.1" + "version": "9.0.0" }, "share_plus_platform_interface": { "dependency": "transitive", "description": { "name": "share_plus_platform_interface", - "sha256": "df08bc3a07d01f5ea47b45d03ffcba1fa9cd5370fb44b3f38c70e42cced0f956", + "sha256": "0f9e4418835d1b2c3ae78fdb918251959106cefdbc4dd43526e182f80e82f6d4", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "4.0.0" }, "shared_preferences": { "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02", + "sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.2.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06", + "sha256": "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.2" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7", + "sha256": "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.4" + "version": "2.3.5" }, "shared_preferences_linux": { "dependency": "transitive", @@ -2058,21 +2208,21 @@ "dependency": "transitive", "description": { "name": "shared_preferences_platform_interface", - "sha256": "d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a", + "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "shared_preferences_web": { "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21", + "sha256": "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.3.0" }, "shared_preferences_windows": { "dependency": "transitive", @@ -2084,6 +2234,46 @@ "source": "hosted", "version": "2.3.2" }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, "sky_engine": { "dependency": "transitive", "description": "flutter", @@ -2100,6 +2290,26 @@ "source": "hosted", "version": "2.0.0" }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, "source_span": { "dependency": "transitive", "description": { @@ -2110,55 +2320,65 @@ "source": "hosted", "version": "1.10.0" }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, "sqflite": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a", + "sha256": "5ce2e1a15e822c3b4bfb5400455775e421da7098eed8adc8f26298ada7c9308c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" + "version": "2.3.3" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6", + "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0+2" + "version": "2.5.4" }, "sqflite_common_ffi": { "dependency": "direct main", "description": { "name": "sqflite_common_ffi", - "sha256": "35d2fce1e971707c227cc4775cc017d5eafe06c2654c3435ebd5c3ad6c170f5f", + "sha256": "4d6137c29e930d6e4a8ff373989dd9de7bac12e3bc87bce950f6e844e8ad3bb5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0+4" + "version": "2.3.3" }, - "sqflite_sqlcipher": { + "sqlcipher_flutter_libs": { "dependency": "direct main", "description": { - "name": "sqflite_sqlcipher", - "sha256": "e1dfb55bf21ee5a18c43f28faa4291272a801da4ab34a6ba9973b6c0e1ed77da", + "name": "sqlcipher_flutter_libs", + "sha256": "60fe3444ff5b1b298a9ca3003c6c7f1f7ee4c90aa6035a8647f3aeaf05a073e2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "0.6.1" }, "sqlite3": { "dependency": "transitive", "description": { "name": "sqlite3", - "sha256": "db65233e6b99e99b2548932f55a987961bc06d82a31a0665451fa0b4fff4c3fb", + "sha256": "1abbeb84bf2b1a10e5e1138c913123c8aa9d83cd64e5f9a0dd847b3c83063202", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.4.2" }, "stack_trace": { "dependency": "transitive", @@ -2190,6 +2410,16 @@ "source": "hosted", "version": "1.2.0" }, + "string_validator": { + "dependency": "transitive", + "description": { + "name": "string_validator", + "sha256": "50dd8ecf91db6a732f4a851eeae81ee12406eedc62d0da72f2d91a04a2d10dd8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0" + }, "swipe_to_action": { "dependency": "direct main", "description": { @@ -2214,11 +2444,21 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60", + "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.0+1" + }, + "tar": { + "dependency": "transitive", + "description": { + "name": "tar", + "sha256": "aca91e93ff9ff2dba4462c6eea6bc260b72f0d7010e748e3397c32190529bd6e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" }, "term_glyph": { "dependency": "transitive", @@ -2230,6 +2470,16 @@ "source": "hosted", "version": "1.2.1" }, + "test": { + "dependency": "transitive", + "description": { + "name": "test", + "sha256": "a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.24.9" + }, "test_api": { "dependency": "transitive", "description": { @@ -2240,15 +2490,25 @@ "source": "hosted", "version": "0.6.1" }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.9" + }, "timezone": { "dependency": "transitive", "description": { "name": "timezone", - "sha256": "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0", + "sha256": "a6ccda4a69a442098b602c44e61a1e2b4bf6f5516e875bbf0f427d5df14745d5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.2" + "version": "0.9.3" }, "tint": { "dependency": "transitive", @@ -2354,11 +2614,11 @@ "dependency": "transitive", "description": { "name": "unifiedpush_android", - "sha256": "19fcdd2671c46bd074efbb80c43cedd0bcddd1fc0cfd3e2f74aec03fb0659d58", + "sha256": "610ad746294541f56d632adf9afba5d1c164c44e23ec0dd2162a41a6ff00a00e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.3" }, "unifiedpush_platform_interface": { "dependency": "transitive", @@ -2404,41 +2664,41 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba", + "sha256": "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.6" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def", + "sha256": "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.0" + "version": "6.3.1" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3", + "sha256": "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.5" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd", + "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "url_launcher_macos": { "dependency": "transitive", @@ -2454,71 +2714,71 @@ "dependency": "transitive", "description": { "name": "url_launcher_platform_interface", - "sha256": "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.3.2" }, "url_launcher_web": { "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7", + "sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.3.1" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc", + "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "uuid": { "dependency": "transitive", "description": { "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "sha256": "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.7" + "version": "4.4.0" }, "vector_graphics": { "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "0f0c746dd2d6254a0057218ff980fc7f5670fd0fcf5e4db38a490d31eed4ad43", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+1" + "version": "1.1.11+1" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "0edf6d630d1bfd5589114138ed8fada3234deacc37966bec033d3047c29248b7", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+1" + "version": "1.1.11+1" }, "vector_graphics_compiler": { "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "d24333727332d9bd20990f1483af4e09abdb9b1fc7c3db940b56ab5c42790c26", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+1" + "version": "1.1.11+1" }, "vector_math": { "dependency": "transitive", @@ -2530,16 +2790,6 @@ "source": "hosted", "version": "2.1.4" }, - "vibration": { - "dependency": "direct main", - "description": { - "name": "vibration", - "sha256": "63d4f6b03e38d106599da18e786d5edcd02354433a4ed478fccbbcfc347193ab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.3" - }, "video_compress": { "dependency": "direct main", "description": { @@ -2554,51 +2804,51 @@ "dependency": "direct main", "description": { "name": "video_player", - "sha256": "e16f0a83601a78d165dabc17e4dac50997604eb9e4cc76e10fa219046b70cef3", + "sha256": "db6a72d8f4fd155d0189845678f55ad2fd54b02c10dcafd11c068dbb631286c0", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.8.1" + "version": "2.8.6" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "3fe89ab07fdbce786e7eb25b58532d6eaf189ceddc091cb66cba712f8d9e8e55", + "sha256": "134e1ad410d67e18a19486ed9512c72dfc6d8ffb284d0e8f2e99e903d1ba8fa3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.4.14" }, "video_player_avfoundation": { "dependency": "transitive", "description": { "name": "video_player_avfoundation", - "sha256": "bc923884640d6dc403050586eb40713cdb8d1d84e6886d8aca50ab04c59124c2", + "sha256": "00c49b1d68071341397cf760b982c1e26ed9232464c8506ee08378a5cca5070d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.2" + "version": "2.5.7" }, "video_player_platform_interface": { "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "be72301bf2c0150ab35a8c34d66e5a99de525f6de1e8d27c0672b836fe48f73a", + "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.2" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "ab7a462b07d9ca80bed579e30fb3bce372468f1b78642e0911b10600f2c5cb5b", + "sha256": "41245cef5ef29c4585dbabcbcbe9b209e34376642c7576cabf11b4ad9289d6e4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.3.0" }, "visibility_detector": { "dependency": "transitive", @@ -2620,56 +2870,55 @@ "source": "hosted", "version": "13.0.0" }, - "wakelock_platform_interface": { - "dependency": "transitive", - "description": { - "name": "wakelock_platform_interface", - "sha256": "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.0" - }, "wakelock_plus": { "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d", + "sha256": "c8b7cc80f045533b40a0e6c9109905494e3cf32c0fbd5c62616998e0de44003f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" + "version": "1.2.4" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385", + "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.2.1" }, - "wakelock_windows": { - "dependency": "direct overridden", + "watcher": { + "dependency": "transitive", "description": { - "path": "wakelock_windows", - "ref": "main", - "resolved-ref": "f3610d6c246098fee74463de09434ed81fc2a7c8", - "url": "https://github.com/chandrabezzo/wakelock.git" + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" }, - "source": "git", - "version": "0.2.2" + "source": "hosted", + "version": "1.1.0" }, "web": { "dependency": "transitive", "description": { "name": "web", - "sha256": "edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.0" + "version": "0.5.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.5" }, "webdriver": { "dependency": "transitive", @@ -2681,35 +2930,45 @@ "source": "hosted", "version": "3.0.3" }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, "webrtc_interface": { "dependency": "direct main", "description": { "name": "webrtc_interface", - "sha256": "2efbd3e4e5ebeb2914253bcc51dafd3053c4b87b43f3076c74835a9deecbae3a", + "sha256": "abec3ab7956bd5ac539cf34a42fa0c82ea26675847c0966bb85160400eea9388", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.2.0" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f", + "sha256": "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.1.0" + "version": "5.5.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a", + "sha256": "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.3" }, "window_to_front": { "dependency": "transitive", @@ -2735,21 +2994,21 @@ "dependency": "transitive", "description": { "name": "xdg_directories", - "sha256": "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.3" + "version": "1.0.4" }, "xml": { "dependency": "transitive", "description": { "name": "xml", - "sha256": "af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.2" + "version": "6.5.0" }, "yaml": { "dependency": "transitive", @@ -2763,7 +3022,7 @@ } }, "sdks": { - "dart": ">=3.2.0 <4.0.0", - "flutter": ">=3.16.0" + "dart": ">=3.3.0 <4.0.0", + "flutter": ">=3.19.3" } } diff --git a/pkgs/applications/networking/instant-messengers/hamsket/default.nix b/pkgs/applications/networking/instant-messengers/hamsket/default.nix index 225a5669469c6..e535456ccf5ed 100644 --- a/pkgs/applications/networking/instant-messengers/hamsket/default.nix +++ b/pkgs/applications/networking/instant-messengers/hamsket/default.nix @@ -21,7 +21,7 @@ let categories = [ "Network" ]; }); - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; @@ -31,7 +31,6 @@ appimageTools.wrapType2 { extraInstallCommands = '' mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps - ln -sf hamsket-${version} $out/bin/${pname} install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/hamsket*.png $out/share/icons/hicolor/256x256/apps/${pname}.png install -Dm644 ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 53762baf82fff..af5f6ca321c03 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -17,7 +17,7 @@ let categories = [ "Network" ]; }); - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in @@ -26,7 +26,6 @@ appimageTools.wrapType2 { extraInstallCommands = '' mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps - ln -sf rambox-${version} $out/bin/${pname} install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png install -Dm644 ${desktopItem}/share/applications/* $out/share/applications ''; 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 62b6e1c9a4847..a87d49de7621f 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.6.0-beta.3"; + version = "7.7.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-BbXogNB2BxFQTpvHw0JVOaCV2PQHEQbafSavVcBd/Fg="; + hash = "sha256-oswS1aRkpiTNSpQ6CqfJnoM412RRwraeht4iqq8L1Bk="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 130508f95e30b..0b1f3b034cced 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.5.1"; + version = "7.6.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-afKR+P2YPkv4OMIr8LzWeAMZWr0zaJ1R0BQD87gQuSk="; + hash = "sha256-sGOWsFZTO9VQDkCqhsOkW5aY+sh0fLH7kPPe/bAzGvg="; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 906736be49774..604feba486c84 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.16.8"; + version = "5.0.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-M8wFhuTTEJippgvS93LNRqREV2TGF04ccps5oOmSr+0="; + hash = "sha256-BjXz2LwsvmJIaN+FZ4+mLu01jaajPvwf8YPqCjx7Kw4="; }; patches = [ 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 b9059e17bc264..8bc0f6f93b442 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,7 +9,7 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-12-21"; + version = "0-unstable-2023-12-21"; src = fetchFromGitHub { owner = "desktop-app"; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 9578b11fdfa67..d1df9c108143e 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "wavebox"; - version = "10.120.10-2"; + version = "10.124.17-2"; src = fetchurl { url = "https://download.wavebox.app/stable/linux/tar/Wavebox_${version}.tar.gz"; - sha256 = "sha256-9kA3nJUNlNHbWYkIy0iEnWCrmIYTjULdMAGGnO4JCkg="; + sha256 = "sha256-RS1/zs/rFWsj29BrT8Mb2IXgy9brBsQypxfvnd7pKl0="; }; # don't remove runtime deps diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 366dcbeffaea4..efb0fc95f33c1 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -25,15 +25,15 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "whatsapp-for-linux"; version = "1.6.4"; src = fetchFromGitHub { owner = "eneshecan"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-DU9tvIvDfOtBydR68yeRMFYdMjiBrOobCDXIZMmm7pQ="; + repo = "whatsapp-for-linux"; + rev = "v${finalAttrs.version}"; + hash = "sha256-DU9tvIvDfOtBydR68yeRMFYdMjiBrOobCDXIZMmm7pQ="; }; nativeBuildInputs = [ @@ -68,12 +68,12 @@ stdenv.mkDerivation rec { xorg.libXtst ]; - meta = with lib; { + meta = { homepage = "https://github.com/eneshecan/whatsapp-for-linux"; description = "Whatsapp desktop messaging app"; mainProgram = "whatsapp-for-linux"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ bartuka ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ bartuka ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index 52e2f0d47c773..934d8f5dcef1d 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-r4sE/1RI/Y6gDMApwlr4Gf6Jvl0zNCAahduXyRtFboE="; + hash = "sha256-ho/wlg6W0/LcJrVHPRVQ6zNjpwqa0+PThUP/RGIXVTA="; }; - cargoHash = "sha256-N9MsYz7QTm04k5eMdwqj4wTQ36SoaJBqvsty58Pg8tU="; + cargoHash = "sha256-1S6lFzoLxF6V94wXw/r5XDwbnt4/aaPOYdIIJA68Ya8="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 252bfb08e93f8..a1368c3884837 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Evolution"; + homepage = "https://gitlab.gnome.org/GNOME/evolution"; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; mainProgram = "evolution"; maintainers = teams.gnome.members; diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix deleted file mode 100644 index 3dc373a09024f..0000000000000 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv -, lib -, fetchgit -, rustPlatform - -# native build inputs -, pkg-config -, installShellFiles -, makeWrapper -, mandoc -, rustfmt -, file - -# build inputs -, openssl -, dbus -, sqlite - -# runtime deps -, gnum4 -}: - -rustPlatform.buildRustPackage rec { - pname = "meli"; - version = "0.8.4"; - - src = fetchgit { - url = "https://git.meli-email.org/meli/meli.git"; - rev = "v${version}"; - hash = "sha256-wmIlYgXB17/i9Q+6C7pbcEjVlEuvhmqrSH+cDmaBKLs="; - }; - - cargoHash = "sha256-gYS/dxNMz/HkCmRXH5AdHPXJ2giqpAHc4eVXJGOpMDM="; - - # Needed to get openssl-sys to use pkg-config - OPENSSL_NO_VENDOR=1; - - nativeBuildInputs = [ - pkg-config - installShellFiles - makeWrapper - mandoc - (rustfmt.override { asNightly = true; }) - ]; - - buildInputs = [ - openssl - dbus - sqlite - ]; - - nativeCheckInputs = [ - file - ]; - - postInstall = '' - installManPage meli/docs/*.{1,5,7} - - wrapProgram $out/bin/meli \ - --prefix PATH : ${lib.makeBinPath [ gnum4 ]} - ''; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - checkFlags = [ - "--skip=conf::test_config_parse" # panicking due to sandbox - "--skip=smtp::test::test_smtp" # requiring network - "--skip=utils::xdg::query_default_app" # doesn't build - "--skip=utils::xdg::query_mime_info" # doesn't build - ]; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "Terminal e-mail client and e-mail client library"; - mainProgram = "meli"; - homepage = "https://meli.delivery"; - license = licenses.gpl3; - maintainers = with maintainers; [ _0x4A6F matthiasbeyer ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 20775c4ed4afe..7677abfb0ccf3 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -10,6 +10,7 @@ nodePackages.n8n.override { nativeBuildInputs = [ pkgs.nodePackages.node-pre-gyp pkgs.which + pkgs.xcbuild ]; buildInputs = [ @@ -30,6 +31,9 @@ nodePackages.n8n.override { # makes libmongocrypt bindings not look for static libraries in completely wrong places BUILD_TYPE = "dynamic"; + # Disable NAPI_EXPERIMENTAL to allow to build with Node.js≥18.20.0. + NIX_CFLAGS_COMPILE = "-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT"; + dontNpmInstall = true; passthru = { diff --git a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch index 260a7dd4ddd7e..56cc005733a77 100644 --- a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch +++ b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch @@ -8,12 +8,13 @@ Subject: [PATCH] Explicitly copy dbus files into the store dir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt -index 2e7349ef7..512d4b188 100644 +index b4434d0..b57e033 100644 --- a/shell_integration/libcloudproviders/CMakeLists.txt +++ b/shell_integration/libcloudproviders/CMakeLists.txt -@@ -1,5 +1,6 @@ - macro(dbus_add_activation_service _sources) +@@ -4,6 +4,7 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0") + else() pkg_get_variable(_install_dir dbus-1 session_bus_services_dir) + endif() + set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service") foreach (_i ${_sources}) get_filename_component(_service_file ${_i} ABSOLUTE) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index a6d88fc686b0f..7e78fb5e65878 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.12.3"; + version = "3.13.0"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - hash = "sha256-ScWkEOx2tHoCQbFwBvJQgk2YoYOTPi3PrVsaDNJBEUI="; + hash = "sha256-i4vQGH9NSxIrLaPdCEh+WN6i6NQilH6uO4dSk/mhLi8="; }; patches = [ diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 678e9f68ee214..7699d5d399c81 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.42.0"; + version = "1.43.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-aQUz6FK04h3nzieK9fX7odVVt/zcdhXlX3T1Z1rN/ak="; + sha256 = "sha256-5aznAAO53EFeq/fap10ARGerKzQAvLx0zOeG6OWkymw="; }; - vendorHash = "sha256-DATSGSFRMrX972CWCiSIlOhDuAG3zcVyuILZ3IpVirM="; + vendorHash = "sha256-U5LJF1RX0ZS0PhjQTZKXrJo89WPfSZaVbgskWcYNlJY="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/applications/networking/p2p/libutp/3.4.nix b/pkgs/applications/networking/p2p/libutp/3.4.nix index 6f543789fd610..35a3b0a8f6591 100644 --- a/pkgs/applications/networking/p2p/libutp/3.4.nix +++ b/pkgs/applications/networking/p2p/libutp/3.4.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libutp"; - version = "unstable-2023-11-14"; + version = "0-unstable-2023-11-14"; src = fetchFromGitHub { # Use transmission fork from post-3.4-transmission branch diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 707ff45b34981..70259e087bb83 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "transgui"; - version = "unstable-2024-02-26"; + version = "5.18.0-unstable-2024-02-26"; src = fetchFromGitHub { owner = "transmission-remote-gui"; @@ -60,7 +60,9 @@ stdenv.mkDerivation rec { cp -r "./lang" "$out/share/transgui" ''; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = { description = "A cross platform front-end for the Transmission BitTorrent client"; diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/applications/networking/p2p/xd/default.nix index 8283a2ec4beee..b6bd6af3e017b 100644 --- a/pkgs/applications/networking/p2p/xd/default.nix +++ b/pkgs/applications/networking/p2p/xd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "XD"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "majestrate"; repo = "XD"; rev = "v${version}"; - sha256 = "sha256-YUstYGIED6ivt+p+aHIK76dLCj+xjytWnZrra49cCi8="; + sha256 = "sha256-u8cUcxNW2jAWxVn1hDHS2cpIpcyv4lwx1zytlzPPdv4="; }; - vendorHash = "sha256-wO+IICtGVHhrPa1JUwlx+PuNS32FJNKYmboLd3lFl4w="; + vendorHash = "sha256-ZD7PZJcY7qWHEQOk5I9IlMup0vbYYaRvVau5Go7ocno="; nativeCheckInputs = [ perl ]; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 5053de0ecb352..ef1c08ef2dcc7 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,14 +5,14 @@ let description = "Desktop sharing application, providing remote support and online meetings"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "anydesk"; version = "6.3.2"; src = fetchurl { urls = [ - "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" - "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz" ]; hash = "sha256-nSY4qHRsEvQk4M3JDHalAk3C6Y21WlfDQ2Gpp6/jjMs="; }; @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { postFixup = '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "${lib.makeLibraryPath buildInputs}" \ + --set-rpath "${lib.makeLibraryPath finalAttrs.buildInputs}" \ $out/bin/anydesk # pangox is not actually necessary (it was only added as a part of gtkglext) @@ -77,12 +77,12 @@ in stdenv.mkDerivation rec { }; }; - meta = with lib; { + meta = { inherit description; homepage = "https://www.anydesk.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ shyim cheriimoya ]; + maintainers = with lib.maintainers; [ shyim cheriimoya ]; }; -} +}) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index fc3cbbcd1109f..c47baaf3602f7 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.11.5"; + version = "2.11.7"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - hash = "sha256-WyYBIiIQNDHydJqU3jWNItJU2/sYnRpGHCXE9Xhom5M="; + hash = "sha256-w+xyMNFmKylSheK0yAGl8J6MXly/HUjjAfR9Qq3s/kA="; }; postPatch = '' diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index 521453e5ecb89..34eef64b9f796 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2024-02-05"; + version = "1.27.1612021-unstable-2024-02-05"; src = fetchFromGitHub { owner = "facebook"; @@ -37,7 +37,9 @@ stdenv.mkDerivation { ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; meta = with lib; { diff --git a/pkgs/applications/office/clockify/default.nix b/pkgs/applications/office/clockify/default.nix index efd20632a2a31..7b2faa6b7d203 100644 --- a/pkgs/applications/office/clockify/default.nix +++ b/pkgs/applications/office/clockify/default.nix @@ -1,40 +1,27 @@ -{ stdenv, lib, fetchurl, dpkg, makeWrapper, electron }: +{ lib +, appimageTools +, fetchurl }: -stdenv.mkDerivation rec { +appimageTools.wrapType2 rec { pname = "clockify"; - version = "2.1.6"; + version = "2.1.17.1354"; src = fetchurl { - url = "https://web.archive.org/web/20231110130133/https://clockify.me/downloads/Clockify_Setup_x64.deb"; - hash = "sha256-jndoMk3vqk8a5jMzKVo6ThovSISmcu+hef9IJcg3reQ="; + url = "https://web.archive.org/web/20240406052908/https://clockify.me/downloads/Clockify_Setup.AppImage"; + hash = "sha256-G5VOAf6PrjHUsnk7IlXdqJ2D941cnggjuHkkgrOaVaA="; }; - nativeBuildInputs = [ - dpkg - makeWrapper - ]; + extraInstallCommands = + let appimageContents = appimageTools.extract { inherit pname version src; }; + in '' + mv $out/bin/${pname}-${version} $out/bin/${pname} - dontBuild = true; - dontConfigure = true; + install -Dm 444 ${appimageContents}/clockify.desktop -t $out/share/applications + install -Dm 444 ${appimageContents}/clockify.png -t $out/share/pixmaps - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - substituteInPlace $out/share/applications/clockify.desktop \ - --replace "/opt/Clockify/" "" - - makeWrapper ${electron}/bin/electron $out/bin/clockify \ - --add-flags $out/opt/Clockify/resources/app.asar - - runHook postInstall - ''; + substituteInPlace $out/share/applications/clockify.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; meta = with lib; { description = "Free time tracker and timesheet app that lets you track work hours across projects"; diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/applications/office/gnote/default.nix index 29c72b24cdcef..0d8c1d2803965 100644 --- a/pkgs/applications/office/gnote/default.nix +++ b/pkgs/applications/office/gnote/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Gnote"; + homepage = "https://gitlab.gnome.org/GNOME/gnote"; description = "A note taking application"; mainProgram = "gnote"; maintainers = with maintainers; [ jfvillablanca ]; diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index d7bad1d133901..18ccdf2db26ec 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -77,7 +77,7 @@ python3Packages.buildPythonApplication rec { "Getting Things GNOME" (GTG) is a personal tasks and ToDo list organizer inspired by the "Getting Things Done" (GTD) methodology. GTG is intended to help you track everything you need to do and need to know, from small tasks to large projects. ''; - homepage = "https://wiki.gnome.org/Apps/GTG"; + homepage = "https://github.com/getting-things-gnome/gtg"; downloadPage = "https://github.com/getting-things-gnome/gtg/releases"; license = licenses.gpl3Plus; maintainers = with maintainers; [ oyren ]; diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index 99a45371b63c3..ca91b33ecae6e 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cairo clutter-gtk ]; meta = with lib; { - homepage = "https://wiki.gnome.org/action/show/Apps/Pinpoint"; + homepage = "https://gitlab.gnome.org/Archive/pinpoint"; description = "A tool for making hackers do excellent presentations"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 1f6ccbf10f487..595b12bf9ab24 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-vyw8SjI8EM9giYpAsCNppgSydPEBNz2sbFahEKmKe6w="; + hash = "sha256-5hiVTU1w3Rk/BdxYwDB0Y+EZFnSAaEWtx19IB1ak1yY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 0beb4825ddd4f..e27fd037df446 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { description = "Project management tool for the GNOME desktop"; mainProgram = "planner"; - homepage = "https://wiki.gnome.org/Apps/Planner"; + homepage = "https://gitlab.gnome.org/World/planner"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ amiloradovsky ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 281273c218039..a7b5835184901 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.68.3"; + version = "0.68.4"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-7EQ/gKFflElga5LDwAkjPcqNl6HNtnAzno1ZGPBybJY="; + hash = "sha256-E4uVI2MJ2tD2wuAxxzCZSmNRbKTTzhi44c4ip7uEhCk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 924f683b52aa8..0ff43b584bea9 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -21,14 +21,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.4.3"; + version = "24.4.4"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-dthb+FkytNiiS2s7VdMgYxvNbGeBx5gONOYkHHphigY="; + hash = "sha256-nTRCW76UogaTOyxQ5HfWUln6Lip/LpoyPG+m+mMCb1I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 59af6868b7dfe..bf08311bad980 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.7.5"; + version = "6.7.6"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-b/I34f8fGgPr4+fZJ+2cb+Xi/AvotxNHYg7IaLTByPk="; + hash = "sha256-wQUR2jLJi1peXqXJJj/72X9xNaD2DzNiB0mGFiaEWBE="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 066c93361899b..0bb054e3d52ed 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, writeShellScript , glib , gsettings-desktop-schemas , python3 @@ -9,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "chirp"; - version = "unstable-2024-02-08"; + version = "0.4.0-unstable-2024-02-08"; src = fetchFromGitHub { owner = "kk7ds"; @@ -37,7 +38,9 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; passthru.updateScript = unstableGitUpdater { - branch = "py3"; + tagConverter = writeShellScript "chirp-tag-converter.sh" '' + sed -e 's/^release_//g' -e 's/_/./g' + ''; }; meta = with lib; { diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index ac08d17397fa7..fdaa76f6f7e8e 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -58,6 +58,10 @@ let # may wish to wrap GR without python support. pythonPkgs = extraPythonPackages ++ [ (unwrapped.python.pkgs.toPythonModule unwrapped) ] + ++ unwrapped.passthru.uhd.pythonPath + ++ lib.optionals (unwrapped.passthru.uhd.pythonPath != []) [ + (unwrapped.python.pkgs.toPythonModule unwrapped.passthru.uhd) + ] # Add the extraPackages as python modules as well ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) ++ lib.flatten (lib.mapAttrsToList ( diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index c3f7b58fa1ba6..947d7d48108d2 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -8,15 +8,8 @@ , boost , ncurses , enableCApi ? true -# Although we handle the Python API's dependencies in pythonEnvArg, this -# feature is currently disabled as upstream attempts to run `python setup.py -# install` by itself, and it fails because the Python's environment's prefix is -# not a writable directly. Adding support for this feature would require using -# python's pypa/build nad pypa/install hooks directly, and currently it is hard -# to do that because it all happens after a long buildPhase of the C API. -, enablePythonApi ? false +, enablePythonApi ? true , python3 -, buildPackages , enableExamples ? false , enableUtils ? true , libusb1 @@ -38,13 +31,7 @@ }: let - onOffBool = b: if b then "ON" else "OFF"; - inherit (lib) optionals; - # Later used in pythonEnv generation. Python + mako are always required for the build itself but not necessary for runtime. - pythonEnvArg = (ps: with ps; [ mako ] - ++ optionals (enablePythonApi) [ numpy setuptools ] - ++ optionals (enableUtils) [ requests six ] - ); + inherit (lib) optionals cmakeBool; in stdenv.mkDerivation (finalAttrs: { @@ -72,7 +59,30 @@ stdenv.mkDerivation (finalAttrs: { # hash. sha256 = "17g503mhndaabrdl7qai3rdbafr8xx8awsyr7h2bdzwzprzmh4m3"; }; + # This are the minimum required Python dependencies, this attribute might + # be useful if you want to build a development environment with a python + # interpreter able to import the uhd module. + pythonPath = optionals (enablePythonApi || enableUtils) [ + python3.pkgs.numpy + python3.pkgs.setuptools + ] ++ optionals (enableUtils) [ + python3.pkgs.requests + python3.pkgs.six + + /* These deps are needed for the usrp_hwd.py utility, however even if they + would have been added here, the utility wouldn't have worked because it + depends on an old python library mprpc that is not supported for Python > + 3.8. See also report upstream: + https://github.com/EttusResearch/uhd/issues/744 + + python3.pkgs.gevent + python3.pkgs.pyudev + python3.pkgs.pyroute2 + + */ + ]; passthru = { + runtimePython = python3.withPackages (ps: finalAttrs.pythonPath); updateScript = [ ./update.sh # Pass it this file name as argument @@ -83,66 +93,91 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_LIBUHD=ON" "-DENABLE_USB=ON" - "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases - "-DENABLE_EXAMPLES=${onOffBool enableExamples}" - "-DENABLE_UTILS=${onOffBool enableUtils}" - "-DENABLE_C_API=${onOffBool enableCApi}" - "-DENABLE_PYTHON_API=${onOffBool enablePythonApi}" - "-DENABLE_DPDK=${onOffBool enableDpdk}" + # Regardless of doCheck, we want to build the tests to help us gain + # confident that the package is OK. + "-DENABLE_TESTS=ON" + (cmakeBool "ENABLE_EXAMPLES" enableExamples) + (cmakeBool "ENABLE_UTILS" enableUtils) + (cmakeBool "ENABLE_C_API" enableCApi) + (cmakeBool "ENABLE_PYTHON_API" enablePythonApi) + /* + + Otherwise python tests fail. Using a dedicated pythonEnv for either or both + nativeBuildInputs and buildInputs makes upstream's cmake scripts fail to + install the Python API as reported on our end at [1] (we don't want + upstream to think we are in a virtual environment because we use + python3.withPackages...). + + Putting simply the python dependencies in the nativeBuildInputs and + buildInputs as they are now from some reason makes the `python` in the + checkPhase fail to find the python dependencies, as reported at [2]. Even + using nativeCheckInputs with the python dependencies, or using a + `python3.withPackages` wrapper in nativeCheckInputs, doesn't help, as the + `python` found in $PATH first is the one from nativeBuildInputs. + + [1]: https://github.com/NixOS/nixpkgs/pull/307435 + [2]: https://discourse.nixos.org/t/missing-python-package-in-checkphase/9168/ + + Hence we use upstream's provided cmake flag to control which python + interpreter they will use to run the the python tests. + + */ + "-DRUNTIME_PYTHON_EXECUTABLE=${lib.getExe finalAttrs.passthru.runtimePython}" + (cmakeBool "ENABLE_DPDK" enableDpdk) # Devices - "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}" - "-DENABLE_MPMD=${onOffBool enableMpmd}" - "-DENABLE_B100=${onOffBool enableB100}" - "-DENABLE_B200=${onOffBool enableB200}" - "-DENABLE_USRP1=${onOffBool enableUsrp1}" - "-DENABLE_USRP2=${onOffBool enableUsrp2}" - "-DENABLE_X300=${onOffBool enableX300}" - "-DENABLE_N300=${onOffBool enableN300}" - "-DENABLE_N320=${onOffBool enableN320}" - "-DENABLE_E300=${onOffBool enableE300}" - "-DENABLE_E320=${onOffBool enableE320}" - ] + (cmakeBool "ENABLE_OCTOCLOCK" enableOctoClock) + (cmakeBool "ENABLE_MPMD" enableMpmd) + (cmakeBool "ENABLE_B100" enableB100) + (cmakeBool "ENABLE_B200" enableB200) + (cmakeBool "ENABLE_USRP1" enableUsrp1) + (cmakeBool "ENABLE_USRP2" enableUsrp2) + (cmakeBool "ENABLE_X300" enableX300) + (cmakeBool "ENABLE_N300" enableN300) + (cmakeBool "ENABLE_N320" enableN320) + (cmakeBool "ENABLE_E300" enableE300) + (cmakeBool "ENABLE_E320" enableE320) # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 - ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] - ; - - pythonEnv = python3.withPackages pythonEnvArg; + ] ++ optionals stdenv.isAarch32 [ + "-DCMAKE_CXX_FLAGS=-Wno-psabi" + ]; nativeBuildInputs = [ cmake pkg-config # Present both here and in buildInputs for cross compilation. - (buildPackages.python3.withPackages pythonEnvArg) + python3 + python3.pkgs.mako + # We add this unconditionally, but actually run wrapPythonPrograms only if + # python utilities are enabled + python3.pkgs.wrapPython ]; - buildInputs = [ + buildInputs = finalAttrs.pythonPath ++ [ boost libusb1 - ] - # However, if enableLibuhd_Python_api *or* enableUtils is on, we need - # pythonEnv for runtime as well. The utilities' runtime dependencies are - # handled at the environment - ++ optionals (enableExamples) [ ncurses ncurses.dev ] - ++ optionals (enablePythonApi || enableUtils) [ finalAttrs.pythonEnv ] - ++ optionals (enableDpdk) [ dpdk ] - ; + ] ++ optionals (enableExamples) [ + ncurses ncurses.dev + ] ++ optionals (enableDpdk) [ + dpdk + ]; # many tests fails on darwin, according to ofborg doCheck = !stdenv.isDarwin; # Build only the host software preConfigure = "cd host"; - # TODO: Check if this still needed, perhaps relevant: - # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm patches = [ - # Disable tests that fail in the sandbox + # Disable tests that fail in the sandbox, last checked at version 4.6.0.0 ./no-adapter-tests.patch ]; - postPhases = [ "installFirmware" "removeInstalledTests" ] - ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ "moveUdevRules" ] - ; + postPhases = [ + "installFirmware" + "removeInstalledTests" + ] ++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ + "moveUdevRules" + ]; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' @@ -162,6 +197,10 @@ stdenv.mkDerivation (finalAttrs: { mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ ''; + # Wrap the python utilities with our pythonPath definition + postFixup = lib.optionalString (enablePythonApi && enableUtils) '' + wrapPythonPrograms + ''; disallowedReferences = optionals (!enablePythonApi && !enableUtils) [ python3 ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 0d8d87ac4109b..ba0114c7b5633 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.17.3"; + version = "2.17.4"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-SGqkWBv4nol0+lnGN7wBHJvndcIqZ5+Wt1wAcXA42cU="; + sha256 = "sha256-LF/rwm/XlLHAJjiAlQVTmx5l+5Np2b5rPjoCdN/qERU="; }; installPhase = '' diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 3bc84e414bb75..85fb1ca80ac65 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1542"; + version = "1543"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-ZzvyyecYiBscogfN9/FnDbHg/lqb8y14n9C2KLIqhFA="; + hash = "sha256-APHPv7Q64JITfHsvjCThZ6hvGHerk6wjOm32KdTv4k8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/seqtk/default.nix b/pkgs/applications/science/biology/seqtk/default.nix index 417bec9c062fb..856248de917db 100644 --- a/pkgs/applications/science/biology/seqtk/default.nix +++ b/pkgs/applications/science/biology/seqtk/default.nix @@ -19,14 +19,13 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libdeflate isa-l ]; - makeFlags = [ "CC=cc" ]; + makeFlags = [ + "CC:=$(CC)" + "BINDIR=$(out)/bin" + ]; - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin seqtk - - runHook postInstall + preInstall = '' + mkdir -p "$out/bin" ''; meta = with lib; { diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 0e4728dd65d6f..1733ba2f236c9 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -38,33 +38,75 @@ let in python3Packages.buildPythonApplication rec { inherit pname; - version = "2.5.0"; + version = "3.0.0"; + pyproject = true; + src = fetchFromGitHub { owner = "schrodinger"; repo = "pymol-open-source"; rev = "v${version}"; - sha256 = "sha256-JdsgcVF1w1xFPZxVcyS+GcWg4a1Bd4SvxFOuSdlz9SM="; + hash = "sha256-GhTHxacjGN7XklZ6gileBMRZAGq4Pp4JknNL+qGqrVE="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "self.install_libbase" '"${placeholder "out"}/${python3.sitePackages}"' + ''; + + build-system = [ + python3Packages.setuptools + ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; buildInputs = [ python3Packages.numpy python3Packages.pyqt5 glew glm libpng libxml2 freetype msgpack netcdf ]; env.NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; - hardeningDisable = [ "format" ]; - - installPhase = '' - python setup.py install --home="$out" - runHook postInstall - ''; postInstall = with python3Packages; '' wrapProgram $out/bin/pymol \ --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5-sip ]} mkdir -p "$out/share/icons/" - ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" + ln -s $out/${python3.sitePackages}/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" + '' + lib.optionalString stdenv.hostPlatform.isLinux '' cp -r "${desktopItem}/share/applications/" "$out/share/" ''; + pythonImportsCheck = [ + "pymol" + ]; + + nativeCheckInputs = with python3Packages; [ + python3Packages.msgpack + pillow + pytestCheckHook + ]; + + # some tests hang for some reason + doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); + + disabledTestPaths = [ + # require biopython which is broken as of 2024-04-20 + "tests/api/seqalign.py" + ]; + + disabledTests = [ + # the output image does not exactly match + "test_commands" + # touch the network + "testFetch" + # requires collada2gltf which is not included in nixpkgs + "testglTF" + # require mmtf-cpp which does not support darwin + "testMMTF" + "testSave_symmetry__mmtf" + ]; + + preCheck = '' + cd testing + ''; + + __darwinAllowLocalNetworking = true; + preFixup = '' wrapQtApp "$out/bin/pymol" ''; @@ -74,6 +116,6 @@ python3Packages.buildPythonApplication rec { mainProgram = "pymol"; homepage = "https://www.pymol.org/"; license = licenses.mit; - maintainers = with maintainers; [ samlich ]; + maintainers = with maintainers; [ natsukium samlich ]; }; } diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 41deecbb62247..7619e43e80332 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -3,17 +3,18 @@ }: let + pname = "digital"; pkgDescription = "A digital logic designer and circuit simulator."; version = "0.30"; buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date desktopItem = makeDesktopItem { type = "Application"; - name = "Digital"; - desktopName = pkgDescription; + name = pname; + desktopName = "Digital"; comment = "Easy-to-use digital logic designer and circuit simulator"; - exec = "digital"; - icon = "digital"; + exec = pname; + icon = pname; categories = [ "Education" "Electronics" ]; mimeTypes = [ "text/x-digital" ]; terminal = false; @@ -28,8 +29,7 @@ let mvnParameters = "-Pno-git-rev -Dgit.commit.id.describe=${version} -Dproject.build.outputTimestamp=${buildDate} -DbuildTimestamp=${buildDate}"; in maven.buildMavenPackage rec { - pname = "digital"; - inherit version jre; + inherit pname version jre; src = fetchFromGitHub { owner = "hneemann"; @@ -44,6 +44,8 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/share/java @@ -53,6 +55,13 @@ maven.buildMavenPackage rec { makeWrapper ${jre}/bin/java $out/bin/${pname} \ --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ --add-flags "-jar $out/share/java/Digital.jar" + + install -Dm644 src/main/svg/icon.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg + for size in 16 32 48 64 128; do + install -Dm644 src/main/resources/icons/icon"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png + done + + runHook postInstall ''; desktopItems = [ desktopItem ]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 7b7b54201bf7d..584f59ba8b472 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.118"; + version = "3.3.119"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-D0MwwCiiqz0vTUzur222kl2wEMS2/VLRECLQ5d6gSGo="; + sha256 = "sha256-6rPgnnZBEVwHhIv7MPfdDDu+K4y+RQF+leB327pqwDg="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 1676ca4c2a4f1..74659a58f13ee 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, lib, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs -, version ? "1.7.1" +, version ? "1.7.2" , ideSupport ? true , wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; hash = { - "1.7.1" = "sha256-rG1hcxFhQ2PlE9RTz9ELliDjCuSzLnJ1togRY637cU4="; + "1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ="; "1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; }."${version}"; }; diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index 029138a852fad..feddf92821c63 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "unstable-2024-04-26"; + version = "0-unstable-2024-04-26"; src = fetchFromGitHub { owner = "georgeweigt"; diff --git a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch b/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch deleted file mode 100644 index 91e080aa294a0..0000000000000 --- a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd -index 7794c9edc3..1753277b1f 100644 ---- a/src/sage/libs/linbox/conversion.pxd -+++ b/src/sage/libs/linbox/conversion.pxd -@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in - - v -- linbox vector - """ - cdef Vector_integer_dense res = P() -- cdef cppvector[Integer] * vec = &v.refRep() - cdef size_t i - for i in range(<size_t> res._degree): -- mpz_set(res._entries[i], vec[0][i].get_mpz_const()) -+ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const()) - - return res -diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd -index 9112d151f8..dcc482960c 100644 ---- a/src/sage/libs/linbox/linbox.pxd -+++ b/src/sage/libs/linbox/linbox.pxd -@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": - ctypedef Modular_double Field - ctypedef double Element - DenseMatrix_Modular_double(Field F, size_t m, size_t n) -- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n) -+ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*) - void setEntry(size_t i, size_t j, Element& a) - Element &getEntry(size_t i, size_t j) - -@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": - ctypedef Modular_float Field - ctypedef float Element - DenseMatrix_Modular_float(Field F, size_t m, size_t n) -- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n) -+ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*) - void setEntry(size_t i, size_t j, Element& a) - Element &getEntry(size_t i, size_t j) - -@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h": - DenseVector_integer (Field &F) - DenseVector_integer (Field &F, long& m) - DenseVector_integer (Field &F, cppvector[Integer]&) -- cppvector[Element]& refRep() - size_t size() - void resize(size_t) - void resize(size_t n, const Element&) -diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi -index 010365d76f..3d60726ff9 100644 ---- a/src/sage/matrix/matrix_modn_dense_template.pxi -+++ b/src/sage/matrix/matrix_modn_dense_template.pxi -@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_ - return 0,[] - - cdef ModField *F = new ModField(<long>modulus) -- cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols) -+ cdef DenseMatrix *A = new DenseMatrix(F[0], <Py_ssize_t>nrows, <Py_ssize_t>ncols, <ModField.Element*>entries) - cdef Py_ssize_t r = reducedRowEchelonize(A[0]) - cdef Py_ssize_t i,j - for i in range(nrows): diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix deleted file mode 100644 index 1eb057cfc7c5c..0000000000000 --- a/pkgs/applications/science/math/scotch/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchurl, bison, mpi, flex, zlib}: - -stdenv.mkDerivation rec { - version = "6.1.1"; - pname = "scotch"; - src_name = "scotch_${version}"; - - buildInputs = [ bison mpi flex zlib ]; - - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; - sha256 = "sha256-OQUvWf9HSkppzvwlzzyvhClACIneugEO5kA8oYj4sxE="; - }; - - sourceRoot = "${src_name}/src"; - - preConfigure = '' - ln -s Make.inc/Makefile.inc.x86-64_pc_linux2 Makefile.inc - ''; - - buildFlags = [ "scotch ptscotch" ]; - installFlags = [ "prefix=\${out}" ]; - - meta = { - description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering"; - longDescription = '' - Scotch is a software package for graph and mesh/hypergraph partitioning, graph clustering, - and sparse matrix ordering. - ''; - homepage = "http://www.labri.fr/perso/pelegrin/scotch"; - license = lib.licenses.cecill-c; - maintainers = [ lib.maintainers.bzizou ]; - platforms = lib.platforms.linux; - }; -} - diff --git a/pkgs/applications/science/misc/gplates/boost-placeholders.patch b/pkgs/applications/science/misc/gplates/boost-placeholders.patch deleted file mode 100644 index 7166b92f646af..0000000000000 --- a/pkgs/applications/science/misc/gplates/boost-placeholders.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --unified --recursive a/src/gui/TopologyTools.cc b/src/gui/TopologyTools.cc ---- a/src/gui/TopologyTools.cc 2021-07-05 05:11:47.000000000 +0200 -+++ b/src/gui/TopologyTools.cc 2022-12-07 22:35:20.444054124 +0100 -@@ -3448,7 +3448,7 @@ - std::find_if( - d_visible_boundary_section_seq.begin(), - d_visible_boundary_section_seq.end(), -- boost::bind(&VisibleSection::d_section_info_index, _1) == -+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == - boost::cref(section_index)); - - if (visible_section_iter == d_visible_boundary_section_seq.end()) -@@ -3467,7 +3467,7 @@ - std::find_if( - d_visible_interior_section_seq.begin(), - d_visible_interior_section_seq.end(), -- boost::bind(&VisibleSection::d_section_info_index, _1) == -+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == - boost::cref(section_index)); - - if (visible_section_iter == d_visible_interior_section_seq.end()) -diff --unified --recursive a/src/presentation/ReconstructionGeometryRenderer.cc b/src/presentation/ReconstructionGeometryRenderer.cc ---- a/src/presentation/ReconstructionGeometryRenderer.cc 2021-07-05 05:11:50.000000000 +0200 -+++ b/src/presentation/ReconstructionGeometryRenderer.cc 2022-12-07 22:36:11.117884262 +0100 -@@ -274,7 +274,7 @@ - GPlatesPresentation::ReconstructionGeometryRenderer::RenderParamsPopulator::visit_reconstruct_visual_layer_params( - const ReconstructVisualLayerParams ¶ms) - { -- d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, _1, _2); -+ d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, boost::placeholders::_1, boost::placeholders::_2); - d_render_params.vgp_draw_circular_error = params.get_vgp_draw_circular_error(); - d_render_params.fill_polygons = params.get_fill_polygons(); - d_render_params.fill_polylines = params.get_fill_polylines(); -diff --unified --recursive a/src/presentation/VisualLayerRegistry.cc b/src/presentation/VisualLayerRegistry.cc ---- a/src/presentation/VisualLayerRegistry.cc 2021-07-05 05:11:50.000000000 +0200 -+++ b/src/presentation/VisualLayerRegistry.cc 2022-12-07 22:38:12.950877614 +0100 -@@ -448,7 +448,7 @@ - &GPlatesQtWidgets::ReconstructScalarCoverageLayerOptionsWidget::create, - boost::bind( - &ReconstructScalarCoverageVisualLayerParams::create, -- _1), -+ boost::placeholders::_1), - true); - - registry.register_visual_layer_type( -@@ -498,7 +498,7 @@ - // NOTE: We pass in ViewState and not the GlobeAndMapWidget, obtained from - // ViewportWindow, because ViewportWindow is not yet available (a reference to - // it not yet been initialised inside ViewState) so accessing it would crash... -- _1, boost::ref(view_state)), -+ boost::placeholders::_1, boost::ref(view_state)), - true); - - // DERIVED_DATA group. -@@ -549,7 +549,7 @@ - &GPlatesQtWidgets::VelocityFieldCalculatorLayerOptionsWidget::create, - boost::bind( - &VelocityFieldCalculatorVisualLayerParams::create, -- _1, boost::cref(view_state.get_rendered_geometry_parameters())), -+ boost::placeholders::_1, boost::cref(view_state.get_rendered_geometry_parameters())), - true); - - using namespace GPlatesUtils; -diff --unified --recursive a/src/qt-widgets/ViewportWindow.cc b/src/qt-widgets/ViewportWindow.cc ---- a/src/qt-widgets/ViewportWindow.cc 2021-08-05 05:44:01.000000000 +0200 -+++ b/src/qt-widgets/ViewportWindow.cc 2022-12-07 22:39:20.487981302 +0100 -@@ -326,7 +326,7 @@ - *d_geometry_operation_state_ptr, - *d_modify_geometry_state, - *d_measure_distance_state_ptr, -- boost::bind(&canvas_tool_status_message, boost::ref(*this), _1), -+ boost::bind(&canvas_tool_status_message, boost::ref(*this), boost::placeholders::_1), - get_view_state(), - *this); - diff --git a/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch b/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch deleted file mode 100644 index 6e90faf9f0373..0000000000000 --- a/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -index ca353c4099..499be0a986 100644 ---- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 9548db1c7c479..59bb9415b37d9 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -53,12 +53,11 @@ , Cocoa , CoreSymbolication , OpenGL -, noSplash ? false }: stdenv.mkDerivation rec { pname = "root"; - version = "6.30.04"; + version = "6.30.06"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -66,7 +65,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-K0GAtpjznMZdkQhNgzqIRRWzJbxfZzyOOavoGLAl2Mw="; + hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -143,8 +142,6 @@ stdenv.mkDerivation rec { -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ - '' + lib.optionalString noSplash '' - substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" '' + lib.optionalString stdenv.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/macosx/CMakeLists.txt \ @@ -163,10 +160,6 @@ stdenv.mkDerivation rec { "-Dbuiltin_gtest=OFF" "-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_openui5=ON" - "-Dalien=OFF" - "-Dbonjour=OFF" - "-Dcastor=OFF" - "-Dchirp=OFF" "-Dclad=OFF" "-Ddavix=ON" "-Ddcache=OFF" @@ -176,21 +169,13 @@ stdenv.mkDerivation rec { "-Dfortran=OFF" "-Dgnuinstall=ON" "-Dimt=ON" - "-Dgfal=OFF" "-Dgviz=OFF" - "-Dhdfs=OFF" "-Dhttp=ON" - "-Dkrb5=OFF" - "-Dldap=OFF" - "-Dmonalisa=OFF" "-Dmysql=OFF" "-Dodbc=OFF" "-Dopengl=ON" - "-Doracle=OFF" "-Dpgsql=OFF" - "-Dpythia6=OFF" "-Dpythia8=OFF" - "-Drfio=OFF" "-Droot7=ON" "-Dsqlite=OFF" "-Dssl=ON" @@ -204,16 +189,12 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" - "-DCMAKE_DISABLE_FIND_PACKAGE_Python2=TRUE" # fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found # fatal error: could not build module '_Builtin_intrinsics' "-Druntime_cxxmodules=OFF" ]; - # suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ]; - postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ @@ -273,7 +254,7 @@ stdenv.mkDerivation rec { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; - maintainers = [ maintainers.veprbl ]; + maintainers = [ maintainers.guitargeek maintainers.veprbl ]; license = licenses.lgpl21; }; } diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 92b48ec863091..33f2043603177 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -6,15 +6,16 @@ , fetchzip , cmake , lz4 +, gfortran , bzip2 -, m4 , hdf5 , gsl , unzip , makeWrapper +, zlib , meson -, git , ninja +, pandoc , eigen , pkg-config , wrapGAppsHook @@ -40,7 +41,7 @@ let pname = "libccp4"; version = "8.0.0"; src = fetchurl { - url = "https://ftp.ccp4.ac.uk/opensource/${pname}-${version}.tar.gz"; + url = "https://ftp.ccp4.ac.uk/opensource/libccp4-${version}.tar.gz"; hash = "sha256-y4E66GYSoIZjKd6rfO6W6sVz2BvlskA0HUD5rVMi/y0="; }; nativeBuildInputs = [ meson ninja ]; @@ -87,7 +88,7 @@ let }; mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11"; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "mosflm"; inherit version src; @@ -111,7 +112,7 @@ let pname = "xgandalf"; version = "c6c5003ff1086e8c0fb5313660b4f02f3a3aab7b"; src = fetchurl { - url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + url = "https://gitlab.desy.de/thomas.white/xgandalf/-/archive/${version}/xgandalf-${version}.tar.gz"; hash = "sha256-/uZlBwAINSoYqgLQFTMz8rS1Rpadu79JkO6Bu/+Nx9E="; }; @@ -121,10 +122,10 @@ let pinkIndexer = stdenv.mkDerivation rec { pname = "pinkindexer"; - version = "5d4e016941eb2a9e50a10df96ded7ff1e2464503"; + version = "15caa21191e27e989b750b29566e4379bc5cd21a"; src = fetchurl { url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-VnJOJJ247dNoBlos4Fu3GQBlAnTk9el+yZDRiicJtu0="; + hash = "sha256-v/SCJiHAV05Lc905y/dE8uBXlW+lLX9wau4XORYdbQg="; }; nativeBuildInputs = [ meson pkg-config ninja ]; @@ -169,13 +170,27 @@ let "-DENABLE_BZIP2_PLUGIN=yes" ]; }; + + millepede-ii = stdenv.mkDerivation rec { + pname = "millepede-ii"; + version = "04-13-06"; + src = fetchurl { + url = "https://gitlab.desy.de/claus.kleinwort/millepede-ii/-/archive/V${version}/millepede-ii-V${version}.tar.gz"; + hash = "sha256-aFoo8AGBsUEN2u3AmnSpTqJ6JeNV6j9vkAFTZ34I+sI="; + }; + + nativeBuildInputs = [ gfortran ]; + buildInputs = [ zlib ]; + + makeFlags = [ "PREFIX=$(out)" ]; + }; in stdenv.mkDerivation rec { pname = "crystfel"; - version = "0.10.2"; + version = "0.11.0"; src = fetchurl { - url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nCO9ndDKS54bVN9IhFBiCVNzqk7BsCljXFrOmlx+sP4="; + url = "https://www.desy.de/~twhite/crystfel/crystfel-${version}.tar.gz"; + sha256 = "sha256-ogNHWYfbxRmB5TdK8K0JpcCnYOOyXapQGSPh8mfp+Tc="; }; nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ] ++ lib.optionals withGui [ wrapGAppsHook ]; @@ -192,6 +207,7 @@ stdenv.mkDerivation rec { mosflm pinkIndexer xgandalf + pandoc ] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ] ++ lib.optionals stdenv.isDarwin [ argp-standalone @@ -201,12 +217,12 @@ stdenv.mkDerivation rec { ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ]; patches = [ + # on darwin at least, we need to link to a separate argp library; + # this patch adds a test for this and the necessary linker options ./link-to-argp-standalone-if-needed.patch - ./disable-fmemopen-on-aarch64-darwin.patch - (fetchpatch { - url = "https://gitlab.desy.de/thomas.white/crystfel/-/commit/3c54d59e1c13aaae716845fed2585770c3ca9d14.diff"; - hash = "sha256-oaJNBQQn0c+z4p1pnW4osRJA2KdKiz4hWu7uzoKY7wc="; - }) + # hotfix for an issue that occurs (at least) on NixOS: + # if the temporary path is too long, we get a segfault + ./gui-path-issue.patch ]; # CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but @@ -218,7 +234,9 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString withBitshuffle '' for file in $out/bin/*; do - wrapProgram $file --set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins + wrapProgram $file \ + --set HDF5_PLUGIN_PATH ${hdf5-external-filter-plugins}/lib/plugins \ + --prefix PATH ":" ${lib.makeBinPath [ millepede-ii ]} done ''; diff --git a/pkgs/applications/science/physics/crystfel/gui-path-issue.patch b/pkgs/applications/science/physics/crystfel/gui-path-issue.patch new file mode 100644 index 0000000000000..28cd0280e8f67 --- /dev/null +++ b/pkgs/applications/science/physics/crystfel/gui-path-issue.patch @@ -0,0 +1,27 @@ +diff --git a/src/gui_index.c b/src/gui_index.c +index 2cc8e8db..13be77d5 100644 +--- a/src/gui_index.c ++++ b/src/gui_index.c +@@ -540,6 +540,7 @@ static void delete_gui_tempdir(char *tmpdir) + { + char *path; + int i; ++ size_t pathlen; + + /* List of files which it's safe to delete */ + char *files[] = {"gmon.out", "mosflm.lp", "SUMMARY", "XDS.INP", +@@ -552,11 +553,12 @@ static void delete_gui_tempdir(char *tmpdir) + + if ( tmpdir == NULL ) return; + +- path = calloc(strlen(tmpdir)+64, 1); ++ pathlen = strlen(tmpdir)+64; ++ path = calloc(pathlen, 1); + if ( path == NULL ) return; + + for ( i=0; i<n_files; i++ ) { +- snprintf(path, 127, "%s/%s", tmpdir, files[i]); ++ snprintf(path, pathlen, "%s/%s", tmpdir, files[i]); + unlink(path); + } + diff --git a/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch b/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch index 8314be29ac006..edadb750ac57f 100644 --- a/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch +++ b/pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 59bbcfb7..dd75d4e2 100644 +index 4717bb2a..38d8693f 100644 --- a/meson.build +++ b/meson.build -@@ -80,6 +80,12 @@ if cc.has_function('clock_gettime', prefix: '#include <time.h>') +@@ -70,6 +70,12 @@ if cc.has_function('clock_gettime', prefix: '#include <time.h>') conf_data.set10('HAVE_CLOCK_GETTIME', true) endif @@ -12,15 +12,15 @@ index 59bbcfb7..dd75d4e2 100644 + argpdep = dependency('', required : false) +endif + - # ************************ libcrystfel (subdir) ************************ - - subdir('libcrystfel') -@@ -180,7 +186,7 @@ endif + if cc.has_function('sched_setaffinity', + prefix: '#include <sched.h>', + args: '-D_GNU_SOURCE') +@@ -186,7 +192,7 @@ endif indexamajig = executable('indexamajig', indexamajig_sources, dependencies: [mdep, libcrystfeldep, gsldep, -- pthreaddep, zmqdep, asapodep], -+ pthreaddep, zmqdep, asapodep, argpdep], +- pthreaddep, zmqdep, asapodep, asapoproddep], ++ pthreaddep, zmqdep, asapodep, asapoproddep, argpdep], install: true, - install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib') + install_rpath: crystfel_rpath) diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/applications/science/physics/xnec2c/default.nix index 26ec1518fed5f..60afa09ecc8cd 100644 --- a/pkgs/applications/science/physics/xnec2c/default.nix +++ b/pkgs/applications/science/physics/xnec2c/default.nix @@ -14,11 +14,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "xnec2c"; - version = "4.4.12"; + version = "4.4.16"; src = fetchurl { url = "https://www.xnec2c.org/releases/${pname}-v${version}.tar.gz"; - hash = "sha256-6Yrx6LkJjfnMA/kJUDWLhGzGopZeecARSrcR++UScsU="; + hash = "sha256-XiZi8pfmfHjGpePkRy/pF1TA+5RdxX4AGuKzG5Wqrmk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 252eadc1c39c9..0792d3375d0a4 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.9.0"; + version = "10.10.0"; src = fetchurl { url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64-portable.zip"; - sha256 = "sha256-9FzMyBIR2u1zXHtTWJABM6RF1+OyjYdEPlRwtig9blI="; + sha256 = "sha256-UB5Vr5wyCUZbOaQNckJQ1tAXwh8VSLNI1IgTiJzxV08="; }; # remove large unneeded files diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 99d4b79d1cc06..36c9f7a7160ab 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -70,11 +70,11 @@ in mkDerivation rec { pname = "recoll"; - version = "1.37.4"; + version = "1.37.5"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-MQnXamW7L4hyMbZDmU7XAcLv5roHcfhFGzni8YbDtq0="; + hash = "sha256-vv2AMt6ufrfxRX2yF28X3E500MYP9hnGfDb3I9RdMVU="; }; configureFlags = [ diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/applications/terminal-emulators/tym/default.nix index acfbbb48943d0..562e06176130c 100644 --- a/pkgs/applications/terminal-emulators/tym/default.nix +++ b/pkgs/applications/terminal-emulators/tym/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tym"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "endaaman"; repo = "${pname}"; rev = version; - sha256 = "sha256-aXV3TNjHxg/9Lb2o+ci5/cCAPbkWhxqOka3wv21ajSA="; + sha256 = "sha256-53XAHyDiFPUTmw/rgoEoSoh+c/t4rS12gxwH1yKHqvw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix index 8890d57b32034..010345aa03dfc 100644 --- a/pkgs/applications/terminal-emulators/x3270/default.nix +++ b/pkgs/applications/terminal-emulators/x3270/default.nix @@ -1,39 +1,72 @@ -{ lib, stdenv, fetchurl, m4, expat -, libX11, libXt, libXaw, libXmu, bdftopcf, mkfontdir -, fontadobe100dpi, fontadobeutopia100dpi, fontbh100dpi -, fontbhlucidatypewriter100dpi, fontbitstream100dpi +{ stdenv +, darwin +, lib +, libiconv +, fetchurl +, m4 +, expat +, libX11 +, libXt +, libXaw +, libXmu +, bdftopcf +, mkfontdir +, fontadobe100dpi +, fontadobeutopia100dpi +, fontbh100dpi +, fontbhlucidatypewriter100dpi +, fontbitstream100dpi , tcl -, ncurses }: - +, ncurses +}: let majorVersion = "4"; - minorVersion = "0"; - versionSuffix = "ga9"; -in stdenv.mkDerivation rec { + minorVersion = "3"; + versionSuffix = "ga8"; +in +stdenv.mkDerivation rec { pname = "x3270"; version = "${majorVersion}.${minorVersion}${versionSuffix}"; src = fetchurl { - url = "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz"; - sha256 = "0km24rgll0s4ji6iz8lvy5ra76ds162s95y33w5px6697cwqkp9j"; + url = + "http://x3270.bgp.nu/download/0${majorVersion}.0${minorVersion}/suite3270-${version}-src.tgz"; + sha256 = "sha256-gcC6REfZentIPEDhGznUSYu8mvVfpPeMz/Bks+N43Fk="; }; - buildFlags = [ "unix" ]; + buildFlags = lib.optional stdenv.isLinux "unix"; + + configureFlags = lib.optionals stdenv.isDarwin [ + "--enable-c3270" + "--enable-pr3270" + "--enable-s3270" + "--enable-tcl3270" + ]; - postConfigure = '' - pushd c3270 ; ./configure ; popd + postBuild = '' + make install.man ''; + pathsToLink = [ "/share/man" ]; + nativeBuildInputs = [ m4 ]; buildInputs = [ expat - libX11 libXt libXaw libXmu bdftopcf mkfontdir - fontadobe100dpi fontadobeutopia100dpi fontbh100dpi - fontbhlucidatypewriter100dpi fontbitstream100dpi + libX11 + libXt + libXaw + libXmu + bdftopcf + mkfontdir + fontadobe100dpi + fontadobeutopia100dpi + fontbh100dpi + fontbhlucidatypewriter100dpi + fontbitstream100dpi tcl ncurses expat - ]; + ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "IBM 3270 terminal emulator for the X Window System"; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 7a9a01ea255bc..41179dfd0bcda 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.9.2"; + version = "3.9.4"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-KsuuwFKdpXHDVAZZ2JiX781mgqDQyyEILo4lmNn+8YE="; + hash = "sha256-pjrWXfae1momJRTfdIPalsLynAGwqp1VtX9M9uqzJwM="; }; buildCommand = '' diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index 1459e2f18e803..b60c38fa1d301 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -1,13 +1,12 @@ -{ fetchFromGitHub -, gitMinimal -, gfold -, lib -, libiconv -, makeWrapper -, rustPlatform -, Security -, stdenv -, testers +{ + fetchFromGitHub, + gfold, + lib, + libiconv, + rustPlatform, + Security, + stdenv, + testers, }: let @@ -26,7 +25,10 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-wDUOYK9e0i600UnJ0w0FPI2GhTa/QTq/2+ICiDWrmEU="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + ]; passthru.tests.version = testers.testVersion { package = gfold; @@ -35,11 +37,10 @@ rustPlatform.buildRustPackage { }; meta = with lib; { - description = - "CLI tool to help keep track of your Git repositories, written in Rust"; + description = "CLI tool to help keep track of your Git repositories, written in Rust"; homepage = "https://github.com/nickgerace/gfold"; license = licenses.asl20; - maintainers = []; + maintainers = [ maintainers.sigmanificient ]; platforms = platforms.unix; mainProgram = "gfold"; }; diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/applications/version-management/gg/default.nix index 279e6d0075e7b..89fd45e45f0dc 100644 --- a/pkgs/applications/version-management/gg/default.nix +++ b/pkgs/applications/version-management/gg/default.nix @@ -59,6 +59,5 @@ in buildGoModule { homepage = "https://gg-scm.io/"; changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ zombiezen ]; }; } diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index a5f0fc2cb2ba6..d5633ef5e3d3c 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.48.0"; + version = "2.49.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-8vQQzLGb1cHeNJC/aUZbROfRoUtuujEKoLWBgLZnhls="; + hash = "sha256-4aT8ThZt2Dlp2RjaGBiTgw2IPantSnTJPhP5Tel755Q="; }; - vendorHash = "sha256-rQtRBXhG5fF+3cIIv9i5r8Kd9YeIq/aDLAw8Rqxn6ww="; + vendorHash = "sha256-p+1Knx+z1M3m8VjsvBfY6D1Gs5va5Z8QFExv5397wHU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix index 2bbcc10202af1..a337443e87ead 100644 --- a/pkgs/applications/version-management/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-aLvx9lYQJYUw2XBj+2P+yEJMboUjmHKzxP5QA3N93JA="; + hash = "sha256-fIvNaMfgwnMBUNo6kr37zhKiBgKNzT2E0dLLtqaVBvI="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index bdef9fe1ea7d9..508f416515ad8 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.197"; + version = "5.12.198"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-Z03FDdlg1IBXHpurKr6RwmtZkaptyeQe+0lgKn/GTTQ="; + hash = "sha256-4tWgIwDmGZhMFTVT5VzmGj69zV8FGTV0yBHUy5Iu1Xw="; }; - cargoHash = "sha256-V8TV8RM3T7DYqwNV/r5PkkJVtyAQLdY3BR3sz26phdY="; + cargoHash = "sha256-vKiCKcyB1Q2CNA4HpE8dc5gh+nlrz0VERIMaTGlDH5Y="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-vanity-hash/default.nix b/pkgs/applications/version-management/git-vanity-hash/default.nix index 915ef38307b2f..55332c6c7287b 100644 --- a/pkgs/applications/version-management/git-vanity-hash/default.nix +++ b/pkgs/applications/version-management/git-vanity-hash/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ + lib, + fetchFromGitHub, + rustPlatform, +}: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "git-vanity-hash"; version = "1.0.0"; src = fetchFromGitHub { owner = "prasmussen"; repo = "git-vanity-hash"; - rev = "v${version}"; - hash = "sha256-jD8cSFXf9UNBZ9d8JTnuwhs6nPHY/xGd5RyqF+mQOlo="; + # v1.0.0 + build fix + rev = "a80e7725ac6d0b7e6807cd7315cfdc7eaf0584f6"; + hash = "sha256-1z4jbtzUB3SH79dDXAITf7Vup1YZdTLHBieSrhrvSXc="; }; - cargoHash = "sha256-8oW6gRtdQdmSmdwKlcU2EhHsyhk9hFhKl7RtsYwC7Ps="; + cargoHash = "sha256-+SQ0HpURBjnnwH1Ue7IUReOtI4LxVPK9AGSAihs0qsc="; postInstall = '' mkdir -p $out/share/doc/git-vanity-hash diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/applications/version-management/gitprompt-rs/default.nix index 5447babaea160..4df54080513cd 100644 --- a/pkgs/applications/version-management/gitprompt-rs/default.nix +++ b/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -12,10 +12,10 @@ rustPlatform.buildRustPackage rec { owner = "9ary"; repo = pname; rev = version; - sha256 = "00xxz7awk01981daabp8m3kwq127y733ynijiwqgs8xvn4nkg8h6"; + hash = "sha256-BqI3LbG7I/0wjzJaP8bxRwTM56joLqVaQCmAydX5vQM="; }; - cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418"; + cargoHash = "sha256-KBBdhiXEZz1/w6Zr/LogyceBdCn1ebfkVgGbtcdAeis="; postPatch = '' substituteInPlace src/main.rs \ @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { description = "Simple Git prompt"; homepage = "https://github.com/9ary/gitprompt-rs"; license = with licenses; [ mpl20 ]; - maintainers = with maintainers; [ isabelroses ]; + maintainers = with maintainers; [ isabelroses cafkafk ]; mainProgram = "gitprompt-rs"; }; } diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index b6c49f47dc56d..2d704143bfdab 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.37.0"; + version = "1.40.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-H1yYjI7ct/YO44czX5J0cHc/YbhxtXJQThJcARyUEq0="; + hash = "sha256-setvszKdG2EQUlVJNbo7gPKE4b7lfdGT30MC82Kk2/s="; }; - vendorHash = "sha256-4CQ4NPHAs736LQxDxvKWEH9TQvIKAouJ6zVReAoZTec="; + vendorHash = "sha256-vx4dNFM0PfapRQxz9ef1vNs4RiZlZDNhcKlo87gjGTs="; ldflags = [ "-s" diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix deleted file mode 100644 index 2448e4ccffea9..0000000000000 --- a/pkgs/applications/version-management/got/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, openssl -, libbsd -, libevent -, libuuid -, libossp_uuid -, libmd -, zlib -, ncurses -, bison -, autoPatchelfHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "got"; - version = "0.97"; - - src = fetchurl { - url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-4HpIlKRYUDoymCBH8GS8DDXaY0nYiVvotpBkwglOO3I="; - }; - - nativeBuildInputs = [ pkg-config bison ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - - buildInputs = [ openssl libbsd libevent libuuid libmd zlib ncurses ] - ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; - - configureFlags = [ "--enable-gotd" ]; - - preConfigure = lib.optionalString stdenv.isDarwin '' - # The configure script assumes dependencies on Darwin are installed via - # Homebrew or MacPorts and hardcodes assumptions about the paths of - # dependencies which fails the nixpkgs configurePhase. - substituteInPlace configure --replace-fail 'xdarwin' 'xhomebrew' - ''; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ - # error: conflicting types for 'strmode' - "-DHAVE_STRMODE=1" - # Undefined symbols for architecture arm64: "_bsd_getopt" - "-include getopt.h" - ]); - - doInstallCheck = true; - - installCheckPhase = '' - runHook preInstallCheck - test "$($out/bin/got --version)" = "got ${finalAttrs.version}" - runHook postInstallCheck - ''; - - meta = { - changelog = "https://gameoftrees.org/releases/CHANGES"; - description = "A version control system which prioritizes ease of use and simplicity over flexibility"; - longDescription = '' - Game of Trees (Got) is a version control system which prioritizes - ease of use and simplicity over flexibility. - - Got uses Git repositories to store versioned data. Git can be used - for any functionality which has not yet been implemented in - Got. It will always remain possible to work with both Got and Git - on the same repository. - ''; - homepage = "https://gameoftrees.org"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ abbe afh ]; - mainProgram = "got"; - platforms = with lib.platforms; darwin ++ linux; - }; -}) diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 14b0ca9497bc5..273b26808af58 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -1,6 +1,6 @@ { lib +, stdenv , fetchFromGitLab -, mkKdeDerivation , breeze-icons , breeze , cmake @@ -15,7 +15,7 @@ , kirigami , kxmlgui , kdoctools -, mpv +, mpvqt , pkg-config , wrapQtAppsHook , qqc2-desktop-style @@ -23,7 +23,7 @@ , yt-dlp }: -mkKdeDerivation rec { +stdenv.mkDerivation rec { pname = "haruna"; version = "1.0.2"; @@ -56,7 +56,7 @@ mkKdeDerivation rec { kirigami kxmlgui kdoctools - mpv + mpvqt qtbase ]; diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix deleted file mode 100644 index 57186eec19f8c..0000000000000 --- a/pkgs/applications/video/manim/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib -, fetchFromGitHub - -, cairo -, ffmpeg -, texliveInfraOnly - -, python3 -}: - -let - # According to ManimCommunity documentation manim uses tex-packages packaged - # in a custom distribution called "manim-latex", - # - # https://community.chocolatey.org/packages/manim-latex#files - # - # which includes another cutom distribution called tinytex, for which the - # package list can be found at - # - # https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt - # - # these two combined add up to: - manim-tinytex = texliveInfraOnly.withPackages (ps: with ps; [ - - # tinytex - amsfonts amsmath atbegshi atveryend auxhook babel bibtex - bigintcalc bitset booktabs cm dehyph dvipdfmx dvips ec epstopdf-pkg etex - etexcmds etoolbox euenc everyshi fancyvrb filehook firstaid float fontspec - framed geometry gettitlestring glyphlist graphics graphics-cfg graphics-def - grffile helvetic hycolor hyperref hyph-utf8 iftex inconsolata infwarerr - intcalc knuth-lib kvdefinekeys kvoptions kvsetkeys l3backend l3kernel - l3packages latex latex-amsmath-dev latex-bin latex-fonts latex-tools-dev - latexconfig latexmk letltxmacro lm lm-math ltxcmds lua-alt-getopt luahbtex - lualatex-math lualibs luaotfload luatex mdwtools metafont mfware natbib - pdfescape pdftex pdftexcmds plain psnfss refcount rerunfilecheck stringenc - tex tex-ini-files times tipa tools unicode-data unicode-math uniquecounter - url xcolor xetex xetexconfig xkeyval xunicode zapfding - - # manim-latex - standalone everysel preview doublestroke ms setspace rsfs relsize ragged2e - fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super - babel-english gnu-freefont mathastext cbfonts-fd - ]); - - python = python3; - -in python.pkgs.buildPythonApplication rec { - pname = "manim"; - pyproject = true; - version = "0.18.0.post0"; - disabled = python3.pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "ManimCommunity"; - repo = "manim"; - rev = "refs/tags/v${version}"; - hash = "sha256-4HwQ74oHloK+1KOD6SzXCzGIDD+Dc0jDabw6/+cqmos="; - }; - - nativeBuildInputs = with python.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "cloup" - "isosurfaces" - "pillow" - "skia-pathops" - "watchdog" - ]; - - patches = [ - ./pytest-report-header.patch - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--no-cov-on-fail --cov=manim --cov-report xml --cov-report term" "" - ''; - - buildInputs = [ cairo ]; - - propagatedBuildInputs = with python.pkgs; [ - click - click-default-group - cloup - colour - grpcio - grpcio-tools - importlib-metadata - isosurfaces - jupyterlab - manimpango - mapbox-earcut - moderngl - moderngl-window - networkx - numpy - pillow - pycairo - pydub - pygments - pysrt - rich - scipy - screeninfo - skia-pathops - srt - svgelements - tqdm - watchdog - ]; - - makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ - ffmpeg - manim-tinytex - ]) - ]; - - nativeCheckInputs = [ - ffmpeg - manim-tinytex - ] ++ (with python.pkgs; [ - pytest-xdist - pytestCheckHook - ]); - - # about 55 of ~600 tests failing mostly due to demand for display - disabledTests = import ./failing_tests.nix; - - pythonImportsCheck = [ "manim" ]; - - meta = with lib; { - description = "Animation engine for explanatory math videos - Community version"; - longDescription = '' - Manim is an animation engine for explanatory math videos. It's used to - create precise animations programmatically, as seen in the videos of - 3Blue1Brown on YouTube. This is the community maintained version of - manim. - ''; - homepage = "https://github.com/ManimCommunity/manim"; - license = licenses.mit; - maintainers = with maintainers; [ friedelino ]; - }; -} diff --git a/pkgs/applications/video/manim/failing_tests.nix b/pkgs/applications/video/manim/failing_tests.nix deleted file mode 100644 index ac788c25be20c..0000000000000 --- a/pkgs/applications/video/manim/failing_tests.nix +++ /dev/null @@ -1,92 +0,0 @@ -[ - # reason for failure: tests try to open display - "test_background_color" - "test_scene_add_remove" - "test_Circle" - "test_wait_skip" - "test_basic_scene_with_default_values" - "test_dry_run_with_png_format" - "test_dry_run_with_png_format_skipped_animations" - "test_FixedMobjects3D" - "test_basic_scene_l_flag" - "test_n_flag" - "test_s_flag_opengl_renderer" - "test_s_flag_no_animations" - "test_image_output_for_static_scene" - "test_no_image_output_with_interactive_embed" - "test_no_default_image_output_with_non_static_scene" - "test_image_output_for_static_scene_with_write_to_movie" - "test_s_flag" - "test_r_flag" - "test_play_skip" - "test_write_to_movie_disables_window" - "test_a_flag" - "test_pixel_coords_to_space_coords" - "test_t_values" - "test_custom_folders" - "test_t_values[15]" - "test_t_values[30]" - "test_t_values[60]" - "test_dash_as_filename" - "test_images_are_created_when_png_format_set_for_opengl" - "test_t_values_with_skip_animations" - "test_static_wait_detection" - "test_non_static_wait_detection" - "test_frozen_frame" - "test_gif_format_output" - "test_animate_with_changed_custom_attribute" - "test_images_are_zero_padded_when_zero_pad_set_for_opengl" - "test_mp4_format_output" - "test_videos_not_created_when_png_format_set" - "test_images_are_created_when_png_format_set" - "test_images_are_zero_padded_when_zero_pad_set" - "test_webm_format_output" - "test_default_format_output_for_transparent_flag" - "test_mov_can_be_set_as_output_format" - "test_force_window_opengl_render_with_format" - "test_get_frame_with_preview_disabled" - "test_get_frame_with_preview_enabled" - - # reason for failure: tests try to reach network - "test_logging_to_file" - "test_plugin_function_like" - "test_plugin_no_all" - "test_plugin_with_all" - - # failing with: - # E AssertionError: - # E Not equal to tolerance rtol=1e-07, atol=1.01 - # E Frame no -1. You can use --show_diff to visually show the difference. - # E Mismatched elements: 18525 / 1639680 (1.13%) - # E Max absolute difference: 255 - # E Max relative difference: 255. - "test_Text2Color" - "test_PointCloudDot" - "test_Torus" - - # test_ImplicitFunction[/test_implicit_graph] failing with: - # E AssertionError: - # E Not equal to tolerance rtol=1e-07, atol=1.01 - # E Frame no -1. You can use --show_diff to visually show the difference. - # E Mismatched elements: 1185[/633] / 1639680[/1639680] (0.0723[/0.0386]%) - # E Max absolute difference: 125[/121] - # E Max relative difference: 6.5[/1] - # - # These started failing after relaxing the “watchdog” and “isosurfaces” dependencies, - # likely due to a tolerance difference. They should, however, start working again when [1] is - # included in a Manim release. - # [1]: https://github.com/ManimCommunity/manim/pull/3376 - "test_ImplicitFunction" - "test_implicit_graph" - - # failing with: - # TypeError: __init__() got an unexpected keyword argument 'msg' - maybe you meant pytest.mark.skipif? - "test_force_window_opengl_render_with_movies" - - # mismatching expecation on the new commandline - "test_manim_new_command" - - # This tests checks if the manim executable is a python script. In our case it is not. - # It is a wrapper shell script instead. - "test_manim_checkhealth_subcommand" -] diff --git a/pkgs/applications/video/manim/pytest-report-header.patch b/pkgs/applications/video/manim/pytest-report-header.patch deleted file mode 100644 index 7aa87d373e508..0000000000000 --- a/pkgs/applications/video/manim/pytest-report-header.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/conftest.py b/conftest.py -index dacb730a..149c6702 100644 ---- a/conftest.py -+++ b/conftest.py -@@ -33,17 +33,3 @@ def temp_media_dir(tmpdir, monkeypatch, request): - with tempconfig({"media_dir": str(tmpdir)}): - assert config.media_dir == str(tmpdir) - yield tmpdir -- -- --def pytest_report_header(config): -- ctx = moderngl.create_standalone_context() -- info = ctx.info -- ctx.release() -- return ( -- f"\nCairo Version: {cairo.cairo_version()}", -- "\nOpenGL information", -- "------------------", -- f"vendor: {info['GL_VENDOR'].strip()}", -- f"renderer: {info['GL_RENDERER'].strip()}", -- f"version: {info['GL_VERSION'].strip()}\n", -- ) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 2802ed8a5b960..8fc656981a3ad 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "83.0"; + version = "84.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-MHi3ewxCn560vpVfOucV34CNj/95U2OFd6bxAjtMBoc="; + hash = "sha256-//I++WWnSHnkpTZ0TzS3lhH5+eDD5mazTQ1HVMQS4Ug="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index e0afa7d932c67..8db7d4b1aa3c9 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -2,7 +2,10 @@ , stdenvNoCC }: let - escapedList = with lib; concatMapStringsSep " " (s: "'${escape [ "'" ] s}'"); + # Escape strings for embedding in shell scripts + escaped = s: "'${lib.escape [ "'" ] s}'"; + escapedList = lib.concatMapStringsSep " " escaped; + fileName = pathStr: lib.last (lib.splitString "/" pathStr); scriptsDir = "$out/share/mpv/scripts"; @@ -50,14 +53,14 @@ lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy } [ ${with builtins; toString (length extraScripts)} -eq 0 ] || { echo "mpvScripts.buildLua does not support 'extraScripts'" \ - "when 'scriptPath' is a directory" + "when 'scriptPath' is a directory" >&2 exit 1 } mkdir -p "${scriptsDir}" cp -a "${scriptPath}" "${scriptsDir}/${scriptName}" else - install -m644 -Dt "${scriptsDir}" \ - ${escapedList ([ scriptPath ] ++ extraScripts)} + install -m644 -Dt "${scriptsDir}" ${escaped scriptPath} + ${lib.optionalString (extraScripts != []) ''cp -at "${scriptsDir}/" ${escapedList extraScripts}''} fi runHook postInstall diff --git a/pkgs/applications/video/mpv/scripts/chapterskip.nix b/pkgs/applications/video/mpv/scripts/chapterskip.nix index 9d0c7dafc1dbf..6c6fc4ba51fee 100644 --- a/pkgs/applications/video/mpv/scripts/chapterskip.nix +++ b/pkgs/applications/video/mpv/scripts/chapterskip.nix @@ -6,7 +6,7 @@ buildLua { pname = "chapterskip"; - version = "unstable-2022-09-08"; + version = "0-unstable-2022-09-08"; src = fetchFromGitHub { owner = "po5"; repo = "chapterskip"; diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index aaf9afcc0d52b..d1fdc9c801bb7 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -10,7 +10,7 @@ buildLua { pname = "mpv-convert-script"; - version = "unstable-2015-07-02"; + version = "0-unstable-2015-07-02"; src = fetchgit { url = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; rev = "f95cee43e390e843a47e8ec9d1711a12a8cd343d"; diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index 69eba782cc1d7..ac2f518a9b5ab 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -2,7 +2,7 @@ buildLua { pname = "video-cutter"; - version = "unstable-2023-11-09"; + version = "0-unstable-2023-11-10"; src = fetchFromGitHub { owner = "rushmj"; @@ -29,7 +29,6 @@ buildLua { extraScripts = [ "c_concat.sh" ]; postInstall = '' - chmod 0755 $out/share/mpv/scripts/c_concat.sh wrapProgram $out/share/mpv/scripts/c_concat.sh \ --run "mkdir -p ~/.config/mpv/cutter/" ''; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index c20ac69ab068c..ce5188c09d294 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -70,12 +70,15 @@ let dynamic-crop = callPackage ./dynamic-crop.nix { }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; memo = callPackage ./memo.nix { }; + manga-reader = callPackage ./manga-reader.nix { }; modernx = callPackage ./modernx.nix { }; modernx-zydezu = callPackage ./modernx-zydezu.nix { }; mpris = callPackage ./mpris.nix { }; mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; + mpv-notify-send = callPackage ./mpv-notify-send.nix { }; mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-slicing = callPackage ./mpv-slicing.nix { }; mpv-webm = callPackage ./mpv-webm.nix { }; mpvacious = callPackage ./mpvacious.nix { }; quack = callPackage ./quack.nix { }; @@ -87,9 +90,11 @@ let thumbfast = callPackage ./thumbfast.nix { }; thumbnail = callPackage ./thumbnail.nix { }; uosc = callPackage ./uosc.nix { }; + videoclip = callPackage ./videoclip.nix { }; visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; + youtube-upnext = callPackage ./youtube-upnext.nix { }; }; aliases = { diff --git a/pkgs/applications/video/mpv/scripts/manga-reader.nix b/pkgs/applications/video/mpv/scripts/manga-reader.nix new file mode 100644 index 0000000000000..9a9621cb34d0e --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/manga-reader.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, +}: + +buildLua rec { + pname = "manga-reader"; + + version = "0-unstable-2024-03-17"; + src = fetchFromGitHub { + owner = "Dudemanguy"; + repo = "mpv-manga-reader"; + rev = "6b65d98be7d20c8e272a4caa6c5018ed3a8bb2b3"; + hash = "sha256-54n513lpn1KCErXJHqL+GKdDE1P52LolS6xDott/epY="; + }; + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Manga reading script for mpv"; + longDescription = '' + mpv-manga-reader is a script aimed at making mpv a usable manga reader. + ''; + homepage = "https://github.com//mpv-manga-reader"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ idlip ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/modernx.nix b/pkgs/applications/video/mpv/scripts/modernx.nix index e6e9ec6110c4f..340b169a0c03d 100644 --- a/pkgs/applications/video/mpv/scripts/modernx.nix +++ b/pkgs/applications/video/mpv/scripts/modernx.nix @@ -6,14 +6,14 @@ }: buildLua (finalAttrs: { pname = "modernx"; - version = "0.6.0"; + version = "0.6.1"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "cyl0"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-Gpofl529VbmdN7eOThDAsNfNXNkUDDF82Rd+csXGOQg="; + hash = "sha256-q7DwyfmOIM7K1L7vvCpq1EM0RVpt9E/drhAa9rLYb1k="; }; postInstall = '' diff --git a/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix b/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix index 56013b1fceeb4..a15f54d01ef22 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-cheatsheet.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, nodePackages, stdenvNoCC }: +{ lib +, fetchFromGitHub +, gitUpdater +, nodePackages +, stdenvNoCC +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mpv-cheatsheet"; version = "0.30.0.2"; @@ -9,6 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = "sha256-MWK0CYto3zgn3fivmL43tvgZn6XrjPxKLp0lgTFdplM="; }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; nativeBuildInputs = [ nodePackages.browserify diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix new file mode 100644 index 0000000000000..04b03670b79f2 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -0,0 +1,39 @@ +{ lib +, buildLua +, fetchFromGitHub +, fetchpatch +, unstableGitUpdater +, libnotify }: + +buildLua rec { + pname = "mpv-notify-send"; + version = "0-unstable-2020-02-24"; + + src = fetchFromGitHub { + owner = "emilazy"; + repo = pname; + rev = "a2bab8b2fd8e8d14faa875b5cc3a73f1276cd88a"; + sha256 = "sha256-EwVkhyB87TJ3i9xJmmZMSTMUKvfbImI1S+y1vgRWbDk="; + }; + + patches = [ + # show title of online videos instead of url + (fetchpatch { + url = "https://github.com/emilazy/mpv-notify-send/pull/6.patch"; + hash = "sha256-7aXQ8qeqG4yX0Uyn09xCIESnwPZsb6Frd7C49XgbpFw="; + }) + ]; + + passthru.extraWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath libnotify) + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A Lua script for mpv to send notifications with notify-send"; + homepage = "https://github.com/emilazy/mpv-notify-send"; + license = licenses.wtfpl; + maintainers = with maintainers; [ r3n3gad3p3arl ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 5287c7f21108d..44f09b8f21fe8 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -2,7 +2,7 @@ buildLua rec { pname = "mpv-playlistmanager"; - version = "unstable-2024-02-26"; + version = "0-unstable-2024-02-26"; src = fetchFromGitHub { owner = "jonniek"; diff --git a/pkgs/applications/video/mpv/scripts/mpv-slicing.nix b/pkgs/applications/video/mpv/scripts/mpv-slicing.nix new file mode 100644 index 0000000000000..cf66a6c78a297 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-slicing.nix @@ -0,0 +1,34 @@ +{ + lib, + buildLua, + fetchFromGitHub, + ffmpeg, + unstableGitUpdater, +}: + +buildLua { + pname = "mpv-slicing"; + version = "0-unstable-2017-11-25"; + + src = fetchFromGitHub { + owner = "Kagami"; + repo = "mpv_slicing"; + rev = "d09c11227704c8d5bdaa2c799ef64dce881c63a7"; + hash = "sha256-MKoM0f74/XoctiHQVOB3LzFWtJXpsREfQh5icaebCJo="; + }; + passthru.updateScript = unstableGitUpdater { }; + + postPatch = '' + substituteInPlace slicing.lua \ + --replace-fail ffmpeg ${lib.getExe ffmpeg} + ''; + + passthru.scriptName = "slicing.lua"; + + meta = { + description = "A lua script to cut fragments of the video in uncompressed RGB format"; + homepage = "https://github.com/Kagami/mpv_slicing"; + license = lib.licenses.cc0; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix index e2411264c7b5d..efff9fa8ee169 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -7,7 +7,7 @@ buildLua { pname = "mpv-webm"; - version = "unstable-2024-04-22"; + version = "0-unstable-2024-04-22"; src = fetchFromGitHub { owner = "ekisu"; @@ -15,7 +15,10 @@ buildLua { rev = "225e8e53842f7da6f77034309c1e54293dc629a4"; hash = "sha256-82xWiuOChxfzX6e0+cGFxTqyuiPefyVwpvLM5ka7nPk="; }; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { + # only "latest" tag pointing at HEAD + hardcodeZeroVersion = true; + }; dontBuild = false; nativeBuildInputs = [ luaPackages.moonscript ]; diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index 8e3c88c761eea..adac4d1d60692 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -9,13 +9,13 @@ buildLua rec { pname = "mpvacious"; - version = "0.31"; + version = "0.33"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-+lixe8FG5jzjEYu4t9bWRy4W/oThV9IdlzeA/ogMlWM="; + sha256 = "sha256-VHMXW2AzgX88EDnNshxo9Gh8mpXzRoTAq+58HKasUdo="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/applications/video/mpv/scripts/occivink.nix b/pkgs/applications/video/mpv/scripts/occivink.nix index 1f17a27172872..be3bdb07db8da 100644 --- a/pkgs/applications/video/mpv/scripts/occivink.nix +++ b/pkgs/applications/video/mpv/scripts/occivink.nix @@ -13,7 +13,7 @@ let mkScript = name: args: let self = rec { pname = camelToKebab name; - version = "unstable-2024-01-11"; + version = "0-unstable-2024-01-11"; src = fetchFromGitHub { owner = "occivink"; repo = "mpv-scripts"; diff --git a/pkgs/applications/video/mpv/scripts/quack.nix b/pkgs/applications/video/mpv/scripts/quack.nix index e7138de928779..646a7a524d18f 100644 --- a/pkgs/applications/video/mpv/scripts/quack.nix +++ b/pkgs/applications/video/mpv/scripts/quack.nix @@ -6,10 +6,10 @@ buildLua rec { pname = "mpv-quack"; - version = "unstable-2020-05-26"; + version = "0-unstable-2020-05-27"; src = fetchFromGitHub { owner = "CounterPillow"; - repo = pname; + repo = "mpv-quack"; rev = "1c87f36f9726d462dd112188c04be54d85692cf3"; hash = "sha256-dEnJbS8RJoAxpKINdoMHN4l7vpEdf7+C5JVWpK0VXMw="; }; @@ -24,8 +24,8 @@ buildLua rec { The volume is linearly increased back up to its original level. Repeated seeks before the transition is done work as well. ''; - homepage = "https://github.com/CounterPillow/quack"; - license = lib.licenses.gpl3; + homepage = "https://github.com/CounterPillow/mpv-quack"; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ nicoo ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/reload.nix b/pkgs/applications/video/mpv/scripts/reload.nix index ec9f441f7cfba..426aabd7fe495 100644 --- a/pkgs/applications/video/mpv/scripts/reload.nix +++ b/pkgs/applications/video/mpv/scripts/reload.nix @@ -6,7 +6,7 @@ buildLua rec { pname = "mpv-reload"; - version = "unstable-2024-03-22"; + version = "0-unstable-2024-03-22"; src = fetchFromGitHub { owner = "4e6"; repo = pname; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix index 7ea503ddd62c5..2557db8313d6d 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix @@ -2,7 +2,7 @@ buildLua { pname = "mpv_sponsorblock_minimal"; - version = "unstable-2023-08-20"; + version = "0-unstable-2023-08-20"; scriptPath = "sponsorblock_minimal.lua"; src = fetchFromGitea { diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 077b8f0590b28..56ac2575ecdea 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -32,7 +32,7 @@ buildLua { --replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" ''; - postInstall = "cp -a sponsorblock_shared $out/share/mpv/scripts/"; + extraScripts = [ "sponsorblock_shared" ]; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 7336fbe35dad8..e30c62774b759 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -2,7 +2,7 @@ buildLua { pname = "mpv-thumbfast"; - version = "unstable-2023-12-08"; + version = "0-unstable-2023-12-08"; src = fetchFromGitHub { owner = "po5"; diff --git a/pkgs/applications/video/mpv/scripts/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix new file mode 100644 index 0000000000000..fff5b788b0286 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, curl +, xclip +, wl-clipboard +, stdenv +, buildLua +, unstableGitUpdater +}: +buildLua { + pname = "videoclip"; + version = "0-unstable-2024-03-08"; + + src = fetchFromGitHub { + owner = "Ajatt-Tools"; + repo = "videoclip"; + rev = "0e3f2245b03e888c14c093a50261e0f54ecdf8e8"; + hash = "sha256-Sg6LHU9OVmVx3cTs8Y0WL8wACb5BlVyeBRccoX+7BXY="; + }; + + patchPhase = '' + substituteInPlace platform.lua \ + --replace \'curl\' \'${lib.getExe curl}\' \ + '' + lib.optionalString stdenv.isLinux '' + --replace xclip ${lib.getExe xclip} \ + --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"} + ''; + + scriptPath = "."; + passthru.scriptName = "videoclip"; + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "Easily create videoclips with mpv"; + homepage = "https://github.com/Ajatt-Tools/videoclip"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ BatteredBunny ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix index d387ac7b9ec71..332604286847a 100644 --- a/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -6,7 +6,7 @@ }: buildLua { pname = "visualizer"; - version = "unstable-2024-03-10"; + version = "0-unstable-2024-03-10"; src = fetchFromGitHub { owner = "mfcc64"; diff --git a/pkgs/applications/video/mpv/scripts/youtube-upnext.nix b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix new file mode 100644 index 0000000000000..cdd7ea66a1763 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/youtube-upnext.nix @@ -0,0 +1,27 @@ +{ buildLua, fetchFromGitHub, curl, unstableGitUpdater, lib }: + +buildLua rec { + pname = "youtube-upnext"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "cvzi"; + repo = "mpv-youtube-upnext"; + rev = "v${version}"; + hash = "sha256-x9mfyc8JIlOpbSfGEwxXoUtsH0A+K3JPwT/8MHq7ks4="; + }; + + postPatch = '' + substituteInPlace youtube-upnext.lua \ + --replace '"curl"' '"${lib.getExe curl}"' + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A userscript that allows you to play 'up next'/recommended youtube videos"; + homepage = "https://github.com/cvzi/mpv-youtube-upnext"; + maintainers = with maintainers; [ bddvlpr ]; + license = licenses.unfree; + }; +} diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 3df52d08684d5..f278d832958ed 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ eclairevoyant jb55 MP2E materus fpletz ]; + maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ]; license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index deebf1af7b848..f400fced2ac08 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-J7tCEIB9zQ0zZFl1eSuEARd+KqpNClHfYx3wcLawFeM="; + sha256 = "sha256-INxz8W4AMKxRcfpZkhqqsWWWQQVEc2G9iFQBit1YA2E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index c6e9f450b9907..82767da10d998 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-baEF8vcAmac4bwpzJnGE2WczTa6vojjRQ/oEKgYeXgk="; + sha256 = "sha256-3lFM7bOzsKex6JUdbcw8MNS4PRzaN/E/vngdukgfV0s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 25fe296df2dae..87732ad75b8cc 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "shotcut"; - version = "24.04.13"; + version = "24.04.28"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${finalAttrs.version}"; - hash = "sha256-xEdCsvclZXCJgoOnx5ZyOElCXjGpbrOtC7VOR5Hgvpg="; + hash = "sha256-iMg2XrTrLFZXXvnJ7lMdkxf/LTaL9bh9Nc2jsPOS0eo="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index cd61cfc9d0d44..ef30ed13784c0 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -12,15 +12,16 @@ , libxkbcommon , pkg-config }: + stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "AlynxZhou"; - repo = pname; - rev = "v${version}"; - hash = "sha256-eeObomb4Gv/vpvViHsi3+O0JR/rYamrlZNZaXKL6KJw="; + repo = "showmethekey"; + rev = "refs/tags/v${version}"; + hash = "sha256-pVFkO/+a7GAOXbYBfU0zcO/uD26PX+y02bEZa3f1ZP8="; }; nativeBuildInputs = [ @@ -40,8 +41,9 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://showmethekey.alynx.one/"; description = "Show keys you typed on screen"; + homepage = "https://showmethekey.alynx.one/"; + changelog = "https://github.com/AlynxZhou/showmethekey/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ ocfox ]; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index c5159fdd61f0f..5713aeb954af3 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.6"; + version = "2.6.7"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - hash = "sha256-3om/Q67PHtX/aIG4zMCaJTyD9bZNEcyE5LQTeb+zB+M="; + hash = "sha256-6i3EQgARwMLNejgB0NevmLmd9OrNBvjqW+qLrAdqUxE="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index 28dad0200270a..efc08eaf06d19 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.4.13"; + version = "3.6.0"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-pDnziIWX6deBXuVIN7w6F6TdYDCcEO6MSaUIMB63uAg="; + sha256 = "sha256-O958GNQI6Z+m4sIJfGQzLaCrzyrdpn+ZY8COx7RoUZs="; rev = "V${version}"; }; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 23c6433f9ebbd..caccdc6ed39a8 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-y6b0nOf597uxS9zDh0NQOwLN81nk4U7lHK2CalyVi8s="; + sha256 = "sha256-1yCDNfUdQLgJ0WWyx0q3Hi0yxb6zxaK7wMzLD9jXweI="; rev = "v${version}"; }; diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index 3a8c5a5593237..89c6d46d2ccf0 100644 --- a/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-+htd9RJGSFzzyEQSBJGIzurQDQgpJ+sJHLPe3aPH0cg="; + hash = "sha256-+RKjJtI01Y56+cFDdOSAL4BodI7R/rM3B3ht3p6+xzs="; }; nativeBuildInputs = [ capnproto protobuf ]; doCheck = false; - cargoHash = "sha256-CcWji/qMd7eX0O3cR9/FLID17WpSfz4kEAhDgKb3jds="; + cargoHash = "sha256-4VOse+y0EO9IORyeAO/j1t6ssQARJp7lK21TUJVuH78="; meta = with lib; { description = "An OCI container runtime monitor written in Rust"; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 124647e6ab7be..6b65ab58dc63c 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.10"; + version = "2.1.11"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-WUXyx5OWIJDamzHUahN+0/rcn2pxQgCgYAE/d0mxk2A="; + hash = "sha256-QQgpvvk7S6ARzBct/4AQP66End30EXcUPqv8a4Udoas="; }; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; # manpage requires building the vendored go-md2man - makeFlags = [ "bin/conmon" ]; + makeFlags = [ "bin/conmon" "VERSION=${version}" ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index a32d4bd8db441..959fe755c209e 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.29.3"; + version = "1.29.4"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-JJuqYC4GAZqXyyAjVoPipnGjRGbVx1rfH4UrtIOP7cc="; + hash = "sha256-bF9hvKKwhsmX606Jk34qn32JklUrG939BW2x4tbknjo="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 3e344a653614b..d2eb61bb893db 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.26.1"; + version = "2.27.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-R/AFjJM4rcu2JbdfTNhxIIVhaP7LzFrDAU93hbuXSXs="; + hash = "sha256-YM/9ijwxDAjFZk/ku33b/pMYri5V1h0wPd2YS7qJgCw="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-SzySXS0s0p1EXcO5RQyATBG9gtoJ4wPxZKGU62fAOHw="; + vendorHash = "sha256-ztqWSoDsN8qdm6Jq8Wo7r16zuXENQDp2JvwSN+6Jbxw="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index a27d9d2b9955f..43222fa6b19b3 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-Ob02OjqQGV60TE1CBe/Hr/WWiPNQ/33T1vPYPmJBr/4="; + hash = "sha256-31cgihmtBIB8U60ic5wKNyqB4a5sXZmIXxAjQI/43ro="; }; - vendorHash = "sha256-XYYGr/mJYQuiDJFRrr8GlQbotM+Sb8xaBiARjZ/UyIs="; + vendorHash = "sha256-X2E0Sy4rJhrDgPSSOTqUeMEdgq5H3DF5xjh84qlH1Ug="; ldflags = [ "-s" diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix index 9c4de021f2560..572ee4a0c0823 100644 --- a/pkgs/applications/virtualization/quickgui/default.nix +++ b/pkgs/applications/virtualization/quickgui/default.nix @@ -1,12 +1,14 @@ -{ stdenv +{ stdenvNoCC , lib , fetchurl , autoPatchelfHook , dpkg , wrapGAppsHook +, quickemu +, gnome }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "quickgui"; version = "1.2.8"; @@ -18,31 +20,48 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg + wrapGAppsHook ]; buildInputs = [ - wrapGAppsHook + quickemu + gnome.zenity ]; + strictDeps = true; + unpackCmd = "dpkg-deb -x $curSrc source"; installPhase = '' runHook preInstall mv usr $out + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ quickemu gnome.zenity ]} + ) + ''; + + postFixup = '' substituteInPlace $out/share/applications/quickgui.desktop \ --replace "/usr" $out - runHook postInstall + # quickgui PR 88 + echo "Categories=System;" >> $out/share/applications/quickgui.desktop ''; - meta = { + meta = with lib; { description = "A Flutter frontend for quickemu"; homepage = "https://github.com/quickemu-project/quickgui"; changelog = "https://github.com/quickemu-project/quickgui/releases/tag/v${version}"; - maintainers = [ lib.maintainers.heyimnova ]; - platforms = lib.platforms.linux; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = licenses.mit; + maintainers = with maintainers; [ heyimnova ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; mainProgram = "quickgui"; }; } diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix deleted file mode 100644 index b245941fc7d49..0000000000000 --- a/pkgs/applications/window-managers/eww/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, wrapGAppsHook -, gtk3 -, librsvg -, gtk-layer-shell -, stdenv -}: - -rustPlatform.buildRustPackage rec { - pname = "eww"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "elkowar"; - repo = "eww"; - rev = "v${version}"; - hash = "sha256-HBBz1NDtj2TnDK5ghDLRrAOwHXDZlzclvVscYnmKGck="; - }; - - cargoHash = "sha256-IirFE714NZmppLjwbWk6fxcmRXCUFzB4oxOxBvmYu5U="; - - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - - buildInputs = [ gtk3 librsvg gtk-layer-shell ]; - - cargoBuildFlags = [ "--bin" "eww" ]; - - cargoTestFlags = cargoBuildFlags; - - # requires unstable rust features - RUSTC_BOOTSTRAP = 1; - - meta = with lib; { - description = "ElKowars wacky widgets"; - homepage = "https://github.com/elkowar/eww"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda lom coffeeispower ]; - mainProgram = "eww"; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix index f38d0d6beb9b1..45f17c0c912ed 100644 --- a/pkgs/applications/window-managers/hackedbox/default.nix +++ b/pkgs/applications/window-managers/hackedbox/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; + CXXFLAGS = "-std=c++98"; + buildInputs = [ freetype fribidi diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index a170ac7608988..4d50b39ebedad 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -77,6 +77,11 @@ stdenv.mkDerivation (finalAttrs: { --replace "@DIRTY@" "" ''; + depsBuildBuild = [ + # to find wayland-scanner when cross-compiling + pkg-config + ]; + nativeBuildInputs = [ jq makeWrapper diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 6718caf1ada23..6b7951c14c374 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -7,20 +7,30 @@ , mesa , pango , udev +, shaderc +, libglvnd +, vulkan-loader +, autoPatchelfHook }: rustPlatform.buildRustPackage rec { pname = "jay"; - version = "unstable-2022-11-20"; + version = "1.1.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; - rev = "09b4668a5363a6e93dfb8ba35b244835f4edb0f2"; - sha256 = "sha256-0IIzXY7AFTGEe0TzJVKOtTPUZee0Wz40yKgEWLeIYJw="; + rev = "v${version}"; + sha256 = "sha256-9fWwVUqeYADt33HGaJRRFmM20WM7qRWbNGpt3rk9xQM="; }; - cargoSha256 = "sha256-zSq6YBlm6gJXGlF9xZ8gWSTMewdNqrJzwP58a0x8QIU="; + cargoSha256 = "sha256-oPGY/rVx94BkWgKkwwyDjfASMyGGU32R5IZuNjOv+EM="; + + SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; + + nativeBuildInputs = [ + autoPatchelfHook + ]; buildInputs = [ libGL @@ -29,9 +39,18 @@ rustPlatform.buildRustPackage rec { pango udev libinput + shaderc + ]; + + runtimeDependencies = [ + libglvnd + vulkan-loader ]; - RUSTC_BOOTSTRAP = 1; + postInstall = '' + install -D etc/jay.portal $out/usr/share/xdg-desktop-portal/portals/jay.portal + install -D etc/jay-portals.conf $out/usr/share/xdg-desktop-portal/jay-portals.conf + ''; meta = with lib; { description = "A Wayland compositor written in Rust"; diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index da1b4e1538316..8575c10a6ad64 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "unstable-2024-04-25"; + version = "0-unstable-2024-04-25"; src = fetchFromGitHub { owner = "Miriway"; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index b4472425324ee..a4e36c18368e6 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo="; + hash = "sha256-6hVmq09f/Ofp/U96H8pbMMquTVACO/RZITmUCU4Cspo="; }; postPatch = '' |