diff options
Diffstat (limited to 'pkgs')
463 files changed, 5516 insertions, 4506 deletions
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 68b74821ec3f7..f9fedfcc28ffa 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, autoreconfHook , pkg-config , intltool , avahi @@ -24,7 +25,14 @@ stdenv.mkDerivation rec { sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl"; }; - nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + gettext + intltool + wrapGAppsHook + ]; + buildInputs = [ avahi curl @@ -36,6 +44,12 @@ stdenv.mkDerivation rec { taglib ]; + postInstall = lib.optionalString stdenv.isDarwin '' + for file in $out/lib/ario/plugins/*.dylib; do + ln -s $file $out/lib/ario/plugins/$(basename $file .dylib).so + done + ''; + meta = with lib; { description = "GTK client for MPD (Music player daemon)"; homepage = "http://ario-player.sourceforge.net/"; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 00843ec863231..038a5277d2f50 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-+NvQ7TA8WLnZKbzsB+jLl/CIg7tayKd+W2svtXtDsT4="; + sha256 = "sha256-nLXpf0Xi7yuz/Rm8Sfkr1PGLuazN+Lh6sIqkWFBmP3w="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 32bcbee2e6cd2..19468b3af3454 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -34,7 +34,7 @@ let homepage = "https://faust.grame.fr/"; downloadPage = "https://github.com/grame-cncm/faust/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ magnetophon pmahoney ]; }; diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/applications/audio/goodvibes/default.nix new file mode 100644 index 0000000000000..1f09d99c88893 --- /dev/null +++ b/pkgs/applications/audio/goodvibes/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, glib +, gtk3 +, libsoup +, keybinder3 +, gst_all_1 +, wrapGAppsHook +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "goodvibes"; + version = "0.7.5"; + + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-CE9f0GnXr7wSpp8jyW0ZxGKx16r6tOaObzQXKcy5nPY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk3 + libsoup + keybinder3 + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + postPatch = '' + patchShebangs scripts + ''; + + meta = with lib; { + description = "A lightweight internet radio player"; + homepage = "https://gitlab.com/goodvibes/goodvibes"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 33c64e079460a..5fe2ca2ce6450 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.8.0-1"; + version = "3.9.0-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-VXf2B5NK6lrcNXUiTTjYhfBVrTWusyadD+5ySkmelsI="; + sha256 = "sha256-+LWEjoke7f+6f4K4jO9nCG88Mdg9C49+v3FboM9/NkU="; }; postPatch = '' diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index 7811125bd2459..524f89a26ac3f 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchFromGitHub , rustPlatform , meson @@ -22,26 +21,18 @@ stdenv.mkDerivation rec { pname = "netease-cloud-music-gtk"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "gmg137"; repo = pname; rev = version; - hash = "sha256-0pmuzdRQBdUS4ORh3zJQWb/hbhk7SY3P4QMwoy4Mgp8="; + hash = "sha256-A3mvf6TZ3+aiWA6rg9G5NMaDKvO0VQzwIM1t0MaTpTc="; }; - patches = [ - (fetchpatch { - name = "add-cargo-lock-for-2.0.2.patch"; - url = "https://github.com/gmg137/netease-cloud-music-gtk/commit/21b5d40d49e661fe7bd35ed10bb8b883ef7fcd9f.patch"; - hash = "sha256-pSgc+yJQMNyLPYUMc1Kp/Kr+++2tH8srIM5PgVeoZ+E="; - }) - ]; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; - hash = "sha256-7Z5i5Xqtk4ZbBXSVYg1e05ENa2swC88Ctd2paE60Yyo="; + inherit src; + hash = "sha256-Y7rZTbg0zd/eoo6E8TmV8JJPs1N0bLlBjvB6W07Kelg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 320b837ab878f..3fa0ea533b262 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +{ lib +, fetchFromGitHub +, python3 +, wrapQtAppsHook +}: # As of 2.1, puddletag has started pinning versions of all dependencies that it # was built against which is an issue as the chances of us having the exact same @@ -14,18 +18,11 @@ # ignoring the pinned versions, it's just something we will have to accept # unless we want to vendor those versions. -let - # NOTE: check if we can drop any of these overrides when bumping the version - overrideVersions = [ - "lxml" - "pyparsing" - "pyqt5" - ]; -in -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "puddletag"; version = "2.2.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "puddletag"; @@ -34,26 +31,29 @@ python3Packages.buildPythonApplication rec { hash = "sha256-KaFfpOWI9u2ZC/3kuCLneWOOKSmAaIuHPFHptkKMH/g="; }; + pythonRelaxDeps = true; + + pythonRemoveDeps = [ + "chromaprint" + "pyqt5-qt5" + ]; + postPatch = '' substituteInPlace setup.py \ --replace share/pixmaps share/icons + ''; - cp requirements.in requirements.txt - sed -i requirements.txt -e 's/^chromaprint$//' - '' + lib.concatMapStringsSep "\n" - (e: '' - sed -i requirements.txt -e 's/^${e}.*/${e}/' - '') - overrideVersions; - - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ + python3.pkgs.pythonRelaxDepsHook + wrapQtAppsHook + ]; - propagatedBuildInputs = with python3Packages; [ - pyacoustid + propagatedBuildInputs = with python3.pkgs; [ configobj levenshtein lxml mutagen + pyacoustid pyparsing pyqt5 rapidfuzz diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index e13a791ccbbc9..f5f1feacb00cc 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.9.1403"; + version = "1.9.9.1411"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "bc72c0de3fff771540a2a45aaafafed539387b3c"; - hash = "sha256-205i61mbeQG2MzSE9NtPHSuNeyMbjZzbZVCFFzjqKqQ="; + rev = "ca44fc6e258bb413d6281d927063b25940f42e5c"; + hash = "sha256-aZ+2nyy6tK3VwgTCWGoNaU4//kkHUzd6DZSfTEIgbvY="; }; buildInputs = [ flac libmad libvorbis mpg123 ] @@ -82,7 +82,7 @@ stdenv.mkDerivation { description = "Lightweight headless squeezebox client emulator"; homepage = "https://github.com/ralph-irving/squeezelite"; license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; - maintainers = with maintainers; [ samdoshi ]; + maintainers = with maintainers; [ adamcstephens ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/applications/audio/tagger/default.nix index 5d4052a8efa78..992934cd8ccd0 100644 --- a/pkgs/applications/audio/tagger/default.nix +++ b/pkgs/applications/audio/tagger/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tagger"; - version = "2022.10.5"; + version = "2022.10.6"; src = fetchFromGitHub { owner = "nlogozzo"; repo = "NickvisionTagger"; rev = version; - hash = "sha256-rkpeecJUOBom0clrwftBa/VxACTihfMfWVmfbZhMQ50="; + hash = "sha256-eo7H2pNtSChUAqjO0ocFjsGt4I0e8ZOHbZ/GoZgUva8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 6c39fdcf5fc08..24c8e610a692d 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.4.2"; + version = "7.4.3"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-fEEu7GqK1leOop3kd1Ci9BAH2bP31jvTOg3DEL8lIF4="; + sha256 = "sha256-eB4fwW5UvylVslSEvDFdCVYcEK3M2H+8VJGHH13vvA0="; }; postUnpack = '' diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 62f21dff30f31..677915066eb07 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-E0n1keNk5jNnErNvYhb8oe26kK9Opl+IJ5zpsvrqS84="; + sha256 = "sha256-QOKFnre5MW9EvrKrKBHWpOxi2fBKTDMhzCDX3ISd2cQ="; }; - cargoSha256 = "sha256-kbo3OMLYA/5xctz/YhQNd8IYlyCQB7D/8rCHZwjvlMI="; + cargoSha256 = "sha256-D+3HIyj1zbs5m8hwLpITS25u/wrRM5GfnwlUUuLX8DQ="; checkFlags = [ # these want internet access, disable them diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 3fa08757f7de7..35470a7b8542c 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-jU0qN+T5bHn9l/SXDR/Wa8uCGyJhIDUCHzEQe39L2MQ="; + hash = "sha256-GqFtCK5hxnEfIfw3ITufeu26yueknuFZhLtGSXmJ8fE="; }; - cargoHash = "sha256-hdScQd0Fd6gE9/f4kk0zjZLK42oK1aaDzIOcAIsJqbU="; + cargoHash = "sha256-p4t+G13XaCl7+IbX5YyBFF0PmARbw4XlRvnA0PRcjvQ="; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; @@ -33,6 +33,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; homepage = "https://github.com/romanz/electrs"; diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 70a87a98e8856..86b014af2a5cb 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "erigon"; - version = "2022.10.01"; + version = "2.29.0"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FuOVI59vfhm5q92hnfgarh3zpLXSDRmZQJuERHf4I7A="; + sha256 = "sha256-hxbeneq1ryTsULRWalgpWRa1aIIyj/QKv5hnYvUUgMg="; fetchSubmodules = true; }; - vendorSha256 = "sha256-B9brjWvYw65ti2Ac3D4nQUEax/q+Uf5DTPBHXeWQybw="; + vendorSha256 = "sha256-VJxsmJxqER+q1rGFy1CI9Wm1+JXTGQiMJwJ+yzjRtAI="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index ca8f33bcd5c57..915cb938423dc 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,13 +9,13 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.25"; + version = "1.10.26"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mnf0kMfQEEQMricZJfyF7ZB/2F1dyPBx9iT2v/rGh1U="; + sha256 = "sha256-eefQEOeKb6gZIJdK9cq20WnhwZE1qbyd8Cl0Hqh2+u8="; }; vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0="; @@ -46,7 +46,7 @@ in buildGoModule rec { "cmd/utils" ]; - # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.25/build/ci.go#L218 + # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.26/build/ci.go#L218 tags = [ "urfave_cli_no_docs" ]; # Fix for usb-related segmentation faults on darwin diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 4d2f727193ec0..4f6ae53ec7845 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.49.0"; + version = "2.49.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-5HrPeLeMPh6hc1OLZVSPWMSV+ZwjgQyUmFCW+ZyYdCA="; + hash = "sha256-8KGZRTJu3uGFyf4vogoC9kDrKegD8Op4Z7gqQK+UFl8="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index f80a598aea932..af60ffc9e589a 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.174.0"; + version = "1.175.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-3jj04ndyuJpfXu9z8j/Pdp8yNybmzLbrPr/S+uV7Rfg="; + hash = "sha256-Q4T4CmMK+sxOst18pW4L4uMYzc/heMetntM0L+HrSlo="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 1d26a8731c59f..9ea04447272f4 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.10.24", - "hash": "sha256-IXMOZV4NNL7VHzlbzPCcYOPYneV7bDYm5L7Ge/SlnJs=" + "rev": "2022.11.03", + "hash": "sha256-U6jF+gXFOuPY512y4KWL18q8rZlfNwGqB9fTUHAHXl8=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.10.25", - "hash": "sha256-eleuHFE+kBmqKBVKOPzUAi+LVgzRr8gIKdCIPzfxUOo=" + "rev": "2022.11.03", + "hash": "sha256-BLKzmkIopcvbngQFWS+f1MQfMBOpZ9S2qch7cDGY7/0=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -36,8 +36,8 @@ }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2021.10.27", - "hash": "sha256-ikXdDUMJ9MxRejEVAhwUsXYVh0URVFHzEpnXuN5NGpA=" + "rev": "2022.10.26", + "hash": "sha256-pVVO3PMazcGizN3RI4zO2tgLJLDOYIKhwnMLBJ5IiwY=" }, "Emmet-Pascal": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 1d1406160c791..8c9189466c83b 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -433,25 +433,26 @@ rec { }; }; - gnuarmeclipse = buildEclipseUpdateSite rec { - name = "gnuarmeclipse-${version}"; - version = "3.1.1-201606210758"; + embed-cdt = buildEclipseUpdateSite rec { + name = "embed-cdt-${version}"; + version = "6.3.1"; src = fetchzip { - stripRoot = false; - url = "https://github.com/gnuarmeclipse/plug-ins/releases/download/v${version}/ilg.gnuarmeclipse.repository-${version}.zip"; - sha256 = "1g77jlhfa3csaxxps1z5lasrd9l2p5ajnddnq9ra5syw8ggkdc2h"; + stripRoot = true; + url = "https://github.com/eclipse-embed-cdt/eclipse-plugins/archive/v${version}.zip"; + sha256 = "sha256-0wHRIls48NGDQzD+wuX79Thgiax+VVYVPJw2Z6NEzsg="; }; meta = with lib; { - homepage = "http://gnuarmeclipse.livius.net/"; - description = "GNU ARM Eclipse Plug-ins"; + homepage = "https://github.com/eclipse-embed-cdt/eclipse-plugins"; + description = "Embedded C/C++ Development Tools (formerly GNU MCU/ARM Eclipse)"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl10; + license = licenses.epl20; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; }; + gnuarmeclipse = embed-cdt; # backward compat alias, added 2022-11-04 jsonedit = buildEclipsePlugin rec { name = "jsonedit-${version}"; diff --git a/pkgs/applications/editors/lite-xl/0001-replace-unpack-with-table-unpack.patch b/pkgs/applications/editors/lite-xl/0001-replace-unpack-with-table-unpack.patch deleted file mode 100644 index e7a2287427f6e..0000000000000 --- a/pkgs/applications/editors/lite-xl/0001-replace-unpack-with-table-unpack.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/data/core/commands/findreplace.lua b/data/core/commands/findreplace.lua -index 5d27aa6..db6a2dd 100644 ---- a/data/core/commands/findreplace.lua -+++ b/data/core/commands/findreplace.lua -@@ -37,7 +37,7 @@ local function update_preview(sel, search_fn, text) - last_view:scroll_to_line(line2, true) - found_expression = true - else -- last_view.doc:set_selection(unpack(sel)) -+ last_view.doc:set_selection(table.unpack(sel)) - found_expression = false - end - end -@@ -55,7 +55,7 @@ end - local function find(label, search_fn) - last_view, last_sel = core.active_view, - { core.active_view.doc:get_selection() } -- local text = last_view.doc:get_text(unpack(last_sel)) -+ local text = last_view.doc:get_text(table.unpack(last_sel)) - found_expression = false - - core.command_view:set_text(text, true) -@@ -69,8 +69,8 @@ local function find(label, search_fn) - last_fn, last_text = search_fn, text - else - core.error("Couldn't find %q", text) -- last_view.doc:set_selection(unpack(last_sel)) -- last_view:scroll_to_make_visible(unpack(last_sel)) -+ last_view.doc:set_selection(table.unpack(last_sel)) -+ last_view:scroll_to_make_visible(table.unpack(last_sel)) - end - end, function(text) - update_preview(last_sel, search_fn, text) -@@ -79,8 +79,8 @@ local function find(label, search_fn) - end, function(explicit) - core.status_view:remove_tooltip() - if explicit then -- last_view.doc:set_selection(unpack(last_sel)) -- last_view:scroll_to_make_visible(unpack(last_sel)) -+ last_view.doc:set_selection(table.unpack(last_sel)) -+ last_view:scroll_to_make_visible(table.unpack(last_sel)) - end - end) - end -diff --git a/data/core/doc/init.lua b/data/core/doc/init.lua -index 2e72907..0e61ffb 100644 ---- a/data/core/doc/init.lua -+++ b/data/core/doc/init.lua -@@ -198,9 +198,9 @@ local function selection_iterator(invariant, idx) - local target = invariant[3] and (idx*4 - 7) or (idx*4 + 1) - if target > #invariant[1] or target <= 0 or (type(invariant[3]) == "number" and invariant[3] ~= idx - 1) then return end - if invariant[2] then -- return idx+(invariant[3] and -1 or 1), sort_positions(unpack(invariant[1], target, target+4)) -+ return idx+(invariant[3] and -1 or 1), sort_positions(table.unpack(invariant[1], target, target+4)) - else -- return idx+(invariant[3] and -1 or 1), unpack(invariant[1], target, target+4) -+ return idx+(invariant[3] and -1 or 1), table.unpack(invariant[1], target, target+4) - end - end - -@@ -345,7 +345,7 @@ function Doc:raw_insert(line, col, text, undo_stack, time) - - -- push undo - local line2, col2 = self:position_offset(line, col, #text) -- push_undo(undo_stack, time, "selection", unpack(self.selections)) -+ push_undo(undo_stack, time, "selection", table.unpack(self.selections)) - push_undo(undo_stack, time, "remove", line, col, line2, col2) - - -- update highlighter and assure selection is in bounds -@@ -357,7 +357,7 @@ end - function Doc:raw_remove(line1, col1, line2, col2, undo_stack, time) - -- push undo - local text = self:get_text(line1, col1, line2, col2) -- push_undo(undo_stack, time, "selection", unpack(self.selections)) -+ push_undo(undo_stack, time, "selection", table.unpack(self.selections)) - push_undo(undo_stack, time, "insert", line1, col1, text) - - -- get line content before/after removed text -diff --git a/data/core/tokenizer.lua b/data/core/tokenizer.lua -index d95baeb..f77fed4 100644 ---- a/data/core/tokenizer.lua -+++ b/data/core/tokenizer.lua -@@ -161,7 +161,7 @@ function tokenizer.tokenize(incoming_syntax, text, state) - if count % 2 == 0 then break end - end - until not res[1] or not close or not target[3] -- return unpack(res) -+ return table.unpack(res) - end - - while i <= #text do diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index b19c3f531b7aa..11dd387523774 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -3,7 +3,7 @@ , Foundation , freetype , lib -, lua5_2 +, lua5_4 , meson , ninja , pcre2 @@ -15,26 +15,21 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - sha256 = "sha256-7ppO5ITijhJ37OL6xlQgu1SaQ/snXDH5xJOwuXZNUVA="; + sha256 = "sha256-9nQFdii6SY14Cul7Ki0DUEsu75HWTCeEZtXaU6KGRiM="; }; - patches = [ - # Fixes compatibility with Lua5.2, remove patch when a new release covers this - ./0001-replace-unpack-with-table-unpack.patch - ]; - nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ agg freetype - lua5_2 + lua5_4 pcre2 reproc SDL2 diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7b4bb66cdf6e8..ad02db2025403 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-10-31"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "bfcd9a05ded8ff6cf89b302bee548c35177d9158"; - sha256 = "1mwj6dhk7wpyk766bq504i87hyw3rgspc64ml0kc5xf8wq1mxx4m"; + rev = "6d856dc67cb85539fae976cce268e853f14079e7"; + sha256 = "09xqfahq1i59bw7fpxh6g16g1j9habsxi68v8ghr1za5lspki768"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-11-01"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "88489db9c24e6c8cbc0b39cc9b8de96d3899cb06"; - sha256 = "16hn8zpmm9qynzakj8dp3d42pczcqdb3xj5k1di7yw810r8gdycf"; + rev = "49e0e52d512a370b53f315fcb83e0e84ebba4d86"; + sha256 = "19jmaabbwp8vl75ldm18vkl76xcgwfx0krihah52sdimfjy1az8i"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -365,12 +365,12 @@ final: prev: SudoEdit-vim = buildVimPluginFrom2Nix { pname = "SudoEdit.vim"; - version = "2022-08-15"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "chrisbra"; repo = "SudoEdit.vim"; - rev = "bcf23412e9f307036ae3dbd7968930c1fd48f02b"; - sha256 = "1zrf32d4v5751vivwl976sjy901vjrl1m5b2vzzmp7aic76rji7y"; + rev = "e0ffcda0c2f98bec80cb52d1af5f3af26bd38821"; + sha256 = "125npjj74zn6ldh0656m5f7bc5035wdh7v3bwhh70jkbw36c3vvm"; }; meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/"; }; @@ -442,7 +442,7 @@ final: prev: owner = "ycm-core"; repo = "YouCompleteMe"; rev = "728b47728c31bcbc92fbc196c00230d601ca2a15"; - sha256 = "11g2gby9qffjs4197ajzk2hsmpsjgak33rxfbfijg82m9ypsf3gc"; + sha256 = "0mlhaxnafi6wdyxhjiy2jdpf7xqwlxh5cqjk658znb05x4kix0pp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-10-31"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "159041f5f6e0ba914221f097886f1d31ce419c04"; - sha256 = "06b5hjsbk4k9zw64zfz8pq540wd2q3i5z4sv78n3kh0cbcjj9gmw"; + rev = "f15e49cbc0da8840531ed0bddf67735c604994d6"; + sha256 = "1lkyl27a3pn7lwcljpyy0q76c7f66jcik1nlbfq5nfr52h040061"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -667,12 +667,12 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2022-10-30"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "4794a74dae54633c586eecd67e31d771323a2f72"; - sha256 = "1d3xm00xhwdm5yc08mzkvn5897rb58cjrlq86dlbypfrni512sv7"; + rev = "e74f19f430f98fbb5a2f4d3a725ea980876b7314"; + sha256 = "0fasalhsyf86sr5r2y1wh6ixbf2ys7abwvsf5lzav0za59542av4"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -907,12 +907,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2022-10-07"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "e88dbe0ba5829119d8edb5fc69d3c8553e324a93"; - sha256 = "0qja5jvx8047v5qbch6flcg8fq00369ffcivrv2gkqkmggg4dvb6"; + rev = "027d356a5caec51881089886893c197f0c27fb48"; + sha256 = "1kg671nqjic4dn275ixf3iapj40q96mmpmi4bssz0pdd4gr37klm"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -1723,12 +1723,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-10-31"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "46571a51028dccca9c10c860a51ea3c8adc92de8"; - sha256 = "1agm4sban6sfg626hf78ayhr98hrvi263jv6i8hk0qhcgv26k32c"; + rev = "5f52e41be1ff19ce1f1bd3307144e7d96703b7fd"; + sha256 = "0nm8jgdgxbdlvcpl12fs2fgxww5nizjpqd2ywm2n7ca0lsjpqcx0"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2011,24 +2011,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-11-01"; + version = "2022-11-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "47e6f18e8583f9d48c7e71e632ceb4121dc1d6cc"; - sha256 = "1k425fr1fmq6k7j16m0ylj0z3g11lcdjflw873ivw0wc9kkh6z47"; + rev = "4e80d710635ef4599391c5da355abe5680931469"; + sha256 = "0zhscd3l9f5a0dn1zbc60p101s8447qjsjxhwivbpdyryl14ydqw"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-11-01"; + version = "2022-11-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "eb27fa28ab08dfaf8911d0ac7f1196d8bc0290cc"; - sha256 = "04ylxsg8xkc7ca4gj4j1r86wagjb8b8vhqwwjxan66igr6lhy2m0"; + rev = "079553e07ac79f6416e7751d388e90849d9f2e91"; + sha256 = "0aw779wcsak7ypq24kjras9bq3ynvxkl7s3mrn26ddpkcdrpkdlz"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2047,12 +2047,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-11-01"; + version = "2022-11-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "0fefc00e9082b9e80345dc7805b146a25773ac2f"; - sha256 = "1ffiyqz8yqq26v81sblgn1rf6f0nxsvlqcz3ag7bxlps24fdq48x"; + rev = "f1668e780b4fbc199ceac58ccba38be5fd5fe7c6"; + sha256 = "0qyam08y3j7z37iaajah2micq82a0jsl17qv4fjd7a2hamchzgcc"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2613,12 +2613,12 @@ final: prev: dracula-nvim = buildVimPluginFrom2Nix { pname = "dracula.nvim"; - version = "2022-10-31"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "09cbd3d9434c781674fafe4da03d616e35a49d51"; - sha256 = "06wan9q59bisd9sfdvh8rmw8vj1ahxa87r35gywlkask2jjzq83b"; + rev = "7ff76dd8248efeabb322fec87b22d33c129536fe"; + sha256 = "1g94pxa1frc5ym506vdvfpsk7qby2wzhdv3fby5c09a1vnkz7npz"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -2666,7 +2666,7 @@ final: prev: owner = "editorconfig"; repo = "editorconfig-vim"; rev = "6bba2596601086ddfc882488b1444bf1ea43aab9"; - sha256 = "02a8v3z8kla7fsirl6lqk9ijj51flhn3mwb4dsc47k4fnpxr4qcp"; + sha256 = "16a1c1k9q6db99i0s7rm3j0g6wci8x41y71ky04hb9khqkzv3xm8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2872,7 +2872,7 @@ final: prev: owner = "andviro"; repo = "flake8-vim"; rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994"; - sha256 = "1s7rb2ygky1jjjqpwhzp5lsf7js1g0yhnbf6x5lfwygz6646xpy3"; + sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/andviro/flake8-vim/"; @@ -3455,12 +3455,12 @@ final: prev: haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2022-11-01"; + version = "2022-11-04"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "249bf253c58b9e70d24a02c5231a75f69d170abe"; - sha256 = "0qyfy5ll3rj1svp0ahbq1f3l3ywk02wm5b2d58ccgw6zfcwndm4y"; + rev = "f7fa54b4efec69fb0fe5379a2d42baed4629ae76"; + sha256 = "07h0mbaxxkpsp0549dd366249pql58yvns1ip4y5jndzq1164c1r"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3960,24 +3960,24 @@ final: prev: lazy-lsp-nvim = buildVimPluginFrom2Nix { pname = "lazy-lsp.nvim"; - version = "2022-10-20"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "20f66b6a1ce6b22b3c02d0f53c15dfa7c6a9f3c8"; - sha256 = "1yigp01qk2ljzb5sskgqic7igxwa4q8rkg4ga9czb3w4f84kpb09"; + rev = "7866efc6e5bef78e7f14ab2c0118c1fed15947c9"; + sha256 = "1d9qk7bffj2ppyd6m6r8g5ip804kqjn64a8k7ckd6jqxfl9w3xga"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-10-25"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "c7a8bfb6062e57f3f7cc735720893f2706e6fc8e"; - sha256 = "1hn6llvqbmghjjygy9vwx3y31sra647f3ys9626c5zn4x7a09kgh"; + rev = "56045b4a0d8fa7bfee37411267ca5c6d3c1fe789"; + sha256 = "1xpq3adm1d1dpfns2p3abm111dschwjqqns7c55f2biig9f3lapl"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -4584,12 +4584,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-10-30"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "3d6128b8f7c90ef8cdb0ebb7ea2f96544fa8d060"; - sha256 = "1y514ysh0jgx9bjh5mcnmiic4m9jzz0w2jmlsf9n42hpazbi6z22"; + rev = "993e8d200ff6d2a354e717b2beb7b31bd91b2ee4"; + sha256 = "02gbnc28bg9sjhjmclwrkf2nh3spqibhan0xy0qdnlswms2cpp6s"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4956,12 +4956,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2022-11-01"; + version = "2022-11-04"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "d9d2afc71ad32ed1edb2feecfa7c5b30ce78583a"; - sha256 = "0bgfq9lihw77x9xyfizi0p5ixf7nx0spn4v3y1469mkmgab9zfm1"; + rev = "d41f7e1713f3421c3c8f71c3fe4a026084227a5d"; + sha256 = "17ffq90vhy5w42h3vqczlxpvj7vxl5sznhbbmlf90psl3s1f20sf"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -4980,12 +4980,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-10-27"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "1acb13c07b34622fe1054695afcecff537d9a00a"; - sha256 = "1wihkwfqhxvaxazn2wsd18jh8qd9cc2rc1m0rd2bw3ywm7jm24aw"; + rev = "71651625b0cccb95bd1ae152d26bcf26d96e5182"; + sha256 = "06xiqy490jxiayabi135c01vmpvbqm55c20lzczms1f2zcrblkny"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5100,24 +5100,24 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2022-10-27"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "0be9899e859da147ad28c23a30a1df2081c16741"; - sha256 = "08f7d8w82jk5jd2w4wrh8x4gyw0msv7m82cpzd1ahijg917818pd"; + rev = "7721205f6b8afc0dc6fa6f1f79d228c3714d6b0e"; + sha256 = "1xldwbmhdm05iimxjsdw03j4xbhf46ia075zqyp6x5zz9gdvcqd0"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2022-10-29"; + version = "2022-11-04"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "550815b39a306dddffd133c29a9f8a4907ef4f1a"; - sha256 = "1zxlqqn490sahv3kp0hkxwqmy1a5wm4qixs4gn67vd5xl2d1jprh"; + rev = "74b10216995909d442ce9ffb966ae3194a6da319"; + sha256 = "184aw9vdvahcxmnhq787yh8861ai1xsai784zfkgzz1pg4s7rvbk"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5364,12 +5364,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-10-26"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "f1add2302e6a01531a007c51054392d2029dbed4"; - sha256 = "050lx51x28msshjr4cq04l93brlswbx9w3kzdp35q7mxfmcr6cyg"; + rev = "1ac465b1617b28f753cb875d8ac1d0f23c0b96d4"; + sha256 = "1f67d5ban0k1902363k3arkfpwkgqj6w1plnxnn11w1w5y3kvj9d"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5424,12 +5424,12 @@ final: prev: nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-11-01"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "a1010173d1cf2fa719618644c2373611ea379402"; - sha256 = "17pwi0haqj7f4d81i148y5p6k5fczj6898p828gjxjm5f0blk2pj"; + rev = "bd172d833538c48bd3d589fbc8bc2f3a395ecc7b"; + sha256 = "1h9d127s9w7qiq54596wsdgjbmhxvd7ik055n923wr4r84087vcn"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5616,12 +5616,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-10-27"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "f889edb4f2b7fafa2a8f8101aea2dc499849b2ec"; - sha256 = "18fi54hfybbywyafk0ik2bvgrl99i605qcs49i1a8gw3d6qx8zy1"; + rev = "6a8271505e95913b82305eff63406ef22baad778"; + sha256 = "139qh9m28zv11xy9rjplpwb4r7g4slxcwwfzvha53bzpshn0w2v6"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5808,12 +5808,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-10-31"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "82f43b518460ff4e29f6b3b2b29018012cfd1a83"; - sha256 = "17ibqbpslzgccpv447dj7cjyysyhqr4nxysyi383k1rl4a46ksb4"; + rev = "56b6d3729e13c049901e0aa1bbea1b71e97b0cda"; + sha256 = "05j1r3lnq4955xlmhhkjf21qyyv6gj8xrsh61b5r8ys0m74ahx98"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5904,12 +5904,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-10-29"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "eebc4f15132c587c52fcd2ce2f0da78fc19a16c0"; - sha256 = "1pwshw6r90ycc315f0savp2iid4rchqplphq9ms36nb4x36894mq"; + rev = "2fad33454cd6e37527a2d41f310d77b552d8c1e0"; + sha256 = "1zdcnazqawkyab9gyfqi1mvnzzil9xvzj7mz7hjqd1w6g9r2c1ip"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6072,12 +6072,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-11-01"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "e7bdcee167ae41295a3e99ad460ae80d2bb961d7"; - sha256 = "1h2aab3zgw4q48pllx211kxqaa47ridfa8w610jb0594sqwhfynx"; + rev = "58f61e563fadd1788052586f4d6869a99022df3c"; + sha256 = "075645lkq6cr22kfab4kz7ay1cf5r0bg41r3nbhpdb52g1klrz5k"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6312,12 +6312,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-10-28"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "62b12ba06cb617fdccfd1553f864e6492dcff2fa"; - sha256 = "1kvnycwid2s7iabaql3iwlin4n88czm56d0qd12hhz2sa6jrriy9"; + rev = "7610bd6b4d4a6e8b4de5c8c8d81f25de2682a7ab"; + sha256 = "07n36hlyavan02l7jf96lhkm629gkjc7d7lr6lc1fsibqzwfdxa2"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6372,12 +6372,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-10-23"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "2479971860e1237e4f0dafb6cbf412dfc8a3d89c"; - sha256 = "1bjxmlrjpgsc70yjphb8y0mkyyy3amk49j4jsbjyh2qzdfh4bghs"; + rev = "da9a0cf060ccb27927f234a74714a74277c858f1"; + sha256 = "0glps3xlg2pd1gwzmpwvrq3ylcw4mzjwgdq4agdjjl6bh41vdjdq"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6642,7 +6642,7 @@ final: prev: owner = "python-mode"; repo = "python-mode"; rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603"; - sha256 = "0gr4ag5qymdpx0mlfvx743y4s8bjd7v4a0yzd02jvmz3dyylvavw"; + sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -6662,12 +6662,12 @@ final: prev: pywal-nvim = buildVimPluginFrom2Nix { pname = "pywal.nvim"; - version = "2022-09-11"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "AlphaTechnolog"; repo = "pywal.nvim"; - rev = "c10ea0b90bc049f882517a65fedbef18ba8f8511"; - sha256 = "1irbzhw1yrds80sncqadz7d2k9xr66h3zs8pnx0malfpvgs41fyk"; + rev = "d11b673c0e3d6eb8cbee7ea8cf4a8911f6ee24b9"; + sha256 = "00lfnbaw83iic68mvlgj75qp384g3xa5mjdhw2xmhnapghjgyv14"; }; meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; @@ -6806,12 +6806,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-11-01"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "395e119782845fe8fa3b7d6d17c60745a2004515"; - sha256 = "0lxfs4rvnvgc7qmcyqspgza70m66khck57fx80v4d6whz9c5ncav"; + rev = "cacd595e794451ce2836539cff6ce0c0c45db046"; + sha256 = "19cwkwmbb626972k8svhm04aiqw174q953bsqxsx72d5sscaisss"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -6830,12 +6830,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2022-09-24"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "4a23d38726c0b3c5a2de9f927de5b0b518bdf4f7"; - sha256 = "10s74zwpr9wnnwjvh079g1k9ffnjpbzpxazwbpr55z9ln02sc2vs"; + rev = "3d4bec4754b41fa1d1a2fe145cdcf3b269b3323a"; + sha256 = "0znrslxik741p8cncf60iii3v9x7ln629wixvm0cm4c6g1mk0x4x"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -7312,12 +7312,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2022-06-08"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "0ff514ff249d0e6b6cc4702d6606f196e3827fc8"; - sha256 = "0l5j9y414nxxiw0vxcygxfd09hn1wbwh3d6a735n6n3kn3z42ww5"; + rev = "cdb0bc36fda80eb58d38ecddfb1c7b2fab3a4d53"; + sha256 = "0x055kynvxym614vzxi1vv2zcndfadzjhwk92f4h6z5zvld7fpxj"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -7505,12 +7505,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2022-10-17"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "18c8effd11f801793e1a8b9adb4d6ef7fbedf57b"; - sha256 = "0r68260gc5ln2z338mm7xb4v4y3p8xzkx1wlwagqp35dhgrl2kpn"; + rev = "1718f42d4044ce612091fd7a7bff0dc7313ff5b8"; + sha256 = "01p7fkhflv23slsr54j7b4cvz0bl2nwn6x0zq1c373cjq3zq2x5a"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -7546,7 +7546,7 @@ final: prev: owner = "codota"; repo = "tabnine-vim"; rev = "e27face391a4d9a3e43ff251010f77deddf0c88d"; - sha256 = "1204ibnsdksihyvnql22sarn2xgqajwvr0d975bnp35n593chymq"; + sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -7795,12 +7795,12 @@ final: prev: telescope-manix = buildVimPluginFrom2Nix { pname = "telescope-manix"; - version = "2022-10-19"; + version = "2022-11-04"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "9f91408328be8719ca1f6c49a3ccc1df6392d5e9"; - sha256 = "03wkgmwq3fl92bd4d33ahfp328pdwcmpw0pcjqf9cfaplpi0fzk2"; + rev = "700279d1d8bc0267404672d2927b522e7ca87ee3"; + sha256 = "0d10lci5wf84wlixxqnrhn3frl735s5jmzg2yz2l79h37k84xydl"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -8120,12 +8120,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-10-26"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "8f302c9a05ff53fc3f891cbf09c5f959b10392a3"; - sha256 = "1nvq4zridnz0pr9j9ivcl4b5w8srli8szhjy6ry22vw9c5xllzx3"; + rev = "3ba683827c623affb4d9aa518e97b34db2623093"; + sha256 = "043rchc7qbn65b7wfgvp6fdg67xijgd3i3jfm82i1rha7dlymb41"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -8744,12 +8744,12 @@ final: prev: vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2022-09-26"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "cc5d3490c8f4c87d29d97df414941a9df8ceb390"; - sha256 = "13lslv7rr3ixcjgkklds2zsk9b0p9sx9lpl3fwzdnkcgh1x91vn8"; + rev = "5552f5e9aa1db1b8d588b9a645a88394452d2b05"; + sha256 = "0bzspa5mrhs52x9q6kxkwbxvqg79myim15jg35rf517sraga5v8s"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -9824,12 +9824,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-10-30"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "20cbfc777b783fd93259c83c96eef4a35c6ddbcd"; - sha256 = "02zwq4hq7zpqhmkir16bms8agvydc6fy51sgw6ycqib0hvsb34cd"; + rev = "280b34a0760801168a67f952542b6c49292aa5f3"; + sha256 = "19hb8bqkk6iqy8lm4gs6kiiw6igjjyvazw9fx6gnmf86pkajk3cw"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -10341,12 +10341,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-11-01"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "7a4eccd0fffe8b5dd14ad0d0400d3eab6d80c4b3"; - sha256 = "0a0d16vjr23a3q6mmz653xn1hmnd7h8dbkldvmsr4dx0spqfydp8"; + rev = "fb83d835eac50baeef49aac20c524a80727db0ac"; + sha256 = "0xk5hhsb3gv3yrfcr3gnxj9g9bcdab8nlfi06q5c7nqgy4fryp6n"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10810,12 +10810,12 @@ final: prev: vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2022-10-31"; + version = "2022-11-02"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "88ad116a4b2b4777ce4d0ecf214963a0c9b4fd06"; - sha256 = "07mhpr326rjfh47izx4c9hdkb5zhpbl01k0h4bbi1lxbzvsxgs9k"; + rev = "5d416e84d024538f5e5cf25c394d081802f0a35e"; + sha256 = "13filvmaxr0dvc44f3ah80g8jhkrn3rqkwqj1a7wxjv6a6xa083z"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -12854,12 +12854,12 @@ final: prev: pname = "vim-yapf"; version = "2018-10-04"; src = fetchFromGitHub { - owner = "mindriot101"; + owner = "simonrw"; repo = "vim-yapf"; rev = "b0c31bd73a6d1026765e659bd0a62c625ec057ad"; sha256 = "0ncv6kjyywljsq5fz71rkmgmqxm7msyscgndnj055bnx5sh9wk80"; }; - meta.homepage = "https://github.com/mindriot101/vim-yapf/"; + meta.homepage = "https://github.com/simonrw/vim-yapf/"; }; vim2hs = buildVimPluginFrom2Nix { @@ -13021,12 +13021,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-10-31"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "e148cf1fdc817b6668263817634538d09bafd115"; - sha256 = "15iikf6w8x75g7wjdp469rsxraz883387cxlahc0zsl0bdbylv5q"; + rev = "06c47edcc2c44c1ca87a2c04a411cf0c0bd39a14"; + sha256 = "0gkq4j2cwc6a4mhhyd3ivkc5qj6m9p4jg469za4v5g1v59w22pch"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13382,11 +13382,11 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-10-31"; + version = "2022-11-03"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c4f0f1a88304378cb76ac0a0c00a99f6d58f972f"; + rev = "72540852ca00d7842ea1123635aecb9353192f0b"; sha256 = "0mb3qhg5aaxvkc8h95sbwg5nm89w719l9apymc5rpmis4r0mr5zg"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; @@ -13406,12 +13406,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-11-01"; + version = "2022-11-04"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d7b2c15268ffbb4dedebbda34b702c89b2cd782a"; - sha256 = "1r53lz0vmfii82mchh0hlzs0zg7d7sjxiihv2bwlapwzwmdp2n4k"; + rev = "5ec88a8374cd7e2564ffeaa27f82dd75229312d2"; + sha256 = "1swic358xzzmw0pxp7x2r35yf70ivbg83fljk8p3qi7s9pr0ngr8"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index e818eff764a86..528baaaa37712 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -25,12 +25,12 @@ }; bash = buildGrammar { language = "bash"; - version = "f1a86d3"; + version = "77cf8a7"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "f1a86d3cc5aeeb67e0e52442e893af7f813025b4"; - hash = "sha256-zzHA+kGw67WFyPVFRWRyKmhAjxp5jkv0K2yhGxNfFM4="; + rev = "77cf8a7cab8904baf1a721762e012644ac1d4c7b"; + hash = "sha256-UPMJ7iL8Y0NkAHtPDrkTjG1qFwr8rXuGqvsG+LTWqEY="; }; }; beancount = buildGrammar { @@ -503,12 +503,12 @@ }; help = buildGrammar { language = "help"; - version = "8df3266"; + version = "49cdef5"; source = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "8df3266b423d24c9ac3f3b4b9928e65eb1e5e741"; - hash = "sha256-t9SHuymK5pYlryWGpORGPYLgPZ3xBx0XH69s5RtRnEI="; + rev = "49cdef52ded4a886bf34bc474876b09f9270d48f"; + hash = "sha256-szNY2yw5i9pgF+MpaEAkP8BgSYEe6nrFW+17sbSZ6Yc="; }; }; hjson = buildGrammar { @@ -633,22 +633,22 @@ }; julia = buildGrammar { language = "julia"; - version = "0572ceb"; + version = "8fb38ab"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "0572cebf7b8e8ef5990b4d1e7f44f0b36f62922c"; - hash = "sha256-hN3wZJa7oXEUgdJfN0o2EoTYBsE1UZjGYfFYlGjjvO8="; + rev = "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25"; + hash = "sha256-G619Zlb2uL2PskYKNqoG6XXBxRipeGFU4eOLw7u3BRo="; }; }; kotlin = buildGrammar { language = "kotlin"; - version = "a4f71eb"; + version = "b953dbd"; source = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "a4f71eb9b8c9b19ded3e0e9470be4b1b77c2b569"; - hash = "sha256-aRMqhmZKbKoggtBOgtFIq0xTP+PgeD3Qz6DPJsAFPRQ="; + rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28"; + hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY="; }; }; lalrpop = buildGrammar { @@ -693,12 +693,12 @@ }; lua = buildGrammar { language = "lua"; - version = "887dfd4"; + version = "fb30e8c"; source = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "887dfd4e83c469300c279314ff1619b1d0b85b91"; - hash = "sha256-5i+UN6Es+K7KDD1qz3ZrVn8IfGdTswcISUyV2sGtY9M="; + rev = "fb30e8cb605e2ebd6c643e6981325a63fbbde320"; + hash = "sha256-gT2WHH3rkFzb6iER0ryVU7bqVbh36RbTI9HSWMh3DsI="; }; }; m68k = buildGrammar { @@ -731,7 +731,6 @@ hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; }; location = "tree-sitter-markdown"; - }; markdown_inline = buildGrammar { language = "markdown_inline"; @@ -743,7 +742,6 @@ hash = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; }; location = "tree-sitter-markdown-inline"; - }; menhir = buildGrammar { language = "menhir"; @@ -815,7 +813,6 @@ hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM="; }; location = "ocaml"; - }; ocaml_interface = buildGrammar { language = "ocaml_interface"; @@ -827,7 +824,6 @@ hash = "sha256-gTmRBFFCBrA48Yn1MO2mMQPpa6u3uv5McC4BDuMXKuM="; }; location = "interface"; - }; ocamllex = buildGrammar { language = "ocamllex"; @@ -983,12 +979,12 @@ }; racket = buildGrammar { language = "racket"; - version = "b9b2e74"; + version = "69ca563"; source = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "b9b2e7454d7098e44595dd8c1b471b9d1518b910"; - hash = "sha256-DxwbIhyCx+E0kDztPQFBa9x65ssKzsMh7vY+TpP3dTM="; + rev = "69ca563af3bcf9d67220532e0814786f2dc34db1"; + hash = "sha256-GLBi/NM7dFsPtmZWbFm/vM0gOwqbihOqXnxMR5k8hWE="; }; }; rasi = buildGrammar { @@ -1043,12 +1039,12 @@ }; ruby = buildGrammar { language = "ruby"; - version = "252ca18"; + version = "c919603"; source = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "252ca18be76b0918fb6b34c302292b6931876c25"; - hash = "sha256-8UWHLVrSxQM6iT+tN+2PwTs43n+Z69c0DVnDE3yfqKo="; + rev = "c91960320d0f337bdd48308a8ad5500bd2616979"; + hash = "sha256-zUNs7s7SLGLU4h08FHLUA3YhbhRotMQVqk+zG9bmtjE="; }; }; rust = buildGrammar { @@ -1123,12 +1119,12 @@ }; sql = buildGrammar { language = "sql"; - version = "2743c7b"; + version = "70c5026"; source = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "2743c7b5e710e6854d4e8c14c302548b436e2a1f"; - hash = "sha256-lhQxFXphS97tITDosG/pGe85osV4CweW44ulmCd+CxQ="; + rev = "70c50264ae022193adb364ffa7a767d765ed9857"; + hash = "sha256-0HlkjL+Wy82SmVLSPXL7o3Y3l/zSDaPeBygLSvdCRZs="; }; }; supercollider = buildGrammar { @@ -1163,14 +1159,14 @@ }; swift = buildGrammar { language = "swift"; - version = "c88b5d7"; + version = "d7808f0"; source = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; nativeBuildInputs = [ nodejs tree-sitter ]; postFetch = "pushd $out && tree-sitter generate && popd"; - rev = "c88b5d73f193f5b0762b1a5f0299a275e6a728fb"; - hash = "sha256-OfFMGxL72SPZW4AtHoThhYtjmKWabStLKAB9TxmjMDw="; + rev = "d7808f030a44dc8768948042baa7566949785e2f"; + hash = "sha256-7Gjpf2isOpeOV3ZMTMibK+F4C4v8ywOPin2Wv86s+AM="; }; }; sxhkdrc = buildGrammar { @@ -1245,7 +1241,6 @@ hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; }; location = "tsx"; - }; turtle = buildGrammar { language = "turtle"; @@ -1259,12 +1254,12 @@ }; twig = buildGrammar { language = "twig"; - version = "6a01f20"; + version = "035f549"; source = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; - rev = "6a01f20e73038300d205d370212c361949be3035"; - hash = "sha256-M+57mGl4Sgn0yUGAyxHxE6ShR+E/ki4m8/x/f/KHetA="; + rev = "035f549ec8c043e734f04341d7ccdc669bb2ba91"; + hash = "sha256-XSE0E6a9o+WpvmMIXHu0N89VqzaIk9eFHofKAPHtT20="; }; }; typescript = buildGrammar { @@ -1277,7 +1272,6 @@ hash = "sha256-Nx+K7Ic/ePKAXPIMlrRn6zELYE59f/FnnZ/LM5ELaU8="; }; location = "typescript"; - }; v = buildGrammar { language = "v"; @@ -1289,7 +1283,6 @@ hash = "sha256-d1NeZixsN9992Q1UC5ZKGN4LNxlsvdL91QW2K8d1J9Y="; }; location = "tree_sitter_v"; - }; vala = buildGrammar { language = "vala"; @@ -1313,12 +1306,12 @@ }; vim = buildGrammar { language = "vim"; - version = "9736af8"; + version = "4ae7bd6"; source = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; - rev = "9736af8ef0a7f20b4c45f6474342c8f5b473e2cc"; - hash = "sha256-cptSrA+EOfntdW9V8qt3pg3PUK7uSwex7OS4XVnwItI="; + rev = "4ae7bd67706d7e10afed827ce2ded884ab41650f"; + hash = "sha256-5gNqs6ykt2m48ghFv9y5OxsHDPTWRicdT9eR+DDiXiA="; }; }; vue = buildGrammar { @@ -1363,12 +1356,12 @@ }; zig = buildGrammar { language = "zig"; - version = "b1803f2"; + version = "d90d38d"; source = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; - rev = "b1803f2a665d228f968a831eac4fcc07a377c7bc"; - hash = "sha256-WLfecfqwCNh/IPPfmZ55XgsY6cLv62ad0Xhh9pUW3nw="; + rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; + hash = "sha256-vdfXC9PUyv4YynfrKi7M708zFbNIV6AERBd63/EAp1A="; }; }; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index f34fd25e8de77..2b8ba7616ae62 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -3,11 +3,31 @@ self: super: let - builtGrammars = callPackage ./generated.nix { + generatedGrammars = callPackage ./generated.nix { buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { }; }; - allGrammars = lib.filter lib.isDerivation (lib.attrValues builtGrammars); + generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; + + # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins` + # for example, for ocaml_interface, the following aliases will be added + # ocaml-interface + # tree-sitter-ocaml-interface + # tree-sitter-ocaml_interface + builtGrammars = generatedGrammars // lib.listToAttrs + (lib.concatLists (lib.mapAttrsToList + (k: v: + let + replaced = lib.replaceStrings [ "_" ] [ "-" ] k; + in + map (lib.flip lib.nameValuePair v) + ([ ("tree-sitter-${k}") ] ++ lib.optionals (k != replaced) [ + replaced + "tree-sitter-${replaced}" + ])) + generatedDerivations)); + + allGrammars = lib.attrValues generatedDerivations; # Usage: # pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ]) @@ -34,5 +54,7 @@ in withAllGrammars = withPlugins (_: allGrammars); }; + + meta.maintainers = with lib.maintainers; [ figsoda ]; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 6c35476d60698..dd88d74e8f17a 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -4,10 +4,10 @@ import json import re import subprocess -from os import getenv +from os import environ from os.path import dirname, join -lockfile = json.load(open(join(getenv("NVIM_TREESITTER"), "lockfile.json"))) +lockfile = json.load(open(join(environ["NVIM_TREESITTER"], "lockfile.json"))) configs = json.loads( subprocess.check_output( @@ -98,8 +98,7 @@ def generate_grammar(item): location = info.get("location") if location: generated += f""" - location = "{location}"; -""" + location = "{location}";""" generated += """ }; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2abac72a3025c..0aeb0816bef4e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1244,10 +1244,16 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.46.6822"; - sha256 = "sha256-L71mC0190ZubqNVliu7es4SDsBTGVokePpcNupABI8Q="; + version = "1.56.7152"; + sha256 = "sha256-9WEvTcVY/yMF00GJVj4h57aWhfBYTSatbw10DjjAaAM="; + }; + meta = with lib; { + description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.copilot"; + homepage = "https://github.com/features/copilot"; + license = licenses.unfree; + maintainers = with maintainers; [ Zimmi48 ]; }; - meta = { license = lib.licenses.unfree; }; }; github-vscode-theme = buildVscodeMarketplaceExtension { @@ -1679,6 +1685,22 @@ let }; }; + maximedenes.vscoq = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "maximedenes"; + name = "vscoq"; + version = "0.3.6"; + sha256 = "sha256-b0gCaEzt5yAj53oLFZSXSD3bum9J1fYes/uf9+OlUek="; + }; + meta = with lib; { + description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=maximedenes.vscoq"; + homepage = "https://github.com/coq-community/vscoq"; + license = licenses.mit; + maintainers = with maintainers; [ Zimmi48 ]; + }; + }; + mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { name = "git-graph"; @@ -2465,8 +2487,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.10.1"; - sha256 = "sha256-FeYkSML6QYtuIHIbAovOqlPwkKfNkHr7IdMCWwkynQ0="; + version = "2.11.0"; + sha256 = "sha256-ZYbkCe/FdSxmipV9TTq0AF/Ft01+LTUeo3sVyKMP3iQ="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; 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 ab3403852409b..a427c1f8764aa 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix @@ -7,8 +7,8 @@ in buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2022.5.1001411044"; - sha256 = "0z6i7a5sba42yc2inp3yvw6lm6m0kings2iv18h4d6zyhm2lb61p"; + version = "2022.9.1202862440"; + sha256 = "sha256-0F6eTEXt0PJY0+1o/qZEuUcD9sjHSnUrI1OS4IO2WLc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix index e72c89511aedb..00121d29a34f8 100644 --- a/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -19,8 +19,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2022.15.12711056"; - sha256 = "sha256-bksUMN+ZdkmElVD8BC4ihklQyWlKkcpep2VOwUzISnQ="; + version = "2022.17.13011006"; + sha256 = "sha256-f5vbXcqKwCnL+vsTcOX7rWUfoXNih5ZaWr3XUpCYB/M="; }; buildInputs = [ icu ]; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 637aefc3074dd..337db00d6c5d5 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0cf6zlwslii30877p5vb0varxs6ai5r1g9wxx1b45yrmp7rvda91"; - x86_64-darwin = "0j9kb7j2rvrgc2dzxhi1nzs78lzhpkfk3gcqcq84hcsga0n59y03"; - aarch64-linux = "1bf2kvnd2pz2sk26bq1wm868bvvmrg338ipysmryilhk0l490vcx"; - aarch64-darwin = "1rwwrzabxgw2wryi6rp8sc1jqps54p7a3cjpn4q94kds8rk5j0qn"; - armv7l-linux = "0p2kwfq74lz43vpfh90xfrqsz7nwgcjsvqwkifkchp1m3xnil742"; + x86_64-linux = "1dcp6r78kaq3wzcw7dfra59kfpdzqy9qnlyp1ywayxh610ryjyfc"; + x86_64-darwin = "0ypxjh5z0v83y0wb22m942qqlvx5df7k4dk8ip9wqd4p7h8540q8"; + aarch64-linux = "1qq4zg0j3rpx06cqaic7a1x7ckk5wf8w1gp5y8hwhvkym4s8g4i7"; + aarch64-darwin = "18hrsvr7hgmlpi64dbk581i516my6c5zwz6g8awp4fhxilk0wbrg"; + armv7l-linux = "1y357ci4gllxg26m5qdv9652i5rra5vj972l7kdnxiimfgm6h83b"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.72.2"; + version = "1.73.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 74c28ad41b2b9..0ce6b8f994687 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0bc95mdl19la63yvqrpfcvq9sx68wfv60a3xrz2z5lk308khfpr6"; - x86_64-darwin = "0qb8610ilf69j0zl7z031bmqdsxsj15w1maz7lx0z09yrdyvgi7c"; - aarch64-linux = "157arn7wsxgh3qr4bzhy75y7zw9qwz1zch7ny36kr53135d2nhz6"; - aarch64-darwin = "0dwzqv1j1gcjyc1w41f9k1pijazr62r569arh4l53xi7amrp7hx8"; - armv7l-linux = "1lam1z8hqdav4al07d1ahq4qh2npv191n2gqpdxg5b1fs7zv3k85"; + x86_64-linux = "1jp21lnz3vmv4f6crnqbkj6jzr6wl5h2ibniki7azamaqxy51ipi"; + x86_64-darwin = "1msngvngcfhc3zmi2vfg5bgrhmj9ml4pyd9lpr7dpcxycswvifw7"; + aarch64-linux = "17l4w4vvvninyhyiwkkqhz7nhm68wj7diwwn9sh54x71dmwcqlcs"; + aarch64-darwin = "102vciba35sma1810bvnr5xa9qaf0fbvrg8blqchy77gydcrnj8b"; + armv7l-linux = "0ihbqy5wda1326nhqgckz26icr9inwk1pvspvpmg221y279s3iwp"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.72.2.22289"; + version = "1.73.0.22306"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 8ab669afee007..2e7b99f4c607a 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-10"; + version = "2.0-13"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-GJA/lJJqShuHeYirBW1kyVsU44kMpmAn916PSGOnKkY="; + hash = "sha256-0yomEJoXMKZV2PAjINegSvtDB6gbYxQ6XcXA60/ZkEM="; }; patches = [ diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 3fd7a488e40b5..fc940cfce3018 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -3,11 +3,11 @@ , lib , fetchurl # native -, autoreconfHook +, cmake , pkg-config # not native , gdal -, wxGTK31 +, wxGTK32 , proj , dxflib , curl @@ -31,24 +31,20 @@ mkDerivation rec { pname = "saga"; - version = "7.9.1"; + version = "8.4.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-Jq1LhBSeJuq9SlNl/ko5I8+jnjZnLMfGYNNUnzVWo7w="; + sha256 = "sha256-v6DPwV20fcsznrEaFJk0/ewU4z3cTjzYYuLkyMwSLV0="; }; + sourceRoot = "saga-${version}/saga-gis"; + nativeBuildInputs = [ - # Upstream's gnerated ./configure is not reliable - autoreconfHook + cmake pkg-config ]; - configureFlags = [ - "--with-system-svm" - # hdf is no detected otherwise - "HDF5_LIBS=-l${hdf5}/lib" - "HDF5_CFLAGS=-I${hdf5.dev}/include" - ]; + buildInputs = [ curl dxflib @@ -56,7 +52,7 @@ mkDerivation rec { libsvm hdf5 gdal - wxGTK31 + wxGTK32 proj libharu opencv @@ -77,9 +73,9 @@ mkDerivation rec { sqlite ]; - enableParallelBuilding = true; - - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; + cmakeFlags = [ + "-DOpenMP_SUPPORT=${if stdenv.isDarwin then "OFF" else "ON"}" + ]; meta = with lib; { description = "System for Automated Geoscientific Analyses"; diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 94c948c1c4ea7..8fa12be3a8b60 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -2,10 +2,16 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, - kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools, - signond, xz, + kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, + postgresql, qttools, signond, xz, + + mysqlSupport ? true, + postgresSupport ? false, + defaultDriver ? if mysqlSupport then "MYSQL" else "POSTGRES", }: +assert mysqlSupport || postgresSupport; + mkDerivation { pname = "akonadi"; meta = { @@ -26,17 +32,19 @@ mkDerivation { propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; CXXFLAGS = [ - ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mariadb}/bin/mysqld\"'' - ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mariadb}/bin/mysqladmin\"'' - ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mariadb}/bin/mysql_install_db\"'' - ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mariadb}/bin/mysqlcheck\"'' - ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' - ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' - ''-DNIXPKGS_POSTGRES_INITDB=\"\"'' + ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqld"}\"'' + ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqladmin"}\"'' + ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysql_install_db"}\"'' + ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqlcheck"}\"'' + ''-DNIXPKGS_POSTGRES_PG_CTL=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_ctl"}\"'' + ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_upgrade"}\"'' + ''-DNIXPKGS_POSTGRES_INITDB=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/initdb"}\"'' ''-DNIX_OUT=\"${placeholder "out"}\"'' ''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory ]; + cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}"; + # compatibility symlinks for kmymoney, can probably be removed in next kde bump postInstall = '' ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 89223b2262826..85579f0521961 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.24.3"; + version = "1.24.4"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-zwAmMj9Px27e/xJPAsOUh4saCZNQYBdse0bcZu8M3xA="; + sha256 = "sha256-YO0K8L03n/KQcINRKwls8BxG8nv5k3Myd95AU8agigI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 049bada253c17..accfcfa2c2371 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "calibre"; - version = "6.7.1"; + version = "6.8.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-B//rBsvOXA5UqGjd2MLcAhDFCvreI7UmtfEpuxaIsa0="; + hash = "sha256-d9JaWjAjJzKldjyrdrl6OyX1JSatp9U8agRog7K5n2s="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index b9df45b482d52..d596a2444667b 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -5,7 +5,8 @@ , enableDdc ? true, ddcutil , enableDpms ? true, libXext , enableGamma ? true, libdrm, libXrandr, wayland -, enableScreen ? true }: +, enableScreen ? true +, enableYoctolight ? true }: stdenv.mkDerivation rec { pname = "clightd"; @@ -33,10 +34,11 @@ stdenv.mkDerivation rec { "-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d" # systemd.pc has prefix=${systemd.out} "-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d" - ] ++ optional enableDdc "-DENABLE_DDC=1" - ++ optional enableDpms "-DENABLE_DPMS=1" - ++ optional enableGamma "-DENABLE_GAMMA=1" - ++ optional enableScreen "-DENABLE_SCREEN=1"; + ] ++ optional enableDdc "-DENABLE_DDC=1" + ++ optional enableDpms "-DENABLE_DPMS=1" + ++ optional enableGamma "-DENABLE_GAMMA=1" + ++ optional enableScreen "-DENABLE_SCREEN=1" + ++ optional enableYoctolight "-DENABLE_YOCTOLIGHT=1"; nativeBuildInputs = [ dbus diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index 4e03059a8cc4a..5cfb8c7039eb6 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dstask"; - version = "0.23.1"; + version = "0.25"; src = fetchFromGitHub { owner = "naggie"; repo = pname; rev = "v${version}"; - sha256 = "0rfz8jim0xqcwdb5n28942v9r3hbvhjrwdgzvbwc9f9psqg2s8d2"; + sha256 = "sha256-nsEn9ZhrSWO0kltyEXaehMcFpqVbivSsXOxu/AX7A9U="; }; # Set vendorSha256 to null because dstask vendors its dependencies (meaning @@ -30,8 +30,6 @@ buildGoModule rec { "-X github.com/naggie/dstask.GIT_COMMIT=v${version}" ]; - subPackages = [ "cmd/dstask.go" ]; - meta = with lib; { description = "Command line todo list with super-reliable git sync"; homepage = src.meta.homepage; diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 0d01122e6a5ff..f1df7445fbe0a 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.15"; + version = "3.0.16"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-QeUopHBW3KZGkYklOJIjlNCQG+aab2vwbIsVBfQ07R4="; + hash = "sha256-hL4Ytu9zf8x+H/TuvJ3m0E3d8gMZFIDogWEYlaOap+g="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/applications/misc/gnome-extension-manager/default.nix index bcc66b19cf2b2..28a4fa84caeb1 100644 --- a/pkgs/applications/misc/gnome-extension-manager/default.nix +++ b/pkgs/applications/misc/gnome-extension-manager/default.nix @@ -54,9 +54,6 @@ stdenv.mkDerivation rec { text-engine ]; - # See https://github.com/NixOS/nixpkgs/issues/36468. - mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - meta = with lib; { description = "Desktop app for managing GNOME shell extensions"; homepage = "https://github.com/mjakeman/extension-manager"; diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index 2f33bb9935d23..f4c7869f152c7 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mangal"; - version = "3.14.2"; + version = "4.0.1"; src = fetchFromGitHub { owner = "metafates"; repo = pname; rev = "v${version}"; - hash = "sha256-W3oToI7frUfd3zwtr3UpbwAWzCVxDaZY9zhn8dO/4wA="; + hash = "sha256-pMiZgO/+koyIDm7ONZn0qEq+d6HeFfQFaU1Qjovqmc4="; }; proxyVendor = true; diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index a463f6e3eecb7..3108d78e8ff8b 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "4.2.1"; + version = "4.3.1"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cDX6XiAPFIS/csVpRl7yyAexiZwjmxp1Ng9gAo1uUw8="; + sha256 = "sha256-Utpv9VdX5vuUWDSGc3YcF8tHbvUZpPeXEDP4NKts+vI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index ba82f2518c5ce..bc6a4817087c1 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -9,7 +9,7 @@ , gtkmm3 , pcre , swig -, antlr4_8 +, antlr4_9 , sudo , mysql , libxml2 @@ -23,7 +23,7 @@ , libzip , libsecret , libssh -, python2 +, python3 , jre , boost , libsigcxx @@ -43,14 +43,14 @@ }: let - inherit (python2.pkgs) paramiko pycairo pyodbc; + inherit (python3.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.21"; + version = "8.0.30"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "0rqgr1dcbf6yp60hninbw5dnwykx5ngbyhhx0sbhgv0m0cq5a44h"; + sha256 = "d094b391760948f42a3b879e8473040ae9bb26991eced482eb982a52c8ff8185"; }; patches = [ @@ -67,6 +67,7 @@ in stdenv.mkDerivation rec { nohup = "${coreutils}/bin/nohup"; rm = "${coreutils}/bin/rm"; rmdir = "${coreutils}/bin/rmdir"; + stat = "${coreutils}/bin/stat"; sudo = "${sudo}/bin/sudo"; }) @@ -78,10 +79,12 @@ in stdenv.mkDerivation rec { }) ]; - # have it look for 4.7.2 instead of 4.7.1 + # 1. have it look for 4.9.3 instead of 4.9.1 + # 2. for some reason CMakeCache.txt is part of source code preConfigure = '' substituteInPlace CMakeLists.txt \ - --replace "antlr-4.7.1-complete.jar" "antlr-4.8-complete.jar" + --replace "antlr-4.9.1-complete.jar" "antlr-4.9.3-complete.jar" + rm -f build/CMakeCache.txt ''; nativeBuildInputs = [ @@ -97,8 +100,8 @@ in stdenv.mkDerivation rec { gtk3 gtkmm3 libX11 - antlr4_8.runtime.cpp - python2 + antlr4_9.runtime.cpp + python3 mysql libxml2 libmysqlconnectorcpp @@ -143,10 +146,10 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" - "-DWITH_ANTLR_JAR=${antlr4_8.jarLocation}" # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8. # Newer versions of connector still provide the legacy library when enabled # but the headers are in a different location. + "-DWITH_ANTLR_JAR=${antlr4_9.jarLocation}" "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc" ]; @@ -156,7 +159,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${python2}/bin" + --prefix PATH : "${python3}/bin" --prefix PROJSO : "${proj}/lib/libproj.so" --set PYTHONPATH $PYTHONPATH ) diff --git a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch index dddf992e4c120..a90075210cf69 100644 --- a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch +++ b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch @@ -1,6 +1,7 @@ ---- a/frontend/linux/workbench/mysql-workbench.in -+++ b/frontend/linux/workbench/mysql-workbench.in -@@ -99,8 +99,8 @@ +diff -u -r a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in +--- a/frontend/linux/workbench/mysql-workbench.in 2022-03-25 09:06:06.000000000 +0200 ++++ b/frontend/linux/workbench/mysql-workbench.in 2022-06-17 00:22:51.290117109 +0300 +@@ -100,8 +100,8 @@ if test "$WB_DEBUG" != ""; then $WB_DEBUG $MWB_BINARIES_DIR/mysql-workbench-bin "$@" else @@ -11,8 +12,9 @@ else $MWB_BINARIES_DIR/mysql-workbench-bin "$@" fi ---- a/plugins/migration/frontend/migration_bulk_copy_data.py -+++ b/plugins/migration/frontend/migration_bulk_copy_data.py +diff -u -r a/plugins/migration/frontend/migration_bulk_copy_data.py b/plugins/migration/frontend/migration_bulk_copy_data.py +--- a/plugins/migration/frontend/migration_bulk_copy_data.py 2022-03-25 09:06:06.000000000 +0200 ++++ b/plugins/migration/frontend/migration_bulk_copy_data.py 2022-06-17 00:13:29.430055453 +0300 @@ -110,7 +110,7 @@ return 'sh' @@ -34,7 +36,7 @@ @@ -417,7 +417,7 @@ with open(script_path, 'w+') as f: - os.chmod(script_path, 0700) + os.chmod(script_path, 0o700) - f.write('#!/bin/bash\n\n') + f.write('#!/usr/bin/env bash\n\n') f.write('MYPATH=`pwd`\n') @@ -43,14 +45,15 @@ @@ -521,7 +521,7 @@ with open(script_path, 'w+') as f: - os.chmod(script_path, 0700) + os.chmod(script_path, 0o700) - f.write('#!/bin/bash\n\n') + f.write('#!/usr/bin/env bash\n\n') f.write('MYPATH=`pwd`\n') f.write("arg_source_password=\"<put source password here>\"\n") ---- a/plugins/wb.admin/backend/wb_server_control.py -+++ b/plugins/wb.admin/backend/wb_server_control.py +diff -u -r a/plugins/wb.admin/backend/wb_server_control.py b/plugins/wb.admin/backend/wb_server_control.py +--- a/plugins/wb.admin/backend/wb_server_control.py 2022-03-25 09:06:06.000000000 +0200 ++++ b/plugins/wb.admin/backend/wb_server_control.py 2022-06-17 00:14:26.937905324 +0300 @@ -39,7 +39,7 @@ UnixVariant = { @@ -60,8 +63,9 @@ } } ---- a/plugins/wb.admin/backend/wb_server_management.py -+++ b/plugins/wb.admin/backend/wb_server_management.py +diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin/backend/wb_server_management.py +--- a/plugins/wb.admin/backend/wb_server_management.py 2022-03-25 09:06:06.000000000 +0200 ++++ b/plugins/wb.admin/backend/wb_server_management.py 2022-06-17 00:18:58.034028354 +0300 @@ -40,7 +40,7 @@ def reset_sudo_prefix(): @@ -89,7 +93,19 @@ return command -@@ -896,9 +896,9 @@ +@@ -878,9 +878,9 @@ + @useAbsPath("path") + def get_file_owner(self, path, as_user = Users.CURRENT, user_password = None): + if self.target_os == wbaOS.linux: +- command = 'LC_ALL=C stat -c %U ' ++ command = 'LC_ALL=C @stat@ -c %U ' + else: +- command = 'LC_ALL=C /usr/bin/stat -f "%Su" ' ++ command = 'LC_ALL=C @stat@ -f "%Su" ' + + output = io.StringIO() + command = command + quote_path(path) +@@ -904,9 +904,9 @@ if as_user == Users.CURRENT: raise PermissionDeniedError("Cannot set owner of directory %s" % path) else: @@ -101,43 +117,43 @@ res = self.process_ops.exec_cmd(command, as_user = as_user, -@@ -927,7 +927,7 @@ +@@ -935,7 +935,7 @@ @useAbsPath("path") def remove_directory(self, path, as_user = Users.CURRENT, user_password = None): - output = StringIO.StringIO() + output = io.StringIO() - res = self.process_ops.exec_cmd('/bin/rmdir ' + quote_path(path), + res = self.process_ops.exec_cmd('@rmdir@ ' + quote_path(path), as_user = as_user, user_password = user_password, output_handler = output.write, -@@ -940,7 +940,7 @@ +@@ -948,7 +948,7 @@ @useAbsPath("path") def remove_directory_recursive(self, path, as_user = Users.CURRENT, user_password = None): - output = StringIO.StringIO() + output = io.StringIO() - res = self.process_ops.exec_cmd('/bin/rm -R ' + quote_path(path), + res = self.process_ops.exec_cmd('@rm@ -R ' + quote_path(path), as_user = as_user, user_password = user_password, output_handler = output.write, -@@ -953,7 +953,7 @@ +@@ -961,7 +961,7 @@ @useAbsPath("path") def delete_file(self, path, as_user = Users.CURRENT, user_password = None): - output = StringIO.StringIO() + output = io.StringIO() - res = self.process_ops.exec_cmd("/bin/rm " + quote_path(path), + res = self.process_ops.exec_cmd("@rm@ " + quote_path(path), as_user = as_user, user_password = user_password, output_handler = output.write, -@@ -1001,7 +1001,7 @@ +@@ -1009,7 +1009,7 @@ def _copy_file(self, source, dest, as_user = Users.CURRENT, user_password = None): - output = StringIO.StringIO() + output = io.StringIO() - res = self.process_ops.exec_cmd("LC_ALL=C /bin/cp " + quote_path(source) + " " + quote_path(dest), + res = self.process_ops.exec_cmd("LC_ALL=C @cp@ " + quote_path(source) + " " + quote_path(dest), as_user = as_user, user_password = user_password, output_handler = output.write, -@@ -1077,9 +1077,9 @@ +@@ -1085,9 +1085,9 @@ # for ls -l, the output format changes depending on stdout being a terminal or not # since both cases are possible, we need to handle both at the same time (1st line being total <nnnn> or not) # the good news is that if the line is there, then it will always start with total, regardless of the locale @@ -147,11 +163,11 @@ - command = 'LC_ALL=C /bin/ls -1 -p %s' % quote_path(path) + command = 'LC_ALL=C @ls@ -1 -p %s' % quote_path(path) - output = StringIO.StringIO() + output = io.StringIO() res = self.process_ops.exec_cmd(command, -@@ -2160,9 +2160,9 @@ +@@ -2163,9 +2163,9 @@ def get_range(self, start, end): - f = StringIO.StringIO() + f = io.StringIO() if not self._need_sudo: - ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) @@ -161,7 +177,7 @@ if ret != 0: raise RuntimeError("Could not get data from file %s" % self.path) -@@ -2170,9 +2170,9 @@ +@@ -2173,9 +2173,9 @@ def read_task(self, offset, file): if not self._need_sudo: @@ -173,9 +189,9 @@ # this will signal the reader end that there's no more data file.close() -@@ -2198,9 +2198,9 @@ +@@ -2202,9 +2202,9 @@ self._pos = offset - f = StringIO.StringIO() + f = io.StringIO() if not self._need_sudo: - self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 405d992576da8..8ec18a8748637 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -89,13 +89,13 @@ let in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.7.3"; + version = "3.7.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-odwYUGfgoRrGbLpOh8SuQzYby8Ya6hKSn0rdHp+RS/U="; + sha256 = "sha256-QoVL6WJjX6+sN5S/iqV3kcfQ5fWTXkTnf6NpZcw3bGo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 80a2047b61f84..be770a3021e8b 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.14"; + version = "0.9.15"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-1tnFBUB7/MjnrCkfKOR2SZ/GB5Ik115zsnwjkNMB05E="; + sha256 = "sha256-u2nEMS0lJ/Kf09+mWYWQLji9MVgjYAfUi5bmPEfTfFc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 060c9f53361be..76603241099c6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "108.0.5359.22", - "sha256": "1wwrwqyl9nl4kpkmkybw14ygj5lfrk274yx5f817ha1kpk8vma0y", - "sha256bin64": "0dq3mf1rai7i3aqq9h8g4iy9nxy3hbb6gd86c31admxygdpgpds5", + "version": "108.0.5359.30", + "sha256": "1sxvlmz9k6r3qmlpljlis3p7vac26k62w21n8x29733hsq3hdra7", + "sha256bin64": "03x79s394xzwncfcgc4lw825q15i1ww2kmy2y7lcld9h52qyns8q", "deps": { "gn": { "version": "2022-10-05", @@ -32,15 +32,15 @@ } }, "dev": { - "version": "109.0.5384.0", - "sha256": "195lbklp5c6bvfzhdvah4k2yr44jwy64499y37kgxky0mb79a26n", - "sha256bin64": "02qbwj9gfcgxdqm1mhxg0mljvrhnl994lhis615y23099r3r67i8", + "version": "109.0.5396.2", + "sha256": "0a4pd365i8wj608n9d6624mf11491px1x0wv4673m3nkj1k8sqld", + "sha256bin64": "1gk7wi20h11bwsfch67xazjk9grxj6ax6vjyz7ihrlajdahdaf0w", "deps": { "gn": { - "version": "2022-10-26", + "version": "2022-10-28", "url": "https://gn.googlesource.com/gn", - "rev": "3e98c606ed0dff59fa461fbba4892c0b6de1966e", - "sha256": "08cz58svkb7c71f1x1ahr60a6ircr31rfmkk4d46z2v39sgry1gv" + "rev": "a4d67be044b42963de801001e7146f9657c7fad4", + "sha256": "0wikkkx503ip5xr72bz6d6sh2k50h5wlz9y8vmasvnrz9kjmlv5b" } } }, diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index d0de63cdb46cc..ea737bb8c03cd 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "107.0b5"; + version = "107.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ach/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ach/firefox-107.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "119ae15a06680b8a887179ae2aa860cb7bf1e7f9d86dd39c9e954e8c044e4139"; + sha256 = "916b0ed984631143bf212276a7156285f012fabc565ac92f5eaf67e496198be3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/af/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/af/firefox-107.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9eeeddee9c798aa23d51cb35233781789c1c37c8135ac7a12a21d566176c8b52"; + sha256 = "a48eeff2b0aa3331c807bc78daf073850e768f270a99d7043f90e218655cfd41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/an/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/an/firefox-107.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "1bc134891cf85c62fa8053091b1e011f52e794e04ea28b18847c3094df56e226"; + sha256 = "522103b5f8f726492f634d46cd939581da4d2583b21718c46e4e985b2811967f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ar/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ar/firefox-107.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "dd3901f63decfe8610cb35f9364c539c68eabe95dbe8c3450f0cbef658e51462"; + sha256 = "22ddbcabedd2c0a4ee19a89296bb5751c7224906b7f52e6ffaef4de2a2ef904c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ast/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ast/firefox-107.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "97c8fa4566fd5da773c9a05be96a80bad6232a4387ecac7dc996e3b073ed57d5"; + sha256 = "4fabe235071114f0489350d67da45300f4dde032e6ac99f667e10b2b5d499717"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/az/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/az/firefox-107.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8a3aec520840bc10a5609ba70b64af0bdc45869a0a9dc9e98efd06a7aff07225"; + sha256 = "53f3d762f228cd54298389e6da77da4b1ccf59d1f79feeb86cd687bfe12c37b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/be/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/be/firefox-107.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "11226933a768e7c6d4e29b2ce02117cbd44ef21b717011cec541cbefb38fcb95"; + sha256 = "24ac93f0c4060acd2700468ffd976688350cd25f3ee8cb412b29ddf9d4573d70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/bg/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/bg/firefox-107.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "529cd4bf8d0f9f73ce3f072e61ac135a9ce59b90cdb525a260068f7758ee35db"; + sha256 = "182e53f5d99aa47ca4654c65466eb5a176d9ab2238ad5ec49009f12f8d6be90f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/bn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/bn/firefox-107.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "660d574697be9e4daf64fa060cdaf853a341658733568ce9c5a12b9ec6a428d5"; + sha256 = "b7d814f3642bcf2de19945262a073fb2de75117dc7dfe6bb0bcbace4f71e0082"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/br/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/br/firefox-107.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "41aaec12b39182ab56372699fc78176f67fb6f3393e1573ab711376a2bdf14f0"; + sha256 = "06e0003e56f5e3b990330b0657c9ec6293275f51060b33b5344f97bd84587d91"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/bs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/bs/firefox-107.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "22d5973f54097c117491f913eb9dcbbb40ad6c8da44818bc473e188c84fe4524"; + sha256 = "6c1baecf2e14fceec17c564e5c6427250e664701187b0d345d5923c7a4febf52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ca-valencia/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ca-valencia/firefox-107.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "df1b43c8fe7d682a3f2717bb96fdca079899b4652970d022ec277d37f23977b5"; + sha256 = "c6c0f70ebb040af59fcdd3be133cc9d0b954acebe7db0931c28602544dd63c04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ca/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ca/firefox-107.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "18412569495ef08b98657785016a0a96329cf7d1911416ec9bde1b163905c193"; + sha256 = "5d6a6825f7ce0f46f298df44a86e14fc9b7504d2ac9027a233a7066487a10f00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/cak/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/cak/firefox-107.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "809fd59b8cd7d50602ba8d7db0019205eb351350a98262048cce831e0cd73273"; + sha256 = "140ce93005581452a2b582bd581d6f3c68c14b3b1a0ea20ca165cde601550d95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/cs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/cs/firefox-107.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "c3f5d99870d3021984600ae92d98860ff50648bceeef3fccab3b5ff80abfaceb"; + sha256 = "bcee508da6f541d6046ea6def6d0b23062eb0989238de72b1a2980aab9e98a92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/cy/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/cy/firefox-107.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0f5e022d73fcc64d13e7b82f60dddf5f4aa583a304e9cf2a6c94b9c4c6973420"; + sha256 = "4a391c8a8ebc2b1ec67a75bd2a6c3d03ed09c3885f85d002e9b193627ae571ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/da/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/da/firefox-107.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dff27a5673c3f9daf9279e4ec47d44c52f2358c6427354b5c15131d27d91385a"; + sha256 = "b1f4de3212f794b846f704fad2b867eb23fcafe75b67acb13e7b325452023620"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/de/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/de/firefox-107.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "912bb578b2b4de0ceb652393e6392617568c41e9d6b10f694654c8eff07b80fd"; + sha256 = "d8b573cf4a298c17b341caea41ddc730db9f104d77e6657ba1aca2032823fcfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/dsb/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/dsb/firefox-107.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "16e907bdd37a1866cbbf1cfa42bc2c65fb58e693e4bc728b04e0e7b71b30d716"; + sha256 = "26aac8dc4fe17516bd28e09f7b130baa09096bdd13f61fbb1286face9412d6c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/el/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/el/firefox-107.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3fee70e070bc783e4e8c3d08d0da2e4c8a33bc15755887d76a28fcb49618f44c"; + sha256 = "3559b969de8ab4c969b967e86f7366755e7818b42f58da21922f7b54aa0928b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/en-CA/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/en-CA/firefox-107.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a43e8d6da39a43dfe24d3b859c0ed87723ffaa358476ed971623e5f71e7dd06e"; + sha256 = "8fa9a78cac2213f57288b587637699f6c049908978f5208f6d94cb447195919b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/en-GB/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/en-GB/firefox-107.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "78a0b48db431dbe540c6f2377258346214c83959ade2db738752e46d9172ee41"; + sha256 = "c34ef625ec69b8eba31c945f683e7660367b666ca941acee9ea05a9e126783f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/en-US/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/en-US/firefox-107.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "fa1bf67f6efabb434dcb8d79eb705a1c174028e8bd3fed4dd7e8f91f535116a5"; + sha256 = "35a148113a4a60c42ebf20d9bc378111e2904a174d3d3253696847bef4bb6029"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/eo/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/eo/firefox-107.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0e80925841accdb550445f8e715c22beb62dd6959fe8bd79beef261195cb3a4e"; + sha256 = "8e080d25d13d36897438b3d631d0837827a466463ef564643841bfa8aa232676"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/es-AR/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/es-AR/firefox-107.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "981b2a274c4fb98fd5aa8db6a46e32b1cb6135d3fb6e29a2bc9f40373e916615"; + sha256 = "ee8c991c71b12c31128334388793d56627354376315d23f28dd3f2fffb1c6f32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/es-CL/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/es-CL/firefox-107.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "089f9ab7042544e90f77a8f62e0ab1a9b8a884f55cb2ac65bc23528d217967e8"; + sha256 = "c5ac567848d64d05bf12319a9db3f4a2d58d37d028cbf6afc47596dd13c7317d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/es-ES/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/es-ES/firefox-107.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "17b9a718034e2beac2bc837b175b048583a16a9e40b40c28932e95a4967d1fc5"; + sha256 = "21d68eaa9bb61b2beeff95e0236ac8ca75e9fb862d3498f419fcb9784eb0d9f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/es-MX/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/es-MX/firefox-107.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "244fc0231ef4af5512462349195e80d16c8f594cd7910f3a1a14779a9f8fa7bc"; + sha256 = "d05b4a8fd2fb8cf10e54bbece7219b0b30cfca417f2f23211ad7c57469404753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/et/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/et/firefox-107.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cb7bef3e4305b15045b9788faae79f9147003092efc62af47fa432077ce3e3b2"; + sha256 = "ba44c1cb9c956c1f9737a1755ed8abadda83b81993af6accb7f1a76e6689fe98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/eu/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/eu/firefox-107.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "173beb4de5e796659b76bf37b1d0c9269e8dda9d5e93802b15e31ff41d457e91"; + sha256 = "efdb3940c69f938886a87b64e50628655620304fb6c6b9a30fcc5ccf7859885e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/fa/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/fa/firefox-107.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "df7d9cb45174adb59f6899fa9f0c0aa762ff098fef7f7eaa7433409c1a9fa7ba"; + sha256 = "6f6d56a161858edda75719dcaa1f15f25e272df86fb2130f7260eda1b9502bde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ff/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ff/firefox-107.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "aac7e8c63fecbb5125b219c3e80e52ba9a39b9e21904a5274b98414de7be235b"; + sha256 = "d6b4e7f4580a25df9221f702e849349d30f075ce1e641b8e51fd38ece441dda5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/fi/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/fi/firefox-107.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3e8fd26302b87ca69a9f5c1cf3b8fb193a5db7bdd8d8168050226920c9f34673"; + sha256 = "2ccc881390f10834f56254e6d09cfb4d84c6d315b005164edc558cc84aae434b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/fr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/fr/firefox-107.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "647abc98c374acd83752d724b3c134f2e38483bc239e37abea98c01d7de6a9a6"; + sha256 = "bbd490197ecd58c1acc552b207298866e63c9eb5265faa292cb66e3f0a47ca5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/fy-NL/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/fy-NL/firefox-107.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "57831566ad2b2a7fad89714cb13fcb114dd53f7efa55a9c8eedf044a923ef2fc"; + sha256 = "4924145964040affbdab6dcdd0584cff6e9947d47a294856b6754de8f63ab961"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ga-IE/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ga-IE/firefox-107.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8741c762980720e8560abb904460f9448c633c39ae66325baa704417902abe8d"; + sha256 = "3ad5950439c1b75f9739b98f15cf9cfe7b3f560d14ea2f043252fed980e4a61c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/gd/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/gd/firefox-107.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a70a7febde647b0f26392660b91bf451190f0d5bf57f61711c685e5c62bbdc26"; + sha256 = "30b39cb67ddc81c9b335e071cb7ab9560bf5c3673c903827d84b6300b4b7698a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/gl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/gl/firefox-107.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a09eac1245c10424cbc0bfcbe690cb8b7f0a704d9fca4e5dbcec28c43e9acccf"; + sha256 = "a8f1fbbea0d9b33c48690b52a2a0cf916a014532edfe755364d1c359d2a18108"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/gn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/gn/firefox-107.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "e8cdb36551ab19a752f06443891ec49db4f4e9b99f17a76dc2dc8c76d8fdeee6"; + sha256 = "1a87d7ff4ade4584990b45dfc7e5583989a71565bb6dc6352f44fbabe12cecc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/gu-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/gu-IN/firefox-107.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ddb60f541a3f4694c5f0916412e73d0b11168d31f2d4379603f5afe319dabb8b"; + sha256 = "7890b8d5a268951c26a57b811e3255e604e402d2a3f5a7feb642b22544862bb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/he/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/he/firefox-107.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c6d96d78559a4e18112b56885ecd4f27a7ee616f48b65fabc655d1dbecf38fe8"; + sha256 = "04075d098593a82465e1da0adce02e97b0fdb88cb13447b7e43a1a6944ee7515"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/hi-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hi-IN/firefox-107.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "54dcbbe0f4dc6453d73709679a76a5eb300aba6d8a03c0c06260b602b378ec4b"; + sha256 = "1bf03964dfa3d9061fa24210e63a95b49ae41663a7d194fec1466e139c64ab77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/hr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hr/firefox-107.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7424c168d9509e2172b582ae192fb5ca93ef92b06794cb1b0fa58da41a2adcf2"; + sha256 = "752873792548f2929b366d81fdf4a20c34e45e94543ec270365240203cd465a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/hsb/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hsb/firefox-107.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "df6a847e73e227c8d02f195cf29ca9c11ecf660285ad35ebc1c40ab1d0854366"; + sha256 = "e337cfdcecb149177585c318fd90efe94b16855d04eadb7b9ea69e4953eb91f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/hu/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hu/firefox-107.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ccd6cf06a6a6b1c169a0db362ac59a6b5c1f5abdc80ce914362f876ba62878c6"; + sha256 = "4eec8a031baafcd41fca513a6e06c4c2f238a542792c01b3cb133caced5fea51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/hy-AM/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/hy-AM/firefox-107.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "984de4c384f81abfff02ff423cae38ee2be66e071ca546eb046502c7fbd529e4"; + sha256 = "273a07774d20273c32162fca5450a6de62427de650e5021d95d452a0c98a2599"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ia/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ia/firefox-107.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "b5c3fe9f6c486a97949fb0a772aa5b307eb0eb81ba48b821110e7f8568c82abc"; + sha256 = "004e09524e22bc7998e0029876a200d885dfaf77bff8e94b3b50bef611f08a44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/id/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/id/firefox-107.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1d8ae61323c836956107ec677bfbd34f5a28ec7e80121efb4dbc0cca987f1490"; + sha256 = "ff0b69a160b219116f3e16916f065571190bba24ff79f55dc987a9cddabc79f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/is/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/is/firefox-107.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "703aa9cf101dcd85b274d96dbfe002f1aaf2c9d877d8fd7254b5f61ff60d5d6d"; + sha256 = "a891d52e60dfdec95ff2e1be785c13e602ec5c5526d6d504f44a831126b57bbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/it/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/it/firefox-107.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d54b7474e8e28749728a2e1b59b14e39186a0200704b52c1e66c8b59ce8842fb"; + sha256 = "531db472c3722d314e1e2e0f176fb6f77a17f21a93725afed598a986b673f4ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ja/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ja/firefox-107.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "4f1a54e88a1997f8b93b52e77137499538c0de74ee63d341d13bc16f03c2e365"; + sha256 = "31bed0e7e8447d73adf4375b091efae46f5ff133521a5dcca8c716878a4ce948"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ka/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ka/firefox-107.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f00abf5436bca238de0ad1b04d5504374f9e21c8ce9386543bf61b40e80d8605"; + sha256 = "446f2fcc8adf041467674a7595e135ec4199c213d4375d61b10241edc9cdbbb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/kab/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/kab/firefox-107.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f6d15cd59503004779ab72aa35fe267b3c19de6a42578379bf72e8b9879d24f3"; + sha256 = "74c76171519d67eca9bf700c6236ee706811ba56e09590ec2bb646f07a02b92b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/kk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/kk/firefox-107.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f7a17c7616c6c1d516ea4722ff773946b28dd4b42cdd7250048961fa039aad91"; + sha256 = "cde84100055d52c9f03e39421f37a12f94fdcfb1522e8f8d7bb09a10dbf02525"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/km/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/km/firefox-107.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "0afe280a5f352c97e7c7164e62c9ee648e42abce45e9a64751ef64ed809fd58c"; + sha256 = "44da869ca2d6742b1331dc8049f8ada6563a380961ab1793762d083648dcda2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/kn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/kn/firefox-107.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "a8a93c9358335cfa654866f3b7db4ca68b2d96cd097ec2a91ae5536e313fd709"; + sha256 = "ba88756099cb97b05a42da3e1e529345f7eb780266c3a2ebb2dde3b691ebd830"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ko/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ko/firefox-107.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "2e31f46b74c4e04ade405664b3953a3c005eeee92134a21a158c6932cf3963aa"; + sha256 = "a8910fc2f008f298172d1a9be9f3297f991f466ec4043ec4271e3cff3e2e7947"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/lij/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/lij/firefox-107.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ff649971f1bd06383920202b0061a56310c3bfefb9b8ef623f8b690ca5db0ac1"; + sha256 = "05557b44a7dce20997697e1222cb8afb32df54561d5c6546cea32a4aeec735db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/lt/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/lt/firefox-107.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "73c06062d0ab76a988efb04966365d69c452856b8d30ab8e917e19960564c980"; + sha256 = "a1da22004ecc7c725962a1b3256855a4c6a3cac43ebe62a0dd2c6f86d35e93f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/lv/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/lv/firefox-107.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "f5d68ad9cc3e8f079688e0a7bab8e0936f4f769e3677389f57efe494b6c87f81"; + sha256 = "67bd5d34e361406a55bc44c858c8a238d9746fe90c7345a562e1e47e0e72be48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/mk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/mk/firefox-107.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "1f72939d7707bee513dbd4ff1ed03952a923bb690afb52eca58288950cad3a05"; + sha256 = "bb0867746e5e46f80b06f3505df1a40c7df0c6797d80cbdad9dee4b64be9be3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/mr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/mr/firefox-107.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "c5643d3f0d822866e277cfc5d8da36d21b1838b0e5d01d2aeb38590a53129771"; + sha256 = "68891ad7635073d72947778eaec1c35bdc8e7f73a04cc00a4905edc5047c0f56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ms/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ms/firefox-107.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4d12364f97bbd224d0cca5c442154d1c16c12451f4c4a73427d8c313b5db11af"; + sha256 = "57dff2faa5b84dcdab9ef10140b479dcf6609fecb96c4608be6708966019c284"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/my/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/my/firefox-107.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "6cdf99de907ed14ecdcaa2e095afa9625649051d0d399421e52014be86f42e01"; + sha256 = "1096e896a0a60d08b326ec1451561416e272fa87e15f4029e8633451b45f6918"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/nb-NO/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/nb-NO/firefox-107.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0b1219be299228acdabc5f950a631fc516c80005ca2225975ce6c3bb5989f24b"; + sha256 = "65eabad859b06b90ecf311ee3cc7ffd27e1bade90e70f04386b3a09394b9120e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ne-NP/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ne-NP/firefox-107.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "50b98b759574ec5acf8116bfa0fd874c0e12a2fd00dacc271ca6033c5f333898"; + sha256 = "09148265cf0f476a34cbd52060117ea035c7d86f5c20d9845a29cedc234ed342"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/nl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/nl/firefox-107.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "264344b7eed60287cd76e23d5e875271534e6e46fa2715714ee522672e520b38"; + sha256 = "be1b51890780447fcc3ca3e6ca2ce72c62dd10c2311f23a4d46ccee1d4656a98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/nn-NO/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/nn-NO/firefox-107.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0729a5df75d324dc6a98526482cf0fb5c4af63afce5b9a1127568a8f0db75c11"; + sha256 = "6396f634229a47213c147527d6a5061885e99dc7bd0f67ed6970a801bb4dc744"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/oc/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/oc/firefox-107.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9a04346eafbec5901d298bc3d96dfccb06c48a4668b26827301e7e0d5fb801c9"; + sha256 = "01528cb2ceabf857b723ecf4201fdd8ced515a56cd866acef518b5533fb0993d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/pa-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/pa-IN/firefox-107.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f281902a211a41def4c1e3c7b2a8c26507ea653288f0740eed6dfd672808af95"; + sha256 = "cb1226ce21df81adb28358ee08d646e133452159e0875ba1a06338bd5711e274"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/pl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/pl/firefox-107.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "3f6abb54dac49988def4f79e55e203fe6fccd683b0bc307f949998db40298d29"; + sha256 = "a132993e9a8026df16f49792b34edc7509a5c3dee243382a02b3aa5b37572358"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/pt-BR/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/pt-BR/firefox-107.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "183e5ca3e5de358c2ca49c669d7d72ac043e842bea87f588af2b7850cbed1233"; + sha256 = "53d656230684b94d596006518581932626f7e04b3e57551b8ad287d165f69048"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/pt-PT/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/pt-PT/firefox-107.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f58b1e758606442797884780394c351cdac75ca9d7d3d5a9185e8a6edddf8967"; + sha256 = "ae784c090a96c118627020d48c7970c158715c69151482c22fd9624d09cf5bc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/rm/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/rm/firefox-107.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a998f116a2d4cdf9ae067b48358a35929a5b552031bcafa3b6254146e1514920"; + sha256 = "9ddc7cddfa8074558ae400cf54717b5fe7ed993a008da1c639f9178d1549553e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ro/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ro/firefox-107.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d3a0c05a55a957c3e1778c06bf5c4bf359d3e3543cc345c2ef89b228476914d4"; + sha256 = "a146c62fa9750210abbfb28e03b7d8d8837566dbdeabc9c7916e1dd99b69bff4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ru/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ru/firefox-107.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "cae053316f95702e2015fe5ec408b832ec29e67b27c5ad3ccad3d09ea8a46958"; + sha256 = "2c58db3ad74194e07b9628cc6f8e1685e88c56689e76d9f37a1e0b18062c4938"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/sco/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sco/firefox-107.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "243084db6238e5bcb263bcecf2496aabb79ba79b9ab9de2989737f383700be11"; + sha256 = "482412af1f7e93138bbf2f229fd628bf5548ca0c0489583cefa866b8fec453f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/si/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/si/firefox-107.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4b141fb98d29497afec8ca756371041cb84694050a44f365ed61405278feb461"; + sha256 = "eed075b164384475015b1b8e9b1f1fca7de2822465d207779d7cc346dff48178"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/sk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sk/firefox-107.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "31ea0863a427e372ad286aeab79fc5b04f95bbae67acb588a4ce7ab54e4ee381"; + sha256 = "167b15a0b675bc68274bd7e5bfdc767945215711ae28b750130f4dde852f6af1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/sl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sl/firefox-107.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2cb675813a736213515f559ed62d4c7523018629233a4e6425e449ee16994993"; + sha256 = "eb4a9f34b7dbf2c921c82e9ab3051896e6ee679b6b0b4975f116b08f0fe475c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/son/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/son/firefox-107.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "e21db43e2d7631417a00a7d7b1fe5f18ad5f11fc635ed6e306fa17f44c568c56"; + sha256 = "c7d3af3d5b277cd121428baa128c0690222f7a3173136f2d605cd8448019f2e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/sq/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sq/firefox-107.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "43044c90d5c5412b27ebbd099bf08c3712afc9cf418aac7a7a765d2c52c7d930"; + sha256 = "04687dabe190ac2ef0322bb7273cea2eef3f112833426dc035bad09b42726638"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/sr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sr/firefox-107.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "629f22fd6c1a1ce32ba65987f4a8bd774a70ee292690821b255d93b8a36f3e12"; + sha256 = "d1e758bfdb493c176096d86fb633ade11ed478051e3306e724c096fb4221239c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/sv-SE/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/sv-SE/firefox-107.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "564c7e61adb35f4d98afbbe60709ee068b861885ca99063e2b07ac46de39a772"; + sha256 = "4df64b31d1eda64befa266acd8297efb98eed5a558cd849959e6d8cd5dca7d0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/szl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/szl/firefox-107.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "251c18c1dfa80633c75b1997cc037d9eae41bc3262a0330411b91b19fe9fb6a8"; + sha256 = "8ae13025e7acbb015ef82a10a59ea024708816c445292a32735bea25b7501f75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ta/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ta/firefox-107.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "27026e5567798d9de60d9749ea3eefd993ef560b31191e4d48f629ec6cb43487"; + sha256 = "885852cf94df27fccbefbbdf7b91b66af5d0c1d531311f19e4a10f73b04d7bee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/te/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/te/firefox-107.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "d9d59b651fd830a987a5edb8dfe6c36df55484040c65c95ab1bd687a21f367ac"; + sha256 = "cdefcdb6d6138a586dc4bbdbf5fbacdba72c70ad6a26e404e436f3ab6c52ce81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/th/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/th/firefox-107.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "884405c9aa638fe6d4b39ab25e86d721f17e07ce5871dded6a05a46a5dd8de94"; + sha256 = "ca6ae16fd7a39b52eb4589d4697a655f8109fda50564d00d9d40990d9c2ca92f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/tl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/tl/firefox-107.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "0360bf08f9fced2480008cdd79f4e1cb339b6813559c80a5101dc4c69fc2e64c"; + sha256 = "c0bfc6a88e4a8c71e7e055d7f33215c17fb16b69ddefaa81e1c783ea8c33efb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/tr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/tr/firefox-107.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "cff8641cf1fa9554411f7f4c273ce5336ba78e67f69f5633e18f02aa0de3b7f3"; + sha256 = "5396444d89d0708fa2cb7b42a0e648a6f67648dc0f4b7e4427fe16bab0db7822"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/trs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/trs/firefox-107.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d2957f6ffd277022eef3d3e702900e8631dfd217edaf4d6684db00bd246c28a3"; + sha256 = "97ac40f8291efbfe145aec8fe8aa8a103c655d31ce30d9c83f2433fc5f494b5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/uk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/uk/firefox-107.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7d7eeb92666c0247f052773257df0fa1d454269586c9e67a832b0544ceb4f4f2"; + sha256 = "33c0e4984d1560949ce12ab2433f7f19f2cf31fd364923898883a0ec51b1c01c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/ur/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/ur/firefox-107.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "795626b97d7ca62e23ea9417678289b279c311d1528c3efe9fbf17bc3b82a84a"; + sha256 = "6314d917d196b260ed41c434e438b553110bf2334f92594ef4b4b987e900b0e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/uz/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/uz/firefox-107.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b0ca203ca2870b7637613fd45cc0ac00b93e0f83be9209c48b70b8f8d25de4f3"; + sha256 = "001160b117717bc45b591cc612dad798040a6252a9d1715c1308df2ef3c6e40f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/vi/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/vi/firefox-107.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "f831686b1ce7e88c573c553e9d28d61afc44cbfb18dd94e60d4c7032dd9f3472"; + sha256 = "4ffe081cfc1bb8d07041cf5a2055688d57040e12426a1aaa8ab9061a6adef65f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/xh/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/xh/firefox-107.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "9aeffff70fdabbdd463fc56ac75a3e62b66ba95a456cd8ddc120e0ff8d2aab39"; + sha256 = "6cf15c2979db7e4e58156919e9295b6e0d2c2ddb854db7ab36bdfdc4e615d898"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/zh-CN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/zh-CN/firefox-107.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "729d745b15fe1e104d6d5319613d52f8475a42ab7d3a263d72ace84aef33a7af"; + sha256 = "783678510f1094701aeb2a84b91419f5bf2e1a4772f57ead3417af9a7d894eb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-x86_64/zh-TW/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-x86_64/zh-TW/firefox-107.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "ea442f895049a5e60d2066a7a02b2e4cbef3ab8004db5df412110f00352b2c69"; + sha256 = "02f29c157cec3732567f903f038866d6006a99f75959ecf22f8635c63ddb4cfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ach/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ach/firefox-107.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "a163e6e271166c016d82ef4ef33c5df311c28b0d7b85059b1dc482e041a1a41c"; + sha256 = "72954ba2b75c395f89e8d4350110c9a25f800938a85869ccf3b174e9b4567a46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/af/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/af/firefox-107.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "58764bd43f45aaa27b3bbef5dd7793237e29ef7e692e45c5eb943886e1bae240"; + sha256 = "4bb990a8fdef626262a3733afef963975085bb4d56ab284791a792169b29fcc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/an/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/an/firefox-107.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1af5ea2a758f7315ef25a40d46d27f58e210444c48cc0a6fb7cde8721974d6fc"; + sha256 = "0a9e2fa6034ab4679032bab672a93da39ebc9cee4b97bd7b80e79f31091cd257"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ar/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ar/firefox-107.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "51fdd4a6a5dc4e6a01517df7dc7b5a5585a96e4b105e98bc2e3ff9c2cf57da16"; + sha256 = "f16b2c0913d9761d88465ca6ae0f45623600a74064eb18289414b98b2dbb1d5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ast/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ast/firefox-107.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0ae24a3be5fb07f6aabf7026dc9a84dfef23d7ba06d1b5743ead2c5959a6b6f9"; + sha256 = "96dd7293f9098902a4d62ad785f7cf15a265ed4f84ef8a7301abfee2f1fb7ecf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/az/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/az/firefox-107.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "6d2a65e3d9a17ea9c55864977254e341b49a9ca4479fe173b277124c29179163"; + sha256 = "3e41784eb43f22a8cc8a124746112859b4a6de51d2a82fd7bfc26c8569b0b9f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/be/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/be/firefox-107.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "086aa9e3515abe04f1d5b39fb0f8c1bb9f856121a2a455274adbb314be9c8e1b"; + sha256 = "8382f3b2f517a05e6c3c7476de8e7db9dd5b97e34d316a6986df0904ebbdfbd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/bg/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/bg/firefox-107.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b9ca95b9a37c1a76d1e2437423822fff80ff71bd53a91967ca71442672456915"; + sha256 = "9e826747f22128aaa1843a3f29d2e35234182a48caa36e69bc94f9f1500a3f3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/bn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/bn/firefox-107.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "0bc7b505c181827e156c0e6f9e047ccc141c1423c7e3e012005384a3651bf5ae"; + sha256 = "9f4963935ce269960411092ffa307122fc98e01b513ec92419d36dd7d938b0ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/br/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/br/firefox-107.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "def16940db17c1a17c5f94f096614aabb9af4524ae47ad109cd3e519e7716253"; + sha256 = "502f4a58ea7e5d2ba9b7bfb9ca0fa8e03aacca068c2f6ed368e3b034393a76a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/bs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/bs/firefox-107.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "943797459407c3c1516c8a7f0b7bdbfbb41415f5784801ecf7d1452a723def93"; + sha256 = "c5cf972a1afd6c6ba6b339a2eb9f349d213e538cfbccac4923e3fdd439a0c9f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ca-valencia/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ca-valencia/firefox-107.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "e1972685bcd07b45d75e3db628756588e1f4e6ee07383b16f63f7d9dffd96b5c"; + sha256 = "ade546a6251b850484b060686621658228b2e0d2b3d203f5b7673b023ffbb63e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ca/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ca/firefox-107.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f33bb5962011e51d16fb0370f1f6aaa890fdd4dbad80d284ff8d80ae7a08caf4"; + sha256 = "4e148bbb9a2818406781e89d0950d24154847dea5bb40e52e62f6360e230bf08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/cak/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/cak/firefox-107.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "b72bd73449f79cbf825346558558afd78fa0b043e0770a6ec221a49420ef4bd7"; + sha256 = "586457dd6a965293af953cd00fa20baf7aa1051dd7c4ca2025f9f864745ec113"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/cs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/cs/firefox-107.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b76acfd649f0f0064f69d075da9b6c94831a09878dfc0a88ab22b1353747deb6"; + sha256 = "18b92c9f1292ec093ca97eecd0c8989343ba9d393b2b327f79d0d31ba08b749e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/cy/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/cy/firefox-107.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "76394f35d16f2a171440609f6268c70c3ba58335fe13ba8793104978b2c8a9a6"; + sha256 = "72251558b568be17fcf51a61d8197861219a2d711632cc84e28eed61bb003750"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/da/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/da/firefox-107.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c7dc96b3e6ca55b9ea005394fa1da46dcfe97fc9c79777c4afa53d136c8b7460"; + sha256 = "dce8d3dbc492605bf708b8b2ae8909a51be7dae69557af2076f8c53274b1f54c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/de/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/de/firefox-107.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2a191724cbca2a172d2e42a13f88505f0234f7381982cc99aea3f6a12f1fa6db"; + sha256 = "47864ddac3c1aed1dc4aa30247fbddb1e38073035f67115cf6f6edb06579582d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/dsb/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/dsb/firefox-107.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "28a0cc82b13589ba0f21ff937515d0a45bf325b4d11652e53f780557c9144510"; + sha256 = "6e6bcfd81e4f30602af1381ea481ebb55af6f6db19b01a3b0be2c6111a0ba1cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/el/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/el/firefox-107.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "810ac57c5f84618e2933541f1c738d9cf6e9b8b6556c1234ad32b8d5bfc79977"; + sha256 = "71bad1277f68ff592f1c0e26e9a50feb5cc78ba8d6531c446f6182ae1837aef2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/en-CA/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/en-CA/firefox-107.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "380487b7d030aa57d9aa37b4169d2a150c7c805eaf95480a177b75236112145c"; + sha256 = "99b4cad938c80937af164fd85dfed4d0fcd5bb2890794612d9a27fef68b11862"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/en-GB/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/en-GB/firefox-107.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "88653083f12113c71a2b6fc3b8e6885a44e39d504115979e93dc3ca2510ac8b4"; + sha256 = "592a484dd1cedb94d37f209c024a993a7c326e57913dd90de5e56dd5cd2061c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/en-US/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/en-US/firefox-107.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0a3b76239d0364b89968a3a8bdf233d1635746aa800b89699384e0211ef1200d"; + sha256 = "36a81db851f34e6df6a52748adeed3b185f29f6f14e9cf940c106be2f3bcb624"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/eo/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/eo/firefox-107.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "04f626a085addfb8da82aee38334672fd2f296ca92dc75d42c5d63ba2993e04a"; + sha256 = "9824ac8690edeea6d7cc00d622e1a0c203cb03f4513653c973edfa1f2c3fa1a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/es-AR/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/es-AR/firefox-107.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "99a708a532e8dd3734aea5d0264821879739dea43a6f0c2b851189b517db1e7d"; + sha256 = "ac84773310cb538158b5d10c96170d845c9f9bd643666cd4ddb13805d21d73c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/es-CL/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/es-CL/firefox-107.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "6be4964b16b7bd148a2cfe9a6acc706510c3cce320e7a8cefcbe0422b0028b39"; + sha256 = "7635cf5ac97a78f0509b983aa58d000b7d7cb5f1ebd06466f662dad9f199097e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/es-ES/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/es-ES/firefox-107.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "395e6aa0438f0c86dbd85b736b63623a178d81511b0639f59f1eda6011a4190f"; + sha256 = "1bcaf099b63f1f1c27b9ed32fec5f743a9c0c1cbad21cec1a725ec2fcbe3248e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/es-MX/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/es-MX/firefox-107.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d0e07e7f3d6f674971d087a99c3aec41320ea0036cc67ac658b48f83c71fd8e6"; + sha256 = "579f5767dfc09d7c71ff317ae46642ebc6d9159270297ba0f89fc8518c4817b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/et/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/et/firefox-107.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2233de3de920ae33c6e9874de69d66510e03b6c20370f67bdf317fbde5b70483"; + sha256 = "f03049b4107be104dfd8214ea4480851cdfee2ca09fee9ec471169fd6b4cac6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/eu/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/eu/firefox-107.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "12f1ed592b960fe1eff9d0a4d8e308e85d99527048fe2d86b7ec4b93547b0664"; + sha256 = "52f54eea2402c7bc09f336cad4ac3b8ae613c95cba85dc03867ca565a91c9851"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/fa/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/fa/firefox-107.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "3298392be234a6cbfd0155b1973e87e0e616e49a8850a447968c8dca43e2c591"; + sha256 = "0c93ef3ed33022436c3291a43ffe8449ffdbc2b4e9d87db5d656f2e3dab4cdcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ff/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ff/firefox-107.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "61ffbb1a669e210940c4e34e27011a8f31cbf36a2f7a18c69d171ee04ceb68d8"; + sha256 = "dcbb91da91be9ef501d0c09d962b7a91bf4a7412ea7d9e16497e3202900403ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/fi/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/fi/firefox-107.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0a8aff19d58b54543378ba73d6294a38962affd3a227dd24dff2e729b22e337b"; + sha256 = "11512a690c09256d05337ca3e787b273af40e6d3a9401116af483236750baff2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/fr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/fr/firefox-107.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "838fa94716b6413f703c5c3cc19fe890e370ae37757ec90087a6d8deece7d05a"; + sha256 = "ac757918368cd4aa1c67c734459d7bd92e62f5134417cd38fd662e1817252e9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/fy-NL/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/fy-NL/firefox-107.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "7feff0f1c8ffef30a03163dd44e406e8fbdf5460a49a4b7fa2e79276ee5f28a5"; + sha256 = "2c3dab7652d03b5a6037f744a9016c934e8f971fe7e1fc8005fb27884fbab2ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ga-IE/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ga-IE/firefox-107.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "bf1dbdf90cdd1eefa403580c638a93544b603ef5be2bdd36f4515eca418c0469"; + sha256 = "ae554f6e691b234ca09c8aae41ca1f5fb20059305b24527b7f06234555e44230"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/gd/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/gd/firefox-107.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5839f49d1b4cf9ae9a78f7b81f89eef7fbc9ea5b6051c9f5020c50b50443d807"; + sha256 = "72481494a77e18709b36593cf5d5c733f9ef1e928898913ff7961ffbd1884234"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/gl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/gl/firefox-107.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "46f1a0254c77531b9129fcef491f5c43a9ff1b833d818afec1fdeb5f6c808de5"; + sha256 = "84497a234c768ecdbb2cbf9ec1137e53c37dfe46b5be9fcb718c9aae70f87629"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/gn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/gn/firefox-107.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "8025b101605466de4a63166eb45e8f63bb7e3795ae6f4b4a87444b95020a6d32"; + sha256 = "35b00e8b881d1e134bbd92e28041d2a3a1288004c437c5f3ca9ddbb8fdaf9681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/gu-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/gu-IN/firefox-107.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "40630fc6d097a23cb1d6b8cfe70e272168e1eb9821e07f75a9d679c3d5871082"; + sha256 = "d6fc5d8b83a8f8187a79701a9a453f31b2708fcf02b0a96184c8c186d6621e35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/he/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/he/firefox-107.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6a33027485ab0e3b415683df2382d7ba51e3f85a73f0e8b6dafc4b22ca392a12"; + sha256 = "e8a14a44deef14d9d5a3f73ebe6e2f1a7eb2dbd64c0042ab2a32e9d0aa9e4079"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/hi-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hi-IN/firefox-107.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4d2c327c909a40851a2dc99a8a0ee52ded0528b66ee624454f4a036677424285"; + sha256 = "7b73748587719c0a12de11e12ae40eb788a99c9d52714ed467a64ede39b9937d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/hr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hr/firefox-107.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "5ab8e03067f87ac31929445a07ed97c8f2aff8c4206a5590c94816fcb62b2fca"; + sha256 = "340b3a46a9e14b383b60d9736f13d36258fd7e89c9c9e8a4dc292eecdafb9a89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/hsb/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hsb/firefox-107.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e9de4c5791b12e25060bc7539517c1ffe7c1ee8a9df5fbbb2f4c56df207328f6"; + sha256 = "87a7dc59a021dd5d411300e76c52a2d7afbf5de24fca7ecbd07671907732a5c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/hu/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hu/firefox-107.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "38fac8c0ff3c5e9473ad6cf0a7b60538f399bffd8069108c90bc11cfd8798912"; + sha256 = "74a4dca5b5419d2df68abe884e66aa8e92c6b502e5fc945e8c670c9f2e94b750"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/hy-AM/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/hy-AM/firefox-107.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "abcaf72a249c75e3dc6f2ca5c9169533c362cacb880f5540b33660be73d97e61"; + sha256 = "a1ed1d83d0f79328843d86a12547cc1135f3154e0e8706baec6bee95df958298"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ia/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ia/firefox-107.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "0ff0d1883ba824b960e0f97d27e02b005d029cb8cbb8b89aaed4359d338fd16d"; + sha256 = "850d522bd1b3282c4861345db6f447ab17acd71ad0b94e437f27c99b6a1c0640"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/id/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/id/firefox-107.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d9540aaabbec9512404c3432fae2f7ccb9e993a9a6b7454fe566f5af4b5eae14"; + sha256 = "33c17e400d900edbfcb1fd6c8f391d7066382511f2ceb8e58cd14001f07a3609"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/is/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/is/firefox-107.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "19ab69a43d3e26bed164f072ce3027f7606d73088a26745b26c6e4833299432b"; + sha256 = "e33daebb1b41bb479911a454225f264410d03a050428d5cda8951cfc3231fc41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/it/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/it/firefox-107.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "39822b2107c5b08b030a9dbda4405c6fbcb7ebbecee7a368b6e4f0686159311d"; + sha256 = "4290a6f73a861f2de2537cc0ff0a7096432dd6ef2b4c86a8af6cf32d6607318c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ja/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ja/firefox-107.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "5a0414e7bcec930985e4df65abec12fe38a5624605127ff42a481147e6b0c77d"; + sha256 = "ff1080c3ed3c1497ca43b0d47e077d057c6b34598e8303875fb4e35cbaef4e4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ka/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ka/firefox-107.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bb67ad171fe9851d327ebd916f96a2fd6eb44ae3ac80a015f7df42666c2b945f"; + sha256 = "b90ab2d94dcb6e1d0f1319180524fb3193c70fcd0f216a2755b67548b4ab4a4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/kab/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/kab/firefox-107.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "82f35c12d777d2ba32e1cf3d367808a6a9b0d73aa456a22e70e8f88998e375df"; + sha256 = "49a12c30417d5283487bc661ea77718e80989e4db39915dc4409e2a141a45373"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/kk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/kk/firefox-107.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "60e1039e883bf6f330c80ce01f16870c6d56a74d190f2d1041883ba2e227e641"; + sha256 = "391751327b023ec313f8336d5517b68a5b059422fa3d469c4c9246be2b8aa767"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/km/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/km/firefox-107.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "1dc0dc3e0a7e6a5564ab605b981a310ff333b111646c001a96cb2d4b4d76bc37"; + sha256 = "6661784587c9495c3421c4aa36fc0bf632e3a1921f2e3778b43d8f3aea215fd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/kn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/kn/firefox-107.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "00e23dc87d2a8cde5889ffcbac51102b4e96ede2bc659dc313082fb670b363e1"; + sha256 = "3a66f003201ad2f1d58e2cf677ac099d087c229b26f5205512f48052ac4e2da8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ko/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ko/firefox-107.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "585003a1ecab5ce4d268eb4cafcf725f840eda61de21181c455a1aaa4f36d61a"; + sha256 = "5a61453eb2fdcb406dc5458148ed0b0a762662969b6298ee7866c1cdb3c43407"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/lij/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/lij/firefox-107.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "fc1293c2ef22f2e36d854073c5131d92c42faa3ff7de7f28cf6f74908a8260dc"; + sha256 = "d017377488a0eefa7cd457d6719cd9a2ddf8e1059e2bb25b4b1e12ff1c690c02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/lt/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/lt/firefox-107.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "d786f9bc3fa1500b5a6370c5689a323f554ae96617c7d14a15a938e1a834f02f"; + sha256 = "c1b27ac2b11e2a20215bb5a1a4a99ed11cbb78ac1645ddf01c3aea33ade7775b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/lv/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/lv/firefox-107.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "36a17d88a6dee8a913e6101c46a95e1fb3a41c2efbcf8925714ba8d995b30808"; + sha256 = "b16146441b287167df03e44dda8641a025cd6f17f06d568c9b63f9c119cfe042"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/mk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/mk/firefox-107.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "62e920574e660cf158d7ddc0eb8ad133b482f8b54891fc553962fa564a62f5af"; + sha256 = "687e319a2fe451a6bb464154c385590f2634ca5e2602b0a1eb21b3f73974e13d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/mr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/mr/firefox-107.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "b4555a40639f4859243d9301fa9a743ed3642b86559dbd4dedb92da4c26c1c42"; + sha256 = "956977f0e6b0190ca8718ef41837e6a3ec12a1d1912af74a9f57cfc80dee9d81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ms/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ms/firefox-107.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f49e774e2ca2a5278a5f72a67fd1e488a933bb350d7f008f01e2fbee4fb3b302"; + sha256 = "75e646f866149bec4b8de9a7e6d482a9310375ba7d789c88df8d776a299cf8ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/my/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/my/firefox-107.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "070661dcc5305faa8b0f5b0bafac6d219225025faeaced1c9f44f7d23413a8fe"; + sha256 = "82cf085e5cb4cec8a646da0b9adf362d3cde77df2480e77baa68500e84e65d7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/nb-NO/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/nb-NO/firefox-107.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "73fb963b963453f3f0a2825c67dec45d7fa69821cf6346407c0b3840529a4b0b"; + sha256 = "151ee93728a1e9db0f52c09fa1ce332da85d5ecb6d3b5e173f88f633b213a0ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ne-NP/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ne-NP/firefox-107.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "683aa8d134d00f6f78e6333c37d8126a12661ebe838ec9341694b703476abace"; + sha256 = "07e9c5c1d46c8ac958a4ebb0313a5542c7f8696536b7ba798be5212b70f10b1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/nl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/nl/firefox-107.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "1c05349cd5ffd9d78e7775990cab2697b3094255b65457834c4b266e13c14705"; + sha256 = "20faf70cf29127d4ab44648c1bc24341b6c724ac87657af978167ffcba0088d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/nn-NO/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/nn-NO/firefox-107.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "548b37c4608da3caa12d45ca4a5306784d8acf69c5787849244ca02f4d1fb04d"; + sha256 = "ae9334704b2dbaa04e26644ed508f14c3efa9a73d643dc30882311144b65cc8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/oc/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/oc/firefox-107.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "a9081854f1bfbeebf56ee936093f9f6455ca70a355a906e57689549674859804"; + sha256 = "c419e0344bdb524c9775e2eb0803feef1f3afdfc3a0465a143692d0b70502b19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/pa-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/pa-IN/firefox-107.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "689283b771875e3ac6645e9f9be009f81c6f39647603f5c6cbeb3e3007054627"; + sha256 = "c5a4789d822975d8b130070c6d893589b3110c2039fc0bab97a06e48f9c6abd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/pl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/pl/firefox-107.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "86a7016c353d74230e827428e6ebef7fd53d7f1592c36c47844f8a31c1a0e3c2"; + sha256 = "606d96c2d3688c3c863c67fd2b09c8f60cb30382d2223ed64a03545b3fab7463"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/pt-BR/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/pt-BR/firefox-107.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "22e755f2c25470b9b6d020243dae73290a26208ca8d3ff035420e46547b31ce8"; + sha256 = "022d89379f0f29aed99031f313e411eefbca10f60d9f08d3b70b50e276f062d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/pt-PT/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/pt-PT/firefox-107.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e44a35e564a89f0d02cadf40708ee180f3578cc8293e05e6008ec3a97060fb53"; + sha256 = "a2eabe1f3f6ba9cdbe072bb0cbe86116b37cae0513c8452d4c42a16915632366"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/rm/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/rm/firefox-107.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1b8e86d06be7766ea5e5c2ad30de5ae7237b502ecf0434a1e24c2f6a1a183bba"; + sha256 = "c7f005af9408d31d6a449cc0cc2040a2f779e52cb127dadd4ea9a742a204d527"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ro/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ro/firefox-107.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "efdfa396efc32094309dd46ade30cc908ebd7e647059ed5aa80133df63270c03"; + sha256 = "eccd837ded35c487a41bf9a6b22f83515de0b48258632f805605b532ca950840"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ru/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ru/firefox-107.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fdca0c11ace36c39ed2885fe3cdc432fae22c1b7a7c8b86adf161f8df6e713cd"; + sha256 = "1bbdc593fdcf9c221de69ee7f3108251ff2a0376e2ba53253452e9c790689350"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/sco/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sco/firefox-107.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "afa2263c3878542f41ff91665d9eddb7813bd5890212e5db2f015c8c9156a347"; + sha256 = "9648d5e705ae53589ed2c895615896cb1bd9419d53f8190d652bec2416ea3946"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/si/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/si/firefox-107.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c195b25c255ea00335291056bd23ec17fbe8c72c219b2dde7dbc0f8f00862857"; + sha256 = "d98725d0d09ea0c47463e1539bff1585a29c61c4107e8e64d3904532ff65894e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/sk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sk/firefox-107.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "92ce827a7f94634e05b42665437abb4b3e048e8e2936b744c570f687e1a5e2f0"; + sha256 = "a971b5f558999be8546429af1ddf0ac02b7468b97efb2da1cf1f6fc82e145838"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/sl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sl/firefox-107.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2919b85a1fd26398d41ad01508b0d5a5e99e70b08067fde63bbdcfc7084e5715"; + sha256 = "de9976f1a2751f0ed3d337e1e2b6433d98e78039839c6e42e8a247baa2987457"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/son/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/son/firefox-107.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2278fadbac733e27b4f2a92cc40b9abcfa2c4688b2ab09f0facf2e895decc702"; + sha256 = "bedea926725984a8ee11f06058a154ecfcba6ebbe4a89ab653188620e409c6e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/sq/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sq/firefox-107.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ee42df16d3dbad31ae920dff5a4d5fc1f9e7cd4c06d2f832913f860dd6bbe887"; + sha256 = "acc68c742f27cd3c9b606f98d60dac3e6703fe7876e487e7d925d7f52d50411c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/sr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sr/firefox-107.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "3929c8c3e14a9710ac6116affd4404577bc7e343d37dbaeb8528bcd001c1db2a"; + sha256 = "bec2eab4399112af1d224cccbc9ecda6941d7388e85c6bc64c2644a33a01383d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/sv-SE/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/sv-SE/firefox-107.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cb307ac81e67c40127c1171df582528c9b1e9763a11d167365a0e4e8c915ac45"; + sha256 = "74eaf1472d1658c90fb35449821423eba583e9d4e380ac03c96c2e2607df23ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/szl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/szl/firefox-107.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "95dd6610bfef762efa8315eddd092e6c3932f336bfc22084cd1c93840c7721ac"; + sha256 = "5c30a2c6995a0dedfdb04236961aa4302e3ddeeaecd25fdb4e963c8ea46d0f2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ta/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ta/firefox-107.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "4c302aa0834a1ed99ba52795b5961c8be0bda711edaeb1afc4e7eed9ea846f80"; + sha256 = "9ea986c362eea0e9ff375463d0c4810590bdc880b3497559dc3275f9ea1d999c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/te/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/te/firefox-107.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "7ec3c681d446d5f73154323d92ef2d4b3c71cd91baa7fddf28634ad4226f392c"; + sha256 = "ffeccf829a6b2b4cebc4df52a122d1ae359b00156ec668e9134a3295b3805907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/th/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/th/firefox-107.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ef41cbd70cc8983399286f3a02eccc54776cfe71f7b0621bd7905cc8e6f643a2"; + sha256 = "66887b5d3e3f573ce3c08d303e9d26cd0c059514fb291a346aa00d4167834ea8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/tl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/tl/firefox-107.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "6d89173478280dcfae6d4e1b35173e631dd9611cfdb5fd4ccf16928ff9ef5fe9"; + sha256 = "70712a82780f1d9af8a95383e6d22cc9bdc75770dd78f35b7968afaaedad074d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/tr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/tr/firefox-107.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8554cd7d14282e207d631cae44255555133de38f05c57758e290558659754d1b"; + sha256 = "fdd6cf59ce86b5a05e51b0e9488a4b59603f7af3f6c393ab96795369e80bbf9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/trs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/trs/firefox-107.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e4d79fd0bdfa9aa7887cab245616f1b26d27025b2307822238a47d89e85f66d3"; + sha256 = "608df7e7573c7d13ce35c98acd870c89d8f60541c056a2bdc9c8c8148c3b0e3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/uk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/uk/firefox-107.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8181ef3c49056fdbbd9eddf705e7350e908f4d74279896c84ce2c5e27259ca59"; + sha256 = "a53cf5ee10946361206e1cd5f90ec88058832e0f1fc8213b34bff1490d453bd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/ur/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/ur/firefox-107.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "25ddd3785382f16317c0d9b1f440241d2187019829855048c518a953650ce053"; + sha256 = "df4cd1e7e612aab4350f5abe7b42b76588285da2d8504431d9af7c7843d67828"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/uz/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/uz/firefox-107.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c7eef4f7238150f15c986e55ba475cbcbc6356428e92575d912365fd51c80644"; + sha256 = "7e7fe38f32fc4beea2afd843f203082ae48e39ef68c69ca41026c15a0c354ec4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/vi/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/vi/firefox-107.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f6b01aa11c23b019f522dc059cda1d9b281326e65ff5eae6f7be822d79b0c468"; + sha256 = "fe8e4693e8de49be5e00077a313b008228ee96abf3e1bed23888adec2d8d15c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/xh/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/xh/firefox-107.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "4520da286c0f458d1b03e2cb4a3e95589f26e3c1a7f52f0c97ee3868b067c347"; + sha256 = "f659de97e9ad809efbf70ddf4c613b4e4667fb93462e6f29de3490aac69fc74b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/zh-CN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/zh-CN/firefox-107.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d91c3dca3f73d02fc08c0fa439e9aa284631f6ac1b730f271f2f1b2b87ef0365"; + sha256 = "ff50ea3194f1710f89bdf33da722a8b5ea005943069d6d8ee82ae2f4c956b85e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b5/linux-i686/zh-TW/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/107.0b9/linux-i686/zh-TW/firefox-107.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a1c0ed3d90a5ec2a420faf58ffb78a430d44508c6f70610d154c3c61e3fdccba"; + sha256 = "8044624334c7f4ed461d64c7e63a89cef7c98d934b04dcc3a455b90383afe3f7"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index e27c906e74497..a28bb26610eb1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "107.0b5"; + version = "107.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ach/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ach/firefox-107.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "fe053dce16acd6ea9cc2cc4764f6cb60fe0164f564cd0969b60edb2b8234f792"; + sha256 = "9b3ea5454f07b42ff0ddbb2aa4c55787e756f433ff2c979cf78afb4fc5781aea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/af/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/af/firefox-107.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e92cfa783ac7241826991213a1d499656973071977a1759ba4b74572932d274e"; + sha256 = "e30f4905ec1ffa513ca38e145855abd4a6dee4c37e067044ab10b7bdfdea1db0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/an/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/an/firefox-107.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "60cecb1239771e9f683580e53dd5ad4d64c2d13adce2c4225bc5f826f500cac7"; + sha256 = "cbce06fbd3f8d7c1b2c2922ee72cbefa055703daf7982ca4b2020c76a8bbc496"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ar/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ar/firefox-107.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bae0d476831faaa52f427ae361d848bfa8539c5c92b78ccffc9a1f42d7ca5756"; + sha256 = "40e993d257da078116e9871e86a953845f1a576f48d9eb5a2954db612ba3af64"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ast/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ast/firefox-107.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "eee35b16635902871c9d3c9ed53432e4477d202ba7a4b219e59c17bdf27357b3"; + sha256 = "335a90d14d899e8da3ad3643ae486ae6490e9334688310e425c753afd72e9185"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/az/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/az/firefox-107.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "a90363c4cdf5d73604197f0197a0b82879c3dda18525350c26a34833973502d3"; + sha256 = "ff33f9f5f3b22dd8146c751aa184d5e5fa7cd69065919422a59ade205b2e6a01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/be/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/be/firefox-107.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "7602b6524ff7e4532b11eb680694a4eab28229ba7733147a748f31941eed37c3"; + sha256 = "f1ea2e11d445ceac47295a2eb849a2bec0e8d403bbb22b57b57c6866abcbfb01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/bg/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/bg/firefox-107.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d192473aca5da3981782bff213afc387404012640281448ca399db389604e549"; + sha256 = "5ea828c5618d805d9e2740f10dddf2e5fbc88f429311875cfeb6f46f9cfb56b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/bn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/bn/firefox-107.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "d981460c55a21a89bcacda06dce6b96bd98a8217ce204017dcd547611ef49553"; + sha256 = "8668200585fc6a3d4d2a6d8e5c9cf34ed825008f2092ad5db499e0de2f8738ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/br/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/br/firefox-107.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8fc3fb7515c462186df5beb311e538e87cac0cee3871681299d71cf8fa61b649"; + sha256 = "ef8ec147f9c109a3b1a838ffc684834e0dc1ff59772adabada1917465d400496"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/bs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/bs/firefox-107.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "51cdcfda971cc5bc2ac49e66ff2d4ab0da98cb1b616170cd5f3efbc0b3646bc7"; + sha256 = "f7933db4933435061acbe5934e0b5f3b430a938f5f6c1eccf46dbc1f20325301"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ca-valencia/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ca-valencia/firefox-107.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "2db66f85156b5313b6acd9c6fc43c420862f99a57e0529e33565846debf1adc6"; + sha256 = "b611b7fe112e60eb2439fd3b1e2581a267d0d464f05f5626ecdf85ce44e01339"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ca/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ca/firefox-107.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "cfdbe8a80b4967b6e7bff79f77120ba710780634a9be003663a5166cad7a057c"; + sha256 = "6cac2d995b2670db82c6829d1e724b28a9b60a25bfeb1b83187ab3c40e4fd869"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/cak/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/cak/firefox-107.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "064ba8ed85dd1980c4f7a2c132484a5f4e22588a71f2e293b13e32920929df32"; + sha256 = "fe2bcd1b7b29765e6810622e36842a367a081486f6656344a191d827b63c6ed1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/cs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/cs/firefox-107.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "22de13b11ee1710a7a27944754d032f8b3d9d2d0352c8b7f27dd2497cbb67075"; + sha256 = "07dd647187739958effe0f298c12b32e58afb3b00a7e0e50cf1fde72e3a54bb0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/cy/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/cy/firefox-107.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "fb606b53542ed71257b2ffa8947f057d5c752266b10d7ee8907b4074d66d161d"; + sha256 = "8399af3743940809c128e841c755433ead1e2aa738d9d0b947d7b49c4e55f900"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/da/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/da/firefox-107.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "52872b6a10d0b13859705143089a37a1aeea05c432ba1e1a0bf86165f33c1ed3"; + sha256 = "ce1c6aa4fe114baca6a356a56455d234c382ed347c225dfbc27f6357f6002475"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/de/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/de/firefox-107.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "08db9fde6433c154d9f59606ffe02955951fa0729e4331dede7251051b778182"; + sha256 = "f87b2fce0c37d975bcf74e39616848c77e1ef5cfde8d5d1769e9bb1076c9a5d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/dsb/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/dsb/firefox-107.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "770ff42ddd51899d718e9c0fdc949fd4a3079627102869f9075a03cf57e9baf8"; + sha256 = "54adf97b32e27ee6d0b5f28a96b716f02b6ae8ff27950b563bd442482175ce23"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/el/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/el/firefox-107.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "116b0c4668466c8c23a58357a07481b1bbc7da02e446f090c68b0d89f0945f1b"; + sha256 = "c9ab3bd70a91108121b24d327db1c790fd1610fba4abc7e13dcd6838891fc777"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/en-CA/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/en-CA/firefox-107.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6ab075420339bd2580fc865f216fb3579d2ca7dd4a8300ea44335b12cd76d255"; + sha256 = "d161003c7807063358b0b4510f55c49810296cddb476e19c27e6f8c33e68a546"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/en-GB/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/en-GB/firefox-107.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "0f6c290946ec9262b0bec636c20ff1730d23fcfaffeadcf3ed09643ab3e30b87"; + sha256 = "768eae513f9c1434520308b8dca8d59dfadbbc36940817d38f651de7fa9b6165"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/en-US/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/en-US/firefox-107.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "316a33b393479a26e608fe3f4a785f119239996c237ef4981ee199d37eaded28"; + sha256 = "01af75b1bc284e1b736ece65a4a21339cc04c81d15b16054736d7c16efa4c161"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/eo/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/eo/firefox-107.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "dd5720a072048a44c7f36f800a6771fb965850bce5e9019f8637940016b7513e"; + sha256 = "72b8bdac3930b69da4d45b9f313fd7c813631aa615b7ca3a7e867438bf9bb040"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/es-AR/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/es-AR/firefox-107.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3a6a67a0042f21617fdf4213bd84464a85a0b45bf19ff32f459aeb388c4aa1bf"; + sha256 = "01a08f43e345a0f42a22dc2258b47041a55bddfbaf9bcbf28c7265ff12ec81db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/es-CL/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/es-CL/firefox-107.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "233e47704674a0a1034cc555b60e182282755c91124abd2bbd9348f9a9020c6f"; + sha256 = "ba9056b9bb4d0cf2d650a679fbb3978584b6685d478a1c55b40db854c31d79ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/es-ES/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/es-ES/firefox-107.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "8146ff917d55c3abc7cce83321ba23b01ded587fd05dc2d4c4a9d4776976bd02"; + sha256 = "bf2ea8c9cfea7cfd5ad3ba2f1ee2b39c6ca62cef4ad20e573c24dd8506c6282f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/es-MX/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/es-MX/firefox-107.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "30f51b07c841662035ae589ddaf8a000b57f731b618a5bb42d5b29d3be9b35a7"; + sha256 = "f369e031f51cf203c5d669d48fadf997738b6d7a410f30dc0de3e5cb57b7847e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/et/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/et/firefox-107.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d6097c7d36d0a98e08bc456cd459ba5e5b753d59a41b01488e3f0ab49d792567"; + sha256 = "8ff0214cec29fd6dd8df1b8e6a079883cd7f7b1c24c89dc8284420f729f43626"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/eu/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/eu/firefox-107.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "532b42859ef8c5948f3c9ad81b83d1fa184776883ef131127833b7459f9d6700"; + sha256 = "0ab036b26d08e2760b51fbd7d30b0004f2750422046f6f16abeeb1c76918e79a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/fa/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/fa/firefox-107.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "5670f56bb0762dcc1e30b359032f8a222d71a814eecb2eb45b9c1be4967fd62b"; + sha256 = "5cb07d8d7634534e741ea59f75c37bae6c7d3a8fb83f94b1de32dcd4baf845a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ff/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ff/firefox-107.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "9a2fb359519dd3c0d308ccb86cab3c0443647a2fbac24259cd401e20a85afcb3"; + sha256 = "b5396fad3986064f9f93aec1bc10f04983c5037c9d7dd37be29a13f9458b10bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/fi/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/fi/firefox-107.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5f901ade78edcbcee08ea9e6bc9e45dbbe37afad8d11695a3a2e37ab8f00e7c5"; + sha256 = "0113c8ea0ec8a1b04eef9906d70068085df44854db669497871b79fc63d45c11"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/fr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/fr/firefox-107.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "85446b0d846445fc5ccb1e8ae49c5f6b318c26a3c089d9ecc00c86e537edde52"; + sha256 = "c24683241f0c962ded1f590f8cc212ce19c5216e0b754cdaae28e52d9460252f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/fy-NL/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/fy-NL/firefox-107.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "ba7d1c20f3fa84361b3cf726725f749f5c8d8616344f0bcc45a0625827ce7969"; + sha256 = "c19b91a2d9d5fb56732f291e02b377ec9e2663ed8f2117b4b128672936eb7970"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ga-IE/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ga-IE/firefox-107.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "9f91ac8e30cb10d6a631d3633da8a4150519f92e77d63eaceadc69b2455ab5f1"; + sha256 = "38757cd45dcef2741353e0bef04a7141d2b87b983572ace81cfe06d7713468ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/gd/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/gd/firefox-107.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3502efbe4b7c1e75032fb04bdf999125f87b7d3313b3ed0d4315f518ab073b22"; + sha256 = "c5f539dd881c31cc06f6597bbd37bffb519558a0181f8da91e24e23e08c5225b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/gl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/gl/firefox-107.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "6db94febebbed719c497335827c738f9560d1a953508c6264e61e21859be3877"; + sha256 = "52d08dca49b83ebe8b5823a2ba9cfae324b44859cad4c753633ac508cbda1fe4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/gn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/gn/firefox-107.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "3f5dac7d17c69c8e37c99a4b3eb5c23b87ce8e0dad927bc5fe810b3098d57eb7"; + sha256 = "918ab16d347ffc8173d86f4e16d21c60ca35eb689562ddccdca3749e8f6776dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/gu-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/gu-IN/firefox-107.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "d874b4f1f6b8968490fbcb4074ded3b098737326f165218e27f9ad8178968458"; + sha256 = "3a053e21a6aec9477f54d91657a18ab7fa939fee4038ffeb3ede70ecda77e4e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/he/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/he/firefox-107.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "36dea00423f7abe170847e7e79436fe6d52b57328aadf96ef3a9def20c12d65d"; + sha256 = "3515257b8df894fb881c1cc8dcf5c0221284e7532abbc71e1a46187b115ba817"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/hi-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hi-IN/firefox-107.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "6212a78e5af37e13828bf63aeb7cebe84d7e74b24d88e51676970b339b4c5e77"; + sha256 = "6c27979e2870c6d4df0266ebec119c4eda5b5ac5b16a9fb3a46c367d57eb8edb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/hr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hr/firefox-107.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "084c2e0182a383f8c76ff5ac5f27349d03a759554e5b69d63ad5a3bd7813fe6b"; + sha256 = "ac4639b888ca62a0d20b338be17838c59608fabcf6ac30de43325db5c1330f39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/hsb/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hsb/firefox-107.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "f7dadbb029b77952ca649d69ed770996289301ef7ce483d6ba15d422435c8a85"; + sha256 = "8c0c095301d64fa1eb11c53cd9dacaa712433b4e03e7265fcd27e0c4dc434405"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/hu/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hu/firefox-107.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e2060ae9fe2c65fcad4a4dca9477c7550368ac77c51d3b205ba1d8f47eac35be"; + sha256 = "cf72a10c7aff8630e303cf28674a9eafa7d836350e55b2cfba0ef887bccdf013"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/hy-AM/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/hy-AM/firefox-107.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3cfef8c3e415441803269178354e470a34e8b47a2bb7573ddf2c51dad79b730e"; + sha256 = "3c9432fd5bc0cb1af24d02044db04fdb5fb17397e9074282df7d3962615faa1a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ia/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ia/firefox-107.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "7390bfabf22c734ace6d542c33b2ff36430ba5fb73f855593b049fe0122224c8"; + sha256 = "6db076b844d8e48fe3563784e0a754a4f2e811b758a3604ab2ea357f48cbbccf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/id/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/id/firefox-107.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "4a571bd603a0a87e1f51dd032993ab0f486c1897d1ce513f849d3f8961ae7a8e"; + sha256 = "699d78cb6a5342e574b3cfca0bb1e8518b09c925a3855675a6fe89e4d77e641c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/is/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/is/firefox-107.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "697e35b8471bad372322db82bf7eece0dd064b2e2255f93d3b7b824f97e7deb4"; + sha256 = "0e29f520b0219bf52497803248b61c4bffb7ec79b1a103e912a51a2118805c1f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/it/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/it/firefox-107.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "01fc105b4ec5f7cce66a899281ee164f9833aedca8bc42026331a7a007fd97f0"; + sha256 = "2131b1350f2a1e6a5fd930b5f22c7859c12ab117d5f868949775cf24f17a4aac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ja/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ja/firefox-107.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a57837802be651563bb80cba7b41c1c1c012e6b83b20f82aa07161af48adc04e"; + sha256 = "5dd23e5287c03d3c9a14fd2dfa880ba291c9b25385ed7eb28c496ac7ee6fc0e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ka/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ka/firefox-107.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a2e70c7086e693c5114ba254d3ed1d9f6353d8b96712c006a27e0d91ae57b5e9"; + sha256 = "205df0df84d91b622099cb2e87c14b9faeecabd55463c31fbfdd3df98f3d698a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/kab/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/kab/firefox-107.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "27a6a4b211ca09d49eafd0b0fe3a742d0284bd2538f1f143377fcd8bd20f78ad"; + sha256 = "42767106aa484e7cae6e123715ac4a9e07059cd0924718b459155ceb54f72ed2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/kk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/kk/firefox-107.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "b9e8266eeff12f2f4af876f27850ed14740577df921ab41241da67e7cf7a4c27"; + sha256 = "0e36661bdd87256fd7e845f62989b1fef89abada607d1e07cf166bcbf44906ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/km/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/km/firefox-107.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "90ea58d4b4d76f9af91f85aa230ce6f605ee5ffed9a3dae0264cc5f6de9f1cbd"; + sha256 = "61ec390dfe07670bbe409f9ec14bdbfa1e46b3330f004e77f42cdcb110396ca8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/kn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/kn/firefox-107.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "38fa2c8ec82a4f010b487b399f32d551724f47fff55b44fd2667f0be64f1f48c"; + sha256 = "cca177d1cdab2e31771cf8f978f25a0c9e50ffca81737b8b067509cf8d10473c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ko/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ko/firefox-107.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "490e398b7949f1711f7d37f3ac9e466a8a44b56434edd5ddcaa13d420984e36e"; + sha256 = "9ae1f47be6ab2a2b18404fa07d080f35e814ff9f64e80303ba8df34abb545a1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/lij/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/lij/firefox-107.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "9aac8f630257d00b6938f33d23188db44c2ffc91cbc3deaea0437961c169f0dc"; + sha256 = "c49a3b55da23e8751f06a37270b07b1744ee5d3d684ac0e96c565690f2d4dcf6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/lt/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/lt/firefox-107.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "10c9ecf157ebc5347525251e79d79307fadee19d23271166da9a7a0d6c7c59f5"; + sha256 = "a8076fdeb3bd6560157fd18204b86b8abff52a3cedfc25d8c8d5e3c3f2e34554"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/lv/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/lv/firefox-107.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "958cf0820a0363e3fe51c871a104dbd266f353f07c725bfca847f09cc115e0f8"; + sha256 = "0de7732546820db139d5a85b80f7518093d0c14edc901060fae19f0a59241fe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/mk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/mk/firefox-107.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "24dcaaef6f2e8dab94e8a172d6eae92b1eb4bf0bac9d35a36234348d1d519d74"; + sha256 = "7e8248f5a3f2de82becd83a975aa3c347e260a7702851d323e53078965c03123"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/mr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/mr/firefox-107.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "15c972e198f598bded68b5bb46fa3d7c926bc15250de819719967ef167f54384"; + sha256 = "435d2bb0dafb1dbe1aa62cd2041da469fe8df58013891e03ad19413bce1bc0b0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ms/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ms/firefox-107.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6b801b428826a57b9a5f0c7b90cb8157933960f7a47bb118f8a904bfe200e030"; + sha256 = "d610e52fef5e4789d8366ffb524c7c62111158bbe34c3094c298b246a3c3fe20"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/my/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/my/firefox-107.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "61aeca4ad22f92f6003438988ccd0f09b4c59edf3486ee49399105a2e55418d1"; + sha256 = "f4ac639edd293fb8f34a9324d908d89a8d428c71c85380a73bddb7b495707d46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/nb-NO/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/nb-NO/firefox-107.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "89528ae463c359b91501107cc76b4454e89ffbd744ef25beaa0257aaf4d4c673"; + sha256 = "0b4919334e0de23ba64d448a62ebcc35ff040ed7bf75e868354d7f610ea31c13"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ne-NP/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ne-NP/firefox-107.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "793ffa67cec4a5436ec93937ba37bfcbe0bc0cffb8a8027ff7904b66e52cf23d"; + sha256 = "15a736fe6fc2d04174a0bdc87964d2d4e33c045a38ade58934e1a71cc2e1c0ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/nl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/nl/firefox-107.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "feaee3aba68a9062624007bb20c09da4807a94230d1497911dfdaecbc2ac3c0e"; + sha256 = "cdf5f69f88f0db3e8d6a0ff8be430741a9b8df2e890862816a1cf1bd706fc81c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/nn-NO/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/nn-NO/firefox-107.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "678650a42390111a0496796d6887848302ab1acc182bb76e2f60488c0c056327"; + sha256 = "6493740642533d83c7fbd3124d817f94ea32bb2939fec72d408e3d74bf9c4cd0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/oc/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/oc/firefox-107.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "74347a65459c968e9102d6613f3773c6a7486e17959575be116c66c60964363f"; + sha256 = "d70abceafb8033a4c080a17bd7c15fb049e583c5c072014907a0a8b19a4da1d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/pa-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/pa-IN/firefox-107.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "830480b8ee3886e8452f55a2421f3187e2781aaa3ad031851450d71591558d39"; + sha256 = "eb303ed66dce80892043b0e0af13f3733f55724b8e7f2670caac1d296179f5ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/pl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/pl/firefox-107.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "fd7b412fe95c40f6a51c4fa1414ee6ef423f60a0cd904dd351b6c10ebfd81e85"; + sha256 = "2d110e659700ed81859fb77614353263dc6fc6d9cbe968cd968f82aaa2748c05"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/pt-BR/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/pt-BR/firefox-107.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d5ed8da82d2c7f3c140c3ad7a2c08cf770f99fd6c7013d9623040b903ae81c0f"; + sha256 = "b5108739a4db70d248fd3d5af10bae3d3982dbb42f6f25776b2913912af2b3ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/pt-PT/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/pt-PT/firefox-107.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "70241f42e2e8657ba15d60c78668af2a70f67979a619aa86df4278efa1472537"; + sha256 = "00198a7983080a49c7e0297f31ee2ffe951446a2ce00053646d72132d64280e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/rm/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/rm/firefox-107.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6c0b14cf9b0f586b4520e9c07bfc6b60198fb7a487bc236853e5126ae820f40b"; + sha256 = "3178df44ec2b220864ddfd3c7efbaacd3f697c7f18c64c921af70419ab2c1279"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ro/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ro/firefox-107.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b1063b98c7dd9fa77136102999f568681020304ac9a6fd82e90e258a1b00b000"; + sha256 = "6fef9cbf2ab8b166f3c3acc0536bcaf685fae7c936c3dd16d09bca39a567b978"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ru/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ru/firefox-107.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d9937d647d7094c766a9130e88798ea64667c3cb19088941fd92b3c27a089e82"; + sha256 = "3a444732572fc6b65248b51c116bfca5d8a3171402762746208943f746393256"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/sco/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sco/firefox-107.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "de5c9c7fe2c78e4b82307e5a7829ad55abc1d6d850193083a1fce500b42b7327"; + sha256 = "092506a707ce1e6c9d0b33050b8db0beec06dda92ea12c3928a164136c08eb46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/si/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/si/firefox-107.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "41452058bfa19468a70bc37aeb1c7f42d2ce820ba2a8e871855a24a890f309e8"; + sha256 = "83832ec02c320c8a169181460294b9e7a8b25141baedcd325953a72b096434e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/sk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sk/firefox-107.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1a91c5d6a7705998c24ca9ad69f23065df22fd95a0d91bc23ea7f2fde91cde52"; + sha256 = "aad444baf5e50efbcf0b1315941b3c0cad14b454b73a8a2e6b43136285f396c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/sl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sl/firefox-107.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "403dcb2a2e37fd9fddab313ab412dc42b74a27c86c8848587fca718dad583d6d"; + sha256 = "6b5054cdc35cf6350f32d8991997da8b6a95b1fd029aa100635f4f2f624b9bb9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/son/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/son/firefox-107.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c00a87c076ad630658649dd6eb13eecc8c8f778845c14f71f2c332f80e327911"; + sha256 = "fd2ad8f414e61c405a630d978cee53a1d5611e8416065d68b04393cbac82d54d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/sq/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sq/firefox-107.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "1f2cd71f6c302c47fa273a4897749036b0c26453dd3ebfe80473963e929b609a"; + sha256 = "5a7d9c15f314a5a56386096cbf7d21f018735c060b0ef7756d3d3ccd1cf8c3cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/sr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sr/firefox-107.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b4ffd0cf3ced236e01aa90003945938d91beedcb9167475dc8b45f9c55055412"; + sha256 = "b64b59f6dfc85b8b3790656d53e17379e4bb0035fb75861546ecc34d86be6047"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/sv-SE/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/sv-SE/firefox-107.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "951af50b065c1300e6534bc9869cbd940c39f47e73bbf23a9c026d4bbc9c92ba"; + sha256 = "46d7fe9022e4b8d8fefd52936084fd2677189df6a286f05b2b6c7a92163e5909"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/szl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/szl/firefox-107.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "71dd54507c36be4f97bc364fdada4475c41cbdff3782898c2ee6762562efd924"; + sha256 = "a5a5b6242ae86a4d3f48d3d22a71ae9c9b0b93c6010d6e345ba655e3124c8acd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ta/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ta/firefox-107.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "fe7c1d95e41849ca1255251d76959138f2d359d5863646c97340fa9f2d67972c"; + sha256 = "8540b9a0fb01c49bfeb44733f77dd4d0a312740043a4a52a9ae18ce12ebdd20a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/te/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/te/firefox-107.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "ae28d8eec95101466414b8b43c73963431cc4ffcc1b9cea2ed1fad3f09bdcaf9"; + sha256 = "36bc5188c2a40ccf65aeee7a2b8bc84469a238ec499191035809da7525a8178e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/th/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/th/firefox-107.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c4d5f11bb3e6afd9db8c198519ed267b8d426e636513d7a062ad1e5e78733fda"; + sha256 = "f572ac21842a64d68efef460401ef2f385be8fee6c4b8561a91fd7e01529c940"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/tl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/tl/firefox-107.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "05bd2a998dc2ae65d6d700bd6e356a4678fda9632fdba6120e06e5084ad23c65"; + sha256 = "af523fe20aaba5916ff94c87d01de9bb863c6acf2e0ecd52de95d2f00055378f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/tr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/tr/firefox-107.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "470110990652a4e3dcf081c146e3bb3ce6aa8b2ccbd5776aba1671693ebba856"; + sha256 = "55a0d1bfcda389522cc66c5ff74e0e9b32ac6d94307f78772bed2e8dcbfc118c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/trs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/trs/firefox-107.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "8a3d9f8f326449e3e979080da37e59124680dbe08340e1cba32b57d58333eb08"; + sha256 = "4da3eeef1c5e4ad09e8ddf9439f5197ee43e95d062080f1bd09d23a60f265f82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/uk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/uk/firefox-107.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2b5e2a97084450afe8fe2c1ad921cc1a57e0972c7ace918d0355d160c53f1e40"; + sha256 = "928ab3b1483ae5bf2ab07c32ca7af9fce4dfaff69ce189b45197136b4ee178d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/ur/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/ur/firefox-107.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "067112a1a86bb44200bab7644787a434433c0f1ddc2b1d6b0ba3c48b12091178"; + sha256 = "628eb5d9b4048db3fab56923dbfead5a21d3af0ee819c2a5a810583888b33d0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/uz/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/uz/firefox-107.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2e6ac4f3887156c0e944b2bfb6ee1cfb7c81c7ea9ad5dc780943a8312bbd41bd"; + sha256 = "712d563f7f2437e019478564153b10fb13aa9d83fde0ab6908555d045d7044f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/vi/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/vi/firefox-107.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "72faec2269186d6665dd383071e841dff3985c6d6917d70cba29e1fc090aef17"; + sha256 = "7d2dbc1db78ca3ab69660da995d0b34f06471dbbd10d80d8cfae41ca7cc9e063"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/xh/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/xh/firefox-107.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e0a9e14f784b24504db15c26fa1d62f04d47fd8c9dfb168b466083cfcc7dc504"; + sha256 = "dd83264ca6c61928f587389c79941f80f6b546aede6bb45db60338a5a3120944"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/zh-CN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/zh-CN/firefox-107.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "74d138e2cb5068932e1b49715b824831a1c6cbce61c4b9d0e3e6d8fdc838fddd"; + sha256 = "eb11a06b2a26975e101c6d7c7a4123078df43444ceaa2be32ce4ffbb5ca07803"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-x86_64/zh-TW/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-x86_64/zh-TW/firefox-107.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8897ddec79f3f0f46e87bdb841fb352146737a2effba4019c51216fc69256d51"; + sha256 = "127c49f376459d60f2fe685b1b238c9bef0f85ede30d383a41cbff760ea4dbe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ach/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ach/firefox-107.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "94c85fa9c8bb459d0c99d430e88f936445627e45dbc9e29a5ced64b2f39292f2"; + sha256 = "57335b5daeaa76fa4bc6c81f6fbf2068de26534fba08f5115bcf0b217d469675"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/af/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/af/firefox-107.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bfebcc54e8caaa6c3100fb29a5e7d79278a7cab7d0d9154f15b933f6a26af1b0"; + sha256 = "99d5a7d122b39b36468c6472c29ef7a813c0728764dcc1d91c57291d314fcd86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/an/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/an/firefox-107.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "b896e3c026317caacd4b70c7539901515fd9da7d5962da8380b139a97182f0ca"; + sha256 = "caa65ff6e9ca252c146d5a5dfd7dee69b814f9943632c8781e0d29506904aae8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ar/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ar/firefox-107.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b8cfad102e121e52b5cd4f2f946d8fb78dc7711c8859b6a74132df3576c76a83"; + sha256 = "9c8c4584802b1786a6111c3b75d54a89f39d0f2c732a1a40c914d3a7ee6ca1d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ast/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ast/firefox-107.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "f459e02e7051faadb796f716918c597494731b4c28176157acb659f69d8ef570"; + sha256 = "5bd64adcba15438424542d9357f23805bfc408f42ea7e0cfec7b3adff194196b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/az/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/az/firefox-107.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7cbcf6aff86fcfd63b7eabe354538f27e65ef38c6e3d547dba66ba0f39997020"; + sha256 = "93382d3c467d99b894f0947ca2f94b1be28bb593006b96ba444d24bcdd0e3ad6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/be/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/be/firefox-107.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9edc60db4ea74b4d994c3e9518bd04372131c913f974fe0cc4fdc9f48a625105"; + sha256 = "0617175ed5698ccffddbf7054b5367408e482272ea42fe703e66735a590d5093"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/bg/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/bg/firefox-107.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9be082827f63f0d8b27222be9071c47da2473dbfee2d68e4d8f277f4f9884de6"; + sha256 = "89ba391d03184879c8d09bcb5077a877034e84a00c738e3cda4240282f34de33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/bn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/bn/firefox-107.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "743b57f7f1609826298c244316278b828c5de836ae415fbf7198df90bf5ebd4c"; + sha256 = "553f57b84d7fad2af979dca958753c40170cc359f6a4af4892ccfc58a439c395"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/br/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/br/firefox-107.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d77c969ba9b74ec5387221a5062995e57221452b1eb83a7fe398bbf7522b728a"; + sha256 = "ffa7443da877f1ef6dcb9ce2280b8133509cb90d5c632fd3710229a47bdc20f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/bs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/bs/firefox-107.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "f81cb2beb3cac871de92d1a4d71fccb0136cdb97b337a8206228479f5af0f6d7"; + sha256 = "9e948b2775c34be6f94435cb8ce1d1a99d2eb55e83715add8f704de0cbb7c4b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ca-valencia/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ca-valencia/firefox-107.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "23d2ec909e3067b3e1e935ba61892e2a659148770f39c0e55d1eb16a15fdc729"; + sha256 = "703500d1be715bc14d6c2221f45d9d31fbc73aa9aa4fe6be0ef23d08ed6f3156"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ca/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ca/firefox-107.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "da8b4757b4fd3854e1feeb7515a30c65d1734e5647a9fcb72accc3778211c4eb"; + sha256 = "2b079bf277c96d11b9eb7bde744910ddcabdf9024236b042edf72ce0d4450f53"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/cak/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/cak/firefox-107.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "bf491359b287a592cf55d6443c4e0defe7ce421fae1fb8099a8b7d24e3de72aa"; + sha256 = "6e8daeca403c0a928ddae33d7b78c2bee0c32febc0c1d56c5264d04811dfc34f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/cs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/cs/firefox-107.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "228262a6bd412c59fa0809554f6073d4260b0cf1b1b521181cb4a71e7c0fd5d2"; + sha256 = "e1d74e5d1b9e53107e3597e3673d129067e8e75f8fca61cc2d09535aaadee3f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/cy/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/cy/firefox-107.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f7e3d0aa40673fc1e7f94a27b6ebcf58543a848cb9603598f69f2def374d27f6"; + sha256 = "941572c6a262141cc4359dd13d248c61b541b9a9bbaa597f187bee5b27ebc28e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/da/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/da/firefox-107.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "bb11fd08ac4c19ae592a8d8188880320978824c2886c46cc069990ea778f9d81"; + sha256 = "5cc8990bc3a9426984523ca6a49fb5f2c4fe444b42e415dfbfdb2004e9ad2eae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/de/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/de/firefox-107.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "992eb739b585affd37a0e45228c7b4b9368d68ba0a7245c8467055a00a275e1d"; + sha256 = "644474d4c128fb6eadeb22b9c89c3d6942cbe391515aeb1c046f01dc0986f390"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/dsb/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/dsb/firefox-107.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "46158408f4b12749ac73d650fc16dc436ef3a52150cac82c9dd4e2d509a371d1"; + sha256 = "394cd9728b0e4d722e13e1776732c8fd38a6e0df331a67f365518a66c1e7bc4b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/el/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/el/firefox-107.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "93ac0eaf96a7a2acc753d14ce5ca5bfe1722cdcbe2b8a743a291b1a4b7a9ae23"; + sha256 = "4848172f39c90095bac18808febfeea415c073382ab5efb115a57935267d867d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/en-CA/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/en-CA/firefox-107.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0ffa6f576a06680f1ab690ee894ea23885d4993f6216c8d236ea8a493ce07765"; + sha256 = "607d27b3c7df703d317264b0441840b33ad2844e7919fae6e3e6445e14693dc5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/en-GB/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/en-GB/firefox-107.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e038c985250095d4267cc2fef9403af4f8487fa47e9a522a82e5d6a3db9d8907"; + sha256 = "d105230556168f5343a2830537a8041c9a6027e0e60f58ccca986257ed478379"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/en-US/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/en-US/firefox-107.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "68c6331b8263d9eef2721410a00a523d708101306d96585009273b8b15178b47"; + sha256 = "5e341f3c5a01324f4c46ae13c42634b2d478207c4296a6557af2e42ceade75a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/eo/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/eo/firefox-107.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "6921fe7696d694ee1aa3798d1aa5af384bfa03c50171ed1c8ff2657a3da74826"; + sha256 = "da156a9cae2623be71434bbf0d38a0dca95cb408955a03a127d1bb3950ca9a51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/es-AR/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/es-AR/firefox-107.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "2cab835fa01a0884c5f3e3823d5e99d487900f77784eba6898d5efa1f41a93fb"; + sha256 = "dbdbe6a406b7f5e9c8fa526d776384e165154ce5abc7a0c2eb3e0d5f026551ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/es-CL/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/es-CL/firefox-107.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "dfe519f8b88c8912435e3d642d341da759293de6ac7b568173ee110eafbc3fad"; + sha256 = "16b0535460b2b64cf6cb30ca911360f2aca58cea3cef5fd982d0ee860d70f2a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/es-ES/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/es-ES/firefox-107.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "815b23918a1cd32943f46e9ebfb483d73b6d9625257d625116a01b44a4d92ca4"; + sha256 = "56ca17e71f3a4b65bbf8bde6cb66928ecef65bfa50b52b67be4ae28725dbca39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/es-MX/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/es-MX/firefox-107.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6ea2831568bb99bdf87bd56d4a0f2510630997e2ecf65e8ecd3de79d7c7ef74c"; + sha256 = "66f9a809359f2a5361507bbb71b02f1d3606b13de76e6bbe5b3e324e0552bcbb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/et/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/et/firefox-107.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "6ed6e4fbb06db113a6bd1653c3364676d99723b2196a5b49faab0579590aec7d"; + sha256 = "f201c1676d3a7531c2a239c5f79278507da972c376f17653554a230c365a63f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/eu/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/eu/firefox-107.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8247acad9f17641c22b2def64f57a95d190ab62e89c06f94081bbd55c93b3aeb"; + sha256 = "88393f69d7f41f6cea9ff23fad774ff14184499c132ab9daf3b1ff0fab595058"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/fa/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/fa/firefox-107.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "095a153f56b903811d7a0c9f02916dc31ec483294e51c0509dae54c180e55464"; + sha256 = "aa0a49410695885f5d5a99650922c6b4d2637c5507d0e983332a3ed3c7f4301b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ff/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ff/firefox-107.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "2d19578ad729800b7909be7d161c9e3fc1cb62067077b83b81e28ad53b8d14c6"; + sha256 = "8f495bb9c14f47e2c9828dd20fa91b6cde5fec3e278ea50cd21116baff6974e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/fi/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/fi/firefox-107.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "cde8376e308d09c44f4c8b38830fb7bf60f3ab04ccbf03caa9d3962f5e796551"; + sha256 = "c51c3261059a365ecd8785a48201cb59011efda24388c553cc76d7834ae08de2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/fr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/fr/firefox-107.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "418b60a44ae495b137bb34fef9d488c5566a5c9c9b6a25417fa6e27652abdccb"; + sha256 = "08a3ffa8e03ebbf8e2f814d682e7814875ac844f7bebe928049de1ae0ab5018a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/fy-NL/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/fy-NL/firefox-107.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0d12989afbfa27fe866c66ce7da166f9a3df5a134c87080e69abe66f99accd56"; + sha256 = "7a4cf93bec3fc86dbe2709b27c1f264a1e316e380ab04d4d66517755f0de863b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ga-IE/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ga-IE/firefox-107.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "cbaede536b00c991ac513f850546acee1941ecf98491463b9907d7c6598d4344"; + sha256 = "a8101bbeb8a00ed611bf4e670c0f49b4cbd0ae46aa063210d2b39e06d1c9b1e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/gd/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/gd/firefox-107.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3f203025375634e1481fb1373dd006120afcd5eca65a3a18f3d8056b117a1ab2"; + sha256 = "cdf9b52e93a84594458e13661d2cde649a6b7001d3a5b31619b0e75f01ada8f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/gl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/gl/firefox-107.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "f9a5f45f80f99f6517136668d485a3471584445d72a21975cbfbaf4cc0a2451b"; + sha256 = "6f9c35bc3b0cc24c24cc35c1d3f7a9c6467cc1670aac4d06366a12e5d83e0054"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/gn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/gn/firefox-107.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "6fc1c9c31e989b652556940d771702ed8efce7b867fe500a7505ad86d0f5ddef"; + sha256 = "f864072d648ba2c65527d8959529aaf669b4c7d809cddbc13466bec07d565da3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/gu-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/gu-IN/firefox-107.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "fab389c57163cd0d08ebc54ef23a4097e2c579d6f5032c9da098e0013cb87383"; + sha256 = "da2b9782d72dd90ddd07b5c8bc3f236edea5de6844b500d59c46a792268fea0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/he/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/he/firefox-107.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "aef8753ca5aa2160c9fb89d413c4ec75976960f3af0a2b73c6c72db1c6228e77"; + sha256 = "c0a764c4beb2cf80b855957e60146b219f55d21f66b0d9bdd5cdb6407eb9210a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/hi-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hi-IN/firefox-107.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "eacb5f7783cd785ea1fec8cb6dcd3792f306500f727f1308fc241226ced89b11"; + sha256 = "7dce018cebdc611df784c44b402a1a651ae37b6705ff586307a00c301444e680"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/hr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hr/firefox-107.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "30d89c75132c1ac94d60a8abf3bda2126e0be6c8a0f232e168eeba18838a3f2a"; + sha256 = "9109f2de571169e3bb956799c13d7f051537de235720d06d422574cc2e190e73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/hsb/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hsb/firefox-107.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ebae564d20800aa98eb4f37df49f67438542dd5d9fdc2d86a8e5a834cad43290"; + sha256 = "90350658065ef477695de5d914dc52ba281f8c7391e4f696c88419ff1ced46c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/hu/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hu/firefox-107.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "086e81341cbadae866659080e4809df0226188df63da909810592b02ef5a7c65"; + sha256 = "24154681d63cd159b477fe8b71015f78e807ac5981434c52bb112ffd0b78befc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/hy-AM/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/hy-AM/firefox-107.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "67331c458f68d9695ed17309a3d2049996aaceb593a4bbfe16ffaf4624ac3083"; + sha256 = "8640d2546a751de4b6391f7ad82f1ce25e7be24d9d00eac1521ec138b27bcd06"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ia/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ia/firefox-107.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e6df1c50081ea7f4c99efee9b15481f467fba9e2ac0a4f4a9918d7c9b44f0d85"; + sha256 = "385beb332d252bf030b2f01a28f6eef99aded89c0d12bb30fb3a7b192ebff8b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/id/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/id/firefox-107.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6ff8341300ec74781de1610fd7c014b8f6d986679e23961cd404d80f6fcc9bb2"; + sha256 = "8e0d8a58a74752c82db369a2dc9131f420caca8f6bd895a015b22971cebac393"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/is/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/is/firefox-107.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "91baeb94a70fe1bd3153e14a8a08d553d8bf2185ed0f121c27b0b1f6abb8d40b"; + sha256 = "4e54090a91c3aeb6ceb6379fd8c0e4482bd83973235ae6127ba9f07fff392576"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/it/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/it/firefox-107.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "349287a8828c81275ef5b8beb538f1b3dc023a5ba89065f9ea9c5494739d9998"; + sha256 = "15537017956686f5fa7aa4d0f7e03666ddb5dd174a45c2102253c3e4f6183e2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ja/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ja/firefox-107.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "19d1a479bf55bcc0afa40a702b4c3f8c943cdd8e678a1b4f1911e0c18c31c338"; + sha256 = "62ccd8504e78ef520153cd6e939d129447e474d5d6082208fad19ab2caeacb4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ka/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ka/firefox-107.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9bc0f0da2ab37c0c94bdbef63c80a063a80f4f7d341caef13afd579f52a6dfb6"; + sha256 = "6a1ecf4c834953bbfc135cbf7b4bbaf977ec88917d7dacb361c9a46df4253ced"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/kab/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/kab/firefox-107.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c6c2b8bc77704941135a65d185746f38b965540a9a9ac104d85363ecfafef87b"; + sha256 = "ee31d4db88583814e8c093b74cee46d36ab2f5595efcf0c89b096f3eb41dc2c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/kk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/kk/firefox-107.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "39f23a865c15f3c61b9d33e22a45c53a7c112084c4f26192f03430387c6d910d"; + sha256 = "3134a73eaa3ea7b63b986df9007cab41927239211d8b6ccf8559ae5cc41176bd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/km/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/km/firefox-107.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "d3f00a2e82e8ad95716082b63e14142f5bb2bb4a34ea95027322cae65d9d1927"; + sha256 = "aa2c336739c86095ac9096e41f33024750aeb22ea81a229fb72ebb2521579d9c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/kn/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/kn/firefox-107.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "c55068255ff3196a98de076b74f89a0c1c63b3235aa5a55ce967e2729715349b"; + sha256 = "492a094b2bd9dca63bff6e3d5a8a065fa9f69ca8bbbf72b339a5e8468d787e50"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ko/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ko/firefox-107.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "12b476eea13b7e9d853571428865a30c92170fbd19126d930dc82d3f7360f494"; + sha256 = "f028a4bd71ba04473c97e9a82889c351c88e60d5e417b3f130f42540284adb73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/lij/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/lij/firefox-107.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "dbb157817d78bb23e8bd9c9511524e64775ed0c4db5a37235cf8af0495c1a33e"; + sha256 = "139d520bb1d60746ce182af6190d6f9a468f0c9c08d94fd4fba938cc237cc344"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/lt/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/lt/firefox-107.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "33b1046501185048a6a27ce181a05bdc103054b921a2d11eb1485715fe7b5277"; + sha256 = "c095a85748064f7c1b420561676b87db0c0e299083f3b91f17abaa7361af690d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/lv/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/lv/firefox-107.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "30e4f908ce07f1cde65bb3260e5aeca1835e8069abc2111d67565c4d1ce2eafc"; + sha256 = "abef8cac24688637da6e2bf57c3d8ad84d061c9c0500d6ade9a0e447d998edd6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/mk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/mk/firefox-107.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "1e8ca562cd0f638908c6dfbf04c368a5ae41ae511736d5e10bf1d0762c95ff92"; + sha256 = "ad67d4bbfc76ff7c35a2c33205c4890fff8f955e0a325aca0998666b766f84af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/mr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/mr/firefox-107.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "027ddec94f782f60eff8376985473d95b41bcea8f568bcd2fcc9f08d08e00985"; + sha256 = "a8ada8b1336f809010a8765f94aa53877a8df05b0bfd5ca3bc050941269f58e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ms/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ms/firefox-107.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5a9a33acbfb3d4353b78afdd1fc691cca34bf524096d8bb97d2ab27a61ec5c94"; + sha256 = "e9bbae9bdd930d5b623c30d0085e1572a6069650d3f695d95a4ddd136260240e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/my/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/my/firefox-107.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "69435e3d8f0419121326a52312f91822b40e8a69aab898793dbd62117e6a7e48"; + sha256 = "b2a62b8c38f287135874ff7c63df66a48172b93f48085c38a7bf99ef7d788ab2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/nb-NO/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/nb-NO/firefox-107.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e5e90621bd9159bcd6f952f090a80acdd3ef0bf9a5509a8692ddb581bd3f681a"; + sha256 = "fb9352cf1cb309538f021786132081c2219505d868e5889af138cc794d46f4c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ne-NP/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ne-NP/firefox-107.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "dc7cc6cf6a1839ffb960b9bc15214d1493a515dc5920aaf0e96db919aabcd94a"; + sha256 = "0e46622ba5f562ef8609f77754354e8614d464b8b05a8ec57d9afe4d724bc9b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/nl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/nl/firefox-107.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3597de37e0003de52193c40fb829c8c7051b0e03a81cac6e067d145fda176308"; + sha256 = "96d5af3ab9753e7fd182d94076cab889a749d5b4684cd94c46ef863403516fff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/nn-NO/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/nn-NO/firefox-107.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d26951d5d9f674195805add539d1060d07e3364b98801e3d77be217cf1fae76c"; + sha256 = "bf2bbdcf7b7b734fdfad845cd51514ea5d529a30f487d0ebc6631fa133e549dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/oc/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/oc/firefox-107.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "16e5509fe548fba9e275fd69e3e773b4203684608542d9f3ec1887845d96d80f"; + sha256 = "a1dace30cfaedcaa2d3ae6b2cfadc5f646717b134bbb780ca15920d903fa49ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/pa-IN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/pa-IN/firefox-107.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "9b4872966ad61fe8f228a1f02bd47d87115c87591a139c1422a538610004599b"; + sha256 = "3c9272845ecf03b477faa8e424e6ed91edb5972ae7d12749951bd6bc99f5f9ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/pl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/pl/firefox-107.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "fca3e486acf75e5157525c5ecf2b72cbcd04418e5f5d9620548124cd7280e339"; + sha256 = "013875909c5d604eb7c0da6a86253b6c2144b604765a60129b12af0a2619abf8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/pt-BR/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/pt-BR/firefox-107.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fcc5745171b981a5d24f33aa4566e9af3231f52734f8b7bd0175be663f0811ee"; + sha256 = "70b0b0dd2c09cb5bbaeceeaec7a9dc3b1398ebd0fe57ac78e0cb6109320a89c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/pt-PT/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/pt-PT/firefox-107.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "097fe7c76508c3ab3e95672cef1c6edb240e9c9a694dc20b8d46e2cbe7eb95f3"; + sha256 = "7aa222aab2459d2b760f73241fd17991cc383855dcb290aa9e5368ed8544daed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/rm/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/rm/firefox-107.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "2ae3dfe23a587f9e9b5025ebe80e64ca4f983e641919ce655a08ab7edb308509"; + sha256 = "fa757433e9126abfa094b211ef8b4389673bfe0f6fbb4709250fb0a7d3faf949"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ro/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ro/firefox-107.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "902b3d1a5fc0ef703e4ebcce31ef0411ef4ed03b51855da4c4250116d3cbfb47"; + sha256 = "a955c51bb4c2d6b0292a2a7dc5c56df0508dac685bae09e620960678fa1dcf18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ru/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ru/firefox-107.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "de3346a73c6172166051513084155caf72320e67512b0bcaf3678def4059ee7c"; + sha256 = "ba84b6c4d1d3eb41da9d486d34f0d9b6286f162b9587aa572b17aeefe8a003f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/sco/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sco/firefox-107.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "abf7dfd8f3ab5749be0a14c6a364f6ce75b54bcac8cd1d4cf9d9b0cd3c392b36"; + sha256 = "e859e8de8186aba80591da6c2a47cc4ec1ff48fdc9fde6d24d4ff5304063fa6c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/si/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/si/firefox-107.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "381b16b51099c938cbb4466684b47fb87671d530822224a762e43fcb9d97d083"; + sha256 = "98d731c72494bcd5f1a52a04f8f11358bca0e66e43f6f46fc8353f1a8fe577ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/sk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sk/firefox-107.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fbde7051f53696d17e1ae7664886b28d02667f210e224dd7181897ed83274b67"; + sha256 = "cb1c600cd02b101eaabcca079da9f7a93d0d8c0cf22abcdf0cff0fd6ddb44e64"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/sl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sl/firefox-107.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "73cdb49023074922e1e7cfe9f8fb40d7813d00e8ec56098adeace4fda692771e"; + sha256 = "72f9c493592af61d614d13eac2b720955a6eefb2f15f8d8ae4fda7ec55d46f3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/son/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/son/firefox-107.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "4ecb1306a36a9f5748036f6be51f3c2233bd0e30cc83cc57f7bd25043ab28e9c"; + sha256 = "7797f3e9614b44f95d4769dacdac0f89e04b03bd058a9029cec7a9be6c4f4e28"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/sq/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sq/firefox-107.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d865f54a121b2c034709e5f08592b3797cde73b8edb5b7fbb76983b33b310041"; + sha256 = "e89f48aa57c12eea6bdc501e51081b51c32ee39328a14355a8df97113c5e66d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/sr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sr/firefox-107.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9e9f820699595322de3e7ae8491b09344abb946eb81c664ceef3ab53a49d1f3e"; + sha256 = "c8c92f2ef7a95dea220347efe80b21ea614770669773e1f053b0a8f292a44447"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/sv-SE/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/sv-SE/firefox-107.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b416f862b181a174e72f2819a04e61ad1a16a23b26e06d5752543154811ffe88"; + sha256 = "826b14f184e1462723f838f73a1f3007f95ae662a0f0b1132d17cb75f3211803"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/szl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/szl/firefox-107.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a376307555f76375976deca3af214eb9f3f123c313c65dc634a4d46b0845e405"; + sha256 = "50a0314fbcfeee232224b4660053d6380e2474c9af69238ec9496c7a0ac83bee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ta/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ta/firefox-107.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "6e52291cb940ec04f9e5cae4132929471e44931c885157e7b76016a0102c056c"; + sha256 = "681dc2309bda68bdc50a322f607d288d2cc1b0fa102de29298aaf0731f327888"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/te/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/te/firefox-107.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "9062f19d6efdd81fd9c3acb0d31e622b70020ce0f0f6a24054b6baa1bdf1093f"; + sha256 = "003542c90d840a3a58f2f54c04d6c5157cdf677fc9ba7ecebd869b468193d083"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/th/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/th/firefox-107.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "9703ad684d03f59110ab9422718bd17a95bd967f3654f9b25b9b4fe588eb7982"; + sha256 = "8d871cb994f172344022915214abe1392525489f0391e53356f8c8ca84fb0cf2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/tl/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/tl/firefox-107.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "cbdc5b49ecb5d2ab2758383f2474f01407225828e858e124612fc91df876e8cc"; + sha256 = "694943d1109d0ddc08a3f03aac45add7f5721e11b3d2c45cd8c70ca0283273b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/tr/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/tr/firefox-107.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e6a236b26fe19b9d23e8bd2e2d1fc922292bd0b38a66e19c44a4a0b0c3bcecec"; + sha256 = "646ec0f570e4e89b73d44f4e25b522ce9c0ce7528a69ceeb527bd0ee35484653"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/trs/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/trs/firefox-107.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "fca60b2e299b842444160d69869be811d14a9ba11838c3ced841ab464c3011f9"; + sha256 = "560963c920c298374a05f59cce006ca86db605732f95e9e756626d28f2e3f716"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/uk/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/uk/firefox-107.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d33ab902ac9001bf0b7c47ec813eec10a719b387ae7f096ccb228a7dab52f009"; + sha256 = "f68cbd33fd7aef2a8a9a86e98dddc3400f124ccf6987ee8592815d1bad3e64c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/ur/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/ur/firefox-107.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "949a4e21454acc28fa1262de13c512807be9c7e33251ce70f59307568403d20a"; + sha256 = "3ac86fadb880a895eff24dd6514f4d63fefdf74cd728407289b403d66ae19c3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/uz/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/uz/firefox-107.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5be012849a38c7b434e1b39eac3cd7d3e92ae333ee7c5740a208bd4b204793b7"; + sha256 = "f6debc624fe80a6e513c385b3fe040e1cc800362b222476eb11b709953c413b0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/vi/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/vi/firefox-107.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "678c124b44d76a381fff3603ea7ab2b338f753eebb2f506af23a28efce529e80"; + sha256 = "a03f2738c7bd9e80940a93e44624f73ab3432a6d4ee4933cbcfb710200587533"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/xh/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/xh/firefox-107.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "d1d255a67b59aaab9ebccc9317ab34d818b5d5a3d6ad5545f0608b4ef4d05a74"; + sha256 = "ca741221d67389caaefbf728a226acffaeb7812ed9c4666804a6e8f09f1100ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/zh-CN/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/zh-CN/firefox-107.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "57a0052a120f96d11a53f5886219eff613d0c35be6e458ee997df69343bc3137"; + sha256 = "b02103d3720f9bacefc7d8cab545f8dc38275f4c8c9645cb5e29eebd22de2f44"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b5/linux-i686/zh-TW/firefox-107.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/107.0b9/linux-i686/zh-TW/firefox-107.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "66b056399f4605538c2a6a4fafa5976788e4c7cb58f453395c9a7398f559b2cf"; + sha256 = "72f39277303b3e2e3be109b02c4b116613c71e9529efd98d2fedd52c744b3720"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index da43a04f5a541..6f4fbe9f2e9e9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0.3"; + version = "106.0.5"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ach/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ach/firefox-106.0.5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "31fb0e887239284858725cdc9ca12336964425e204812fe7fb152eedd4b2a900"; + sha256 = "de20c9b8647ee05b5105451eaf1089ec1ec8fe66b3a7d28f763d1ccff72d00d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/af/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/af/firefox-106.0.5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "49857fbdeaa48ba225e1b4804b4958f4df1701f677b38da75f308169f5ba0398"; + sha256 = "88dbfd37789f97bd50150c0688c982624e2cae00f019df8c7963e189a70be88e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/an/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/an/firefox-106.0.5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "420f848d1510256f431a412a59ea8c321f0b6ca3414a947a9932037b01c66881"; + sha256 = "000975748e3093e1a071fc96c5d5ba096964172e01a8ea77a68a730c46e03885"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ar/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ar/firefox-106.0.5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b108d4c7989e55863d54fe43bbdf1ab95ac6f2ee63265be3ec8a2c6d1e89370d"; + sha256 = "9062d287f1bf9f5600045ccea06dccfcf29963f927047f53db98e97434ede817"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ast/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ast/firefox-106.0.5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5887bef188ce5bc9261e9ba5b335800c5918a1ab9a5ff64f549a4d2d1fef6bbc"; + sha256 = "d1887a1c5b5b500cd86f701ac98135d3cc86214ded3a5086743e749f14611c04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/az/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/az/firefox-106.0.5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "faa0fc42cdc7fd594dcbf8873913144f881be036e553b9b913ec5b825f2358ad"; + sha256 = "82c6eb89b389e7547b8d0c74c19de7f889a4fe41837f1967230addb70af3234d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/be/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/be/firefox-106.0.5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "01ef94bd46b2cf6933517b048452a665b260291f7eeb6c71ede047e19942668b"; + sha256 = "c0de3d082549c9fc1abd82c33821b123b78c2f18d98c6a048eb71722287a20ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/bg/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/bg/firefox-106.0.5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c800c227b1c6e55f6d2d080d03f72d4469a1452be5c388e472ceb0b99107f20b"; + sha256 = "1ddd268c0441b7ff4ab6df3aa5e2b869f0a2090f7f2520888ad121e781c8e50a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/bn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/bn/firefox-106.0.5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "aef3853b5fcaeb794cb2014ee7ce2c4d31692cf2a8ecdab5fc276645c20d4c61"; + sha256 = "b324b6d3ef4ecdf9719fb9033770e21aaf599c5ee50cac30674cd00372a39e08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/br/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/br/firefox-106.0.5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "11be73589548959ce15e1ab8c2d5c90a918cc8541bb51707b5b12bc29404aa59"; + sha256 = "a82f3113f98d8fe6ae36598130dbf3a22417078fff697a1f1965cd42c3aa3b51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/bs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/bs/firefox-106.0.5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9d38beb6e0b5070c6370994bd7f714e4b435f82bb802f708d0b32f1665ba674d"; + sha256 = "608ce5cd8e10d5229b9b35ba022e83efe1dea9a344ba02ae1c393c60f0a89cbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ca-valencia/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ca-valencia/firefox-106.0.5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e25facfe1cf74cf83a5afb47e912d59c80b66d276cbac794a43c7871c9a2706d"; + sha256 = "11058ac996d040d1290280a28cdbeb2fb39930de10c66cd1c242688eed21fc0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ca/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ca/firefox-106.0.5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "2bc2c0031ca385bbd3935d53824887e047478509fef3941511fb61c35c981616"; + sha256 = "fdf9e15faa3e6c0de727a1bcbe37ffd50b18f2a9029c94af4a95afc11d51493e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/cak/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/cak/firefox-106.0.5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "774147fb330ad37ab5455954fcad9daad265d8ae996c5efec85120926ee20b65"; + sha256 = "437153e634cf3886756f9fe5cdcea75689959e9a8bd5eb23635ef59e7caac4b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/cs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/cs/firefox-106.0.5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ecce0b2298fd44a63026ee1d057d02972e168e7c0ee792ba404ecb8f573fe618"; + sha256 = "f81f3c40dae9c1df4fccf318898fd3e1a819847361f888ed8f4a230f99436b4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/cy/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/cy/firefox-106.0.5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0e70e7413d7e72ef44fc905ff4689e47bec3224533c17c8e8751a814801e8ac6"; + sha256 = "fd3ac9eb5bd3fd61144320bf826555ee1181ba7fc1f19d0ce697760e755b249d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/da/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/da/firefox-106.0.5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "27997c29c7db7bf928559beaa42d2478e8c18c05494307c6dbd1ea66f1307fdc"; + sha256 = "bbc0762c9e579d4cbf30e90a22596ae0848b5de7f0ba444afbe822741a9a3be2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/de/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/de/firefox-106.0.5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "58477c226f5e30bcfdebd5b7a7cfed154eb277dc227e0d57f0fc5b34d4785869"; + sha256 = "1931181943067d3a65c1e656a6f85780d9f512b1a8a8bcee966b1d92d3ba186a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/dsb/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/dsb/firefox-106.0.5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "4cdbef5b1daa86c8ded63fd71f847d81b1a81067ad721ee31f7763d0152214af"; + sha256 = "24a2fe0f1f276669fa33a2d6005afae7082ca0c6f93d73609b0a02b96b0537cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/el/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/el/firefox-106.0.5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "20422b61965b700acf7beea92d09e7f5bdc71cb2228451a5559b06433c949a7a"; + sha256 = "3d3e6008651d2518adedb75b3c0ef4ac9d20c67a2fac296f20fc6b4ee5c76046"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/en-CA/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/en-CA/firefox-106.0.5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f95f69a3c742a8693d3331f582bdf1086c8142de0fd790148a7db3ef597f8769"; + sha256 = "905fdbaba632a8b1edbd5db3122013b1c4a8c8e09d5c6a11463226d174b56e08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/en-GB/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/en-GB/firefox-106.0.5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f511ef6add6fb5ebeb711d2b7fc1f0f8b79545c3f22a17b91ff3988d7c43f72a"; + sha256 = "b48660979cf355bf9d45513839b530923fad069c4b3adc6042fbb593869145ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/en-US/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/en-US/firefox-106.0.5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0c18141ededd6c969f00275eaf26d05933f71bf14143d70d4f5fa74df9411155"; + sha256 = "8fd85cf26df85bc1df86e708763bad84da6486f320c5fd3bb95343cd0804d01d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/eo/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/eo/firefox-106.0.5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "d177833b695e5ecc92abef14b2957df0087d04763dad69b0598bbb5278885702"; + sha256 = "a9385b94ff73ad5127f84e9c4c78d2ade002d8a5be404db8db890eeca9fafed0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/es-AR/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/es-AR/firefox-106.0.5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8f66db37834870232eb60573e29fbae645f3bc88557678565bae835f1f91cc8c"; + sha256 = "eba6c875092125a561a08689c81aef00d39379cb5c9295a289b054c037289321"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/es-CL/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/es-CL/firefox-106.0.5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8e565b5630ecddd2d026b09f3f1fc983ee651d1b6af35d6f3c66277380048413"; + sha256 = "cc87602616b80c806b01e37fe8185e25efeb7bb0a22d659e120ba0f3cb562853"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/es-ES/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/es-ES/firefox-106.0.5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "278a50d11dbca9937859334bd4456189c90030a75c697965dfdc17191c96bff3"; + sha256 = "0058b27a15256cb9b1e17e2b20ac869b153ae0dd47df55602f0407fb62481f87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/es-MX/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/es-MX/firefox-106.0.5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "69bb1b0852b6c10374ab8a332372decfb9b6c8adade223ea934463d17c2dd2ee"; + sha256 = "405a538dd2d0dc6c7cad0f59789c6663d7b52d407c5e4b15c451b02758e45b4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/et/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/et/firefox-106.0.5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "25859d8df8d4f557e32ef3d4e520428e0d4804824fb95f60644720142acf9de9"; + sha256 = "cd56167f10d8fd754ebdd85cbb942e4462d2ebb951020fdf80e09a993af6fd6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/eu/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/eu/firefox-106.0.5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3e84112cc7981c763bed273cff26285fc3a7cf0e2b11325165a23958523c24e9"; + sha256 = "1fba6204452d49df48461ee9468b09c68c33536e1dd88ca0ecd3d31a9de38592"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/fa/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/fa/firefox-106.0.5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "2096bd82fff97da6ac23d88ed92832503084b30444ed38ee0e61f7245d8a8aa6"; + sha256 = "289d98c4d5f61211313c5ac14daf79bd124c108d503af538cc10d32fe3e228a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ff/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ff/firefox-106.0.5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f9e58ab7cb3b06482d7e0d0814a41ca8f0319b6130c16080043c2d30fb3786a7"; + sha256 = "dbb7ef853ae7b88fdfbfae511b442439d05371caa11bd3453718ee20d5a20edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/fi/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/fi/firefox-106.0.5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e365f19a9e58c447f5093ff77208fd972d1bf2afddcc92e9a0cc94ce7c7986a1"; + sha256 = "84b2a50361c62cc0df7ada06e307ee39229c9174179901de4ca48d7e3bbd4a2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/fr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/fr/firefox-106.0.5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "0a313be3de9bc834993ea5085290c975485138718131aa83ca52818d22ba97eb"; + sha256 = "f50fa5c5a0f7d4d34cf4413afc89737ad3344b930f80a12bcb8e277012b07e3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/fy-NL/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/fy-NL/firefox-106.0.5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "991550fdcbaa1be5f8fc3a66989159a67a25fbc8436a488126d99abc76b9ee63"; + sha256 = "5ed8ca07362f91fb7d1e856621519b4acad992caf34c2cc8471f485d8b0fe549"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ga-IE/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ga-IE/firefox-106.0.5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "bbd2826156fec3e556fb2a0af5e4a6b056a04d6808a0c8d442648264a3f876b7"; + sha256 = "b4a5d6c721da37c608a7f552a7a5d468d8940e9f257a2009d8b0adf0114290d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/gd/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/gd/firefox-106.0.5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d5517a7292652c26073004055bac3cc3c269e346dce6537698b4945c5c9db00c"; + sha256 = "610bb032370f97045295ab29ec1d611ca404bfe31bf5114e5a9e311b8275a312"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/gl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/gl/firefox-106.0.5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8b527884efc8233e42040f3ddba1078149bc54bee41674b37912bc7ba3f04aa2"; + sha256 = "61164548e79b8f7b1382139e376f0bef6fa027bb636249e4249f7d5f8fe96014"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/gn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/gn/firefox-106.0.5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "615040d2e5b1a9f8a5bf13f7f3485fc63e378d23b0d3ea6ec84ab2aeb926a3f6"; + sha256 = "ed5f643e37f97c9071ff23c4f1570db66b5f45d7083ca49915adee35c8592220"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/gu-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/gu-IN/firefox-106.0.5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "8c11d61d431bff7e4725a123ce5dc72067ff57d3b23adb37f2377ebad4168117"; + sha256 = "c1c435ae0dda7d5e3f42092338878e903d0b4d148f1e3d289e70e827979181f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/he/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/he/firefox-106.0.5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "101053ad36adbceecc45a001c8bcfb274d1f7381e7aac9994142f99f110983df"; + sha256 = "b8a88dfd487aea0e3433c07a69f8cbc64e72bb47949a6e26b7b2b7a3c8e65966"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hi-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hi-IN/firefox-106.0.5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "3a1b7b8aa61baa363edeb4e78b98ea2dc67ec13ca9dc14c1a6934fc5fc5673fa"; + sha256 = "170b7639f2cfcbbbcf44711c5dc673c5f370313d5e31e320ca61a71570c1e5f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hr/firefox-106.0.5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7fb991b57ecd01def50948d35b5b8a93dfa00f28f6522b59639877465a2d7c34"; + sha256 = "3a9936ad64ed021a3f5206c3fe4db67a797977ec89475a567cbf5eee34f29739"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hsb/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hsb/firefox-106.0.5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b82c58c200f42f9f7fafe555391e714d9cc3dc2ee9a633dbe19e1cebd1012320"; + sha256 = "d555c052f61206e9859761c3a26d700187dd2574a22b5042971a517482a3ca4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hu/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hu/firefox-106.0.5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "22905b2ef794896557be6112965a593e0b64ca5bad9b65fd6ebf8586b5ced0bc"; + sha256 = "eab88af4ba8dbbca366d4f014bb5e6645f9ea5d8db0682467618eec202c51f19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hy-AM/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hy-AM/firefox-106.0.5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "38e33a1273d6f4d4e5b0799b67150e5289427b13674ff981af6946e5ed0d0e68"; + sha256 = "1992e69bbad6642c9b57e907d05e2af6b8225f4b7d9b018a7a6580fba9a47352"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ia/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ia/firefox-106.0.5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "dbcb7470bd85c8b77114f759d4c327981ec27cd16cca668f41061f3f70d3d211"; + sha256 = "3f85c52de056ec59fa7f74b4b475c4390f6bdacbc36b9a8c9faebee6acffb44d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/id/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/id/firefox-106.0.5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b0704bead492263ec9c4577ff4a62a0a8991ea037d1c50fb30ca70cc3739431f"; + sha256 = "63598ca91097510ca43b36295524e8bfcbea8d7efbe1750f151df71f0866f7fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/is/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/is/firefox-106.0.5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0760f29d86b512d142cb8288bc32c32ba4535b42361946fe9751755b86a5d40e"; + sha256 = "ff17d72653957d7d78796307e060665a8e64ce47360a6aac36817af430f06495"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/it/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/it/firefox-106.0.5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3bd1d12a7478179de8a88b60c597e83a36cd5865751937810a6650735832aea9"; + sha256 = "43d21db88424f22a2f11dd71381d5ea593a3d1c87deda9db15e30da3e1529bad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ja/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ja/firefox-106.0.5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f6d977565bcbe67a00bb7b0cd2a981cc8f308a2a6c06008d063a4da6fa8a8125"; + sha256 = "e9446d1c0cdb2f71b76e0493d5c4845d4f7047865393e2d58991b2a5e2c925d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ka/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ka/firefox-106.0.5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "26288ee314f708a36ccdd584163962a5220398de1e8801c0cbd77fd7daa7a1b1"; + sha256 = "5f1eb6dbc85f08195234f684648eb32f33fa62956add52bc16c45616f1d7ac3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/kab/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/kab/firefox-106.0.5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "15257692589a80497c667a171f7348b4ea8db63afea583ce2db948d1be72a095"; + sha256 = "c4c6b2046362c27c8c6f70fe38aa9265a5aa9ffb41d29ed8c05b832fd8ecfe34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/kk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/kk/firefox-106.0.5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "16fb0d6b793132af4ded6fdba8cc8f160aa111c3b8859676d3d693c64b0338f1"; + sha256 = "60a84aeaaaa4d27ccb491f0a9e9ae4e7d637581ae615718c31866c55642a3048"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/km/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/km/firefox-106.0.5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "030e15c8a1b9826f6ad9f458ad00982bb0ea93ea1f5ad19e19efe207f928939a"; + sha256 = "cc5ba6588d3a88482e5b98854c54cc21e10ddc560e04f5f024746a74c265aa5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/kn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/kn/firefox-106.0.5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "6ea17eed26aacddf3016a04e953c2fc20cb973275f70d37179966f3a4992253e"; + sha256 = "46ced27dbeeb58fa12831ac14cf5e89163d3eb578d0739cb8f2ea30f887ee984"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ko/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ko/firefox-106.0.5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "57b9450a1a44ddbfaf1a2e0cd5dd701692d63c54258de6965a5b7e7a4f1ba34a"; + sha256 = "2c6cf5f50c697d73a51fd8a679344e1d7fbf36b64f01135eeba8a29150239641"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/lij/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/lij/firefox-106.0.5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ec69ee6dbb47af8ff3d91ac317fc7e6b4d94ee515fdfe0197a832f8960e9f201"; + sha256 = "8c58ad9fb77d22e7dd5b5e70686011dac7ccf34ac29fdacc0cf659d4fdec5b4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/lt/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/lt/firefox-106.0.5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "56c0bdb64b493177e099555c591fc3379a9572f5a3b7f61d9c3fcf2d623c8a89"; + sha256 = "2aef1b4084884ae44be02a14461fa2dec2c81ce2ac377c5cee29f83a4c642dc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/lv/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/lv/firefox-106.0.5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "e06d195e2d8c3d3c319d7feb1ab68b947e89993efcfab50f0671e2fbab892ba2"; + sha256 = "87100833e89e26e457d96061a1e6de17ed094fd168c35373be603c7f6b63a168"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/mk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/mk/firefox-106.0.5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3bc69c36d17ec8c23c2036968ff90c5bc9eff671b178b2cadd5d0878d15334e4"; + sha256 = "722850038a48ed39fde1430b3a197275dfb7fd3ba24d2cff09c1301dbfbc025f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/mr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/mr/firefox-106.0.5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "5ba8997b7bf593537d09e624bd90a753996bbc01134a82795d2564d3397c3a63"; + sha256 = "cafda0f1999c6a71c2c70b9006d8e8a88bfedf75348fac2e72b287731ccf27da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ms/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ms/firefox-106.0.5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "17a860e0fafc415d1522ae046ca32dd63e9913f03da913bb720ec5178eb0824b"; + sha256 = "4998d8cd3a2ad8340f68159b5512d7b8088c62b2197b6cd3eccc46a6f6d229f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/my/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/my/firefox-106.0.5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "17bd6b39e1c00755077488cd1081115d8766c71233df68613434577020550b3e"; + sha256 = "bea718582d932f5710d70f5127fbccc41e03598322801e7b59b5de1502eb8e6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/nb-NO/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/nb-NO/firefox-106.0.5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e54acc8694b15c8b78c4f590ab47079eedc377f5c6256140e28757841416d180"; + sha256 = "65a685f7e693b73d270502fea7525887ee8d957c5a75744cbdc3fcd15157b6f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ne-NP/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ne-NP/firefox-106.0.5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "3bc205b224f1d827488b8aef743a1ea339c05ac711bc0c921ab957561410b600"; + sha256 = "ebd9d437d1fcc0f3e8acc013d30697019558671041eb4206eea0012160ab8444"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/nl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/nl/firefox-106.0.5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4fb99ce202b0671ffaa3abf78e683c2e687cab5a1081a34d1dbf93bfdc855185"; + sha256 = "5dde661ba63c77d616cf5909d1e52375ef218f449a3c431f0e93ada4332619bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/nn-NO/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/nn-NO/firefox-106.0.5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "340288ea958ccfe0af479094d23b01c0b88034d67c3d154613923eec23191392"; + sha256 = "0cd75e48327d416a090af8ab40592fc09ac763f0da4f48e86b4771c8d4daf695"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/oc/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/oc/firefox-106.0.5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3da7ba90ebb55823868adf45d59d9c480d5ec3b1d91506c2f9ac265627c89d4d"; + sha256 = "1082e6a572755973d3e21699a00b857002e49354d9d5299646551aed7ea2c00f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/pa-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/pa-IN/firefox-106.0.5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "708b1c2c33295d1fb9f6a852c4db85fa13da94f16050ab1fd1a8e1c4c99a7262"; + sha256 = "4f37ba01cc17921d9dfaf2f5f2f36a6c9692fd5cc3b4757613a60507a806a0f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/pl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/pl/firefox-106.0.5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "852995b094042e39dcb70876679d322a02b76595632682277b7dee45e5ae199d"; + sha256 = "9a70bd5d8c4ae48a169c4eae37eac264a05db863d977f6f3bdd325e8d22e7fc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/pt-BR/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/pt-BR/firefox-106.0.5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "feb01adeb4bde5bf182c99fb381e0600a7bd6bb84e8c3266fa81f32fb710e8f0"; + sha256 = "e30f043eb18d23cf9f492b14dfb4517ac6c47cbc2a0de3e9fb0d8935a62a989d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/pt-PT/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/pt-PT/firefox-106.0.5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4184e119c458df3200ba77030913f2a44a8f0845289c50511a18a8c48c3dc86d"; + sha256 = "211a29f69bce68bc7c72148bdb9d1d30a77960fc2dc3e114b21fb9f2c8170bdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/rm/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/rm/firefox-106.0.5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "2243b8d915c687e14e230f518707f42519b0089dd87dc05c1004b3a5ada53f3a"; + sha256 = "e4567228921101a1e0dc66ed852c4616e1a68d74f71ac7a82584419fa5a62a1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ro/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ro/firefox-106.0.5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e8f457a1bd2c913b45ecd509f7f2b47c3f72db11cf3e319d42593a032b17dce4"; + sha256 = "ffb85f77d6e4d6f21ea100b083e25dc6da56beb6e4c4c440042ec0eb6eff215b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ru/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ru/firefox-106.0.5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "18452434a94044dfbc9cc9d8a7a5c2812a9b6f042d6f5e1cb711c3b9384a38dc"; + sha256 = "b93ae5d5ce9fc33167263ba02e7f6be8d00010a1c3436f93357ce3bd1c14f4f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sco/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sco/firefox-106.0.5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "4f2dbb99229b5b77620ab4eace76603a60200755aacb32dd708903f59d973c73"; + sha256 = "dac6f947025d77b7591673c7de4a37129ede2be94bf2b62832b173b9e61eb160"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/si/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/si/firefox-106.0.5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "034f5aa862f91682d1900fdfee6019bd6ab0f08e04112a8858be23cf5c76616c"; + sha256 = "62435eccd92098701aba6b9c142656d430324d4e4b999a677e70827968819a50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sk/firefox-106.0.5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5531cad398d274e8cdd4309754aecda44f5bad7c31262a86aad4c38dfb0a1333"; + sha256 = "d79809a87163157e3ee1f235ee4776166867e526770e2a87f2cddea02238233e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sl/firefox-106.0.5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6f7d89cd53186103d902e1bc5963bbb09107e6ce642adbc04d346255ac6a636d"; + sha256 = "3f3d8eb8cc92e723f379bb563a5b19e25c27349c1e2ed89cd1e0830e7c6237d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/son/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/son/firefox-106.0.5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "98e0a9a93159f1db4baaeccd145e4e9519232664feb3492d61292c90884da8ff"; + sha256 = "45550ebc716d58456c879dca7d862699bf3c399a28c05578d17165934246c1c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sq/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sq/firefox-106.0.5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2052fa7872e80d020600af5c146516275d5f4566cedcb2ee547a13f5e73037df"; + sha256 = "0b0c3c345be57fba174cbe39a62d5490234aa27a52840d1e6c346ef569ce88f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sr/firefox-106.0.5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b1401b7403aac0a6e9bcd5200646fea6694509639e1bc7d87d67d86e5f005220"; + sha256 = "da4281081e6a6a329708d79b1c1d6b9219fca578fe7129ef6b627ce8004061ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sv-SE/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sv-SE/firefox-106.0.5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "eb7889b5a3412945fcb1a5b75890a028e387c1e21a5aa5c7cb38f6c51c706c02"; + sha256 = "36aaf827ac63f4b5262cd23a66a4a6aae02fc27aab1702c4c5ee35cf44357dad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/szl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/szl/firefox-106.0.5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2079250dd3f66a5efb2b1b85362a04dfb45d835c72d9122ee80e0a7a1055bc7a"; + sha256 = "9c6c63d15e9a3d5030381c722bf8ea2302672ead978bd7fd4bae485faa247b29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ta/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ta/firefox-106.0.5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "10e74f8e866ef435622c9e4e67a088e77d51c957afe250ae925497ec61202812"; + sha256 = "b7c2338fd9cfb1548d43205c7c30dc1251c1800338be6ea130503cb6154741fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/te/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/te/firefox-106.0.5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1f077da289e7b76fa09dcc40d976992cb92893220e595a7103d5efe754cafe05"; + sha256 = "a1e307f56851f2d3a6e1ce8819f0df5684207c6c39593de6b584116ee678ae14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/th/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/th/firefox-106.0.5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f127a65ca22e29d88940defa640f212e7cd804ab1700c94d9e2d413d1456e169"; + sha256 = "3059998f8b4ba27adbd67c072faf570dc1dd32264d7d4835d448e6e8540fbffa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/tl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/tl/firefox-106.0.5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "5ae091d179b85af53a4a7ecaa0bb13d1fe9658bbc21fbc18a027f742b940a154"; + sha256 = "30fb920d75135f02b2e7cbb619114cc3eefbaf14ea4320dd389acb6043e1abb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/tr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/tr/firefox-106.0.5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9c1551fe9c86d3fa044804657cfa80503bd28cc182b14bee83be4e529fe4d299"; + sha256 = "385db6ff23a0f3dc73103524fbea53ab3804cdc6dfe24eefaf6b6f4db20d136b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/trs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/trs/firefox-106.0.5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "2a66bede6e02846c55207d5e556e0381da6ee7b39f5ee90d63a4535d49e5df3d"; + sha256 = "d5771fe381ee05d542fbcee2e5761488db446535b3001f834834292eb0a532e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/uk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/uk/firefox-106.0.5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c09d340c70e58ea1c1d95c76102056b474be0f14579fa39090df45de4d4e1911"; + sha256 = "098a8b55ce2d09c816df1b54ea61af72ef5d0073bb22434b2b7c7152affece5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ur/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ur/firefox-106.0.5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "9bb8dd1d033c1839627e684835b101c6b0c1898ed91cea158f9840ae16344fc4"; + sha256 = "1741506b8043a98796370c1f89f88ae1d8c8ee7507dea303b97cdce5ea49c06e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/uz/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/uz/firefox-106.0.5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "4dbf714bd6fd6a81fd93575f295b9468dee8ea6d1b15851bec52eaa23d825aaa"; + sha256 = "6e87d694c393a76b0e573f7251c2959870c898c1d99f9795ddf018b396af99ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/vi/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/vi/firefox-106.0.5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "bebd1b56a963c5fb6934b0feee2db4e4d7ac39c218ee71370f98280414715f40"; + sha256 = "eb8a0ba4e7ad891c8b2d6c0d86e927e09e3cda8af573bff9aabfec82e3f8e998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/xh/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xh/firefox-106.0.5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b65497a0b633789641d1794a0bcc96d77339a5b08c9adcf23a9ac05936f99d2b"; + sha256 = "28f3eba6d67e81f736a7c52f0021c52df373e8b11927c2a461b3d2a7e87a5d89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/zh-CN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/zh-CN/firefox-106.0.5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5308893259e84866e7a9085dbd9323eece94ee54fbe933dbed67163b1097145a"; + sha256 = "c6a3e2b2fda4fe0f5598c6ca0f3ee39d779035cdc80cbad69295a642807bf510"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/zh-TW/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/zh-TW/firefox-106.0.5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "a6da14bc65a44c5e082a8aca9b7adab4c40b43a6c341dc3e80cebad2bf5fa695"; + sha256 = "a13302de38a34a8b5324d4ed00dc618935d0b36fc8f373a8bcf37f31016722f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ach/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ach/firefox-106.0.5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c4973a0988bcd5459a8688a3b05ef4c59ec4926ef662c797950e395abfe5312f"; + sha256 = "bfac96b4a87e6947ee22f79db96856dc4fbbeff7cd0e4269b511fd4bacd4979f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/af/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/af/firefox-106.0.5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "79eebc1e6f3172428ed685399b7502d90061f787a2b07336867cf482cec797ef"; + sha256 = "c37ca9ff65a6f2d5eb4d55bc4c4828252925dbace100291d9b521ab57d249be4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/an/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/an/firefox-106.0.5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "6a54f2b9c3ae8befbbb81948ece27312673021a00b7b23b7a6db9127d5354339"; + sha256 = "09d241887c11acc2b04505cdd6ba6c02cf437f3bd6d36c31e1dc301d46bd2e7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ar/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ar/firefox-106.0.5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d46344c1a435135bb6bdf9c5b8676e71367c2024431eecfafd4d2d5fd0eae1bc"; + sha256 = "58fd1d348d1247377b666d568a8f13877c42438408de2ab300d4f4822dafecbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ast/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ast/firefox-106.0.5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "d35f5d34ac377724708496e32c1cbc82c9770eb4ca99804b55095d10c8e379d7"; + sha256 = "808c1f48d7412b78ae4f217b44a7e651d4437deb7c77a64a6e98d795c945b1b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/az/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/az/firefox-106.0.5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "8e26a4f3070ad17d8ef9ea0a7eeed07f488a891bffae963f082fb932d90bac2f"; + sha256 = "16f0c6bc525f87bcd0b1f9102c65fc906908239e61b801d6eb9f9f1db50736ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/be/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/be/firefox-106.0.5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "06315e7c19162f96b2a54115527167ae02c56c7f1797e952d268e6f6e1c27286"; + sha256 = "a3224744a782f7f84a04fd7883498d319530808da621b1bf6659decdc5d5a3bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/bg/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/bg/firefox-106.0.5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1d96aca3bae1dd7a725e6ca79018f3909a4008757cc16ad7b6ae897bd977e624"; + sha256 = "e42520df88204dcb3c0c3ecdbed5ed03ef1967a95537408728c128ba826b389f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/bn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/bn/firefox-106.0.5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "c8cc8903f532568708217f8013b202b6204f6cbf9bf732cea5adbcfa3ebb5604"; + sha256 = "49dfe8bfdb2a5cb8228c343bc3b68cba9aea691915c77c545d99bd9d3a6b022d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/br/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/br/firefox-106.0.5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "b7b8482c4c5408f278ee653096c673fcbddca8c441045de0f8f2193f2031bbea"; + sha256 = "cbfe771b3304934ccc4b888239f4d5ecf8785969e035c712aff097dce76cd541"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/bs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/bs/firefox-106.0.5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "eb3f1adf762af8801e86e1f9d7e775248f7214bd8d448a64bd37c8efefdf4f5b"; + sha256 = "2d33748cb23d4173d69a91a7344843c824d81f01c89a8864e217145068c7b195"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ca-valencia/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ca-valencia/firefox-106.0.5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "dff88888fba09e6c5508a14d94594ff794aec8ba515078804346aa2fe9e31c8e"; + sha256 = "775ee17b32a98996e26d50065b80b093625c8f6ba09dda8cc859139b4588be8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ca/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ca/firefox-106.0.5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "050c9d662284471f8b6da31ad32ae0016bcb622d35ca96f4524abf603dce59bb"; + sha256 = "5b9c1ee42961ff98a1ab7d578f00cc5e12188f636accfe67429f4de059fdb33a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/cak/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/cak/firefox-106.0.5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1a377cef57eaea6594a95fb56adc1cf8296073e27266f9e1e42bc7a37fa2817d"; + sha256 = "879809f89310e0c72e58d6305dd3757dc7a920c9d89f9c15981c23003a31a654"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/cs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/cs/firefox-106.0.5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "97a1d76274cf524068035d3864f1e304c964a82cc32cf62a5de29b276b7d7c61"; + sha256 = "7585d2ea180dfb8cf5da38b519cc9b7b3b5fb31c89f61f41cfa90ee2e8618ded"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/cy/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/cy/firefox-106.0.5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "fea97ffa123a66631fb656cad681a18f68f9572a1b8c41f25ff7896ff2f83800"; + sha256 = "59241413efabb0741bd7ae5ce0d2503dd341df1d5799088991c643ef514082e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/da/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/da/firefox-106.0.5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d275390ed892c69e3d3cbca26cfb4ddea2bc0a170475278c63d73df40183a894"; + sha256 = "8e6d239d086ed41eac2c5987bb11e5a14271745c83fabff5dd5959ae9750e804"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/de/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/de/firefox-106.0.5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2b7effdc826a8f70bed63e76a0633761e8f1115bae5341c4a19946a3dda63e45"; + sha256 = "232532f2cd60388065c4c4d6135ae41838756fd8f81bc7d4900a4e37e23193a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/dsb/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/dsb/firefox-106.0.5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "106ddd9bd6019b01ec736775dc6bd4d6f96170fb42a5730e14818acab40ebe9d"; + sha256 = "354fa6a668da8132ca504798e04878078368376a6ce9fcdd4bda894171b01072"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/el/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/el/firefox-106.0.5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "fd78d309bc7533a9fdc303274d4a1f021dca67b9fbeacb7f1eb2a99a7dd00758"; + sha256 = "995c4b20371d5177f0d28f575f92765aaa6230ce03b8a7acce126a389b944ffd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/en-CA/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/en-CA/firefox-106.0.5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "1cfd23d00c316923bd69a1e5b306b88d8993a35bfad5255785ad98880598d259"; + sha256 = "65c3280b54414efe93499297d5dac6df8ac1d64a841c8367749be942da7c2639"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/en-GB/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/en-GB/firefox-106.0.5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7234cf1d21094d1040dc47567f7cb135e7e88b6a8ade06c056443899b1770aa2"; + sha256 = "b1eee7e9bcb93aaff519b18753e0b6b9bd24d8cab9b22b4abab9d4b272301411"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/en-US/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/en-US/firefox-106.0.5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e9b45716fd2f6d40d6e94f25ec5b973f1c31700a0c6b5b7b5f7d8f22fe933d0f"; + sha256 = "4759a6edda9c05b23c134b74262c4beb5d754df73f900170c08deb9cd2bfb817"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/eo/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/eo/firefox-106.0.5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "c4888b0636f96f95986bd0c128095f6195fce81672a220a520e7d11f0f3bcace"; + sha256 = "8a4c2f5c560a113ea57fa455fae0b098e949c6efb88b1a0fa3518ae7b6e8244d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/es-AR/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/es-AR/firefox-106.0.5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4e3c551924255eccfc37e35c83919cb22ab9c0b00eb7bac20aec3674f3b79069"; + sha256 = "7084b54973296664a7f78ee4866a3ecb5ee6da0c51c3a4820111dfee58ea74f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/es-CL/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/es-CL/firefox-106.0.5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7a00e0b06d682b60440c94cd79faf9c53cf371aa86e8ae4308a701ffcb207705"; + sha256 = "550cb2cf9102645cec671e0d60887b1dc1421079774b0015b14633dd6380e158"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/es-ES/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/es-ES/firefox-106.0.5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "87539b760616c22f3bbb5e983bfe51492d84f60f4778a7f4dff240eccf8257a9"; + sha256 = "829a0ee0f52602d5e630eb0e516f53650c8e28f77f8dfb24f1cd53c20836abec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/es-MX/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/es-MX/firefox-106.0.5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "065996e24e6a2253a3a06e33b666b9106e2c60c42d37e6d8faf6c0f5d7cd33d2"; + sha256 = "a514a4f378f4c21669423af47661b5452f448003d02b0cc2db6a7a90221b7f85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/et/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/et/firefox-106.0.5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9cd9cbd6b93116bd0df8d98b38b26672de34fb39c66eaa9abb1082f63e9e18a4"; + sha256 = "aabe2400efc673378b4548f7c7957dec6711822a26675f304bfc5232361abfd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/eu/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/eu/firefox-106.0.5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f336ec889a5fb57e4fe2a94511301cc688979caf54219e13d2dc95e238d23c59"; + sha256 = "32f394f2c21bae6b1102b2d6a0671bf1c08ea87e08e04b291f0aa64056a9cc64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/fa/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/fa/firefox-106.0.5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0624d7e83b41e5feb32aa5709fee95449e938ad953a922018ebc9cd8aaf82fb2"; + sha256 = "f6caf62aa656b11c2cc6a674e0d6d8c42823471b42f7fe63171fbdd338136c0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ff/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ff/firefox-106.0.5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "35c244b150bb5f3f12b095f02b94838aeba5de4b4b19ab3c2b1895d792f5cda8"; + sha256 = "1804e43bc7d2b7f5b0741380728b5311feaec10bb397fc11028f4f0708196b4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/fi/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/fi/firefox-106.0.5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "2510bd28ca158d9ff51abac42dd3c2321afcd1d3951d8d72878241aafca5ff51"; + sha256 = "9fc3fefc74b639b9370513abfdbfdcc805f2435885a9a9dcb3e2073c4bde7aa9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/fr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/fr/firefox-106.0.5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "a07d6c6ec4f1d5517faae488766e1efee7733d0c4069e4aa91682ec11848798c"; + sha256 = "a5491daf349b5e79b80cc6a3f69edcc18338c1fe1cfd962f3d3fd87d53c2b46c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/fy-NL/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/fy-NL/firefox-106.0.5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "16d12c88d3a3668a38904fe4a6a2731fd3909d1b62ac5af58c0275677b4d492e"; + sha256 = "809b08b64e699e8ec8a11746215ecaa1a2682356796d0d18ef76a012a57e380c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ga-IE/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ga-IE/firefox-106.0.5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5e76da71a864bf8a894e1b615eeb6f66f8886487be7baee687a4581ddb20a573"; + sha256 = "febf0ec0fe7d75366709a5f6e214cf423a4e77e2af4864993c0fba6cd643a846"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/gd/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/gd/firefox-106.0.5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "91983cd398c49881971a6972f6d20f599d752009300757712a093691f9778af0"; + sha256 = "0344ad234005e8cc7f1886203bbcf11de8739a9f4ce8f674b4c678a1d123acd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/gl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/gl/firefox-106.0.5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7336d539599c41d12b12c5ea353c65dc5e4c0259044a23b3b1822f7e6d1a1479"; + sha256 = "fea568adbd37c193919854a8244256838973ade7c251ef016c2bb457e894972e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/gn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/gn/firefox-106.0.5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "259f56c94a0eee5005aa7da7542d3297e6d205d7ff5c22f96b2a9f5302a71996"; + sha256 = "346bd8431e9ccc13e278e8563bf7b4feb49b6f2acb9469ef4194cfb5b551a618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/gu-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/gu-IN/firefox-106.0.5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f78689869d21c2b6dcdc17abb3ac56bc59af2da75b4d6c8c0b838e799576651e"; + sha256 = "3be2979b35c373a2679c95b456edd3d0fa45f5e6cb645a747d97f05569c3fd16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/he/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/he/firefox-106.0.5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "012e5f6faee74c3b9f643d4cf288bf0993088b62959eb6329a5588d7b8f3059f"; + sha256 = "85aebd4e130ff6fa61b71b69fa7b66822f119dccafbcf18c0589386b21b42970"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hi-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hi-IN/firefox-106.0.5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "1755e7f66d3ce6a737dec1b79c54e03ccfe8897b6898830e42c1744e5cf0bc35"; + sha256 = "4e12c197575b21609842c6baa020eca1003e5455589c043e82ebc2fec3eb895d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hr/firefox-106.0.5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "af48c9ef10f7f1f32b83547d361835b22b7668f323fd5ed16ef1615adc9e7b83"; + sha256 = "62fd48ba8c6533a19779dbc71b5d897c16db06c81f696d89f600f216ed47c1ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hsb/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hsb/firefox-106.0.5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "301c5e4b5bb9815889b652cf609b7cff261fe488086cbb1c718f79456da3fc06"; + sha256 = "9d9f07fe6e75af945e3295c2af4d3253419adb07d26297ea0119f888010022f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hu/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hu/firefox-106.0.5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "af1d857099344e7304bc7ff3b8bc51f8d1337730767c80f0db400a935b490c52"; + sha256 = "7169dced288547644979acba8f015c8fb5945283cdca4400b273a142c9407c46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hy-AM/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hy-AM/firefox-106.0.5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2569d8ef038ca29dc59a7f423921c1afcc60e3cbd882d7b061a4de6a1c189a16"; + sha256 = "46282b573d353699c65217fdcf907c614b5ee3ebec3f121f0e04aa52fb8813f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ia/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ia/firefox-106.0.5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "8fb116fb83b55279df51caf2d5e4e2c0475ceae98c3a8f59a1c217a086dceee7"; + sha256 = "71274f5f6b4f243a718edbea6ceedf5658d90f562c6eed14a24af49a36ac95a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/id/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/id/firefox-106.0.5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "37c973a9d2b2ffce6685ae652860bb384fb50570d3f4c22a2be600531a218d7d"; + sha256 = "3668a592dbeae0d8cdd42e46a1d6285220eb5d1c3b6c111d7f6082ecead61305"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/is/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/is/firefox-106.0.5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "463814e5a96ca1f5a16f6206951dfb662784222260ccabc06fd9f212b1f26595"; + sha256 = "6345b38c7cb3e42c0f5ac9d2aef46a02d7b66d65720b3495c2837fea34708123"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/it/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/it/firefox-106.0.5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2c0cbc92ee66bbf5f0a922b427b0ed961574c606671e530c3d9f3b8e8d9dbe9e"; + sha256 = "e25d0251b309815992911d86bb004f77da5568911074e2949a25be4cbb41b0b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ja/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ja/firefox-106.0.5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b31adfbc4f03f4cb0b0410c28a3eebb5f02f529cf7957bedb6ffaa6a079e22d7"; + sha256 = "f199e69573f9cbc3231ddeaef718a25b82a7deced96e8ce870ab2275110f7b1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ka/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ka/firefox-106.0.5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d0fd226ceb44ff4ba7e1817eabd653806a6343e8285d077743b3f76601d5ad2c"; + sha256 = "29ca54083f7f502e056c90bf0cf3d57259bbf3ac66555f085177c26f10055d09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/kab/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/kab/firefox-106.0.5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "dbd293017d716cb350b2739f21be00a998e6d34618f56b6ab63084c53d6482d0"; + sha256 = "96d259d3dda1ce3036f59ca85d2365d8d45d3fb12c479773b85200088d601c01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/kk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/kk/firefox-106.0.5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a6d7af17fd716eeb8be4668d77ab2116ef16a72be5fd594cd8eb182a4eb4652a"; + sha256 = "24cffb1f0bc5099dcd1d5214a34fb4f856148c9b33bde0eaedc2aa48baad4447"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/km/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/km/firefox-106.0.5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "b45b85869ebd147f44fcb4b813afb32e91fe7831592e3dadbc55163b84593fec"; + sha256 = "6c0f331a80e9ed4689700dc2e007ff798d6196a3d48e146cdfbb58e1b04434f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/kn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/kn/firefox-106.0.5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "61bd032d859396416d48d7afa27dc51a1117b35605e265da4dc8cfc9f45afedd"; + sha256 = "3a9f55bbd8dc818093cd1565660d0a909accc35d3907ad269fe3dec7f5f45e92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ko/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ko/firefox-106.0.5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "9b74f822a17c3ee9d4f787a3b6efdc7807adb02b9f8c26f997ae3fa828679b05"; + sha256 = "903a5aa70257444d06738954bd280a0f6ea233099163f157ac2089755f0d7605"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/lij/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/lij/firefox-106.0.5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "04ef02e365eed5206e048696d55fa3df49db4f4374ee98dda422d7effd8fea15"; + sha256 = "090b75b861454023cbd3479e0e11b2b971e1eb3fe47690fe4774ac0cf8e8144e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/lt/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/lt/firefox-106.0.5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a88c5e217d5bedb98a403aed894917cda97284ffdda676bff73b4b4682798eb5"; + sha256 = "90d200db253b2b4340dd2f766c20358c9c699350c5ac1946a5830dd5009d673b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/lv/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/lv/firefox-106.0.5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9520b8f802bf500255f2e07e1faab1afadeafae2ec1ce57ab8c514a52b1055ff"; + sha256 = "adcc97bdfd9dde72c379ef8e4b9b4789e2daccba279fdb24342d8c2c2d2ff34f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/mk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/mk/firefox-106.0.5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d1ca84ac561e7bf67089c180346fb71a1350bca2d5dbccb20c48f1d9667e76d1"; + sha256 = "989dfe2ed111ce4fb40b2ee4ca9ef07de210539690867d6a9f1bae64fd2e8b8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/mr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/mr/firefox-106.0.5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "377b803e367b36e54bc7f2a720901745bfc36ae95583b3d43a8effb5ece6bb41"; + sha256 = "e12952b27f9f99aa0167ba08f6d00dda3c2dccb340e7968152e334f0eeb91472"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ms/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ms/firefox-106.0.5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "69ba788924141600cb4e60e370798f426f44010eff6f44ccd3e615f2249adc61"; + sha256 = "e9c26689a5f0479561545a96d37a655a0edda532b78391794dc9cb8dda0d9b62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/my/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/my/firefox-106.0.5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "711dfe02b12428d508627b441b26e799458634bcaa2ce8f73b9a599fdd902e0b"; + sha256 = "3e3af776a1a53de30e6a568e76d549b9d161c95cc6f90e8513eed7c2513075b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/nb-NO/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/nb-NO/firefox-106.0.5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "791eaeb621160945c3a647529324f90ed8a6368379871d2ba1ab997228d2b210"; + sha256 = "3a4b0486dc04fcd81b810ea093e4b00f6ea1ce401055d4b263108e42365fec9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ne-NP/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ne-NP/firefox-106.0.5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d668db53a74b92928a255c75e5f354039811c4a2cfbd79a12ea1e6543ccc6989"; + sha256 = "8e81a476091727a2449a6c9d357b2519a315c439f8b6cbe4e9f195b721e6833e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/nl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/nl/firefox-106.0.5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0939f17542b3e51da5fee6ffb0bdf378bb9879bc8c6f5c73ff65c9df6c0c3e0f"; + sha256 = "80260fe98704a3b090c778090ffef82a67b3b24e0ec29753a7d9dc12e25b754c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/nn-NO/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/nn-NO/firefox-106.0.5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b73cc2dec61c097680d4885b637a4c1ca50fec3ce970d5294ecf074e59907035"; + sha256 = "439db446f9554bb2e83b266fc5a9c3da9d55515c0c64447d2563d9f5ac4dd024"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/oc/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/oc/firefox-106.0.5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "56c79712082f66611194ee25c1cc0ac6717813b86f148f6889a19b8f6bfab8a1"; + sha256 = "a5e4067bcfff97bab9d421a9b76d20ec10204dfe2fecf7e60cd303ba0ee9acfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/pa-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/pa-IN/firefox-106.0.5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "23f31f719b3956e3e3288e483bcedec649cd7fdeb0d8e496ce9c6b8939a33d8d"; + sha256 = "1b55725007d2f68c209082c1655568bd7504b0d192928d55c5de3eb27a326005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/pl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/pl/firefox-106.0.5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5dc691eb6df81b457562d358f00f60024a58537a3c4e58f41b1e654c3454b7df"; + sha256 = "dcba4844632270e11f8f0b5c32d520df24befe17b17b8088a0e16f6ecf975177"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/pt-BR/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/pt-BR/firefox-106.0.5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "c256f6fedbe65587ede43d1d6fcd30313dec63dc26cc8a14557dcea26d1c5c28"; + sha256 = "609e4decaf03a4c957cc04c71f60a9e049bfc9f4711d0d653e6df96b1579ffbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/pt-PT/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/pt-PT/firefox-106.0.5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4034810b68acd46f8b633ea660df39285d517aeab778cefdb449b295f70a76ce"; + sha256 = "527e946e3d769c831bb80663b0f0fe9677eed17f780c1c2cac9c48f72e1700ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/rm/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/rm/firefox-106.0.5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "31564251db55d332a79e2a669dded1e337415fbd61e38205fc4608e5f28a405d"; + sha256 = "509585050885537e89a9cc6435f52c9c88df487edae84001910fdace812515b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ro/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ro/firefox-106.0.5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "2909d9bdd4614f3e5a882e62242a189b1cd7c827764d8f8192423a2823d8ee2c"; + sha256 = "ce46f3974a3cf506d50c8fbf4b8a3e6dbfa3fd185ce1113665124dc966b71a54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ru/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ru/firefox-106.0.5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b8d5f67a8f95f93807fb027de446485bbc48e6773118f0c5c29df2ae85da6ca5"; + sha256 = "2b52af61e9f87043bc07b5cbfcd0dfba82eab0e6e0b90c90e64985eca1167e1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sco/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sco/firefox-106.0.5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "1733540d61c033062ab57379042ef3082d8605b8f2a57e71bdfe4cb0222a7f7b"; + sha256 = "f2dfb7cbda3434d2fa2696d1239bf25da10c1631dd2db97e4a24dc1cebb6a330"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/si/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/si/firefox-106.0.5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "12e6adeb13b207377a430b16091bb56a7883cde4be81200b6cfc3cb96a62c434"; + sha256 = "38cbee17384dc83b478a0372284a06ea0ff6dc5a743f1e4879317a86fd2ae2a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sk/firefox-106.0.5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "8a8c0de4aef600f846c0ca1721297f8422e457855a9fd631c03746e8b6c3ffb3"; + sha256 = "3a8d0f81a7276dc780091f30a4f4ce3392c19b1c31ed77dc88527a48d1a69e8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sl/firefox-106.0.5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "9ed77c83ec1a2ca6b01145ba763f2bec4000fd6c25ccdaa7ea1ced3267517b78"; + sha256 = "080bb30fe1587ae1f07f120657741ecc652a6a1d901c8c5ab6ae72f8ec4d8566"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/son/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/son/firefox-106.0.5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "35c340200c1c8dd6c99d531d5ce32f713ea6e09b019a4a698017a9a2016e9a7d"; + sha256 = "d0b51c603b6966e90f278d7d008d1a78d4ec7ae46aabf59f8b2b6ef992c978e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sq/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sq/firefox-106.0.5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "45123de3970bd6c27a649e393f122762b6e126d27b57606f69e1d796257249b1"; + sha256 = "cd8765fc2cf59814cd2dccbf01a90afca7f2221069922b9c312a012b370c836f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sr/firefox-106.0.5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "76a2e56153b0a4831503b7f5cd87192a604d6f4f1007932aafcc06172b4a0b28"; + sha256 = "f9bb4b36b0d992a615e3a698307c0c94f5a2ec0c18af3bee1b7bd0ec735f40f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sv-SE/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sv-SE/firefox-106.0.5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c1ebc3b6a62c85d434dbdc268ca269473bc4e6d58de59410a5c81dfaf20f9e7b"; + sha256 = "5e9b2ab11da0435075ec345f011d236f5d6e5beb65af2d980184d280ad5c3e3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/szl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/szl/firefox-106.0.5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "92e238e7f07fa630fcd10bfd7ca6bd33d3dd323e3a9f87122d6c0a41acb3dc98"; + sha256 = "88d22866fa2435e576be2ea405250d4fc11f88432c955c86b3271f32e24f70b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ta/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ta/firefox-106.0.5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b19e4e5fbb5882abacb89ff04b3e453c36cd0b29c6ccc80a83dc9f510a239511"; + sha256 = "bfb79595012034f7ac4ce2a1824792f259f2e4be259deb28f5b77409b63f722d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/te/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/te/firefox-106.0.5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "74715e756eb306d627cf4e82400773597f1c17c9dd8dc502a2cb072753dc81a3"; + sha256 = "d6ebf6b4f3300ff7d4818935865c2dc15eb72f8181289d347e1272f700cc0aaf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/th/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/th/firefox-106.0.5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "3e1f9fccfad05ea9487c960dcd1bb0fc4905c6e690b2b85ecf559593bf434421"; + sha256 = "2369419116f948fe8578a790539904e8cc801d1affe49f84689db4e0cc6a5996"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/tl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/tl/firefox-106.0.5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c90a633917e84fbe05b0b8143acb1dfa2c749f7858f688d75284cfa4e6fd952f"; + sha256 = "e4708141e720ba6eb4843c7899592c66fad7f0ed55128c2c49d7ca7cc0f9a955"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/tr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/tr/firefox-106.0.5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fa08235eed535d66d0458b73e517d2ef1d87a6ec9adae7fd56747e1a8735ec91"; + sha256 = "b99642de344e5874ebd7450f3548815cf6795abcd5d19730f74b4573b1db4e81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/trs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/trs/firefox-106.0.5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "dc6f90bc9ba03b518c9727c71eb18aac21a4f00b0bb2253f1c79d8c575b21b62"; + sha256 = "9bd307e5865afb53db7d960815430c1b5e692243047fac7be229f4935daf6e4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/uk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/uk/firefox-106.0.5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4794dfd6b8fb4dd2c0ffd38d54e91f52a2038bd076fc3a7bd7bde802e673934b"; + sha256 = "0239d30b14fd7f31bcee7ece51501a465058cef308460498b62b35830672d89b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ur/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ur/firefox-106.0.5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "089a373e5d0b857837fed9b2c784888feef06b40fde1ee8c31615efa12dc45a7"; + sha256 = "f9f0598bdae45ea0ddcee22da0ec647a3b212b6037c8072aff9255ce93a5931a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/uz/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/uz/firefox-106.0.5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2c98e74eb3aa52ba1d3716708d374a18d11f2f4b011e3638d318c50b81b141ad"; + sha256 = "4b45396f564fbe1440ee3415c38268718023bc558afeffac49b097dfa83e2488"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/vi/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/vi/firefox-106.0.5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "248bd09dba39dab6a3bc64fa0816e47300138d747e9904fbebbac04e87adb8b9"; + sha256 = "537d17dc4266752329091724aba644dffbcbc389dcb9dff368aba001c9ef9d3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/xh/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/xh/firefox-106.0.5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b9afa144d4643b238875528e1e213a1c17155f478e3d5c96dc2669879f58a1d7"; + sha256 = "869e3f149d37b09f1a9211585fca0b73e2c84f23465b64cbb26648df784fee30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/zh-CN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/zh-CN/firefox-106.0.5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "638ff37a0d9d552d1b363053f2a7fba76ca48cd2de50e61a919d2930d4e407db"; + sha256 = "dabaefdbea9e998b4cf5836a562630a7c075fd23eefa529c44232a06e6dc2147"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/zh-TW/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/zh-TW/firefox-106.0.5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7555b126741878c18b32a6439e6d0eb5395e003ee0afa2b04b68be3ff9cd96dd"; + sha256 = "29625c22cd269d5e13a95c2d8939d76c3fa95708ae8c641e8998d4c159e61866"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 7f76285d0da24..66be124888477 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "106.0.3"; + version = "106.0.5"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "226bde9082330abe134d1726cec59b473d4d6839ea55ca20faddb901f032d89eb9d2bd5d887ccd4ba515c6b1a44817420cfee2e9f4f8a79ed46a38287083d28d"; + sha512 = "879b054340d632c5d972888ceb67da0d02f28f6755e9683c8e4e7fb71b55bde0e588b98e24bae448ffea8ddd3e30c44dc0563554ecd69506862796a64ca040d7"; }; # This patch could be applied anywhere (just rebuild, no effect) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index eeb72590df23e..c52c7caef8687 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -166,38 +166,64 @@ let in stdenv.mkDerivation { inherit pname version; - desktopItem = makeDesktopItem { + desktopItem = makeDesktopItem ({ name = applicationName; exec = "${launcherName} %U"; inherit icon; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; - genericName = "Web Browser"; - categories = [ "Network" "WebBrowser" ]; - mimeTypes = [ - "text/html" - "text/xml" - "application/xhtml+xml" - "application/vnd.mozilla.xul+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - "x-scheme-handler/ftp" - ]; + startupNotify = true; startupWMClass = wmClass; - actions = { - new-window = { - name = "New Window"; - exec = "${launcherName} --new-window %U"; - }; - new-private-window = { - name = "New Private Window"; - exec = "${launcherName} --private-window %U"; - }; - profile-manager-window = { - name = "Profile Manager"; - exec = "${launcherName} --ProfileManger"; - }; - }; - }; + terminal = false; + } // (if libName == "thunderbird" + then { + genericName = "Email Client"; + comment = "Read and write e-mails or RSS feeds, or manage tasks on calendars."; + categories = [ + "Network" "Chat" "Email" "Feed" "GTK" "News" + ]; + keywords = [ + "mail" "email" "e-mail" "messages" "rss" "calendar" + "address book" "addressbook" "chat" + ]; + mimeTypes = [ + "message/rfc822" + "x-scheme-handler/mailto" + "text/calendar" + "text/x-vcard" + ]; + actions = { + profile-manager-window = { + name = "Profile Manager"; + exec = "${launcherName} --ProfileManger"; + }; + }; + } + else { + genericName = "Web Browser"; + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; + actions = { + new-window = { + name = "New Window"; + exec = "${launcherName} --new-window %U"; + }; + new-private-window = { + name = "New Private Window"; + exec = "${launcherName} --private-window %U"; + }; + profile-manager-window = { + name = "Profile Manager"; + exec = "${launcherName} --ProfileManger"; + }; + }; + })); nativeBuildInputs = [ makeWrapper lndir jq ]; buildInputs = [ browser.gtk3 ]; diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 68e1f3bc720d5..b41f95b0b0cc8 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.13.7"; + version = "1.13.8"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-WUNDkLKT/AgS5WkBKbVSM5/1zSjQuE8Aq68JLSOHFEs="; + sha256 = "sha256-SdncFkMCAY28njw361R70h6gcK0YHSU7AUwf9wzxCRo="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 11b72f2603434..827570db179e7 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VChonOHnif9Rz0pLg+nGt5jFT4wLIQq/C64zBlP/w0w="; + sha256 = "sha256-w9U8+TYU9BQ2w/jSbDo6lEAlIuMOoCjO9fWhywyVbEk="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 203b0f37a3bf5..0728a03e976b8 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.31"; + version = "1.12.33"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-t/i1UhPfhT7+HAhVBhZKQezqpFrBrzimUHjIozQeJnk="; + hash = "sha256-T/fkQxRcwDYppGpAu1sBg8Oe8dAa4Bk/jt4jYMikPBE="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-MRBnwpuqYElxA4V1x7F4wccKV3T51RopfT37QUr7G4Y="; + vendorSha256 = "sha256-G26BfTdXMQP0U4FDRYkJNfUOGfqow714WPNBnBrXLZQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 774efb044af1f..9c28ba063e243 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildGoModule -, makeWrapper +, fetchpatch }: buildGoModule rec { @@ -15,7 +15,16 @@ buildGoModule rec { sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg="; }; - vendorSha256 = "sha256-OAFxEb7IWhyRBEi8vgmekDSL/YpmD4EmUfildRaPR24="; + patches = [ + # https://github.com/instrumenta/kubeval/pull/346 + (fetchpatch { + name = "bump-golang.org/x/sys.patch"; + url = "https://github.com/instrumenta/kubeval/commit/d64502b04d9e1b85fd3d5509049adb50f3e39954.patch"; + sha256 = "sha256-S/lgwdykFLU2QZRW927fgCPxaIAMK3vSqmH08pXBQxM="; + }) + ]; + + vendorSha256 = "sha256-R/vVrLsVSA9SGra4ytoHlQkPaIgQaj/XdivcQp8xjSM="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index c3c6355cd0cfc..0362095bce697 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.24.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-8dCmORfTMFHSyc9FOpL01ywxGcH3uolzD2aOtyy191Q="; + sha256 = "sha256-zLPZueKdUNauIzqXOV773SZ/RWg7UuMNeJHr7z6ZJ+E="; }; vendorSha256 = null; @@ -17,14 +17,15 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - # third_party/VENDOR-LICENSE breaks build/check as go files are still included - # docs is a tool for generating docs - excludedPackages = [ "third_party" "cmd/docs" ]; + subPackages = [ "cmd/tkn" ]; preCheck = '' # some tests try to write to the home dir export HOME="$TMPDIR" + # run all tests + unset subPackages + # the tests expect the clientVersion ldflag not to be set unset ldflags diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 6d86bc79e6b28..abaff42f3a32e 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal-cli"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - sha256 = "sha256-XEN4Ntt7yHng1+3E5SlxthEWPXJ+kSx9L1GbW9bV03Y="; + sha256 = "sha256-rdDtgSM2wZsHYv9tBNdcSHYXdvvEk5wqdLr1KjoPz1E="; }; vendorSha256 = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw="; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cab8444b88e34..04a711142b151 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -111,13 +111,13 @@ "version": "2.24.1" }, "aws": { - "hash": "sha256-qm6iXQFnCFGSL9TsJlIwl/qTPagSaWbJOmLlzFBFAzo=", + "hash": "sha256-TQzVuqUhAfEqzCcxA5l993ww9X1dcBeKvddJKzYsBH8=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.37.0", - "vendorHash": "sha256-EnCFfs+REgT3q2OprotXNvnLka4JRfj5c0VTi7Js7zc=", - "version": "4.37.0" + "rev": "v4.38.0", + "vendorHash": "sha256-6IyBJJV+PRFc8f12fBhtOUjbJdyQYanhsvAxugFf/EE=", + "version": "4.38.0" }, "azuread": { "hash": "sha256-mjll5ANx063JLSbqohPOhor3GNeI1MUKgUKQ/f5XFk8=", @@ -129,13 +129,13 @@ "version": "2.30.0" }, "azurerm": { - "hash": "sha256-TOm7e3yLTsmWCIDHklUncCjI5vbd0u/HWH/koOL95u4=", + "hash": "sha256-SV5td8GMEpLGLQgbl+1v9F2/hIrXpKsMBfOK+2+jDvk=", "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.29.1", + "rev": "v3.30.0", "vendorHash": null, - "version": "3.29.1" + "version": "3.30.0" }, "azurestack": { "hash": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", @@ -714,14 +714,14 @@ "version": "2.0.3" }, "lxd": { - "hash": "sha256-x0f8kP7OsgSD8d9vu99vp7Xq3szwLKxoAZdUCJc8B7A=", + "hash": "sha256-DfRhPRclg/hCmmp0V087hl66WSFbEyXHFUGeehlU290=", "owner": "terraform-lxd", "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", "proxyVendor": true, "repo": "terraform-provider-lxd", - "rev": "v1.7.3", + "rev": "v1.8.0", "vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M=", - "version": "1.7.3" + "version": "1.8.0" }, "mailgun": { "hash": "sha256-Yi258SIFSdD+JSi5oX74bhBFYYGYQfSAyYD07eO8MmM=", @@ -914,13 +914,13 @@ "version": "0.22.0" }, "pagerduty": { - "hash": "sha256-S55TSm3aFe9ACo+ysNRnyQ/U55C2KoZroQEHVBXsSPI=", + "hash": "sha256-vkfsQxjlYSOl0VJBWvFCxVz7o+XgxDMkwFMomdl+iWQ=", "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.6.3", + "rev": "v2.6.4", "vendorHash": null, - "version": "2.6.3" + "version": "2.6.4" }, "panos": { "hash": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=", @@ -1058,22 +1058,22 @@ "version": "6.18.0" }, "skytap": { - "hash": "sha256-EAimiuQJOt12baZSjDKI+c9UjJd8e26ouOAZIZezw/I=", + "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", "owner": "skytap", "provider-source-address": "registry.terraform.io/skytap/skytap", "repo": "terraform-provider-skytap", - "rev": "v0.15.0", + "rev": "v0.15.1", "vendorHash": null, - "version": "0.15.0" + "version": "0.15.1" }, "snowflake": { - "hash": "sha256-XjLsRS7n3p0lNVEPx6b+h5TCzK+1Kws/72FNgy3sVbE=", + "hash": "sha256-Hoaqj3hksiWm60cSr8OPqAvS29SMVLtwkSWXZvpBePA=", "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.49.0", + "rev": "v0.50.0", "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=", - "version": "0.49.0" + "version": "0.50.0" }, "sops": { "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", @@ -1112,13 +1112,13 @@ "version": "2.0.5" }, "sumologic": { - "hash": "sha256-DvEd1OdLmUEEmk0zl7jiTjdk/3Fp1Z/3KCpYRpxHTn4=", + "hash": "sha256-lhMPA4ub3NlaYs0pX6FkWuR3LQxytrQxu9DjAjDja2Q=", "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.19.1", + "rev": "v2.19.2", "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=", - "version": "2.19.1" + "version": "2.19.2" }, "tailscale": { "hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=", @@ -1130,13 +1130,13 @@ "version": "0.13.5" }, "tencentcloud": { - "hash": "sha256-lWePRU8kmOjOq9giCMdU5Aeb74WR/s6wIzShjzDBFjc=", + "hash": "sha256-DvH8+Be2AVwsNoDrNlCG8/Uve2EKcuan3qUsJynreHw=", "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.7", + "rev": "v1.78.8", "vendorHash": null, - "version": "1.78.7" + "version": "1.78.8" }, "tfe": { "hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=", diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 10649ffb9ffdb..f2cafe7f1d9a3 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.39.2"; + version = "0.40.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YHPtOcWhUDcCqtAmxy/veBgpYY+UmnmK2IwplI5uRh0="; + sha256 = "sha256-ZDoGlm/H2xh9+azb7N1EWUXwfF919K9B4PmQZol4RV8="; }; vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg="; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index be26e31c7e39b..cce2b739e1001 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "sha256-H1Nuu/T55e5zWUmofKoyVSA4TaJBdK+JeZtw+G/sC54="; + sha256 = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; }; - vendorSha256 = "sha256-ivkTtcvoH+i58iQM9T0xio0YUeMhNzDcmrCSuGFljEI="; + vendorSha256 = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 97a8d7d074e1b..7e7830fd1b56a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.62.0"; # Please backport all updates to the stable channel. + version = "5.63.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-ehRwGZM4lj+pgxUnBlBfcYt2JypuZ5PX3S5ymZriRWA="; + sha256 = "sha256-f8gQUnmI/VU0FteoMVY0k0RK1R7Ho7JRx+WoMhKki4s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index cc3bba9528e9f..f8a47d1023ba8 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -12,6 +12,8 @@ , gpgSupport ? false , gpgmeSupport ? true , imapSupport ? true +, pop3Support ? true +, smtpSupport ? true , withSidebar ? true , gssSupport ? true , writeScript @@ -44,9 +46,9 @@ stdenv.mkDerivation rec { (lib.enableFeature headerCache "hcache") (lib.enableFeature gpgmeSupport "gpgme") (lib.enableFeature imapSupport "imap") + (lib.enableFeature smtpSupport "smtp") + (lib.enableFeature pop3Support "pop") (lib.enableFeature withSidebar "sidebar") - "--enable-smtp" - "--enable-pop" "--with-mailpath=" # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 7a1dd8be40d50..ec94d504b9dbc 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "sha256-f1XEcDMy4skddtbZFFhCF4xg6zQahOLiGcYiJPy2SHs="; + sha256 = "sha256-ee3RKlcZQf8o8cQfz1ckiLDFNzdFJesBJKJTTrUmcpU="; }; strictDeps = true; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 35b4fa3aef43a..3d12b11b51410 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ... }: +{ lib, stdenv, fetchurl, libxcrypt, ... }: stdenv.mkDerivation rec { pname = "resilio-sync"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { install -D rslsync "$out/bin/rslsync" patchelf \ --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc ]} "$out/bin/rslsync" + --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc libxcrypt ]} "$out/bin/rslsync" ''; meta = with lib; { diff --git a/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix b/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix new file mode 100644 index 0000000000000..3ceb5c0e1afd2 --- /dev/null +++ b/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix @@ -0,0 +1,43 @@ +{ lib, writeScript, qt5, fetchurl, autoPatchelfHook }: + +qt5.mkDerivation rec { + pname = "synology-cloud-sync-decryption-tool"; + version = "027"; + + src = fetchurl { + url = "https://global.download.synology.com/download/Utility/SynologyCloudSyncDecryptionTool/${version}/Linux/x86_64/SynologyCloudSyncDecryptionTool-${version}_x64.tar.gz"; + sha256 = "sha256-EWxADvkfhnMwHIauJj3pH6SvSkkrc4cwAhsf1pWOOWQ="; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $NIX_BUILD_TOP/SynologyCloudSyncDecryptionTool $out/bin + + runHook postInstall + ''; + + passthru.updateScript = writeScript "update-synology-cloud-sync-decryption-tool" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + + set -euo pipefail + + version="$(curl -s https://www.synology.com/en-uk/releaseNote/SynologyCloudSyncDecryptionTool \ + | grep -oP '(?<=data-version=")\d+' \ + | head -1)" + update-source-version synology-cloud-sync-decryption-tool "$version" + ''; + + meta = with lib; { + description = "A desktop tool to decrypt data encrypted by Cloud Sync."; + homepage = "https://kb.synology.com/en-global/DSM/help/SynologyCloudSyncDecryptionTool/synologycloudsyncdecryptiontool"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ kalbasit ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 4efec422ce315..5a1a59d7c6e1f 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -9,7 +9,7 @@ , pkg-config , python3 , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 , glib , gtk4 , libadwaita @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; - repo = "warp"; + repo = pname; rev = "v${version}"; - hash = "sha256-ajz450ix68TDkhyAZd1IgZA/jUnXULrYZOSdcoOL+S0="; + hash = "sha256-0zjtaF0RwI7Sj2D5vRaiBJI+Bp/F17VO9ywMRqZyqxI="; }; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-08xbd2YmJw2NTrxBrnJZMV2VvX6V0eX+fxbEEWFoC9c="; + hash = "sha256-HotArxXfmT6Gw6ZZZQ4X6bTx0EFb6vZLbXxhddmGID8="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index 1b85cae70c53f..940a648549235 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -112,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.83.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-7.83.1.tar.xz"; - sha256 = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4"; + name = "curl-7.86.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-7.86.0.tar.xz"; + sha256 = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b"; md5 = ""; - md5name = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4-curl-7.83.1.tar.xz"; + md5name = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b-curl-7.86.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -126,11 +126,11 @@ md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { - name = "libepoxy-1.5.9.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz"; - sha256 = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4"; + name = "libepoxy-1.5.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.10.tar.gz"; + sha256 = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15"; md5 = ""; - md5name = "d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4-libepoxy-1.5.9.tar.xz"; + md5name = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15-libepoxy-1.5.10.tar.gz"; } { name = "epm-3.7.tar.gz"; @@ -154,11 +154,11 @@ md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; } { - name = "expat-2.4.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/expat-2.4.6.tar.xz"; - sha256 = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b"; + name = "expat-2.4.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.9.tar.xz"; + sha256 = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354"; md5 = ""; - md5name = "de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b-expat-2.4.6.tar.xz"; + md5name = "6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354-expat-2.4.9.tar.xz"; } { name = "Firebird-3.0.7.33374-0.tar.bz2"; @@ -560,11 +560,11 @@ md5name = "26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931-xmlsec1-1.2.33.tar.gz"; } { - name = "libxml2-2.9.14.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.14.tar.xz"; - sha256 = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee"; + name = "libxml2-2.10.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.10.3.tar.xz"; + sha256 = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c"; md5 = ""; - md5name = "60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee-libxml2-2.9.14.tar.xz"; + md5name = "5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c-libxml2-2.10.3.tar.xz"; } { name = "libxslt-1.1.35.tar.xz"; @@ -637,11 +637,11 @@ md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; } { - name = "nss-3.79-with-nspr-4.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.79-with-nspr-4.34.tar.gz"; - sha256 = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835"; + name = "nss-3.83-with-nspr-4.34.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.83-with-nspr-4.34.1.tar.gz"; + sha256 = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30"; md5 = ""; - md5name = "5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835-nss-3.79-with-nspr-4.34.tar.gz"; + md5name = "b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30-nss-3.83-with-nspr-4.34.1.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -672,11 +672,11 @@ md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { - name = "openssl-1.1.1l.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.1.1l.tar.gz"; - sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1"; + name = "openssl-1.1.1q.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-1.1.1q.tar.gz"; + sha256 = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca"; md5 = ""; - md5name = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1-openssl-1.1.1l.tar.gz"; + md5name = "d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca-openssl-1.1.1q.tar.gz"; } { name = "liborcus-0.17.2.tar.bz2"; @@ -707,39 +707,39 @@ md5name = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc-pixman-0.40.0.tar.gz"; } { - name = "libpng-1.6.37.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"; - sha256 = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca"; + name = "libpng-1.6.38.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.38.tar.xz"; + sha256 = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be"; md5 = ""; - md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; + md5name = "b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be-libpng-1.6.38.tar.xz"; } { - name = "poppler-21.11.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-21.11.0.tar.xz"; - sha256 = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584"; + name = "poppler-22.09.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-22.09.0.tar.xz"; + sha256 = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e"; md5 = ""; - md5name = "31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584-poppler-21.11.0.tar.xz"; + md5name = "d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e-poppler-22.09.0.tar.xz"; } { - name = "poppler-data-0.4.10.tar.gz"; - url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.10.tar.gz"; - sha256 = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30"; + name = "poppler-data-0.4.11.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz"; + sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c"; md5 = ""; - md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz"; + md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz"; } { - name = "postgresql-13.5.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2"; - sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3"; + name = "postgresql-13.8.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.8.tar.bz2"; + sha256 = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded"; md5 = ""; - md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2"; + md5name = "73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded-postgresql-13.8.tar.bz2"; } { - name = "Python-3.8.10.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.10.tar.xz"; - sha256 = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9"; + name = "Python-3.8.15.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.15.tar.xz"; + sha256 = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550"; md5 = ""; - md5name = "6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9-Python-3.8.10.tar.xz"; + md5name = "5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550-Python-3.8.15.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -861,11 +861,11 @@ md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; } { - name = "zlib-1.2.12.tar.xz"; - url = "https://dev-www.libreoffice.org/src/zlib-1.2.12.tar.xz"; - sha256 = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"; + name = "zlib-1.2.13.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.2.13.tar.xz"; + sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98"; md5 = ""; - md5name = "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18-zlib-1.2.12.tar.xz"; + md5name = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98-zlib-1.2.13.tar.xz"; } { name = "libzmf-0.0.2.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index 53c732b59bfd9..dd51866033978 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "3"; - patch = "6"; + patch = "7"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - hash = "sha256-MwPWr2/7vFg0UFGgCQwTNvi5PEnHhhxlNLzuogWu1aM="; + hash = "sha256-UphmAklfbZdWGlTgmBGsXv53vYPY+oyRpFKfBhBX9Ls="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-vjthXfBP6vRY3lMBlithJM7b5SX3uvBwEpi30IeW/Dg="; + sha256 = "sha256-WRgPzLGywfQI6uFRBNhPZ2G1nhhiWa8WbaCYp2XRALk="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-b3VvaNEfnytWqJekAWOKokNoCnefXdQgYB7Hpptra0s="; + sha256 = "sha256-yBnnR0mTexkyWnJnSf2zC6w+DsdBTHU8frOTmPfEedA="; }; } diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix index 8533e1e3455e0..184157d9d0118 100644 --- a/pkgs/applications/office/micropad/default.nix +++ b/pkgs/applications/office/micropad/default.nix @@ -14,18 +14,18 @@ let in mkYarnPackage rec { pname = "micropad"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "MicroPad"; repo = "Micropad-Electron"; rev = "v${version}"; - sha256 = "sha256-ity5oU6TCBpQgimoiaMswOV3FY7Z0GmBcFWqQzdYmao="; + sha256 = "sha256-XylyQd4AhvrwJzBZXab7rA2IrZcqzEv8BANk+ozYyHk="; }; micropad-core = fetchzip { url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz"; - sha256 = "0br8lsdrbjkr5gl434r5ngdhbwbzhav94q8kizsixb8k0wwyfxy5"; + sha256 = "0vddz95c1khalvl2a9zccy36j8s7862gpqcqlrvp1pn4bbp2pm3s"; }; packageJSON = ./package.json; diff --git a/pkgs/applications/office/micropad/package.json b/pkgs/applications/office/micropad/package.json index 8eaa6e26f9b1e..167cef8113bef 100644 --- a/pkgs/applications/office/micropad/package.json +++ b/pkgs/applications/office/micropad/package.json @@ -1,6 +1,6 @@ { "name": "micropad", - "version": "4.1.0", + "version": "4.2.0", "description": "A powerful note-taking app that helps you organise + take notes without restrictions.", "main": "main.js", "scripts": { @@ -26,7 +26,7 @@ "homepage": "https://getmicropad.com", "devDependencies": { "@types/node": "^18.7.18", - "electron": "^20.1.4", + "electron": "^21.2.2", "electron-builder": "^23.3.3", "typescript": "~4.8.3" }, diff --git a/pkgs/applications/office/micropad/yarn.lock b/pkgs/applications/office/micropad/yarn.lock index b033937987c13..93e7ea8736677 100644 --- a/pkgs/applications/office/micropad/yarn.lock +++ b/pkgs/applications/office/micropad/yarn.lock @@ -111,14 +111,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*", "@types/node@^18.7.18": - version "18.7.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154" - integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg== + version "18.11.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4" + integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== "@types/node@^16.11.26": - version "16.11.59" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.59.tgz#823f238b9063ccc3b3b7f13186f143a57926c4f6" - integrity sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw== + version "16.18.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz#d7f7ba828ad9e540270f01ce00d391c54e6e0abc" + integrity sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg== "@types/plist@^3.0.1": version "3.0.2" @@ -139,9 +139,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.1": - version "17.0.12" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526" - integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ== + version "17.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76" + integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg== dependencies: "@types/yargs-parser" "*" @@ -174,13 +174,6 @@ ajv@^6.10.0, ajv@^6.12.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== - dependencies: - string-width "^4.1.0" - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -198,10 +191,10 @@ app-builder-bin@4.0.0: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz#78b9dbb0bd8a69842461edd77a3226d0547c5939" - integrity sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ== +app-builder-lib@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" + integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -209,13 +202,13 @@ app-builder-lib@23.3.3: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chromium-pickle-js "^0.2.0" debug "^4.3.4" ejs "^3.1.7" electron-osx-sign "^0.6.0" - electron-publish "23.3.3" + electron-publish "23.6.0" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" @@ -304,20 +297,6 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== -boxen@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -374,25 +353,25 @@ buffer@^5.1.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.0.3: - version "9.0.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz#6c62c493ba2b73c2af92432db4013b5a327f02b2" - integrity sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA== +builder-util-runtime@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" + integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz#449ee57ec1ffc7e59f7a3a8a1a33d25cf5e39e43" - integrity sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA== +builder-util@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" + integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "9.0.3" + builder-util-runtime "9.1.1" chalk "^4.1.1" cross-spawn "^7.0.3" debug "^4.3.4" @@ -418,12 +397,7 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.2, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -441,20 +415,10 @@ chromium-pickle-js@^0.2.0: resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - ci-info@^3.2.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz#b28484fd436cbc267900364f096c9dc185efb251" - integrity sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug== - -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + version "3.5.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" + integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== cli-truncate@^2.1.0: version "2.1.0" @@ -464,13 +428,13 @@ cli-truncate@^2.1.0: slice-ansi "^3.0.0" string-width "^4.2.0" -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== dependencies: string-width "^4.2.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" wrap-ansi "^7.0.0" clone-response@^1.0.2: @@ -534,18 +498,6 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== - dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" - core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -567,11 +519,6 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -593,11 +540,6 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - defer-to-connect@^1.0.1: version "1.1.3" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" @@ -641,14 +583,14 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz#b37547f8403c3e9f7c60265a93d902f5b0c395ea" - integrity sha512-ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ== +dmg-builder@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" + integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== dependencies: - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -669,13 +611,6 @@ dmg-license@^1.0.11: smart-buffer "^4.0.2" verror "^1.10.0" -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== - dependencies: - is-obj "^2.0.0" - dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" @@ -699,36 +634,36 @@ ejs@^3.1.7: jake "^10.8.5" electron-builder@^23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz#88d4e584a99b9e36ca4e8432b1163a1ef877355f" - integrity sha512-mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw== + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" + integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== dependencies: "@types/yargs" "^17.0.1" - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" - dmg-builder "23.3.3" + dmg-builder "23.6.0" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" read-config-file "6.2.0" - update-notifier "^5.1.0" - yargs "^17.0.1" + simple-update-notifier "^1.0.7" + yargs "^17.5.1" electron-context-menu@^3.1.2: - version "3.5.0" - resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.5.0.tgz#f5d6df982e37555a77666bcecff59b094211b54a" - integrity sha512-z4agpok6YnXlGFs66zU9EBFft4llUFJ41NYFEMMS0fnprMKBztJUCHBA6LMAqJgjabfqsYC7kxlvjvepxodOqg== + version "3.6.0" + resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.0.tgz#d60fabb99d5bb06c46b6929c342c75cc0eee348e" + integrity sha512-7uhF3WX7ZalLEurKqML2cJJrBUw1JSZNzbwIB9kVbip7sVwyl7bVjiwHzdYjuOh/+xHw21ZzxwgZcB6sTeKdEw== dependencies: cli-truncate "^2.1.0" electron-dl "^3.2.1" electron-is-dev "^2.0.0" electron-dl@^3.2.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.3.1.tgz#14164595bebcc636c671eb791b2a3265003f76c4" - integrity sha512-kmcSYZyHVEHHHFKlZWW58GiCmu2NSu3Rdwnl3+/fr/ftQYHJULVf1QkrCBPFE2bp/Ly113Za7c8wJZs1nBy04A== + version "3.4.1" + resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.4.1.tgz#2d74a47a04eb8a042c90480cb59736c6f2626219" + integrity sha512-NUrjWTlFW7n/+0ECxQ1AkjikNxdeRDpaprLY7YhmOg6pkFcPHwdEfpkTK+CIhyGMAlZOuto1clB1z5HAwgZcaA== dependencies: ext-name "^5.0.0" pupa "^2.0.1" @@ -751,14 +686,14 @@ electron-osx-sign@^0.6.0: minimist "^1.2.0" plist "^3.0.1" -electron-publish@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz#c4125fbb00620acb854f6e994fd3ab3115662ddd" - integrity sha512-1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ== +electron-publish@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" + integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" @@ -772,10 +707,10 @@ electron-window-state@^5.0.3: jsonfile "^4.0.0" mkdirp "^0.5.1" -electron@^20.1.4: - version "20.1.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-20.1.4.tgz#d25b549f14376f99a0a239e27d67ef8515b4a5a0" - integrity sha512-7ov5kgSQi2JewV5SrVfjGasUvyScjuJrrDCW0rYxtP2SMe3JjoP4rsOOnh3ps2P/Nrdlbv+0ygiK0zp4ARCZ+A== +electron@^21.2.2: + version "21.2.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.2.tgz#e2f3dd014981df555d2cd1655590168b404edae4" + integrity sha512-Q0j1tzLTM5JRjSJVAfDSONZgdtuyruHR1pc1y2IbMYQz62pVJWVWAvcJXzpty5iRh2HKzW9+B9WVlmfWNFA8ag== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" @@ -984,13 +919,6 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.1" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== - dependencies: - ini "2.0.0" - global-tunnel-ng@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" @@ -1025,7 +953,7 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: +graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -1052,11 +980,6 @@ has-symbols@^1.0.3: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -1118,16 +1041,6 @@ immediate@~3.0.5: resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1141,23 +1054,11 @@ inherits@2: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== - -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" - is-ci@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" @@ -1170,44 +1071,11 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" - -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== - -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - is-plain-obj@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== - isbinaryfile@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" @@ -1285,13 +1153,6 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== - dependencies: - package-json "^6.3.0" - lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" @@ -1333,13 +1194,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -1390,7 +1244,12 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.6: +minimist@^1.2.0: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + +minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== @@ -1472,16 +1331,6 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== - dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" - path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -1543,23 +1392,13 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.0.1, pupa@^2.1.1: +pupa@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== dependencies: escape-goat "^2.0.0" -rc@1.2.8, rc@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-config-file@6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" @@ -1571,20 +1410,6 @@ read-config-file@6.2.0: json5 "^2.2.0" lazy-val "^1.0.4" -registry-auth-token@^4.0.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" - integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== - dependencies: - rc "1.2.8" - -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== - dependencies: - rc "^1.2.8" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -1638,25 +1463,23 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== - dependencies: - semver "^6.3.0" - -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.4, semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== +semver@^7.3.2, semver@^7.3.7: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" +semver@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + serialize-error@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" @@ -1676,10 +1499,12 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.2: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +simple-update-notifier@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz#7edf75c5bdd04f88828d632f762b2bc32996a9cc" + integrity sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew== + dependencies: + semver "~7.0.0" slice-ansi@^3.0.0: version "3.0.0" @@ -1732,7 +1557,7 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -1748,11 +1573,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== - sumchecker@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" @@ -1768,9 +1588,9 @@ supports-color@^7.1.0: has-flag "^4.0.0" tar@^6.1.11: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + version "6.1.12" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6" + integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -1823,35 +1643,16 @@ type-fest@^0.13.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - typescript@~4.8.3: - version "4.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88" - integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig== + version "4.8.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" + integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== typo-js@^1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== - dependencies: - crypto-random-string "^2.0.0" - universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -1870,26 +1671,6 @@ unused-filename@^2.1.0: modify-filename "^1.1.0" path-exists "^4.0.0" -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== - dependencies: - boxen "^5.0.0" - chalk "^4.1.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.4.0" - is-npm "^5.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.1.0" - pupa "^2.1.1" - semver "^7.3.4" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -1925,13 +1706,6 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - dependencies: - string-width "^4.0.0" - wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -1946,21 +1720,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== - xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" @@ -1981,12 +1740,12 @@ yargs-parser@^21.0.0: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.0.1: - version "17.5.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== +yargs@^17.5.1: + version "17.6.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.1.tgz#712508771045019cda059bc1ba3ae091aaa1402e" + integrity sha512-leBuCGrL4dAd6ispNOGsJlhd0uZ6Qehkbu/B9KCR+Pxa/NVdNwi+i31lo0buCm6XxhJQFshXCD0/evfV4xfoUg== dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" diff --git a/pkgs/applications/office/micropad/yarn.nix b/pkgs/applications/office/micropad/yarn.nix index b0a4f27204246..71457edcd05ce 100644 --- a/pkgs/applications/office/micropad/yarn.nix +++ b/pkgs/applications/office/micropad/yarn.nix @@ -114,19 +114,19 @@ }; } { - name = "_types_node___node_18.7.18.tgz"; + name = "_types_node___node_18.11.9.tgz"; path = fetchurl { - name = "_types_node___node_18.7.18.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz"; - sha512 = "m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="; + name = "_types_node___node_18.11.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz"; + sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="; }; } { - name = "_types_node___node_16.11.59.tgz"; + name = "_types_node___node_16.18.3.tgz"; path = fetchurl { - name = "_types_node___node_16.11.59.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.59.tgz"; - sha512 = "6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw=="; + name = "_types_node___node_16.18.3.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz"; + sha512 = "jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg=="; }; } { @@ -154,11 +154,11 @@ }; } { - name = "_types_yargs___yargs_17.0.12.tgz"; + name = "_types_yargs___yargs_17.0.13.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.12.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz"; - sha512 = "Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ=="; + name = "_types_yargs___yargs_17.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz"; + sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg=="; }; } { @@ -194,14 +194,6 @@ }; } { - name = "ansi_align___ansi_align_3.0.1.tgz"; - path = fetchurl { - name = "ansi_align___ansi_align_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; - }; - } - { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { name = "ansi_regex___ansi_regex_5.0.1.tgz"; @@ -226,11 +218,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz"; - sha512 = "m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ=="; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz"; + sha512 = "dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA=="; }; } { @@ -338,14 +330,6 @@ }; } { - name = "boxen___boxen_5.1.2.tgz"; - path = fetchurl { - name = "boxen___boxen_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; - }; - } - { name = "brace_expansion___brace_expansion_1.1.11.tgz"; path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; @@ -418,19 +402,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz"; - sha512 = "SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA=="; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz"; + sha512 = "azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw=="; }; } { - name = "builder_util___builder_util_23.3.3.tgz"; + name = "builder_util___builder_util_23.6.0.tgz"; path = fetchurl { - name = "builder_util___builder_util_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz"; - sha512 = "MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA=="; + name = "builder_util___builder_util_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz"; + sha512 = "QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ=="; }; } { @@ -442,14 +426,6 @@ }; } { - name = "camelcase___camelcase_6.3.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - } - { name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { name = "chalk___chalk_4.1.2.tgz"; @@ -474,27 +450,11 @@ }; } { - name = "ci_info___ci_info_2.0.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; - }; - } - { - name = "ci_info___ci_info_3.4.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz"; - sha512 = "t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug=="; - }; - } - { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; + name = "ci_info___ci_info_3.5.0.tgz"; path = fetchurl { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; + name = "ci_info___ci_info_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz"; + sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; }; } { @@ -506,11 +466,11 @@ }; } { - name = "cliui___cliui_7.0.4.tgz"; + name = "cliui___cliui_8.0.1.tgz"; path = fetchurl { - name = "cliui___cliui_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + name = "cliui___cliui_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; }; } { @@ -594,14 +554,6 @@ }; } { - name = "configstore___configstore_5.0.1.tgz"; - path = fetchurl { - name = "configstore___configstore_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; - }; - } - { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; @@ -626,14 +578,6 @@ }; } { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - path = fetchurl { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; - }; - } - { name = "debug___debug_4.3.4.tgz"; path = fetchurl { name = "debug___debug_4.3.4.tgz"; @@ -658,14 +602,6 @@ }; } { - name = "deep_extend___deep_extend_0.6.0.tgz"; - path = fetchurl { - name = "deep_extend___deep_extend_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; - }; - } - { name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; path = fetchurl { name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; @@ -722,11 +658,11 @@ }; } { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz"; - sha512 = "ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ=="; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz"; + sha512 = "jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA=="; }; } { @@ -738,14 +674,6 @@ }; } { - name = "dot_prop___dot_prop_5.3.0.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; - }; - } - { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; path = fetchurl { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; @@ -778,27 +706,27 @@ }; } { - name = "electron_builder___electron_builder_23.3.3.tgz"; + name = "electron_builder___electron_builder_23.6.0.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz"; - sha512 = "mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw=="; + name = "electron_builder___electron_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz"; + sha512 = "y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw=="; }; } { - name = "electron_context_menu___electron_context_menu_3.5.0.tgz"; + name = "electron_context_menu___electron_context_menu_3.6.0.tgz"; path = fetchurl { - name = "electron_context_menu___electron_context_menu_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.5.0.tgz"; - sha512 = "z4agpok6YnXlGFs66zU9EBFft4llUFJ41NYFEMMS0fnprMKBztJUCHBA6LMAqJgjabfqsYC7kxlvjvepxodOqg=="; + name = "electron_context_menu___electron_context_menu_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.0.tgz"; + sha512 = "7uhF3WX7ZalLEurKqML2cJJrBUw1JSZNzbwIB9kVbip7sVwyl7bVjiwHzdYjuOh/+xHw21ZzxwgZcB6sTeKdEw=="; }; } { - name = "electron_dl___electron_dl_3.3.1.tgz"; + name = "electron_dl___electron_dl_3.4.1.tgz"; path = fetchurl { - name = "electron_dl___electron_dl_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.3.1.tgz"; - sha512 = "kmcSYZyHVEHHHFKlZWW58GiCmu2NSu3Rdwnl3+/fr/ftQYHJULVf1QkrCBPFE2bp/Ly113Za7c8wJZs1nBy04A=="; + name = "electron_dl___electron_dl_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.4.1.tgz"; + sha512 = "NUrjWTlFW7n/+0ECxQ1AkjikNxdeRDpaprLY7YhmOg6pkFcPHwdEfpkTK+CIhyGMAlZOuto1clB1z5HAwgZcaA=="; }; } { @@ -818,11 +746,11 @@ }; } { - name = "electron_publish___electron_publish_23.3.3.tgz"; + name = "electron_publish___electron_publish_23.6.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz"; - sha512 = "1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ=="; + name = "electron_publish___electron_publish_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz"; + sha512 = "jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg=="; }; } { @@ -834,11 +762,11 @@ }; } { - name = "electron___electron_20.1.4.tgz"; + name = "electron___electron_21.2.2.tgz"; path = fetchurl { - name = "electron___electron_20.1.4.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-20.1.4.tgz"; - sha512 = "7ov5kgSQi2JewV5SrVfjGasUvyScjuJrrDCW0rYxtP2SMe3JjoP4rsOOnh3ps2P/Nrdlbv+0ygiK0zp4ARCZ+A=="; + name = "electron___electron_21.2.2.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-21.2.2.tgz"; + sha512 = "Q0j1tzLTM5JRjSJVAfDSONZgdtuyruHR1pc1y2IbMYQz62pVJWVWAvcJXzpty5iRh2HKzW9+B9WVlmfWNFA8ag=="; }; } { @@ -1074,14 +1002,6 @@ }; } { - name = "global_dirs___global_dirs_3.0.0.tgz"; - path = fetchurl { - name = "global_dirs___global_dirs_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; - }; - } - { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; path = fetchurl { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; @@ -1146,14 +1066,6 @@ }; } { - name = "has_yarn___has_yarn_2.1.0.tgz"; - path = fetchurl { - name = "has_yarn___has_yarn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; - }; - } - { name = "has___has_1.0.3.tgz"; path = fetchurl { name = "has___has_1.0.3.tgz"; @@ -1226,22 +1138,6 @@ }; } { - name = "import_lazy___import_lazy_2.1.0.tgz"; - path = fetchurl { - name = "import_lazy___import_lazy_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha512 = "m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A=="; - }; - } - { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - path = fetchurl { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - } - { name = "inflight___inflight_1.0.6.tgz"; path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; @@ -1258,14 +1154,6 @@ }; } { - name = "ini___ini_2.0.0.tgz"; - path = fetchurl { - name = "ini___ini_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; - }; - } - { name = "ini___ini_1.3.8.tgz"; path = fetchurl { name = "ini___ini_1.3.8.tgz"; @@ -1274,14 +1162,6 @@ }; } { - name = "is_ci___is_ci_2.0.0.tgz"; - path = fetchurl { - name = "is_ci___is_ci_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; - }; - } - { name = "is_ci___is_ci_3.0.1.tgz"; path = fetchurl { name = "is_ci___is_ci_3.0.1.tgz"; @@ -1298,38 +1178,6 @@ }; } { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - path = fetchurl { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; - }; - } - { - name = "is_npm___is_npm_5.0.0.tgz"; - path = fetchurl { - name = "is_npm___is_npm_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; - }; - } - { - name = "is_obj___is_obj_2.0.0.tgz"; - path = fetchurl { - name = "is_obj___is_obj_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; - }; - } - { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - } - { name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; path = fetchurl { name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; @@ -1338,22 +1186,6 @@ }; } { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; - }; - } - { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - path = fetchurl { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; - }; - } - { name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; path = fetchurl { name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; @@ -1450,14 +1282,6 @@ }; } { - name = "latest_version___latest_version_5.1.0.tgz"; - path = fetchurl { - name = "latest_version___latest_version_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; - }; - } - { name = "lazy_val___lazy_val_1.0.5.tgz"; path = fetchurl { name = "lazy_val___lazy_val_1.0.5.tgz"; @@ -1514,14 +1338,6 @@ }; } { - name = "make_dir___make_dir_3.1.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - } - { name = "matcher___matcher_3.0.0.tgz"; path = fetchurl { name = "matcher___matcher_3.0.0.tgz"; @@ -1586,6 +1402,14 @@ }; } { + name = "minimist___minimist_1.2.7.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + }; + } + { name = "minimist___minimist_1.2.6.tgz"; path = fetchurl { name = "minimist___minimist_1.2.6.tgz"; @@ -1698,14 +1522,6 @@ }; } { - name = "package_json___package_json_6.5.0.tgz"; - path = fetchurl { - name = "package_json___package_json_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; - }; - } - { name = "path_exists___path_exists_4.0.0.tgz"; path = fetchurl { name = "path_exists___path_exists_4.0.0.tgz"; @@ -1802,14 +1618,6 @@ }; } { - name = "rc___rc_1.2.8.tgz"; - path = fetchurl { - name = "rc___rc_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; - }; - } - { name = "read_config_file___read_config_file_6.2.0.tgz"; path = fetchurl { name = "read_config_file___read_config_file_6.2.0.tgz"; @@ -1818,22 +1626,6 @@ }; } { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; - path = fetchurl { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz"; - sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; - }; - } - { - name = "registry_url___registry_url_5.1.0.tgz"; - path = fetchurl { - name = "registry_url___registry_url_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; - }; - } - { name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { name = "require_directory___require_directory_2.1.1.tgz"; @@ -1898,14 +1690,6 @@ }; } { - name = "semver_diff___semver_diff_3.1.1.tgz"; - path = fetchurl { - name = "semver_diff___semver_diff_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; - }; - } - { name = "semver___semver_6.3.0.tgz"; path = fetchurl { name = "semver___semver_6.3.0.tgz"; @@ -1914,11 +1698,19 @@ }; } { - name = "semver___semver_7.3.7.tgz"; + name = "semver___semver_7.3.8.tgz"; + path = fetchurl { + name = "semver___semver_7.3.8.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; + }; + } + { + name = "semver___semver_7.0.0.tgz"; path = fetchurl { - name = "semver___semver_7.3.7.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; } { @@ -1946,11 +1738,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.7.tgz"; + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"; + sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew=="; }; } { @@ -2034,14 +1826,6 @@ }; } { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; - }; - } - { name = "sumchecker___sumchecker_3.0.1.tgz"; path = fetchurl { name = "sumchecker___sumchecker_3.0.1.tgz"; @@ -2058,11 +1842,11 @@ }; } { - name = "tar___tar_6.1.11.tgz"; + name = "tar___tar_6.1.12.tgz"; path = fetchurl { - name = "tar___tar_6.1.11.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + name = "tar___tar_6.1.12.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz"; + sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw=="; }; } { @@ -2122,27 +1906,11 @@ }; } { - name = "type_fest___type_fest_0.20.2.tgz"; + name = "typescript___typescript_4.8.4.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - } - { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - path = fetchurl { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; - }; - } - { - name = "typescript___typescript_4.8.3.tgz"; - path = fetchurl { - name = "typescript___typescript_4.8.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz"; - sha512 = "goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig=="; + name = "typescript___typescript_4.8.4.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz"; + sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="; }; } { @@ -2154,14 +1922,6 @@ }; } { - name = "unique_string___unique_string_2.0.0.tgz"; - path = fetchurl { - name = "unique_string___unique_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; - }; - } - { name = "universalify___universalify_0.1.2.tgz"; path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; @@ -2186,14 +1946,6 @@ }; } { - name = "update_notifier___update_notifier_5.1.0.tgz"; - path = fetchurl { - name = "update_notifier___update_notifier_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; - }; - } - { name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; @@ -2234,14 +1986,6 @@ }; } { - name = "widest_line___widest_line_3.1.0.tgz"; - path = fetchurl { - name = "widest_line___widest_line_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; - }; - } - { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; @@ -2258,22 +2002,6 @@ }; } { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - path = fetchurl { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; - }; - } - { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - path = fetchurl { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; - }; - } - { name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; path = fetchurl { name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; @@ -2306,11 +2034,11 @@ }; } { - name = "yargs___yargs_17.5.1.tgz"; + name = "yargs___yargs_17.6.1.tgz"; path = fetchurl { - name = "yargs___yargs_17.5.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz"; - sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; + name = "yargs___yargs_17.6.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.1.tgz"; + sha512 = "leBuCGrL4dAd6ispNOGsJlhd0uZ6Qehkbu/B9KCR+Pxa/NVdNwi+i31lo0buCm6XxhJQFshXCD0/evfV4xfoUg=="; }; } { diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index a56c8447e27d4..9c233f4692479 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.15"; + version = "6.0.16"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-h/hyaRjunVkVoHmVpru481goN73Ano1TDRDDg5AVoTI="; + sha256 = "sha256-PqC7PqpRSm/Yt3pK8TuzcrhtfJSeJX6th2xb2n/Bul8="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/applications/radio/guglielmo/default.nix index 1702f5902021f..404ec7aa96a19 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/applications/radio/guglielmo/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "guglielmo"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "marcogrecopriolo"; repo = pname; rev = "v${version}"; - sha256 = "0s1iz9s0k897jayiwl3yr9ylpclw6bzcpmzhxqn0mkd7jhgfl4vx"; + sha256 = "sha256-djBQTYbpgPFBtQZ9fZBpECP20RxB49AdxLbq8mUU6rg="; }; postInstall = '' diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index e04a8a907d191..1dac6525ee630 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { name = "CVE-2022-27419"; url = "https://github.com/merbanan/rtl_433/commit/37455483889bd1c641bdaafc493d1cc236b74904.patch"; sha256 = "172jndh8x5nlcbx2jp5y8fgfxsawwfz95037pcjp170gf93ijy88"; + }) ( fetchpatch { + name = "CVE-2022-25051"; + url = "https://github.com/merbanan/rtl_433/commit/2dad7b9fc67a1d0bfbe520fbd821678b8f8cc7a8.patch"; + sha256 = "sha256-IfxwdnuA7WbaVdxMTln069mA5hKNuPz+XYQaNA4YY24="; })]; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix new file mode 100644 index 0000000000000..528fc74394f8f --- /dev/null +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, wrapQtAppsHook +, glm +, eigen +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "calcmysky"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "10110111"; + repo = "CalcMySky"; + rev = "v${version}"; + hash = "sha256-0tHxHek4wqJKLl54zF7wDYN+UPL2y35/YAb6Dtg4k48="; + }; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ glm eigen qtbase ]; + + doCheck = true; + + meta = with lib;{ + description = "Simulator of light scattering by planetary atmospheres"; + homepage = "https://github.com/10110111/CalcMySky"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index b157be0fcb75c..cabb281551d76 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,25 +1,51 @@ -{ stdenv, lib, fetchFromGitHub -, cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv -, qtscript, qtserialport, qttools, qtcharts -, qtmultimedia, qtlocation, qtbase, wrapQtAppsHook +{ lib +, stdenv +, fetchFromGitHub +, cmake +, perl +, wrapQtAppsHook +, qtbase +, qtcharts +, qtlocation +, qtmultimedia +, qtscript +, qtserialport +, qtwebengine +, calcmysky +, qxlsx +, indilib +, libnova }: stdenv.mkDerivation rec { pname = "stellarium"; - version = "0.22.2"; + version = "1.0"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-FBH5IB1keMzRP06DQK2e7HX8rwm5/sdTX+cB80uG0vw="; + sha256 = "sha256-6EAykJ0yWeU1EBR5+7JjWGUVBE1DKW+W8yJOt0smkaE="; }; - nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + perl + wrapQtAppsHook + ]; buildInputs = [ - freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools - qtmultimedia qtlocation qtbase qtcharts + qtbase + qtcharts + qtlocation + qtmultimedia + qtscript + qtserialport + qtwebengine + calcmysky + qxlsx + indilib + libnova ]; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix new file mode 100644 index 0000000000000..27ba07481f0e7 --- /dev/null +++ b/pkgs/applications/science/biology/seqkit/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "seqkit"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "shenwei356"; + repo = "seqkit"; + rev = "v${version}"; + sha256 = "sha256-2DWb6PIYT9VfJeqbZ9+E1jk/xJ2+h0GARKF6XWdMhkI="; + }; + + vendorSha256 = "sha256-RQNthtPYuOSCenA0hs5EhybimrftjEJlQNkfnKGXTiM="; + + meta = with lib; { + description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; + homepage = "https://github.com/shenwei356/seqkit"; + license = licenses.mit; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 8a97dc5f0c330..d0058c8650d81 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -8,6 +8,7 @@ }: assert (!blas.isILP64) && (!lapack.isILP64); +assert (blas.isILP64 == arpack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix new file mode 100644 index 0000000000000..b5130654c371a --- /dev/null +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +, pkg-config +, libuuid +, openjdk11 +, gperftools +}: + +stdenv.mkDerivation rec { + pname = "surelog"; + version = "1.40"; + + src = fetchFromGitHub { + owner = "chipsalliance"; + repo = pname; + rev = "v${version}"; + hash = "sha256-5nhJilFIJJDCnJUEUgyPNtWSQUgWcvM6LDFgFatAl/k="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + openjdk11 + (python3.withPackages (p: with p; [ + psutil + orderedmultidict + ])) + ]; + + buildInputs = [ + libuuid + gperftools + ]; + + doCheck = true; + checkPhase = '' + runHook preCheck + make -j $NIX_BUILD_CORES UnitTests + ctest --output-on-failure + runHook postCheck + ''; + + postInstall = '' + mv $out/lib/surelog/* $out/lib/ + mv $out/lib/pkg $out/lib/surelog/ + ''; + + meta = { + description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler"; + homepage = "https://github.com/chipsalliance/Surelog"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ matthuszagh ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix new file mode 100644 index 0000000000000..47b9bb0d94232 --- /dev/null +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, python3 +}: + +stdenv.mkDerivation rec { + pname = "UHDM"; + version = "0.9.1.40"; + + src = fetchFromGitHub { + owner = "chipsalliance"; + repo = pname; + rev = "v${version}"; + hash = "sha256-CliKU2WM8B9012aDcS/mTyIf+JcsVsc4uRRi9+FRWbM="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + (python3.withPackages (p: with p; [ orderedmultidict ])) + ]; + + doCheck = true; + checkPhase = "make test"; + + postInstall = '' + mv $out/lib/uhdm/* $out/lib/ + rm -rf $out/lib/uhdm + ''; + + prePatch = '' + substituteInPlace CMakeLists.txt --replace \ + 'capnp compile' \ + 'capnp compile --src-prefix=''${GENDIR}/..' + ''; + + meta = { + description = "Universal Hardware Data Model"; + homepage = "https://github.com/chipsalliance/UHDM"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ matthuszagh ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index df943277a627e..4b0ae6f8ac9d9 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -1,5 +1,9 @@ { lib, stdenv, fetchurl, gfortran, arpack, spooles, blas, lapack }: +assert (blas.isILP64 == lapack.isILP64 && + blas.isILP64 == arpack.isILP64 && + !blas.isILP64); + stdenv.mkDerivation rec { pname = "calculix"; version = "2.19"; diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index c309423f142aa..c65507228f82b 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -4,6 +4,7 @@ , makeWrapper , readline , gmp +, pari , zlib # one of # - "minimal" (~400M): @@ -23,27 +24,31 @@ let # packages absolutely required for gap to start # `*` represents the version where applicable requiredPackages = [ - "GAPDoc-*" - "primgrp-*" - "SmallGrp-*" + "gapdoc" + "primgrp" + "smallgrp" "transgrp" ]; - # packages autoloaded by default if available + # packages autoloaded by default if available, and their dependencies autoloadedPackages = [ "atlasrep" - "autpgrp-*" - "alnuth-*" - "crisp-*" - "ctbllib-*" - "FactInt-*" + "autpgrp" + "alnuth" + "crisp" + "ctbllib" + "factint" "fga" - "irredsol-*" - "laguna-*" - "polenta-*" - "polycyclic-*" - "resclasses-*" - "sophus-*" - "tomlib-*" + "irredsol" + "laguna" + "polenta" + "polycyclic" + "resclasses" + "sophus" + "tomlib" + "autodoc" # dependency of atlasrep + "io" # used by atlasrep to fetch data from online sources + "radiroot" # dependency of polenta + "utils" # dependency of atlasrep ]; keepAll = keepAllPackages || (packageSet == "full"); packagesToKeep = requiredPackages ++ lib.optionals (packageSet == "standard") autoloadedPackages; @@ -61,11 +66,11 @@ in stdenv.mkDerivation rec { pname = "gap"; # https://www.gap-system.org/Releases/ - version = "4.11.1"; + version = "4.12.1"; src = fetchurl { url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"; - sha256 = "sha256-ZjXF2n2CdV+DOUhrnKwzdm9YcS8pfoI0+6QIGJAuowQ="; + sha256 = "sha256-+evvEe4xshDONuPHCWB0K04lMoK71ScK3JMkJzySsBY="; }; # remove all non-essential packages (which take up a lot of space) @@ -83,9 +88,14 @@ stdenv.mkDerivation rec { makeWrapper ]; - # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. - # tests are run twice, once with all packages loaded and once without - # checkTarget = "teststandard"; + propagatedBuildInputs = [ + pari # used at runtime by the alnuth package + ]; + + # "teststandard" is a superset of the tests run by "check". it takes ~20min + # instead of ~1min. tests are run twice, once with all packages loaded and + # once without. + # installCheckTarget = "teststandard"; doInstallCheck = true; installCheckTarget = "check"; @@ -104,34 +114,28 @@ stdenv.mkDerivation rec { # like the defaults the Makefile, but use gap from PATH instead of the # one from builddir installCheckFlagsArray+=( - "TESTGAP=gap --quitonbreak -b -m 100m -o 1g -q -x 80 -r -A" - "TESTGAPauto=gap --quitonbreak -b -m 100m -o 1g -q -x 80 -r" + "TESTGAPcore=gap --quitonbreak -b -q -r" + "TESTGAPauto=gap --quitonbreak -b -q -r -m 100m -o 1g -x 80" + "TESTGAP=gap --quitonbreak -b -q -r -m 100m -o 1g -x 80 -A" ) ''; postBuild = '' pushd pkg - bash ../bin/BuildPackages.sh + # failures are ignored unless --strict is set + bash ../bin/BuildPackages.sh ${lib.optionalString (!keepAll) "--strict"} popd ''; - installTargets = [ - "install-libgap" - "install-headers" - ]; - - # full `make install` is not yet implemented, just for libgap and headers postInstall = '' - # Install config.h, which is not currently handled by `make install-headers` - cp gen/config.h "$out/include/gap" - - mkdir -p "$out/bin" "$out/share/gap/" - - echo "Copying files to target directory" - cp -ar . "$out/share/gap/build-dir" - - makeWrapper "$out/share/gap/build-dir/bin/gap.sh" "$out/bin/gap" \ - --set GAP_DIR $out/share/gap/build-dir + # make install creates an empty pkg dir. since we run "make check" on + # installCheckPhase to make sure the installed GAP finds its libraries, we + # also install the tst dir. this is probably excessively cautious, see + # https://github.com/NixOS/nixpkgs/pull/192548#discussion_r992824942 + rm -r "$out/share/gap/pkg" + cp -ar pkg tst "$out/share/gap" + + makeWrapper "$out/lib/gap/gap" "$out/bin/gap" --add-flags "-l $out/share/gap" ''; preFixup = '' @@ -141,14 +145,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Computational discrete algebra system"; - maintainers = with maintainers; - [ - raskin - chrisjefferson - timokau - ]; + # We are also grateful to ChrisJefferson for previous work on the package, + # and to ChrisJefferson and fingolfin for help with GAP-related questions + # from the upstream point of view. + maintainers = teams.sage.members; platforms = platforms.all; - broken = stdenv.isDarwin; # keeping all packages increases the package size considerably, which is # why a local build is preferable in that situation. The timeframe is # reasonable and that way the binary cache doesn't get overloaded. diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index 45a4799d1a031..1f8b33f687384 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -35,7 +35,7 @@ writeTextFile rec { export GRAPHS_DATA_DIR='${graphs}/share/graphs' export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves' export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes' - export GAP_ROOT_DIR='${gap}/share/gap/build-dir' + export GAP_ROOT_DIR='${gap}/share/gap' export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 6cdb7919d9ea8..e1d7d283dc2d8 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -130,6 +130,14 @@ stdenv.mkDerivation rec { rev = "2816dbacb342398a23bb3099e20c92c8020ab0fa"; sha256 = "sha256-tCOsMxXwPkRg3FJGVvTqDzlWdra78UfDY6nci0Nr9GI="; }) + + # https://trac.sagemath.org/ticket/34391 + (fetchSageDiff { + name = "gap-4.12-upgrade.patch"; + base = "9.8.beta2"; + rev = "eb8cd42feb58963adba67599bf6e311e03424328"; + sha256 = "sha256-0dKewOZe2n3PqSdxCJt18FkqwTdrD0VA5MXAMiTW8Tw="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 15b164284bfb6..bfa5addefee98 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.18.1"; + version = "2.19.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-igtbMrm4cgaBWxjvv8UjqvPNFSi1UxNgplWYArqRRi0="; + sha256 = "sha256-SqKjN9Met+NsfaQO3PGTPua/ZVaorYbSJHWeXgEm524="; }; - vendorSha256 = "sha256-XWquL/+47t467kOYpDgMmT7t3hbdCiPQnatRW+VtaYc="; + vendorSha256 = "sha256-VWeUVdrAzbS7OmHHZIPlyq6WVj4I39n7ozS7n3ReqJk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix new file mode 100644 index 0000000000000..7c0dbefc50696 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitnuro/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, jre +}: + +stdenv.mkDerivation rec { + pname = "gitnuro"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-${version}.jar"; + hash = "sha256-tAFFl14mmXhLr6V/vTDe9lwX7trsaTWgIqkwxD3mBUw="; + }; + + icon = fetchurl { + url = "https://raw.githubusercontent.com/JetpackDuba/Gitnuro/4cfc45069c176f807d9bfb1a7cba410257078d3c/icons/logo.svg"; + hash = "sha256-QGJcWTSJesIpDArOWiS3Kn1iznzeMFzvqS+CuNXh3as="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + makeWrapper ${jre}/bin/java $out/bin/gitnuro --add-flags "-jar $src" + install -Dm444 $icon $out/share/icons/hicolor/scalable/apps/com.jetpackduba.Gitnuro.svg + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Gitnuro"; + exec = "gitnuro"; + icon = "com.jetpackduba.Gitnuro"; + desktopName = "Gitnuro"; + categories = [ "Development" ]; + comment = meta.description; + }) + ]; + + meta = with lib; { + description = "A FOSS Git multiplatform client based on Compose and JGit"; + homepage = "https://gitnuro.jetpackduba.com"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index b70fe634cb1ee..3676de308e5b8 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.77"; + version = "0.78"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-/O9u7Ei6f0rGr7LRWcG9FUQd7Z+qpq2/6H01jNR1C7o="; + sha256 = "sha256-fi0YF0YCOtzA02Ix42BU6fi1UKgF/X6mG3S0fP/ZwxE="; }; nativeBuildInputs = [ pkg-config bison ]; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 8e32b42912c0d..a3e8d5dc81355 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -1,17 +1,21 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-PBs86cvEacvCt/2JnURL4qKvXGXRZHWaGYrPUSsnt0I="; + sha256 = "sha256-XGZ6Jr/RVDOLDa0sANZIsKtNjY3pEBlOtei+xNGPBBY="; }; - cargoSha256 = "sha256-5CUbfI67gsINdHcxN8KbIN10Mu90rAU53DbmQ5QotWg="; + cargoSha256 = "sha256-sjMg5XMnAQZjp6z9prtRq+0pyNQ1oTm0/KWOZPxDW4w="; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; meta = with lib; { description = "Sysrev version control"; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index ee146127a38f1..7c06f6ddb8598 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -93,6 +93,51 @@ let sha256 = "1kk11zl1mk37d4cvbc75gfndmma7vy3vkp4gmkyl92kiz6zadhyy"; }; + # Handbrake maintains a set of ffmpeg patches. In particular, these + # patches are required for subtitle timing to work correctly. See: + # https://github.com/HandBrake/HandBrake/issues/4029 + ffmpeg-version = "4.4.1"; + ffmpeg-hb = ffmpeg-full.overrideAttrs (old: { + version = ffmpeg-version; + src = fetchurl { + url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2"; + hash = "sha256-j8nyCsXtlRFanihWR63Q7t1cwamKA5raFMEyRS+YrEI="; + }; + patches = old.patches or [] ++ [ + "${src}/contrib/ffmpeg/A01-qsv-scale-fix-green-stripes.patch" + "${src}/contrib/ffmpeg/A02-qsv-interpolation.patch" + "${src}/contrib/ffmpeg/A03-qsv-dx11-ffmpeg44.patch" + "${src}/contrib/ffmpeg/A04-configure-ensure-the-right-libmfx-version-is-used-wh.patch" + "${src}/contrib/ffmpeg/A05-qsv-add-includedir-mfx-to-the-search-path-for-old-ve.patch" + "${src}/contrib/ffmpeg/A06-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A07-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A08-qsvenc-don-t-support-multi-frame-encode-when-MFX_VER.patch" + "${src}/contrib/ffmpeg/A09-qsvenc-don-t-support-MFX_RATECONTROL_LA_EXT-when-MFX.patch" + "${src}/contrib/ffmpeg/A10-qsv-don-t-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A11-qsv-opaque-deinterlace.patch" + "${src}/contrib/ffmpeg/A12-qsv-opaque-vpp.patch" + "${src}/contrib/ffmpeg/A13-qsv-opaque-hwcontext_qsv.patch" + "${src}/contrib/ffmpeg/A14-configure-check-mfxdefs.h-instead-of-mfxvp9.h-for-MF.patch" + "${src}/contrib/ffmpeg/A15-configure-allow-user-to-build-FFmpeg-against-oneVPL.patch" + "${src}/contrib/ffmpeg/A16-qsv-add-macro-QSV_ONEVPL-for-the-oneVPL-SDK.patch" + "${src}/contrib/ffmpeg/A17-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch" + "${src}/contrib/ffmpeg/A18-qsv-new-method-hwcontext_qsv.patch" + "${src}/contrib/ffmpeg/A19-qsv-fix-session-for-d3d11-device.patch" + "${src}/contrib/ffmpeg/A20-mov-read-name-track-tag-written-by-movenc.patch" + "${src}/contrib/ffmpeg/A21-movenc-write-3gpp-track-titl-tag.patch" + "${src}/contrib/ffmpeg/A22-mov-read-3gpp-udta-tags.patch" + "${src}/contrib/ffmpeg/A23-movenc-write-3gpp-track-names-tags-for-all-available.patch" + "${src}/contrib/ffmpeg/A24-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch" + "${src}/contrib/ffmpeg/A25-dvdsubdec-fix-processing-of-partial-packets.patch" + "${src}/contrib/ffmpeg/A26-ccaption_dec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A27-dvdsubdec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A28-dvdsubdec-use-pts-of-initial-packet.patch" + "${src}/contrib/ffmpeg/A29-matroskaenc-aac-extradata-updated.patch" + "${src}/contrib/ffmpeg/A30-ccaption_dec-fix-pts-in-real_time-mode.patch" + "${src}/contrib/ffmpeg/A32-qsv-fix-decode-10bit-hdr.patch" + ]; + }); + versionFile = writeText "version.txt" '' BRANCH=${versions.majorMinor version}.x DATE=1970-01-01 00:00:01 +0000 @@ -152,7 +197,7 @@ let self = stdenv.mkDerivation rec { buildInputs = [ a52dec dav1d - ffmpeg-full + ffmpeg-hb fontconfig freetype fribidi diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index b9be0a2b6eb1e..02ce844c07605 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -12,7 +12,7 @@ obs-gstreamer = callPackage ./obs-gstreamer.nix { }; - obs-hyperion = callPackage ./obs-hyperion/default.nix { }; + obs-hyperion = libsForQt5.callPackage ./obs-hyperion/default.nix { }; obs-move-transition = callPackage ./obs-move-transition.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix index a358249080709..90fffa50ed592 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix @@ -1,22 +1,37 @@ -{ stdenv, lib, fetchFromGitLab, meson, ninja, pkg-config, obs-studio, libGL -, qtbase }: +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, obs-studio, libGL +, qtbase, flatbuffers }: stdenv.mkDerivation rec { pname = "obs-hyperion"; version = "1.0.1"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "hyperion-project"; repo = "hyperion-obs-plugin"; - rev = "v${version}"; - sha256 = "sha256-Si+TGYWpNPtUUFT+M571lCYslPyeYX92MdYV2EGgcyQ="; + rev = version; + sha256 = "sha256-pfWfJWuIoa+74u5J76/GE+OuHkksbwOAPfsR9OGX3L4="; }; - nativeBuildInputs = [ meson pkg-config ninja ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ obs-studio libGL qtbase ]; + dontWrapQtApps = true; + + cmakeFlags = [ + "-DOBS_SOURCE=${obs-studio.src}" + "-DGLOBAL_INSTALLATION=ON" + ]; + + preConfigure = '' + # https://github.com/hyperion-project/hyperion-obs-plugin/issues/7 + rm -rf external/flatbuffers + cp -r ${flatbuffers.src} external/flatbuffers + chmod -R a+w external + ''; + meta = with lib; { description = "OBS Studio plugin to connect to a Hyperion.ng server"; + homepage = "https://github.com/hyperion-project/hyperion-obs-plugin"; license = licenses.mit; maintainers = with maintainers; [ algram ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/applications/virtualization/libgovirt/default.nix index 9c9da54c3632d..0815781c21f7d 100644 --- a/pkgs/applications/virtualization/libgovirt/default.nix +++ b/pkgs/applications/virtualization/libgovirt/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; }; + patches = lib.optionals stdenv.isDarwin [ + # The flag breaks the build on darwin and doesn't seem necessary + ./no-version-script-ld-flag.patch + ]; + nativeBuildInputs = [ pkg-config gobject-introspection @@ -46,8 +51,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/GNOME/libgovirt"; description = "GObject wrapper for the oVirt REST API"; - maintainers = [ maintainers.amarshall ]; - platforms = platforms.linux; + maintainers = with maintainers; [ amarshall atemu ]; + platforms = with platforms; linux ++ darwin; license = licenses.lgpl21Plus; }; } diff --git a/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch new file mode 100644 index 0000000000000..a837c3bf06421 --- /dev/null +++ b/pkgs/applications/virtualization/libgovirt/no-version-script-ld-flag.patch @@ -0,0 +1,14 @@ +--- a/govirt/Makefile.in ++++ b/govirt/Makefile.in +@@ -511,8 +511,7 @@ + libgovirt_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-dynamic \ +- -no-undefined \ +- -Wl,--version-script=$(srcdir)/govirt.sym ++ -no-undefined + + libgovirt_la_CFLAGS = \ + $(WARNINGFLAGS_C) + +Diff finished. Fri Oct 28 10:36:38 2022 diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index ca98669ba4379..497ba195e8977 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.11.6"; + version = "0.12.2"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9b1j3hY4ChlLIXmNsIjt6SjqHOYSqdY98amV36WPU74="; + sha256 = "sha256-l6QIP/GIm7QMWLjYQJ3yuT7mWriowcND32EUuiNfvNA="; }; - cargoSha256 = "sha256-s34mYMaHElBTD7I6QZtGsVTZUbVkcSmavvLs2k4mJDw="; + cargoSha256 = "sha256-t2kxpiSSYzg4MfjCyxkKNfPLTwGB8KgzQonFkLPCpvM="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 42a556a451fb4..46bbc3b914b93 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -14,7 +14,7 @@ , gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner, gtk3, gettext, vte, wrapGAppsHook , vncSupport ? !nixosTestRunner, libjpeg, libpng , smartcardSupport ? !nixosTestRunner, libcacard -, spiceSupport ? !stdenv.isDarwin && !nixosTestRunner, spice, spice-protocol +, spiceSupport ? true && !nixosTestRunner, spice, spice-protocol , ncursesSupport ? !nixosTestRunner, ncurses , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index ed882709aa143..2e8aa34286a6f 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -29,7 +29,7 @@ assert spiceSupport -> ( gdbm != null - && libcap != null + && (stdenv.isLinux -> libcap != null) && spice-gtk_libsoup2 != null && spice-protocol != null ); @@ -76,12 +76,13 @@ stdenv.mkDerivation rec { libvirt-glib libxml2 vte - ] ++ optionals spiceSupport [ + ] ++ optionals spiceSupport ([ gdbm - libcap spice-gtk_libsoup2 spice-protocol - ]; + ] ++ optionals stdenv.isLinux [ + libcap + ]); # Required for USB redirection PolicyKit rules file propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2; @@ -94,8 +95,8 @@ stdenv.mkDerivation rec { meta = { description = "A viewer for remote virtual machines"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; + maintainers = with maintainers; [ raskin atemu ]; + platforms = with platforms; linux ++ darwin; license = licenses.gpl2; }; passthru = { diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 64d863e8047f1..35a58bd25f00e 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -2,13 +2,13 @@ i3.overrideAttrs (oldAttrs : rec { pname = "i3-gaps"; - version = "4.21"; + version = "4.21.1"; src = fetchFromGitHub { owner = "Airblader"; repo = "i3"; rev = version; - sha256 = "sha256-douSRvnyDbi2gDJfu9VZmmTyYfy+FrFWHgyAyPyBWdM="; + sha256 = "sha256-+JxJjvzEuAA4CH+gufzAzIqd5BSvHtPvLm2zTfXc/xk="; }; meta = with lib; { diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 4bcdf1643f1b7..3ddca4d40fd37 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-0mnhH/7Y4VXpNUU++ln2//9/vuTxq9sa2D933Cf7Ifw="; + hash = "sha256-fTaWfItY//fkvaYADeCBYg+dag59Y9Fw+Al0UgHnkXc="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index 264bbcf3f761d..5cdd04fc46ce8 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -10,7 +10,7 @@ let slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]); escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug; escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev; - passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" ]; + passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "leaveDotGit" "deepClone" ]; useFetchGit = deepClone || fetchSubmodules || leaveDotGit; fetcher = if useFetchGit then fetchgit else fetchzip; diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 827d7b0a5a449..259ac0141b2bf 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,4 +1,4 @@ -{ fetchurl }: +{ lib, fetchurl }: let version = "2.04"; @@ -21,5 +21,6 @@ in fetchurl { meta = { description = "Font, metrically identical to Arial and Times New Roman"; + license = lib.licenses.bitstreamVera; }; } diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index 81a1b5649b368..7de0e6d060273 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }: +{ lib, stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { pname = "dosemu-fonts"; @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { meta = { description = "Various fonts from the DOSEmu project"; + license = lib.licenses.gpl2Only; }; } diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index 02e90ff1c4080..45041bb805d94 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -1,20 +1,18 @@ -{ lib, fetchgit }: +{ lib, fetchzip }: let version = "2.010"; -in (fetchgit { - name = "go-font-${version}"; - url = "https://go.googlesource.com/image"; rev = "41969df76e82aeec85fa3821b1e24955ea993001"; +in (fetchzip { + name = "go-font-${version}"; + url = "https://go.googlesource.com/image/+archive/${rev}/font/gofont/ttfs.tar.gz"; + stripRoot = false; postFetch = '' - mv $out source - cd source - mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/go-font - cp font/gofont/ttfs/* $out/share/fonts/truetype - mv $out/share/fonts/truetype/README $out/share/doc/go-font/LICENSE + mv $out/*.ttf $out/share/fonts/truetype + mv $out/README $out/share/doc/go-font/LICENSE ''; sha256 = "175jwq16qjnd2k923n9gcbjizchy7yv4n41dm691sjwrhbl0b13x"; diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix index 53099f3e0b31b..a0cc7106afe67 100644 --- a/pkgs/data/fonts/tipa/default.nix +++ b/pkgs/data/fonts/tipa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tipa"; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Phonetic font for TeX"; + license = lib.licenses.lppl13c; }; } diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 4fb1ada66540c..096baa49acea9 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -15,5 +15,6 @@ stdenvNoCC.mkDerivation rec { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = "https://icon-theme.freedesktop.org/releases/"; platforms = platforms.unix; + license = licenses.gpl2Only; }; } diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 18676018eff46..a607748c7c38b 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; - meta = { + meta = with lib; { description = "A basic set of icons"; homepage = "http://tango.freedesktop.org/Tango_Icon_Library"; - platforms = lib.platforms.linux; + platforms = platforms.linux; + license = licenses.publicDomain; }; } diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix index e09ff07a9e847..abf945e9df555 100644 --- a/pkgs/data/misc/dns-root-data/default.nix +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { meta = with lib; { description = "DNS root data including root zone and DNSSEC key"; maintainers = with maintainers; [ fpletz vcunat ]; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 0d2c4588ede98..b6b4af002d5ca 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202210270100"; + version = "202211030059"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "7558586fefca29c5d1705777187677fd8a4c4e6f"; - sha256 = "sha256-8UKcmkaRe51X4JgQ5pqPE46BnVF0AlXETD/Pliwx9xk="; + rev = "b7d16c8aea9bbe2555fe4aabddd1fb86f9785229"; + sha256 = "sha256-1WxqD9a0uJY+/DiFwESkEceN2EJvDl5qhLg4oEs5uSA="; }; installPhase = '' diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index fe619bee483e9..3b0618bc41acd 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -13,14 +13,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.26.1"; + version = "1.26.2"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk="; + sha256 = "RyxILg7y+xYp5h4X2qoaSH9kOSsCmEncmkCCr7OLye4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 9817962920a16..e34f0b901daf9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -29,24 +28,15 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.1.4"; + version = "6.2.0"; outputs = [ "out" "dev" ]; - patches = [ - # Fix terminal critical warnings and possible crash when removing bookmark - # https://github.com/elementary/files/pull/2062 - (fetchpatch { - url = "https://github.com/elementary/files/commit/daa5ab244b45aafdd7be49eb0bd6f052ded5b5a7.patch"; - sha256 = "sha256-crGvbo9Ye9656cOy6YqNreMLE2pEMO0Rg8oz81OfJkw="; - }) - ]; - src = fetchFromGitHub { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-3j0b+hExUe6OBmEHQVmd2uBkbOGxMdpgDmymuCiph80="; + sha256 = "sha256-V1otkc1Og7J/A68j+4MrJzOtAH6PHSfj5fSpjKhhwo4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix index ce0556ee1a770..c801199a72a8a 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "kzones"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "gerritdevriese"; repo = "kzones"; rev = "v${version}"; - sha256 = "sha256-o7ItUHPayR0wnySssWvtVAaMRa9A1m778FY500hXHXQ="; + sha256 = "sha256-E5pi2ttar6bAt7s0m/NCw66Qgg5fL5p5QpXROWuUTvM="; }; buildInputs = [ diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 53c9ac806e786..67d775eb7cd81 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { release = "10.3-2021.10"; suffix = { - aarch64-darwin = "mac"; # use intel binaries via rosetta aarch64-linux = "aarch64-linux"; x86_64-darwin = "mac"; x86_64-linux = "x86_64-linux"; @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { - aarch64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn"; x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; x86_64-linux = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp"; @@ -51,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix index 1e7e1c307c7c6..62f5df9dd870d 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { version = "11.3.rel1"; platform = { - aarch64-darwin = "darwin-x86_64"; # use intel binaries via rosetta aarch64-linux = "aarch64"; x86_64-darwin = "darwin-x86_64"; x86_64-linux = "x86_64"; @@ -19,7 +18,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; sha256 = { - aarch64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc"; x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; x86_64-linux = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l"; @@ -49,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 6d7eed72932f3..a0d414d974f01 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { subdir = "6-2017q2"; suffix = { - aarch64-darwin = "mac"; # use intel binaries via rosetta x86_64-darwin = "mac"; x86_64-linux = "linux"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { - aarch64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -50,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 36dc4fb12e456..4df2a90f52ea0 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { subdir = "7-2018q2"; suffix = { - aarch64-darwin = "mac"; # use intel binaries via rosetta x86_64-darwin = "mac"; x86_64-linux = "linux"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { - aarch64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -50,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 25d8b611f3dd0..152ecdb867d9c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { subdir = "8-2019q3/RC1.1"; suffix = { - aarch64-darwin = "mac"; # use intel binaries via rosetta x86_64-darwin = "mac"; x86_64-linux = "linux"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -20,7 +19,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { - aarch64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -50,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 2254b600772d3..c625134508e36 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { subdir = "9-2020q2"; suffix = { - aarch64-darwin = "mac"; # use intel binaries via rosetta aarch64-linux = "aarch64-linux"; x86_64-darwin = "mac"; x86_64-linux = "x86_64-linux"; @@ -21,7 +20,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { - aarch64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s"; @@ -52,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index fff2886246ff7..dce3dab727f47 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -154,6 +154,11 @@ stdenv.mkDerivation rec { "-DHIP_COMMON_DIR=${hip}" "-DROCCLR_PATH=${rocclr}" "-DHIP_VERSION_BUILD_ID=0" + # Temporarily set variables to work around upstream CMakeLists issue + # Can be removed once https://github.com/ROCm-Developer-Tools/hipamd/issues/55 is fixed + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; postInstall = '' diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index ace6c773770a6..2100c7d9070ad 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -3,36 +3,53 @@ , cmake , pkg-config , lit -, llvm_11 +, llvm , spirv-headers , spirv-tools }: +let + llvmMajor = lib.versions.major llvm.version; + + branch = + if llvmMajor == "15" then rec { + version = "15.0.0"; + rev = "v${version}"; + hash = "sha256-111yL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; + } else if llvmMajor == "14" then rec{ + version = "14.0.0"; + rev = "v${version}"; + hash = "sha256-BhNAApgZ/w/92XjpoDY6ZEIhSTwgJ4D3/EfNvPmNM2o="; + } else if llvmMajor == "11" then { + version = "unstable-2022-05-04"; + rev = "99420daab98998a7e36858befac9c5ed109d4920"; # 265 commits ahead of v11.0.0 + hash = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; + } else throw "Incompatible LLVM version."; +in stdenv.mkDerivation rec { pname = "SPIRV-LLVM-Translator"; - version = "unstable-2022-05-04"; + inherit (branch) version; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-LLVM-Translator"; - rev = "99420daab98998a7e36858befac9c5ed109d4920"; - sha256 = "sha256-/vUyL6Wh8hykoGz1QmT1F7lfGDEmG4U3iqmqrJxizOg="; + inherit (branch) rev hash; }; - nativeBuildInputs = [ pkg-config cmake llvm_11.dev spirv-tools ]; + nativeBuildInputs = [ pkg-config cmake llvm.dev spirv-tools ]; - buildInputs = [ spirv-headers llvm_11 ]; + buildInputs = [ spirv-headers llvm ]; checkInputs = [ lit ]; cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" - "-DLLVM_DIR=${llvm_11.dev}" + "-DLLVM_DIR=${llvm.dev}" "-DBUILD_SHARED_LIBS=YES" "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; + ] ++ lib.optionals (llvmMajor != "11") [ "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" ]; # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist doCheck = false; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 2c8150f764be1..b26132ff66cf6 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -6,18 +6,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M4"; + milestone_id = "M4c"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz"; - sha256 = "A8i1jH9+W89M+XbmYx0knJsP5c/EdVE2T9L/EIL0USU="; + sha256 = "sha256-mkzIC/cPkpH0obEBqkvvKVh74LaV6jkfyEMLHmJn/nE="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz"; - sha256 = "OqtJiKAsefw2fVjhtsYUe+qLPqXBPFkHUaMh26EJBJ4="; + sha256 = "sha256-LfT/pMOvfBAwew6NW0VNvuB5c1AC7b+qKraP25+kytg="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix index cecc1bee9219c..97f0cdb7b5faf 100644 --- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix +++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix @@ -4,29 +4,27 @@ , python3 , readline , stdenv -, which , yosys , zlib , yosys-symbiflow +, uhdm +, surelog }: let src = fetchFromGitHub { - owner = "SymbiFlow"; - repo = "yosys-symbiflow-plugins"; - rev = "35c6c33811a8de7c80dff6a7bcf7aa6ec9b21233"; - hash = "sha256-g5dX9+R+gWt8e7Bhbbg60O9qa+Vi6Ar0M1sHhYlAre8="; + owner = "chipsalliance"; + repo = "yosys-f4pga-plugins"; + rev = "27208ce08200a5e89e3bd4f466bc68824df38c32"; + hash = "sha256-S7txjzlIp+idWIfp/DDOznluA3aMFfosMUt5dvi+g44="; }; - version = "2022.01.06"; + version = "2022.09.27"; # Supported symbiflow plugins. # # The following are disabled: # # "ql-qlf" builds but fails to load the plugin, so is not currently supported. - # - # "UHDM" doesn't currently build, as the work to package UHDM and surelog has - # not (yet) been undertaken. plugins = [ "design_introspection" "fasm" @@ -36,7 +34,7 @@ # "ql-qlf" "sdc" "xdc" - # "UHDM" + "systemverilog" ]; static_gtest = gtest.dev.overrideAttrs (old: { @@ -50,8 +48,8 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec { inherit src version plugin; enableParallelBuilding = true; - nativeBuildInputs = [ which python3 ]; - buildInputs = [ yosys readline zlib ] ; + nativeBuildInputs = [ python3 ]; + buildInputs = [ yosys readline zlib uhdm surelog ]; # xdc has an incorrect path to a test which has yet to be patched doCheck = plugin != "xdc"; @@ -102,5 +100,3 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec { maintainers = with maintainers; [ ollieB thoughtpolice ]; }; })) - - diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 6d51aec72ca43..3bea390bd4c14 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.1.1182"; + version = "1.11.1.1189"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-u6qTQwtoN47UedSsxsyV0ej3C6Ta5ncbP3lZzTmvPr8="; + sha256 = "sha256-wg5iN5/UT6jb68vF98mgSl21fLG9BdEcXH0EEmvnEOs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index 52a00229e9790..22914b107b541 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-mbleTBNZegfYeaRgEup36+mAwYs/2FReA3gW2tp4ctk="; + sha256 = "sha256-B7BTafeN60csYhhscuHsynI183AvCqLljQgm8NgE6xo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 7fe511373d8dd..385cfb81a56d7 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.19.0"; + version = "5.20.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sygt30x5S2n24ONMBRzNyLZcnl4hM4tUFpX/Yx6ZSMM="; + sha256 = "sha256-KOvRNo8qd8nXhh/f3uAN7jOsNMTX8dJRGUHJXP+FdEs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index dfce8765062fe..1d6a2b4da91c3 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -16,14 +16,14 @@ let cmakeBool = b: if b then "ON" else "OFF"; in stdenv.mkDerivation rec { - version = "1.5.3"; + version = "1.5.5"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; rev = version; - sha256 = "sha256-LbWtZtgvZQdgwAGHVsouH6cAIVXP+9Q5n8KjzaBRrBQ="; + sha256 = "sha256-WYWEUfBPz/Pt7sE8snG3/LnOA3DEUm/SUVLtsH7zG5g="; fetchSubmodules = true; }; @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; homepage = "https://google.github.io/draco/"; + changelog = "https://github.com/google/draco/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ jansol ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index b1af825cccd8a..a90820c02cb9f 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , qmake }: @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' install -d -m 0755 $out/lib - cp -pr *.so* $out/lib + cp -pr *${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib install -d -m 0755 $out/include/dxflib cp -pr src/*.h $out/include/dxflib # Generate pkg-config file @@ -39,8 +40,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://qcad.org/en/90-dxflib"; - maintainers = with lib.maintainers; [raskin]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; description = "DXF file format library"; }; } diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index dadab6e610ff1..c0c4d6fe0ce97 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi +{ lib, stdenv, fetchurl, libGLU, libXmu, libXi, libXext , AGL, OpenGL }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = if stdenv.isDarwin then [ AGL ] else [ xlibsWrapper libXmu libXi ]; + buildInputs = if stdenv.isDarwin then [ AGL ] else [ libXmu libXi libXext ]; propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 7e281892a1fd1..94a2d2c967b1a 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, xlibsWrapper, libXmu, libXi +{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, libXmu, libXi, libXext , OpenGL , enableEGL ? false }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libXmu libXi libXext ]; propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h cmakeDir = "cmake"; diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 0a8b372a52fc6..f7bc072f1757d 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "globalarrays"; - version = "5.8.1"; + version = "5.8.2"; src = fetchFromGitHub { owner = "GlobalArrays"; repo = "ga"; rev = "v${version}"; - sha256 = "sha256-IyHdeIUHu/T4lb/etGGnNB2guIspual8/v9eS807Qco="; + sha256 = "sha256-2ffQIg9topqKX7ygnWaa/UunL9d0Lj9qr9xucsjLuoY="; }; nativeBuildInputs = [ autoreconfHook gfortran ]; diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix index 13c3a4752e67d..6c35126143ec0 100644 --- a/pkgs/development/libraries/howard-hinnant-date/default.nix +++ b/pkgs/development/libraries/howard-hinnant-date/default.nix @@ -19,6 +19,13 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728"; sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154"; }) + # Fix CMake include directory path. + # https://github.com/HowardHinnant/date/pull/753 + (fetchpatch { + name = "fix-cmake-include-dir.patch"; + url = "https://github.com/HowardHinnant/date/commit/8061b53c489b0c8676feedcb65049b27664327b5.patch"; + hash = "sha256-weZUgu0SDad7EK7msUbVzk1zY4euI0Biafj/5jD4JV4="; + }) # Without this patch, this library will drop a `tzdata` directory into # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it # searches for `zoneinfo` be the one from the `tzdata` package. diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 69778f0348298..9381f1b9ea30a 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -21,6 +21,10 @@ , xmlto }: +assert (blas.isILP64 == lapack.isILP64 && + blas.isILP64 == arpack.isILP64 && + !blas.isILP64); + stdenv.mkDerivation rec { pname = "igraph"; version = "0.9.10"; diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index e4041241dcf9c..b5d93069cf8f9 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.7.0"; + version = "2.7.1"; underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "sha256-nLBCigQMPF6QbjrUuSDjP2ir38TmzC5Pa8Rjpk1BkcQ="; + sha256 = "sha256-d0FruJXNnwme1gPHWcIXpD2LO0fL8CzZOn8H14Quo50="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 6beceec390a81..ccff068e1da24 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -8,13 +8,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-2"; + version = "5.1.2-4"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-7Icp1vFnvhuohipGK7BqnxhhtX0iB02v5TXvh5sss3c="; + sha256 = "sha256-yzaS50sPgyRRLnvzaOiKOEaHKL3Yuf89KsHyPebjoL8="; }; configureFlags = old.configureFlags ++ [ diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index a569e881b9882..e5d42f540a36f 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-HBhVPHkr21iT78lE0FRydZAY7kkH1s/EWP7lsWFC0xA="; + sha256 = "sha256-v6Gp9C5r5WMFR+LAZPlUKQ4EiBDmbscPEKKDv7gaTEo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index 3ad5c16d352d7..76e379b45a6e7 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -51,10 +51,10 @@ let in stdenv.mkDerivation rec { pname = "libpulsar"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - hash = "sha256-qMj76jnxRH68DE6JkZjQrLSNzgXGnO7HjPjlaFavaUY="; + hash = "sha256-IONnsSDbnX2qz+Xya0taHYSViTOiRI36AfcxmY3dNpo="; url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; }; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 000678652cad4..e9f1a2d4bbdf3 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -104,16 +104,7 @@ in { }; libressl_3_6 = generic { - version = "3.6.0"; - hash = "sha256-GxLe/Lvb2+2oaSnkIQAK8PQjM63UgX/SbA2aGuxHhAQ="; - - patches = [ - # Fix endianness detection on aarch64-darwin, issue #181187 - (fetchpatch { - name = "fix-endian-header-detection.patch"; - url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch"; - sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE="; - }) - ]; + version = "3.6.1"; + hash = "sha256-rPrGExbpO5GcKNYtUwN8pzTehcRrTXA/Gf2Dlc8AZ3Q="; }; } diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index e45a2082247ed..780ca0ebdc73e 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libspiro"; - version = "20220722"; + version = "20221101"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256-qNff53wyf8YhFVOn169K7smCXrSxdiZWxWOU8VTcjSI="; + sha256 = "sha256-/9UCrdq69RO22593qiA8pZ4qfY9UVGqlGYB9zatsOgw="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 1b538c880a127..f94ceed78ae82 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "lief"; - version = "0.12.1"; + version = "0.12.3"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-IQqPwTNFHLOr8iwg8IhXpuiyg2rIdFuVDzwT39eA6/c="; + sha256 = "sha256-wZgv4AFc7DrMCyxMLKQxO1mUTDAU4klK8aZAySqGJoY="; }; outputs = [ "out" "py" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index cf04517907070..24ce9ff207719 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -9,7 +9,7 @@ , galliumDrivers ? ["auto"] , vulkanDrivers ? ["auto"] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] -, vulkanLayers ? [ "device-select" "overlay" ] +, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" ] # No Vulkan support on Darwin , OpenGL, Xplugin , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light , enableGalliumNine ? stdenv.isLinux diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 6dcf1978edcfb..3a15f6b1aaf31 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc="; + sha256 = "sha256-h3+awCdlZaGCkavBeQfJsKgOZX4MHB3quPIfTlj6pDw="; }; doCheck = true; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 6ed7d846de203..885fbb058bd11 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -23,7 +23,7 @@ sdlSupport ? false, SDL2, restSupport ? false, asio, withApps ? false, - withExamples ? false, fltk, wxGTK, + withExamples ? false, fltk, wxGTK30-gtk3, }: stdenv.mkDerivation rec { @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ++ lib.optional luaSupport lua ++ lib.optional sdlSupport SDL2 ++ lib.optional restSupport asio - ++ lib.optionals withExamples [ fltk wxGTK ] + ++ lib.optionals withExamples [ fltk wxGTK30-gtk3 ] ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] ++ lib.optional (restSupport || colladaSupport) boost ; diff --git a/pkgs/development/libraries/qca-qt5/2.3.2.nix b/pkgs/development/libraries/qca-qt5/2.3.2.nix deleted file mode 100644 index 098fbacc7ff53..0000000000000 --- a/pkgs/development/libraries/qca-qt5/2.3.2.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, openssl, pkg-config, qtbase }: - -stdenv.mkDerivation rec { - pname = "qca-qt5"; - version = "2.3.2"; - - src = fetchurl { - url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-RpdgAjfEvDqXnofSzIBiTyewYoDmNfXZDsfdTSqfYG0="; - }; - - buildInputs = [ openssl qtbase ]; - nativeBuildInputs = [ cmake pkg-config ]; - - dontWrapQtApps = true; - - # tells CMake to use this CA bundle file if it is accessible - preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt"; - - # tricks CMake into using this CA bundle file if it is not accessible (in a sandbox) - cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ]; - - meta = with lib; { - description = "Qt 5 Cryptographic Architecture"; - homepage = "http://delta.affinix.com/qca"; - maintainers = with maintainers; [ ttuegel ]; - license = licenses.lgpl21Plus; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix new file mode 100644 index 0000000000000..b077b77517b8b --- /dev/null +++ b/pkgs/development/libraries/qxlsx/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +}: + +stdenv.mkDerivation rec { + pname = "qxlsx"; + version = "1.4.4"; + + src = fetchFromGitHub { + owner = "QtExcel"; + repo = "QXlsx"; + rev = "v${version}"; + hash = "sha256-01G7eJRrnee/acEeobYAYMY+93y+I0ASOTVRGuO+IcA="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase ]; + + # Don't force Qt definitions onto users: https://github.com/QtExcel/QXlsx/commit/8e83402d + postPatch = '' + substituteInPlace QXlsx/CMakeLists.txt \ + --replace 'target_compile_definitions(QXlsx PUBLIC' 'target_compile_definitions(QXlsx PRIVATE' + ''; + + preConfigure = '' + cd QXlsx + ''; + + dontWrapQtApps = true; + + meta = with lib;{ + description = "Excel file(*.xlsx) reader/writer library using Qt 5 or 6"; + homepage = "https://qtexcel.github.io/QXlsx"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/libraries/rocmlir/default.nix b/pkgs/development/libraries/rocmlir/default.nix new file mode 100644 index 0000000000000..bf4234a21503b --- /dev/null +++ b/pkgs/development/libraries/rocmlir/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, hip +, python3 +}: + +stdenv.mkDerivation rec { + pname = "rocmlir"; + rocmVersion = "5.3.1"; + # For some reason they didn't add a tag for 5.3.1, should be compatible, change to rocmVersion later + version = "5.3.0"; + + src = fetchFromGitHub { + owner = "ROCmSoftwarePlatform"; + repo = "rocMLIR"; + rev = "rocm-${version}"; # change to rocmVersion later + hash = "sha256-s/5gAH5vh2tgATZemPP66juQFDg8BR2sipzX2Q6pOOQ="; + }; + + nativeBuildInputs = [ + cmake + hip + ]; + + buildInputs = [ + python3 + ]; + + cmakeFlags = [ + "-DBUILD_FAT_LIBMLIRMIOPEN=ON" + ]; + + meta = with lib; { + description = "MLIR-based convolution and GEMM kernel generator"; + homepage = "https://github.com/ROCmSoftwarePlatform/rocMLIR"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ Madouura ]; + broken = rocmVersion != hip.version; + }; +} diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 9d96368a4cda7..bdb386b9fe5c5 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,5 +1,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake -, gfortran, blas, lapack, eigen }: +, gfortran, blas, lapack, eigen +, useMpi ? false +, mpi +, openssh +}: + +# MPI version can only be built with LP64 interface. +# See https://github.com/opencollab/arpack-ng#readme +assert useMpi -> !blas.isILP64; stdenv.mkDerivation rec { pname = "arpack"; @@ -27,13 +35,16 @@ stdenv.mkDerivation rec { blas lapack eigen - ]; + ] ++ lib.optional useMpi mpi; + + checkInputs = lib.optional useMpi openssh; doCheck = true; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}" + "-DMPI=${if useMpi then "ON" else "OFF"}" ]; preCheck = '' @@ -45,6 +56,8 @@ stdenv.mkDerivation rec { install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; + passthru = { inherit (blas) isILP64; }; + meta = { homepage = "https://github.com/opencollab/arpack-ng"; description = '' diff --git a/pkgs/development/libraries/science/math/cutensor/generic.nix b/pkgs/development/libraries/science/math/cutensor/generic.nix index e4cbf0ab7bf72..c957fcdd99d4e 100644 --- a/pkgs/development/libraries/science/math/cutensor/generic.nix +++ b/pkgs/development/libraries/science/math/cutensor/generic.nix @@ -13,6 +13,7 @@ let mostOfVersion = builtins.concatStringsSep "." (lib.take 3 (lib.versions.splitVersion version)); + platform = "${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}"; in stdenv.mkDerivation { @@ -20,7 +21,9 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz"; + url = if lib.versionOlder mostOfVersion "1.3.3" + then "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${platform}-${version}.tar.gz" + else "https://developer.download.nvidia.com/compute/cutensor/redist/libcutensor/${platform}/libcutensor-${platform}-${version}-archive.tar.xz"; inherit hash; }; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 4f639cf29f74f..ed47a87ee1161 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -22,6 +22,7 @@ , libopus , gst_all_1 , orc +, gdk-pixbuf }: let @@ -43,6 +44,9 @@ stdenv.mkDerivation rec { sha256 = "1xd0xffw0g5vvwbq4ksmm3jjfq45f9dw20xpmi82g1fj9f7wy85k"; }; + patches = [ + ./remove-rt-on-darwin.patch + ]; postPatch = '' install ${doxygen_sh} doxygen.sh patchShebangs build-aux @@ -65,7 +69,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsa-lib cyrus_sasl glib gst_all_1.gst-plugins-base @@ -84,6 +87,10 @@ stdenv.mkDerivation rec { python3.pkgs.pyparsing spice-protocol zlib + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + gdk-pixbuf ]; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; @@ -108,7 +115,7 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/"; license = licenses.lgpl21; - maintainers = [ maintainers.bluescreen303 ]; - platforms = platforms.linux; + maintainers = with maintainers; [ bluescreen303 atemu ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/spice/remove-rt-on-darwin.patch b/pkgs/development/libraries/spice/remove-rt-on-darwin.patch new file mode 100644 index 0000000000000..b3696d736af79 --- /dev/null +++ b/pkgs/development/libraries/spice/remove-rt-on-darwin.patch @@ -0,0 +1,18 @@ +--- a/meson.build ++++ b/meson.build +@@ -103,11 +103,11 @@ + spice_server_deps += dependency(dep) + endforeach + +-if host_machine.system() != 'windows' ++if (host_machine.system() != 'windows' and host_machine.system() != 'darwin') + foreach dep : ['rt', 'm'] + spice_server_deps += compiler.find_library(dep) + endforeach +-else ++elif host_machine.system() == 'windows' + foreach dep : ['ws2_32', 'shlwapi'] + spice_server_deps += compiler.find_library(dep) + endforeach + +Diff finished. Sun Oct 16 06:09:35 2022 diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index c795d783894e9..503615926433e 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -30,7 +30,14 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; + cmakeFlags = lib.optionals (!enableModTool) [ + "-DENABLE_MODTOOL=OFF" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05 + # volk_32f_log2_32f: fail on arch neon + "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f" + ]; + postInstall = lib.optionalString (!stdenv.isDarwin) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) ''; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 59d258e9d98d4..de61ae59a5ba1 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.1"; + version = "2.38.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - sha256 = "AuGVs/ueBXdDszZO5/HuwT9xYUImhJVEwHwypzuPGEg="; + hash = "sha256-8+uCiZZR9YO02Zys0Wr3hKGncQ/OnntoB71szekJ/j4="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index eddcf008787c5..0b6045884270d 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -1,19 +1,20 @@ { lib , stdenv , fetchFromGitHub +, Security , autoreconfHook , openssl }: stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "sha256-gDY5uEvV5nNPObrar5Fq2UTW30UZ71CooUwQVJkq4l8="; + sha256 = "sha256-d8DDyEsK35WK7c0udZI5HxQLO+mbod8hlbSoa3IWWS0="; }; postPatch = '' @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { "out" ]; + propagatedBuildInputs = [ ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 9a250ac287410..0ab4680b92945 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.148"; + version = "0.6.153"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WMy65tnNYN1RzAEAyn2a+H3c+2ygFjqv1eGbBWIj3v0="; + sha256 = "sha256-v9jkQoamLiH8LsBmqNwUrnAvXamMHxhJ94SXFgdt9Cc="; }; vendorSha256 = "sha256-cNwfK1LpguRfM/ORebU6v+JLIxDJdT5y+zM3KmEamEw="; diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix new file mode 100644 index 0000000000000..1c3e6f1a8f3c8 --- /dev/null +++ b/pkgs/development/mobile/maestro/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, unzip, makeWrapper, jre_headless }: + +stdenv.mkDerivation rec { + pname = "maestro"; + version = "1.11.3"; + + src = fetchurl { + url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro-${version}.zip"; + sha256 = "0hjsrwp6d1k68p0qhn7v9689ihy06ssnfpi8dj61jw6r64c234m4"; + }; + + dontUnpack = true; + nativeBuildInputs = [ unzip makeWrapper ]; + + installPhase = '' + mkdir $out + unzip $src -d $out + mv $out/maestro-$version/* $out + rm -rf $out/maestro-$version + ''; + + postFixup = '' + wrapProgram $out/bin/maestro --prefix PATH : "${lib.makeBinPath [ jre_headless ]}" + ''; + + meta = with lib; { + description = "Mobile UI Automation tool"; + homepage = "https://maestro.mobile.dev/"; + license = licenses.asl20; + platforms = lib.platforms.all; + maintainers = with maintainers; [ SubhrajyotiSen ]; + }; +} diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 17f32ef3edebc..9a4bf801d1e55 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,16 +1,19 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview }: +{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview +, camlp-streams +}: let param = let check = lib.versionAtLeast ocaml.version; in if check "4.06" then rec { - version = "2.18.12"; + version = "2.18.13"; src = fetchFromGitHub { owner = "garrigue"; repo = "lablgtk"; rev = version; - sha256 = "sha256:0asib87c42apwf1ln8541x6i3mvyajqbarifvz11in0mqn5k7g7h"; + sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po="; }; NIX_CFLAGS_COMPILE = null; + buildInputs = [ camlp-streams ]; } else if check "3.12" then { version = "2.18.5"; src = fetchurl { @@ -26,11 +29,12 @@ let param = in stdenv.mkDerivation { - pname = "lablgtk"; + pname = "ocaml${ocaml.version}-lablgtk"; inherit (param) version src NIX_CFLAGS_COMPILE; nativeBuildInputs = [ pkg-config ocaml findlib ]; - buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; + buildInputs = [ gtk2 libgnomecanvas gtksourceview ] + ++ param.buildInputs or []; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = [ "world" ]; diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index 6074bf566caf1..f4ab5f9a4d5bc 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.46"; + version = "0.1.47"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-tSPoumEWdlzyxHhyXd7jD58pdJzfw1CCJM1MYBAdxOk="; + hash = "sha256-1q5CX5vtdK+rNDE6GtIobuacv6dkHhRJ+kirbX62us8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 4d0edf652085a..794879d4b4728 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -3,6 +3,7 @@ , aiocoap , bleak , bleak-retry-connector +, chacha20poly1305 , chacha20poly1305-reuseable , commentjson , cryptography @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.0.2"; + version = "2.2.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pZEZHhsU/1tEX1VOFQ8b+ERJ8tU1pzRJMRYD28nfTb0="; + hash = "sha256-0O8fax25vabItFnUD9N7C4gyMSKPHqHSgzJXJjp5dGw="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { aiocoap bleak bleak-retry-connector + chacha20poly1305 chacha20poly1305-reuseable commentjson cryptography diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix new file mode 100644 index 0000000000000..4aeec041c0431 --- /dev/null +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, aiolifx +, poetry-core +, pytest-asyncio +, pytestCheckHook +, async-timeout +, typer +}: + +buildPythonPackage rec { + pname = "aiolifx-themes"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Djelibeybi"; + repo = "aiolifx-themes"; + rev = "v${version}"; + hash = "sha256:17498vdg8i20hk4i8hzc67qaj206ik3s1zn1k70plsjr9zlgs6vz"; + }; + + prePatch = '' + # Don't run coverage, or depend on typer for no reason. + substituteInPlace pyproject.toml \ + --replace " --cov=aiolifx_themes --cov-report=term-missing:skip-covered" "" \ + --replace "typer = " "# unused: typer = " + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiolifx + ]; + + checkInputs = [ + async-timeout + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "aiolifx_themes" + ]; + + meta = with lib; { + description = "Color themes for LIFX lights running on aiolifx"; + homepage = "https://github.com/Djelibeybi/aiolifx-themes"; + license = licenses.mit; + maintainers = with maintainers; [ lukegb ]; + }; +} diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index b2888a92d2566..bbbaa7361c698 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "v${version}"; - hash = "sha256-uzVtgJ4R2MK6lqruvmoqgkzVCLhjyaEV92X6U6+lwG4="; + hash = "sha256-XPvnZOshA+PdFOzOlJXMfRTRYSue0uHsNwQsCwv3WOU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index e9dec57f4d18a..eba27f0390ad7 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -2,7 +2,9 @@ , aiohttp , aresponses , buildPythonPackage +, ciso8601 , fetchFromGitHub +, orjson , pytest-asyncio , pytestCheckHook , pythonOlder @@ -10,7 +12,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.9.0"; + version = "22.10.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,11 +21,13 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-nJjqpk4GcgXJhFZd4E3vSmyNP+RkOASEd4Ipemx6cAc="; + hash = "sha256-FpBKhxFFMG5WgQ3TCAcg1P+cGVGU7LiJ+Zr4kL2Nl88="; }; propagatedBuildInputs = [ aiohttp + ciso8601 + orjson ]; checkInputs = [ diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index a3dfa62705a52..c4881dcdd56f4 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "3.0.0"; + version = "4.1.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Id4qg7uSvpjXpEx0/EvSMvFxgkR78/NOoOmmwngj7Qw="; + hash = "sha256-0BxbcWA2Kdk1xTSKN/dH9LJc3yI60kmyMCrK77tqyNE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 38b84ddf57298..b75b9ac318109 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "40"; + version = "41"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PJ3AIoqu0cUs8IZqY9O2e+GuPd4vjLn9VruKyPxVe4A="; + hash = "sha256-rBluo4080m9jFnquXaQY/Cntp7wHToY16aNFhzrQJs8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 14dfb65cfea8b..614bbe28a21c8 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -12,6 +12,7 @@ , pytest-timeout , pytest-xdist , pytestCheckHook +, pythonOlder , python-daemon , pyyaml , six @@ -19,12 +20,14 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.2.1"; + version = "2.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-zZtssRdAEbTi4KWZPU0E2SjN5f4iqJk67UQ4STOHwYI="; + hash = "sha256-mcTfu+reRGOXvRqeC/BQhz2KBrWSbVXSQIWyld2/Ecs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index e49fda936c831..f9b12e553420d 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asyncclick"; - version = "8.0.1.3"; + version = "8.1.3.2"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = pname; rev = version; - sha256 = "03b8zz8i3aqzxr3ffzb4sxnrcm3gsk9r4hmr0fkml1ahi754bx2r"; + sha256 = "sha256-by1clF+WAfN/gjOg/F60O1tCZ3qAhWqiiJJY04iMzQ8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index a87bca4396433..6a52ff4fd2d17 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -1,31 +1,37 @@ { lib , buildPythonPackage -, pythonOlder -, fetchPypi -, async_generator +, fetchFromGitHub , paho-mqtt +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.12.1"; + version = "0.13.0"; format = "setuptools"; - src = fetchPypi { - pname = "asyncio_mqtt"; - inherit version; - sha256 = "sha256-bb+FpF+U0m50ZUEWgK2jlHtQVG6YII1dUuegp+16fDg="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "sbtinstruments"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-On4N5KPnbwYrJguWwBdrnaNq58ZeGIPYSFzIRBfojpQ="; }; propagatedBuildInputs = [ paho-mqtt - ] ++ lib.optionals (pythonOlder "3.7") [ - async_generator + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; - doCheck = false; # no tests + # Module will have tests starting with > 0.13.0 + doCheck = false; - pythonImportsCheck = [ "asyncio_mqtt" ]; + pythonImportsCheck = [ + "asyncio_mqtt" + ]; meta = with lib; { description = "Idomatic asyncio wrapper around paho-mqtt"; diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 088965d7dfd28..3457d2d37b23d 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "av"; - version = "9.2.0"; + version = "10.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "mikeboers"; repo = "PyAV"; rev = "v${version}"; - hash = "sha256-I7j+EzpvgKCNY8TbcaHsaWtetyvmno6YYhQTer2+Ds0="; + hash = "sha256-XcHP8RwC2iwD64Jc7SS+t9OxjFTsz3FbrnjMgJnN7Ak="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 2e167add9b9f7..26fe4d62feb40 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "2.1.3"; + version = "2.8.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fEdyo6QBmHWgl5o/ZIu/HM8GWp5t88awhb+7SPWngf0="; + hash = "sha256-u/7gEY1HsOc2JqGmq/kS46wcA0p8B7D08vrOHWIuFyY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 81dd818e227be..ed21f046eae40 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -5,6 +5,7 @@ , dbus-fast , fetchFromGitHub , poetry-core +, pytest-asyncio , pytestCheckHook , pythonOlder , typing-extensions @@ -12,16 +13,16 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.18.1"; + version = "0.19.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2/jJ2C2TudwCAshDBLUQjNMbYa2j4XfW8bXmeWrAyrA="; + hash = "sha256-WNFAN8xE0ULo4fQnPFJJsc/HtrVo1ClxsvxrrhJjvI0="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 8744adc575556..7a17d84a666c2 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.1.2"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-AobkHODtWun2TPxb6yR/ieYyeIndTG0KmxTY81fQHCA="; + hash = "sha256-5FOFN2B35dTYuZhO09HZ/sNkY5X16bICP+qWzmrua5o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix deleted file mode 100644 index 9f35da172596b..0000000000000 --- a/pkgs/development/python-modules/bsblan/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, aiohttp -, aresponses -, buildPythonPackage -, fetchFromGitHub -, mypy -, packaging -, poetry-core -, pydantic -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, setuptools -, yarl -}: - -buildPythonPackage rec { - pname = "bsblan"; - version = "0.5.6"; - format = "pyproject"; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "liudger"; - repo = "python-bsblan"; - rev = "refs/tags/v${version}"; - hash = "sha256-eTKexiuomlTryy2bD2w9Pzhb4R9C3OIbLNX+7h/5l+c="; - }; - - nativeBuildInputs = [ - poetry-core - setuptools - ]; - - propagatedBuildInputs = [ - aiohttp - packaging - pydantic - yarl - ]; - - checkInputs = [ - aresponses - mypy - pytest-asyncio - pytest-mock - pytestCheckHook - ]; - - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace "--cov" "" - ''; - - pythonImportsCheck = [ - "bsblan" - ]; - - meta = with lib; { - description = "Python client for BSB-Lan"; - homepage = "https://github.com/liudger/python-bsblan"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 5f82f2a1852fa..9f0014c16feb5 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "1.2.2"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-2/2ODlHqQOl4LHUb2fyQpmsBYnoz0Rvc9lLEfZTKijA="; + hash = "sha256-4vk9uaG/9n3lNEWAergW9kFN2/Ta/KSax0rK9tVxAfw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index fa2880fb0553c..23a31e389acb1 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -1,31 +1,40 @@ { lib +, blinker , buildPythonPackage , fetchPypi +, flask , pythonOlder , webob }: buildPythonPackage rec { pname = "bugsnag"; - version = "4.2.1"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-PT6XaKz3QFAEhCmS7jXKK7xxscNlpbhGpCKQIRuSt6U="; + hash = "sha256-9q6Cp/reUJJ3XGMT9BV+4z5AxJdP8izfzgjOpS84/Tc="; }; propagatedBuildInputs = [ webob ]; + passthru.optional-dependencies = { + flask = [ + blinker + flask + ]; + }; + pythonImportsCheck = [ "bugsnag" ]; - # no tests + # Module ha no tests doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 4600e0c1e6b67..3e88db6c915bc 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.6.3"; + version = "1.6.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yll2C8J0qJmg2nWAnWkJrkPlEjOB/W7wQKRNGVLAtEg="; + hash = "sha256-bAmyEZUR8w6xEmz82XOhCCTiDxz9JQOc3j0SGN2cjY8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 5f208793ab556..19444ee49f628 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.17.3"; + version = "1.17.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-b/bA1ClBdj25aPoniszqRtNih+qzJuLMiGkNoV1cv7c="; + hash = "sha256-idcqNWocy4dDh7zv3gz81wHp+9WX5PptXGHI9uqM69M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 55a316ceab99a..9de7f2ad5e924 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -1,33 +1,51 @@ -{ config, lib, buildPythonPackage, fetchFromGitHub, isPy3k -, filelock, protobuf, numpy, pytestCheckHook, mock, typing-extensions -, cupy, cudaSupport ? config.cudaSupport or false +{ lib +, buildPythonPackage +, config +, cudaSupport ? config.cudaSupport or false +, cupy +, fetchFromGitHub +, filelock +, mock +, numpy +, protobuf +, pytestCheckHook +, pythonOlder +, six +, typing-extensions }: buildPythonPackage rec { pname = "chainer"; version = "7.8.1.post1"; - disabled = !isPy3k; # python2.7 abandoned upstream + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "chainer"; repo = "chainer"; rev = "refs/tags/v${version}"; - sha256 = "sha256-epwnExmyCWmwaOz+mJnAl1peEeHLBdQGC62BlLfSTQQ="; + hash = "sha256-epwnExmyCWmwaOz+mJnAl1peEeHLBdQGC62BlLfSTQQ="; }; propagatedBuildInputs = [ filelock - protobuf numpy + protobuf + six typing-extensions - ] ++ lib.optionals cudaSupport [ cupy ]; + ] ++ lib.optionals cudaSupport [ + cupy + ]; checkInputs = [ - pytestCheckHook mock + pytestCheckHook ]; - pytestFlagsArray = [ "tests/chainer_tests/utils_tests" ]; + pytestFlagsArray = [ + "tests/chainer_tests/utils_tests" + ]; preCheck = '' # cf. https://github.com/chainer/chainer/issues/8621 @@ -43,6 +61,10 @@ buildPythonPackage rec { "ideep" ]; + pythonImportsCheck = [ + "chainer" + ]; + meta = with lib; { description = "A flexible framework of neural networks for deep learning"; homepage = "https://chainer.org/"; diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix index 2f755bf3ded75..c0e82acc17a14 100644 --- a/pkgs/development/python-modules/crownstone-uart/default.nix +++ b/pkgs/development/python-modules/crownstone-uart/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crownstone-uart"; - version = "2.6.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-uart"; rev = version; - sha256 = "sha256-cmMxbYGaE+HpgrZ78eCampE/1Ku/X9mJP6VcBbxQm6Q="; + sha256 = "sha256-Sc6BCIRbf1+GraTScmV4EAgwtSE/JXNe0f2XhKyACIY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index aba974e027045..9bc7efafff54c 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -9,12 +9,12 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "11.1.0"; + version = "11.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-4TtvmQrd172HCQWvQp+tUQhNCFf4YA3TIGod9aRoTt0="; + sha256 = "sha256-wzNh8RejR6Y/aZbql0RtF/HAOPGh9TPlAkZCNQdpI+I="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both @@ -70,8 +70,5 @@ in buildPythonPackage rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ hyphon81 ]; - - # See https://github.com/NixOS/nixpkgs/pull/179912#issuecomment-1206265922. - broken = true; }; } diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 72cb7b7ee9c7b..3fabcd6a1135d 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.29.1"; + version = "1.64.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-GqL6PZlqFi5Es8VYeqeTsXX6j5fol2JzcosFtVCQn60="; + hash = "sha256-y/H4TYCicn6Gvv+F4ogqhNWK2mZxEVNGCY4pJAfjq9s="; }; nativeBuildInputs = [ @@ -78,6 +78,14 @@ buildPythonPackage rec { "test_standard_interfaces" "test_tcp_connection_with_forwarding" "test_unexpected_disconnect" + # NameError: name '_cast_uint32_native' is not defined + "test_unmarshall_bluez_interfaces_added_message" + "test_unmarshall_bluez_interfaces_removed_message" + "test_unmarshall_bluez_message" + "test_unmarshall_bluez_properties_changed_with_service_data" + "test_unmarshall_can_resume" + "test_unmarshalling_with_table" + "test_ay_buffer" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 368e95c2a1a02..bf296db3815ac 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "6.1.0"; + version = "6.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-ngtQNyVQaywMyYitj37m0RJGBiMpjB4b8Rn+feMOjVU="; + hash = "sha256-AKah3A9srKm/cFWM7IiZ7JxQ8s0KTuh8VLKOymsDgnA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix new file mode 100644 index 0000000000000..6dc8ebde08419 --- /dev/null +++ b/pkgs/development/python-modules/deploykit/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, bash +, openssh +, pytestCheckHook +, stdenv +}: + +buildPythonPackage rec { + pname = "deploykit"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "numtide"; + repo = pname; + rev = version; + hash = "sha256-eKyqsGgnJmF2wUYa7HjC1Jwsh03qVTJEP1MtL7JL4Ts="; + }; + + buildInputs = [ + setuptools + ]; + + checkInputs = [ + bash + openssh + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ "test_ssh" ]; + + # don't swallow stdout/stderr + pytestFlagsArray = [ "-s" ]; + + meta = with lib; { + description = "Execute commands remote via ssh and locally in parallel with python"; + homepage = "https://github.com/numtide/deploykit"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 zowoq ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/dinghy/default.nix b/pkgs/development/python-modules/dinghy/default.nix index 1949fb6714f84..f117cd3381a43 100644 --- a/pkgs/development/python-modules/dinghy/default.nix +++ b/pkgs/development/python-modules/dinghy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dinghy"; - version = "0.13.4"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "nedbat"; repo = pname; rev = version; - hash = "sha256-H3AFKKtSiFD3LqyWaIYB4LncPaH2/eptuKS4BN0cNBQ="; + hash = "sha256-zhSSEI5h7ZCQeytAFbevowhITghaG4vu81C4pDb6xUg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index fce3751dc20c7..935abb99c8db1 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.1.2"; + version = "4.1.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-uNhDcUgQq4jVk0RQfURHvoss8SpJAxNjtu7Z8bmyKA8="; + hash = "sha256-Z4u/yGBOskbtVOIGPwdl8TsyGlBSa9yMsflD7af6MfE="; }; patches = [ diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 412009cc637a7..a79de8f96c01c 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.20.46"; + version = "0.20.50"; pname = "dulwich"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Tw6I//9dsVI9k9kvFSX+X6FhMY/7qtUCwbmzvnoGcXI="; + hash = "sha256-UKlBeWssZ1vjm+co1UDBa1t853654bP4VWUOzmgy0r4="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/energyflip-client/default.nix b/pkgs/development/python-modules/energyflip-client/default.nix new file mode 100644 index 0000000000000..73d0f5adfa166 --- /dev/null +++ b/pkgs/development/python-modules/energyflip-client/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "energyflip-client"; + version = "0.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "dennisschroer"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-neuZ6pZWW/Rgexu/iCEymjnxi5l/IuLKPFn6S9U4DgU="; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + yarl + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "energyflip" + ]; + + meta = with lib; { + description = "Library to communicate with the API behind EnergyFlip"; + homepage = "https://github.com/dennisschroer/energyflip-client"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index e179f5c94d203..621c3e8273616 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "eve"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; src = fetchPypi { inherit version; pname = "Eve"; - sha256 = "80cad5702d07189c5f43f432d307c473331144477a6a360d22a27dc018366c13"; + sha256 = "sha256-UiOhnJyEy5bPIIRHAhuWo8AqHOCp0OE5d0btujfeq4o="; }; disabled = pythonOlder "3.7"; diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index ca47c67c81d81..fc6ede97dd755 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.6.1"; + version = "1.7.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-2BtJQiDPMMIxbO0FdOQT/jzsaiPMTdmf8S21ezmQRLQ="; + sha256 = "sha256-vzaaX3wj1UkFGCohxYlPw6NA0b+oV/2JtpYXC4zncjk="; }; preBuild = '' diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 065150e88e2f5..b66ccd155c192 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -1,17 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "fastrlock"; - version = "0.8"; + version = "0.8.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9cc100ed0924b32173d7de705a82fdf1257cdf60af1952a13f64759307b40931"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "scoder"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-KYJd1wGJo+z34cY0YfsRbpC9IsQY/VJqycGpMmLmaVk="; }; + nativeBuildInputs = [ + cython + ]; + + # Todo: Check why the tests have an import error + doCheck = false; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "fastrlock" + ]; + meta = with lib; { + description = "RLock implementation for CPython"; homepage = "https://github.com/scoder/fastrlock"; - description = "A fast RLock implementation for CPython"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index 0feaa5595f905..e5e594fc5c100 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-r+SgAClgH2bSObcmiAZcx8IZ3sHJJ5lPkLgl6eU9j5M="; + hash = "sha256-ZrVs1kdL9B2MVGYDR9N6/MP30ZcGSN42XBAu93VIqts="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/fjaraskupan/default.nix b/pkgs/development/python-modules/fjaraskupan/default.nix index 3c4478a8007b9..bad4d7f14ef0a 100644 --- a/pkgs/development/python-modules/fjaraskupan/default.nix +++ b/pkgs/development/python-modules/fjaraskupan/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fjaraskupan"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "elupus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Vt2THMB4m0YCLdfEnAokwS0oJfcgp3fmZMUDhTrekZY="; + hash = "sha256-0tNLwYckWF9GjhniEkiO+A+xDsUriUsMFZxG/FmUfps="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index a04dada07dcc0..76fd69bd02234 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "freebox-api"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; - rev = "v${version}"; - hash = "sha256-y78PzSivB+IJ9hrN3ZRhDBo7kI7M6uleTPkF6slO6So="; + rev = "refs/tags/v${version}"; + hash = "sha256-60hIv35nNxXPFZy/JvG1O/ZkSMk65XDojUYP1QyfwXY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 1ded2320dfa85..e9afe6ef1b496 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -1,18 +1,20 @@ { lib +, aiohttp , buildPythonPackage -, pythonOlder , fetchFromGitHub -, aiohttp -, pydantic , freezegun +, ical +, pydantic , pytest-aiohttp , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "gcal-sync"; - version = "1.1.0"; + version = "3.0.0"; + format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,11 +22,12 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-IiBwqpglVC+M1NXSmidSEDjKcGn76aqPZclXK0vKsm8="; + hash = "sha256-xRmNV06gMdPPHcvgJTvxPZBUi1BbFTnwZpzXLBluBYo="; }; propagatedBuildInputs = [ aiohttp + ical pydantic ]; @@ -35,12 +38,15 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "gcal_sync" ]; + pythonImportsCheck = [ + "gcal_sync" + ]; - meta = { - description = "Python library for syncing Google Calendar to local storage"; + meta = with lib; { + description = "Library for syncing Google Calendar to local storage"; homepage = "https://github.com/allenporter/gcal_sync"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; + changelog = "https://github.com/allenporter/gcal_sync/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 3eee938f9ee7d..addc372f8a7e4 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -8,13 +8,12 @@ , pythonOlder , requests , responses -, six , typing-extensions }: buildPythonPackage rec { pname = "globus-sdk"; - version = "3.13.0"; + version = "3.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-d8c/kMfDMz5Z9O7OtAz2hAXQHqTlJ8oKcL9Yk+6MsA4="; + hash = "sha256-lCqiBlyf0cUqsmSlCmt+jXTBGsXyCioZ232zd5rVqiA="; }; propagatedBuildInputs = [ @@ -38,7 +37,6 @@ buildPythonPackage rec { mypy pytestCheckHook responses - six ]; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index bab843f81ccf1..4dedba76ff44e 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.5"; + version = "1.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/zKQX6olZS0yl1yAu7Hguj87GUCiPfuf9oamobFHxjw="; + hash = "sha256-N0d/8lqqLT4IXbg0QpxchtJ4PmBOvXc4yGkvNhvHyJc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 70d021318fdd0..6c5132027c5e4 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.15.1"; + version = "1.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bQpOXKK/piX1+243BS8BCEX/0FEl5YnOvegvAR53az4="; + hash = "sha256-3sJBf2VACLHXtkWzHs9iHIvvkBaU5MTnJy7/0Yr6Nts="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 631e0b6eaad38..4b0a9b660cfb9 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.5.1"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-//e+Kb85TBAC9/mHz/T/Dm/pNjbj0488/L/NeS1RMqY="; + hash = "sha256-6w940Yn0WgVC0Rn9OX40+6hO4maPSC7VrT3ARD8CIjQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index 18476fac8c4bd..ba4c156f3a56a 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -1,7 +1,9 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub , home-assistant-bluetooth +, mac-vendor-lookup , poetry-core , pytestCheckHook , pythonOlder @@ -9,7 +11,7 @@ buildPythonPackage rec { pname = "ibeacon-ble"; - version = "0.7.4"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,26 +20,28 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-B+ftS/oNCECjCqB396K5iCl0aeJSBGVXshlvZ1kvEuo="; + hash = "sha256-iYgGflM0IpSIMNgPpJAFAl9FYoMfRinM3sP6VRcBSMc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + aiohttp home-assistant-bluetooth + mac-vendor-lookup ]; checkInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "ibeacon_ble" ]; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 87f2eb6926200..84c1a7e930402 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -46,7 +46,6 @@ }: let testBackends = [ - "dask" "datafusion" "duckdb" "pandas" diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix new file mode 100644 index 0000000000000..d5ac5f4196edf --- /dev/null +++ b/pkgs/development/python-modules/ical/default.nix @@ -0,0 +1,56 @@ +{ lib +, python-dateutil +, buildPythonPackage +, fetchFromGitHub +, freezegun +, tzdata +, pyparsing +, pydantic +, pytest-asyncio +, pytest-benchmark +, pytest-golden +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ical"; + version = "4.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-pZtjGWmEVcHSCgiVTKoEaRvec02cz3x93W+UXx3J8gE="; + }; + + propagatedBuildInputs = [ + python-dateutil + tzdata + pydantic + pyparsing + ]; + + checkInputs = [ + freezegun + pytest-asyncio + pytest-benchmark + pytest-golden + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ical" + ]; + + meta = with lib; { + description = "Library for handling iCalendar"; + homepage = "https://github.com/allenporter/ical"; + changelog = "https://github.com/allenporter/ical/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 41bd796372d10..192a6db039ad3 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -2,20 +2,14 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, asttokens -, typing-extensions -, pytestCheckHook -, yapf -, docutils -, pygments -, dpcontracts -, tabulate -, py-cpuinfo -, typeguard , astor -, numpy +, asttokens , asyncstdlib , deal +, dpcontracts +, numpy +, pytestCheckHook +, typing-extensions }: buildPythonPackage rec { @@ -38,40 +32,39 @@ buildPythonPackage rec { export ICONTRACT_SLOW=1 ''; - propagatedBuildInputs = [ asttokens typing-extensions ]; checkInputs = [ - pytestCheckHook - yapf - docutils - pygments - dpcontracts - tabulate - py-cpuinfo - typeguard astor - numpy asyncstdlib deal + dpcontracts + numpy + pytestCheckHook ]; disabledTestPaths = [ - # mypy decorator checks don't pass. For some reaseon mypy + # mypy decorator checks don't pass. For some reason mypy # doesn't check the python file provided in the test. "tests/test_mypy_decorators.py" ]; + # Upstream adds some plain text files direct to the package's root directory + # https://github.com/Parquery/icontract/blob/master/setup.py#L63 + postInstall = '' + rm -f $out/{LICENSE.txt,README.rst,requirements.txt} + ''; + pythonImportsCheck = [ "icontract" ]; meta = with lib; { description = "Provide design-by-contract with informative violation messages"; homepage = "https://github.com/Parquery/icontract"; - changelog = "https://github.com/Parquery/icontract/blob/master/CHANGELOG.rst"; + changelog = "https://github.com/Parquery/icontract/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ gador ]; + maintainers = with maintainers; [ gador thiagokokada ]; }; } diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 3cea645942009..de9656d01ccd1 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jsonmerge"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a86bfc44f32f6a28b749743df8960a4ce1930666b3b73882513825f845cb9558"; + sha256 = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0="; }; propagatedBuildInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 9830d29789b51..2cd29ba4da4b7 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -26,29 +26,16 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.3"; + version = "2.6.5"; format = "setuptools"; src = fetchFromGitHub { owner = "Juniper"; repo = "py-junos-eznc"; rev = version; - hash = "sha256-XhQJwtS518AzSwyaWE392nfNdYe9+iYHvXxQsjJfzI8="; + hash = "sha256-BoHT6ejccInfREbYtW6psm3fvsQxLS1vpj/aPDqqpnY="; }; - patches = [ - (fetchpatch { - # Fixes tests with lxml>=4.8.0; remove > 2.6.3 - url = "https://github.com/Juniper/py-junos-eznc/commit/048f750bb7357b6f6b9db8ad64bea479298c74fb.patch"; - hash = "sha256-DYVj0BNPwDSbxDrzHhaq4F4kz1bliXB6Au3I63mRauc="; - }) - ]; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace "ncclient==0.6.9" "ncclient" - ''; - propagatedBuildInputs = [ jinja2 lxml diff --git a/pkgs/development/python-modules/lcov_cobertura/default.nix b/pkgs/development/python-modules/lcov_cobertura/default.nix new file mode 100644 index 0000000000000..ecbeb35b906fa --- /dev/null +++ b/pkgs/development/python-modules/lcov_cobertura/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lcov_cobertura"; + version = "2.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-xs40e/PuZ/jV0CDNZiYmo1lM8r5yfMY0qg0R+j9/E3Q="; + }; + + doCheck = true; + pythonImportsCheck = [ + "lcov_cobertura" + ]; + + meta = { + description = "Converts code coverage from lcov format to Cobertura's XML format"; + homepage = "https://eriwen.github.io/lcov-to-cobertura-xml/"; + license = lib.licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index 92f397a4c517c..810a9d59c02c9 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "led-ble"; - version = "0.10.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-GyVj9g4tqPaR5Gd8N76TtkldaAATnEBsSs/F+2iQqGM="; + hash = "sha256-XAb/tJPUe/sNvcU7t63inMPBIz+AREioWXBuQa/c9T0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index da5e0c7d8e75d..947d29762f3e3 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "life360"; - version = "5.2.1"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yhOqiLozeqPjl5ZBgPaMuZ2fJeOwhI460p9x7i1hVuM="; + hash = "sha256-GacesPWPTuIIZel4OARWW13OYflYFNf4Jxh9I8ms7s0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 4f5994f3f6983..a3efd863bbbdc 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.2.2"; + version = "0.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-DmJcxbAVaNUTe1ulVmYeI0Kdtm0Lz83akjH4ttZsgZg="; + hash = "sha256-yr+CU8MgBIUHuw40oNmm+//DG+iB0m7geBh4doaqV/0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mac-vendor-lookup/default.nix b/pkgs/development/python-modules/mac-vendor-lookup/default.nix new file mode 100644 index 0000000000000..2c0a7d4f7240b --- /dev/null +++ b/pkgs/development/python-modules/mac-vendor-lookup/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiofiles +, aiohttp +}: + +buildPythonPackage rec { + pname = "mac-vendor-lookup"; + version = "0.1.12"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bauerj"; + repo = "mac_vendor_lookup"; + rev = "5b57faac0c5a701a7e18085e331853397b68c07c"; + hash = "sha256-F/aiMs+J4bAesr6mKy+tYVjAjZ3l9vyHxV7zaaB6KbA="; + }; + + postPatch = '' + sed -i '/mac-vendors.txt/d' setup.py + ''; + + propagatedBuildInputs = [ + aiofiles + aiohttp + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "mac_vendor_lookup" + ]; + + meta = with lib; { + description = "Find the vendor for a given MAC address"; + homepage = "https://github.com/bauerj/mac_vendor_lookup"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/mediafile/default.nix b/pkgs/development/python-modules/mediafile/default.nix index c71bf3214b2c1..1e09a5e489ab7 100644 --- a/pkgs/development/python-modules/mediafile/default.nix +++ b/pkgs/development/python-modules/mediafile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mediafile"; - version = "0.10.0"; + version = "0.10.1"; format = "flit"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "beetbox"; repo = pname; rev = "v${version}"; - hash = "sha256-Sdb5Hvm4Y344msZGie4PJ88ZmFtWfc0chABtmwnEN/Y="; + hash = "sha256-2h17FA0GTY4R+WhZiQtPFYf6gH7XLbI3aOB/nUXFtJI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index fb11b9be64afd..1e3dad2c16338 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-2m63OSVyhZgptBln+b65zX3609Liwq5V2a78UQThHyE="; + hash = "sha256-Z2/nzsHRpaykqLRkJoPdNGSLNbJvd4GOUpTYl8MG8mw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix index 0a4b7c8be42ba..791963f4107f8 100644 --- a/pkgs/development/python-modules/mitmproxy-wireguard/default.nix +++ b/pkgs/development/python-modules/mitmproxy-wireguard/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "mitmproxy-wireguard"; - version = "0.1.15"; + version = "0.1.17"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "decathorpe"; repo = "mitmproxy_wireguard"; rev = "refs/tags/${version}"; - hash = "sha256-31S955juthagoFsthVTf3Vjx2YCKn43HKJ6mjrA8lfw="; + hash = "sha256-G//3h9QHModKNcGqG2FcV65bver809J4Xnig/Fr5zdg="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-e2P3vfiaTOUf28Lexv2SDFaiGE55G8EkDKSYb8b7vLM="; + hash = "sha256-KPk6lLofsWDG+rswG5+q4bs9CZJFn4RuepX/OQvZ1Pw="; }; # Module has no tests, only a test client diff --git a/pkgs/development/python-modules/mockupdb/default.nix b/pkgs/development/python-modules/mockupdb/default.nix index 47107f0617bee..ddd72e7e7c1ac 100644 --- a/pkgs/development/python-modules/mockupdb/default.nix +++ b/pkgs/development/python-modules/mockupdb/default.nix @@ -1,19 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , pymongo +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "mockupdb"; version = "1.8.1"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "d36d0e5b6445ff9141e34d012fa2b5dfe589847aa1e3ecb8d774074962af944e"; + hash = "sha256-020OW2RF/5FB400BL6K13+WJhHqh4+y413QHSWKvlE4="; }; - propagatedBuildInputs = [ pymongo ]; + propagatedBuildInputs = [ + pymongo + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mockupdb" + ]; - pythonImportsCheck = [ "mockupdb" ]; + disabledTests = [ + # AssertionError: expected to receive Request(), got nothing + "test_flags" + "test_iteration" + "test_ok" + "test_ssl_basic" + "test_unix_domain_socket" + ]; meta = with lib; { description = "Simulate a MongoDB server"; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index aa5a74c2cfe86..d6c5fac48593f 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.1.3"; + version = "3.1.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8en64QefQ+r92fgXzbP9MNcJ7cCTtdXa2lekYbLbMAg="; + sha256 = "sha256-F4WPLrxiMiDQEg0fqNQo0DPd50nEvDWzPYGmatf5NIA="; }; passthru = { @@ -41,11 +41,13 @@ buildPythonPackage rec { setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - nativeBuildInputs = [ mpi openssh ]; + nativeBuildInputs = [ mpi ]; + + checkInputs = [ openssh ]; meta = with lib; { description = "Python bindings for the Message Passing Interface standard"; - homepage = "https://bitbucket.org/mpi4py/mpi4py/"; - license = licenses.bsd3; + homepage = "https://github.com/mpi4py/mpi4py"; + license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 835a9d8861a2c..78dbb73a00e12 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.45.1"; + version = "1.46.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1"; + hash = "sha256-bl+LqEg2uZ/mC+X7J/hL5K2Rm7trScqmroHnBYS1Xlg="; }; outputs = [ "out" "doc" ]; @@ -44,11 +44,13 @@ buildPythonPackage rec { disabledTests = [ # Hypothesis produces unreliable results: Falsified on the first call but did not on a subsequent one "test_test_fileobj_save" + "test_test_fileobj_load" + "test_test_fileobj_delete" + "test_mock_fileobj" ]; - disabledTestPaths = [ - # we are not interested in code quality measurements - "tests/quality/test_flake8.py" + pythonImportsCheck = [ + "mutagen" ]; meta = with lib; { @@ -66,5 +68,6 @@ buildPythonPackage rec { homepage = "https://mutagen.readthedocs.io"; changelog = "https://mutagen.readthedocs.io/en/latest/changelog.html#release-${lib.replaceStrings [ "." ] [ "-" ] version}"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 1a3d745dfd0d9..075aebbd6b2e1 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.2.5"; + version = "0.2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = version; - hash = "sha256-iPgdXii3SZWxSTpILBLIWY6vpBTnrpGnEosD/ttN/Yk="; + hash = "sha256-ycQWvJnYvuNtXxNWjuLXD+TghscCIuOZMmch02M9C00="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3f8883b479898..9a5e34d5dc20f 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.24.0"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - hash = "sha256-0bXJoEq8FHRNaFMjncIwDbJROtFz/IJ4gD+LfvmtFUg="; + hash = "sha256-bwv7lpdDYlk+y3KBjv7cSvaGr3v02riNCUfPFh6yv1I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix new file mode 100644 index 0000000000000..8905529f6dec8 --- /dev/null +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -0,0 +1,55 @@ +{ lib +, bluetooth-data-tools +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "oralb-ble"; + version = "0.10.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Iuu44H8fCbJysoSJLBtlJ1XE5Ad2caWihj3UZytWK3o="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=oralb_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "oralb_ble" + ]; + + meta = with lib; { + description = "Library for Oral B BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/oralb-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index efa35f67ddf2f..634c06352e503 100644 --- a/pkgs/development/python-modules/p1monitor/default.nix +++ b/pkgs/development/python-modules/p1monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "2.1.0"; + version = "2.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-p1monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-3xvh/Ic2Mtczi5WREDXy+qQLpXhJQZf6fosT0h+fA0o="; + hash = "sha256-VHY5AWxt5BZd1NQKzsgubEZBLKAlDNm8toyEazPUnDU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index ebf158f261a12..26662c7e6f01f 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "7.1.9"; + version = "7.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ytW+liDg3H0l6znuosG/b17QJJXai4GG7ca7oUQ2eZI="; + hash = "sha256-G2ujLjN8LEHY9gd0SWBpOSkV6fQAZ8pojR0+bMi6TUw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index b75eabf302708..8907cb456846f 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.15"; + version = "3.17"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xm4ySCqa+hHlgjdz8WwkHjevLc79YX/XRKKD/SdIttw="; + hash = "sha256-C2SWuX6Lt4R62rkNJ9qOoVK50j+TUkhoGUw+seWjTQw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 945093dffd0b0..0132ff4db3456 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.3.1"; + version = "2.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "naiquevin"; + owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-X3SVQzBg+QjBSewRsfiyLqIea0duhe1nUf8ancWLvcI="; + hash = "sha256-ivqu9b+4FhGa5y+WnKRk4nF6MR4Vj62pSs2d7ycIZMc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -38,7 +38,9 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - graphviz = [ graphviz ]; + graphviz = [ + graphviz + ]; }; checkInputs = [ @@ -54,7 +56,8 @@ buildPythonPackage rec { meta = with lib; { description = "Command line utility to show dependency tree of packages"; - homepage = "https://github.com/naiquevin/pipdeptree"; + homepage = "https://github.com/tox-dev/pipdeptree"; + changelog = "https://github.com/tox-dev/pipdeptree/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ charlesbaynham ]; }; diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 9a938bdaa0ea8..55874b1665467 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.25.4"; + version = "0.25.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-avriroWSgBn80PzGEuvp/5yad9Q4onSxWLaLlpXDReo="; + sha256 = "sha256-n7+cEJC/RIbA4e5b19HncFOhzWhUZ8etxYsiER7zd8E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 9b6653f2fa590..aacde11916e58 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.14.1"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "prometheus"; repo = "client_python"; - rev = "v${version}"; - sha256 = "sha256-hvBdWOMDuzF91Hv4u//tF+z6la0JfiTQHlpS4TnWpmk="; + rev = "refs/tags/v${version}"; + hash = "sha256-LabvQMNiRH4jclMnN0P4M3w25NQasNQEu1HWvRDQQ2o="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index d0ebca394460a..7facf0c0032de 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.56"; + version = "1.57"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - sha256 = "sha256-L6xrv3dAT/sWt/7ZeDy3P095g7Lpht52LkfCVYNLkbA="; + sha256 = "sha256-7CNvSOwDXXcJ082/Fmgr6OtTQeA30yDjt/Oq2nx4vEk="; }; propagatedBuildInputs = [ @@ -36,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to access the GitHub API v3"; homepage = "https://github.com/PyGithub/PyGithub"; - platforms = platforms.all; + changelog = "https://github.com/PyGithub/PyGithub/raw/v${version}/doc/changes.rst"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jhhuh ]; }; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 5a570464abf28..afa5f0c378b1f 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "7.2.0"; + version = "7.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-5RlYTgxWm6BM/V2+1IF/rje5dNirN7PJs0eSiYeOpOQ="; + sha256 = "sha256-3NgAsXMdt4FsE30oxeTfunpP2e+iqLFZkhMJbc5jVGw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 66608d7783ccd..ba6612bbde47e 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.7.2"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig="; + hash = "sha256-AZDwoq4lCThzwHI0WCzrV9Il2MHp0LKxWg/dscGw0q0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 185e83450937a..c81c42d47707b 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "104"; + version = "105"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-bG2dhWa+KnSsigmOHE4wShaS56M9z6vqrFNek3PLbic="; + hash = "sha256-8GQJ4PCl8te3sovC5FwWoaQnXIRR27b7gPwfmyPRVBE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index f813cfb23214f..81788c5d66b51 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydmd"; - version = "0.4.0.post2210"; + version = "0.4.0.post2211"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "PyDMD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2GSmd+OxdGW9XdLGL08Bnrz0WCtTAYQtYHf2gM5CFIE="; + sha256 = "sha256-DTKw7Gy2w+zas9u62SN6QDhoeMEjSk/Ej09do38yfNY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index e9a6850b5e654..ce69c36d74619 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "pygls"; - version = "0.12.1"; + version = "0.12.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "openlawlibrary"; - repo = pname; + repo = "pygls"; rev = "refs/tags/v${version}"; - sha256 = "sha256-L2KTNiI+I+r2fF88B1NSunowokrDzGCw3PXbxekg/oE="; + sha256 = "sha256-RtoRIfPIbERQFx0GzQqsxnKAMsIK5Zbf2sNtHhC2fmo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pylddwrap/default.nix b/pkgs/development/python-modules/pylddwrap/default.nix new file mode 100644 index 0000000000000..27bac5c1e3a0f --- /dev/null +++ b/pkgs/development/python-modules/pylddwrap/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, coreutils +, fetchFromGitHub +, icontract +, pytestCheckHook +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pylddwrap"; + version = "1.2.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Parquery"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Gm82VRu8GP52BohQzpMUJfh6q2tiUA2GJWOcG7ymGgg="; + }; + + postPatch = '' + substituteInPlace lddwrap/__init__.py \ + --replace '/usr/bin/env' '${coreutils}/bin/env' + ''; + + # Upstream adds some plain text files direct to the package's root directory + # https://github.com/Parquery/pylddwrap/blob/master/setup.py#L71 + postInstall = '' + rm -f $out/{LICENSE,README.rst,requirements.txt} + ''; + + propagatedBuildInputs = [ + icontract + typing-extensions + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "lddwrap" ]; + + meta = with lib; { + description = "Python wrapper around ldd *nix utility to determine shared libraries of a program"; + homepage = "https://github.com/Parquery/pylddwrap"; + changelog = "https://github.com/Parquery/pylddwrap/blob/v${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index e84374e4f744f..96b7cb163669a 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.10.1"; + version = "2022.11.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-E7rBRPtXa/E6jf75zULuGaiu2DHvq4hZjcwPwj/w9ww="; + hash = "sha256-GEKLkFzQV8xI3c8061fO1p66WKj3eDXmx7VaRYDu7kw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 89b7dd6c7f392..114e295c66eaa 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.17.0"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "v${version}"; - hash = "sha256-8keKhwbvqIMxbfmd9GGF7uacOyvqb8G/ifq+pr4Z700="; + hash = "sha256-W3OfYNVendYOrwN/WGeAkNAnZctvlssZ3Bvp5caPZao="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index fbf6769ab4ca0..84f94a76294c0 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -2,32 +2,22 @@ , buildPythonPackage , dpkt , fetchFromGitHub -, fetchpatch , libpcap , pytestCheckHook }: buildPythonPackage rec { pname = "pypcap"; - version = "1.2.3"; - + version = "1.3.0"; src = fetchFromGitHub { owner = "pynetwork"; repo = pname; - rev = "v${version}"; - sha256 = "1zscfk10jpqwxgc8d84y8bffiwr92qrg2b24afhjwiyr352l67cf"; + # No release was tagged and PyPI doesn't contain tests. + rev = "968859f0ffb5b7c990506dffe82457b7de23a026"; + sha256 = "sha256-NfyEC3qEBm6TjebcDIsoz8tJWaJ625ZFPfx7AMyynWE="; }; - patches = [ - # Support for Python 3.9, https://github.com/pynetwork/pypcap/pull/102 - (fetchpatch { - name = "support-python-3.9.patch"; - url = "https://github.com/pynetwork/pypcap/pull/102/commits/e22f5d25f0d581d19ef337493434e72cd3a6ae71.patch"; - sha256 = "0n1syh1vcplgsf6njincpqphd2w030s3b2jyg86d7kbqv1w5wk0l"; - }) - ]; - postPatch = '' # Add the path to libpcap in the nix-store substituteInPlace setup.py --replace "('/usr', sys.prefix)" "'${libpcap}'" diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix index e76152e218d44..1db84979e2a13 100644 --- a/pkgs/development/python-modules/pyrmvtransport/default.nix +++ b/pkgs/development/python-modules/pyrmvtransport/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyrmvtransport"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cgtobi"; repo = pname; rev = "v${version}"; - sha256 = "0m74m3dhxmbv10hsvs7cpshzs3pg66va5lyq94i5j1nxrl9i7spb"; + sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 5ec0aa44995ed..96864141e0549 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.12"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uxMxqx5qbahMvTm3akiOTODhKLNVhHzBAUsOcZo/35I="; + sha256 = "sha256-hIrdT0b9XKw1UoPZtQQ7IaW+HV8wuA9Rwoo8XYdGyw8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix new file mode 100644 index 0000000000000..31a884a69d831 --- /dev/null +++ b/pkgs/development/python-modules/pysnooz/default.nix @@ -0,0 +1,68 @@ +{ lib +, bleak +, bleak-retry-connector +, bluetooth-sensor-state-data +, buildPythonPackage +, events +, fetchFromGitHub +, freezegun +, home-assistant-bluetooth +, poetry-core +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, transitions +}: + +buildPythonPackage rec { + pname = "pysnooz"; + version = "0.8.3"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "AustinBrunkhorst"; + repo = pname; + rev = "v${version}"; + hash = "sha256-K99sE9vxJo6grkp04DmTKOVqdfpQI0kUzJjSR6gnSew="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'transitions = "^0.8.11"' 'transitions = ">0.8.11"' \ + --replace " --cov=pysnooz --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bleak + bleak-retry-connector + bluetooth-sensor-state-data + events + home-assistant-bluetooth + transitions + ]; + + checkInputs = [ + freezegun + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pysnooz" + ]; + + meta = with lib; { + description = "Library to control SNOOZ white noise machines"; + homepage = "https://github.com/AustinBrunkhorst/pysnooz"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index fea0b68dcce9d..33883250fecdb 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "1.0.7"; + version = "1.0.11"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mcaulifn"; repo = "solcast"; rev = "v${version}"; - sha256 = "J4D7W89Qz1Nv4DeqOmHVAWfmThlY5puBjSClRkfwhVw="; + hash = "sha256-iK3WCpl7K/PUccNkOQK7q4k7JjwHAEydU47c8tb4wvc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -53,9 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the Solcast API"; homepage = "https://github.com/mcaulifn/solcast"; - # No license statement present - # https://github.com/mcaulifn/solcast/issues/70 - license = with licenses; [ unfree ]; + license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index ec7758f664b86..6ba4edcde88c2 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.19.15"; + version = "0.20.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-iWd67JEnlI60mvd5hhMPRooZ3VECTt+M9UFvXWdJVPg="; + hash = "sha256-GNjyDkqhOP9sq2qoAZCdSrUNte3FynVxhy9RSUn9j/c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-golden/default.nix b/pkgs/development/python-modules/pytest-golden/default.nix new file mode 100644 index 0000000000000..d6fd3fe5d2d01 --- /dev/null +++ b/pkgs/development/python-modules/pytest-golden/default.nix @@ -0,0 +1,65 @@ +{ lib +, atomicwrites +, buildPythonPackage +, fetchFromGitHub + #, hatchling +, ruamel-yaml +, poetry +, pytest +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, testfixtures +}: + +buildPythonPackage rec { + pname = "pytest-golden"; + version = "0.2.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "oprypin"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-l5fXWDK6gWJc3dkYFTokI9tWvawMRnF0td/lSwqkYXE="; + }; + + pythonRelaxDeps = [ + "testfixtures" + ]; + + nativeBuildInputs = [ + # hatchling used for > 0.2.2 + poetry + pythonRelaxDepsHook + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + atomicwrites + ruamel-yaml + testfixtures + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_golden" + ]; + + meta = with lib; { + description = "Plugin for pytest that offloads expected outputs to data files"; + homepage = "https://github.com/oprypin/pytest-golden"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index bb809674e8305..51ac732b17290 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,23 +1,34 @@ -{ lib, fetchPypi, buildPythonPackage, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "1.17"; pname = "python-stdnum"; + version = "1.17"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "374e2b5e13912ccdbf50b0b23fca2c3e0531174805c32d74e145f37756328340"; + hash = "sha256-N04rXhORLM2/ULCyP8osPgUxF0gFwy104UXzd1Yyg0A="; }; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - nosetests - ''; + pythonImportsCheck = [ + "stdnum" + ]; - meta = { - homepage = "https://arthurdejong.org/python-stdnum/"; + meta = with lib; { description = "Python module to handle standardized numbers and codes"; - maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.lgpl2Plus; + homepage = "https://arthurdejong.org/python-stdnum/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ johbo ]; }; } diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix index 015d07be09b9c..0d60916724b53 100644 --- a/pkgs/development/python-modules/pyxiaomigateway/default.nix +++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyxiaomigateway"; - version = "0.14.1"; + version = "0.14.3"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyXiaomiGateway"; rev = version; - sha256 = "sha256-e/FqqUl90VFDJD6ZFbFqXKH3s2sBaDjSFEvaKJhDlGg="; + sha256 = "sha256-TAbZvs1RrUy9+l2KpfbBopc3poTy+M+Q3ERQLFYbQis="; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 9a987e99141f2..a219977348fa3 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.3.18"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-UKhANqd1QKc1qrN5pjw8GYDJy2UNSKwWJcBYjxMKSKg="; + hash = "sha256-bUhVnkFgfwhHe8zFLICOXHluecp0hZlD10I1AtpWO8o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index e791454b9018f..f85121a39ac3e 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchPypi , python +, pythonOlder , buildPythonPackage , cython , gfortran @@ -14,6 +15,7 @@ , pytest-xdist , numpy , pybind11 +, libxcrypt }: buildPythonPackage rec { @@ -28,7 +30,12 @@ buildPythonPackage rec { nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; - buildInputs = [ numpy.blas pybind11 ]; + buildInputs = [ + numpy.blas + pybind11 + ] ++ lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 9465237eed41b..62ba132641c9c 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Mm/wwPB1iguCaS3cMp6R2r9+g6Nrs5NPU4BuQgBiMRI="; + hash = "sha256-YivsP5c0fnpm/0VCFfyH054LYAQbyEdH+wZTRxsCAY4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 988c0bf28c03d..3571a783af8d6 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.7.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-Ssvg8fX7XqkTU1EriVjtMEvCX2373ig5oNh6SUNRWLk="; + hash = "sha256-MPpAg1PSSx35ed8upK+9GbSuAvsiB/IY0kYzLx4c8U4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index ea26d5b86f210..20bd058fdf5a8 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.9.1"; + version = "2.10.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bBLBDdwVUCh8VA/6w/5DmJNvayaWHNIe1kRhnOQ2Llc="; + hash = "sha256-pCo9CMX+CQBFuK5rbMHsxQEdBHvp1EZA7A9Ykm68NCw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix index 67610774f4b08..8038e0f2f000a 100644 --- a/pkgs/development/python-modules/shiv/default.nix +++ b/pkgs/development/python-modules/shiv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "shiv"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BDSfgXSythWUrwVnsg27rHN0nsfumFdX/2e62h239UY="; + sha256 = "sha256-vxRv8/Oryi6xIU6GAY82EkocItk1QO71JAMhys19f1c="; }; propagatedBuildInputs = [ click pip setuptools wheel ]; diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index 4e8ba675b9c12..24a29318170ff 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.5.6"; + version = "1.5.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-w04wvmzWcp92slPIc2f1En+52J9Z/XvjGHHntCeuTd0="; + hash = "sha256-BIUUg+Y6bbgjnIWPU/bZO2axSLSzIsRJwyu7lBVQz/Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 42a9fa1ebf790..9312b9f36d175 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.07.1"; + version = "2022.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-mbdL1fX86OPMw6I7Lk7NDhm2kE6/iamYbyvYvJrkwLQ="; + sha256 = "sha256-I4ZEKJFfCrpwPXl2f+2XJdFD2VkCghiKdgLjRKdZC+0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index bb6ffcad00059..303d385bbc429 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-Td7WBPpc+ZYlFroZNzvUqQZJag0lbkCgj8TVOPrAAPY="; + hash = "sha256-u9uA4eq6gYQXHhZ1ruk1vkEIRTKsgN87zENuR1Fhew4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index f25322531789e..d788e164f80dc 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.5.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - hash = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E="; + hash = "sha256-esZ+nIHIXKfilb8dBFbAbQQFI6fFRUcoFVCPdnqGXYw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 5e390d7f417e3..c8308b2f80ac1 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -375,7 +375,7 @@ let # FIXME: this checksum is currently wrong, since the tensorflow dependency fetch is broken on darwin "sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjr0=" else - "sha256-3nAjP6WH6xhvVyA6ZGZ6ZpsTTUCQohNIiQhVn1eWpr8="; + "sha256-zH3xNFEU2JR0Ww8bpD4mCiorGtao0WVPP4vklVMgS4A="; }; buildAttrs = { diff --git a/pkgs/development/python-modules/testbook/default.nix b/pkgs/development/python-modules/testbook/default.nix new file mode 100644 index 0000000000000..615fb96cd1421 --- /dev/null +++ b/pkgs/development/python-modules/testbook/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, nbformat +, nbclient +, ipykernel +, pandas +, pytestCheckHook +, traitlets +}: + +buildPythonPackage rec { + pname = "testbook"; + version = "0.4.2"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "nteract"; + repo = pname; + rev = version; + sha256 = "sha256-qaDgae/5TRpjmjOf7aom7TC5HLHp0PHM/ds47AKtq8U="; + }; + + propagatedBuildInputs = [ + nbclient + nbformat + ]; + + checkInputs = [ + ipykernel + pandas + pytestCheckHook + traitlets + ]; + + pythonImportsCheck = [ + "testbook" + ]; + + meta = with lib; { + description = "A unit testing framework extension for testing code in Jupyter Notebooks"; + homepage = "https://testbook.readthedocs.io/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ djacu ]; + }; +} diff --git a/pkgs/development/python-modules/toml-adapt/default.nix b/pkgs/development/python-modules/toml-adapt/default.nix index 0ff06f43093f5..51497c3fbc0d3 100644 --- a/pkgs/development/python-modules/toml-adapt/default.nix +++ b/pkgs/development/python-modules/toml-adapt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "toml-adapt"; - version = "0.2.8"; + version = "0.2.10"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = pname; rev = version; - sha256 = "sha256-9auZZl6c+EfAO/2QaHW5BI1aDZkIIGU+fwzudIdFWqI="; + sha256 = "sha256-eVRiMwdYDS2YdQsINy8lBzV8lhcKgq+Vwlc02C5ar0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 51ed08fe4ced6..78f8a01472812 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.16"; + version = "0.9.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - sha256 = "sha256-tpgRBTA+0c0F5XA+dusqPHlegV5r2Ny7AZeRBvS1pcQ="; + sha256 = "sha256-r77M0IxZ72Sl5c6rA7z8EdZ6rYS/oMrdvdt/E/Pw7nQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 315bcf87b17ff..e82602d3458c2 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Nam6TnjTAt5oV+IQ+6cS8L0/j/lp+x9adRHUTs69GA0="; + hash = "sha256-IHZvmVloBSLcK3GZV9urFeqRxOG76O9O/3ZDNTz4wjQ="; }; propagatedBuildInputs = [ @@ -41,6 +41,8 @@ buildPythonPackage rec { disabledTests = [ # Test requires network access "test_scan_timeout" + "test_start_secure_routing_knx_keys" + "test_start_secure_routing_manual" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 67bbdc965b513..084feb2e6ca4c 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.9.2"; + version = "1.9.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-ypZ0VDGgQcwlMS1POW+lvTlmd02P7bPR2Qo0lDyBYUw="; + hash = "sha256-cU4aeJlRBwxQm6a/rqpO2HVZfz/vfEo4P5x+BjKqqeo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix new file mode 100644 index 0000000000000..474907593a6cc --- /dev/null +++ b/pkgs/development/python-modules/zamg/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zamg"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "killer0071234"; + repo = "python-zamg"; + rev = "refs/tags/v${version}"; + hash = "sha256-mVJ1zuh3v803XgynQiUvt6whTmXxGS7SEtr6IDm4kz4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "zamg" + ]; + + meta = with lib; { + description = "Library to read weather data from ZAMG Austria"; + homepage = "https://github.com/killer0071234/python-zamg"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 44040246587e0..7049f5afc965e 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.39.3"; + version = "0.39.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-bzD8i97m6iHsHiGJHlyRuhtKBqQiAb6YEOglIIGn2no="; + hash = "sha256-CUHpTtCQBuuy8E8bjxfhGOIKr9n2Gdhg/RIyv6OWGvI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b48804ed86709..94bf7cf397abf 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.83"; + version = "0.0.84"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-N+DSaPohwkMJ+YjbnUi7k8GQ+YFd6Ng8n0yesEnOnRA="; + hash = "sha256-x8DOUQjjOlLaIhsLLbGNEE+MYBcMD+VsmcCDU0XxxcE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 694871fbf78ae..24cf7f30eb30c 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/v${version}"; - hash = "sha256-Vb87G+R4SvAhCF3h/U5Q4/avxPgfIjklWdWGaiIWGhk="; + hash = "sha256-zO20ySRO9XFcDB8TkUJW2MxkhDIBpHp9Z24gupssOaY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index fbce8f8db61ea..c7abaac023aa3 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.51.3"; + version = "0.51.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw="; + hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index ea832cec6f1bc..bbcc6d67c8c95 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.18.0"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CsA1eg2YW0/zGoVHRAQNe1dUOF0fmPcUXDDgLGhly28="; + sha256 = "sha256-MdEvzZQt2Nv1LKX2sbvih/ROXVUaCBqYP/PqIIKGeGM="; }; propagatedNativeBuildInputs = [ diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 2c2f0f6053ebc..8a7adc122e9b1 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.19.0"; + version = "2.20.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-WjyCU9z+szSeGbnsTTZGq8UFUpmrMPW+pTZPMk1ZC+s="; + sha256 = "sha256-NTDG0mG2qyOrUSRSm59ybXiJd6pSoSq+xE9or8YRMw8="; }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 17f7ec81be3a2..4575b06c572b5 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.3.4"; + version = "10.4"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-HOKEbBU2jo7AJmSMVG2j1yM4VfcdN+Tl/MiazxtKYHw="; + sha256 = "sha256-x/13rqb3NOP4ML2HoddkmRrEwBAsG97Z2iLLoJCu2PQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0efe231568c3a..23bc700190b59 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.191.0"; + version = "0.192.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-WS2Mm8hK03fXfjLLSL9V0itgmv8/tDQhN6G/C6SucOs="; + sha256 = "sha256-Eqn90vA48PKea2Qrj7sN1hWoU31KzAr7xbfF8Fwi9uw="; }; makeFlags = [ "FLOW_RELEASE=1" ]; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 3eb5086345a76..816326489d8c4 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -81,7 +81,7 @@ buildBazelPackage rec { rm -rf $bazelOut/external/com_google_protobuf ''; - sha256 = "sha256-AiSUwoa0JKChSSPSi1EWTpUKQggmOsjLB6fRMCAgUyE="; + sha256 = "sha256-R+Hc9ldYcKgAXETKr2+Hk7IrjJ93WkrjyJ1SQRoM9V4="; }; buildAttrs = { diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 5c5e7c2d530b7..fd8a78a1ac6b8 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y3DVU2xHYZGUqf+kXhBDpTHACloqOXiMFY9bWU/QfOg="; + sha256 = "sha256-+JAAei783S9umDSMSQq50ovYm1MCID33W6dolTxBEvU="; }; vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg="; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 1fdfa1be259a3..491a02d74d0d6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -26,12 +26,12 @@ }: let - version = "5.3.2"; + version = "5.2.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-OICtkZWS0ePkDFBvE7Ms0KLibxKdh8troXDxgB19e4I="; + sha256 = "sha256-ggqU27FAce1tjCZs8MCA7LJlpe6mUwdXlInEZiwtWCo="; }; # Update with `eval $(nix-build -A bazel_5.updater)`, diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index 97aae84e14d3e..de4deed0606ab 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-yn8Nz2f0UffzTrI+g1MoDpOYj7frq6/US86auYkcs3I="; + sha256 = "sha256-9Fks0DrUgk6N218pPvgAHrU0P9kjCOJhQx8ILzloC+I="; }; dontUnpack = true; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 82d0359de9643..605099c219c09 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.89.0"; + version = "0.91.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MsuLMEbOz68RNq0kLicTslSiucdmcOn7Y6Nhbxwyt+Q="; + sha256 = "sha256-nJd7azn42IqIx8CXL7RHJFAZUaN0uq4FumHL3uGIx9U="; }; vendorSha256 = "sha256-Llq6siZn34sHsZFneT+MLXf2W9cXqi4DZwrH1R5laOY="; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index a318ad48cdbad..e460ffd2590ad 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -46,7 +46,7 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.299.0"; + version = "2.299.1"; inherit sdkSource; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-/grYaWhpd6jZx/gkWC3L+BoZcB6WKVMZzMGfwDhBRr0="; + hash = "sha256-o6N7GDfSEWX6QaEga5hQpbpDcBh7Alcy9mK3QlODTbs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 5b6ec28f8125f..fc0a77cdb66a0 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -34,7 +34,9 @@ in stdenv.mkDerivation rec { sha256 = "sha256-PLnfiWpelgKhs4FNry60sm6/QdhYs76FnZ/ZcRmb4Ok="; }; patches = [ ./patches/no-network.patch ]; - nativeBuildInputs = [ cmake pandoc ]; + + # We need both binary from "capnproto" and library files. + nativeBuildInputs = [ cmake pandoc capnproto ]; buildInputs = [ capnproto sqlite boost zlib rapidjson ]; preBuild = '' mkdir -p js css diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 3238682eb007e..bf49c850881b7 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-69xFfDNitLu8KUQP9ij0ndV6JCzp9wrLsHKwEjuhYdY="; + sha256 = "sha256-h0JR641+VBiTJY8INXhxwvsyZGLH4YRdkddwo2IUDQk="; }; vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix index eefb0a32525ff..50f4d32221296 100644 --- a/pkgs/development/tools/database/indradb/default.nix +++ b/pkgs/development/tools/database/indradb/default.nix @@ -16,7 +16,7 @@ let meta = with lib; { description = "A graph database written in rust "; homepage = "https://github.com/indradb/indradb"; - license = licenses.asl20; + license = licenses.mpl20; maintainers = with maintainers; [ happysalada ]; platforms = platforms.unix; }; @@ -25,7 +25,7 @@ in indradb-server = rustPlatform.buildRustPackage { pname = "indradb-server"; version = "unstable-2021-01-05"; - inherit src; + inherit src meta; cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js="; @@ -43,7 +43,7 @@ in indradb-client = rustPlatform.buildRustPackage { pname = "indradb-client"; version = "unstable-2021-01-05"; - inherit src; + inherit src meta; cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM="; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 8a8562af65ecd..03b0b362682cb 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.15.12"; + version = "0.15.13"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-NyujxnBi55wMmLW488gmimcywfeO6WWAnx/y0KqhR7o="; + sha256 = "sha256-iQei9YSJIKnqsWK26Eh6l3yafvRKPZ2YdHhQqybsfVg="; }; vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/development/tools/grpc-gateway/default.nix index fac290ff2bf81..064448b6c6c48 100644 --- a/pkgs/development/tools/grpc-gateway/default.nix +++ b/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-OthyGEMVQnK0jN9svlfAZUl52lt19jtLd1Oj3cuirx4="; + sha256 = "sha256-bJfqBXi77C0sa6ww0hNOwXYINp6q+KN02LdIHtlHp9Q="; }; - vendorSha256 = "sha256-UjwpFjHVaQT4irhbt2GGlYeNhDs9Dv73PcHKhMrQfQs="; + vendorSha256 = "sha256-Rr7O5pQntuvHfBurPW8FfJQmBWZOmVx7jPCu8HOs0ac="; meta = with lib; { description = diff --git a/pkgs/development/tools/htmltest/default.nix b/pkgs/development/tools/htmltest/default.nix index aac3096a722c0..0630be6148ea8 100644 --- a/pkgs/development/tools/htmltest/default.nix +++ b/pkgs/development/tools/htmltest/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "htmltest"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "wjdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Om3jnaHFEq8XJZhGolPax2NH7PFqtqMG5Rd7JTBdGf8="; + sha256 = "sha256-8tkk476kGEfHo3XGu3/0r6fhX1c4vkYiUACpw0uEu2g="; }; - vendorSha256 = "0zx3ii9crick647kslzwg4d39li6jds938f9j9dp287rhrlzjfbm"; + vendorSha256 = "sha256-dTn5aYb5IHFbksmhkXSTJtI0Gnn8Uz0PMZPFzFKMo38="; ldflags = [ "-w" diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index 8ec8deaefe008..4145fca812c92 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jo"; - version = "1.6"; + version = "1.9"; src = fetchFromGitHub { owner = "jpmens"; repo = "jo"; rev = version; - sha256 ="sha256-aATCeJV0x+XHOQbwulutxivPzGVQ0mJj90vA+6IM124="; + sha256 ="sha256-1q4/RpxfoAdtY3m8bBuj7bhD17V+4dYo3Vb8zMbI1YU="; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index fc893d92f98ee..f513a589767fe 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d2DETEASOe73mpyuk5NZzSzKln1LPttCbnmWEiFnAks="; + sha256 = "sha256-Vv22BDFecGEketJb0qQ4+FxSB2BLb9LcnEAqm/BKRxM="; }; - cargoSha256 = "sha256-se5tGgZysetH4dlh+oe41FRhVqFQIw218fEKwqa3WCA="; + cargoSha256 = "sha256-DRrewxKOR0LjpgoN7TWXHWxJxcZ/psjI/lSnyzBXRXM="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 506eec47d8bbd..62f9be12575a0 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qYWme1VepGTKuvhUtuCqkalfp1YhKDoW8sc6Co0sbHg="; + sha256 = "sha256-kMWheOf6lR2Fdb77NvjQYB/PHILs6ZIfQORh72ojc8c="; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 5334ea0df8a86..5d6d4c1583c48 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.10.05-16.39.51"; + version = "2022.11.03-00.14.57"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-44GAG9PSLpeV6rBGnw6f0EvmQDwCGtrTbPrKWx5pP8Q="; + sha256 = "sha256-NtvW0KT6d0k2oN//7xaTnBIoLKkc7zQFj3VdoFdgBWI="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "7976ad30713ff0886421de42906622aa84d1409b37c8d603189059201daa4fb3"; + sha256 = "49e0a848dc32216a60f48eca68ff476cb69b999f6a79fb7310bf9fb2ffcaf4b6"; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index ce689f0c1e269..916226ea05052 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -17,7 +17,7 @@ luarocks.overrideAttrs (old: { updateScript = unstableGitUpdater { }; }; - meta = { + meta = old.meta // { mainProgram = "luarocks"; }; }) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 664bd9892d2a4..351762233db5a 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.19"; + version = "6.0"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-qj3ByOYOT2/z05ZRSqJH88e/cZ2KjcTdT6eTvnhr7KM="; + sha256 = "sha256-ktcgpmaFXp8cahFRL9bplnSoK7/hRCVXgV8s6OEpMzg="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index cd57796b0bc37..d33ac023fcd3e 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -12,23 +12,24 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; -in rustPlatform.buildRustPackage rec { +in +rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "latex-lsp"; - repo = pname; + repo = "texlab"; rev = "refs/tags/v${version}"; - sha256 = "sha256-PhzxWLkqsHU32vIZwHzdy86bwIzDDmnxp12PS774P3k="; + sha256 = "sha256-gtPnuKmKfUBZDM6DATJB5NxndOwvG5JpBRO4cEU6lIU="; }; - cargoSha256 = "sha256-tH566L0oHnI9mNp1KtJYaBaWCkiAOrtBYkfVSCA2N6w="; + cargoSha256 = "sha256-nu2KltPgexBTxG13kUgHgMrxefPD+Gaj5qBIWWFPdFs="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; nativeBuildInputs = [ installShellFiles ] - ++ lib.optional (!isCross) help2man; + ++ lib.optional (!isCross) help2man; buildInputs = lib.optionals stdenv.isDarwin [ libiconv @@ -36,19 +37,11 @@ in rustPlatform.buildRustPackage rec { CoreServices ]; - postInstall = '' - # Remove generated dylib of human_name dependency. TexLab statically - # links to the generated rlib and doesn't reference the dylib. I - # couldn't find any way to prevent building this by passing cargo flags. - # See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43 - rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}" - rmdir "$out/lib" - '' # When we cross compile we cannot run the output executable to # generate the man page - + lib.optionalString (!isCross) '' + postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v4.3.0/.github/workflows/publish.yml#L131-L135 + # https://github.com/latex-lsp/texlab/blob/v4.3.1/.github/workflows/publish.yml#L126-L130 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 4e4987fa53dff..8829a3e1583f5 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.10.0"; + version = "12.12.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iPSaJL1mvPjzZjXtgqeFS1p1jlOqc6B/R1/Zwym0j3g="; + sha256 = "sha256-6h/TV9Ddv+1pYPV7ZvOfEOOvbocRpLXdeR6EchTvV/A="; }; vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 11af21a6e48b4..dcc8be0640f47 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -28,7 +28,7 @@ let # to update: # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars - # 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit + # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions) # 4) run the ./result script that is output by that (it updates ./grammars) version = "0.20.7"; sha256 = "sha256-5ILiN5EfJ7WpeYBiXynfcLucdp8zmxVOj4gLkaFQYts="; @@ -42,9 +42,7 @@ let fetchSubmodules = true; }; - update-all-grammars = import ./update.nix { - inherit writeShellScript nix-prefetch-git curl jq xe src formats lib; - }; + update-all-grammars = callPackage ./update.nix {}; fetchGrammar = (v: fetchgit { inherit (v) url rev sha256 fetchSubmodules; }); diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 5b3862082d8f7..b3e325ffc9a63 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -17,6 +17,7 @@ tree-sitter-devicetree = lib.importJSON ./tree-sitter-devicetree.json; tree-sitter-dockerfile = lib.importJSON ./tree-sitter-dockerfile.json; tree-sitter-dot = lib.importJSON ./tree-sitter-dot.json; + tree-sitter-eex = lib.importJSON ./tree-sitter-eex.json; tree-sitter-elisp = lib.importJSON ./tree-sitter-elisp.json; tree-sitter-elixir = lib.importJSON ./tree-sitter-elixir.json; tree-sitter-elm = lib.importJSON ./tree-sitter-elm.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json new file mode 100644 index 0000000000000..0bfb77c762fc6 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/connorlay/tree-sitter-eex", + "rev": "f742f2fe327463335e8671a87c0b9b396905d1d1", + "date": "2022-01-12T10:01:23-08:00", + "path": "/nix/store/an5vj0gnziy44ckklm9hxp9wbydisk4l-tree-sitter-eex", + "sha256": "19n07ywavwkh4p189d18wxhch45qgn094b7mkdymh60zr7cbmyjh", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index 4c55b73a1183c..4d857f665e56b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "1a538da253d73f896b9f6c0c7d79cda58791ac5c", - "date": "2022-06-20T17:01:16+02:00", - "path": "/nix/store/6mrkhc8bkfnmfaq94a30am9ygh971y97-tree-sitter-embedded-template", - "sha256": "0j73jk9byrhwddb4qsh67gf5fwj9fgdz6byphh3jj8f0ajzdxrmx", + "rev": "91fc5ae1140d5c9d922312431f7d251a48d7b8ce", + "date": "2022-11-03T14:16:56-07:00", + "path": "/nix/store/6z47mgb533bf76l1x22bh64rck5phq8z-tree-sitter-embedded-template", + "sha256": "161bw6hhx4pgzdav5hah4is5w0rfhyid4q9gak0yp05ylk0040sq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index 023ef76c17858..791c2469e7d9a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/connorlay/tree-sitter-heex", - "rev": "52b804b1cb2d57e58d90090326d3ef9bd19cf16c", - "date": "2022-10-18T07:22:45-07:00", - "path": "/nix/store/7f1xgx8l68lz8jwvni65j4kcxpl68b36-tree-sitter-heex", - "sha256": "0qiwzkb2ksp2cb87zsda5zwwsbpbqzgvnmysalbm3x0c81gnzv3y", + "rev": "881f1c805f51485a26ecd7865d15c9ef8d606a78", + "date": "2022-09-24T18:53:08-07:00", + "path": "/nix/store/vb6x1b9lc90ys55cwshdz5dxmwvzyjvv-tree-sitter-heex", + "sha256": "00330rgg67fq0d9gk1yswj78d9mn1jvvjmmy1k7cxpvm5993p3sw", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json index 5024fcb151dcd..5b968a05ec6a1 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-julia", - "rev": "0572cebf7b8e8ef5990b4d1e7f44f0b36f62922c", - "date": "2022-09-01T18:19:12-07:00", - "path": "/nix/store/qh31867lp801xzb93n6jdmibp25zzli1-tree-sitter-julia", - "sha256": "1vxwwdl98n7ic739hl9mq43di10j6r53fpyjh4a738dvjrjg1pc4", + "rev": "8fb38abff74652c4faddbf04d2d5bbbc6b4bae25", + "date": "2022-11-01T17:30:42-05:00", + "path": "/nix/store/58qk62ilnkwqbqc5y0ah1ky5z4n4d4xr-tree-sitter-julia", + "sha256": "06h5nyxw72z3w5a62y59332w2xg90sm3c2j6na7vvf7nark7vb8v", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 0a09e92c43cbd..60df466547de5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MunifTanjim/tree-sitter-lua", - "rev": "887dfd4e83c469300c279314ff1619b1d0b85b91", - "date": "2022-09-16T01:06:50+06:00", - "path": "/nix/store/nypzx0f8fdlamiycl1vqrj4ifx0bfgij-tree-sitter-lua", - "sha256": "1lv3mp0xm5ac9440gcskcxy0hzsnddvcysix1k5axy1cl4vr8bz6", + "rev": "fb30e8cb605e2ebd6c643e6981325a63fbbde320", + "date": "2022-10-31T13:56:07+06:00", + "path": "/nix/store/ifpy40hx70sg9syjr3d35ngrfkmmqi18-tree-sitter-lua", + "sha256": "1hhffz45ilni4g9idsbpp1aymdjkjnyd4491xbdmr47bglf9cgc1", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 73572f033d837..ca9a4c927ca62 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "47b061c1e1ba3a7e9c2f450363a50e87de3f7c61", - "date": "2022-08-18T13:07:47+02:00", - "path": "/nix/store/db0s8jdi3r07y0wsv7a6kkvzrfgnjqqz-tree-sitter-rust", - "sha256": "106406hm5aqwj6p2h70p542dgphian46rw98gj5yf82p1h0k38dz", + "rev": "0431a2c60828731f27491ee9fdefe25e250ce9c9", + "date": "2022-11-03T12:28:18-07:00", + "path": "/nix/store/w0c9d84wvp2d8zx15h7dc3v33n1njmfz-tree-sitter-rust", + "sha256": "149jhy01mqvavwa8jlxb8bnn7sxpfq2x1w35si6zn60b7kqjlx8f", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index c9320b1ec00eb..b019f2b79b134 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "9736af8ef0a7f20b4c45f6474342c8f5b473e2cc", - "date": "2022-10-20T14:10:31+02:00", - "path": "/nix/store/ss7h5sjfkfj5ims3q273ric2yljpz3gz-tree-sitter-viml", - "sha256": "1li2y1cmvf74xjqhfjzfmr8cy3d6fymz4mbgfpnzjfc41yn556vj", + "rev": "4ae7bd67706d7e10afed827ce2ded884ab41650f", + "date": "2022-11-02T08:03:51+01:00", + "path": "/nix/store/k2fsslkwfsxscmcghiz6qqah9v275hy9-tree-sitter-viml", + "sha256": "082yw8qgi4fp9wfjfinnyh60f6rvp7fbyi88yaw6kdx4mjrnl0z6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 6126b3e4892e7..057b6527f1846 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "b1803f2a665d228f968a831eac4fcc07a377c7bc", - "date": "2022-10-14T15:52:08+07:00", - "path": "/nix/store/2sb78vfflr69yj6f2iw3872dvij1vxgf-tree-sitter-zig", - "sha256": "0z6y2sazcqbqs6fndszgqblih2syg6g9kpzk41zxh25hz9qxxdsq", + "rev": "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca", + "date": "2022-11-02T09:17:19+07:00", + "path": "/nix/store/h3wg6zkkzyq1vicp7bi4xkcvjb9himh0-tree-sitter-zig", + "sha256": "0l5703qxyyhp8h2a0ms8ncak6kzgrhp2msvpr8cgxjnlsc5xgmxx", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/mypy.ini b/pkgs/development/tools/parsing/tree-sitter/mypy.ini new file mode 100644 index 0000000000000..3a34ffac26ed5 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/mypy.ini @@ -0,0 +1,11 @@ +[mypy] +disallow_untyped_defs = true +disallow_subclassing_any = true + +no_implicit_optional = true + +warn_redundant_casts = true +warn_unused_ignores = true +warn_no_return = true +warn_return_any = true +warn_unreachable = true diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 49863f189dad0..63f749c890b48 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -1,11 +1,12 @@ { writeShellScript +, writeText +, writers , nix-prefetch-git , formats , lib +, coreutils , curl -, jq , xe -, src }: # Grammar list: @@ -223,6 +224,10 @@ let orga = "connorlay"; repo = "tree-sitter-surface"; }; + "tree-sitter-eex" = { + orga = "connorlay"; + repo = "tree-sitter-eex"; + }; "tree-sitter-heex" = { orga = "connorlay"; repo = "tree-sitter-heex"; @@ -386,108 +391,77 @@ let jsonFile = name: val: (formats.json { }).generate name val; - # check the tree-sitter orga repos - checkTreeSitterRepos = writeShellScript "get-grammars.sh" '' - set -euo pipefail - res=$(${jq}/bin/jq \ - --slurpfile known "${knownTreeSitterOrgGrammarReposJson}" \ - --slurpfile ignore "${ignoredTreeSitterOrgReposJson}" \ - '. - ($known[0] + $ignore[0])' \ - ) - if [ ! "$res" == "[]" ]; then - echo "These repositories are neither known nor ignored:" 1>&2 - echo "$res" 1>&2 - exit 1 - fi - ''; - - # TODO - urlEscape = x: x; + # implementation of the updater + updateImpl = passArgs "updateImpl-with-args" { + binaries = { + curl = "${curl}/bin/curl"; + nix-prefetch-git = "${nix-prefetch-git}/bin/nix-prefetch-git"; + printf = "${coreutils}/bin/printf"; + }; + inherit + knownTreeSitterOrgGrammarRepos + ignoredTreeSitterOrgRepos + ; + } + (writers.writePython3 "updateImpl" { + flakeIgnore = ["E501"]; + } ./update_impl.py); - # generic bash script to find the latest github release for a repo - latestGithubRelease = { orga, repo }: writeShellScript "latest-github-release" '' - set -euo pipefail - - args=( '--silent' ) - if [ -n "''${GITHUB_TOKEN:-}" ]; then - args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" ) - fi - args+=( "https://api.github.com/repos/${urlEscape orga}/${urlEscape repo}/releases/latest" ) - - res=$(${curl}/bin/curl "''${args[@]}") - - if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then - echo "rate limited" >&2 - fi - release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name' | tr -d \")" - # github sometimes returns an empty list even tough there are releases - if [ "$release" = "null" ]; then - echo "uh-oh, latest for ${orga + "/" + repo} is not there, using HEAD" >&2 - release="HEAD" - fi - echo "$release" + # Pass the given arguments to the command, in the ARGS environment variable. + # The arguments are just a json object that should be available in the script. + passArgs = name: argAttrs: script: writeShellScript name '' + env ARGS="$(< ${jsonFile "${name}-args" argAttrs})" \ + ${script} "$@" ''; - # find the latest repos of a github organization - latestGithubRepos = { orga }: writeShellScript "latest-github-repos" '' - set -euo pipefail - - args=( '--silent' ) - if [ -n "''${GITHUB_TOKEN:-}" ]; then - args+=( "-H" "Authorization: token ''${GITHUB_TOKEN}" ) - fi - args+=( 'https://api.github.com/orgs/${urlEscape orga}/repos?per_page=100' ) - - res=$(${curl}/bin/curl "''${args[@]}") + foreachSh = attrs: f: + lib.concatMapStringsSep "\n" f + (lib.mapAttrsToList (k: v: { name = k; } // v) attrs); - if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then - echo "rate limited" >&2 - exit 1 - elif [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "Bad credentials" ]]; then - echo "bad credentials" >&2 - exit 1 - fi + jsonNewlines = lib.concatMapStringsSep "\n" (lib.generators.toJSON {}); - printf "%s" "$res" | ${jq}/bin/jq 'map(.name)' \ - || echo "failed $res" + # Run the given script for each of the attr list. + # The attrs are passed to the script as a json value. + forEachParallel = name: script: listOfAttrs: writeShellScript "for-each-parallel.sh" '' + < ${writeText "${name}.json" (jsonNewlines listOfAttrs)} \ + ${xe}/bin/xe -F -j5 ${script} {} ''; - # update one tree-sitter grammar repo and print their nix-prefetch-git output - updateGrammar = { orga, repo }: writeShellScript "update-grammar.sh" '' - set -euo pipefail - latest="$(${latestGithubRelease { inherit orga repo; }})" - echo "Fetching latest release ($latest) of ${repo} …" >&2 - ${nix-prefetch-git}/bin/nix-prefetch-git \ - --quiet \ - --no-deepClone \ - --url "https://github.com/${urlEscape orga}/${urlEscape repo}" \ - --rev "$latest" - ''; - - foreachSh = attrs: f: - lib.concatMapStringsSep "\n" f - (lib.mapAttrsToList (k: v: { name = k; } // v) attrs); + # The output directory in the current source tree. + # This will depend on your local environment, but that is intentional. + outputDir = "${toString ./.}/grammars"; update-all-grammars = writeShellScript "update-all-grammars.sh" '' set -euo pipefail - echo "fetching list of grammars" 1>&2 - treeSitterRepos=$(${latestGithubRepos { orga = "tree-sitter"; }}) - echo "checking the tree-sitter repo list against the grammars we know" 1>&2 - printf '%s' "$treeSitterRepos" | ${checkTreeSitterRepos} - outputDir="${toString ./.}/grammars" - echo "writing files to $outputDir" 1>&2 - mkdir -p "$outputDir" - ${foreachSh allGrammars - ({name, orga, repo}: ''${updateGrammar { inherit orga repo; }} > $outputDir/${name}.json'')} - ( echo "{ lib }:" - echo "{" - ${foreachSh allGrammars - ({name, ...}: '' - # indentation hack - printf " %s = lib.importJSON ./%s.json;\n" "${name}" "${name}"'')} - echo "}" ) \ - > "$outputDir/default.nix" + ${updateImpl} fetch-and-check-tree-sitter-repos '{}' + echo "writing files to ${outputDir}" 1>&2 + mkdir -p "${outputDir}" + ${forEachParallel + "repos-to-fetch" + (writeShellScript "fetch-repo" '' + ${updateImpl} fetch-repo "$1" + '') + (lib.mapAttrsToList + (nixRepoAttrName: attrs: attrs // { + inherit + nixRepoAttrName + outputDir; + }) + allGrammars) + } + ${updateImpl} print-all-grammars-nix-file "$(< ${ + jsonFile "all-grammars.json" { + allGrammars = + (lib.mapAttrsToList + (nixRepoAttrName: attrs: attrs // { + inherit nixRepoAttrName; + }) + allGrammars); + inherit outputDir; + } + })" ''; + in update-all-grammars diff --git a/pkgs/development/tools/parsing/tree-sitter/update_impl.py b/pkgs/development/tools/parsing/tree-sitter/update_impl.py new file mode 100644 index 0000000000000..db470617ed9c2 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/update_impl.py @@ -0,0 +1,217 @@ +from urllib.parse import quote +import json +import subprocess as sub +import os +import sys +from typing import Iterator, Any, Literal, TypedDict +from tempfile import NamedTemporaryFile + +debug: bool = True if os.environ.get("DEBUG", False) else False +Bin = str +args: dict[str, Any] = json.loads(os.environ["ARGS"]) +bins: dict[str, Bin] = args["binaries"] + +mode: str = sys.argv[1] +jsonArg: dict = json.loads(sys.argv[2]) + +Args = Iterator[str] + + +def log(msg: str) -> None: + print(msg, file=sys.stderr) + + +def atomically_write(file_path: str, content: bytes) -> None: + """atomically write the content into `file_path`""" + with NamedTemporaryFile( + # write to the parent dir, so that it’s guaranteed to be on the same filesystem + dir=os.path.dirname(file_path), + delete=False + ) as tmp: + try: + tmp.write(content) + os.rename( + src=tmp.name, + dst=file_path + ) + except Exception: + os.unlink(tmp.name) + + +def curl_github_args(token: str | None, url: str) -> Args: + """Query the github API via curl""" + yield bins["curl"] + if not debug: + yield "--silent" + # follow redirects + yield "--location" + if token: + yield "-H" + yield f"Authorization: token {token}" + yield url + + +def curl_result(output: bytes) -> Any | Literal["not found"]: + """Parse the curl result of the github API""" + res: Any = json.loads(output) + match res: + case dict(res): + message: str = res.get("message", "") + if "rate limit" in message: + sys.exit("Rate limited by the Github API") + if "Not Found" in message: + return "not found" + # if the result is another type, we can pass it on + return res + + +def nix_prefetch_git_args(url: str, version_rev: str) -> Args: + """Prefetch a git repository""" + yield bins["nix-prefetch-git"] + if not debug: + yield "--quiet" + yield "--no-deepClone" + yield "--url" + yield url + yield "--rev" + yield version_rev + + +def run_cmd(args: Args) -> bytes: + all = list(args) + if debug: + log(str(all)) + return sub.check_output(all) + + +Dir = str + + +def fetchRepo() -> None: + """fetch the given repo and write its nix-prefetch output to the corresponding grammar json file""" + match jsonArg: + case { + "orga": orga, + "repo": repo, + "outputDir": outputDir, + "nixRepoAttrName": nixRepoAttrName, + }: + token: str | None = os.environ.get("GITHUB_TOKEN", None) + out = run_cmd( + curl_github_args( + token, + url=f"https://api.github.com/repos/{quote(orga)}/{quote(repo)}/releases/latest" + ) + ) + release: str + match curl_result(out): + case "not found": + # github sometimes returns an empty list even tough there are releases + log(f"uh-oh, latest for {orga}/{repo} is not there, using HEAD") + release = "HEAD" + case {"tag_name": tag_name}: + release = tag_name + case _: + sys.exit(f"git result for {orga}/{repo} did not have a `tag_name` field") + + log(f"Fetching latest release ({release}) of {orga}/{repo} …") + res = run_cmd( + nix_prefetch_git_args( + url=f"https://github.com/{quote(orga)}/{quote(repo)}", + version_rev=release + ) + ) + atomically_write( + file_path=os.path.join( + outputDir, + f"{nixRepoAttrName}.json" + ), + content=res + ) + case _: + sys.exit("input json must have `orga` and `repo` keys") + + +def fetchOrgaLatestRepos(orga: str) -> set[str]: + """fetch the latest (100) repos from the given github organization""" + token: str | None = os.environ.get("GITHUB_TOKEN", None) + out = run_cmd( + curl_github_args( + token, + url=f"https://api.github.com/orgs/{quote(orga)}/repos?per_page=100" + ) + ) + match curl_result(out): + case "not found": + sys.exit(f"github organization {orga} not found") + case list(repos): + res: list[str] = [] + for repo in repos: + name = repo.get("name") + if name: + res.append(name) + return set(res) + case _: + sys.exit("github result was not a list of repos, but {other}") + + +def checkTreeSitterRepos(latest_github_repos: set[str]) -> None: + """Make sure we know about all tree sitter repos on the tree sitter orga.""" + known: set[str] = set(args["knownTreeSitterOrgGrammarRepos"]) + ignored: set[str] = set(args["ignoredTreeSitterOrgRepos"]) + + unknown = latest_github_repos - (known | ignored) + + if unknown: + sys.exit(f"These repositories are neither known nor ignored:\n{unknown}") + + +Grammar = TypedDict( + "Grammar", + { + "nixRepoAttrName": str, + "orga": str, + "repo": str + } +) + + +def printAllGrammarsNixFile() -> None: + """Print a .nix file that imports all grammars.""" + allGrammars: list[dict[str, Grammar]] = jsonArg["allGrammars"] + outputDir: Dir = jsonArg["outputDir"] + + def file() -> Iterator[str]: + yield "{ lib }:" + yield "{" + for grammar in allGrammars: + n = grammar["nixRepoAttrName"] + yield f" {n} = lib.importJSON ./{n}.json;" + yield "}" + yield "" + + atomically_write( + file_path=os.path.join( + outputDir, + "default.nix" + ), + content="\n".join(file()).encode() + ) + + +def fetchAndCheckTreeSitterRepos() -> None: + log("fetching list of grammars") + latest_repos = fetchOrgaLatestRepos(orga="tree-sitter") + log("checking the tree-sitter repo list against the grammars we know") + checkTreeSitterRepos(latest_repos) + + +match mode: + case "fetch-repo": + fetchRepo() + case "fetch-and-check-tree-sitter-repos": + fetchAndCheckTreeSitterRepos() + case "print-all-grammars-nix-file": + printAllGrammarsNixFile() + case _: + sys.exit(f"mode {mode} unknown") diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index c86c3eb08708e..f12cf2a07c962 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, sbcl_2_2_6, sqlite, freetds, libzip, curl, git, cacert, openssl }: stdenv.mkDerivation rec { pname = "pgloader"; - version = "3.6.8"; + version = "3.6.9"; src = fetchurl { - url = "https://github.com/dimitri/pgloader/releases/download/v3.6.8/pgloader-bundle-3.6.8.tgz"; - sha256 = "sha256-h5vB+KOapbXsSVNIVWEsaanyczaCfl81+SXdiNmNboE="; + url = "https://github.com/dimitri/pgloader/releases/download/v3.6.9/pgloader-bundle-3.6.9.tgz"; + sha256 = "sha256-pdCcRmoJnrfVnkhbT0WqLrRbCtOEmRgGRsXK+3uByeA="; }; nativeBuildInputs = [ git makeWrapper ]; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index abf965f4a0217..63ab2100f6d08 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.10.12"; + version = "2022.10.25"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pNiPZmfLzZ6kMtYmqLNzzTEBiGufuWTqfn+WUKg/wwc="; + sha256 = "sha256-PjnI1aK8qrMkVSoYV2EFwqNeAguzEf9T106stYuFGFM="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 3c0bf53c382dd..5ff02a25d3d37 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.94"; + version = "0.0.100"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ux6AeETHFVCapBBKn32NlMhXMWTi5tEbnSqGd6K5r0A="; + sha256 = "sha256-kFWYSaRKx63X6Nfxd1knkusiJRKVRTNdd1jOQXBCRFQ="; }; - cargoSha256 = "sha256-7eB6DaD4/ivAGip3Vsb1RZBQ38Hxn4y/oz9/jjI3A1g="; + cargoSha256 = "sha256-eew1ZTCm/C3qY/eZvWYkcLprgM/cRaTb6e2O66SNwk8="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 0b82c1b5a3665..e478f909a2437 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.9.2"; + version = "0.9.13"; src = fetchCrate { inherit pname; # this version may need to be updated along with package version - version = "${version}+cargo-0.55"; - sha256 = "sha256-yh5vAtKlBvoSlJBsW2RSduSK6T8aOssM84WQMNjLZqA="; + version = "${version}+cargo-0.65"; + sha256 = "sha256-f/p+ZIvDe9JQ8GM82SEud7sRTlimNs/ADPevfdkhsfg="; }; - cargoSha256 = "sha256-YikTjAeroaHyNe3ygUWRHSXJwdm2BSBV7RgIDN4suZ4="; + cargoSha256 = "sha256-JrlEWgKbTqQG/JYFqBR53eB58fa29c/+vIdSNGoS5Y0="; nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 6d32c8b311fe2..869c5efaf643c 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.13.2"; + version = "0.13.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-5JQ4G8wyKf//KU5NRr3fLLDUKsla+965wLj3nWeaEOo="; + sha256 = "sha256-GmuBWvDy4UfEvR3znj8BQiIHzu5KSY4rgOc+I/GGJZU="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-dNFwPP/qCyL1JWeE8y8hJR+b30tj0AQFFa42s2XjSzg="; + cargoSha256 = "sha256-Mm/IzEAOSDbO9c+C12Y6BNHlxKVVM+gOK1mGLtaJO2A="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index dec12ef677aa3..8064de4d2b3d0 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -38,8 +38,12 @@ rustPlatform.buildRustPackage rec { # Exclude some tests that don't work in sandbox: # - favorites_default_to_git_if_not_defined: requires network access to github.com # - should_canonicalize: the test assumes that it will be called from the /Users/<project_dir>/ folder on darwin variant. - checkFlags = [ "--skip favorites::favorites_default_to_git_if_not_defined" ] - ++ lib.optionals stdenv.isDarwin [ "--skip git::utils::should_canonicalize" ]; + checkFlags = [ + "--skip favorites::favorites_default_to_git_if_not_defined" + # Probably git 2.38.1 releated failure + # Upstream issue https://github.com/cargo-generate/cargo-generate/issues/777 + "--skip basics::it_loads_a_submodule" + ] ++ lib.optionals stdenv.isDarwin [ "--skip git::utils::should_canonicalize" ]; meta = with lib; { description = "cargo, make me a project"; diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/development/tools/rust/cargo-guppy/default.nix new file mode 100644 index 0000000000000..62e7b970b5161 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -0,0 +1,38 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-guppy"; + version = "unstable-2022-10-29"; + + src = fetchFromGitHub { + owner = "guppy-rs"; + repo = "guppy"; + rev = "448d830de4867c32eaa57911a392e47c81d1a0e0"; + sha256 = "sha256-Ce6WO01gN8Ip5smAyGNEg87vyFXFDIq6ilHTbEStm/c="; + }; + + cargoSha256 = "sha256-DR/k6g2uWCOhM20qROybsH4gTvH+Kd+jaDHGZ4loK7g="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + cargoBuildFlags = [ "-p" "cargo-guppy" ]; + cargoTestFlags = [ "-p" "cargo-guppy" ]; + + meta = with lib; { + description = "A command-line frontend for guppy"; + homepage = "https://github.com/guppy-rs/guppy/tree/main/cargo-guppy"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index 492bebaa83d61..2dd6647033ffd 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchCrate, rustPlatform }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.14"; + version = "0.9.15"; src = fetchCrate { inherit pname version; - sha256 = "sha256-C4UBvxGZDpGfYokTzHQNkUkZqBNuKbE4pzOJ04sTDoY="; + sha256 = "sha256-jPvQKc5jDWHIOmJPpgsR9usYzjjCKlSL04N6Opgyiac="; }; - cargoHash = "sha256-eQrRBmlP206MKDlXxcJ64jD6/6mv3V/sv9TsybIx+8Q="; + cargoHash = "sha256-tmBgmIwFW/0+WQUEJFf6rFtRhoGn41BvZUIng8MsxQM="; meta = with lib; { description = "Manage workspace-hack packages to speed up builds in large workspaces."; @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { and cumulatively by 20-25% or more. ''; homepage = "https://crates.io/crates/cargo-hakari"; + changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ macalinao ]; + maintainers = with maintainers; [ figsoda macalinao ]; }; } diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix new file mode 100644 index 0000000000000..bf55e638bdefc --- /dev/null +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchzip +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-llvm-cov"; + version = "0.5.0"; + + src = fetchzip { + url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; + sha256 = "sha256-ifnwiOuFnpryYxLgescpxN8CzgFzSZlY+RlbyW7ND6g="; + }; + cargoSha256 = "sha256-11xNgiOw0qysTWpoKAXQ5gx1uJSAsp+aDDir0zpkpeQ="; + + # skip tests which require llvm-tools-preview + checkFlags = [ + "--skip bin_crate" + "--skip cargo_config" + "--skip clean_ws" + "--skip instantiations" + "--skip merge" + "--skip merge_failure_mode_all" + "--skip no_test" + "--skip open_report" + "--skip real1" + "--skip show_env" + "--skip virtual1" + ]; + + meta = rec { + homepage = "https://github.com/taiki-e/${pname}"; + changelog = homepage + "/blob/v${version}/CHANGELOG.md"; + description = "Cargo subcommand to easily use LLVM source-based code coverage"; + longDescription = '' + In order for this to work, you either need to run `rustup component add llvm- + tools-preview` or install the `llvm-tools-preview` component using your Nix + library (e.g. nixpkgs-mozilla, or rust-overlay) + ''; + license = with lib.licenses; [ asl20 /* or */ mit ]; + maintainers = with lib.maintainers; [ wucke13 ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 01d0a5f6a4a1c..fb6e0d4f5f23a 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,31 +1,28 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.42"; + version = "0.9.43"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-tNfJJfNjaeMszO5dGBvJfq7Hb0Sxc6DbRhYvpIjpCU0="; + sha256 = "sha256-7Ujm5xqgyw4/P/XBZKh9yE9sWz9n+WmZbGdmif9oK+w="; }; - cargoSha256 = "sha256-wEm1ooNZGDeMwJNGGL1bPMeBqL9VjxXlKVgmshNUUoo="; + cargoSha256 = "sha256-S46W+6+FyjI8BrdedDCzHHK+j3EyofQ9u8Ut1yr1/TI="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix - "--" - "--skip=tests_integration::test_relocated_run" - "--skip=tests_integration::test_run" - "--skip=tests_integration::test_run_after_build" - ]; + cargoBuildFlags = [ "-p" "cargo-nextest" ]; + cargoTestFlags = [ "-p" "cargo-nextest" ]; meta = with lib; { description = "Next-generation test runner for Rust projects"; homepage = "https://github.com/nextest-rs/nextest"; + changelog = "https://nexte.st/CHANGELOG.html"; license = with licenses; [ mit asl20 ]; - maintainers = [ maintainers.ekleog ]; + maintainers = with maintainers; [ ekleog figsoda ]; }; } diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 2919d34b2573e..476635ad305d7 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.22.2"; + version = "0.23.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-G235QKwwOFnHsfU26hc7d0mD/nwGyJRPs6BCctEqxJ8="; + sha256 = "sha256-11u6y4w7Ah4SNgfNeVpanIZ5bWz1K0TkMGCxDtomKMM="; }; - cargoSha256 = "sha256-A3tzgLW+/GO4/kHRJH7Y7vtFUzI2Ow0nyfMfIuI5Sl4="; + cargoSha256 = "sha256-oXTuLWH8nSH1XZ+Zwu2jEi3yY+0SeR+N/b0s5gKVORQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index bb512e0eeff5e..e178a70b310b5 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.33"; + version = "0.1.35"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fl/4RsWHjWYJ76mD59m9Gcs2hz7bwnd0YWpZnVgMKjg="; + sha256 = "sha256-FVOrF90kgcxWmeyxBnmGyOwb1aycAQelqskOYYpAXhI="; }; - cargoSha256 = "sha256-kQwg1R+rvg2Tw27pTkrOi5QpPF3Q1woPsjac9RDYCyg="; + cargoSha256 = "sha256-JTRel8bOJbBdeDyJjO/xc+ZUQ1EunMPlyWeFrWrsVEI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/gitlab-clippy/default.nix b/pkgs/development/tools/rust/gitlab-clippy/default.nix new file mode 100644 index 0000000000000..2269f812f424b --- /dev/null +++ b/pkgs/development/tools/rust/gitlab-clippy/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitLab +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "gitlab-clippy"; + version = "1.0.3"; + + src = fetchFromGitLab { + owner = "dlalic"; + repo = pname; + rev = version; + sha256 = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y="; + }; + cargoSha256 = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk="; + + # TODO re-add theses tests once they get fixed in upstream + checkFlags = [ + "--skip cli::converts_error_from_pipe" + "--skip cli::converts_warnings_from_pipe" + ]; + + meta = { + homepage = "https://gitlab.com/dlalic/gitlab-clippy"; + description = "Convert clippy warnings into GitLab Code Quality report"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wucke13 ]; + }; +} diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 146b67f0a3178..58b4b89ad9aab 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -9,13 +9,13 @@ llvmPackages.stdenv.mkDerivation rec { pname = "wasmedge"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "WasmEdge"; repo = "WasmEdge"; rev = version; - sha256 = "sha256-+rCzbw44/8mHo6v4rUuXOq4FVs/LJtSF5zhva9/LIL0="; + sha256 = "sha256-P2Y2WK6G8aEK1Q4hjrS9X+2WbOfy4brclB/+SWP5LTM="; }; buildInputs = [ diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 1610d70cb60c9..cae2c870efc52 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nvQimTCzcmTI37hFqf0aZvVUS01dy6alxkTTkY9nNPU="; + sha256 = "sha256-HlaCssoDySmjLqvsILnE8+SZc0oHtD0SvgjmT0hUPvs="; }; - cargoSha256 = "sha256-1TrzF9h6OHfDzkKL+zQTf5dIMzB820WFtFi9pFQIgig="; + cargoSha256 = "sha256-iP9TPWQlZGLrpRIMnySqiy2LX2y5XXfWqBbSrSQ+BD4="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index f665f763ed562..89256eae0be66 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.426"; + version = "0.0.429"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-yZWQu3+nLcBC3s8QrP0jNWjJRaiGovAbovtSGB5xNCg="; + sha256 = "sha256-rx+5wHd6RyvsoL6176zBCgAZLCAXfdOIgZ41Vq48rdI="; }; - vendorSha256 = "sha256-wMVvDB/6ZDY3EwTWRJ1weCIlRZM+Ye24UnRl1YZzAcA="; + vendorSha256 = "sha256-pc9+m6oZGYBqDwE642HB4Ku549L3bMA52jWSmzV3tHc="; subPackages = [ "." ]; diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 20f3f181b388c..86358be5bcf04 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.21.0"; - sha256 = "sha256-O0vawbrMxUuu4uPbyre7Y1Ikxxbudu5Jqk9vVMKPeZE="; + version = "14.21.1"; + sha256 = "sha256-PbldbKcolXvwkLYwGnqdLYBxSyoG2Jih22XG5Csdp6w="; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index a0586849cf75b..a35c347c3d143 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "16.18.0"; - sha256 = "sha256-/P5q0jQPIpBh0+galN8Wf+P3fgFxLe3AFEoOfVjixps="; + version = "16.18.1"; + sha256 = "sha256-H4BRqI+G9CBk9EFf56mA5ZsKUC7Mje9YP2MDvE1EUjg="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 142bf08bad7e9..29f133a811052 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.12.0"; - sha256 = "sha256-c6fwHimZ6xl3Y87WZqbNVErVgOrvtz4KhJYDs+gE9C4="; + version = "18.12.1"; + sha256 = "sha256-T6QGRRvFJlmikOUs/bIWKnYL1UnaS4u+vmop8pbZON8="; patches = [ (fetchpatch { # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200 diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index cb34e1c919d8f..b9aed788bcd34 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.0.0"; - sha256 = "sha256-C3LSB6WBXxznskezPL+aLIb20BJT+jmQyXROJdl1BQ0="; + version = "19.0.1"; + sha256 = "sha256-7OXCjOtHY/Xn8nb4ySUbNiHh+m5FyULnV8TRUfi/AW0="; patches = [ (fetchpatch { # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200 diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix index fa7b3c4e0b50a..e676ce1a5cd7f 100644 --- a/pkgs/games/ldmud/default.nix +++ b/pkgs/games/ldmud/default.nix @@ -7,6 +7,7 @@ , libiconv , pcre , libgcrypt +, libxcrypt , json_c , libxml2 , ipv6Support ? false @@ -39,12 +40,13 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; nativeBuildInputs = - [ autoreconfHook pkg-config bison libgcrypt pcre json_c libxml2 ] + [ autoreconfHook pkg-config bison ]; + buildInputs = [ libgcrypt libxcrypt pcre json_c libxml2 ] ++ lib.optional mccpSupport zlib ++ lib.optional mysqlSupport libmysqlclient ++ lib.optional postgresSupport postgresql ++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl - ++ lib.optional pythonSupport python310; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optional pythonSupport python310 + ++ lib.optionals stdenv.isDarwin [ libiconv ]; # To support systems without autoconf LD puts its configure.ac in a non-default # location and uses a helper script. We skip that script and symlink the .ac diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index 5392062585c73..fbd3f95128218 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -3,13 +3,13 @@ buildPythonApplication rec { pname = "rare"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "Dummerle"; repo = "Rare"; rev = version; - sha256 = "sha256-mL23tq5Fvd/kXAr7PZ+le5lRXwV3rKG/s8GuXE+S11M="; + sha256 = "sha256-M+OMsyamh4WHIx7Pv2sLylOrnSmYrv1aEm3atqXrDaw="; }; nativeBuildInputs = [ diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 227ab720490a4..fa8b7bcc8dd44 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libGLU, libGL, glew, pkg-config, openalSoft, freealut, wxGTK, libogg +{ lib, stdenv, fetchurl, libGLU, libGL, glew, pkg-config, openalSoft, freealut, wxGTK32, libogg , freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libGLU libGL glew openalSoft freealut wxGTK libogg freetype libvorbis + [ libGLU libGL glew openalSoft freealut wxGTK32 libogg freetype libvorbis SDL SDL_net expat libjpeg libpng fftwSinglePrec ]; @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch?id=1bbcfc9ae3dfdfcbdd35151cb7b6050776215e4d"; sha256 = "1farmjxbc2wm4scsdbdnvh29fipnb6mp6z85hxz4bx6n9kbc8y7n"; }) + (fetchurl { + url = "https://sources.debian.org/data/main/s/scorched3d/44%2Bdfsg-7/debian/patches/wx3.0-compat.patch"; + sha256 = "sha256-Y5U5yYNT5iMqhdRaDMFtZ4K7aD+pugFZP0jLh7rdDp8="; + }) ]; sourceRoot = "scorched"; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 89a04bacd770e..c844dbffee404 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gmp ]; - configurePlatforms = [ "build" "host" ]; + configurePlatforms = lib.optionals stdenv.isLinux [ "build" "host" ]; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index abe7281c9d148..f8e57cf12a36e 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.6600"; + version = "1.0.6644"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "SrWkm+dXfBQmI9nownh7fRe6WXrF/x2GP0Guw7GmXOo="; + sha256 = "41jlcsJpcFlNdBIOAdzTUF3wOUAOS9upF/uxFQaGULc="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bfcfa874addcd..a808338c98766 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.296-hardened1.patch", - "sha256": "1shbnrzdl0zpyq1wpd610l5xf0j1nsnbgd6yg88gjacgd2hpx143", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.296-hardened1/linux-hardened-4.14.296-hardened1.patch" + "name": "linux-hardened-4.14.298-hardened1.patch", + "sha256": "1gzp5fxyv5s029s6c9zrnvj3wb02blabmdmcziaqvf6k7k178prs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.298-hardened1/linux-hardened-4.14.298-hardened1.patch" }, - "sha256": "1n4vngqbywwkqrq9fwp3lp4w6d3z588hbnzfngcp07z1ffrcvm9d", - "version": "4.14.296" + "sha256": "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6", + "version": "4.14.298" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.262-hardened1.patch", - "sha256": "117l4azj4j6jydrgrjs96xgab0g3ail4q75hkyqn85if7bjjnymk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.262-hardened1/linux-hardened-4.19.262-hardened1.patch" + "name": "linux-hardened-4.19.264-hardened1.patch", + "sha256": "08swipghq66lx3nrww1319qwwgw3yipy5m4kvzpsz6mfhkm54aw9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.264-hardened1/linux-hardened-4.19.264-hardened1.patch" }, - "sha256": "07xnslqvmspqizng50yyprzrydwp0qdjmpsq2l1gjxr1lf3n8r5v", - "version": "4.19.262" + "sha256": "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps", + "version": "4.19.264" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.152-hardened1.patch", - "sha256": "0j5zbmhf1lf9b4xy11h48rl7vcj7jk4bx8phwkk2bvvrapv05r3j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.152-hardened1/linux-hardened-5.10.152-hardened1.patch" + "name": "linux-hardened-5.10.153-hardened1.patch", + "sha256": "02kw33m0j10dnl30n17ppffqh8l8v91jpz1d1pkqipfw3j40j8az", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.153-hardened1/linux-hardened-5.10.153-hardened1.patch" }, - "sha256": "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs", - "version": "5.10.152" + "sha256": "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw", + "version": "5.10.153" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.76-hardened1.patch", - "sha256": "0wrrys0wbjczish6jp3mdcsrqph8bvid27cjfr6r7pvpzw9cwimi", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.76-hardened1/linux-hardened-5.15.76-hardened1.patch" + "name": "linux-hardened-5.15.77-hardened1.patch", + "sha256": "0pfa2xi64an716by3rqgn521a4igzb1y2bmbdn87icg8p79qavgx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.77-hardened1/linux-hardened-5.15.77-hardened1.patch" }, - "sha256": "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh", - "version": "5.15.76" + "sha256": "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql", + "version": "5.15.77" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.221-hardened1.patch", - "sha256": "19zp4pn8vbrgcnq1m9wck5ixs7247amwifngzb1630jniqhkrj0n", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.221-hardened1/linux-hardened-5.4.221-hardened1.patch" + "name": "linux-hardened-5.4.223-hardened1.patch", + "sha256": "1jsnrxv9a16l5gdhbn7w4rc9ql7arggvcizmkdvnk7ymd6ni6518", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.223-hardened1/linux-hardened-5.4.223-hardened1.patch" }, - "sha256": "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7", - "version": "5.4.221" + "sha256": "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y", + "version": "5.4.223" }, "6.0": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.0.6-hardened1.patch", - "sha256": "1p6l1ysxclp10bl3sd5kvzrp29kdqddk6hvy8dxydni1kysvf2j8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.6-hardened1/linux-hardened-6.0.6-hardened1.patch" + "name": "linux-hardened-6.0.7-hardened1.patch", + "sha256": "0y1g4zahlq28s8grzzpxcccr7sjh6cgbviz880g1wqg7vmqpi1fz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.7-hardened1/linux-hardened-6.0.7-hardened1.patch" }, - "sha256": "1akzfkwjbxki6r41gcnp5fml389i8ng9bid9c4ysg6w65nphajw6", - "version": "6.0.6" + "sha256": "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7", + "version": "6.0.7" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index e94263de28e6d..97fd9d525f37f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.296"; + version = "4.14.298"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1n4vngqbywwkqrq9fwp3lp4w6d3z588hbnzfngcp07z1ffrcvm9d"; + sha256 = "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 7a4c0dff7ae66..902be54d30e3f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.262"; + version = "4.19.264"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07xnslqvmspqizng50yyprzrydwp0qdjmpsq2l1gjxr1lf3n8r5v"; + sha256 = "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index f85b78a8f54fd..c58e05b485e5c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.331"; + version = "4.9.332"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0v3vv02i9aqgx4g4kw0vpixxsms7w3s5fhry4wlqmsq0gkmqv3j8"; + sha256 = "1kiqa9kw4932n5qglkyymsrak849wbbszw9rnq1aygmdinjz4c8i"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index b80fce4f2d151..b918ef7c35f60 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.152"; + version = "5.10.153"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs"; + sha256 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index a53e38fe38833..8dd899d0bac33 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.76"; + version = "5.15.77"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh"; + sha256 = "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index d1da73804f428..f617ba6f0e3ee 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.221"; + version = "5.4.223"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7"; + sha256 = "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 5213856218d39..0661da8d338ef 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.6"; + version = "6.0.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1akzfkwjbxki6r41gcnp5fml389i8ng9bid9c4ysg6w65nphajw6"; + sha256 = "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 1814d4cee069e..0a397d6393607 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18950"; - sha256 = "1k84mqvi71bmd7x0km980z1y7cm71fc6jvnf2rzhxss9pjscrh2j"; + rev = "18978"; + sha256 = "12mvj5c2k774fpmixcv7i4ciw7xqjaxqd20ryn8xw8vgrnb4h6fi"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 3693c9868df85..969d1e2bb657b 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -73,6 +73,11 @@ stdenv.mkDerivation { separateDebugInfo = true; installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; + postInstall ='' + # Same as perf. Remove. + rm -f $out/bin/trace + ''; + preFixup = '' # Pull in 'objdump' into PATH to make annotations work. # The embeded Python interpreter will search PATH to calculate the Python path configuration(Should be fixed by upstream). diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 2ac516175f02a..44746439ec2eb 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -27,7 +27,7 @@ let structuredExtraConfig = with lib.kernel; { # AMD P-state driver - X86_AMD_PSTATE = yes; + X86_AMD_PSTATE = lib.mkOverride 60 yes; # Google's BBRv2 TCP congestion Control TCP_CONG_BBR2 = yes; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 99980b46e08bd..2fc9d8fe3c085 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.0.3"; #zen - suffix = "zen2"; #zen - sha256 = "1paywv7y4jizlq092irjcn9r62npzglrf5s008l6129b9q5ib0v8"; #zen + version = "6.0.7"; #zen + suffix = "zen1"; #zen + sha256 = "011wlc0h99vx830qmgy569srhb3rzhyy5j235pf7m541392vh41g"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.19.16"; #lqx - suffix = "lqx4"; #lqx - sha256 = "0mzrgy2kq0i26vgcdfc7nz7m6rw17s0lr9idwy71iz1f8i1pz82w"; #lqx + version = "6.0.7"; #lqx + suffix = "lqx1"; #lqx + sha256 = "09h99fdzicbc4kkl51dqwgqqa9416hd7bvrghr4pdjqrw4z15557"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index 6c2ece4b8cb11..cef966d7bfcea 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -1,7 +1,6 @@ { fetchFromGitHub , json_c , lib -, libuuid , meson , ninja , openssl @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libnvme"; - version = "1.1"; + version = "1.2"; outputs = [ "out" "man" ]; @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { owner = "linux-nvme"; repo = "libnvme"; rev = "v${version}"; - sha256 = "EPAPWY6/Bh8I1eLslKJAofLn0IAizmGn00Q5PJPtdRw="; + sha256 = "sha256-U9Fj3OcBe32C0PKhI05eF/6jikHAvdyvXH16IY0rWxI="; }; postPatch = '' @@ -40,7 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ json_c - libuuid openssl python3 systemd diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 99382ad4aae1c..2a0f145742540 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -55,11 +55,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "515.49.15"; + version = "515.49.24"; persistencedVersion = "515.48.07"; settingsVersion = "515.48.07"; - sha256_64bit = "sha256-yQbNE+YsbHUc4scXvMZFGuuBRrFTa42g1XoMVZEO/zo="; - openSha256 = "sha256-2RvogIdTA7Rg4oq14TG7Kh31HWuj860xsK7/MYFitpQ="; + sha256_64bit = "sha256-hiTG1gZr02hyetOGvHzY8Be9jaWklhteqe24BRvpw+c="; + openSha256 = "sha256-4NFR4oY728E/yE3FoD3vph8NvSHGD0f0iK2FHqlgK94="; settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU="; persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY="; url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; @@ -77,6 +77,8 @@ rec { sha256_64bit = "sha256-vpjSR6Q9dJGmW/3Jl/tlMeFZQ0brEqD6qgRGcs21cJ8="; settingsSha256 = "sha256-OWSUmUBqAxsR3e6EPzcIotpd6nm4Le8hIj4pzJ5WnhE="; persistencedSha256 = "sha256-XsGYGgucDhvPpqtM9IBLfo3tbn7sIobpo5JW/XqOkTo="; + + broken = kernel.kernelAtLeast "6.0"; }; # Last one supporting x86 diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 08d5f887762ec..a0f0b31e9c0fb 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config , meson , ninja -, libuuid , libnvme , json_c , zlib @@ -10,13 +9,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - hash = "sha256-ZjgysgWMmBlN+aalI5u2vQ58XrtEbJlDPCqUN6avv08="; + hash = "sha256-okYtGiKUPNO31ntD9j5iAgdcnS5OQ/g1QAY+svhga4c="; }; mesonFlags = [ @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { python3.pkgs.nose2 ]; buildInputs = [ - libuuid libnvme json_c zlib diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index ae7e4b868882c..2c58a0fdb323e 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.1.1"; + version = "1.1.2"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-ClVHThhcf4QkYhgJevTKroBe0z0YZX83qKFB0thH6eM="; + sha256 = "sha256-cTSRfnMYAyoOoTy0wx8sxqyS92zP6GZu8aH5hRRTxU4="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index beee5d3a4d77d..7ca466ef5a106 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns"; - version = "4.6.3"; + version = "4.7.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - hash = "sha256-rNBricoB0a32G5BmBGFPDh13oelO7srej/XVOhbbc4k="; + hash = "sha256-TcrjXr3ASRWHLXv24tC8pLBcY1ChAKXPnCnfU7qlPOI="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index bbf7d3a0d5262..a5725b98a8d1d 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.21"; + version = "3.4.22"; vendorSha256 = "sha256-P3EQTraMdZ2fAHDue5cKAxyHbh6nNeFV9ykT0rH7KPs="; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-+IU1l23sN9v48ZhJLGncUa3t5kPHBFcqQ/ojaZXzMU4="; + sha256 = "sha256-LIhAvW/oIlPp6U4VVUvUlmOHCduIbzYnrKc4PyfcXQQ="; }; buildPhase = '' diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 73edd94a34935..0abc196d8db7e 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-lyHQYU4aXQ/muAyaigStqO/ULL393SOelagFmuKDqm8="; }; + # utmp.h is deprecated on aarch64-darwin + postPatch = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) '' + for file in login.*; do + substituteInPlace $file --replace "#ifdef HAVE_UTMP_H" "#if 0" + done + ''; + buildInputs = [ libxcrypt ]; preConfigure = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f2f472276c87b..796546fd0b9fb 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,8 +2,10 @@ # Do not edit! { - version = "2022.10.5"; + version = "2022.11.1"; components = { + "3_day_blinds" = ps: with ps; [ + ]; "abode" = ps: with ps; [ abodepy ]; @@ -51,6 +53,21 @@ "airthings" = ps: with ps; [ airthings-cloud ]; + "airthings_ble" = ps: with ps; [ + aiohttp-cors + airthings-ble + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + dbus-fast + fnvhash + home-assistant-frontend + pillow + pyserial + pyudev + sqlalchemy + ]; "airtouch4" = ps: with ps; [ airtouch4pyapi ]; @@ -98,6 +115,8 @@ amcrest ha-ffmpeg ]; + "amp_motorization" = ps: with ps; [ + ]; "ampio" = ps: with ps; [ asmog ]; @@ -203,6 +222,8 @@ yalexs-ble yalexs ]; + "august_ble" = ps: with ps; [ + ]; "aurora" = ps: with ps; [ auroranoaa ]; @@ -281,6 +302,10 @@ "blinksticklight" = ps: with ps; [ BlinkStick ]; + "bliss_automation" = ps: with ps; [ + ]; + "bloc_blinds" = ps: with ps; [ + ]; "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ @@ -352,6 +377,8 @@ "braviatv" = ps: with ps; [ pybravia ]; + "brel_home" = ps: with ps; [ + ]; "broadlink" = ps: with ps; [ broadlink ]; @@ -367,7 +394,9 @@ brunt ]; "bsblan" = ps: with ps; [ - bsblan + python-bsblan + ]; + "bswitch" = ps: with ps; [ ]; "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist @@ -388,6 +417,10 @@ pyudev sqlalchemy ]; + "bticino" = ps: with ps; [ + ]; + "bubendorff" = ps: with ps; [ + ]; "buienradar" = ps: with ps; [ buienradar ]; @@ -499,6 +532,8 @@ ]; "cover" = ps: with ps; [ ]; + "cozytouch" = ps: with ps; [ + ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy "cpuspeed" = ps: with ps; [ @@ -517,6 +552,8 @@ ]; "currencylayer" = ps: with ps; [ ]; + "dacia" = ps: with ps; [ + ]; "daikin" = ps: with ps; [ pydaikin ]; @@ -616,6 +653,10 @@ "dialogflow" = ps: with ps; [ aiohttp-cors ]; + "diaz" = ps: with ps; [ + ]; + "digital_loggers" = ps: with ps; [ + ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; @@ -668,6 +709,8 @@ aiohttp-cors doorbirdpy ]; + "dooya" = ps: with ps; [ + ]; "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ @@ -944,6 +987,8 @@ "flexit" = ps: with ps; [ pymodbus ]; + "flexom" = ps: with ps; [ + ]; "flic" = ps: with ps; [ pyflic ]; @@ -1038,12 +1083,15 @@ "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; + "gaviota" = ps: with ps; [ + ]; "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ aio-georss-gdacs ]; "generic" = ps: with ps; [ + aiohttp-cors av pillow ]; @@ -1210,6 +1258,8 @@ pillow sqlalchemy ]; + "havana_shade" = ps: with ps; [ + ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ @@ -1219,12 +1269,16 @@ ]; "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 + "heiwa" = ps: with ps; [ + ]; "heos" = ps: with ps; [ pyheos ]; "here_travel_time" = ps: with ps; [ herepy ]; + "hi_kumo" = ps: with ps; [ + ]; "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ @@ -1340,12 +1394,15 @@ aiohue ]; "huisbaasje" = ps: with ps; [ - ]; # missing inputs: energyflip-client + energyflip-client + ]; "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ aiopvapi ]; + "hurrican_shutters_wholesale" = ps: with ps; [ + ]; "hvv_departures" = ps: with ps; [ pygti ]; @@ -1442,6 +1499,8 @@ ]; "input_text" = ps: with ps; [ ]; + "inspired_shades" = ps: with ps; [ + ]; "insteon" = ps: with ps; [ aiohttp-cors fnvhash @@ -1491,6 +1550,8 @@ "islamic_prayer_times" = ps: with ps; [ prayer-times-calculator ]; + "ismartwindow" = ps: with ps; [ + ]; "iss" = ps: with ps; [ ]; # missing inputs: pyiss "isy994" = ps: with ps; [ @@ -1640,6 +1701,8 @@ pyudev sqlalchemy ]; + "legrand" = ps: with ps; [ + ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; @@ -1656,6 +1719,7 @@ aiohttp-cors aiolifx aiolifx-effects + aiolifx-themes ifaddr ]; "lifx_cloud" = ps: with ps; [ @@ -1736,6 +1800,8 @@ "lutron_caseta" = ps: with ps; [ pylutron-caseta ]; + "luxaflex" = ps: with ps; [ + ]; "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ @@ -1764,6 +1830,10 @@ pillow sqlalchemy ]; + "marantz" = ps: with ps; [ + ]; + "martec" = ps: with ps; [ + ]; "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ @@ -2043,6 +2113,8 @@ "nexia" = ps: with ps; [ nexia ]; + "nexity" = ps: with ps; [ + ]; "nextbus" = ps: with ps; [ py-nextbusnext ]; @@ -2076,8 +2148,9 @@ aiohttp-cors getmac ifaddr + mac-vendor-lookup netmap - ]; # missing inputs: mac-vendor-lookup + ]; "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ @@ -2115,6 +2188,8 @@ "nut" = ps: with ps; [ pynut2 ]; + "nutrichef" = ps: with ps; [ + ]; "nws" = ps: with ps; [ pynws ]; @@ -2216,6 +2291,21 @@ "opple" = ps: with ps; [ pyoppleio ]; + "oralb" = ps: with ps; [ + aiohttp-cors + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + dbus-fast + fnvhash + home-assistant-frontend + oralb-ble + pillow + pyserial + pyudev + sqlalchemy + ]; "oru" = ps: with ps; [ ]; # missing inputs: oru "orvibo" = ps: with ps; [ @@ -2265,6 +2355,8 @@ pillow sqlalchemy ]; + "pcs_lighting" = ps: with ps; [ + ]; "peco" = ps: with ps; [ peco ]; @@ -2468,6 +2560,8 @@ ]; "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client + "raven_rock_mfg" = ps: with ps; [ + ]; "rdw" = ps: with ps; [ vehicle ]; @@ -2508,6 +2602,8 @@ ]; "rest_command" = ps: with ps; [ ]; + "rexel" = ps: with ps; [ + ]; "rflink" = ps: with ps; [ rflink ]; @@ -2535,6 +2631,8 @@ "rmvtransport" = ps: with ps; [ pyrmvtransport ]; + "roborock" = ps: with ps; [ + ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ @@ -2616,6 +2714,8 @@ lxml xmltodict ]; + "screenaway" = ps: with ps; [ + ]; "screenlogic" = ps: with ps; [ screenlogicpy ]; @@ -2647,6 +2747,8 @@ fnvhash sqlalchemy ]; + "sensorblue" = ps: with ps; [ + ]; "sensorpro" = ps: with ps; [ aiohttp-cors bleak-retry-connector @@ -2704,6 +2806,7 @@ "shell_command" = ps: with ps; [ ]; "shelly" = ps: with ps; [ + aiohttp-cors aioshelly ]; "shiftr" = ps: with ps; [ @@ -2732,6 +2835,8 @@ "simplisafe" = ps: with ps; [ simplisafe-python ]; + "simply_automated" = ps: with ps; [ + ]; "simulated" = ps: with ps; [ ]; "sinch" = ps: with ps; [ @@ -2770,9 +2875,15 @@ aiohttp-cors pysmappee ]; + "smart_blinds" = ps: with ps; [ + ]; + "smart_home" = ps: with ps; [ + ]; "smart_meter_texas" = ps: with ps; [ smart-meter-texas ]; + "smarther" = ps: with ps; [ + ]; "smartthings" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -2803,6 +2914,21 @@ "snmp" = ps: with ps; [ pysnmplib ]; + "snooz" = ps: with ps; [ + aiohttp-cors + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + dbus-fast + fnvhash + home-assistant-frontend + pillow + pyserial + pysnooz + pyudev + sqlalchemy + ]; "solaredge" = ps: with ps; [ solaredge stringcase @@ -2818,6 +2944,8 @@ "soma" = ps: with ps; [ pysoma ]; + "somfy" = ps: with ps; [ + ]; "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; @@ -2967,6 +3095,8 @@ ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate + "symfonisk" = ps: with ps; [ + ]; "syncthing" = ps: with ps; [ aiosyncthing ]; @@ -3073,6 +3203,8 @@ sqlalchemy thermobeacon-ble ]; + "thermoplus" = ps: with ps; [ + ]; "thermopro" = ps: with ps; [ aiohttp-cors bleak-retry-connector @@ -3243,6 +3375,8 @@ "ukraine_alarm" = ps: with ps; [ uasiren ]; + "ultraloq" = ps: with ps; [ + ]; "unifi" = ps: with ps; [ aiounifi ]; @@ -3277,6 +3411,8 @@ ifaddr zeroconf ]; + "uprise_smart_shades" = ps: with ps; [ + ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ @@ -3557,6 +3693,7 @@ py-zabbix ]; "zamg" = ps: with ps; [ + zamg ]; "zengge" = ps: with ps; [ bluepy @@ -3630,6 +3767,7 @@ "airly" "airnow" "airthings" + "airthings_ble" "airtouch4" "airvisual" "airzone" @@ -3695,6 +3833,7 @@ "canary" "cast" "cert_expiry" + "clicksend_tts" "climate" "cloud" "cloudflare" @@ -3871,6 +4010,7 @@ "http" "huawei_lte" "hue" + "huisbaasje" "humidifier" "hunterdouglas_powerview" "hvv_departures" @@ -4005,6 +4145,7 @@ "nextdns" "nightscout" "nina" + "nmap_tracker" "no_ip" "nobo_hub" "notify" @@ -4033,6 +4174,7 @@ "openuv" "openweathermap" "opnsense" + "oralb" "overkiz" "ovo_energy" "owntracks" @@ -4145,6 +4287,7 @@ "smtp" "snips" "snmp" + "snooz" "solaredge" "solarlog" "solax" @@ -4297,6 +4440,7 @@ "yeelight" "yolink" "youless" + "zamg" "zeroconf" "zerproc" "zha" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 69ce9addcd67d..795d42cf53eb5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -41,26 +41,15 @@ let }; }); - bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec { - version = "0.5.0"; - postPatch = null; - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.cattrs ]; + gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; src = fetchFromGitHub { - owner = "liudger"; - repo = "python-bsblan"; - rev = "v.${version}"; - hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg="; - }; - }); - - blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec { - version = "2.0.2"; - src = fetchFromGitHub { - owner = "blebox"; - repo = "blebox_uniapi"; - rev = "refs/tags/v${version}"; - hash = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA="; + owner = "allenporter"; + repo = "gcal_sync"; + rev = "refs/tags/${version}"; + hash = "sha256-5PoKdJBrNhPfcDxmprc/1jX7weIs7HSxFzzvjKOjGbY="; }; + doCheck = false; # requires aiohttp>=1.0.0 }); gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { @@ -84,16 +73,6 @@ let }; }); - iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec { - version = "0.4.1"; - src = fetchFromGitHub { - owner = "flz"; - repo = "iaqualink-py"; - rev = "v${version}"; - hash = "sha256-GDJwPBEU7cteAdYj7eo5tAo0G8AVcQR7KSxLNLhU/XU="; - }; - }); - # pytest-aiohttp>0.3.0 breaks home-assistant tests pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { version = "0.3.0"; @@ -115,9 +94,6 @@ let aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); - gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires aiohttp>=1.0.0 - }); hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); @@ -161,6 +137,12 @@ let }; }); + pydaikin = super.pydaikin.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_power_sensors" + ]; + }); + pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -254,7 +236,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.10.5"; + hassVersion = "2022.11.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -272,7 +254,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-y2X6tiR3TLbQ1tYUUuu8D0i5j+P0FnDWJ1mSlGPwIuY="; + hash = "sha256-2zpNrkRYsmJEq+4L0J6wJodmda5r8NWgYVtYwAHKSps="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 5282874435f31..9f9bcf022356d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20221010.0"; + version = "20221102.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-TyaEnXHnaFk+V06BjeblYv6VnXsmYCc/7mYicJsBEY8="; + sha256 = "sha256-HAFJxrBI6wB1XMe+71tF/bijuQAoyAw8LBQbfv+Vqco="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index b2d8e49efc582..a77b48c6b17eb 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -168,8 +168,8 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional return None -def get_pkg_version(package: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: - pkg = packages.get(f"{PKG_SET}.{package}", None) +def get_pkg_version(attr_path: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: + pkg = packages.get(attr_path, None) if not pkg: return None return pkg["version"] @@ -198,12 +198,14 @@ def main() -> None: extras = name[name.find("[")+1:name.find("]")].split(",") name = name[:name.find("[")] attr_path = name_to_attr_path(name, packages) - if our_version := get_pkg_version(name, packages): - if Version.parse(our_version) < Version.parse(required_version): - outdated[name] = { - 'wanted': required_version, - 'current': our_version - } + if attr_path: + if our_version := get_pkg_version(attr_path, packages): + attr_name = attr_path.split(".")[-1] + if Version.parse(our_version) < Version.parse(required_version): + outdated[attr_name] = { + 'wanted': required_version, + 'current': our_version + } if attr_path is not None: # Add attribute path without "python3Packages." prefix pname = attr_path[len(PKG_SET + "."):] diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index c40d9e71989c3..1651e30266440 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -47,6 +47,10 @@ let # bytearrray mismatch "test_rfy_cover" ]; + zha = [ + # 'manual_pick_radio_type' == 'choose_serial_port' + "test_options_flow_migration_reset_old_adapter" + ]; }; extraPytestFlagsArray = { @@ -62,6 +66,10 @@ let # Flaky: AssertionError: assert '0.0' == '12.0' "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" ]; + modem_callerid = [ + # aioserial mock produces wrong state + "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" + ]; skybell = [ # Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443 "--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error" @@ -106,8 +114,6 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ - "modem_callerid" - "subaru" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index e17a36881b29a..6df91c317b9b2 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "9e58bc19c4baf7ca7da97c2f8b164789d041d9b8", - "sha256": "sha256-LXCwVcjXx0JQ9yOyiZCqWYkMmD5iCEe4vcuCZTX+S/Y=", - "version": "unstable-2022-08-13" + "rev": "09942dee6621e7047a63dffcc61b3bbf78cef2c6", + "sha256": "sha256-0Cb1Qsn6vnrzd4pZm1GZxlVQNn5dYKUR/xWMCG37GSk=", + "version": "unstable-2022-11-02" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index 121372ec2fc45..be312614af987 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dpkg, jre8_headless, makeWrapper, writeText, xorg }: +{ lib, stdenv, fetchurl, dpkg, jdk11_headless, makeWrapper, writeText, xorg }: let xorgModulePaths = writeText "module-paths" '' @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { pname = "jibri"; - version = "8.0-93-g51fe7a2"; + version = "8.0-139-g7ab9aa2"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "8jBSkFIBi7NYxV41VtFmGfevVp6+emRWdoQ1l4dS6PA="; + sha256 = "14V5khp6S9T3SWiNfKyxn2WCzwhcXDCRDtATa15p01M="; }; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { cat '${xorgModulePaths}' >> $out/etc/jitsi/jibri/xorg-video-dummy.conf - makeWrapper ${jre8_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" + makeWrapper ${jdk11_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" runHook postInstall ''; diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix index ae80a2342df1e..315d95e1f158a 100644 --- a/pkgs/servers/jicofo/default.nix +++ b/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-934"; + version = "1.0-940"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "tT1w1OUcsnyQ5/pkborFkdOq0CEge6qtNLJrJgWIwjo="; + sha256 = "vx7aUHfKxG+tZ0sM8eWr1tTKf//bMxdKVhE5I4P4mLo="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 53db8b7303a8f..d1041f6bc936b 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.2-22-g42bc1b99"; + version = "2.2-45-ge8b20f06"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "ZiIeD5NXHMurcoyVnD8RCGuOKRiUDU1AMH57A0s4tAs="; + sha256 = "fbSpjLdx9xbLdp7vzHTW9B/cDf3DahpwuI4IcqEqpas="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index bf1eacdebea1f..2d5261f5fc268 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2022-10-25"; + version = "unstable-2022-11-03"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "96ea871b355d69ae00220d14c3a9f9c4b8754337"; - sha256 = "sha256-40rWK47XDbwOujTiRMrKDXLj0ifCGDiccJEt1RyKzQE="; + rev = "342d3f1414f905fc85ea14a125463ff2df4e9b51"; + sha256 = "sha256-w5hvuKrtZUwYfrBWMJD9jntdjWDfDysAiwhQDTc9jb0="; }; sourceRoot = "source/klippy"; diff --git a/pkgs/servers/klipper/klipper-firmware.nix b/pkgs/servers/klipper/klipper-firmware.nix index f80cec0b687ed..704a7310cb8c0 100644 --- a/pkgs/servers/klipper/klipper-firmware.nix +++ b/pkgs/servers/klipper/klipper-firmware.nix @@ -5,7 +5,7 @@ , bintools-unwrapped , libffi , libusb1 -, wxGTK +, wxGTK30-gtk3 , python2 , python3 , gcc-arm-embedded @@ -30,7 +30,7 @@ avrdude stm32flash pkg-config - wxGTK # Required for bossac + wxGTK30-gtk3 # Required for bossac ]; preBuild = "cp ${firmwareConfig} ./.config"; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index 8821c151f8420..77ed5932180ed 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.157.3"; + version = "0.157.4"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-AsIo/mQx4lUjrJGurJ40Wy1QhBKiYcuzX9PvyM7bfRg="; + sha256 = "sha256-mszVdDnluR+na1DDEyNNqTyRS/8pUZ+et0M7KkXqNiE="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix index 78fd6e9b96d4d..81e9e1b671fa1 100644 --- a/pkgs/servers/kubemq-community/default.nix +++ b/pkgs/servers/kubemq-community/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "kubemq-community"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "kubemq-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rZlWVbAmmZ1w6YSb481GHl64aUvdehPVAqYpwk48RGA="; + sha256 = "sha256-+HJpjKMSndcV+xQJM+FesdtoUSGHnpILQFuf3sbxBY0="; }; CGO_ENABLED=0; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 65266c86d9390..fcff16672f319 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "sha256-VBNRdkJxO3OSl6ap0BZl4bxJdu0cUNxiH+TrseyGZ1s="; + sha256 = "sha256-KEIOyURdioyqD33K3rRTiysGO/zSEm6k29zqjzmK9Uk="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 04cbf72f39cab..971b01cfda3b3 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -28,6 +28,9 @@ ourNodePackages.package.override { ''; postInstall = '' + # Compile typescript + npm run build + makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-irc" \ --add-flags "$out/lib/node_modules/matrix-appservice-irc/app.js" @@ -39,7 +42,7 @@ ourNodePackages.package.override { meta = with lib; { description = "Node.js IRC bridge for Matrix"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ rhysmdnz ]; homepage = "https://github.com/matrix-org/matrix-appservice-irc"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 5fd62ad653e12..fddf12d79b4b1 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-3Brm9pWCLCSjNE5ZACAV4K34L3oBfvT9VI4TKMXrmgY="; + sha256 = "sha256-nZGDaoxGv5DrQY57v4by7SNlRWueKXGrndOKu+cZgDY="; }; vendorSha256 = "sha256-FxfER3THsA7NRuQKEdWQxgUN0SiNI00hGUMVD+3BaG4="; diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index bcba5ce243aae..4e85ff5f736c5 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.14.10"; + version = "0.14.14"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "09diqgv5pbv8igb4x9lzrmaf5ic1fd3m8y7rlpwh4w145qwjxc8y"; + sha256 = "sha256-ur3CnkIOtGRJJKfYIrlJ6bqkO06C6unizCUb9Ea9nGI="; }; sourceRoot = "source/src"; diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index 674cf2630e564..fdaf7bdcb21b8 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "alertmanager-irc-relay"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "google"; repo = "alertmanager-irc-relay"; rev = "v${version}"; - sha256 = "sha256-ACOXrIeNDUFUwr50frW/miuW1eq29UvCYac5HCdXfx8="; + sha256 = "sha256-qE+cKwn/rqxL5/LUSirflmnFCow6IxjCcGvu2bbBmsk="; }; vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 60a7333fe0d9b..a44fbb7f4231f 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -1,27 +1,46 @@ -{ lib, buildGoModule, fetchFromGitHub, systemd, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, systemd, nixosTests, bcc }: buildGoModule rec { pname = "grafana-agent"; - version = "0.25.1"; + version = "0.28.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-VbcWYH3eSKfYlSoN9HpxvhtvW36M1aYn9nLDfEbIzTY="; + sha256 = "sha256-KeajXEeaTrLObgLrIyI2MJK+ap8zIdZ/jIQuVaF4ojg="; }; - vendorSha256 = "sha256-VFTz9+nf4qH8bbFijpT1uIHSAhJy/aMMlIjkvnzzAD4="; + vendorSha256 = "sha256-UEQYZbP3dzi7wZwX+InJrgHrFB1wfSUNmUMkit+Y1Lo="; + + ldflags = let + prefix = "github.com/grafana/agent/pkg/build"; + in [ + "-s" "-w" + # https://github.com/grafana/agent/blob/d672eba4ca8cb010ad8a9caef4f8b66ea6ee3ef2/Makefile#L125 + "-X ${prefix}.Version=${version}" + "-X ${prefix}.Branch=v${version}" + "-X ${prefix}.Revision=v${version}" + "-X ${prefix}.BuildUser=nix" + "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z" + ]; tags = [ "nonetwork" "nodocker" ]; + subPackages = [ + "cmd/agent" + "cmd/agentctl" + ]; + # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 NIX_CFLAGS_COMPILE = [ "-I${lib.getDev systemd}/include" ]; + buildInputs = [ bcc ]; + # tries to access /sys: https://github.com/grafana/agent/issues/333 preBuild = '' rm pkg/integrations/node_exporter/node_exporter_test.go diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index 748e135b63439..92b04b08a5bfc 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus-nextcloud-exporter"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "xperimental"; repo = "nextcloud-exporter"; rev = "v${version}"; - sha256 = "18xvxx0aplkj7xzi0zfsz7a5d45hh8blfqb105360pknvvi6apjv"; + sha256 = "sha256-/EwQSxYDaf7B8A48aelf1yYbM7Vw6ntoz1VuYM2HDEc="; }; - vendorSha256 = "1wr1ckz0klk9sqpyk96h8bwr1dg6aiirr1l1f23kbib91pfpd08r"; + vendorSha256 = "sha256-b05N5TXsRHD8h3q+ckxaVizq+A7VqkDWOSb0LOMGCHM="; passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index ccb0718a77acb..68a8a0cf4cf94 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,19 +4,19 @@ let generic = { subPackages, pname, postInstall ? "", mainProgram }: buildGoModule rec { inherit pname; - version = "6.8.2"; + version = "6.9.0"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "sha256-1blHYUwZHaAdWN7xag+aSPP2GEBmJ+HKK10pKXiNDxY="; + sha256 = "sha256-H6mpry6uJtMVJmsdLgka7X/IzMP1dbp+hOl3pGVWUAE="; }; inherit subPackages postInstall; - vendorSha256 = "sha256-Eiebn4BfdI1VhjzdCl3XT/zoFNUbaC1X0v+tGSfNCOE="; + vendorSha256 = "sha256-zrwTdMlDfG1RudOfV52qOP9NMU3/XYb5TND6xyglJ0I="; doCheck = false; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3ebaf09711744..7008a24d5ae2d 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -48,13 +48,13 @@ in { ''; nextcloud24 = generic { - version = "24.0.6"; - sha256 = "b26dff9980a47e7e722805fdbbf87e07f59a3817b03ecc32698e028e9baf0301"; + version = "24.0.7"; + sha256 = "a1c7344a4eb27260a9f6f6e6f586bdc4fb35e1e9330e1a6e8d46c05634db6384"; }; nextcloud25 = generic { - version = "25.0.0"; - sha256 = "2c05ac9d7b72b44ef8b3d2ae03ff0fd6121e254b8054556f5163bd8760dd8f49"; + version = "25.0.1"; + sha256 = "72d4076924caf19139c40178597af6211799e20440ce196fb43b9c4e47d77515"; }; # tip: get the sha with: diff --git a/pkgs/servers/nosql/cassandra/2.1.json b/pkgs/servers/nosql/cassandra/2.1.json deleted file mode 100644 index d1af24106b69f..0000000000000 --- a/pkgs/servers/nosql/cassandra/2.1.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "version": "2.1.22", - "sha256": "1wk57dz0kmc6d5y8d8dkx269lzh3ark3751z734gxncwdlclcyz3" -} diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix deleted file mode 100644 index 02f954ebd1fe7..0000000000000 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix ( - args - // builtins.fromJSON (builtins.readFile ./2.1.json) - // { - generation = "2_1"; - extraMeta.knownVulnerabilities = [ - # Fixed in 3.* but 2.* hasn't been released since - "CVE-2020-17516" - ]; - }) diff --git a/pkgs/servers/nosql/cassandra/2.2.json b/pkgs/servers/nosql/cassandra/2.2.json deleted file mode 100644 index 694e66f4f463f..0000000000000 --- a/pkgs/servers/nosql/cassandra/2.2.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "version": "2.2.14", - "sha256": "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q" -} diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix deleted file mode 100644 index bcb2eaec123c6..0000000000000 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix ( - args - // builtins.fromJSON (builtins.readFile ./2.2.json) - // { - generation = "2_2"; - extraMeta.knownVulnerabilities = [ - # Fixed in 3.* but 2.* hasn't been released since - "CVE-2020-17516" - ]; - }) diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index af1826dfd6353..12798b8ed5041 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-9tstGrl+5OzHUtoY1OREPT0zTDmUg8JkyzUzraLdAFA="; + hash = "sha256-diBMOVEZYKQlGBTU6pZpc1pG71Ad0qbXc+NLLxTczFk="; }; - vendorSha256 = "sha256-tmIM7X6sdeA6h4wAGb1RRgkqIjpcgVNq4oMwHZIB4W8="; + vendorSha256 = "sha256-62Jayh1blz5tbRtYxpPaSCJkRgpaTIcmw7lCuJ0JtIU="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix deleted file mode 100644 index 905a8424e8efe..0000000000000 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, bison, ncurses, openssl, zlib, libaio, perl }: - -stdenv.mkDerivation rec { - pname = "percona-server"; - version = "5.6.49-89.0"; - - src = fetchurl { - url = "https://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${version}/source/tarball/percona-server-${version}.tar.gz"; - sha256 = "09qqk02iny7jvngyk6k2j0kk2sspc6gw8sm3i6nn97njbkihi697"; - }; - - nativeBuildInputs = [ cmake bison perl ]; - buildInputs = [ ncurses openssl zlib libaio ]; - - cmakeFlags = [ - "-DFEATURE_SET=community" - "-DBUILD_CONFIG=mysql_release" - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" - "-DWITH_SSL=yes" - "-DWITH_READLINE=no" - "-DWITH_EMBEDDED_SERVER=no" - "-DWITH_EDITLINE=bundled" - "-DWITH_ZLIB=yes" - "-DHAVE_IPV6=no" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_SYSCONFDIR=etc/mysql" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" - "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_SCRIPTDIR=bin" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_DOCREADMEDIR=share/mysql" - "-DINSTALL_SUPPORTFILESDIR=share/mysql" - "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_DOCDIR=share/mysql/docs" - "-DINSTALL_SHAREDIR=share/mysql" - ]; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; - NIX_LDFLAGS = "-lgcc_s"; - - prePatch = '' - sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake - ''; - postInstall = '' - sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db - rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a - ''; - - passthru.mysqlVersion = "5.6"; - - meta = with lib; { - homepage = "https://www.percona.com"; - description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation"; - platforms = platforms.linux; - license = licenses.gpl2; - maintainers = with maintainers; [ grahamc ]; - }; -} diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 39615a238e353..113dedf090cfc 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -1,16 +1,13 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "tt-rss"; - year = "21"; - month = "06"; - day = "21"; - version = "20${year}-${month}-${day}"; - rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270"; + version = "unstable-2022-10-15"; - src = fetchurl { - url = "https://git.tt-rss.org/fox/tt-rss/archive/${rev}.tar.gz"; - sha256 = "1dpmzi7hknv5rk2g1iw13r8zcxcwrhkd5hhf292ml0dw3cwki0gm"; + src = fetchgit { + url = "https://git.tt-rss.org/fox/tt-rss.git"; + rev = "602e8684258062937d7f554ab7889e8e02318c96"; + sha256 = "sha256-vgRaxo998Gx9rVeZZl52jppK1v11jpEK0J0NoDMT44I="; }; installPhase = '' @@ -21,7 +18,7 @@ stdenv.mkDerivation rec { # see the code of Config::get_version(). you can check that the version in # the footer of the preferences pages is not UNKNOWN - echo "${year}.${month}" > $out/version_static.txt + echo "22.10" > $out/version_static.txt runHook postInstall ''; diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index 7bff424d9f7ed..c057880b05d5c 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { pname = "tt-rss-plugin-auth-ldap"; - version = "2.0.0"; + version = "unstable-2022-10-31"; src = fetchFromGitHub { owner = "hydrian"; repo = "TTRSS-Auth-LDAP"; - rev = version; - sha256 = "1mg9jff2m0ajxql1vd1g7hsxfbv9smhrmjg4j2gvvjbii45ry0jh"; + rev = "0cc2a21441f99eef8368cfe0fbdbb78126e28d61"; + sha256 = "sha256-pJWyvRnC38Ov1awVLgFZfp8+haADPniP+/P/C74qpcA="; }; patches = [ + # https://github.com/hydrian/TTRSS-Auth-LDAP/pull/47 (fetchpatch { - url = "https://github.com/Mic92/TTRSS-Auth-LDAP/commit/7534fa54babc377a070e05e326a46a252b5e3884.patch"; - sha256 = "1p7zas0n627z0g226dp5m5dg1ai2z3vi69n3xivp517iv3lch70l"; + url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/003ca55bbd6e0a87fb729383e51eb269d918313d.patch"; + sha256 = "sha256-0YD33JPNOOPH2dpGwA/RbV3Kg4i2oKazBjP3hBcUIes="; }) # https://github.com/hydrian/TTRSS-Auth-LDAP/pull/40 (fetchpatch { diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 5c53c12022693..e5e616819ebb9 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -11,13 +11,13 @@ }@args: let - version = "2.9.0.beta10"; + version = "2.9.0.beta11"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-7uMcJZolLUoJILRYbmcSDArcMP3o89ubh6XttZ7TsLg="; + sha256 = "sha256-ejLVEfWHlropB/PDmU2iV5bqxFJrHqxgqCyfiw4scaU="; }; runtimeDeps = [ @@ -165,7 +165,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "0s8cmy76xh4z9y932bjshmpyr04zn3yn62ld9174lks2j965qkbl"; + sha256 = "0zn2ikb4sgf1bg1hrybw4qg31xqrjz406bzdv5lpis308c1l08bp"; }; nativeBuildInputs = runtimeDeps ++ [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index b1ada2100f2e7..8b80f92e62c92 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "c5ad176aaf60150ff44a3f4dd01920ce57975551"; - sha256 = "sha256-AHymwpWcPlgcuJR5x3Ea+l2cuMJKXyNVBtZFJKjsNf4="; + rev = "ed1b344d32cedcd0d5141ff44a5b6842b4bd1927"; + sha256 = "sha256-uPD/8nR8ymoYSSUiPJAmA0W2ljb+s7RSstUSZF9yPEs="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix index 43f7849bc8a72..93fd2d75671ae 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-bbcode-color"; - rev = "e58c38930122772aef15738676683f7d7ff68411"; - sha256 = "sha256-/uHJ9HMXx7YMYsAc3t/s//ucI8I9Wh3wtC/dQCbtbGU="; + rev = "2fcb3a657582f6fcc2a9abf32db9afde31276ee8"; + sha256 = "sha256-gM/EOAyY1rtlT3/9XR1+GGPjOg7cZj2jSx/1lFaL0bc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-bbcode-color"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 3f85eae74422b..1fd9e3111d448 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES rrule (= 0.4.4) BUNDLED WITH - 2.3.22 + 2.3.23 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 7524e8c6da4be..151a141c952b3 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "d0908b9b2e80087dd6638e661c3307d8d384550e"; - sha256 = "sha256-zmoL4v3tdcPQUdLl+bcT4Kb7EDLVgJa9VVX9ofcPoHk="; + rev = "e0efb16264a07f74d1a66f1568cec2774b4b2fa8"; + sha256 = "sha256-IJaa1JOJCOFvnBVK92autgDQCRACYkcJY8T38QQk2Oc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 07d1afb2da490..005981ed3e7be 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "faa586b095a9ec5b0088bdfa7b04a3aba9f44521"; - sha256 = "sha256-f/9JtPtYZsRIzk3cBlXAtdG25oep7/Kl74JsGkoP4PI="; + rev = "6440ddecf2c94444257da5be911f39067dfb3be0"; + sha256 = "sha256-VBsxpm6/xx5N6tzO9z+yE7tQcdXCPM8bV4HhF3JwXNc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 355162c0163c3..ba8284820b9ff 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "7bf7368520d37a2dca9c21dcffd8831d987f64f8"; - sha256 = "sha256-f0JgiuwSKtCfr+s3D4HVVWjyE/5sixqRDsgcvBJs8Uk="; + rev = "820d04d1b2f0c31fc16abf791b0af3a1036be84f"; + sha256 = "sha256-2mIKTuWqx01vNpD9fEBN1UBAf0sXTKAijZNoVG7HBdA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index e8de49349f0c6..3fc0c89b42873 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "8763292e9a02fc2fed6d39c59c3cf5401dcdd950"; - sha256 = "sha256-xUsTjoG25efIumrf6XX8rAKWjfcAhZiqQz9pfnG3pQU="; + rev = "4fb02010235b7d6e8d9a50b007fc42afb4a064bc"; + sha256 = "sha256-Tzz9di8a6wJwyqb8G7z5K95YLqteNssZ8S/5nAOu84I="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 6dd4352461754..5c71ba5a84b94 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "16bb6a946cc2014aa709aba60940a96b5452936d"; - sha256 = "sha256-E9qGAG4XWrxqP1SPq5LYQn89sQbX8DgGxtCfEQcBFX8="; + rev = "bf1a79c9ad1c77e8ff2b86e1efea4e753bb4968d"; + sha256 = "sha256-7K/fjfChOsTDHbFCJPWkulvcFT/+gxajkbJUmhxYeKM="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 7ed0ba1ccc651..a2c3993933a66 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "9cffc3e479117af1665096e16b7d5a637b112b28"; - sha256 = "sha256-F74eFhDIdWbnCCsWsT3SrQBSS8IUPLi2N9w3h8i5++0="; + rev = "c083f0140ae88702dce4988979d55a7f8e5cfe43"; + sha256 = "sha256-MUIHAW/08UYlXUIK7M+IVzJS/HjP5pGeBgHra+9e+ZA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index 12c8201d7b405..80965f09e6bb4 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -3,10 +3,10 @@ GEM specs: addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) - faraday (2.5.2) + faraday (2.6.0) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) + faraday-net_http (3.0.1) octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -24,4 +24,4 @@ DEPENDENCIES sawyer (= 0.9.2) BUNDLED WITH - 2.3.22 + 2.3.23 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index 0edbe1c9f100f..32fac719fcd94 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "e513628acc716c8e35611d9a31fca8badf2757e2"; - sha256 = "sha256-K6FzV/r9i0rlOlek5AYZkwfV5diBtzBd5zLmMStcqAI="; + rev = "6506360937c1d060e185bb06126334e36abc7c15"; + sha256 = "sha256-3kS2wINiLX3hulVlHDnpsfW2wLFl025ffbIu+W67p8I="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 5c3d7e8ec7034..b7bd22ea52dad 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -16,20 +16,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a6q8k82vfqyzlnrs6r6d82fyz5fminc8p57mr5xkdabs0m2y3mx"; + sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yicplzlh5da8pr64286zga3my86cjsb2y9dqlzsacpw8hbkmjvw"; + sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index b18bf07789b00..63f2d8aef3414 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "bcaccbd845825e99c39060e3898e8d5ea1bba927"; - sha256 = "sha256-c/4oVDBhDiPrLSooU9TgDQJSij8i+QYCoNqDCicXPJk="; + rev = "594e746904a126e75aa2b440deb6c405f863861f"; + sha256 = "sha256-S/3SKYMtTepPsjzsEIex3leZqfyVMOto1SetWtKhd1Q="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index 1401a09405af4..e7e49724b57df 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -23,4 +23,4 @@ DEPENDENCIES unix-crypt (= 1.3.0) BUNDLED WITH - 2.3.22 + 2.3.23 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index 99a316bcbf4f6..8c022162512fb 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "ebb705d2f86dea862d6492ae8da5ececca4fde1c"; - sha256 = "sha256-UByhKdIYvwlo8tA9JTK6EGKo7QGkcKIFBVgsgHGIFc0="; + rev = "54a451e3dea4416c763c9afacfb6e9fcc05f135a"; + sha256 = "sha256-14gxO4hYEOSz2Fenl4tO8xeM1AkPaCilV4cnoJQNHGY="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index 374d7ba3ac175..c69c6911b56a7 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "d3b347388d3e28a5c2ec7dfe8403e949928d5010"; - sha256 = "sha256-3rASzJgZeXY2oA7EpwPwgN7YiRSXGPCtJlhAIK1RCDw="; + rev = "0817bef63a17771da217c3f8b4db740157a06a3b"; + sha256 = "sha256-uN03WhyY2v6OwOpy1aHPmBH6tMgmVcwQyVJZTVhaysA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock index 79978e387cb9f..9b917de921454 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES prometheus_exporter (= 0.5.0) BUNDLED WITH - 2.3.9 + 2.3.23 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 07c942303e7f7..b22f5be0e7205 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "e8caf83e0bcbb55effb86e99324aa15259f608cc"; - sha256 = "sha256-X3VU4TUth/6j/x9hVpw2GLRZHDCnDfxLbveZUQrFfVU="; + rev = "31ae7c3c4daab543c63cd74e20b07f440d36fece"; + sha256 = "sha256-/wY/piUerXxQyhwqqqK4nWR9Qs6JAgEPIJ9Sw3yyDv0="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index ad9c2f91c8370..bd5c45cee9c69 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "836981c3d5c51353165a2dad05de5054fe7a1b77"; - sha256 = "sha256-UisVi+JKZovge0SFFlgxX4WXLOtWKX/RDMVR7Vrc8so="; + rev = "d1df24c0f94d36f5184eb2d9354b86f821e96a90"; + sha256 = "sha256-kAFGxhiIh4enZ8jyePgzHakA99RERbUCoXsxPsZQjNI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index fb7ce4855e73b..e2731d83a5136 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "e96934d60f3fb97a949e0d901fd1c061e6c3bd71"; - sha256 = "sha256-DOFUTiTYffvrwmHkEuX5TGk0VL3iqSziXZ3ogsbkwjQ="; + rev = "76daa65b11a6c3b0c7ed7bc3fb60cdec0d8b09a4"; + sha256 = "sha256-q7RfaRFcvDUyz3mSO5bDZFGX7aAqzH978Ck812a627s="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index 6b0a203c232f3..32d837913f0e7 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "a1e4d543e1bafeb11cbb9d09a887ce210b7eecb8"; - sha256 = "sha256-lZUT+ix1mLomeIdYIOz1vgY6sLVSPOhM85/FkXZFfWc="; + rev = "636245b0e63dd53271ba55144edb20f48822b59f"; + sha256 = "sha256-WTY9wvCAyWa3VgfRclOm9mkVgDxZBojgCvJqjTga90o="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index ea5c172e6141d..965efd7834361 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "b6118e9e50a2bec6bbb995db235657c7097bfaa9"; - sha256 = "sha256-dXJS5ZcyBstE8mSTukUDg0H1ytEJs679wvVuojoUPY4="; + rev = "f42dc208199f9a294f3493b1715eea7b6919ee74"; + sha256 = "sha256-M6sh9xkutOR1pyu/Qz3w7olsGSQrQX3Ouk4cfhr5drA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index bd4dbc6bd1375..efd6ae2805961 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "76b35ac9b20725250140602e5d12a82b31383d35"; - sha256 = "sha256-RtmnRXh8AbKSe+kuBcORv5FcKYez7WU2owcW16LFCns="; + rev = "bb1fcc7d3922390a9a4020c532fb1ac08a06959c"; + sha256 = "sha256-VdH5ZKSzT0hD+kaNMpyXhehlNV+LVaNCE8asA3662WA="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index e29c6737bedd3..daf68be0cba66 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -39,7 +39,7 @@ gem 'sprockets', '3.7.2' # allows us to precompile all our templates in the unicorn master gem 'actionview_precompiler', require: false -gem 'seed-fu' +gem 'discourse-seed-fu' gem 'mail', git: 'https://github.com/discourse/mail.git' gem 'mini_mime' @@ -134,13 +134,10 @@ gem 'cose', require: false gem 'addressable' gem 'json_schemer' -if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1") - # net-smtp, net-imap and net-pop were removed from default gems in Ruby 3.1 - gem "net-smtp", "~> 0.2.1", require: false - gem "net-imap", "~> 0.2.1", require: false - gem "net-pop", "~> 0.1.1", require: false - gem "digest", "3.0.0", require: false -end +gem "net-smtp", require: false +gem "net-imap", require: false +gem "net-pop", require: false +gem "digest", require: false # Gems used only for assets and not required in production environments by default. # Allow everywhere for now cause we are allowing asset debugging in production @@ -272,6 +269,9 @@ gem 'maxminddb' gem 'rails_failover', require: false +gem 'faraday' +gem 'faraday-retry' + # workaround for faraday-net_http, see # https://github.com/ruby/net-imap/issues/16#issuecomment-803086765 gem 'net-http' diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index b6392ce704a79..f1685e31cdd05 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -106,7 +106,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.10) connection_pool (2.3.0) - cose (1.2.1) + cose (1.3.0) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) cppjieba_rb (0.4.2) @@ -118,6 +118,7 @@ GEM debug_inspector (1.1.0) diff-lcs (1.5.0) diffy (3.4.2) + digest (3.1.0) discourse-ember-rails (0.18.6) active_model_serializers ember-data-source (>= 1.0.0.beta.5) @@ -127,6 +128,9 @@ GEM railties (>= 3.1) discourse-ember-source (3.12.2.3) discourse-fonts (0.0.9) + discourse-seed-fu (2.3.12) + activerecord (>= 3.1) + activesupport (>= 3.1) discourse_dev_assets (0.0.4) faker (~> 2.16) literate_randomizer @@ -141,17 +145,19 @@ GEM sprockets (>= 3.3, < 4.1) ember-source (2.18.2) erubi (1.11.0) - excon (0.92.5) + excon (0.93.1) execjs (2.8.1) - exifr (1.3.9) + exifr (1.3.10) fabrication (2.30.0) faker (2.23.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) - faraday (2.5.2) + faraday (2.6.0) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) + faraday-net_http (3.0.1) + faraday-retry (2.0.0) + faraday (~> 2.0) fast_blank (1.0.1) fast_xs (0.8.0) fastimage (2.2.6) @@ -184,9 +190,9 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.6.2) - json-schema (2.8.1) - addressable (>= 2.4) - json_schemer (0.2.21) + json-schema (3.0.0) + addressable (>= 2.8) + json_schemer (0.2.22) ecma-re-validator (~> 0.3) hana (~> 1.3) regexp_parser (~> 2.0) @@ -219,7 +225,7 @@ GEM lz4-ruby (0.3.3) matrix (0.4.2) maxminddb (0.1.22) - memory_profiler (1.0.0) + memory_profiler (1.0.1) message_bus (4.2.0) rack (>= 1.1.3) method_source (1.0.0) @@ -233,39 +239,39 @@ GEM mini_suffix (0.3.3) ffi (~> 1.9) minitest (5.16.3) - mocha (1.15.0) - msgpack (1.5.6) + mocha (1.16.0) + msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) mustache (1.1.1) net-http (0.2.2) uri - net-imap (0.3.0) + net-imap (0.3.1) net-protocol net-pop (0.1.2) net-protocol net-protocol (0.1.3) timeout - net-smtp (0.3.2) + net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.13.8) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.8-aarch64-linux) + nokogiri (1.13.9-aarch64-linux) racc (~> 1.4) - nokogiri (1.13.8-arm64-darwin) + nokogiri (1.13.9-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.8-x86_64-darwin) + nokogiri (1.13.9-x86_64-darwin) racc (~> 1.4) - nokogiri (1.13.8-x86_64-linux) + nokogiri (1.13.9-x86_64-linux) racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) snaky_hash (~> 2.0) version_gem (~> 1.1) - oauth-tty (1.0.3) - version_gem (~> 1.1) + oauth-tty (1.0.5) + version_gem (~> 1.1, >= 1.1.1) oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) @@ -304,7 +310,7 @@ GEM parallel parser (3.1.2.1) ast (~> 2.4.1) - pg (1.4.3) + pg (1.4.4) progress (3.6.0) pry (0.14.1) coderay (~> 1.1) @@ -322,7 +328,7 @@ GEM rack (2.2.4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-protection (3.0.1) + rack-protection (3.0.2) rack rack-test (2.0.2) rack (>= 1.3) @@ -369,52 +375,53 @@ GEM chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.1) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.12.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.11.1) + rspec-mocks (3.12.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (5.1.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.11.1) + rspec-support (~> 3.12.0) + rspec-rails (6.0.1) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.11) + rspec-expectations (~> 3.11) + rspec-mocks (~> 3.11) + rspec-support (~> 3.11) + rspec-support (3.12.0) rss (0.2.9) rexml - rswag-specs (2.6.0) + rswag-specs (2.7.0) activesupport (>= 3.1, < 7.1) - json-schema (~> 2.2) + json-schema (>= 2.2, < 4.0) railties (>= 3.1, < 7.1) - rubocop (1.36.0) + rspec-core (>= 2.14) + rubocop (1.37.1) json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) + rubocop-ast (>= 1.23.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) + rubocop-ast (1.23.0) parser (>= 3.1.1.0) rubocop-discourse (3.0) rubocop (>= 1.1.0) rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.13.2) + rubocop-rspec (2.14.2) rubocop (~> 1.33) ruby-prof (1.4.3) ruby-progressbar (1.11.0) @@ -435,9 +442,6 @@ GEM sprockets (> 3.0) sprockets-rails tilt - seed-fu (2.3.9) - activerecord (>= 3.1) - activesupport (>= 3.1) selenium-webdriver (4.5.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) @@ -455,9 +459,9 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - snaky_hash (2.0.0) + snaky_hash (2.0.1) hashie - version_gem (~> 1.1) + version_gem (~> 1.1, >= 1.1.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -466,8 +470,8 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.21) - test-prof (1.0.10) + stackprof (0.2.22) + test-prof (1.0.11) thor (1.2.1) tilt (2.0.11) timeout (0.3.0) @@ -485,8 +489,8 @@ GEM uniform_notifier (1.16.0) uri (0.11.0) uri_template (0.7.0) - version_gem (1.1.0) - webdrivers (5.1.0) + version_gem (1.1.1) + webdrivers (5.2.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0) @@ -502,7 +506,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yaml-lint (0.0.10) - zeitwerk (2.6.0) + zeitwerk (2.6.3) PLATFORMS ruby @@ -534,9 +538,11 @@ DEPENDENCIES cppjieba_rb css_parser diffy + digest discourse-ember-rails (= 0.18.6) discourse-ember-source (~> 3.12.2) discourse-fonts + discourse-seed-fu discourse_dev_assets email_reply_trimmer ember-handlebars-template (= 0.8.0) @@ -545,6 +551,8 @@ DEPENDENCIES fabrication faker (~> 2.16) fakeweb + faraday + faraday-retry fast_blank fast_xs fastimage @@ -577,6 +585,9 @@ DEPENDENCIES multi_json mustache net-http + net-imap + net-pop + net-smtp nokogiri oj (= 3.13.14) omniauth @@ -618,7 +629,6 @@ DEPENDENCIES sanitize sassc (= 2.0.1) sassc-rails - seed-fu selenium-webdriver shoulda-matchers sidekiq @@ -639,4 +649,4 @@ DEPENDENCIES yaml-lint BUNDLED WITH - 2.3.22 + 2.3.23 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 632f95c4e1ba4..c979db62e2e1b 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -393,10 +393,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf29s40xf6a9k0idswfbabkswr0k5iqfrg61v40bzfrv0fdg440"; + sha256 = "00c6x4ha7qiaaf88qdbyf240mk146zz78rbm4qwyaxmwlmk7q933"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; cppjieba_rb = { groups = ["default"]; @@ -470,6 +470,16 @@ }; version = "3.4.2"; }; + digest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39"; + type = "gem"; + }; + version = "3.1.0"; + }; discourse-ember-rails = { dependencies = ["active_model_serializers" "ember-data-source" "ember-handlebars-template" "ember-source" "jquery-rails" "railties"]; groups = ["default"]; @@ -501,6 +511,17 @@ }; version = "0.0.9"; }; + discourse-seed-fu = { + dependencies = ["activerecord" "activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r3mbi72cx3xx8dnva1zhvxcacdma4xfn16d8s860m7d25fdjqag"; + type = "gem"; + }; + version = "2.3.12"; + }; discourse_dev_assets = { dependencies = ["faker" "literate_randomizer"]; groups = ["development" "test"]; @@ -594,10 +615,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qc7l72y7wxlc3pi3paj84jc5jfb0yc1vsc0w6v029il3dd14b8r"; + sha256 = "1v71iii13cnlkck20xv0yrbz0g60qn88f4r6518k8vk31sddw4hx"; type = "gem"; }; - version = "0.92.5"; + version = "0.93.1"; }; execjs = { groups = ["assets" "default"]; @@ -614,10 +635,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mylhwmh6n4xihxr9s3zj0lc286f5maxbqd4dgk3paqnd7afz88s"; + sha256 = "08fmmswa9fwymwsa2gzlm856ak3y9kjxdzm4zdrcrfyxs2p8yqwc"; type = "gem"; }; - version = "1.3.9"; + version = "1.3.10"; }; fabrication = { groups = ["development" "test"]; @@ -656,20 +677,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a6q8k82vfqyzlnrs6r6d82fyz5fminc8p57mr5xkdabs0m2y3mx"; + sha256 = "0mqv17hfmph4ylmb2bqyccy64gsgpmzapq5yrmf5yjsqkvw9rxbv"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yicplzlh5da8pr64286zga3my86cjsb2y9dqlzsacpw8hbkmjvw"; + sha256 = "13b717ddw90iaf4vijy06srmkvrfbzsnyjap93yll0nibad4dbxq"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; + }; + faraday-retry = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07bn75d784ndj9ljqk19ff6217hkqqmxjlnjx5b9v36k2nnj9kys"; + type = "gem"; + }; + version = "2.0.0"; }; fast_blank = { groups = ["default"]; @@ -921,10 +953,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5"; + sha256 = "0gdvm83yaa5n8hwapwzxwfcmbypiq2i0zfx4mzz67wg55p2cnli4"; type = "gem"; }; - version = "2.8.1"; + version = "3.0.0"; }; json_schemer = { dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; @@ -932,10 +964,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11dsw41f1zai3k8kxxjhmjlycwg67irqaqmiw4jbw12wdc6cxa6d"; + sha256 = "09ji9ljkpfq38q1g16d60d9hb602rkkhnwzkj03479ss4w96c5rz"; type = "gem"; }; - version = "0.2.21"; + version = "0.2.22"; }; jwt = { groups = ["default"]; @@ -1115,10 +1147,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8qaf19yr4lhvdxk3cy3ifc47cgxdz2jybg6hzxsy9gh88c1f7v"; + sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; message_bus = { dependencies = ["rack"]; @@ -1219,10 +1251,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z2nzk106b6af6n0d9xqf2sphaff4gpjgxvwqcmvy6k719hqhkh9"; + sha256 = "155asp0lxm7qbj3bvsg6zghzs127w4hd86djg8m3nkbksqrzxmpn"; type = "gem"; }; - version = "1.15.0"; + version = "1.16.0"; }; msgpack = { groups = ["default"]; @@ -1233,10 +1265,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01sw335w8wl6rjz8raa8xkxnk36d7ib7zqkc9gdibmplar4x1fqg"; + sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3"; type = "gem"; }; - version = "1.5.6"; + version = "1.6.0"; }; multi_json = { groups = ["default"]; @@ -1285,10 +1317,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jn5bkvmsfxha6fn19k4sy03jh9mi96aj3wgci42fvxhh69z54kk"; + sha256 = "1s1d01q6mljiiv6y2w6znmhmnm2b5lkw8d13wip9x23a820z8cjw"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.1"; }; net-pop = { dependencies = ["net-protocol"]; @@ -1318,10 +1350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d1y3nkgwypfsivip8vzphs3a01a40ds4ng8i314fpr9fdk48dad"; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; type = "gem"; }; - version = "0.3.2"; + version = "0.3.3"; }; nio4r = { groups = ["default"]; @@ -1339,10 +1371,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.9"; }; oauth = { dependencies = ["oauth-tty" "snaky_hash" "version_gem"]; @@ -1361,10 +1393,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mjmiz82f3p81mipy4skhpbvsv55mcv20qan3m1avdm1ama5fr55"; + sha256 = "05wb5n36i4h23hh9dx2m2cwjxx5vj0vgyrn2xr6rsl54glq5rqil"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.5"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1536,10 +1568,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; + sha256 = "09a5z9qhxnybahx162q2q1cygdhxfp6cihdivvzh32jlwc37z1x3"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; progress = { groups = ["default"]; @@ -1656,10 +1688,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01wjwmby7kjv8967i2mvvj1h9phdwq2ci7xkk20nbv9xlimypqaz"; + sha256 = "0jmixih0qrsdz60dhznkk29v50ks55cqq51jjf0yn3amqghh4bhk"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; rack-test = { dependencies = ["rack"]; @@ -1908,10 +1940,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9"; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -1919,10 +1951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1930,10 +1962,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l1bzk6a68i1b2qix83vs40r0pbjawv67hixiq2qxsja19bbq3bc"; + sha256 = "0qldsmjhqr4344zdlamzggr3y98wdk2c4hihkhwx8imk800gkl8v"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.0"; }; rspec-html-matchers = { dependencies = ["nokogiri" "rspec"]; @@ -1952,10 +1984,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm"; + sha256 = "1yvwnb0x5d6d4ff3wlgahk0wcw72ic51gd2snr1xxc5ify41kabv"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.0"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -1963,20 +1995,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l"; + sha256 = "0d3fnabkaw8n0na2dpnlg2xygggj51djzpj9x6y5rkiqbfyqwv01"; type = "gem"; }; - version = "5.1.2"; + version = "6.0.1"; }; rspec-support = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; type = "gem"; }; - version = "3.11.1"; + version = "3.12.0"; }; rss = { dependencies = ["rexml"]; @@ -1990,15 +2022,15 @@ version = "0.2.9"; }; rswag-specs = { - dependencies = ["activesupport" "json-schema" "railties"]; + dependencies = ["activesupport" "json-schema" "railties" "rspec-core"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvjsw01b51ag60zr2pymldzwz6jp7pl0y0lkfq2js1v0cggjdyb"; + sha256 = "1mh9w7l9jl44pdxigppsxzrxracfsx7fsfz25ixamc8dkcklybx8"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; rubocop = { dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -2006,10 +2038,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7zc3gissn5ki7zz2szg1mlxn8zqhgb3bdv96cl25w4mgf4g3in"; + sha256 = "1xhm882zzs4z4ivknrymh6lgnd3p90b651dn0fp32dciajdxr9f1"; type = "gem"; }; - version = "1.36.0"; + version = "1.37.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2017,10 +2049,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; + sha256 = "1qiq3q66w57im0ryrvnd1yq0g2s2safhywpv94441kvc1amayjzy"; type = "gem"; }; - version = "1.21.0"; + version = "1.23.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; @@ -2039,10 +2071,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1acfcw78w5mgsj34w5drizl4pzp3ivk67z98k1jxqmja75l7rxxc"; + sha256 = "1g8spxvms3mqrv5afj7rrqzxasncpz9y266jnpgj7z5gj76i7bkk"; type = "gem"; }; - version = "2.13.2"; + version = "2.14.2"; }; ruby-prof = { groups = ["development"]; @@ -2132,17 +2164,6 @@ }; version = "2.1.2"; }; - seed-fu = { - dependencies = ["activerecord" "activesupport"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7lzcshsq6i20qn1p8zczir4fivr6nbl1km91ns320vvh92v43d"; - type = "gem"; - }; - version = "2.3.9"; - }; selenium-webdriver = { dependencies = ["childprocess" "rexml" "rubyzip" "websocket"]; groups = ["test"]; @@ -2213,10 +2234,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pl70rh92wsn15q4lwzikzi7j5a00vm77bqjg07k4sgzx0wjx2zy"; + sha256 = "0cfwvdcr46pk0c7m5aw2w3izbrp1iba0q7l21r37mzpwaz0pxj0s"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.1"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; @@ -2259,20 +2280,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bpmrz2vw59gw556y5hsha3xlrvfv4qwck4wg2r39qf2bp2hcr1b"; + sha256 = "0v7nk5i3fa63h6clfr5vbr0y91v3kxkaxh6gbdx583pn982avdlc"; type = "gem"; }; - version = "0.2.21"; + version = "0.2.22"; }; test-prof = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kcmayrkhf0znxpny8f6ca9ljbfv7kdsbig3spy5ylgsv2mjkvzs"; + sha256 = "08f6lj1yh1ykwdaz5zkqpj5hn4vl4vid2x74k135cbggw3j9grdq"; type = "gem"; }; - version = "1.0.10"; + version = "1.0.11"; }; thor = { groups = ["default" "development" "test"]; @@ -2409,10 +2430,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104s7p4zp5yvf0bvbwd9mqmnkgz2z89h4hbvxi8pzd8d08c9a03b"; + sha256 = "0v2vj7q1rk3wd7hdqa3i1d4hq7sfcgf55qc70g6dsichsbgacb9w"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; webdrivers = { dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; @@ -2420,10 +2441,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8kbn592rm11mnyrdq6xp35arfpn9xr0bbkh5imcwpw3wslcfli"; + sha256 = "0nxk9719nyk7vsc15mz2hxc8whciihcs40skpn2rncnzsppbv1w3"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; @@ -2493,9 +2514,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; + sha256 = "0c381ngdj24ad6i1hvd8w052x6zry8qjyv0s4p6sl7cfj7yw0z6c"; type = "gem"; }; - version = "2.6.0"; + version = "2.6.3"; }; } diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index 133fa4801dbc7..6ea75ee7a9c03 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.6600"; + version = "1.0.6644"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "KrmpEGMLTy9p/MGgFKR+NGhryjwp3W95gIQrOYm3iTI="; + sha256 = "y1oI3nxIu7breYNPhdX7PU5GfnCyxdEbAYlyZmif2Uo="; }; dontBuild = true; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f9418902ea892..92e3c6d0f3005 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-10-30"; + version = "2022-11-04"; pname = "oh-my-zsh"; - rev = "50a526f209a182add8a47e362e1c9a3bfd7c5af4"; + rev = "80fdbc9b91a9acca42fb90065b5e64a9722978a7"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1PPLUxFGUTHCxEgJXw8TLAqXOLfzz1oQNwmjLRfhQH4="; + sha256 = "dapyDDtQ8JUE3PpmHo9DLtt0gEBOrHqoC8wMZeQFUts="; }; strictDeps = true; diff --git a/pkgs/test/cuda/cuda-library-samples/generic.nix b/pkgs/test/cuda/cuda-library-samples/generic.nix index f0c30d801a1c9..e01664bab3191 100644 --- a/pkgs/test/cuda/cuda-library-samples/generic.nix +++ b/pkgs/test/cuda/cuda-library-samples/generic.nix @@ -54,6 +54,8 @@ in src = "${src}/cuTENSOR"; + buildInputs = [ cutensor ]; + cmakeFlags = [ "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${builtins.placeholder "out"}/bin" ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 0aedc30da230e..8b4b42e31239b 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -32,14 +32,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.8.7"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.8.9"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-AFVIHDWgBuM9aGFY7sEvoU6NmSBYQa/dXgz/qW/3rUY="; + sha256 = "sha256-7So0zPknO5rIiWY7o82HXl+Iw2+fQmhYvrfrFMCDdDE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index fcf2b72a1422b..65b8d75746e03 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clair"; - version = "4.4.4"; + version = "4.5.0"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-QfNFms1OxKPk6vimagMFGWJSl9L7JEM1rIK5kNpZlfg="; + hash = "sha256-/Czgdl6OxfXSQGvoanA8eoGdzK/wCgGH3wy5aLf0DSM="; }; - vendorSha256 = "sha256-Y3eymnLVbDmisV3RDAYkV+I6kTe/CoG0yLvZBOrTfig="; + vendorSha256 = "sha256-XWsnEjVA/fqiLevn6sxjzlDfuy937idIcXdTY56FrdA="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index bac1cbd375f22..a1c9117ae5121 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.22.1"; + version = "1.23.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jm4UTwWuqbtckIoXD7YVQk2MQlvzdfRbLW7YA+CmhDE="; + sha256 = "sha256-K+OWAZudk/xxKZw0zdsJfMj1jRhzOamBI7wd5ttmaiY="; }; - vendorSha256 = "sha256-MOFPuxn6LwPUw0A14OXhZefAgvtm+9qcDTR3kfwCtjQ="; + vendorSha256 = "sha256-DCjJJZKVDFyZXItWRzBsxb8xLZNDLWI2kAp4KKKn9yA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index db993c0496653..7f79d5dabc8ac 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.115.0"; + version = "0.117.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-IIxg0xaRfd7jKS4AkSFHcObQmKSRCnQ+K68by8aZlAc="; + sha256 = "sha256-3OYhwl+oJNSAYI5RLJgdZgq8teqkjCHy5r/XOqJdz7I="; }; - vendorSha256 = "sha256-glMu2GwMWsuIjLjCwskH90wn690tosLTCThd4LUZobo="; + vendorSha256 = "sha256-a5E6a+DFrbAA2/sznrKbE4IP68f49+Nbiujx94snryQ="; doCheck = false; diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/tools/admin/infra/default.nix index fa00ef9098ab7..8d915495c8b89 100644 --- a/pkgs/tools/admin/infra/default.nix +++ b/pkgs/tools/admin/infra/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "infra"; - version = "0.15.2"; + version = "0.16.1"; src = fetchFromGitHub { owner = "infrahq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-luwswGFI+ygLWp8Yi0PuZpkjQiPiF7bCv0kc8DNYxkw="; + sha256 = "sha256-0HCfJwgeLM4uLiXcaW+9FxMVgeDJG7Opr0dEj525npw="; }; - vendorSha256 = "sha256-j+ZtBqAIeI25qRKu6RvW79Ug/lUGreC06qXL5dgchHc="; + vendorSha256 = "sha256-wtzk5J9b1SbWkRRgPmVdxiMJdgPDwAtNOx6Uup7iakk="; subPackages = [ "." ]; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 74f483ab7e958..c221ea38eaea6 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.59.0"; + version = "0.60.3"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jFBYH3xhny+KURoYiuyblntmtKD9XKLp3V2ifqkfHZg="; + sha256 = "sha256-btPH92cLCAZFzlVoRxivBBhqzDK1bASrKbk3jvwDNo8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,9 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-xoGraf3Rh14lHyTU12qFxwk1Cv9N6u5FSxtro0zwRJM="; + # hash mismatch with darwin + proxyVendor = true; + vendorSha256 = "sha256-gwj6Tj4JqZCCLOSw+K1DpwKhcWLtJ6YY5No20WbqQHU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/audio/unflac/default.nix b/pkgs/tools/audio/unflac/default.nix new file mode 100644 index 0000000000000..2e22b81cc5995 --- /dev/null +++ b/pkgs/tools/audio/unflac/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromSourcehut +, ffmpeg +, makeWrapper +}: + +buildGoModule rec { + pname = "unflac"; + version = "1.0"; + + src = fetchFromSourcehut { + owner = "~ft"; + repo = pname; + rev = version; + sha256 = "1vlwlm895mcvmxaxcid3vfji1zi9wjchz7divm096na4whj35cc4"; + }; + + vendorSha256 = "sha256-QqLjz1X4uVpxhYXb/xIBwuLUhRaqwz2GDUPjBTS4ut0="; + + nativeBuildInputs = [ makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/unflac --prefix PATH : "${lib.makeBinPath [ffmpeg]}" + ''; + + meta = with lib; { + description = + "A command line tool for fast frame accurate audio image + cue sheet splitting"; + homepage = "https://sr.ht/~ft/unflac/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ felipeqq2 ]; + }; +} diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix index 9fecfb70f398d..ea6a1ffa88ee8 100644 --- a/pkgs/tools/backup/duplicacy/default.nix +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -1,32 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "duplicacy"; - version = "2.7.2"; - - goPackagePath = "github.com/gilbertchen/duplicacy"; + version = "3.0.1"; src = fetchFromGitHub { owner = "gilbertchen"; repo = "duplicacy"; rev = "v${version}"; - sha256 = "0j37sqicj7rl982czqsl3ipxw7k8k4smcr63s0yklxwz7ch3353c"; + sha256 = "sha256-7VCgXUmmAlmv0UwSM3Hs9t586gJWvFWsP/0BJXze1r4="; }; - goDeps = ./deps.nix; - buildPhase = '' - cd go/src/${goPackagePath} - go build duplicacy/duplicacy_main.go - ''; - installPhase = '' - install -D duplicacy_main $out/bin/duplicacy - ''; + vendorSha256 = "sha256-3vzx2SCgJAhSwW8DRtkQ6pywquFwwou0HZ6a1dmHhPY="; + + doCheck = false; meta = with lib; { homepage = "https://duplicacy.com"; description = "A new generation cloud backup tool"; platforms = platforms.linux ++ platforms.darwin; license = lib.licenses.unfree; - maintainers = with maintainers; [ ffinkdevs ]; + maintainers = with maintainers; [ ffinkdevs devusb ]; }; } diff --git a/pkgs/tools/backup/duplicacy/deps.nix b/pkgs/tools/backup/duplicacy/deps.nix deleted file mode 100644 index 83d69d398cbf1..0000000000000 --- a/pkgs/tools/backup/duplicacy/deps.nix +++ /dev/null @@ -1,408 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613"; - sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "9bc4033dd347c7f416fca46b2f42a043dc1fbdf6"; - sha256 = "158xbd8wn1bna1k1ichlirz6a1zvlh3rg7klr9cnp72l2q8jwvcl"; - }; - } - { - goPackagePath = "github.com/aryann/difflib"; - fetch = { - type = "git"; - url = "https://github.com/aryann/difflib"; - rev = "e206f873d14a916d3d26c40ab667bca123f365a3"; - sha256 = "00zb9sx6l6b2zq614x45zlyshl20zjhwfj8r5krw4f9y0mx3n2dm"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "851d5ffb66720c2540cc68020d4d8708950686c8"; - sha256 = "16qp8ywcf04d2y1ibf3mpglcrxk07x8gak46a2l53lchps2mgcrp"; - }; - } - { - goPackagePath = "github.com/bkaradzic/go-lz4"; - fetch = { - type = "git"; - url = "https://github.com/bkaradzic/go-lz4"; - rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; - sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/gilbertchen/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/azure-sdk-for-go"; - rev = "8fd4663cab7c7c1c46d00449291c92ad23b0d0d9"; - sha256 = "123fj5jni1pjj8i9adzd4r07n9hnlmfprlcjf5hqb1zjb72xi1p7"; - }; - } - { - goPackagePath = "github.com/gilbertchen/cli"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/cli"; - rev = "1de0a1836ce9c3ae1bf737a0869c4f04f28a7f98"; - sha256 = "00vbyjsn009cqg24sxcizq10rgicnmrv0f8jg3fa1fw6yp5gqdl5"; - }; - } - { - goPackagePath = "github.com/gilbertchen/go-dropbox"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/go-dropbox"; - rev = "2233fa1dd846b3a3e8060b6c1ea12883deb9d288"; - sha256 = "01fqxad5mm7rs0mp1ipp9aw80ski6sqyqljpf9dgify8dbiffl97"; - }; - } - { - goPackagePath = "github.com/gilbertchen/go-ole"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/go-ole"; - rev = "0e87ea779d9deb219633b828a023b32e1244dd57"; - sha256 = "1d937b4i9mrwfgs1s17qhbd78dcd97wwm8zsajkarky8d55rz1bw"; - }; - } - { - goPackagePath = "github.com/gilbertchen/go.dbus"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/go.dbus"; - rev = "8591994fa32f1dbe3fa9486bc6f4d4361ac16649"; - sha256 = "0wg82hwgk4s65ns76x7cby6dfdxsdkc4jyqn9zd7g037fhzh8rk5"; - }; - } - { - goPackagePath = "github.com/gilbertchen/goamz"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/goamz"; - rev = "eada9f4e8cc2a45db775dee08a2c37597ce4760a"; - sha256 = "0v6i4jdly06wixmm58ygxh284hnlbfxczvcwxvywiyy9bp5qyaid"; - }; - } - { - goPackagePath = "github.com/gilbertchen/gopass"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/gopass"; - rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; - }; - } - { - goPackagePath = "github.com/gilbertchen/keyring"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/keyring"; - rev = "8855f5632086e51468cd7ce91056f8da69687ef6"; - sha256 = "1ja623dqnhkr1cvynrcai10s8kn2aiq53cvd8yxr47bb8i2a2q1m"; - }; - } - { - goPackagePath = "github.com/gilbertchen/xattr"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/xattr"; - rev = "68e7a6806b0137a396d7d05601d7403ae1abac58"; - sha256 = "120lq8vasc5yh0ajczsdpi8cfzgi4ymrnphgqdfcar3b9rsvx80b"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "84668698ea25b64748563aa20726db66a6b8d299"; - sha256 = "1gkd1942vk9n8kfzdwy1iil6wgvlwjq7a3y5jc49ck4lz9rhmgkq"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "c8a15bac9b9fe955bd9f900272f9a306465d28cf"; - sha256 = "13x3x7agq0b46wpchbd2sqli5l33z6hvfn1qjbiqvsgpbv7wd140"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/klauspost/cpuid"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/cpuid"; - rev = "750c0591dbbd50ef88371c665ad49e426a4b830b"; - sha256 = "1yiby4xa12j3kcw5q7dfsbcybhaxjkppvgz6ac2p2lcwha303b1g"; - }; - } - { - goPackagePath = "github.com/klauspost/reedsolomon"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/reedsolomon"; - rev = "7daa20bf74337a939c54f892a2eca9d9b578eb7f"; - sha256 = "1xk4wqgrl63l95lqnszzbpa06apzxfmpwfnkrn1n8jb0ws7mi01m"; - }; - } - { - goPackagePath = "github.com/kr/fs"; - fetch = { - type = "git"; - url = "https://github.com/kr/fs"; - rev = "1455def202f6e05b95cc7bfc7e8ae67ae5141eba"; - sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q"; - }; - } - { - goPackagePath = "github.com/marstr/guid"; - fetch = { - type = "git"; - url = "https://github.com/marstr/guid"; - rev = "8bd9a64bf37eb297b492a4101fb28e80ac0b290f"; - sha256 = "081qrar6wwpmb2pq3swv4byh73r9riyhl2dwv0902d8jg3kwricm"; - }; - } - { - goPackagePath = "github.com/minio/blake2b-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/blake2b-simd"; - rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4"; - sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; - }; - } - { - goPackagePath = "github.com/minio/highwayhash"; - fetch = { - type = "git"; - url = "https://github.com/minio/highwayhash"; - rev = "86a2a969d04373bf05ca722517d30fb1c9a3e4f9"; - sha256 = "0kj2hs82sphag0h25xvprvf2fz3zlinmlif89sk9jp8h518aiahf"; - }; - } - { - goPackagePath = "github.com/mmcloughlin/avo"; - fetch = { - type = "git"; - url = "https://github.com/mmcloughlin/avo"; - rev = "443f81d771042b019379ae4bfcd0a591cb47c88a"; - sha256 = "1zc95crbyi7ylqq3jwv4ya55lyzn9x730szdm307vdss4gqlx8yn"; - }; - } - { - goPackagePath = "github.com/ncw/swift"; - fetch = { - type = "git"; - url = "https://github.com/ncw/swift"; - rev = "3e1a09f21340e4828e7265aa89f4dc1495fa7ccc"; - sha256 = "19gb8xh400hzlbdp3nx1f85jxzs36zk0py39vmjcg3fnvdjzblm2"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "614d223910a179a466c1767a985424175c39b465"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pkg/sftp"; - fetch = { - type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "5616182052227b951e76d9c9b79a616c608bd91b"; - sha256 = "1rjlhlkr505a0wvync1ycfn9njfc6bib6bw44qnnm50hlfs59hz2"; - }; - } - { - goPackagePath = "github.com/pkg/xattr"; - fetch = { - type = "git"; - url = "https://github.com/pkg/xattr"; - rev = "dd870b5cfebab49617ea0c1da6176474e8a52bf4"; - sha256 = "11ynkc61qrmf853g04sav8vawz8i6a8b73w71f3cq4djb4cnsw0d"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - { - goPackagePath = "github.com/vaughan0/go-ini"; - fetch = { - type = "git"; - url = "https://github.com/vaughan0/go-ini"; - rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; - sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "d835ff86be02193d324330acdb7d65546b05f814"; - sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "056763e48d71961566155f089ac0f02f1dda9b5a"; - sha256 = "0dcmns62hwid7hk4bmpl22z6ygjh168p23x3arzy320sd1lvap92"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "859b3ef565e237f9f1a0fb6b55385c497545680d"; - sha256 = "0ldgbx2zpprbsfn6p8pfgs4nn87gwbfcv2z0fa7n8alwsq2yw78q"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d3edc9973b7eb1fb302b0ff2c62357091cea9a30"; - sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d622ce64ec6ce98d2c98f916b6303"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "59c9f1ba88faf592b225274f69c5ef1e4ebacf82"; - sha256 = "014iiqjh9sikbcvacqiwhg6mvrsrr1va91wmc9yrnsm11c63yxfa"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "5d1fdd8fa3469142b9369713b23d8413d6d83189"; - sha256 = "0xp5ggnjnl1gqwi2ks042zimgkfv2qda9a57ar198xpyzdn1bv5s"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca"; - sha256 = "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-api-go-client"; - rev = "52f0532eadbcc6f6b82d6f5edf66e610d10bfde6"; - sha256 = "0l7q0mmq0v51wc72bk50nwaz9frl1pqp7gn5jhy1vzxdry930gkc"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "971852bfffca25b069c31162ae8f247a3dba083b"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "baae70f3302d3efdff74db41e48a5d476d036906"; - sha256 = "1xacik4i5w2bpkrxzrfm00ggy5vygbzh8jmm2yq4mxiv0lnsh9nk"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "ac54eec90516cee50fc6b9b113b34628a85f976f"; - sha256 = "17zfx4xgqjamk7rc1sivm5gppkh3j4qp3i294w9rqbv0rqi0c9pq"; - }; - } -] diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 1db9ef848fa29..66c31ddd0e167 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" - wrapProgram "$out/bin/duply" --set PATH \ + wrapProgram "$out/bin/duply" --prefix PATH : \ ${lib.makeBinPath [ coreutils python3 duplicity gawk gnupg bash gnugrep txt2man which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" ''; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 4263dc8aa2430..799fa2345b308 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.0"; + version = "6.0.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-Rp4bLshCpuZISK5j3jAiRG+ACel19765GRkfE3y91TQ="; + sha256 = "sha256-tTFv/x2BHirToGeXMQnrkSuw2SgFc1Yl/YuC5wAgHEg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 9a68a6ef8d67e..dec4739654603 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -4,12 +4,10 @@ stdenv.mkDerivation rec { pname = "netatalk"; - release = "3.1.13"; - patch = "3"; - version = "${release}_${patch}"; + version = "3.1.13"; src = fetchurl { - url = "mirror://sourceforge/netatalk/netatalk/netatalk-${release}.tar.bz2"; + url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9"; }; @@ -18,8 +16,7 @@ stdenv.mkDerivation rec { ./omitLocalstatedirCreation.patch (fetchpatch { name = "make-afpstats-python3-compatible.patch"; - url = - "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch"; + url = "https://github.com/Netatalk/Netatalk/commit/916b515705cf7ba28dc53d13202811c6e1fe6a9e.patch"; sha256 = "sha256-DAABpYjQPJLsQBhmtP30gA357w0Qn+AsnFgAeyDC/Rg="; }) ]; @@ -28,26 +25,22 @@ stdenv.mkDerivation rec { # https://bugs.freebsd.org/263123 (fetchpatch { name = "patch-etc_afpd_directory.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_directory.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_directory.c"; sha256 = "sha256-07YAJs+EtqGcFXbYHDLbILved1Ebtd8ukQepvzy6et0="; }) (fetchpatch { name = "patch-etc_afpd_file.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_file.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_file.c"; sha256 = "sha256-T1WTNa2G6wxKtvMa/MCX3Vx6XZBHtU6w3enkdGuIWus="; }) (fetchpatch { name = "patch-etc_afpd_volume.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_volume.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_afpd_volume.c"; sha256 = "sha256-NOZNZGzA0hxrNkoLTvN64h40yApPbMH4qIfBTpQoI0s="; }) (fetchpatch { name = "patch-etc_cnid__dbd_cmd__dbd__scanvol.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_cnid__dbd_cmd__dbd__scanvol.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-etc_cnid__dbd_cmd__dbd__scanvol.c"; sha256 = "sha256-5QV+tQDo8/XeKwH/e5+Ne+kEOl2uvRDbHMaWysIB6YU="; }) (fetchpatch { @@ -58,33 +51,28 @@ stdenv.mkDerivation rec { }) (fetchpatch { name = "patch-libatalk_adouble_ad__conv.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__conv.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__conv.c"; sha256 = "sha256-T27WlKVXosv4bX5Gek2bR2cVDYEee5qrH4mnL9ghbP8="; }) (fetchpatch { name = "patch-libatalk_adouble_ad__date.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__date.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__date.c"; sha256 = "sha256-fkW5A+7R5fT3bukRfZaOwFo7AsyPaYajc1hIlDMZMnc="; }) (fetchpatch { name = "patch-libatalk_adouble_ad__flush.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__flush.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__flush.c"; sha256 = "sha256-k2zTx35tAlsFHym83bZGoWXRomwFV9xT3r2fzr3Zvbk="; }) (fetchpatch { name = "patch-libatalk_adouble_ad__open.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__open.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_adouble_ad__open.c"; sha256 = "sha256-uV4wwft2IH54+4k5YR+Gz/BpRZBanxX/Ukp8BkohInU="; }) # https://bugs.freebsd.org/251203 (fetchpatch { name = "patch-libatalk_vfs_extattr.c"; - url = - "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_vfs_extattr.c"; + url = "https://cgit.freebsd.org/ports/plain/net/netatalk3/files/patch-libatalk_vfs_extattr.c"; sha256 = "sha256-lFWF0Qo8PJv7QKvnMn0Fc9Ruzb+FTEWgOMpxc789jWs="; }) ]; @@ -96,8 +84,7 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = - [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkg-config perl python3 python3.pkgs.wrapPython ]; buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ]; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index ed8bde2a23fb9..e73f039e31603 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -8,7 +8,7 @@ , libXpm ? null , libXaw ? null , aquaterm ? false -, withWxGTK ? false, wxGTK ? null +, withWxGTK ? false, wxGTK32, Cocoa , fontconfig ? null , gnused ? null , coreutils ? null @@ -37,7 +37,8 @@ in ++ lib.optional withCaca libcaca ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withQt [ qtbase qtsvg ] - ++ lib.optional withWxGTK wxGTK; + ++ lib.optional withWxGTK wxGTK32 + ++ lib.optional (withWxGTK && stdenv.isDarwin) Cocoa; postPatch = '' # lrelease is in qttools, not in qtbase. diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 3ea23bafb1842..14831c70b0478 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.13.2"; + version = "8.13.3"; outputs = [ "bin" "out" "man" "dev" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-Tff+M2qJ/FPxU7Y5gUnuF+Kbwh8DIW5Tb7fe0Lbi0m4="; + sha256 = "sha256-JkG1f2SGLI6tSNlFJ//S37PXIo+L318Mej0bI7p/dVo="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 3f68dfb2587fa..add13870148c4 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.16.1"; + version = "1.16.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-OiTZAQYVIMJmQXGQkqcMsUykCImbEOCnYcKmwXwXlpQ="; + sha256 = "sha256-5R5pGCn4CJU2kGPiu6PpUBxr0/02hOwN1ikns2pvGA0="; }; - cargoHash = "sha256-sPJ8NrnwAHuCPLPef8tCbU4nM5J04CzGwf58a9J5Gz4="; + cargoHash = "sha256-0d7EMWc/PU9kDgfTVc1SWYYym9UEULwR1X3qIW+zvjM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index b8d099795e0ea..9465d412b0465 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -16,14 +16,14 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.127"; + version = "1.0.128"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; rev = version; - sha256 = "sha256-KKH9F0e4HEO2FFh1/V5UIY5C95ZOUm4nUhVUGqpZWaI="; + sha256 = "sha256-WybWWyRPreokjUAdWfZ2MUjgZhF1GTncpbLajQ3rh0E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/eget/default.nix b/pkgs/tools/misc/eget/default.nix index 8872b01e9daab..c989f31ef5c73 100644 --- a/pkgs/tools/misc/eget/default.nix +++ b/pkgs/tools/misc/eget/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "eget"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S+L1mr2g+9KHc6AFjlMnlo/K/X3Z5SbFOkFSCvFRaPs="; + sha256 = "sha256-U4sfcmdv1LPddeLjV/eANdxysnOX8bd3PiJpMIDi6PE="; }; - vendorSha256 = "sha256-axJqi41Fj+MJnaLzSOnSws9/c/0dSkUAtaWkVXNmFxI="; + vendorSha256 = "sha256-J8weaJSC+k8BnijG2Jm2GYUZmEhASrrCDxb46ZGmCMI="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index e0c5d6f509203..1a8843bd4f8cf 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "8.5.1"; + version = "8.5.2"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "sha256-zS0AEGd+4YmwId6zJ08q3xYzXF+9K0XL8XWeXGaEJxA="; + sha256 = "sha256-APgC5159U9yMrTiGLE0ngyA5y1bbJUZgoleDAs2ZaDI="; }; - cargoSha256 = "sha256-upI/cDtqe+P7PxoWZZddPqaic2pWclpTC/ATjR7sXx8="; + cargoSha256 = "sha256-8pkn7FLPWMEwsjdwxKigHDEwBHBlh2W9R7HCUIu94Wg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 7a90a86869598..ffeca65910110 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.9.9"; + version = "2.0.3"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "sha256-6+4DOi61WwUstIkHzUU4eBsfeqEUxJY54RccvpXjlJY="; + sha256 = "sha256-8P28xaFyaU0GrIrO+D+Rp9H4xgOymHtbAbd2mI79vSI="; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index b5ca1b41c32eb..e8261182ca463 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.6.4"; + version = "1.6.5"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gm9WtlkjJui8pFk1jypu4i/A14nL8itJIHPQl05+gLg="; + sha256 = "sha256-ZXWlFg0h0PvUqX5+kR/TAkH3GvL9pHRrKueBGqx5MCY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/lemmy-help/default.nix b/pkgs/tools/misc/lemmy-help/default.nix new file mode 100644 index 0000000000000..1bc07257a2fde --- /dev/null +++ b/pkgs/tools/misc/lemmy-help/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "lemmy-help"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "numToStr"; + repo = "lemmy-help"; + rev = "v${version}"; + sha256 = "sha256-VY8sGxS8wwrezTe4ht9xdr4iE2n9fNSNhfCeGDJL5Lo="; + }; + + buildFeatures = [ "cli" ]; + + cargoSha256 = "sha256-yj14kg41EqOco0gx79n8xhf8cyotZ1Mxj2AbNV9TImU="; + + meta = with lib; { + description = "A CLI for generating vim help docs from emmylua comments"; + longDescription = '' + `lemmy-help` is an emmylua parser as well as a CLI which takes that parsed tree and converts it into vim help docs. + ''; + homepage = "https://github.com/numToStr/lemmy-help"; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index fbfb488f90679..b5fc42be82dc7 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }: stdenv.mkDerivation rec { - version = "4.06"; + version = "4.09"; pname = "quota"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "sha256-Lz4DA583jU8Nl6zbSdr1gdyq1k0uHd8SlJX9V5+9Jo0="; + sha256 = "sha256-nNrKFUvJKvwxF/Dl9bMgjdX4RYOvHPBhw5uqCiuxQvk="; }; outputs = [ "out" "dev" "doc" "man" ]; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 83fdef4b95e14..2758b348610c0 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen"; - version = "0.14.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OoRXf0QboRQkZE4zcwlGFyoToGOy1bbgGSo17BQLqCE="; + sha256 = "sha256-nKt/A1LIr+cPWASWFYiOebxsuWcbzd23CQ32GgnWvLA="; }; - vendorSha256 = "sha256-dkPpz0SZEAMPR7mq11kDHGCgeIpnXj2lRnJo1Ws32Cc="; + vendorSha256 = "sha256-feQOrZmJ656yD3HsxnN8JFXoP/XM2Gobyzj5MHyH/Xw="; agents = fetchzip { name = "mutagen-agents-${version}"; @@ -21,7 +21,7 @@ buildGoModule rec { postFetch = '' rm $out/mutagen # Keep only mutagen-agents.tar.gz. ''; - sha256 = "sha256-AlAo55/ewTE04WfS0beVonGA97AmpR1pAw/QxKAYjv8="; + sha256 = "sha256-QkleSf/Npbqrx2049tKxxwJk+996gM5AU/BIoyplDYo="; }; doCheck = false; diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index 46155dcb33236..d560c8b848986 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -33,7 +33,8 @@ buildPythonApplication rec { --replace 'halo = "^0.0.29"' 'halo = "*"' substituteInPlace tests/test_inspect.py \ --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \ - --replace "serialized_size: 2222" "serialized_size: 2221" + --replace "serialized_size: 2222" "serialized_size: 2221" \ + --replace "format_version: 1.0" "format_version: 2.6" ''; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index fdee67de119b0..e25ee09af6bf8 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , rustPlatform , installShellFiles -, libiconv , cmake , fetchpatch , nixosTests @@ -20,16 +19,14 @@ rustPlatform.buildRustPackage rec { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-90mh8C52uD68K5o1LE22gkbL1gy6FyMJTiiN9oV/3DE="; + hash = "sha256-90mh8C52uD68K5o1LE22gkbL1gy6FyMJTiiN9oV/3DE="; }; nativeBuildInputs = [ installShellFiles cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security Foundation Cocoa ]; - buildNoDefaultFeatures = true; - # the "notify" feature is currently broken on darwin - buildFeatures = if stdenv.isDarwin then [ "battery" ] else [ "default" ]; + NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; postInstall = '' installShellCompletion --cmd starship \ @@ -38,7 +35,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoSha256 = "sha256-Q1VY9RyHEsQAWRN/upeG5XJxJfrmzj5FQG6GBGrN0xU="; + cargoHash = "sha256-Q1VY9RyHEsQAWRN/upeG5XJxJfrmzj5FQG6GBGrN0xU="; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix index f7493e152e5b9..ce06bdfdce8f0 100644 --- a/pkgs/tools/misc/tealdeer/default.nix +++ b/pkgs/tools/misc/tealdeer/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tealdeer"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "dbrgn"; repo = "tealdeer"; rev = "v${version}"; - sha256 = "sha256-c7HYQtNT3e/GRyhS6sVGBw91cIusWmOqQ3i+Gglc/Ks="; + sha256 = "sha256-zQzYukhruVUVP1v76/5522ag7wjN9QoE9BtfMNYQ7UY="; }; - cargoSha256 = "sha256-CLCY4rKdYX3QZvk18Ty9B3kcC6hXsDTpAFG0S5xusEQ="; + cargoSha256 = "sha256-VeJsCWU7sJy88uvGGjpuGRzsAgBRvzOYU1FwpImpiLk="; buildInputs = lib.optional stdenv.isDarwin Security; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A very fast implementation of tldr in Rust"; homepage = "https://github.com/dbrgn/tealdeer"; - maintainers = with maintainers; [ davidak ]; + maintainers = with maintainers; [ davidak newam ]; license = with licenses; [ asl20 mit ]; mainProgram = "tldr"; }; diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index 2b737df6f94d4..cacc770052fa3 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, inih, bash-completion }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, inih, bash-completion }: stdenv.mkDerivation rec { pname = "tio"; - version = "2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "tio"; repo = "tio"; rev = "v${version}"; - hash = "sha256-1GKwJylC57es2zM0ON3y4DLgJ7Q6bDYZW/L49U8GBLo="; + hash = "sha256-BjA9Zl6JcgDxTj4KPiWItSq9XuX9FJkpZnhdMBGZQpQ="; }; - nativeBuildInputs = [ meson ninja cmake pkg-config inih bash-completion ]; + nativeBuildInputs = [ meson ninja pkg-config inih bash-completion ]; meta = with lib; { description = "Serial console TTY"; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 2fb2f82ba80f1..d6c589ee2ed08 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -32,7 +32,7 @@ let pname = "vector"; - version = "0.24.1"; + version = "0.25.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -41,28 +41,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-RfKg14r3B5Jx2vIa4gpJs5vXRqSXKOXKRFmmQmzQorQ="; + hash = "sha256-2hCgHf7iBPl9BQITXyUDwgAz/i2HhXT4eczWrExCUDk="; }; - patches = [ - (fetchpatch { - name = "rust-1.64-part1.patch"; - url = "https://github.com/vectordotdev/vector/commit/e7437df97711b6a660a3532fe5026244472a900f.patch"; - hash = "sha256-EyheI3nngt72+ZZNNsjp3KV1CuRb9CZ7wUCHt0twFVs="; - }) - (fetchpatch { - name = "rust-1.64-part2.patch"; - url = "https://github.com/vectordotdev/vector/commit/e80c7afaf7601cf936c7c3468bd7b4b230ef6149.patch"; - hash = "sha256-pHcq7XLn+9PKs0DnBTK5FawN5KSF8BuJf7sBO9u5Gb8="; - excludes = [ - # There are too many conflicts to easily resolve patching this file, but - # the changes here do not block compilation. - "lib/lookup/src/lookup_v2/owned.rs" - ]; - }) - ]; - - cargoHash = "sha256-l2rrT2SeeH4bYYlzSiFASNBxtg4TBm1dRA4cFRfvpkk="; + cargoHash = "sha256-E23m8/XCEXeEpz1itIzCit9RpoB1/PRrYVWxt+VVfxA="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index a193075633d06..bf7c724564eed 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -9,7 +9,7 @@ , qtbase , qtgraphicaleffects , qtquickcontrols2 -, yubikey-manager +, yubikey-manager4 , yubikey-personalization }: @@ -41,7 +41,7 @@ mkDerivation rec { ]; pythonPath = [ - (yubikey-manager.override { python3Packages = python3.pkgs; }) + (yubikey-manager4.override { python3Packages = python3.pkgs; }) ]; postInstall = '' diff --git a/pkgs/tools/misc/yubikey-manager/4.nix b/pkgs/tools/misc/yubikey-manager/4.nix new file mode 100644 index 0000000000000..5e0f0b1d92e34 --- /dev/null +++ b/pkgs/tools/misc/yubikey-manager/4.nix @@ -0,0 +1,73 @@ +{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps +, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }: + +python3Packages.buildPythonPackage rec { + pname = "yubikey-manager"; + version = "4.0.9"; + format = "pyproject"; + + src = fetchFromGitHub { + repo = "yubikey-manager"; + rev = "refs/tags/${version}"; + owner = "Yubico"; + sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0="; + }; + + patches = lib.optionals (!pyOpenSSLSupport) [ + ./remove-pyopenssl-tests.patch + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"' + substituteInPlace "ykman/pcsc/__init__.py" \ + --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill' + ''; + + nativeBuildInputs = with python3Packages; [ poetry-core ]; + + propagatedBuildInputs = + with python3Packages; ([ + click + cryptography + pyscard + pyusb + six + fido2 + ] ++ lib.optionals pyOpenSSLSupport [ + pyopenssl + ]) ++ [ + libu2f-host + libusb1 + yubikey-personalization + ]; + + makeWrapperArgs = [ + "--prefix" "LD_LIBRARY_PATH" ":" + (lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ]) + ]; + + postInstall = '' + mkdir -p "$out/man/man1" + cp man/ykman.1 "$out/man/man1" + + mkdir -p $out/share/bash-completion/completions + _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || : + mkdir -p $out/share/zsh/site-functions/ + _YKMAN_COMPLETE=source_zsh "$out/bin/ykman" > "$out/share/zsh/site-functions/_ykman" || : + substituteInPlace "$out/share/zsh/site-functions/_ykman" \ + --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' + ''; + + checkInputs = with python3Packages; [ pytestCheckHook makefun ]; + + meta = with lib; { + homepage = "https://developers.yubico.com/yubikey-manager"; + description = "Previous release of command line tool for configuring any YubiKey over all USB transports"; + + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ benley lassulus pinpox ]; + mainProgram = "ykman"; + }; +} diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 0d73b826a6676..fe64a2df37b29 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -1,22 +1,18 @@ { python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps -, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }: +, stdenv }: python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "4.0.9"; + version = "5.0.0"; format = "pyproject"; src = fetchFromGitHub { repo = "yubikey-manager"; rev = "refs/tags/${version}"; owner = "Yubico"; - sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0="; + sha256 = "sha256-ZQQhRiUsQwLaOY8NCzSc/PTmRewTL0ECBKj7Uj+6Gn8="; }; - patches = lib.optionals (!pyOpenSSLSupport) [ - ./remove-pyopenssl-tests.patch - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace 'fido2 = ">=0.9, <1.0"' 'fido2 = ">*"' @@ -34,8 +30,7 @@ python3Packages.buildPythonPackage rec { pyusb six fido2 - ] ++ lib.optionals pyOpenSSLSupport [ - pyopenssl + keyring ]) ++ [ libu2f-host libusb1 diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index 40e1154b4be7b..8b8659f28151f 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-O3ZFc2Hc2HpJEctPlwLpWkYI4cJuUVGUXbBIk+1FD7k="; + sha256 = "sha256-0gqd/bEj8ZDpf/3J2iZnGswTO6k8aJOuRiZXMZLm7zo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index d2defe9544641..a5b0b7c807865 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cassowary"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JWuVoEEViVHn39LmJ0IQGg6ggDKS49WhE5Qwp+ep0Pk="; + sha256 = "sha256-eZ61LIDMv+G7jnSrEFCsm6MP5+BpzJW+OnI9bqAZ5hw="; }; - vendorSha256 = "sha256-caFYa0chTsIVW7pN/TBJNfQpnF6Hm4/GFyULDqL/bH4="; + vendorSha256 = "sha256-5U/YqqNfZfLZLEwuRh4mXACr9Gj7iOrLQRSLC/b8ZRw="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 9136b81a00a89..3660b8610af64 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.19.1"; + version = "0.20.1"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-pWi4JKBfIb6c4fh0EAPf86B4axrDzOPM+ZWquFd6mTk="; + sha256 = "sha256-0DRHUT2kXHQMnIEGHwzF70Gr3eP+Zg3rvAGtYyqtzLo="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index 16350850163e3..787e5f3df51a8 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ghostunnel"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ghostunnel"; repo = "ghostunnel"; rev = "v${version}"; - sha256 = "sha256-VameENcHZ6AttV0D8ekPGGFoMHTiTXAY2FxK/Nxwjmk="; + sha256 = "sha256-vODSjTpo2oTY42fONhUU8Xn119cTYUGQ6RJaLnS9q3k="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 329046d7e67ed..077323cd9493b 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-3Brm9pWCLCSjNE5ZACAV4K34L3oBfvT9VI4TKMXrmgY="; + sha256 = "sha256-nZGDaoxGv5DrQY57v4by7SNlRWueKXGrndOKu+cZgDY="; }; vendorSha256 = "sha256-FxfER3THsA7NRuQKEdWQxgUN0SiNI00hGUMVD+3BaG4="; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index f4195dfa5fd90..5811c9a4a268c 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JytK4wmQepSSml6jmP2TWRICt/s26E56ntACpFdiTDU="; + sha256 = "sha256-Z67imUrs/NUoBfbqIBmfTNMb1+X1NpYX4KxB5jU4C9c="; }; vendorSha256 = "sha256-3gpA0EGdcVeUCU7iozpjQJM/iid34PRm3gpxUiwzDEk="; diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index c4ba4c869a2d6..0cdbd52f6f6a0 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , pkg-config, makeWrapper, autoreconfHook -, openldap, python2, pam +, openldap, python3, pam }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ]; - buildInputs = [ openldap pam python2 ]; + buildInputs = [ openldap pam python3 ]; preConfigure = '' substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index de491f2df0e29..339b2aecbaa58 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "6.2.0"; + version = "6.2.1"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-YHB+LIk4qUJ49iFggdcGfQ8b7O2MjrEnfmJemlnM0to="; + sha256 = "sha256-8shgDywj7hEj7r9H7w9A2zhmJ+dbA0DKFhgsEPQXT6k="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index a73d39b5126a5..db6175bea50ab 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "s3cmd"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; - rev = "v${version}"; - sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-nb4WEH8ELaG/bIe4NtjD4p99VJoG90UQ662iWyvnr2U="; }; propagatedBuildInputs = [ python-magic python-dateutil ]; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index c87db08e88a99..244dd3bbcdc00 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.66"; + version = "5.67"; src = fetchurl { - url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c"; + url = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz"; + sha256 = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456"; # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 352bf98a70687..cad54499e3044 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.5.2"; + version = "2.5.4"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-zFw3TCgxyeOQ2cXwgCmoHDyit3irwN0UJsgcZXYo/p0="; + hash = "sha256-fFD2P6j4sozee0UFXfFok304LyiwBF1RM4KbcGNu+HI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index dd83ed9e9ec38..f65b18c7a95ef 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "pacman"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-DbYUVuVqpJ4mDokcCwJb4hAxnmKxVSHynT6TsA079zE="; + hash = "sha256-fY4+jFEhrsCWXfcfWb7fRgUsbPFPljZcRBHsPeCkwaU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/credslayer/default.nix b/pkgs/tools/security/credslayer/default.nix index f43e216868ce8..67b0844f36147 100644 --- a/pkgs/tools/security/credslayer/default.nix +++ b/pkgs/tools/security/credslayer/default.nix @@ -6,13 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "credslayer"; - version = "0.1.2"; + version = "0.1.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "ShellCode33"; repo = "CredSLayer"; - rev = "v${version}"; - sha256 = "1rbfy0h9c2gra1r2b39kngj3m7g177nmzzs5xy9np8lxixrh17pc"; + rev = "refs/tags/v${version}"; + hash = "sha256-gryV9MHULY6ZHy6YDFQDIkZsfIX8La0tHT0vrrQJNDQ="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -24,7 +25,9 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests/tests.py" ]; + pytestFlagsArray = [ + "tests/tests.py" + ]; disabledTests = [ # Requires a telnet setup @@ -36,7 +39,9 @@ python3.pkgs.buildPythonApplication rec { "test_ntlmssp" ]; - pythonImportsCheck = [ "credslayer" ]; + pythonImportsCheck = [ + "credslayer" + ]; postInstall = '' wrapProgram $out/bin/credslayer \ @@ -48,8 +53,5 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/ShellCode33/CredSLayer"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; - # Upstream issue https://github.com/ShellCode33/CredSLayer/issues/16 - # This package works only with pyshark < 0.5 - broken = true; }; } diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 12b21d28034a3..f4624b87e80ab 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "grype"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WTDUkC+TFVkT/D36hDusqxwidy6O+iMInBpTumdCaw4="; + sha256 = "sha256-RZBO8TpFwRwr1CkGSX06jtAtLiNVHhe+8AJsHwNyPMY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -26,7 +26,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-bpWUo6YA0TkIyDg27mv88X1fh+1Wal362Sqi7loo/Zs="; + vendorSha256 = "sha256-K6MJp07JEit/6AHqLtnzXIaVCi7W6jfX41M96VwnS5A="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/tools/security/kestrel/default.nix new file mode 100644 index 0000000000000..16f3a4f52a4e1 --- /dev/null +++ b/pkgs/tools/security/kestrel/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "kestrel"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "finfet"; + repo = pname; + rev = "v${version}"; + hash = "sha256-aJKqx/PY7BanzE5AtqmKxvkULgXXqueGnDniLd9tHOg="; + }; + + cargoHash = "sha256-UnXaDdQzoYP1N2FnLjOQgiJKnCyCojXKKxVlWYZT0DE="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installManPage docs/man/kestrel.1 + installShellCompletion --bash --name ${pname} completion/kestrel.bash-completion + ''; + + meta = with lib; { + description = "File encryption done right"; + longDescription = " + Kestrel is a data-at-rest file encryption program + that lets you encrypt files to anyone with a public key. + "; + homepage = "https://getkestrel.com"; + license = licenses.bsd3; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 12a872c643f38..eb55297f643b7 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.12"; + version = "1.9.12p1"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-3hVzOIgXDFaDTar9NL+YPbEPshA5dC/Pw5a9MhaNY2I="; + hash = "sha256-R1oYqOs9qLKRfOqwY6a69R6gkSjDxH4+DjOrdJe6t9g="; }; prePatch = '' diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index e3016eacf7141..2740368669b8a 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-c2MIX4uDbHuiuZr12SkUV6jLsx2PS3Q+NngacT7AQO0="; + sha256 = "sha256-qUCJFlnh4NIV0GH+yuOahC3arRWwPoPjVo3h881OtUY="; }; - vendorSha256 = "sha256-BPIUIy1xEUzbh1ESldiOhDpYp4EdfUi/QkBNqk3U1UY="; + vendorSha256 = "sha256-2JlnSdwXaYG2e1A67c2tt5zg5ZN37m/Wsp6WUpOtR1o="; subPackages = [ "." ]; @@ -44,7 +44,6 @@ buildGoModule rec { homepage = "https://www.vaultproject.io/"; description = "A tool for managing secrets"; changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; - platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri Chili-Man techknowlogick ]; }; diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 78b7f32a61df1..8a349ac9e28c0 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -2,15 +2,16 @@ buildGoModule rec { pname = "witness"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "testifysec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/v6dltF4oCIOtN6Fcpf+VvT+c3vTB1q/IgGUqZzbcVk="; + sha256 = "sha256-MH4ByPoHZHIq2b/QGA/fFa3P1a28BbkaX/p48pwnl1Q="; }; - vendorSha256 = "sha256-UP68YNLX+fuCvd+e3rER1icha9bS3MemJLwJOMMOVfg="; + proxyVendor = true; + vendorSha256 = "sha256-CUiex+ljzpbkqbXCmOjO62YTcgqOIE9Cg3JB6CWUbsk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix index 8b461fa7f3c61..830809593633e 100644 --- a/pkgs/tools/system/natscli/default.nix +++ b/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.34"; + version = "0.0.35"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tDs0OrMeWLhBUnngJRBmAauwMA/zdMC4ED7xcCED4Zs="; + sha256 = "sha256-Sro0EwHP1pszuOYP6abZO5XjJvbXrDDeSAbzPA2p00M="; }; - vendorSha256 = "sha256-Wv0V1/BbO8cP9Qj1TBCDpPTpbv3xzT8eCLPBhCPxRKo="; + vendorSha256 = "sha256-HSKBUw9ZO150hLXyGX66U9XpLX2yowxYVdcdDVdqrAc="; meta = with lib; { description = "NATS Command Line Interface"; diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index cf74ace516e8e..222c3ddf93659 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = "v${version}"; - hash = "sha256-1w132lpkn0m2ZoMyFKFGjwn9Gd3UDksEKr5vq8l4ANQ="; + hash = "sha256-22JmV4cFfUTwiweQP0Em2VbqmTUui2yWnbhKagprQ4Q="; }; - cargoHash = "sha256-OKE8RcCE4pIRtQDW7KNzUVrNpyZzWg6QHchJg0XWmYQ="; + cargoHash = "sha256-tztzmfWOtqFGWERMWgBSAqvT+hKfhBWL9KW4awixXk0="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index 3d02278ddc560..c09d6381bec45 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.5.6"; + version = "2.5.7"; src = fetchzip { url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "sha256-oAakldNmSWMAgbHRZm9jY9QRFdQamrAsDyD0havivr0="; + sha256 = "sha256-LUbzS2XYSsSPyJmyvitS5or0S4o9SB2ycMkuAWyVB8w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/tools/typesetting/biblatex-check/default.nix index c929d59015027..d3d3be0f430fd 100644 --- a/pkgs/tools/typesetting/biblatex-check/default.nix +++ b/pkgs/tools/typesetting/biblatex-check/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "biblatex-check"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Pezmc"; repo = "BibLatex-Check"; rev = "v${version}"; - sha256 = "sha256-Pe6Ume7vH8WJG2EqOw31g3VYilfFsDBmNHtHcUXxqf0="; + sha256 = "sha256-8oHX56+kRWWl8t22DqLAFinjPngRMo3vXxXuVXBwutM="; }; buildInputs = [ python3 ]; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 6a2d0fcdda70d..5e438d8872117 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -14,14 +14,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "22.3.3"; + version = "22.3.4"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; - rev = version; - hash = "sha256-9vdFPSmkkdJDlVfA9DgqczRoOBMmSMezdl3D/0OSbsQ="; + rev = "refs/tags/${version}"; + hash = "sha256-agffkTEaURjw/Ro8znYRQLKhDP2Ey0LimuzqbW5xb28="; }; patches = [ ./0001-add-nixos-support.patch ]; diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index 0f42441b7cd05..f007057222f7a 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "guest-agent"; - version = "20221025.00"; + version = "20221104.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-LbpSRQgxAfgaO7UPJD5j/wrMjR383qjD5SD1cVTzWLs="; + sha256 = "sha256-JvI0tj6/+iCu+Q5XB3QOrrfBl6n2/bB6pj9lUDZL8DE="; }; vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI="; diff --git a/pkgs/tools/wayland/swayimg/default.nix b/pkgs/tools/wayland/swayimg/default.nix new file mode 100644 index 0000000000000..24f44fa8d3361 --- /dev/null +++ b/pkgs/tools/wayland/swayimg/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +, wayland-protocols +, json_c +, libxkbcommon +, fontconfig +, giflib +, libheif +, libjpeg +, libwebp +, libtiff +, librsvg +, libpng +, libjxl +, libexif +, bash-completion +}: +stdenv.mkDerivation rec { + pname = "swayimg"; + version = "1.9"; + + src = fetchFromGitHub { + owner = "artemsen"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-864riSvWhWV4X84UeZ+xfQBOAQmwMrX6s90TXMGeruY="; + }; + + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ meson ninja pkg-config ]; + + buildInputs = [ + bash-completion + wayland + wayland-protocols + json_c + libxkbcommon + fontconfig + giflib + libheif + libjpeg + libwebp + libtiff + librsvg + libpng + libjxl + libexif + ]; + + meta = with lib; { + homepage = "https://github.com/artemsen/swayimg"; + description = "Image viewer for Sway/Wayland"; + changelog = "https://github.com/artemsen/swayimg/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aefaf5752953d..5813052acd694 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -173,6 +173,8 @@ mapAliases ({ cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; + cassandra_2_1 = throw "cassandra_2_1 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 + cassandra_2_2 = throw "cassandra_2_2 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29 catfish = xfce.catfish; # Added 2019-12-22 ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # Added 2021-03-25 cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12 @@ -1067,6 +1069,8 @@ mapAliases ({ pdfstudio = throw "'pdfstudio' has been replaced with 'pdfstudio<year>', where '<year>' is the year from the PDF Studio version number, because each license is specific to a given year"; # Added 2022-09-04 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 + percona-server = percona-server56; # Added 2022-11-01 + percona-server56 = throw "'percona-server56' has been dropped due to lack of maintenance, no upstream support and security issues"; # Added 2022-11-01 perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 pgadmin = pgadmin4; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e5ed41963f27..9456fdfe6487c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -456,6 +456,8 @@ with pkgs; dhallToNix = callPackage ../build-support/dhall/to-nix.nix { }; + dinghy = with python3Packages; toPythonApplication dinghy; + deadcode = callPackage ../development/tools/deadcode { }; deadnix = callPackage ../development/tools/deadnix { }; @@ -1431,6 +1433,8 @@ with pkgs; ttchat = callPackage ../tools/misc/ttchat { }; + unflac = callPackage ../tools/audio/unflac { }; + veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { @@ -3523,6 +3527,8 @@ with pkgs; swaysome = callPackage ../tools/wayland/swaysome { }; + swayimg = callPackage ../tools/wayland/swayimg { }; + swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; wayland-utils = callPackage ../tools/wayland/wayland-utils { }; @@ -4859,7 +4865,9 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; - srvc = callPackage ../applications/version-management/srvc { }; + srvc = callPackage ../applications/version-management/srvc { + inherit (darwin.apple_sdk.frameworks) Security; + }; ssmsh = callPackage ../tools/admin/ssmsh { }; @@ -7189,6 +7197,8 @@ with pkgs; gitlabEnterprise = true; }; + gitlab-clippy = callPackage ../development/tools/rust/gitlab-clippy { }; + gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; @@ -7199,6 +7209,8 @@ with pkgs; gitleaks = callPackage ../tools/security/gitleaks { }; + gitnuro = callPackage ../applications/version-management/git-and-tools/gitnuro { }; + gitsign = callPackage ../tools/security/gitsign { }; gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; @@ -7311,7 +7323,9 @@ with pkgs; gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; - gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; + gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; gnuplot_qt = gnuplot.override { withQt = true; }; @@ -8297,6 +8311,8 @@ with pkgs; keepalived = callPackage ../tools/networking/keepalived { }; + kestrel = callPackage ../tools/security/kestrel { }; + kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; @@ -8825,6 +8841,8 @@ with pkgs; lemmeknow = callPackage ../tools/misc/lemmeknow { }; + lemmy-help = callPackage ../tools/misc/lemmy-help { }; + lethe = callPackage ../tools/security/lethe { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14859,6 +14877,8 @@ with pkgs; rocminfo = callPackage ../development/tools/rocminfo { }; + rocmlir = callPackage ../development/libraries/rocmlir { }; + rtags = callPackage ../development/tools/rtags { inherit (darwin) apple_sdk; }; @@ -14934,8 +14954,10 @@ with pkgs; }; cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { }; cargo-graph = callPackage ../development/tools/rust/cargo-graph { }; + cargo-guppy = callPackage ../development/tools/rust/cargo-guppy { }; cargo-hack = callPackage ../development/tools/rust/cargo-hack { }; cargo-license = callPackage ../development/tools/rust/cargo-license { }; + cargo-llvm-cov = callPackage ../development/tools/rust/cargo-llvm-cov { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { @@ -15197,6 +15219,8 @@ with pkgs; spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; + spirv-llvm-translator_14 = callPackage ../development/compilers/spirv-llvm-translator { llvm = llvm_14; }; + sqldeveloper = callPackage ../development/tools/database/sqldeveloper { jdk = oraclejdk; }; @@ -21575,7 +21599,9 @@ with pkgs; boringssl = callPackage ../development/libraries/boringssl { }; - wolfssl = callPackage ../development/libraries/wolfssl { }; + wolfssl = callPackage ../development/libraries/wolfssl { + inherit (darwin.apple_sdk.frameworks) Security; + }; openssl = openssl_3; @@ -22964,6 +22990,7 @@ with pkgs; yubihsm-connector = callPackage ../tools/security/yubihsm-connector { }; + yubikey-manager4 = callPackage ../tools/misc/yubikey-manager/4.nix { }; yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; @@ -23338,12 +23365,6 @@ with pkgs; cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -23549,9 +23570,7 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent { - buildGoModule = buildGo118Module; # tests fail with 1.19 - }; + grafana-agent = callPackage ../servers/monitoring/grafana-agent {}; grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; @@ -24052,12 +24071,6 @@ with pkgs; nginx-sso = callPackage ../servers/nginx-sso { }; - percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { - stdenv = gcc10StdenvCompat; - openssl = openssl_1_1; - }; - percona-server = percona-server56; - immudb = callPackage ../servers/nosql/immudb { }; influxdb = callPackage ../servers/nosql/influxdb { }; @@ -25670,7 +25683,6 @@ with pkgs; swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { }; sysdig = callPackage ../os-specific/linux/sysdig { - openssl = openssl_1_1; kernel = null; }; # sysdig is a client, for a driver look at linuxPackagesFor @@ -27502,6 +27514,8 @@ with pkgs; inherit (gnome2) libglade; }; + calcmysky = libsForQt5.callPackage ../applications/science/astronomy/calcmysky { }; + calcurse = callPackage ../applications/misc/calcurse { }; calculix = callPackage ../applications/science/math/calculix {}; @@ -28948,6 +28962,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox; }; + goodvibes = callPackage ../applications/audio/goodvibes { }; + googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; @@ -31795,10 +31811,14 @@ with pkgs; synology-drive-client = callPackage ../applications/networking/synology-drive-client { }; + synology-cloud-sync-decryption-tool = callPackage ../applications/networking/synology-cloud-sync-decryption-tool { }; + maestral = with python3Packages; toPythonApplication maestral; maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; + maestro = callPackage ../development/mobile/maestro { }; + myfitnesspal = with python3Packages; toPythonApplication myfitnesspal; insync = callPackage ../applications/networking/insync { }; @@ -35255,6 +35275,8 @@ with pkgs; seqtk = callPackage ../applications/science/biology/seqtk { }; + seqkit = callPackage ../applications/science/biology/seqkit { }; + snpeff = callPackage ../applications/science/biology/snpeff { }; somafm-cli = callPackage ../tools/misc/somafm-cli { }; @@ -35842,6 +35864,10 @@ with pkgs; symfpu = callPackage ../applications/science/logic/symfpu {}; + uhdm = callPackage ../applications/science/logic/uhdm {}; + + surelog = callPackage ../applications/science/logic/surelog {}; + mcy = callPackage ../applications/science/logic/mcy {}; lingeling = callPackage ../applications/science/logic/lingeling {}; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 70d57672a0f56..c57e486406e1f 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -28,15 +28,15 @@ let "1.2.2.5" = { hash = "sha256-lU7iK4DWuC/U3s1Ct/rq2Gr3w4F2U7RYYgpmF05bibY="; }; - "1.3.1.3" = { - hash = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8="; + "1.5.0.3" = { + hash = "sha256-T96+lPC6OTOkIs/z3QWg73oYVSyidN0SVkBWmT9VRx0="; }; }; inherit (final) cudaMajorMinorVersion cudaMajorVersion; cutensor = buildCuTensorPackage rec { - version = if cudaMajorMinorVersion == "10.1" then "1.2.2.5" else "1.3.1.3"; + version = if cudaMajorMinorVersion == "10.1" then "1.2.2.5" else "1.5.0.3"; inherit (cuTensorVersions.${version}) hash; # This can go into generic.nix libPath = "lib/${if cudaMajorVersion == "10" then cudaMajorMinorVersion else cudaMajorVersion}"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 809858799658c..efd71e23ce746 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -442,9 +442,7 @@ in { rr-zen_workaround = callPackage ../development/tools/analysis/rr/zen_workaround.nix { }; - sysdig = callPackage ../os-specific/linux/sysdig { - openssl = pkgs.openssl_1_1; - }; + sysdig = callPackage ../os-specific/linux/sysdig {}; systemtap = callPackage ../development/tools/profiling/systemtap { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 77088aa1bef25..8a33d02ba1a37 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -41,6 +41,7 @@ mapAliases ({ Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 + bsblan = python-bsblan; # added 2022-11-04 bt_proximity = bt-proximity; # added 2021-07-02 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5248321ec871f..ae46e21fd2e1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -238,6 +238,8 @@ self: super: with self; { aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; + aiolifx-themes = callPackage ../development/python-modules/aiolifx-themes { }; + aiolimiter = callPackage ../development/python-modules/aiolimiter { }; aiolip = callPackage ../development/python-modules/aiolip { }; @@ -1394,8 +1396,6 @@ self: super: with self; { bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; - bsblan = callPackage ../development/python-modules/bsblan { }; - bson = callPackage ../development/python-modules/bson { }; bsuite = callPackage ../development/python-modules/bsuite { }; @@ -2287,6 +2287,8 @@ self: super: with self; { dependency-injector = callPackage ../development/python-modules/dependency-injector { }; + deploykit = callPackage ../development/python-modules/deploykit { }; + deprecated = callPackage ../development/python-modules/deprecated { }; deprecation = callPackage ../development/python-modules/deprecation { }; @@ -2909,6 +2911,8 @@ self: super: with self; { enamlx = callPackage ../development/python-modules/enamlx { }; + energyflip-client = callPackage ../development/python-modules/energyflip-client { }; + energyflow = callPackage ../development/python-modules/energyflow { }; enhancements = callPackage ../development/python-modules/enhancements { }; @@ -4367,6 +4371,8 @@ self: super: with self; { ibm-watson = callPackage ../development/python-modules/ibm-watson { }; + ical = callPackage ../development/python-modules/ical { }; + icalendar = callPackage ../development/python-modules/icalendar { }; icecream = callPackage ../development/python-modules/icecream { }; @@ -5053,6 +5059,8 @@ self: super: with self; { lc7001 = callPackage ../development/python-modules/lc7001 { }; + lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { }; + ldap3 = callPackage ../development/python-modules/ldap3 { }; ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; @@ -5425,6 +5433,8 @@ self: super: with self; { mac_alias = callPackage ../development/python-modules/mac_alias { }; + mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { }; + macfsevents = callPackage ../development/python-modules/macfsevents { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; @@ -6480,6 +6490,8 @@ self: super: with self; { opuslib = callPackage ../development/python-modules/opuslib { }; + oralb-ble = callPackage ../development/python-modules/oralb-ble { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; @@ -6965,6 +6977,8 @@ self: super: with self; { pykrakenapi = callPackage ../development/python-modules/pykrakenapi { }; + pylddwrap = callPackage ../development/python-modules/pylddwrap { }; + pynndescent = callPackage ../development/python-modules/pynndescent { }; pynobo = callPackage ../development/python-modules/pynobo { }; @@ -8570,6 +8584,8 @@ self: super: with self; { pysnooper = callPackage ../development/python-modules/pysnooper { }; + pysnooz = callPackage ../development/python-modules/pysnooz { }; + pysnow = callPackage ../development/python-modules/pysnow { }; pysocks = callPackage ../development/python-modules/pysocks { }; @@ -8743,6 +8759,8 @@ self: super: with self; { pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; + pytest-golden = callPackage ../development/python-modules/pytest-golden { }; + pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; pytest-html = callPackage ../development/python-modules/pytest-html { }; @@ -10954,6 +10972,8 @@ self: super: with self; { textual = callPackage ../development/python-modules/textual { }; + testbook = callPackage ../development/python-modules/testbook { }; + testing-common-database = callPackage ../development/python-modules/testing-common-database { }; testing-postgresql = callPackage ../development/python-modules/testing-postgresql { }; @@ -12148,6 +12168,8 @@ self: super: with self; { zake = callPackage ../development/python-modules/zake { }; + zamg = callPackage ../development/python-modules/zamg { }; + zarr = callPackage ../development/python-modules/zarr { }; zc-buildout = callPackage ../development/python-modules/buildout { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 6d66eda3c3562..116ad216e025a 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -174,11 +174,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; - # Until macOS SDK allows for Qt 5.15, darwin is limited to 2.3.2 - qca-qt5_2_3_2 = callPackage ../development/libraries/qca-qt5/2.3.2.nix { - openssl = pkgs.openssl_1_1; - }; - qcoro = callPackage ../development/libraries/qcoro { }; qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { }; @@ -225,6 +220,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qwt6_1 = callPackage ../development/libraries/qwt/6_1.nix { }; + qxlsx = callPackage ../development/libraries/qxlsx { }; + soqt = callPackage ../development/libraries/soqt { }; telepathy = callPackage ../development/libraries/telepathy/qt { }; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index d50b979fdcec0..c133e1472ebc0 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -12,8 +12,7 @@ rec { fontconfigSupport = stdenv.isLinux; alsaSupport = stdenv.isLinux; openglSupport = true; - # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK. - vulkanSupport = stdenv.isLinux; + vulkanSupport = true; tlsSupport = true; cupsSupport = true; dbusSupport = stdenv.isLinux; @@ -41,7 +40,6 @@ rec { gphoto2Support = true; krb5Support = true; ldapSupport = true; - # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK. vkd3dSupport = stdenv.isLinux; embedInstallers = true; }; |