diff options
Diffstat (limited to 'pkgs/applications')
214 files changed, 1704 insertions, 1659 deletions
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 44b54111fd36..376e8e418cce 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -58,14 +58,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "7.1"; + version = "7.3"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-eLF9n71tjdPA+ks0B8UonmPZqRgcZEA7ok79+m9PioU="; + hash = "sha256-fDZGmKQ6qgENkq8NY/J67Jym+IXoOYs8DT4xyPXLcC4="; }; bundledContent = fetchzip { diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix index 4662002c95e8..5a3d9949f8c5 100644 --- a/pkgs/applications/audio/blanket/default.nix +++ b/pkgs/applications/audio/blanket/default.nix @@ -31,13 +31,13 @@ python3Packages.buildPythonApplication rec { pkg-config wrapGAppsHook4 desktop-file-utils + gobject-introspection ]; buildInputs = [ glib gtk4 libadwaita - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -48,9 +48,6 @@ python3Packages.buildPythonApplication rec { pygobject3 ]; - # Broken with gobject-introspection setup hook - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; format = "other"; postPatch = '' diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 6d37e33b5eee..a3f859ca0ea4 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -20,7 +20,7 @@ , cddbSupport ? true, libcddb ? null , cdioSupport ? true, libcdio ? null, libcdio-paranoia ? null , cueSupport ? true, libcue ? null -, discidSupport ? (!stdenv.isDarwin), libdiscid ? null +, discidSupport ? false, libdiscid ? null , ffmpegSupport ? true, ffmpeg ? null , flacSupport ? true, flac ? null , madSupport ? true, libmad ? null diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index 6398141c86dd..8f7461683be1 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -24,11 +24,6 @@ python3Packages.buildPythonApplication rec { pname = "cozy"; version = "1.2.1"; - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/57029 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - src = fetchFromGitHub { owner = "geigi"; repo = pname; diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 100796e26cee..62c5962b5399 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -107,6 +107,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index a6164189c1db..d79aa713f086 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -27,17 +27,12 @@ python3Packages.buildPythonApplication rec { intltool wrapGAppsHook glibcLocales + gobject-introspection ]; - # as of 2021-07, the gobject-introspection setup hook does not - # work with `strictDeps` enabled, thus for proper `wrapGAppsHook` - # it needs to be disabled explicitly. https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - buildInputs = [ python3 gtk3 - gobject-introspection gnome.adwaita-icon-theme ]; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index f40fb1413264..98ecd3064a92 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.11.21"; + version = "3.11.22"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-nItqx3g4W3s1phHe6F8EtOL4nwJQ0XnKB8Ujg71/Q3Q="; + sha256 = "sha256-mmPFASc2ARI1ht9SYhFsDjTkWfhxXdc2zEi5rvfanZc="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = "https://www.ocenaudio.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ onny ]; }; } diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 71fc1f103b9b..4100d166a25e 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-tfWimJ9eEFBUxPRVNjgbu8tQNokPbXOxOXO64mFuMfM="; + hash = "sha256-P3aTGt/T59JE2oy8uRhD8h2NXX/ZXno6qY0frpcir7A="; }; # Remove some Electron stuff from package.json diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 384718f1db54..5358750b13e2 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication { notify2 pyroute2 pygobject3 - PyChromecast + pychromecast lxml setuptools zeroconf diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/applications/audio/pulseeffects-legacy/default.nix index 53d2a998fbe2..7d255b7a71e2 100644 --- a/pkgs/applications/audio/pulseeffects-legacy/default.nix +++ b/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -110,6 +110,5 @@ in stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 1d638c01f205..3196d492fb50 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -80,6 +80,9 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; + # 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + nativeCheckInputs = [ gtest ]; doCheck = !stdenv.isAarch64; # single failure that I can't explain diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 86f5cf83ad40..b88fd55e51ac 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "23.0"; + version = "23.1"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-WnQtXr1IcOpNJBrSvLf2rNu2XPs8JU01LWsQSzvvivA="; + sha256 = "sha256-zNXA/HFUCTxKzeKde/XVK239dInnxkPBmxXrlicl1fI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 9eae394488e2..78c17d09e0de 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -39,10 +39,6 @@ in buildPythonApplication rec { setuptools ]; - # Otherwise the setup hook for gobject-introspection is not run: - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - postPatch = '' # Remove "Local MPD" tab which is not suitable for NixOS. sed -i '/localmpd/d' sonata/consts.py diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index d469c9689a5d..39de4728f3da 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -70,15 +70,11 @@ python3Packages.buildPythonApplication rec { requests semver ] - ++ lib.optional chromecastSupport PyChromecast + ++ lib.optional chromecastSupport pychromecast ++ lib.optional keyringSupport keyring ++ lib.optional serverSupport bottle ; - # hook for gobject-introspection doesn't like strictDeps - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeCheckInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix index 9b6f4efe1661..cde74ae96ca0 100644 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ b/pkgs/applications/audio/tap-plugins/default.nix @@ -1,32 +1,41 @@ -{ lib, stdenv, ladspa-sdk, pkgs, ... }: +{ lib +, stdenv +, fetchFromGitHub +, ladspa-sdk +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "tap-plugins"; - version = "1.0.1"; + version = "unstable-2020-12-09"; - src = pkgs.fetchFromGitHub { - owner = "tomszilagyi"; - repo = pname; - rev = "v${version}"; - sha256 = "0c6qhyf8smlypc36vmpr42dm3mrzk6pg9cc9r0vx22qbrd5zfpjw"; + src = fetchFromGitHub { + owner = "tomscii"; + repo = "tap-plugins"; + rev = "5d882799f37dffe37fc73451f2c5b4fb24316f3b"; + hash = "sha256-bwybMxIAbOzPr43QGshjbnRK5GdziGiYDsTutZdSj4s="; }; - buildInputs = [ ladspa-sdk ]; + buildInputs = [ + ladspa-sdk + ]; - preInstall = '' + postPatch = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - meta = with lib; { + meta = { + homepage = "https://tomscii.sig7.se/tap-plugins/"; description = "Tom's Audio Processing plugins"; longDescription = '' - A number of LADSPA plugins including: TAP AutoPanner, TAP Chorus/Flanger, TAP DeEsser, - TAP Dynamics (Mono & Stereo), TAP Equalizer and TAP Equalizer/BW, TAP Fractal Doubler, TAP Pink/Fractal Noise, - TAP Pitch Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling Limiter, - TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP TubeWarmth, TAP Vibrato. + A number of LADSPA plugins including: TAP AutoPanner, TAP Chorus/Flanger, + TAP DeEsser, TAP Dynamics (Mono & Stereo), TAP Equalizer and TAP + Equalizer/BW, TAP Fractal Doubler, TAP Pink/Fractal Noise, TAP Pitch + Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling + Limiter, TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP + TubeWarmth, TAP Vibrato. ''; - homepage = "https://tap-plugins.sourceforge.net/ladspa.html"; - license = licenses.gpl3; - maintainers = [ maintainers.fps ]; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index db7851d9e154..984938a7b4e2 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { plexapi pulsectl pycairo - PyChromecast + pychromecast pylast pygobject3 pylyrics diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index dff52d125704..2e755dab5048 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.1.6.150"; + version = "1.1.9.163"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-sYkAFyXnmzgSzo68OF0oiv8tUvY+g1WCcY783OZO+RM="; - armv7l-linux = "sha256-GWpYW1262plxIzPVzBEh4Z3fQIhSmy0N9xAgwnjXrQE="; - x86_64-linux = "sha256-LUWlLEsTUqVoWAkjXC/zOziPqO85H8iIlwJU7eqLRcY="; + aarch64-linux = "sha256-LhF0pgMRbEXeLt5g56VBNuCssaTjsczx/+C76ckmGZo="; + armv7l-linux = "sha256-T4AzXIbhO6fNN8xDFwz6M2lSH6hLgNjVyDsSt8m+Mr4="; + x86_64-linux = "sha256-LJ36kHx8PPzfLpJMx1ANSmifS84saCQ8pF0quhgzdt0="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/audio/touchosc/update.sh b/pkgs/applications/audio/touchosc/update.sh index f656a1df72d4..dc3e2f088878 100755 --- a/pkgs/applications/audio/touchosc/update.sh +++ b/pkgs/applications/audio/touchosc/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix curl libxml2 jq common-updater-scripts +#!nix-shell -i bash -p nix curl libxml2 jq set -euo pipefail @@ -8,6 +8,20 @@ nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixp attr="${UPDATE_NIX_ATTR_PATH:-touchosc}" version="$(curl -sSL https://hexler.net/touchosc/appcast/linux | xmllint --xpath '/rss/channel/item/enclosure/@*[local-name()="version"]' - | cut -d= -f2- | tr -d '"' | head -n1)" +narhash() { + nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash +} + +nixeval() { + if [ "$#" -ge 2 ]; then + systemargs=(--argstr system "$2") + else + systemargs=() + fi + + nix --extra-experimental-features nix-command eval --json --impure "${systemargs[@]}" -f "$nixpkgs" "$1" | jq -r . +} + findpath() { path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" @@ -19,15 +33,22 @@ findpath() { echo "$path" } +oldversion="${UPDATE_NIX_OLD_VERSION:-$(nixeval "$attr".version)}" + pkgpath="$(findpath "$attr")" -sed -i -e "/version\s*=/ s|\"$UPDATE_NIX_OLD_VERSION\"|\"$version\"|" "$pkgpath" +if [ "$version" = "$oldversion" ]; then + echo 'update.sh: New version same as old version, nothing to do.' + exit 0 +fi + +sed -i -e "/version\s*=/ s|\"$oldversion\"|\"$version\"|" "$pkgpath" for system in aarch64-linux armv7l-linux x86_64-linux; do - url="$(nix --extra-experimental-features nix-command eval --json --impure --argstr system "$system" -f "$nixpkgs" "$attr".src.url | jq -r .)" + url="$(nixeval "$attr".src.url "$system")" - curhash="$(nix --extra-experimental-features nix-command eval --json --impure --argstr system "$system" -f "$nixpkgs" "$attr".src.outputHash | jq -r .)" - newhash="$(nix --extra-experimental-features nix-command store prefetch-file --json "$url" | jq -r .hash)" + curhash="$(nixeval "$attr".src.outputHash "$system")" + newhash="$(narhash "$url")" sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" done diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 700a65f3a58d..56f8c039c6ec 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -18,15 +18,15 @@ , zlib }: let - py3 = python3.withPackages (p: [ p.Mako ]); + py3 = python3.withPackages (p: [ p.mako ]); in stdenv.mkDerivation rec { pname = "clightning"; - version = "23.02"; + version = "23.02.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256-uvk7sApIwlrkH8eERBetf/nsAkN2d35T/IEtICFflzY="; + sha256 = "sha256-fHGBwf79Q0DSLs/b+Lhg9kdIQzDn5rJYEB9yLkLbxlE="; }; # when building on darwin we need dawin.cctools to provide the correct libtool diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index f79d72792317..dc7e0ff2f8ec 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -66,6 +66,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mkg20001 ]; license = licenses.gpl2; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 441b224ef022..60edd1871bca 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31, gtk3 +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3 , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; - buildInputs = [ wxGTK31 gtk3 ] + buildInputs = [ wxGTK32 gtk3 ] ++ lib.optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ @@ -48,10 +48,73 @@ stdenv.mkDerivation rec { sha256 = "sha256-RRjwZA37RllnG8cJdBEnASpEd8z0+ru96fjntO42OvU="; }) (fetchpatch { + name = "fix-taskbar-icons.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/40eb88e3f2b933f19f9933e06c8d0899c54f5e25.patch"; + hash = "sha256-Gj5gtxX5QNYAeF+QrPS/bBHLLEmflSxUHSLUK3GSs0I="; + }) + (fetchpatch { + name = "fix-warnings.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/56ac0396fad7a5b4bbb40bb8c4b5fe1755078aef.patch"; + excludes = [ "src/src/environmentsettingsdlg.h" ]; + hash = "sha256-tl4rF9iAf1TzCIbKhVFqcxvr1IiPdwqLYZg0SY5BJ7I="; + }) + (fetchpatch { name = "fix-getstring.patch"; url = "https://github.com/arnholm/codeblocks_sfmirror/commit/dbdf5c5ea9e3161233f0588a7616b7e4fedc7870.patch"; sha256 = "sha256-DrEMFluN8vs0LERa7ULGshl7HdejpsuvXAMjIr/K1fQ="; }) + # Fix build with wxGTK 3.1.6 + (fetchpatch { + name = "remove-code-for-old-wx-1.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/8035dfdff321754819f79e3165401aa59bd8c7f7.patch"; + hash = "sha256-Z8Ap03W/XH5VwKFVudJr7rugb0BgI2dKJgQS4yIWbEM="; + }) + (fetchpatch { + name = "remove-code-for-old-wx-2.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/9a9c6a9d5e3e0f6eff5594ecd61a2222f073be9c.patch"; + hash = "sha256-SwYixvbRuXQ+jA1ijmClWkzqzzr0viVuFOAsihGc5dM="; + }) + (fetchpatch { + name = "remove-code-for-old-wx-3.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/c28746f4887f10e6f9f10eeafae0fb22ecdbf9c7.patch"; + hash = "sha256-1lcIiCnY2nBuUsffXC2rdglOE3ccIbogcgTx4M2Ee2I="; + }) + (fetchpatch { + name = "fix-notebookstyles.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/29315df024251850832583f73e67e515dae10830.patch"; + hash = "sha256-Uc1V0eEbNljnN+1Dqb/35MLSSoLjyuRZMTofgcXRyb8="; + }) + (fetchpatch { + name = "fix-regex.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/46720043319758cb0e798eb23520063583c40eaa.patch"; + hash = "sha256-Aix58T0JJcX/7VZukU/9i/nXh9GJywXC3yXEyUZK0js="; + }) + (fetchpatch { + name = "fix-build-with-clang.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/92cb2239662952e3b59b31e03edd653bb8066e64.patch"; + hash = "sha256-XI7JW9Nuueb7muKpaC2icM/CxhrCJtO48cLHK+BVWXI="; + }) + (fetchpatch { + name = "fix-normalize.patch"; + url = "https://github.com/archlinux/svntogit-community/raw/458eacb60bc0e71e3d333943cebbc41e75ed0956/trunk/sc_wxtypes-normalize.patch"; + hash = "sha256-7wEwDLwuNUWHUwHjFyq74sHiuEha1VexRLEX42rPZSs="; + }) + # Fix HiDPI + (fetchpatch { + name = "update-about-dialog.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/a4aacc92640b587ad049cd6aa68c637e536e9ab5.patch"; + hash = "sha256-2S4sVn+Dq5y9xcxCkzQ+WeR+qWxAOLbQUZEnk060RI0="; + }) + (fetchpatch { + name = "add-display-info.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/f2f127cf5cd97c7da6a957a3f7764cb25cc9017e.patch"; + hash = "sha256-C0dVfC0NIHMXfWNlOwjzoGz5tmG2dlnU/EE92Jjebbs="; + }) + (fetchpatch { + name = "fix-hidpi.patch"; + url = "https://github.com/arnholm/codeblocks_sfmirror/commit/b2e4f1279804e1d11b71bc75eeb37072c3589296.patch"; + hash = "sha256-/Xp6ww9C3V6I67tTA4MrGpSGo3J0MXzFjzQU7RxY84U="; + }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix index f45aadfa67b4..36576f7c1239 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix @@ -73,28 +73,28 @@ in { error = sourceArgs.error or args.error or null; hasSource = lib.hasAttr variant args; pname = builtins.replaceStrings [ "@" ] [ "at" ] ename; - broken = ! isNull error; + broken = error != null; in if hasSource then lib.nameValuePair ename ( self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { inherit pname ename commit; - version = if isNull version then "" else - lib.concatStringsSep "." (map toString + version = lib.optionalString (version != null) + (lib.concatStringsSep "." (map toString # Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413 # This filter method is still technically wrong, but it's computationally cheap enough and tapers over the issue - (builtins.filter (n: n >= 0) version)); + (builtins.filter (n: n >= 0) version))); # TODO: Broken should not result in src being null (hack to avoid eval errors) - src = if (isNull sha256 || broken) then null else + src = if (sha256 == null || broken) then null else lib.getAttr fetcher (fetcherGenerators args sourceArgs); - recipe = if isNull commit then null else + recipe = if commit == null then null else fetchurl { name = pname + "-recipe"; url = "https://raw.githubusercontent.com/melpa/melpa/${commit}/recipes/${ename}"; inherit sha256; }; - packageRequires = lib.optionals (! isNull deps) + packageRequires = lib.optionals (deps != null) (map (dep: pkgargs.${dep} or self.${dep} or null) deps); meta = (sourceArgs.meta or {}) // { diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 9b248df95b66..2eabf9b9d648 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.7.1"; + version = "6.7.2"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-4sD/gN9cbgZ9Z5Xiyx2velX5q6J6vOQAeRor10Zamyw="; + sha256 = "sha256-n9Ze02Dvoci3QS5slJNpb3CI3zlTq6FsdVbxvZHCJ2A="; }; dontBuild = true; diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 8a4e86ef6551..707a310b632a 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -157,6 +157,28 @@ rec { ''; }); + # check that the vim-doc hook correctly generates the tag + # for neovim packages from luaPackages + # we know for a fact gitsigns-nvim has a doc folder and comes from luaPackages + checkForTagsLuaPackages = vimPlugins.gitsigns-nvim.overrideAttrs(oldAttrs: { + doInstallCheck = true; + installCheckPhase = '' + [ -f $out/doc/tags ] + ''; + }); + + nvim_with_gitsigns_plugin = neovim.override { + extraName = "-with-gitsigns-plugin"; + configure.packages.plugins = { + start = [ + vimPlugins.gitsigns-nvim + ]; + }; + }; + checkHelpLuaPackages = runTest nvim_with_gitsigns_plugin '' + export HOME=$TMPDIR + ${nvim_with_gitsigns_plugin}/bin/nvim -i NONE -c 'help gitsigns' +quitall! -e + ''; # nixpkgs should detect that no wrapping is necessary nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index e27c80052f29..c4fd772d35a4 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.9"; + version = "0.26.10"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-FoVMTU6Ug4IZrjEVpCujhf2lyH3GyYZayQ03dPjQX/s="; + sha256 = "sha256-KKYU9+DDK0kXperKfgxuysqHsTGRq1NKtAT1Vps8M/o="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 2018e1d5e2af..abbfefce5293 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -30,10 +30,6 @@ buildPythonApplication rec { "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ]; - # Until gobject-introspection in nativeBuildInputs is supported. - # https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-472568643 - strictDeps = false; - meta = with lib; { homepage = "https://rednotebook.sourceforge.io/"; changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index 234d3a06901f..835188f44975 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.150.0", + "version": "3.150.7", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-x86_64.AppImage", - "hash": "sha512-qDjZ/WQdxXCoTA2PVRiSrIukO+N6gB9UdK7Fed5cvd+xFGteSmfPpP7R6wbvTkxkAe4gkH57taeWg+Tt1jW+nA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.7/standard-notes-3.150.7-linux-x86_64.AppImage", + "hash": "sha512-uJJloClRiyBneNrRjsRnq0AiSlJyZFrS97bdkDU89Oz0GCaVjQMnAz87gPu9H45qqjQyIogtOnd6Wpkw2/5WJA==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.0/standard-notes-3.150.0-linux-arm64.AppImage", - "hash": "sha512-KxK5Z3x611kp2TU5MTxwBfPirlPRbe8zSbF4mjMGDuzmTK3beqHhIGUh4Lud5opMyvUlbVxQf4SxslMxh7uvmw==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.7/standard-notes-3.150.7-linux-arm64.AppImage", + "hash": "sha512-rzMu2VsrQJmaQFSJjyMLcL2/jXvMAQgzrOw179fGOPBKP+LA6hQ7XYBXL/abb9ZwAz5NO/uV6QUS8HDciKtIZw==" } } } diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 03c6d19b80c4..47270dcce65d 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { - owner = "bjorn"; + owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-026OO7r8n1BUapUtKRHvqKdSZiClTQIiYfajiC2TAcQ="; + sha256 = "sha256-y79trmkRrkOOP6p9VMjo/11IE22J3YJtnerBsVP9134="; }; nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f62ab8e77cf7..3a320a5452a4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -753,8 +753,8 @@ let mktplcRef = { name = "vscode-eslint"; publisher = "dbaeumer"; - version = "2.2.6"; - sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ="; + version = "2.4.0"; + sha256 = "sha256-7MUQJkLPOF3oO0kpmfP3bWbS3aT7J0RF7f74LW55BQs="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; @@ -927,8 +927,12 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "2023.2.2804"; - sha256 = "sha256-3jQ0CpAGrPLQPpwZx2u3ylfOwy6cBu7WLr0w3h8IM2Y="; + # Stable versions are listed on the GitHub releases page and use a + # semver scheme, contrary to preview versions which are listed on + # the VSCode Marketplace and use a calver scheme. We should avoid + # using preview versions, because they expire after two weeks. + version = "13.3.2"; + sha256 = "sha256-4o4dmjio/I531szcoeGPVtfrNAyRAPJRrmsNny/PY2w="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix index f1ce06b7ca0f..3c20aa299b6e 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix @@ -2,20 +2,14 @@ # - <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix> # - <https://github.com/NixOS/nixpkgs/issues/41189> { lib, gccStdenv, vscode-utils -, jq, autoPatchelfHook, bash, makeWrapper -, dotnet-sdk_3, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, util-linux, zlib -, desktop-file-utils, xprop, xsel +, autoPatchelfHook, bash, makeWrapper +, curl, gcc, libsecret, libunwind, libX11, lttng-ust, util-linux +, desktop-file-utils, xsel }: let # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually libs = [ - # .NET Core - openssl - libkrb5 - zlib - icu - # Credential Storage libsecret @@ -36,91 +30,20 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.5043"; - sha256 = "OdFOFvidUV/trySHvF8iELPNVP2kq8+vZQ4q4Nf7SiQ="; + version = "1.0.5834"; + sha256 = "sha256-+KfivY8W1VtUxhdXuUKI5e1elo6Ert1Tsf4xVXsKB3Y="; }; -}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ - jq - autoPatchelfHook - makeWrapper - ]; +}).overrideAttrs({ buildInputs ? [], ... }: { buildInputs = buildInputs ++ libs; # Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates. # Rather than patching the calls to functions, we modify the functions to return what we want, # which is less likely to break in the future. postPatch = '' - sed -i \ - -e 's/updateExecutablePermissionsAsync() {/& return;/' \ - -e 's/isInstallCorrupt(traceSource, manifest) {/& return false;/' \ - out/prod/extension-prod.js - - declare ext_unique_id - ext_unique_id="$(basename "$out")" - - # Fix extension attempting to write to 'modifiedInternalSettings.json'. - # Move this write to the tmp directory indexed by the nix store basename. - substituteInPlace out/prod/extension-prod.js \ - --replace "path.resolve(constants_1.EXTENSION_ROOT_PATH, './modifiedInternalSettings.json')" \ - "path.join(os.tmpdir(), '$ext_unique_id-modifiedInternalSettings.json')" - - # Fix extension attempting to write to 'vsls-agent.lock'. - # Move this write to the tmp directory indexed by the nix store basename. - substituteInPlace out/prod/extension-prod.js \ - --replace "path + '.lock'" \ - "__webpack_require__('path').join(__webpack_require__('os').tmpdir(), '$ext_unique_id-vsls-agent.lock')" - - # Hardcode executable paths - echo '#!/bin/sh' >node_modules/@vsliveshare/vscode-launcher-linux/check-reqs.sh - substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/install.sh \ - --replace desktop-file-install ${desktop-file-utils}/bin/desktop-file-install - substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/uninstall.sh \ - --replace update-desktop-database ${desktop-file-utils}/bin/update-desktop-database - substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/vsls-launcher \ - --replace /bin/bash ${bash}/bin/bash - substituteInPlace out/prod/extension-prod.js \ - --replace xprop ${xprop}/bin/xprop \ + substituteInPlace extension.js \ --replace "'xsel'" "'${xsel}/bin/xsel'" ''; - postInstall = '' - cd $out/share/vscode/extensions/ms-vsliveshare.vsliveshare - - bash -s <<ENDSUBSHELL - shopt -s extglob - - # A workaround to prevent the journal filling up due to diagnostic logging. - # See: https://github.com/MicrosoftDocs/live-share/issues/1272 - # See: https://unix.stackexchange.com/questions/481799/how-to-prevent-a-process-from-writing-to-the-systemd-journal - gcc -fPIC -shared -ldl -o dotnet_modules/noop-syslog.so ${./noop-syslog.c} - - # Normally the copying of the right executables is done externally at a later time, - # but we want it done at installation time. - cp dotnet_modules/exes/linux-x64/* dotnet_modules - - # The required executables are already copied over, - # and the other runtimes won't be used and thus are just a waste of space. - rm -r dotnet_modules/exes dotnet_modules/runtimes/!(linux-x64|unix) - - # Not all executables and libraries are executable, so make sure that they are. - jq <package.json '.executables.linux[]' -r | xargs chmod +x - - # Lock the extension downloader. - touch install-linux.Lock externalDeps-linux.Lock - ENDSUBSHELL - ''; - - postFixup = '' - # We cannot use `wrapProgram`, because it will generate a relative path, - # which will break when copying over the files. - mv dotnet_modules/vsls-agent{,-wrapped} - makeWrapper $PWD/dotnet_modules/vsls-agent{-wrapped,} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" \ - --set LD_PRELOAD $PWD/dotnet_modules/noop-syslog.so \ - --set DOTNET_ROOT ${dotnet-sdk_3} - ''; - meta = with lib; { description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; homepage = "https://aka.ms/vsls-docs"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c deleted file mode 100644 index c76ec57a3820..000000000000 --- a/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c +++ /dev/null @@ -1 +0,0 @@ -void syslog(int priority, const char *format, ...) { } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 79417b42f99f..09ccf97d2f90 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 = "0dqwjc606z8qizg9hcfjlpq92hmaxh3a09368ffz7irl5sgwp300"; - x86_64-darwin = "00795gr9dmshz6sfgsp70fii6m76fqdmqskwkdwqwxddl0i07sw5"; - aarch64-linux = "04ckk6l9ym1igaqk1zfyy4zx05yryi641lc0i1l38k3mbv1k3gvw"; - aarch64-darwin = "16z96h8s9irgb17gy6ng3r6cbiwrxa7q7qazqamnmgvvahg08kvj"; - armv7l-linux = "042ihy4bg39y4m2djkqcx099w9710ikprbw3z7gh1gqvj3qyxy6i"; + x86_64-linux = "1h8iryrcn22i2vxh7srlfy1amdvkk6p7fk6wmsbylhb845zfq0s2"; + x86_64-darwin = "1q2nfm89m9lp9mf7q62l17z9gkmj0fpjmn905x7dw8xjlslkp9v8"; + aarch64-linux = "19y661ad95dmr9hhkmb8a2w17jj4c9ywlg49bi2r5l7birv4v6hy"; + aarch64-darwin = "18ycg1hj26zj68zni314wpbl3h8p7jw3lf2h791vjzbpgjznxnz4"; + armv7l-linux = "0hk67pik1z1s1nd2m0xc8zgfyn8i7v2z14j5bmc48k7spirrpz7r"; }.${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.76.1"; + version = "1.76.2"; 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 5944625f68a4..7d13de9c8960 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 = "0q3wp1n67f8w0j35saf4mlnsfd2481f9yl28428vycq32m10q96k"; - x86_64-darwin = "1820a01a97vvv1d2553czv1g2z7mg3f6l8i8168g63zvvnad0f1c"; - aarch64-linux = "03gzfp5n6z6dzinsnwpvmmlj0lqa53152a4mylaj1rg540jv2xh7"; - aarch64-darwin = "0mbwavi3palh353i19an94hr6xs0i5bxqcvkmr5qv3xvpwlaandl"; - armv7l-linux = "0wpnjd9fqlnv360q6061kmi1z699kd4q9igdczp8gwqyz2x4d3yz"; + x86_64-linux = "1cwxb6713hlgbrp4yhaky18r05ykb2ljxkldpj3hlgiz8x9l3n8r"; + x86_64-darwin = "14j7jsy7ldgkjpfb6acyv86nqfg6mip27rq0d9zfg26n4m0qm3s9"; + aarch64-linux = "080qqc9bacgs655sz32vdczdlkylycgzf5l584il9xyn7bp8xyk1"; + aarch64-darwin = "0ifzwjalwskxm4phf9c4v6sfyxhdh63vzdippcwh0r7fx0gcj6g8"; + armv7l-linux = "1gchynk0i05jkan47773fdlkbppwvdim73qwpcxbl0ck2giy7q9z"; }.${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.76.1.23069"; + version = "1.76.2.23074"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index b9ef4682e87d..13eec39fefbe 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -135,9 +135,6 @@ stdenv.mkDerivation rec { "--set QT_QPA_PLATFORM xcb" ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - # Use nix-provided libraries instead of submodules postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index ed6b75ad406a..5aa4ff77fd8a 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -49,7 +49,7 @@ let mkLibretroCore = { core , src ? (getCoreSrc core) - , version ? "unstable-2022-12-20" + , version ? "unstable-2023-03-13" , ... }@args: import ./mkLibretroCore.nix ({ @@ -400,8 +400,6 @@ in core = "flycast"; extraBuildInputs = [ libGL libGLU ]; makefile = "Makefile"; - makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=arm64" ]; - patches = [ ./fix-flycast-makefile.patch ]; meta = { description = "Flycast libretro port"; license = lib.licenses.gpl2Only; @@ -734,9 +732,7 @@ in picodrive = mkLibretroCore { core = "picodrive"; - version = "unstable-2023-02-15"; dontConfigure = true; - makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ]; meta = { description = "Fast MegaDrive/MegaCD/32X emulator"; license = "MAME"; @@ -822,8 +818,19 @@ in }; }; - scummvm = mkLibretroCore { + scummvm = mkLibretroCore rec { core = "scummvm"; + version = "unstable-2022-04-06"; + # Commit below introduces libretro platform, that uses libretro-{deps,common} as + # submodules. We will probably need to introduce this as separate derivations, + # but for now let's just use the last known version that does not use it. + # https://github.com/libretro/scummvm/commit/36446fa6eb33e67cc798f56ce1a31070260e2ada + src = fetchFromGitHub { + owner = "libretro"; + repo = core; + rev = "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3"; + hash = "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="; + }; extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ]; makefile = "Makefile"; preConfigure = "cd backends/platform/libretro/build"; diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 7befac996fed..ba1bfe28b2a3 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -52,26 +52,17 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-oEENGehbzjJq1kTiz6gkXHMMe/rXjWPxxMoe4RqdqK4="; + hash = "sha256-kJOR3p3fKqGM8a5rgDPkz43uuf5AtS5fVnvr3tJgWbc="; rev = "v${version}"; }; patches = [ ./use-default-values-for-libretro_info_path-assets_directory.patch - # TODO: remove those two patches in the next RetroArch release - (fetchpatch { - url = "https://github.com/libretro/RetroArch/commit/894c44c5ea7f1eada9207be3c29e8d5c0a7a9e1f.patch"; - hash = "sha256-ThB6jd9pmsipT8zjehz7znK/s0ofHHCJeEYBKur6sO8="; - }) - (fetchpatch { - url = "https://github.com/libretro/RetroArch/commit/c5bfd52159cf97312bb28fc42203c39418d1bbbd.patch"; - hash = "sha256-rb1maAvCSUgq2VtJ67iqUY+Fz00Fchl8YGG0EPm0+F0="; - }) ]; nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++ diff --git a/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch b/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch deleted file mode 100644 index a067839c7c32..000000000000 --- a/pkgs/applications/emulators/retroarch/fix-flycast-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile b/Makefile -index 01d99c30..8c2dd248 100644 ---- a/Makefile -+++ b/Makefile -@@ -440,7 +440,6 @@ else ifeq ($(platform), arm64) - CPUFLAGS += -DTARGET_LINUX_ARMv8 -frename-registers - CFLAGS += $(CPUFLAGS) - CXXFLAGS += $(CPUFLAGS) -- ASFLAGS += $(CFLAGS) -c -frename-registers -fno-strict-aliasing -ffast-math -ftree-vectorize - PLATFORM_EXT := unix - WITH_DYNAREC=arm64 - HAVE_GENERIC_JIT = 0 diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 08c65a7dbff2..e18361c0d35d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -14,38 +14,38 @@ "beetle-lynx": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "9c48124dc15604b3eb6892e3616dfb77992a6fd6", - "sha256": "ZXFU4QmjVQVU5bE5TVmGm4gepZpuoS8+p60l+Ha4I9s=" + "rev": "3ca44fda26f27418c92ada1b0f38b948af2151ae", + "sha256": "f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA=" }, "beetle-ngp": { "owner": "libretro", "repo": "beetle-ngp-libretro", - "rev": "00c7cb8ea97ad9a372307405d8abf34e401fec8a", - "sha256": "MtZMPjgT4dQy+E+4jSDE08PRi0pwa+q48kmTHhfIQMY=" + "rev": "65460e3a9ad529f6901caf669abbda11f437ab55", + "sha256": "+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w=" }, "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "d4fa4480f17f067c3aba25380717a5aee059f026", - "sha256": "t7OJuqEWec3GvNq9dsmrRhgz+GybBzt1ZO6FwZ9L5yE=" + "rev": "e480f6388375f59fd3e7aeef8ef8531c20e5c73e", + "sha256": "uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA=" }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "af16dfd8353ed6cf76ef381b98a6a9abf59051ec", - "sha256": "snAA5PCU2NRsCiQtBRYEzczPSGG9OT2jDTrGaPZqhic=" + "rev": "724bd21b4524f8cf376dbc29c3e5a12cb674c758", + "sha256": "xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "3827fb4bd0d36f0db7b59e0c220524c7daaf0430", - "sha256": "CGNzb6XDPsp+EitkgyvDha9DoZSy+e9JWye0nmCiOns=" + "rev": "fd812d4cf8f65644faef1ea8597f826ddc37c0a0", + "sha256": "yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "19ce186783174b93b90845c3f0e1fa1694904912", - "sha256": "mEuv9lrDi/q2ASV9hxYptievupcv4PfUWPYlDcNzXQg=" + "rev": "9bd31a4a42d06ca0f6d30ee38a569e57c150c414", + "sha256": "RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM=" }, "beetle-snes": { "owner": "libretro", @@ -62,20 +62,20 @@ "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "787772dff157c8fe54b2e16bb770f2c344c8932b", - "sha256": "i4SnjIqA0U88FnaT7fz5fqMyp8FyfNvxxhflOaAv1mA=" + "rev": "1ff2daa9377114d5394142f75f1c388b706567ed", + "sha256": "0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE=" }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "3e845666d7ce235a071eb306e94074f1a72633bf", - "sha256": "ukKzG+O2o6EAF0l7cmMQOkemJ1oweIpRH5rle1gqaFk=" + "rev": "dd6393f76ff781df0f4e8c953f5b053b1e61b313", + "sha256": "C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "cccee4217e53e164fd70196e56dfb24b967e5fd8", - "sha256": "RpGYQwDWkfYY0qnrTuAMzVuOSfTX5AZph7FD8ijUggc=" + "rev": "81e8b2afd31b7f0f939a3df6d70c8723bcc8a701", + "sha256": "xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8=" }, "blastem": { "owner": "libretro", @@ -92,8 +92,8 @@ "bsnes": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "dabf6679024124b2f819c79f279dbb85a5263255", - "sha256": "iv8gxC48i8JMzby3vR4eYDViqCwSf8JGlPekQE6AF4c=" + "rev": "4da970a334ba4644cef72e560985ea3f31fa40f7", + "sha256": "Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI=" }, "bsnes-hd": { "owner": "DerKoun", @@ -110,8 +110,8 @@ "citra": { "owner": "libretro", "repo": "citra", - "rev": "f0b09a5c0cb3767d43f5f8ca12a783012298fd44", - "sha256": "v86R5TLmNNMhuTMCwU3mAAtLK5H0sP//soh4x+cFgTQ=", + "rev": "d7e1612c17b1acb5d5eb68bb046820db49aeea5e", + "sha256": "u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", "fetchSubmodules": true }, "desmume": { @@ -153,14 +153,14 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "ef17049274a21239e5f21198b026dacbb38d7b90", - "sha256": "2N7c5L9grp+Rkhj25SoB9K9rVHq4H9IzU2KSeb1O7/E=" + "rev": "ffcd114b8ea3f3387b66997263ea5df358675aa5", + "sha256": "a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI=" }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "8c3f690e61a1d65dfb25510426ae88eeae93e1ae", - "sha256": "vzPrAEII8SWj3Ki2OaZb0/9gbQDz04rp2dXf2LE1sXg=" + "rev": "1fa798b220a6df8417dcf7da0ab117533385d9c2", + "sha256": "B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE=" }, "flycast": { "owner": "libretro", @@ -183,20 +183,20 @@ "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "7e02df60048db0898131ea365f387a026e4e648d", - "sha256": "RnFuD8PL+/uPhWe+sSXMPm5+XH8FzCwY+MSquR/AB+o=" + "rev": "ea563fac40e281b29d37f6b56657abef8f1aaf0d", + "sha256": "2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk=" }, "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "74a2f6521aea975a51f99497b57c5db500d61ed9", - "sha256": "qTNbFXg5QFKSzMOWhDdDfc0FinF/D7n2OruG5zv+ANY=" + "rev": "f6a9bd72a56a11c2068be2d15fa52dda3e1e8027", + "sha256": "4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI=" }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "81649a2c8075201bb823cce8fdf16a31c92a3b6c", - "sha256": "De9Tke+fp6CtXzm0w6Qzts3jj1j/1uB0kYZfaWyNqA0=" + "rev": "541adc9e1c6c9328c07058659594d6300ae0fa19", + "sha256": "2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA=" }, "gw": { "owner": "libretro", @@ -207,8 +207,8 @@ "handy": { "owner": "libretro", "repo": "libretro-handy", - "rev": "517bb2d02909271836604c01c8f09a79ad605297", - "sha256": "Igf/OvmnCzoWjCZBoep7T0pXsoBKq3NJpXlYhE7nr3s=" + "rev": "63db085af671bad2929078c55434623b7d4632a1", + "sha256": "N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE=" }, "hatari": { "owner": "libretro", @@ -219,8 +219,8 @@ "mame": { "owner": "libretro", "repo": "mame", - "rev": "85581d60bb24fea14542b154aef2c7b624f5b60f", - "sha256": "AUqJAXJCvddv9vPqXt5EZncKNdeLaXoc6xhYWqOMebY=" + "rev": "f7761a9902d59030882c58d4482446196e748c50", + "sha256": "g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g=" }, "mame2000": { "owner": "libretro", @@ -237,8 +237,8 @@ "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "3249de7ceaaa92ee18e93cbd8c2ace9f1ee34c08", - "sha256": "mBF1j4em4e/fKEmPA8MmAZrXXYQiqFfAloOHdMbVq+k=" + "rev": "0b9309d9d86aea2457df74709e997bea37899475", + "sha256": "US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0=" }, "mame2010": { "owner": "libretro", @@ -267,7 +267,7 @@ "mesen": { "owner": "libretro", "repo": "mesen", - "rev": "c89474c9d87df967d21b7b7d5971dc9475fec028", + "rev": "caa4e6f14373c40bd2805c600d1b476e7616444a", "sha256": "cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU=" }, "mesen-s": { @@ -285,45 +285,45 @@ "mgba": { "owner": "libretro", "repo": "mgba", - "rev": "ec5ecb26deba8d7ac830fc66ade9fac0eeaeb4ae", - "sha256": "kDDs+M7TPu6UhFnj9+XGI9whQFQ5/+7fSb0YUN7oMsg=" + "rev": "a69c3434afe8b26cb8f9463077794edfa7d5efad", + "sha256": "rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg=" }, "mupen64plus": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "bc241538b9ef85d8b22c392d7699dc73f460e283", - "sha256": "eCosI2yL1HJpHWvZLYZQe6+1rmmyHLFYCY7bX+3hPec=" + "rev": "5a63aadedc29655254d8fc7b4da3a325472e198b", + "sha256": "QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE=" }, "neocd": { "owner": "libretro", "repo": "neocd_libretro", - "rev": "53f5453311a1ac43700fedb2317c810586f9ccf5", - "sha256": "BZBpojShHk+j5wz/d7FnykpX562TgH6PAqTUigE+zUU=" + "rev": "2070f5258c9d3feee15962f9db8c8ef20072ece8", + "sha256": "X+lS1zW5oTzp7wwurM5xjVqIBwEOCIdj/NX/+33K2qg=" }, "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "d30c55052292826836f6dbaa2adc46fdf1a2d93c", - "sha256": "R2Kbtr2EqNUyx5eGBYyyw/ugSxVRM70TP/IsIsU0EZM=" + "rev": "16b14865caf1effca030630e2fc73d2d4271fc53", + "sha256": "dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM=" }, "np2kai": { "owner": "AZO234", "repo": "NP2kai", - "rev": "606fafa7081b62df5f4727c34560da23927c21cd", - "sha256": "qS7OrY8bFkAmRgbzLCw9PqgxtKuVNKI+tsDVU7PqWIw=", + "rev": "6089943a80a45b6c18d765765f7f31d7a5c0d9c6", + "sha256": "tdF0Qb+smWAVoPmI0dd5s51cnYxMmqM36rQNMiEjU9A=", "fetchSubmodules": true }, "nxengine": { "owner": "libretro", "repo": "nxengine-libretro", - "rev": "e271c6262d73f07e5d92d285503f1c049801c51a", - "sha256": "PfzHV6/nGUdbnfZ8+aHuoIQhvKcxdbuKnjIMWIIFt7Q=" + "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", + "sha256": "4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=" }, "o2em": { "owner": "libretro", "repo": "libretro-o2em", - "rev": "3303cc15e4323280084471f694f6d34c78199725", - "sha256": "xH8Dlsg84q8awxjObMPXKZcJSwmix1YdRXIpee7rw6o=" + "rev": "a2a12472fde910b6089ac3ca6de805bd58a9c999", + "sha256": "0cZYw3rrnaR+PfwReRXadLV8RVLblYqlZxJue6OZncg=" }, "opera": { "owner": "libretro", @@ -340,59 +340,59 @@ "pcsx2": { "owner": "libretro", "repo": "pcsx2", - "rev": "d2e37b80cfe6f6eecfe0356c7537d8e98bee7a8d", - "sha256": "rHXJG2wGoyNGvxxeZVF/I1CpaSBPUwZNERJtkG/z7MU=" + "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", + "sha256": "0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "aced3eb3fcaa0fe13c44c4dd196cdab42555fd98", - "sha256": "RzcrSADagi3AIPINQxc36BfMjWjatP/JL6HY744XnZk=" + "rev": "4373e29de72c917dbcd04ec2a5fb685e69d9def3", + "sha256": "727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "b2d43acfbc288038749d8a8fdfbcb0474568e043", - "sha256": "kDSQgF8G/IpZ9NkSwuOjFSkirkum7foRT01qIbNJmJI=", + "rev": "7ab066aab84f15388a53433ea273420bcf917e00", + "sha256": "NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "0483fc43da01b5b29883acb2cf1d02d33bba1e30", - "sha256": "OxBQFTQP0L8k0lH88Ey6KWybW912Ehsv7XjWrvFivxo=", + "rev": "b33834af08a4954f06be215eee80a72e7a378e91", + "sha256": "IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "1fa2f7a97191d2a73f243bfc464edef69b26f652", - "sha256": "BDX2eHtFbsloC9XYORHwpix8tbRSQUbcoP7DKFIohW4=", + "rev": "7df51c3d060a780b7383c5c1380e346ad9304bb4", + "sha256": "GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=", "fetchSubmodules": true }, "prboom": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "4e671fa0a4b7b892e17ac4e1803c9d627653a4c1", - "sha256": "d2/cpfhNczZkHzMGQIxO9jw65AMs9Jmh4ItiLLdDYsk=" + "rev": "d9c3975669b4aab5a1397e0174838bcbbc3c1582", + "sha256": "klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA=" }, "prosystem": { "owner": "libretro", "repo": "prosystem-libretro", - "rev": "cf544d3c8e40ff197ea5bb177a1269db31077803", - "sha256": "A7yQwzM8ewI+UCPQVyO7DNyiQCTw2yG1soi6l7T3pDE=" + "rev": "763ad22c7de51c8f06d6be0d49c554ce6a94a29b", + "sha256": "rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E=" }, "puae": { "owner": "libretro", "repo": "libretro-uae", - "rev": "af9e35383c00980aabb38c929e679704b624dee0", - "sha256": "hp4XOQUKktmUfLtRfVv1Oe1vqHUYu+vagxSSef55APs=" + "rev": "ae58c0f226b654d643b9f2dce58f64657f57cb76", + "sha256": "6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU=" }, "quicknes": { "owner": "libretro", "repo": "QuickNES_Core", - "rev": "1b88a09f1c386ff9ee46bb371583ae04c5cb5dd0", - "sha256": "Q7DDufGTdP+R05ND56PxMNR96ZacJFxPi0ETieV2B58=" + "rev": "75d501a87ec2074e8d2f7256fb0359513c263c29", + "sha256": "yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw=" }, "sameboy": { "owner": "libretro", @@ -403,8 +403,8 @@ "scummvm": { "owner": "libretro", "repo": "scummvm", - "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", - "sha256": "wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=" + "rev": "ab2e5d59cd25dfa5943d45c2567e8330d67fad8b", + "sha256": "9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM=" }, "smsplus-gx": { "owner": "libretro", @@ -415,8 +415,8 @@ "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "3c4982edddfdba482204ed48cf0b1d41ccae5493", - "sha256": "d4luyBSU/4PdsDd2jLwWSyckBPAqXMJ3C1sNmLO+E6U=" + "rev": "cc0a87711a7a208cabefc9fd1dbb90e31fe51684", + "sha256": "1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo=" }, "snes9x2002": { "owner": "libretro", @@ -433,26 +433,26 @@ "snes9x2010": { "owner": "libretro", "repo": "snes9x2010", - "rev": "e86e54624a7910a64a9a744e3734d4067c48d240", - "sha256": "U1eeXuhYssAOgiNOZ7fr/8rkPScts3GmWgK6ki39PVA=" + "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf", + "sha256": "7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=" }, "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "82da36dd685c68b09047d7c835175879edb68653", - "sha256": "y7AOSY2VUe4Jv+wteplvA1ul5iXHoeYQhgycD+nfIuc=" + "rev": "93ea39d6155f08c21707a85a0b04b33008a7ab15", + "sha256": "9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4=" }, "stella2014": { "owner": "libretro", "repo": "stella2014-libretro", - "rev": "1351a4fe2ca6b1f3a66c7db0df2ec268ab002d41", - "sha256": "/sVDOfP5CE8k808lhmH3tT47oZ1ka3pgDG5LglfPmHc=" + "rev": "8ab051edd4816f33a5631d230d54059eeed52c5f", + "sha256": "wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0=" }, "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "f2e335bfd4751410dfb24d933f762b9a4fd7fdeb", - "sha256": "l3A1Xb6YD+OOTZEF6whst1Kr8fSRnXuIVIUN1BCa2Bw=" + "rev": "e24f21196cdcd50321475c4366b51af245a6bbe6", + "sha256": "DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978=" }, "tgbdual": { "owner": "libretro", @@ -463,8 +463,8 @@ "thepowdertoy": { "owner": "libretro", "repo": "ThePowderToy", - "rev": "ac620c0a89a18774c3ad176a8a1bc596df23ff57", - "sha256": "C/X1DbmnucRddemEYml2zN3qr5yoXY3b+nvqfpboS0M=" + "rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243", + "sha256": "aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo=" }, "tic80": { "owner": "libretro", @@ -476,20 +476,20 @@ "vba-m": { "owner": "libretro", "repo": "vbam-libretro", - "rev": "7e30b038893de63e674944f75581d57c7685ea3a", - "sha256": "CmmiKiy0mFqAiagUHFV5wRSZ0MkzADrHRAG+h82dWAQ=" + "rev": "640ce45325694d1dc574e90c95c55bc464368d7e", + "sha256": "aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM=" }, "vba-next": { "owner": "libretro", "repo": "vba-next", - "rev": "4191e09e2b0fcf175a15348c1fa8a12bbc6320dd", - "sha256": "IG2oH4F17tlSv1cXYZobggb37tFNE53JOHzan/X0+ws=" + "rev": "0c310082a6345790124e9348861b300bcccbeced", + "sha256": "RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78=" }, "vecx": { "owner": "libretro", "repo": "libretro-vecx", - "rev": "b5c17bb7fd4a704f58160bc699322a16d0643396", - "sha256": "nICXrVyoMWs2yDcewHd7z6rBt+haY/Dqf5lvF6RLnyg=" + "rev": "8e932c1d585ae9e467186dea9e73ce38fe1490f7", + "sha256": "2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM=" }, "virtualjaguar": { "owner": "libretro", @@ -500,7 +500,7 @@ "yabause": { "owner": "libretro", "repo": "yabause", - "rev": "c7e02721eddb3de0ec7ae0d61e9e3afa5f586a62", - "sha256": "Y2YsPpgBA021pRDOFqH29zsRSbFIpRo5fq+tkknJbSA=" + "rev": "4c96b96f7fbe07223627c469ff33376b2a634748", + "sha256": "7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8=" } } diff --git a/pkgs/applications/emulators/retroarch/libretro-core-info.nix b/pkgs/applications/emulators/retroarch/libretro-core-info.nix index 79f9002ed402..308f78c08e2b 100644 --- a/pkgs/applications/emulators/retroarch/libretro-core-info.nix +++ b/pkgs/applications/emulators/retroarch/libretro-core-info.nix @@ -5,12 +5,12 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - hash = "sha256-3nw8jUxBQJxiKlWS6OjTjwUYWKx3r2E7eHmbj4naWrk="; + hash = "sha256-WIgcHuZgAOrlg+WyOS4TyzWziNzjyQB2sPDM9fR6kwA="; rev = "v${version}"; }; diff --git a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix index 829b96387f11..bc457d0cb702 100644 --- a/pkgs/applications/emulators/retroarch/mkLibretroCore.nix +++ b/pkgs/applications/emulators/retroarch/mkLibretroCore.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation ({ "ARCH=${{ armv7l = "arm"; armv6l = "arm"; + aarch64 = "arm64"; i686 = "x86"; }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}" ] ++ (args.makeFlags or [ ]); diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index f6aa0f9c526a..655fa8623768 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14757-3388c8ed0"; - rpcs3Version = "0.0.26-14757-3388c8ed0"; - rpcs3Revision = "3388c8ed090afb216f40c1d00361c6f6f1e7a9ba"; - rpcs3Sha256 = "0w2qsk91dxp0lxy6bdz4yyf79wqfnzyxswrg1kxwm0s7iwwch2pj"; + rpcs3GitVersion = "14812-cf5346c26"; + rpcs3Version = "0.0.27-14812-cf5346c26"; + rpcs3Revision = "cf5346c263111760752cabb94767c07c501207c4"; + rpcs3Sha256 = "1dkik6r6khmpcbh27n1bzg7y1ws7ljrkn81a7qn21wmh709sscc8"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index 4f480e67ee5e..932f8a59e7d9 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -57,6 +57,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lassulus netali ]; homepage = "https://vba-m.com/"; platforms = lib.platforms.linux; - badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index 51aa407b04a4..33b9182a4805 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -130,7 +130,7 @@ in python.pkgs.buildPythonApplication rec { vobject werkzeug xlrd - XlsxWriter + xlsxwriter xlwt zeep ]; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 387cb97a3cbc..60cba0410c49 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params for file in "$dev"/bin/*-config; do substituteInPlace "$file" --replace pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'" done '' + lib.optionalString ghostscriptSupport '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index f63b3b1709c0..13a8ef1a02bd 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -22,7 +22,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ cadquery - Logbook + logbook pyqt5 pyparsing pyqtgraph diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix index 118703afc60e..1d7df76c214e 100644 --- a/pkgs/applications/graphics/curtail/default.nix +++ b/pkgs/applications/graphics/curtail/default.nix @@ -37,24 +37,30 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config + gobject-introspection ]; - propagatedBuildInputs = [ + buildInputs = [ appstream-glib - python3.pkgs.pygobject3 - gobject-introspection gettext + gtk3 ]; - # Currently still required for the gobject-introspection setup hook - strictDeps = false; + propagatedBuildInputs = [ + python3.pkgs.pygobject3 + ]; preInstall = '' patchShebangs ../build-aux/meson/postinstall.py ''; - postInstall = '' - wrapProgram $out/bin/curtail --prefix PATH : ${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]} + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]}" + ) ''; meta = with lib; { diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 3f5fc3d12f76..e5fc811d43ff 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { wxPython_4_2 dbus-python distro - PyChromecast + pychromecast send2trash ]; diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix index 6b8f465a1061..58b8777bb223 100644 --- a/pkgs/applications/graphics/eddy/default.nix +++ b/pkgs/applications/graphics/eddy/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook python3Packages.setuptools python3Packages.rfc3987 - python3Packages.JPype1 + python3Packages.jpype1 python3Packages.pyqt5 ]; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 611033c5906a..ed8f2bef9e35 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "519"; + version = "520"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-q5pPRMBuB6hqDGuOl0kMyXjMKze5dw+3kdmA2FPJTPU="; + hash = "sha256-y8KfPe3cBBq/iPCG7hNXrZDkOSNi+qSir6rO/65SHkI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 45688725c2af..a165d0d3e096 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "kodelife"; - version = "1.0.6.163"; + version = "1.0.8.170"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-BbNk/YfTx/J8ApgdiY/thnD2MFUUCSQt/CMjkewLcL0="; - armv7l-linux = "sha256-fp4YM2BgyTr4vvxw5FaqKyGm608q8fOpB3gAgPA9UQ4="; - x86_64-linux = "sha256-sLRdU/UW2JORAUOPzmr+VUkcLoesrshjdLvDCizX0iM="; + aarch64-linux = "sha256-FHE87B34QSc7rcKHE3wkZq1VzcZeKWh68rlIIMDRmm8="; + armv7l-linux = "sha256-OqomlL7IFHyQQULbdbf5I0dRXdy3lDHY4ej2P1OZgzo="; + x86_64-linux = "sha256-QNcWMVZ4bTXPLFEtD35hP2LbuNntvF2e9Wk2knt4TBY="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index fbc80d0da6d5..2cec147fb30a 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -25,17 +25,13 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-Nok4oqTezO84q9IDZvgi33ZeKfRL+tpg7QEDmp2ZZpU="; }; - buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; - nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ gtk3 gdk-pixbuf ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); # Tests are broken doCheck = false; - # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943 - # until https://github.com/NixOS/nixpkgs/pull/102613 - strictDeps = false; - # prevent double wrapping dontWrapGApps = true; diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index 0d3a86663b30..774a8b19dd34 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -37,10 +37,6 @@ buildPythonPackage rec { gtk3 ]; - # https://github.com/NixOS/nixpkgs/issues/56943 - # this must be false, otherwise the gobject-introspection hook doesn't run - strictDeps = false; - preDistPhases = [ "fixupIconPath" ]; fixupIconPath = '' diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a566d9da788c..623a8d783f76 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl +, fetchpatch2 , meson , ninja , gtk3 @@ -31,6 +33,7 @@ , gobject-introspection , itstool , libsecret +, libportal-gtk3 , gsettings-desktop-schemas , python3 }: @@ -39,13 +42,22 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.5"; + version = "0.31.7"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-OwSPxs6ZsjLR4OqbjbB0CDyGyI07bWMTaiz4IXqkXBk="; + sha256 = "sha256-gPCj2HVS+L3vpeNig77XZ9AFdtqMyWpEo9NKQjXEmeA="; }; + patches = [ + # Fix build with vala 0.56.4, can be removed on next update + # https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/69 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/shotwell/-/commit/cd82759231e5ece2fa0dea40397c9051d15fd5c2.patch"; + hash = "sha256-Vy2kvUlmPdEEuPB1RTcI5pGYNveeiQ+lId0YVlWo4wU="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -86,6 +98,7 @@ stdenv.mkDerivation rec { gcr gnome.adwaita-icon-theme libsecret + libportal-gtk3 ]; postPatch = '' diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index e32226ad2f97..1887d542fbc0 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Tom94/tev/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.unix; - badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247 maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index bbee8671cc67..4b32cf8e8a85 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.23"; + version = "0.0.24"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-wRqQ7x6eQTrzFU++Qgq/7NXXo5F1onlZBdQ9ttNvvEw="; + sha256 = "sha256-ZkO2CLSuuJcFJFBO4XS8Qec0CxxAJdzOGfFa2zy+4uI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix b/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix index 00cdf8ae6f07..fc99ceb07144 100644 --- a/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix +++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { mkdir $out for format in vox qef qbt qb vxm vxr binvox gox cub vxl csv; do echo Testing $format export - ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools}/share/vengi-voxedit/chr_knight.qb --output $out/chr_knight.$format + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/voxedit/chr_knight.qb --output $out/chr_knight.$format done ''; } diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix index 3d324d2c38d4..a6fbb65fedfd 100644 --- a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix +++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "vengi-tools-test-voxconvert-roundtrip"; meta.timeout = 10; buildCommand = '' - ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools}/share/vengi-voxedit/chr_knight.qb --output chr_knight.vox + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/voxedit/chr_knight.qb --output chr_knight.vox ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.vox --output chr_knight.qb ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.qb --output chr_knight1.vox diff chr_knight.vox chr_knight1.vox diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8a031a220068..a6ea64724051 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -99,11 +99,11 @@ stdenv.mkDerivation rec { setupPyBuildFlags = [ "--enable=load_extension" ]; })) beautifulsoup4 - cchardet css-parser cssselect python-dateutil dnspython + faust-cchardet feedparser html2text html5-parser diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 55bca8aa8058..a1430a8b5e39 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -13,7 +13,7 @@ , pango , gst-python , kiss-headers -, Logbook +, logbook , pillow , poetry-core , pygobject3 @@ -47,7 +47,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ gst-python kiss-headers - Logbook + logbook pillow poetry-core pygobject3 diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 8cf8ddada564..9f95163698a3 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-mVMyXpNhwljxsAvrKeHPxUSfdF/mfxG157T13Kb8PnE="; + sha256 = "sha256-WgtLDAjywHd9++7DvPfpfEXGbBQWx8kQxseIadho1YE="; }; patches = [ ./polkit-dir.patch diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index db18ec5d131d..9ae6e96d5d29 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -7,7 +7,7 @@ }: rustPlatform.buildRustPackage rec { - name = "cotp"; + pname = "cotp"; version = "1.2.3"; src = fetchFromGitHub { @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Pg07iq2jj8cUA4iQsY52cujmUZLYrbTG5Zj+lITxpls="; }; - cargoHash = "sha256-gH9axiM0Qgl2TdJUpnDONHtU2I5l03SrKEe+2l5V21Y="; + cargoHash = "sha256-9jOrDFLnzjxqN2h6e1/qKRn5RQKlfyeKKmjZthQX3jM="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index a3a8c1dcf6cf..258c8b4ce7d6 100644 --- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreaction"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XQ/GcSjGSe+3d0dJxjmmcBFoDzrmM6zsHMfbDdzmpPs="; + sha256 = "sha256-rJ4EFKk/zlvQqptbL81WdqqZQUR9hYADFkXuw11SzRc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 7549ef20b112..4403a2c08d1c 100644 --- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corearchiver"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EUcUivUuuUApIC9daS6BFA1YoE4yO3Kc8jG0VIks/Y0="; + sha256 = "sha256-rn0rasFWSjgBIOpKIb35xsEewOfAQOr4kEiA1GhShg0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index a3314dface43..3d3edae1b179 100644 --- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corefm"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uScM6cVRwYopZ6NY3PSAAyxNNyX3hVnFs6hkAyF29PA="; + sha256 = "sha256-ue0OOBf0PAxYHTfo37RvxnsKxzAEGIiGltXBVZpI6lk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index f416f21c419a..15cd71ec9e2b 100644 --- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coregarage"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jq0lIXfw/1Ixd+QIY7D1ErBCOSKmwkWBupcDxUUEliM="; + sha256 = "sha256-NsCJS+FyHWj2aLXlbzxcHEcdZ2cViZmJlh501/48xdI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index 7da5ebe081fd..060a5bc4eb98 100644 --- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corehunt"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zhJadrdOXpl0bXxEPWjQ59Pzjg4MfIZXtYzCnJbh+pI="; + sha256 = "sha256-txQ/uoSwseo0i4/CqdQm3wN9/3p3gioRG9IuJTsgSF4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 6078d04be7a7..07035867271b 100644 --- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreimage"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uG9/8sQK0G3f7O59OHEHqNHP8cUC73hmjsfpOnj0kFM="; + sha256 = "sha256-8ILnZQIErLakiNfGZ91/vY+9XS/eOHcAnIFIuT1x9Mg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index c5f7e49d4521..bb9e603f06c7 100644 --- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreinfo"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KoX2U07giVF2xZR1diM6teiNfKYRiqjowTJgnsMlaN0="; + sha256 = "sha256-EWz2FQQzWVeP2qw1pz2Lg3COUo2y7/9a105R1Bj0Aqw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch b/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch deleted file mode 100644 index 084a650c610e..000000000000 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/corekeyboard/CMakeLists.txt 2022-01-29 14:03:28.149607341 +0700 -+++ b/CMakeLists.txt 2022-01-29 14:04:00.178733700 +0700 -@@ -55,5 +55,4 @@ - - install( TARGETS corekeyboard DESTINATION bin ) - install( FILES org.cubocore.CoreKeyboard.desktop DESTINATION share/applications ) --install( FILES org.cubocore.CoreKeyboard-Tray.desktop DESTINATION /etc/xdg/autostart ) - install( FILES org.cubocore.CoreKeyboard.svg DESTINATION share/icons/hicolor/scalable/apps/ ) diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index 5116f80f4cb2..bf065bc2a5c7 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -2,20 +2,15 @@ mkDerivation rec { pname = "corekeyboard"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yJOcuE6HknDhXCr1qW/NJkerjvBABYntXos0owDDwcw="; + sha256 = "sha256-zOH/w4QroMaVjWnFuWAJQ11RYlpXwIXRG9QYGDkfLVY="; }; - patches = [ - # Remove autostart - ./0001-fix-installPhase.patch - ]; - nativeBuildInputs = [ cmake ninja diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix index bdded6e8f1fe..d1856445ab3c 100644 --- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepad"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-19qR08QhWeeXnJAQHe1SJjT0xnQLlbkXlzmd9uiMp14="; + sha256 = "sha256-MZdEdGfCaQp5DuDDYRNXi37O+O/aRS8XgAN0Jma/J3k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 228b0175a7d2..745a9637643d 100644 --- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepaint"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uAFV3NKtgNri8GQLD+MRacl9WYMfkMVZcoVML+oSX78="; + sha256 = "sha256-wRF2Z2n9rEixmKYDRqKxQad2JDSxsgfGIWQWpjz/+yU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index 42f8fd0dd0fd..8bf3a6f8cbbf 100644 --- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepdf"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VwJ3H/jNP3u5C+LATPUSftiWm89upx77fN3NqzTnU7Y="; + sha256 = "sha256-Dm3RDVHw1JXSC3HdS0k/IVTO/o5vaWiCr5vPDjr2uFk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix index 7b5ba0ad7a60..c71e64f1623a 100644 --- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepins"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CVToPF8/Tw+n31/A0bzyBbwF7xPBVirsqVOUsM8QtH0="; + sha256 = "sha256-wrP9Jm3T9gzEwEjNH2SXSqwP/+YRxVIyQRSPxdYgPCs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index e13485619d9a..cdec45c745f6 100644 --- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corerenamer"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WrMyz8Noq0EeBIxL4mSl6e+8wrivmwfoa1yKBrSgrRI="; + sha256 = "sha256-hjI7KK+/u7OcqyjrZkRtBTfo8obDNqdudlFYcJR0dl8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index 18d773e904bf..808adcc3d3f0 100644 --- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreshot"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wEpo/YINtKAYHqlGYytUPh9ndkvQBw3tRIlyjnKJaf8="; + sha256 = "sha256-K/K6630ctWG856igXF1fAukwu6FbsBzF8JxG8K3gICc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix index ac3f7280aa76..b08a7980fe63 100644 --- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestats"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-154BZIKb6QDrTC4DXh4dbFtN/Lq0ok/qOrqTkXa+rAo="; + sha256 = "sha256-AhM7Rvxh8WZPrpDzhY6DYALVe4VlF9b77oX61AVntI0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index 04c6d82d4b27..e482ece3d15e 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestuff"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-snzW6cqxIyiXJLOD5MoEqmzen1aZN4IALESaIWIOMro="; + sha256 = "sha256-F0kddb622W44MDkZOh4YTyFQ+J/UGGbkcrWXCSDYcek="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index 1203706a62e6..7710f2f753ec 100644 --- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "coreterminal"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0gxcbfDD43BnkxYWSdViK3hjzfgPGFruwzF4hCxFZ7c="; + sha256 = "sha256-sFNKyqzNrPAGitmR8YEtIf6vtnvAP7+jXk4GFnDeGJs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix index 41fe2698e4eb..844e18b26b7b 100644 --- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coretime"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MIcmgBfgyjEyJxXCq6IbQ/i6IdtL5cWVGpV2YZbzK58="; + sha256 = "sha256-XTX4oeUFwfZE0ey1NjXpAzw0x+4d8IGwU/sEojRwBBY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index b72008cd43ad..9da76dfa4c00 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "coretoppings"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yq57dY1zIuQN2Gj9haxJMomafL32B+/9v3lWlY9fvcc="; + sha256 = "sha256-3wLDTN3SrbQNs43nQmSBrSB0bD6YineBQ8eNPDws1G8="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix index 5e72458dad45..a29aa95fdcee 100644 --- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreuniverse"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KNjXrsm4OfBxida8mcAlKgomcpg0xJg51ZxEdhaiL84="; + sha256 = "sha256-ThEzuwBrPUkXURcW9KiXJs8ExqYWZamlfeQ1IggMWdc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch index b454abb188bc..3d2238b57788 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch +++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch @@ -1,29 +1,31 @@ -From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com> -Date: Wed, 28 Jul 2021 02:26:39 +0300 +From a63a4b6de9ba730e10b54f4b5ce454edb10c7c39 Mon Sep 17 00:00:00 2001 +From: dyrnade <gurescicem@gmail.com> +Date: Wed, 1 Feb 2023 22:28:02 +0100 Subject: [PATCH] fix application dirs --- - cprime/systemxdg.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + cprime/systemxdg.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp -index f9eee66..ea0553d 100644 +index 4c40d4c..5dbb6ff 100644 --- a/cprime/systemxdg.cpp +++ b/cprime/systemxdg.cpp -@@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety - SystemXdgMime::SystemXdgMime() { +@@ -372,9 +372,10 @@ void SystemXdgMime::setApplicationAsDefault(QString appFileName, QString mimetyp - appsDirs << QDir::home().filePath( ".local/share/applications/" ); + SystemXdgMime::SystemXdgMime() + { +- appsDirs << QDir::home().filePath(".local/share/applications/"); - appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; - appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; -+ appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" ); ++ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); + appsDirs << "/run/current-system/sw/share/applications/"; + appsDirs << "/run/current-system/sw/share/applications/kde4/"; + appsDirs << "/run/current-system/sw/share/gnome/applications/"; - }; + } + - DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) { -- -2.32.0 +2.39.0 + diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index f100a3a10403..37f95c4ad177 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libcprime"; - version = "4.3.0"; + version = "4.4.1"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+z5dXKaV2anN6OLMycEz87kDqQScgHHEKwGhDAdHSd4="; + sha256 = "sha256-6kkKmF9mARhSm93ZrWJiwRNmpkiCxyhSD3W7X3gYuu4="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix index 395a40ddfc66..adba59b9da1e 100644 --- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libcsys"; - version = "4.3.0"; + version = "4.4.1"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/iRFppe08+rMQNFjWSyxo3Noy0iNaelg0JAczg/BYBs="; + sha256 = "sha256-IWzgRwouI/0bQBuEd9CV0Ue6cF2HwRw3jMdLyGA1+TY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 18110a07c374..9b0c5e47dca8 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkg-config, which, perl, libXrandr +, pkg-config, which, perl, jq, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , wayland, wayland-protocols , libXinerama, libnotify, pango, xorgproto, librsvg @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/dunst \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + + install -D contrib/_dunst.zshcomp $out/share/zsh/site-functions/_dunst + install -D contrib/_dunstctl.zshcomp $out/share/zsh/site-functions/_dunstctl + substituteInPlace $out/share/zsh/site-functions/_dunstctl \ + --replace "jq -M" "${jq}/bin/jq -M" ''; passthru.tests.version = testers.testVersion { package = dunst; }; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 0644471c5fa8..16eb89cb5a84 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { cython trezor keepkey - btchip + btchip-python hidapi pyopenssl pyscard diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 40f67c02c752..08d887f7e926 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins - btchip + btchip-python ckcc-protocol keepkey trezor diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index a4166a3fe641..fd1e6706e440 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins - btchip + btchip-python ckcc-protocol keepkey trezor diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index abb88796ddd0..ed573d1322d5 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -71,7 +71,7 @@ python3.pkgs.buildPythonApplication { requests tlslite-ng # plugins - btchip + btchip-python ckcc-protocol keepkey trezor diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 32319d08b6a9..a301b12506c9 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -11,14 +11,14 @@ let version = "2.0.3"; src = old.src.override { inherit version; - sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; + hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; }; }); flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec { version = "0.15.1"; src = old.src.override { inherit version; - sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc"; + hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw="; }; disabledTests = [ "test_outside_request" @@ -33,7 +33,7 @@ let version = "2.0.3"; src = old.src.override { inherit version; - sha256 = "b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c"; + hash = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; }; }); }; @@ -44,7 +44,7 @@ in python.pkgs.buildPythonApplication rec { src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720"; + hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA="; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 9b12b9bbd520..ace775b224c0 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.23.2"; + version = "1.23.3"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-dSlpCmVtF4H9d2DcOBkybrQz39QRlBCTTuGPA9yH8is="; + sha256 = "sha256-CCIu6DNU71oL0JIW3mQ5ThRSjbXeBmJ4FbF6i2dERbc="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index 1b8a7e706dde..676a19641bdb 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -18,7 +18,6 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; version = "7.2"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index dbf7e1aee746..925d246ba844 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool +{ lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3 , wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication rec { pango gdk-pixbuf atk + gtk3 ]; propagatedBuildInputs = with python3Packages; [ @@ -37,10 +38,6 @@ python3Packages.buildPythonApplication rec { dbus-python ]; - # Setup hooks have trouble with strict deps. - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - dontWrapGApps = true; # Arguments to be passed to `makeWrapper`, only used by buildPython* diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index aa9b530dee30..bb4c52882761 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -12,7 +12,7 @@ let version = "1.0.18"; src = oldAttrs.src.override { inherit version; - sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx"; + hash = "sha256-3U/KAsgGlJetkxotCZFMaw0bUBUc6Ha8Fb3kx0cJASY="; }; }); # Use click 7 @@ -20,7 +20,7 @@ let version = "7.1.2"; src = old.src.override { inherit version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); }; @@ -37,7 +37,7 @@ buildPythonApplication rec { owner = "donnemartin"; repo = pname; rev = "811a5804c09406465b2b02eab638c08bf5c4fa7f"; - sha256 = "1g3dfsyk4727d9jh9w6j5r51ag07851cls7v7a7hmdvdixpvbzp6"; + hash = "sha256-5v61b49ttwqPOvtoykJBBzwVSi7S8ARlakccMr12bbw="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 94d63a9a3a4f..2173c12461c3 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-vYsJBMtdkbe87Xn8Ah0eT+azFWfm3ZUooejs7oB2KVQ="; + sha256 = "sha256-ipcv1rP4DDjBEybmntsfw2ubjCgm1cGDlYM7sN0jeVo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index da4216cd8b83..b23b004d7198 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kondo"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "tbillington"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TTgsfoJ3TEK7wyRJfBIxvPA53wZbq7KJ4LxjUbrHE4Y="; + sha256 = "sha256-f0eRM4U2FwMGjmQKb3tjX2TRv1hN//FkoA2h6WmFOQk="; }; - cargoSha256 = "sha256-s5e997I7YiDKF6rOB0XwcxbnHR8AifYPX9ctvdz8VTw="; + cargoHash = "sha256-DouQN9Lo/CoqZZD3HuO1+Xzvc2yL5l157TeAi+bmfrE="; meta = with lib; { description = "Save disk space by cleaning unneeded files from software projects"; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 47e310fb7658..fbb33c7e096f 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -11,6 +11,8 @@ , shared-mime-info , wrapGAppsHook , wafHook +, bash +, dbus }: with python3Packages; @@ -33,14 +35,12 @@ buildPythonApplication rec { itstool # for help pages desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info + docutils # for rst2man + dbus # for detection of dbus-send during build ]; - buildInputs = [ docutils libwnck keybinder3 ]; + buildInputs = [ libwnck keybinder3 bash ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; - # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' - # see https://github.com/NixOS/nixpkgs/issues/56943 for details - strictDeps = false; - postInstall = '' gappsWrapperArgs+=( "--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}" diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index d476024553ba..35dbf1fcb440 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -84,13 +84,12 @@ buildPythonApplication rec { sha256 = "sha256-rsiXm7L/M85ot6NrTyy//lMRFlLPJYve9y6Erg9Ugxg="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; buildInputs = [ atk gdk-pixbuf glib-networking gnome-desktop - gobject-introspection gtk3 libnotify pango @@ -139,9 +138,6 @@ buildPythonApplication rec { "--prefix PATH : ${lib.makeBinPath requiredTools}" "\${gappsWrapperArgs[@]}" ]; - # needed for glib-schemas to work correctly (will crash on dialogues otherwise) - # see https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; meta = with lib; { homepage = "https://lutris.net"; diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index 743c92407e79..4dffe9e08eb6 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -31,18 +31,14 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; - # Cannot find GSettings schemas when opening settings, - # probably https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ gettext wrapGAppsHook + gobject-introspection ]; buildInputs = [ glib-networking - gobject-introspection gtk3 ]; @@ -64,6 +60,7 @@ python3Packages.buildPythonApplication rec { ]; # Run Linux games using the Steam Runtime by using steam-run in the wrapper + # FIXME: not working with makeBinaryWrapper postFixup = '' sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy ''; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 31adb54ac71f..45db4d479775 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "nut"; - version = "2.7.4"; + version = "2.8.0"; src = fetchurl { - url = "https://networkupstools.org/source/2.7/${pname}-${version}.tar.gz"; + url = "https://networkupstools.org/source/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq"; }; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index c1a4f6aec922..4c740852f6af 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -38,6 +38,17 @@ let nativeBuildInputs = [ ]; format = "setuptools"; outputs = [ "out" ]; + patches = [ ]; + }); + # downgrade needed for flask-babel 2.0.0 + babel = super.babel.overridePythonAttrs (oldAttrs: rec { + version = "2.11.0"; + src = super.fetchPypi { + pname = "Babel"; + inherit version; + hash = "sha256-XvSzImsBgN7d7UIpZRyLDho6aig31FoHMnLzE+TPl/Y="; + }; + propagatedBuildInputs = [ self.pytz ]; }); } ) diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 472af0caf484..9d88d6331c1d 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -108,9 +108,6 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.nose ]; - # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - doCheck = false; preBuild = '' diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix index 4a61ab65376d..045211c3af6a 100644 --- a/pkgs/applications/misc/openlp/lib.nix +++ b/pkgs/applications/misc/openlp/lib.nix @@ -4,7 +4,7 @@ # python deps , python, buildPythonPackage -, alembic, beautifulsoup4, chardet, lxml, Mako, pyenchant +, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant , pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate }: @@ -37,7 +37,7 @@ buildPythonPackage rec { beautifulsoup4 chardet lxml - Mako + mako pyenchant pyqt5_with_qtwebkit pyxdg diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 7ae8662e2c19..546c0544cffa 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -32,8 +32,6 @@ python3Packages.buildPythonApplication rec { ''; dontWrapGApps = true; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 2af5e9d692db..f7f94d9940ab 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -26,7 +26,7 @@ let src = self.fetchPypi { pname = "Flask-Migrate"; inherit version; - sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; + hash = "sha256-ri8FZxWIdi3YOiHYsYxR/jVehng+JFlJlf+Nc4Df/jg="; }; }); flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (old: rec { @@ -43,7 +43,7 @@ let version = "1.0.1"; src = old.src.override { inherit version; - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + hash = "sha256-bICx5a02ZSkOo5MguR4b4eDV9gZSuWSjBwIW3oPS5Hw="; }; nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ requests @@ -55,18 +55,18 @@ let version = "2.11.3"; src = old.src.override { inherit version; - sha256 = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; + hash = "sha256-ptWEM94K6AA0fKsfowQ867q+i6qdKeZo8cdoy4ejM8Y="; }; patches = [ # python 3.10 compat fixes. In later upstream releases, but these # are not compatible with flask 1 which we need here :( (fetchpatch { url = "https://github.com/thmo/jinja/commit/1efb4cc918b4f3d097c376596da101de9f76585a.patch"; - sha256 = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; + hash = "sha256-GFaSvYxgzOEFmnnDIfcf0ImScNTh1lR4lxt2Uz1DYdU="; }) (fetchpatch { url = "https://github.com/mkrizek/jinja/commit/bd8bad37d1c0e2d8995a44fd88e234f5340afec5.patch"; - sha256 = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; + hash = "sha256-Uow+gaO+/dH6zavC0X/SsuMAfhTLRWpamVlL87DXDRA="; excludes = [ "CHANGES.rst" ]; }) ]; @@ -76,21 +76,21 @@ let version = "2.0.1"; src = old.src.override { inherit version; - sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; + hash = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; }; }); itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { version = "1.1.0"; src = old.src.override { inherit version; - sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; + hash = "sha256-MhsDPQfypBNtPsdi6snxahDM1g9TwMka+QIXrOe6Hxk="; }; }); flask = super.flask.overridePythonAttrs (old: rec { version = "1.1.4"; src = old.src.override { inherit version; - sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"; + hash = "sha256-D762GA04OpGG0NbtlU4AQq2fGODo3giLK0GdUmkn0ZY="; }; }); sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { @@ -100,13 +100,13 @@ let version = "7.1.2"; src = old.src.override { inherit version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); # Now requires `lingua` as check input that requires a newer `click`, # however `click-7` is needed by the older flask we need here. Since it's just # for the test-suite apparently, let's skip it for now. - Mako = super.Mako.overridePythonAttrs (lib.const { + mako = super.mako.overridePythonAttrs (lib.const { nativeCheckInputs = []; doCheck = false; }); @@ -165,7 +165,7 @@ python3'.pkgs.buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; + hash = "sha256-SYXw8PBCb514v3rcy15W/vZS5JyMsu81D2sJmviLRtw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index f51f53e9b72d..86aaae625c3e 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,5 +1,5 @@ { lib -, python3 +, python310 , fetchFromGitHub , gdk-pixbuf , gnome @@ -17,11 +17,19 @@ }: let - python = python3.override { + python = python310.override { packageOverrides = (self: super: { matplotlib = super.matplotlib.override { enableGtk3 = true; }; + sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec { + version = "1.4.46"; + src = self.fetchPypi { + pname = "SQLAlchemy"; + inherit version; + hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; + }; + }); }); }; in python.pkgs.buildPythonApplication rec { @@ -77,7 +85,7 @@ in python.pkgs.buildPythonApplication rec { TZ=Europe/Kaliningrad \ LC_ALL=en_US.UTF-8 \ xvfb-run -s '-screen 0 800x600x24' \ - ${python3.interpreter} setup.py test + ${python.interpreter} setup.py test ''; meta = with lib; { diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 2cdc3bdd9f3a..8ac8ae5f4f55 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -6,7 +6,6 @@ , qmake , qtbase , qttools -, qtwayland , openssl , libscrypt , wrapQtAppsHook @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns="; }; - buildInputs = [ qtbase qtwayland libX11 libXtst openssl libscrypt ]; + buildInputs = [ qtbase libX11 libXtst openssl libscrypt ]; nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; # Upstream install is mostly defunct. It hardcodes target.path and doesn't diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index acd1337a6693..8a953d8b7133 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.16.1"; + version = "2.16.2"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pq8HjmWSfBgieSJejrlw+FiRdq9NxryYPcw++Pdjsuk="; + sha256 = "sha256-13JWceuiNz1FxgVVQ2KV88zYLIBkEVeTfPF5eEK1oe8="; }; - vendorSha256 = "sha256-E2Q+mXojMb8E0zSnaCOl9xp5QLeYcuTXjhcp3Hc8gH4="; + vendorHash = "sha256-rmQpS4k/G3s/H7sPxVZ70KtJEvYjsDV2htV97viWttM="; ldflags = [ "-s -w" diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index 2c7aaa18eef7..cf7cec7a69e6 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.10"; + version = "0.13.12"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-epfEw62OXWiJqqvxJ8U9tRy0ZrQkSqa8GL4TluO9Df4="; + hash = "sha256-GJFPKQNrdyrFhXsPsVC629t/rHXZ16A19e8EaSdUOls="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-mOe0rREiqOxwVwVo4S0889cbqVLknVRCW4bSiIh6IdQ="; + vendorHash = "sha256-X58rFQi4YA8nCP02zH1nRi0TFGkQJ7jyCK6p8bfe0fI="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index d7d497174342..8053d8bd2a71 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/pkgs/applications/misc/watchmate/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "watchmate"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "azymohliad"; repo = "watchmate"; rev = "v${version}"; - hash = "sha256-UHlHfDFTQapQcETCvtch72DqelfBYMymMD/zODFtr1c="; + hash = "sha256-LwtlI6WCOO24w8seUzyhCp51pfEiCM+iL6lu/J6v4PQ="; }; - cargoHash = "sha256-QYw/am5cMVbRdx/XQ+lZv2Jo9Aiwd2ypUlo854sm7i4="; + cargoHash = "sha256-MD0eWZDpCevBY1Y3Gzgk13qCFtL7QOPDATv8MA+Q5go="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index c3e5a505722c..00cd8dcf0518 100644 --- a/pkgs/applications/misc/wike/default.nix +++ b/pkgs/applications/misc/wike/default.nix @@ -12,7 +12,6 @@ python3.pkgs.buildPythonApplication rec { pname = "wike"; version = "1.7.1"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "hugolabe"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 246cd15af3f8..4cbd9971a1f9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1005 +1,1005 @@ { - version = "111.0b8"; + version = "112.0b2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ach/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ach/firefox-112.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "269dc39cbd876a480c7e5ffba2e2485b0d38bea9acb575a6de7597decf211ae0"; + sha256 = "55396746ee49a401ea7c82d909f800d7eba326e92dc28a910712ea7a35711718"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/af/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/af/firefox-112.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2d96546d48f3048b6a2ce46e1b4aaede84e6a303d70458983b05dffcd9c08e7b"; + sha256 = "b73bfa68625ec6e1a6d23077a580678dd0fdf319b8366f65c20185dafc1e978f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/an/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/an/firefox-112.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "793a8d77b4addf0ced87d5f15d53c6c1e82ceb95d2c0056ce2c6a98d694751c3"; + sha256 = "f52aa9bd79c3501eff9662ec065f8e26531c5860fdc32a5228fd12f9a1d69917"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ar/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ar/firefox-112.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "fb8624c6bc03bdcc0a30f10e9b81dbdb16cdcb35f89ad6c7485102ba8bdbf513"; + sha256 = "0fd26c0e7122bc2af38d9c812fb5deddd6f8ca85bda625781fd61de685dd9872"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ast/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ast/firefox-112.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d4509b771d11ea1c896f16d76762dc2c43585650aa1039adb8747095b444857c"; + sha256 = "634f8f5b63f4e5103238b0dff6a5de27b63fa0abce5959cab9f22723eb1e7763"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/az/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/az/firefox-112.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "89444c573fe9854a6f8bfeb700b4e6867b0b4653ce77691b1625ef1a663bc570"; + sha256 = "2b1dea32824f6bf622e1551ef1501eb0fbc29eef1611d78cf0826bf71f75452a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/be/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/be/firefox-112.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2f66c9a6a4e32a229e18c0a25964b675f360b6f49237e6057a4c95fac345eb44"; + sha256 = "668735893d389b63613cdd6c35847d5e9842d7fd64f2bb79df98f119f0ae2619"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bg/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/bg/firefox-112.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "6e36ae61a32eeec05f629a996ca66d3b5149da42a1ba7814095f8e49ae368bc2"; + sha256 = "51e874da59d9309c40644ad3d480ad6f50db7c556f5d0873326e65f591e11543"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/bn/firefox-112.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "55f9b57bd28300368d346ea23eff96183909a4bf1c7dfca40fa826e82e092d8e"; + sha256 = "60cf87ed845a5b9ec9c25fd0c54422d5df1a220cffa040acdcbab6cac5f90cc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/br/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/br/firefox-112.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0d080e978ecb9749d7584c523e09fbe5821a13021c2be0a86100e3b89bc0d020"; + sha256 = "78d9409a97934bdc7fea4f55f19830d02abf8212fb019d1d3b36a1dd6fa86e0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/bs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/bs/firefox-112.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "be4f73c95edbef52d0758e4d7a1bd727ce761aa544a8893a25492330982554f8"; + sha256 = "5309007b0605b956cdeb2c4857a2bd475cbdfac1cb2998d081b1931c96415892"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ca-valencia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ca-valencia/firefox-112.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8c81f99a4f3c1b2a60e3ab13f16ae99fc86a60dbf866b1626401e84335fe9f75"; + sha256 = "c655f8b4a7cd9501df33aaa0f6dfee6ac0e3cddb91877701eb82b672c62ca70e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ca/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ca/firefox-112.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1aa57869adfcbfd93abf27dbefec6b804227f2154ab5892b827fd0d68fabe059"; + sha256 = "7ed53427e009b63002a9770fcefabaf16b695d1362587d5e85421285ac9bc128"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cak/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/cak/firefox-112.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c657012c8907084eb4ce301e7833fe669e0be96a0f32ee270040c99358c63e62"; + sha256 = "f30f034d6604d0d5fa72f5d85a811316cf2812bcb79bee6022de9bec68506022"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/cs/firefox-112.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a446f29ac2668f2cef6deb6330f193407e1ab250e08c1033fbb1ae775c2c12e4"; + sha256 = "ac00859c967995db0cc79760e248fa566f42c5301c173a0dabb64d719ce7577b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/cy/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/cy/firefox-112.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dc187d329fff2c6cd84ddb6cf47c047ff41d7ee7d795dc7c9a2523362c3d515e"; + sha256 = "45866ae73478e6e7516b93a23844214e89716542bdcc04e769f7b18d7d3defb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/da/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/da/firefox-112.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "311da7ac12ad5748f4f301374f6fe474053ed7448d76fd8d0eee0427274b4fc0"; + sha256 = "2f0416215cc403e81c326179a65ab9a2af0e836bfccab1877c00fa997228ffdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/de/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/de/firefox-112.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6b1634343ad72f9f917fb2491f7593d7f59eed963c263abbe72cceeee44e01d1"; + sha256 = "4ad318d32e0e26dca381d10becd101afb544a6fadf281ccd3808e5f3ca061904"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/dsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/dsb/firefox-112.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "608e1981096855d4b11e035fe2f0520574bf4d6126f0ca695c76ad7e71859fdd"; + sha256 = "0d18ef2b1d134b613dc9851798f5438f82e3a1ec6bdd751fa336a7053ddbc6cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/el/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/el/firefox-112.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "e6e508da92c33e92cbb35c8faeaf0e97a42ea60496e1082b17471c5310f4fc48"; + sha256 = "de0c0315b8e67c608b285a33ea707fb8c86af1317d724dd8a9643ed3847aa726"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-CA/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/en-CA/firefox-112.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "74619673bbef29b09055a6ad7f9793f184a752ef08b97bb10872548cfad74385"; + sha256 = "1f5604d2baba29149341d358a49c9bef2a9975901d635bc111fbf3ccc4fb921a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-GB/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/en-GB/firefox-112.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "70bd112e0803b92789ef9bbc18dad26444c35788c7f8eb65f8677aa7a9690033"; + sha256 = "67b1eb3be91530e9da75d7a441b6af4a1f9686fafeaf6b7de92add80d2d1071a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/en-US/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/en-US/firefox-112.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "69fd115da6f9262e0ff9c1ffc45575fdbcdfd54d377289d622d0266cbf390ae3"; + sha256 = "8bdf79d6a7acb3f85564ad97fcf5906357b90530e51e7eac09d209475ac56135"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/eo/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/eo/firefox-112.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "d7e31eed1e72f2edfec79e8a10fc7d7f56fcb3c51f99b59ab075cbb06d7a8c67"; + sha256 = "8643d3b2eda5b93e61d2091d77c8abfad6089ed600846ead645ca49720214eb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-AR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-AR/firefox-112.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1c2493d9aee6a9d82df2fabd29d8fc25032cf7d16480db772d7bae9b50d55267"; + sha256 = "48d60dd690e9e1cceaf8f515b8e51b4f26a213acffa55a8bc324e85740cbcde9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-CL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-CL/firefox-112.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "75ec2c9d79fdd9af3a8cdaf2fd644a936cd8bf7338f0a66ec1e2e2812b2b3d69"; + sha256 = "1ed56eeafdc3a7a26004116773c497675fcc30b4f8c3c5e290aca07e66a82391"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-ES/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-ES/firefox-112.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "5b4d3cd852dbb075c78a0e05a55dcc5a072e6f17111343d4a444a93f738a343c"; + sha256 = "c927fcf15729383de1c40415e0948f4a7fbedccade5eb6583fdca89250c80931"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/es-MX/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/es-MX/firefox-112.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f3eaf9e6a2288f52f08adaffaef18f3057dc78888da96138b5fca1ec1f82fcf1"; + sha256 = "c1f9be15acbf299f52a1c49712508f140e88134de72261b4c6f7014c5143fd15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/et/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/et/firefox-112.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e74d817c9d8c9cfd0fb4b0e6ceb55a9825880323daeb283dff08ec10ac3d03a9"; + sha256 = "6fbd0755b7c32cfada83d6d94adb42a983e8b33bc4610b086256cd4abf913da8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/eu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/eu/firefox-112.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "58499484b222c68aea2386f62eafbeac6179dae1df5fb60a22d57f63f91e77ea"; + sha256 = "c6111ce30274a888a19a17a00bed3ea323c2d327544a4bf97fba671cf19d66ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fa/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fa/firefox-112.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "4685a514ed0f627b58464ab7949e2570fe1f3eb903e21816e384d599728f294f"; + sha256 = "8598a16e1d48fbb6beb3e576741795b56c6cc1ebce5ce143d995607341e581c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ff/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ff/firefox-112.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ffab5a17ba7a8dc900a7727b380c5cda427c634acac6f5d856da09e6186b555d"; + sha256 = "5efbfc006a2e101a3c650963c9ff1cbd216f66c82c7460ce84f6dbf71745eeb5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fi/firefox-112.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1d89d921b2dd9644fbb2b600573b4aad3ac832f2da66a3bee44607a53e268008"; + sha256 = "729d21e2d57ab76035f06d0d66b29a387d697c5d0a7ce858c2773fc91a7d5338"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fr/firefox-112.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "054ad2f7a95fd0dac604d1e709c736cd6ada53adeae63b8468a2d1dd0e9f60c4"; + sha256 = "35d9f24f0e6d5c907752a08354a6f31eb41da4e3f7a2ca41c05d0ee39432fbf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fur/firefox-112.0b2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "a46fc891c9f658b6610d901aefb83f9bd7e5ae19a64b429c1077691bcbca045b"; + sha256 = "7a418568590169aac482da758b3aa36f66bde5bc7d66d92a9af9a90d9a498fda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/fy-NL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/fy-NL/firefox-112.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4f7390dff95dbce0c5b0489602e0659b330c1868ed76c7901ddf5860a4df8ee8"; + sha256 = "66e84d4c9c3cccaa0571bcfa074179ffe2506b09435807e8dfca622cda809fa4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ga-IE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ga-IE/firefox-112.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7eb0fe2607754d2f6f2c7ce67b2e9d6a52b61695fd603ab2a9750cedb83be589"; + sha256 = "63ffe4004348fc89fcf9f7356db750c2188c6b70c59b1669f0f00976c8b7ac14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gd/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gd/firefox-112.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "e48ff3117f7b12a5e62431c49a26745ba556e674b09499803966163377f90597"; + sha256 = "7bb88fafdb04958ac90c3452581561ea1de3d628cdf0a5aac12d42e26193d240"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gl/firefox-112.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b2a7fa276e1e42a5b2d6f2e9f6b0cf8c4d5a06a11d5961ddf36e4e244e583593"; + sha256 = "3b8a1044208be74ae645f2d7ccb2e097310c1bc0ab9bc99a63ed962404bb3625"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gn/firefox-112.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4ba54e390d4ca56c5fa247453f5eedb9a76ca5765da53c1c4537eb10f9ed45a3"; + sha256 = "6849e381fd05fcf1a98f2477723165efc1261c3a86e937befd92faa553e618b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/gu-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/gu-IN/firefox-112.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0fc2f5c3fa0ffc29b290316f68021687e692495d858d66362bd09d7755ca61a0"; + sha256 = "cc60d45f0febacfc656df94c9fefe3bc90fccda3afb8255ec7192fb319a02402"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/he/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/he/firefox-112.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "1d164328ff99d9f052ba9d3efd4cd9c14fd3a665c9e515e3666125363519e7a7"; + sha256 = "b74bd9ee031591edb59a6f19bdf4962dc69c6293c6fe5cc1283edfc017dbcb3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hi-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hi-IN/firefox-112.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ec7e4ca3529624db58e413c9e36bd367ab108f73aa09e20587d7b680e854a95b"; + sha256 = "e799b203ab879a93930d9a357d24a12f8cab342ab59bf84c0184302ce4fdc328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hr/firefox-112.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6c9f1ddee7ba12c6f075819dc86a36522cf1d58e88d41378d14b6c6fa2a923d2"; + sha256 = "931df65476467ef9f7ba2f93dfccef78abed33bc51959b1a6979377aeed50272"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hsb/firefox-112.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "007f641d8f3a4348fc53efe404aeeeb018bb8003048826e16bae2107f7f791a8"; + sha256 = "d8aec47e9bf5aedeee2cc377aa6a6aff37d8ab87c95944e0dc2858eac4690d92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hu/firefox-112.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "26449a321dda6ee431207f0c412bd4e7bd65663f43979c1c294627f2cb97c4d1"; + sha256 = "806ffbdd6cdaf50d5bdf7667e94e3b7cc7d6380f9c85d297aa16c08a6a7e31a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/hy-AM/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/hy-AM/firefox-112.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "039254afb85950ab3aafd335328a0dfd0b4b2009aa58d78233853bbaf3156e25"; + sha256 = "d5899fa4fc5275c2768f32dddc24757567660e75d28bdeab98347048066dc76e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ia/firefox-112.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "249f3b342d8f7399c74a2bfc613af09af0d5e7accc020bc6963e20d0cacd56b7"; + sha256 = "4af2425183d662c94597004d0e2806feb8c3bb6f2f47c0bff0c4af105a159569"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/id/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/id/firefox-112.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "452c2bd007a2759d3bcead151de1da48a744958d60160d35786c04be90917dd7"; + sha256 = "1a6a234d8832c69256da8d779d33e61e1c5439a9b26224b47d7991b6ffac9388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/is/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/is/firefox-112.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8e53044f6659e853a4df3f5213320343355548357d519221525a040e0a97dfb6"; + sha256 = "4d1877cf223bb4ff2e316076c8daa5d444e7d29d69792f67023fb3a1a648a4f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/it/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/it/firefox-112.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0c60fe915d8fee0adc05a432e2985209f2f86bf4972d434e2090249b8b1c8ea4"; + sha256 = "2a62b2dd7afaf0df7e204b407e4fd1aa3cf2b4eb5432b4dc711a5272714f80a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ja/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ja/firefox-112.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5221ae7ccd0793e4a752deda5363c390c6bd54e54700f7022f6b723f1196f835"; + sha256 = "61467c700234a05e93e8edeb206089b842aa3e4369a04fa0f598e100bd9241db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ka/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ka/firefox-112.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f762705b947ea334b4e15007c6123a75e28fa416d609955e3c35040737728e45"; + sha256 = "1f99776b2fd66dc0359835f3b6850cc309cef9b3a6e71a5ddc57bd1cd3cc21f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kab/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/kab/firefox-112.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e39779eef6d953aa87b6ccd2ab5b71802b5201e9cd333de45388894359bc62de"; + sha256 = "039e07066d2f0d6daf645140d4e76547989ba2317dba1740f871e461513242b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/kk/firefox-112.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "eb3b95d9f579bd14e8d6eab765c14ecbfd6a93d4b222f5e4a16708f9bb169662"; + sha256 = "a987b5f450098524ed168ab2456eae80f44f9af62b11a66549ec09385d44db37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/km/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/km/firefox-112.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "6589fede696924d56ede3590d6af100dd558e7e7ca6f44a55fea37140915f095"; + sha256 = "88e29f0b43f2f4ce1436c0b7037a8f81181d22fc2bb51767af69467626cd8f04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/kn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/kn/firefox-112.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "6976e3c805dac1409cc6a541b81a057cdc312f15ef3387f1ff9a05d6b529c6e0"; + sha256 = "f3736b3bf2494265969e88c5b9aab181a4db849a5031cd069368619862f6a60d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ko/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ko/firefox-112.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "773e04d3e9e4c818aab45fa5fbfc0baa1edf2e8d3cc0fcedb55ae2bc495b844d"; + sha256 = "dd2b1aec2ca81706b571f071321ebf5ed17406ace002541a1a83241997474e28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lij/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/lij/firefox-112.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "a5b9e9eca192461672e1f29d951686c4f606566c6f024f2b8664aff85cc72a2a"; + sha256 = "f14eb0a22303fd690ccde2785a5d97416549def4e3f257ec76b0a2ac02ed52c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lt/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/lt/firefox-112.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0b1f166f08d62949c0ba4f72225c8149befc9ba94913bcc54ff2dda687a01c1f"; + sha256 = "183cdf167e94c15904716dffc6eca228260ee0369327f30d500000468a8bf661"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/lv/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/lv/firefox-112.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "82aac072c7299281c1d0133616c6e0c3f5c03df72e892e48731ac19b11f04e24"; + sha256 = "d44dee85e3872fbb693b493d27d7e3710a8a833abaa355f856a18ea66aacf815"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/mk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/mk/firefox-112.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "fd31c8f26fec85b85c09370b91e71e8ad577984d4e77d965f528388101a645c8"; + sha256 = "64e84176db80cba34e4e50762b4760184f4526dc82e2eba91335d95b6b7f3731"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/mr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/mr/firefox-112.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "6fc6484f7163d9aa5b29b10fb1c9e4f5c865c38d481414383e62a688db0ab981"; + sha256 = "9f668f8005135354ae1c8f46d2d81e651ee3d7f4427af6837a1e18597d2e84c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ms/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ms/firefox-112.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e56aa4c8bbd75bfa303aeee791a7f54df47ca45a90c40828a11de28261fc12d5"; + sha256 = "3518682aa9aa1013a4148d465a39211c77d83deb95a33647e5f8421586f747df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/my/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/my/firefox-112.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "e59ed8962cd267eacadd8c273c109b05b2c7d8abd89ebbf9c0505ac598330847"; + sha256 = "3a67b0b9c75f19057fb9a9b01e6fe82f95a9d2db6440ae8ef912ef8e7e340722"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nb-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/nb-NO/firefox-112.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e07856e116d21f71221fe6d09baa9de7b39c393466ab397e83e05a6072ed53cd"; + sha256 = "e552c61e6b6989359ff9c3ccaf1356cb454f47ae37d93504d74b6638a5a0e93a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ne-NP/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ne-NP/firefox-112.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "5eb1a0b5aa86304bda9b135354798c4bf273a542bfafdae58493b861fe9bf1ba"; + sha256 = "511eca660eb81a5b588fd74f41a45087209ed46ca84889bdb2810f046a199218"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/nl/firefox-112.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "827c5e383d8bcb6c8351e94b62d28d98837bf22e5c0ab7b20f0ee7c3fd7df7fd"; + sha256 = "8aac8ebde87b78016f6b387fcc89c13868cf6e22e2ce0019a9360ef39f869963"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/nn-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/nn-NO/firefox-112.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4e33cbedb9ec4294bc3c590d50f050f955a95973ac2a888bf7246482d8ef38c0"; + sha256 = "23a51c27dc4b3e445ab96248ec8d837a84f7bcec813f3c7152d3ca9a0aaefe1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/oc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/oc/firefox-112.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "aaf09e1bc3021619edba3b86d0599360705cf8282202d19d68b3945772906f86"; + sha256 = "db42d7c58e2258af28eef21264775c01821f35502971ee1ae0a55a9e86ed3abe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pa-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pa-IN/firefox-112.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "388ca99b77bad8b85256ef8c94f42d5e94eb1e541e696b5616e871dc0380c857"; + sha256 = "c8a33f5837b14f526583c490d69cfa2c22570ecf86707d2a4d8dccfedcfe2263"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pl/firefox-112.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7f9254889e2e26295dfd878fc5a1296a535ad12bc97832c652c611289c1fdf94"; + sha256 = "27d144f7981c2f24ee8593ba7dd9d4e14148caa6b3c410f5330362b80e6b166c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pt-BR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pt-BR/firefox-112.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ea983344e14e43e57761de7ff86622c370353be8b9098cc65789f015ffa08302"; + sha256 = "39101266685e7d5189c14be4d8074556703da991aec3c54bd9706b7c40f8c0a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/pt-PT/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/pt-PT/firefox-112.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1ceab92a1c89cf6c281da104736bdb07245c6b493640bbb0d289d3304b8f76f0"; + sha256 = "f5ef13f286e8576b9173dc01fde64661b3bdadc931649e0222e5823b13226330"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/rm/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/rm/firefox-112.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c01a0ffee6bd39435cc49856c112df51c3ef10c3aec1f916980bd09e2ac3ba28"; + sha256 = "c931759b0427b575f8bac8cf5b4b5885c6b87a12d4d352bb250c564e8dd8ac70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ro/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ro/firefox-112.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "64a0065aa656ff81b9d4354d325becbc46344a767eaace692ce6c662d591c26c"; + sha256 = "8ac650b0ff186988a0d6f4d57f25bd10f7c7bca64de51255ede8fda5650cf951"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ru/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ru/firefox-112.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "143591dd532ea1250decb6d36296075e575746293f554498a51a86c82515e354"; + sha256 = "d87fee506fd1cddc271ebe57d6ffded155527bb8d0e13e5d1b09bc0b3f9a9934"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sc/firefox-112.0b2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "b77079edc573f00a2e1fd840a18a9d8a1b275f0adc9e2d56d35c8963b9433000"; + sha256 = "e3823b4d874db0db6d204d73221d808d4be165cc7123701f2070f835888121a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sco/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sco/firefox-112.0b2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "28f71392241f5f7871cf10e40d4eaf951615666e8780e79f560f7997748e7cc0"; + sha256 = "3c96b18a9cd9335ca260bdf63081c6045caadc832a299d446ce3e4c9650983ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/si/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/si/firefox-112.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9e968c177b199b5bb6dc196c591b64aef4b8c3f801f203cc3e41f77234d4e218"; + sha256 = "479b46f22f1cf1d23491a736f0fa4ff5912ccf06c369ad7d4d0bc07859aec05f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sk/firefox-112.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "0e58438f597a87218d9d50f44b60d397f807f11179b8f854ca9387705ec6ccc9"; + sha256 = "6c64b98d54474ec6baef932e9ecfcd3cb573e7d6c1392c6804dcc2f53e3afe38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sl/firefox-112.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "b66743d01ef65d1fc3be41741c9458350062df8167dea418bb8e3d7ff3c9e510"; + sha256 = "10e1f08f4749baea435fd86757bab0803e91d06a6a861266edfa3cb31bf9d933"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/son/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/son/firefox-112.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "106a68c050abf166fcbe6b0e8aa96b6c3f75c4165bb467fb628f0b9ed0284c96"; + sha256 = "36c7cbcd1484dfeaec8a705f88361907a20c445158d369f8d3cfcab7c62ce3f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sq/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sq/firefox-112.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bd712df03192b43cd45202673f34dbfcc4a28d6299d0a0a5c7a4ceaab06eac27"; + sha256 = "8546e98da2258e93cec5f0e8644e9527ef350752f5b5c00bbe2c1cfd1714ea35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sr/firefox-112.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "32b4563a2a1a595d95299eee00731614e9ec117675b8a0063cd2fe37c5d3cc22"; + sha256 = "882a878e500fd9263beeaa798d39f961d9c5d2eeaa4d888e21ab1ee1af40d4c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/sv-SE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/sv-SE/firefox-112.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "17767bd33ca9f86236b909ec58116bfaa61b3440afa698e4fc9ae3fac89de0f1"; + sha256 = "e3abe18d5c611f9cbbd01d412548ce105e5adae46f1d91c07d0e0b2a9c0b5ea8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/szl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/szl/firefox-112.0b2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "af69ccf3e497a9c3c5e36f9b808f21c7c6a81b2f8e5fdbb5187d53d2e880976f"; + sha256 = "8922c6f901b721b9a04a7e312f7ed2f5356b7d242f1eea46e56e451a6d857704"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ta/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ta/firefox-112.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ff8b14add93bc4395e8be6fa8f6630d8a7a2183a64a038a8e152ce30dea73ebf"; + sha256 = "ded7f0b62950c98976dbdf3aae278a9ce276c4af426348584d6ffc64ffb21af9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/te/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/te/firefox-112.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "b9db822d4afc8d72cade1e03b396db1bfa96bc00caa66fc93be70f8509e0768c"; + sha256 = "3cfe5876e38f2e27116c7b6d967307075bf29785b62c8c654b82e10b20ff90b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/th/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/th/firefox-112.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "67ce391735971500b8b6739282fefb781cb9a67140e8d508d65715d2e613d792"; + sha256 = "481bbc770777e74f89f9be8e9754ca09ffddf7d27b57fbb69f51a7abb961988e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/tl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/tl/firefox-112.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "aea24e2cadbfd9cbae87a21b5ff8a24c8a8fdde1f79b2b44637a779eccd2ecfb"; + sha256 = "c6b8955e9e3dfab1df30dbeacaebe6996db8396233744066b097230bd25b255e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/tr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/tr/firefox-112.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d4960566c8b33b4c8fe2b7c50d6af9e5bba2cfc2e3ef6dd0c3e96b36a85d4a0e"; + sha256 = "5a9b5ac4883f21123e538b90ca46240e7049b431aa3600e7482258b6004e7860"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/trs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/trs/firefox-112.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "fcedca9235e77dd06a53afe0ffcec131a49fc99ca0fe5edefe9d31287cfcb5da"; + sha256 = "f3783058be21631d7171655374bab478e774a177933f303625680715abffd35d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/uk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/uk/firefox-112.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b5b041aee3b4c4f205e8ef59d22f6284112b18a273fbc2432d2ba3f440b71b95"; + sha256 = "b299304e04b028725b9c9d5717f452bcc401704273afe52287e77e6174263de1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/ur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/ur/firefox-112.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "192ea167b65a86b9834982d017b9100865fab79cc0cbc174df137d7c1d4a213e"; + sha256 = "8133e3d5d0ee4bbc0bfc0a318888fae6550fc991f538c0840631862c5d813ea8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/uz/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/uz/firefox-112.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f6abb675ed43c2a6b346b8700603fea938482e2492d4241ec63620b19ad6f93e"; + sha256 = "a31eff2ff348d6912cfcdd61a8affcb6df273d0f8bf4d335a30a27f4831d9694"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/vi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/vi/firefox-112.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "17a48c248e13751476e83be211ab94643311d62051ca7b32cdff942623a9a301"; + sha256 = "4d8b37a549c8563237bb05858fc461ec37f51430502e66d0339d9c05b2e39829"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/xh/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/xh/firefox-112.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a60b7f5c90c043c9c2540527dcd689d08e693a8348d1c2c1241e1f63e66472fc"; + sha256 = "41d26832882ecf6d27b60179eade9d3dc8cfe1caf3d05f6d9b427e44e3483a7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/zh-CN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/zh-CN/firefox-112.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "13684be7d69c332457e7c1f97072869ed87900744ccfa5dd9c9b198716c3b4b2"; + sha256 = "2d3e6f2e8a1c6ec8ba9e6d1b8533b5509abe57f00f191b4dfee4a794196a8057"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-x86_64/zh-TW/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-x86_64/zh-TW/firefox-112.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "eda9bc5547a095dbdfda0554a07970d75c5b8b4a421c5c79bf7ff06ce44245ed"; + sha256 = "9567f87bfe116e7d87a74a4cfb9a62ff9f7b5836660aabbae4b19b35ac501b32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ach/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ach/firefox-112.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "cf0f925a584c5317b420d36bc79f8cde96d59f6996b65a200908f43990a12914"; + sha256 = "86fc72753eda740d36a7d266a40baf1478a7f2f44215ac3b8d933819bf833253"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/af/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/af/firefox-112.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "18be90927891a5c05ceec6572004dd0a6f1a0859c6e01b476473908f91212f5e"; + sha256 = "d1e3d273ae8deb2c08cc063cc0b190419429b2c4d31f766d01f287f3687da194"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/an/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/an/firefox-112.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5f63450e0539fddcc1038610be1ba0cc6b2be4662fd9eb6719fdc5d4c31c6c68"; + sha256 = "0424e520e5a607486a0b0ca49b990a246885438db5792e5ae73bcc818814d271"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ar/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ar/firefox-112.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "f636c78f6658e83adc5610b4c27c75bd3673a60ad107a9844a8618eb097766ad"; + sha256 = "426e28278444abedc3c89b9a9bd5f3e8bd780604c60fc6aa6d2e3f870f2455e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ast/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ast/firefox-112.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "67f4263d9f41b46403ef98bf13b0be52b25b495cb3b65ea215e987178af717f5"; + sha256 = "2fc2fa7d00da97e396dd0131280bd5998bc602fac0d958b35e48ba6717140e9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/az/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/az/firefox-112.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0992a93710781628687b5869338b6cbe76a1c8341f76057bed213eed08c2eb5d"; + sha256 = "1a1920482d20fe5eb103f6196213ad1420af52abb06a936a56d63d42437b1be5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/be/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/be/firefox-112.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6e3b6835ad6d71af0f7b9945f26cb3bdeae35143297f56850bdae17ede9e87df"; + sha256 = "b468fa07d58a4df4084826567895b7686736e248021f01d0b81e73018c8f793c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bg/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/bg/firefox-112.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "acb71ef9be3016e639db77aaa0c7ad74e47797d88ad42bdaecdda7f63bca0b42"; + sha256 = "3a69a522c7984a774e58560188b78530f50cec56510d3f3bddc07e76d17d4116"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/bn/firefox-112.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "184dba37d13b8b59c9398644ecd674af2284054803f1d576e0949a6b865a0f30"; + sha256 = "2ec4fad1bab1ca7141c4a77d30ff0295be3862fbab5d601e57204e01787f9d0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/br/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/br/firefox-112.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "1c08acbea74425df40948691c2212631fdfe6e0c2eae32db0c695623ab0cb88d"; + sha256 = "7f0952a7c568e2729846f9adc7efd5a68f589dd5a5ca33e085048572b16e0862"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/bs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/bs/firefox-112.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "52d15fa6ac4bcdbd7e2eaed2ca782ca35392ead5481f5b2388b3d6e7f98874b2"; + sha256 = "0fab3a39d619f1c618df1da23c7bf38402c14d27c2270a7bad355c2e4153dd62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ca-valencia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ca-valencia/firefox-112.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "59ea849914caf82346401f0831add849c7db0812a8cc737fc3d927d82223ea96"; + sha256 = "b0ce82c7d514798fddce87c7b511636738618d849395797298d692e3c80f194a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ca/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ca/firefox-112.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "79393e803a125b2026d8ac4a7ca39e4ea08792c4337046241578684960746665"; + sha256 = "3f65999a6d05aa92ca2e7c6ee0f2b5d998ca024b02de219330dfd8d55e3975ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cak/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/cak/firefox-112.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ad08d645469f71030af139985de3c2fec86d98a2d212e31a24975e899cf5a9ff"; + sha256 = "34b9ea098d35a8b3e851ed21ff40883f9e4599401312a03b2340ed6c5b078c0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/cs/firefox-112.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9096779a6ebfe0c3f95afce66e6dc8c27fe8a5380ae95d1f252a70f6571ece46"; + sha256 = "b1641da89fcc3228ed20ed498480c7fa038c8f71952379ccba06e8fb12909f6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/cy/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/cy/firefox-112.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f2c98d60f624a4bb19482516abb0734f6066600cd4883c0a5ba8fd2e05018bc3"; + sha256 = "504f7a2da4c55da4e8f23f3720957c4c4aef2c5928b828eb1d755add0e2ac662"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/da/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/da/firefox-112.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0e26278a6b4c7ba649842256cbebcc8130513f9dc76d5f878f9610ba59801df1"; + sha256 = "98d0809c79b84c38a0f3abb9f0f671b1ef9a39af98e81119cfddd57f5896a420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/de/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/de/firefox-112.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "33c184d7f74dcdc7004206bb4db1810c8d96b8b64adeb9f5b9d312922b3100ce"; + sha256 = "168f86a353e3c957d8f06456c0d812d77594650eee1f9ecb11abde4b3b233c40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/dsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/dsb/firefox-112.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "46833d7749b4eaa54c2cebee5d62a4ae473f55a136617c57db60c2c3da264e47"; + sha256 = "c8b55f26695561256477ba1cae2a96834b4ec5b4cd1335e15354d60bb87f50ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/el/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/el/firefox-112.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "20754336bc44e34cb8619d77fb4843068ea2eb8c2c9516060af650a17ebec943"; + sha256 = "f421644ddd383dcd5ddeda769e089100e9fcd411fbd905de3586bc65aa6472e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-CA/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/en-CA/firefox-112.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a1843a6aee18f2b996a2cadf5a07994138b9a721e9bfe8790b168021bd77724f"; + sha256 = "43ce0669004841271ad56df70bb40737566528fdd76039cf068b9fb0fc5077ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-GB/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/en-GB/firefox-112.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8db377519662f9d2cc9a55f493105ec184c157dbb2426fb86a1f3b109cca213c"; + sha256 = "5dadea5f50c87add40108d844dd3a9dca7848371e0d23e64a2a012339769b671"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/en-US/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/en-US/firefox-112.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "7ff7a066239aea60634796291196b083bc2d5eb855bfb4e9d7beaa24f6f8d262"; + sha256 = "fd9070fca4f57b1fcd89bcbcd99af77baceb3a1cf9f6b913ba872b6a6bef7981"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/eo/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/eo/firefox-112.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3326717180afc0580b20f36a2a94e375baa72194f459f09c01f72266c51fb4fe"; + sha256 = "2a3fa752b56c66a1c263c895e67b7024dfe3a096faaf0d02d579340b85bb3997"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-AR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-AR/firefox-112.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f8fadc3a9a8406e4b408c80900ecfdf0e982217ec9f8c0347f0882698c5a11b7"; + sha256 = "09f714d25a3bbec50acbf1c034331c1d874708efe5a9e2b6d950e62190983bf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-CL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-CL/firefox-112.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "8ab2d5752ccc1e33620650f76bdde525f078fcb2b30769641a639de3fe90b6b0"; + sha256 = "b13ca7876f86848c299631e0748038beab882a79d3d73eccbbe12270ec2e168d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-ES/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-ES/firefox-112.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "547994faad72d930850d7fe824ad734f6ddebeaed9b27d9f60324ed472b8a11c"; + sha256 = "11c4e97e67a10d83d5449ff5997086e5f5841be8967e906165e3e0d73c3b4361"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/es-MX/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/es-MX/firefox-112.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d23ad96f1a70355e4a710e751f7d1222b5abb630e8e28136cb455c4ffbef998c"; + sha256 = "5d816f8ae4d9bc9832cd504942c8149edd6c9b74c5c2e0badde60650405f0449"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/et/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/et/firefox-112.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f8d8bac8b2fc2f5267f53f2bf7b83b92bc64d58cbd53f718c49ed8da5c7318a4"; + sha256 = "552ab594c7bfeba7349be8e41893384270aefc1ecf2494211ea545de1cefa31b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/eu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/eu/firefox-112.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "587ad4225cfca77855961d170c1cee0680459b115793f4dd123ba38767abce92"; + sha256 = "f6ffda74095133401b9e46c106d576b7bed246496f36735832e8b61ed19e900e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fa/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fa/firefox-112.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6d54ea2900492a74f4de0720d8b6630b21708ccb0460654a7ed6fb0defd34cf1"; + sha256 = "e6e180e29d549c567258e92f8473058ff93c0f06387ca8e01110860d70533ed6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ff/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ff/firefox-112.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "2309289fe4450928b37cdab4070aaf555b2f707018bdd0af1879763dc495fa02"; + sha256 = "68ceb489b4644c248318497e03ae30a6bb001c3b04acd0c6090fa5c254ffd210"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fi/firefox-112.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "614c2710d7498d8527c467e344ff4475e1e6741376166ada64c320335f9db7ed"; + sha256 = "4ce32db7753ffa71a3fdf0f53f5e40dec079aa4ef853b0feb106ef61d77a542d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fr/firefox-112.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3384f827b4d4abf8955a277706ce0de2a2f3307580d42534b7183e861b86310e"; + sha256 = "05bc65ed25e706c8986399e8b63de60bb0ffc083597076026c765f730a0eeca0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fur/firefox-112.0b2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "f9c8c5b61f23182cad2f028903b921d7d0b106324278c9b9e7057ce35bd592f2"; + sha256 = "53f110d7eabae149501169be92f6440a4fb6eb78117c9f4af85706392d79e28b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/fy-NL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/fy-NL/firefox-112.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3a6ca2363b6eb2a240c53e13bef7a8feabce2e9450d15cbd99d0267406af4853"; + sha256 = "e000e7bcf9895be56486ad6b4c38add84a5040a03e521971ccecea26f3a3be96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ga-IE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ga-IE/firefox-112.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5f8d2a9234dbff2c7c3b416bdaad877a945346d6ecd3faad98f25643cdb32e64"; + sha256 = "c8521aa00842e685ab031a73550515e78c270816c6c2c315b7262c8dc607f3e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gd/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gd/firefox-112.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "7f30aec3a02c3f092810482e3d90ddf93aa7304988a75d8391eaebabaf474bee"; + sha256 = "19e8b5db0f621f278cfdf4c455b69ed3dd185f06a5e26a8221495288e39faa2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gl/firefox-112.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "df750038ae58b9ad47db756ed5e009c3d633e9444f48b9d1b2ba0e9de5784318"; + sha256 = "6b00b50cbdbac600bb052c26cf3c8f58f39ac9dab4c1a6216f30ab551593a825"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gn/firefox-112.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "325d66bf2399ebc62c95f263b20a2c294b396ebac31de454d94d31f32ee6f6fe"; + sha256 = "954b4c072c73b536c6983ef255c714dd68faeaa024618ee50c8945185d290935"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/gu-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/gu-IN/firefox-112.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1f2b583782ceaa153cb52ce0a787c51541131f771682cca2753dfe3d96cb92a1"; + sha256 = "90c07f61193d579227d3a29d366ed1478a16c1896554fc987f43624fc5f09f36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/he/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/he/firefox-112.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "aa5f1242cdad391c66bd799977c4512e494333f20ca66db180089c5916fdac6d"; + sha256 = "a5dda773b34679a43984ce90c7cf09b21d7b6ce113fc77693f4620a4fc2d7caf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hi-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hi-IN/firefox-112.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "9e3ec577fd89ed029a05170a707ad20b650282fc646a39ebff63f858a2f259b6"; + sha256 = "547b62ecc5fcea06bef7d9ae8289049c923a17a8f93d9ac13dbc44a1052a9ac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hr/firefox-112.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "119e846be03a97aaaccd846b9dfcc4ffd9b74db6065ddb9e20c9755c455d3d10"; + sha256 = "49eb4f4f4adfdc140dc78e931c161cdcc81665105c65b42c8c42a35c80a30f24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hsb/firefox-112.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "efa3e76e979f1dbb01fb04254de7a307c78770acdeabdd8dcad3d042177ac72e"; + sha256 = "8c15c32c8ef5b44efd66948a8f0c9cfcaafecddea8ab0d5a1d3af7f7cdda60c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hu/firefox-112.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "44b163479d1c4cd7aba090433dd212a71ef17502484f9476036f0feaff471fb8"; + sha256 = "a376b005b88e238d72862597462127dd8a1086c072ca133190ecd5ffa31cccf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/hy-AM/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/hy-AM/firefox-112.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a2ff925d483f13b08aadd94444dc01836b1efd66be4989ee643f347933cfec01"; + sha256 = "8b8959d88b066a29c0fbdce3674a613840d8b6ee691f7e7633e44a05ad0f455e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ia/firefox-112.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "84a2b7f5ba2713cfb0d208c8727c52c51d55a9f3fac879a069c523b3529b67d8"; + sha256 = "ef61b675d573ae28886f99cf8dded130049b7211abaeedafd9ed1cd7b6caeefe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/id/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/id/firefox-112.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "aef00fda24e748c845acf9357e84c2136c399cf6b859227dca8a4775ad8bed83"; + sha256 = "4cad3aadf08bde466e269538bb86126ba24bbc84434ea846148124dcf8aaedab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/is/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/is/firefox-112.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "34dbed0bfd8dc823247746938b81d76f7679d99da8e133927c477ec62ab31b50"; + sha256 = "138d0488679d1404a9008726c14285f84b21923b55fbc0acb13bbaa5bbb4a07c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/it/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/it/firefox-112.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "47a2e1c02cc85cac00c97342c8f4ef329c2925ca7b7427b20b426a440d4f3dd0"; + sha256 = "e9a48a0143ad94b8d896379d90e8cb6345eb9f83013c0a5af8a65a8a82785e26"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ja/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ja/firefox-112.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9dbc7e2a054d9d0a4579a52ec0755d5e9e18a80a5a8ab14f10ff799d2a0c9e8b"; + sha256 = "9308c18b92d0632044b08b8f379ddc844027c3164e3e7ec0a2334881ddc91bdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ka/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ka/firefox-112.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "5bd5aaa044b2a2873d6174ceabac557a8592f9b79e76afaab22e3f7a9bd03486"; + sha256 = "dff35b11c31c2b88408124ac9bb18dbfacd8ed995757fb1d029c6093cbb0f876"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kab/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/kab/firefox-112.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b476b0141126a7bd877fede45f3e3b5d6cc3011b5fcdd4386ab7122a5d7b086c"; + sha256 = "8754269b4a19381c8d937549753bc28da50b2a983e50c30ee892d59a577b8466"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/kk/firefox-112.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b66cdf440275d4799e71d34a07fef436dd12eff18f51448b4f2f02020dcc6ceb"; + sha256 = "ee6c23c675616aa7914eae572c459ac0d24414e2a8eeccb02c9e1beb7d723a8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/km/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/km/firefox-112.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "fa7bdf3c2da92f7a6636bfa24658ab355edee1631f579f3ecfa9cf8cd8ce3de7"; + sha256 = "2b5e981a9e4f6c9bf35446c40c7089d050a26e667e1c09de663a1e42561fcb4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/kn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/kn/firefox-112.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "4dbbd458324f85b8a7eab2db3f14db21fbdcf13f6e1149e8c11b9101f6518ffb"; + sha256 = "329b868009d91299f6e6986480833088ae3772499760df05c593e09af7cd2372"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ko/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ko/firefox-112.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3f26be2ade71d4bae842918ab87db1603703aae22f868cdc0e803b6066644986"; + sha256 = "86e1b61b8ea6a684fedd564a7a77306f86a528a1063ecadacbcb6472969c73c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lij/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/lij/firefox-112.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "be1f40281f13d8381bd2d3c33f4cfff9d6a7e2bf7e759ed9a03b2928aa71b0ed"; + sha256 = "e26f1d2c2907b689e9c3b8e1eec263c6af0ec4a45b6e5a49c60bd9c4106043fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lt/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/lt/firefox-112.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e09be22cd422296513b6139640e33e9288abd82361f0d7c4951eb40786f4dbf6"; + sha256 = "3611dd950e4e075fd6cfe93cf1971b58b2646338e496f0c1a6c5ce1fe53d75a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/lv/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/lv/firefox-112.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "3233d65c85aa14f48e98fa013a96a65ec690e85518519dcef64e2af1700e708f"; + sha256 = "3d7297474479195d1f6f7b84bd10ab5e3d90d5f5f125428f90030e9d872ec13b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/mk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/mk/firefox-112.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d5521848f261eafcba30c2b7270b2265cd6cecb2bc0a072c2cb4659f34e19bf3"; + sha256 = "abfc67f3309176423b9bc7940ea9051cfe8d9bc37f8479dfae6aa34973c35ed9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/mr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/mr/firefox-112.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "a87019f3b1870f6d4a074c26505a271c5820e43bfb9741b63903fd8b1a33ef8b"; + sha256 = "7f6cf8f198258974f8eb7dfd8cca9863ce257ef45c9a8d9bc8e47a0a69ad29e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ms/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ms/firefox-112.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "245f864d137c8ca72015f342c747d7e67c49de94893e58fb010d1bb3244993b5"; + sha256 = "a2ee5ace0a082f8044311d8f19be2c85e0a9240c0c0b0fb41de360cbfb089d6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/my/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/my/firefox-112.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4b6a71cec55eb771e61f7e083954cc0423c38efc4e04f2352cd64ff7b208d0d2"; + sha256 = "594a0a72f9e73ae1e0e3457ffd5c0ca9a538cad5b449653ed01bc134a0d9f486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nb-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/nb-NO/firefox-112.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "a92cfb32046d6f246e1ab1acbc7d4fc1ddca12c93638b11ffffeb7522cc4bebc"; + sha256 = "231b5da2221c1b7578c9207be5a66611e4b9a87997a6a9c2eec77ef335875176"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ne-NP/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ne-NP/firefox-112.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "b7cb0ee3f8dd4e1b8b5550444a9c3cee50a64c622febe9e545f6aec463286630"; + sha256 = "fde2520f5560db603f30283fc896a17f6aa60ea1e5b8f2254fb6cc9feb62d850"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/nl/firefox-112.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "eaf0f00ba24966d15aaaedff25d572891e9c4762b046b8349cdf02aefe2e3a79"; + sha256 = "2ca2eb4aaccd6a79f4e777a68bf583103f22b97e9dc2dd6dcd8e566bceccfa05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/nn-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/nn-NO/firefox-112.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "fa744ec3cfff9346070094ef055641cf7704cea2cd1acb728ec940c9157fdb7d"; + sha256 = "a1385b042ec255f9891ffda4e0ebb99bfd44449a091d3aeaed1443004fee8df9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/oc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/oc/firefox-112.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "8097c48bec46e426b22e0bdce252b0ea67c173a6ab3612e66735a4d8392a997c"; + sha256 = "6cc029e84d57cedf5c605117ad1cb8fae390b725810707bcce58c4832f9f0712"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pa-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pa-IN/firefox-112.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "911ecca7d29a5d6ad6371fc2785238a3ed4a99481b752924fc6b48e37779c0e7"; + sha256 = "6ee37768a1724bf68b4f4031f03c2a2307fb9c16d34094d476b1ff14ceac4b7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pl/firefox-112.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "541b825482e5446e020529a09d29c25b8742953315fc30f074c5ce2dc575a419"; + sha256 = "444ce2cdc080c1a61a4c2c4ad007b84dd803bd7f89e44b768af3a90d089dcdcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pt-BR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pt-BR/firefox-112.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7d5a22eb6eb9317c278dedbc016d25a882462a094c0f3e4006594930925bb39a"; + sha256 = "c1aa3fa50b5283c5ce19f65e38c919fd98a6a75990ea04b4ac6efa2633e77c4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/pt-PT/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/pt-PT/firefox-112.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "ccd5a185c8da07def1ed7fab0b4ed4279f8b8b73e9135073bfe6a7a928722410"; + sha256 = "a8e057612f8d1851afe3909f65a2c834ad14a3163c2378e75710ce31582fa4ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/rm/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/rm/firefox-112.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7cffec4453563a4eaf94f5f53422dabf1b4087470bd5cc5d25cca2781ef46f44"; + sha256 = "2fae5f8a4cfe624b0839bb5041f39f9069968e415fee2a2194a915b944e11223"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ro/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ro/firefox-112.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "00cb10d57f563da7cf7272a4c169446e29f956d7dda8d877c7088d35c167e31d"; + sha256 = "4b613170a3804636921d98192be0274c4003862a9abe73db90b3af1f8aaaf119"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ru/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ru/firefox-112.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "18fb8e71fe1b9d76ca51da60346c54c4c0b92b0e95b855871fbb5fcf89e1195d"; + sha256 = "4d98bf5c649863726a6aac51be8b6302ec488bf733182eeba68f613f262ac272"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sc/firefox-112.0b2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "488614b08b8850028e14dead6cbfd69bb680475e3ef08cc09954d201cf614c1d"; + sha256 = "dd681b2f31c328195041dd9fe317d24b1dbccff854c1216d4ca6da416dfbf666"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sco/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sco/firefox-112.0b2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a4bd6d0bac1396ebc9f233468d4c258bd1700fb25c9af473a8b040d1ca3876f9"; + sha256 = "1f0ad138c378639fabbf8e743a17d185eca531642cb12581027274e5c9ca08b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/si/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/si/firefox-112.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "7ef48eb84c4a667ae3faac898e112fa595c1db561a3dfe9116a843b07b8779fe"; + sha256 = "ab295cbd4d3ba4dd4dacf54410f343773f0b77d626b8f6fd60bbff037f6c990e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sk/firefox-112.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "08660dbb36d937a42a0f9d223db550dcb916cf538c9adf4fdea8e72b12b586dc"; + sha256 = "0d15d109730e3344042eaf2e8889af553b1d5b5c19bfcfd7a7792f445fc85d79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sl/firefox-112.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "d31009f1e1e506772db2b43b64ee66e91d6f069d9c423645847c5e67212b2798"; + sha256 = "9d76acd56e898fcd44345c5494b5e955cd45424d6decc2ed6760d0fb2e005b2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/son/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/son/firefox-112.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "f6768a336fe0bb6a8ac92633238cde92fae73e58338379ad27be8f6ab07a93e5"; + sha256 = "c54714ea09a58a9a74f42bd790ecf132a9d47a616b9a8919dec637a1d44aac7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sq/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sq/firefox-112.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "aa1a1fa5d64c611bc53bab303ca463949f1e0e2d5d8b3ff7ba9b33ac7b0d9c0d"; + sha256 = "63f9e4e802ed33dccf69776ec9943166ede4bc776544844d9ec2353b52a25cfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sr/firefox-112.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a185a54d5f29b4d6f2d34a530b498fd3a67636b068279a01427f6f0c29bd221b"; + sha256 = "619add5c2769b48ee10b3b41bd417526b2bf33917e9b5842c0505b76a63f2b04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/sv-SE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/sv-SE/firefox-112.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "401677189e0c0a2c17f433aa4574cf92075ff7e4f028eb6a1a9092e1dd30a5cc"; + sha256 = "7016af55f36b24571a40d220a4052dc452f1e5db95a3f6afbca59cdb06f0d6d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/szl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/szl/firefox-112.0b2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c0039e65a43f59f9495c7a2022d4982849a0ea6fc611b25d348c02ed3dd7d671"; + sha256 = "d1e04b8430fa4fd5539461526197615b29d3c5502acba6ab1cc73b608872e25e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ta/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ta/firefox-112.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "bfce50f6e107d4a49d0349e1ef8234c4b7bb67d6f135f8dddb5512364464e6a7"; + sha256 = "de14f539f653a6b6591914e9a5c28ba2aa15a2c785a1523e245b45cb4538d958"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/te/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/te/firefox-112.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "aacb23547b2a20b4ca5b548694ab3e265ea18ff5fe77d7d77dd00298e73fd801"; + sha256 = "ad76c68b3d42f153a3be66e9c7136144e80d8d9b5a708f038eed2c9e79012fce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/th/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/th/firefox-112.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f87db79ce94e8e964b3ff3a89efd0d53e4a5753854778845f9548aa7d41ffba1"; + sha256 = "afc74679a4459a83bdc4eef2233c10d7e73ebd224c82fc7a92e3091daa571fd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/tl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/tl/firefox-112.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e7e786a25afb44e53c52b19ac545ee455ff505cef4393fe698057df6d5fbff3b"; + sha256 = "f934e3c405586e6bf7afa1e0f7c0eadb2d80934c1053042b6860776e1d6ddc99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/tr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/tr/firefox-112.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "426ee6932fca23e26a4cc6943adacd798c74406c47fd71a023c2f2ef503855fe"; + sha256 = "208757d985bc26286f5110e7f7f792eaeaae0c66e787549a20abbed223b46256"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/trs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/trs/firefox-112.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "47ed2f1510095a6a9120f3962f8ae817c5cc2e6431c6b80583fd64e7650593fd"; + sha256 = "6e905c7fbdc204acba757ac6e8edbb64b167dbb96983946281474c1a4b1860f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/uk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/uk/firefox-112.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "14dc9e8d8301d7ca3a5af0f61d4a2db35c29cad07d083e272aa947454fa47d4b"; + sha256 = "bd560a5e68b99505e4ed22f7dad5fa092d50fdeb6fcdae8cae79482f063a0717"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/ur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/ur/firefox-112.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f02797ca77be238488ca7511d940307d8946b1ceeb31f3ed46e242e2a46fda2a"; + sha256 = "2fef7230abb9d3c8a7316d1845ddeb18448964e18dd3e2d42fbe97a0fd0b0914"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/uz/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/uz/firefox-112.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "05f8d37542245f10bcd6cae6aaea5e171d6ead2c2ae3ee1dfdf663a47a127ee9"; + sha256 = "e41b97e5330293e90ac8144201c57f8c0790498974dcac76f6619fca2ecc894e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/vi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/vi/firefox-112.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "6f254c3ac71ec2eac74c907b89064f72840cabe1555a827a4941aec060edfbcb"; + sha256 = "96058e17e04669bc6be5bd2a51397a6507c724409f05165157b9f8d8a0624c15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/xh/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/xh/firefox-112.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "262b3d430b34a3da6020e1d1ae60414049347f0869e8cde4273601da0d55c258"; + sha256 = "819d77f589915cd2d8b93ef56c1925749cb9adb031ee79f1e9ba5d3bacd67645"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/zh-CN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/zh-CN/firefox-112.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "2db8e3c9f6438576ed774b76b962650cb7f037c97b07f4d1e18f03ab02d1b017"; + sha256 = "92e05721680fcafa7fe089574af964876510d5263ef8dbfeebb608aa0b172002"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/111.0b8/linux-i686/zh-TW/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/112.0b2/linux-i686/zh-TW/firefox-112.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "4d0eff7854d49607316218489212f7a61bbf7b95118140fea8f44a72431f576c"; + sha256 = "008962e0e26fcbdce8306ae9e55a858539a09f653b284d9d3361ae44b6de4aeb"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index cc3b89f51b50..d0322eda06b0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1005 +1,1005 @@ { - version = "111.0b8"; + version = "112.0b1"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ach/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ach/firefox-112.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e4b6897f7b966db543f1b2280bfa148302f6bc41c10b36fe558c7b1c93b6c41d"; + sha256 = "51f1f250a2fff0ee9df3037938a401e49c440adeaadbc919696a2d6899491451"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/af/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/af/firefox-112.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "402c4cc64a64d852306d3f4fe24c7a7298a2a4d8b8c7bd283f988e5b5355e96a"; + sha256 = "bf8a85ba0b579556fe67f26ec19c5d90aab84df81f3fea51247c5e9a9cbbed61"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/an/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/an/firefox-112.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "0b6f6ac27ddbc58ccbdd841fd82ad090df1bf0f4adc014273086a77015dc3575"; + sha256 = "ec3169495ac16d6bb556528ec4b2964b7154582f960e749678a74dd207722da9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ar/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ar/firefox-112.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5348a341bc7200fef4f7417eb56895f49c84d0ac7510f747843e2c06dcba012f"; + sha256 = "b32d5a461349f40677585ebb69e377e17274b205849d6c52abf9de5abe403ff4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ast/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ast/firefox-112.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5fa0e650a914a995bfd7527e204ddb76bc8645b905cebe059e6a9611c36e0fe2"; + sha256 = "aaf15df89db57e72c5376f1ffdb9069d2829de2239d05fa6ff259eefaa6cd091"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/az/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/az/firefox-112.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "be7cdc1981f47ec5b58794c69d2c9af3dd79172f51522c9be83dbcf0bba461d0"; + sha256 = "6de8e904e2cb8aba079b3feae4b64a41eb5faa654b4f8d4edfb5f88bdffcc65a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/be/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/be/firefox-112.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "0ab859b1a17d60be0daa785bb0c07bf756a65b868b7a3fc2cdbf978705c9907a"; + sha256 = "3bc70120a61306634634c556cad24a73b64d74d0a4172cb6206df19ac9888b5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/bg/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/bg/firefox-112.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "7c3a6c15da67366b7ccd169e3f8b99aeded81273ae2d24a9f6249e7e8f8a85f9"; + sha256 = "37d2760c4fb90c3371c1d8fc4c5d82fe3d04bb873857642b1bb32b0403bb0115"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/bn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/bn/firefox-112.0b1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "38d7c927b9a1eec5cff34891852642ae597fdff11b823f88ccf0c442a218fbfe"; + sha256 = "474fa71b1c0ab86162f42b73d92857149df19510f4c7a65e5ff8072b47a584e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/br/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/br/firefox-112.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "abc952c5836fb089a63aef6a0226ec5899c381e803f603e76308105929437772"; + sha256 = "7f6840772618db61c44058bc4e5b052f521e479a350e0e4dde6d66cd0bf868fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/bs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/bs/firefox-112.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d888020f7c33bf4fe6a0597f08d82e8690de278c557b8e1d97535735fc05f45c"; + sha256 = "b7424e14c2f445503b6f9b5cc2746783bee60bf555bd19e870b38d29166211bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ca-valencia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ca-valencia/firefox-112.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "315364e1cf5a9dfcd8d96389659fd82183a9190c7cc4e15ef351f8550a3e162d"; + sha256 = "28e85f3a1838220f88ed466eacb78b9b33b771a3ca5a2e2f92c9f5d1b59fae3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ca/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ca/firefox-112.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6a25a6daba3888437978a62a2bd269034b022fc7969e1145ace5d5d05e568f54"; + sha256 = "cbd21f6be9a4031115c501b7cf0cfb2fa4b4b44f2183758b870b8a9660052f88"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/cak/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/cak/firefox-112.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "add65d41e303f9325979ecceb178f86158a15df11535b3dd395ab92294862da6"; + sha256 = "8347bdec54a5ec1146b4eda865d4b9c235a169edb6c4a0829ff87d4d3d082191"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/cs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/cs/firefox-112.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b8cf05148129eae6f903f47adb20f4853451e7a1929cfb59faf48f1978a6166a"; + sha256 = "abc75f49aca885329e0ab657b8a2ae554ad983d6748bc281c87a7b82aa8d080c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/cy/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/cy/firefox-112.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8018352aa6d09dcb1528510ae343f2d0ebad32e6c8afd2f2e62ae06edcd28fa9"; + sha256 = "82959b89547c41c492925a4d9a2c7e4430c95fc1e97d9072a2b4bc4197259174"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/da/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/da/firefox-112.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "fbd8db1662cbd578b12ad1bf46c010f7229439be362c670776a9ece2e66a84c5"; + sha256 = "bb75e38cded06b58203e0013da2430304d896fd6c9ffaafb64704f53e7f87e0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/de/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/de/firefox-112.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "5ff08217efb014e644375daf52635e225080618c43f6e26953bb7ec7e69ce196"; + sha256 = "017bf08ae063a5c85c938411c2a4b7a7fa1d3cb51aaf64f5b3f640a32794e566"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/dsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/dsb/firefox-112.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2c963a71b2bc50ac31c8988f97d490467c082212f67dd9f8e5049fce49ec67cb"; + sha256 = "5ee9c0882863df1724d923d2d021045fef8a19a13f7b5d8ec25c649b8238af6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/el/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/el/firefox-112.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "aab3dbf0d32df431693a82e7d3b832274e4ac989a55702bc61994d212ca2c64a"; + sha256 = "b166521a31c6cea9400e7623d43df3352f96d5fb3c0edc6a0a6666462ee6a72f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/en-CA/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/en-CA/firefox-112.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "374410ef85dbe4cab0b93af1808878e214d612410c464bfa74f8f65245c4936e"; + sha256 = "0da1b2e4a928445ee27781bc585f9778394c2e09cb7e2ee0df442ad488aa2f84"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/en-GB/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/en-GB/firefox-112.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "bb48c387e3e8ee6b6ebfdf888ebda7ee58f1bac97541e3f9b88e6ca0eed84fbb"; + sha256 = "3bf1bc8c8b45f99e7166155ed7fa2de7647d3a47f70186fd70f025124d4bfdb1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/en-US/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/en-US/firefox-112.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6aee747b92f5fd6d1d37413e456aac45d1b77f692089316bf5b00b894a83e27b"; + sha256 = "c54c1f52ccc8b6cf39353bb3c034106a09de1ef5577aa5f443d5094696ae750d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/eo/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/eo/firefox-112.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "b0692b9f6c69a78e3fca895432b16a55c5876e412470b22b4c53e3e96a246970"; + sha256 = "3d6f2b563d63665302c504e5ad1f6f9a4c17a6b0f955b1eccbb81937565113b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/es-AR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/es-AR/firefox-112.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "11db0b0617d6217e5be38958b84a91db379883967f31ae872b947a965b330714"; + sha256 = "053f1fde4bb52c636c08780ea2670c9e81a40be81832bb276bda12be30b689a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/es-CL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/es-CL/firefox-112.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "490a7989700246760aa4ad7716a8326900905716e24ee34d58b97dd0a8d03adc"; + sha256 = "cbe30f81268b032a757f108476f1fa424e76d1aafb96acb47f48b0008b3e9ebb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/es-ES/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/es-ES/firefox-112.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c74d97c15231f7eefe32c96d91fb519a3099399ba7a0c8d0b520e300afd137bb"; + sha256 = "e601fff8d25f15a45811d4ee8e235bf93f0c8dd20d34341eb8da43ade1147391"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/es-MX/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/es-MX/firefox-112.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0cd9d9b8e3abcac86665ad66125664e596341712ff65765aa490b04563146665"; + sha256 = "3b25544eece15ebd42d4bccebdb7db7907bda7c3b080f7a289052b2577304ae4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/et/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/et/firefox-112.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "bae9e6b3b9fb9813a36a5a6d92ed125d7e6b70095a6df6f40a700442f08b06f4"; + sha256 = "88b3b39a5030a9433e11c68451df172ef7b3bd276973d502d7459e23d0b8abd6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/eu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/eu/firefox-112.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "aa5df25429c0dd7370113ecde7f3b79185663a1ea7ec5c79ddcd36de0631354d"; + sha256 = "b50f8c3f0422bdcf48069453486268fcde372171c97a3d74289d191852510575"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fa/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fa/firefox-112.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "1b6596ab5ca5542f1e81fd6636d3ebd5b653b36e0d1309f74acc65cc6b0f6026"; + sha256 = "b7b757cf5090f02179e73b792106eebf67d8c06e064eec4ecd0d0f0b1043cf61"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ff/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ff/firefox-112.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "991fc136c1deff6f9f53b94c49e5ad3a4539a07c557f81a8176cab16328b1bd1"; + sha256 = "3073dc75e9d5526ce7431f866e584ba63553303f8511f76438adb891eb494ef0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fi/firefox-112.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "73d64e461ac095654d26cedd274b6d0567bb3848f8b07257d0047df869be26b2"; + sha256 = "ade2216cda1cdf01773ad52fb89c04360e491459e775ccc0d8e05fe2c3f1939a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fr/firefox-112.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ab4ba364b58c05943535a2fd52d8d62b43552226087d29add7ceafc08f8ee080"; + sha256 = "b44101455cbd19cc065af595aab52059555a251c24100379ce59e26d2880936f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fur/firefox-112.0b1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "e72c18c7101886abcbca3d0b8365743ea1207bf29e45133bf64cfcf52755e7fa"; + sha256 = "46d817230f1905b992bde3af2489b753e5830191e852961d07040937062c949c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/fy-NL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/fy-NL/firefox-112.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "2f33e358fd958655346e9f5b067a7ea41e2ee399692ca4ac50ab24a487944378"; + sha256 = "e10d9b7c49c9f0c1225826c729433946cce932302852832d5a70d2b86f2e7c88"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ga-IE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ga-IE/firefox-112.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "d0e0d93511c4ee96e79dd7892d2bf9e752ce895c16401ef4fc0c62deaa70d48b"; + sha256 = "5e38b3875c5dbeabc6f66dd51e1593136b3a45d704921be6f8a36c7c35706bf8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/gd/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/gd/firefox-112.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f1fc1e0e072e815b3c5f7ca78c6a19e07e9b9738574df3dfe14bc81aac27ff7f"; + sha256 = "5062746cad2000f282a85cf5cbafd5757afbcd655e38ab4d6429a52e083cafae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/gl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/gl/firefox-112.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "30b3f3d6ea7c7707b9506468caa9a4960106bc8d4362122138400102ad5f21cf"; + sha256 = "93ca5cbc822bc45681e5e06a75400df28f97462de1c1d0981f98c16e94f35013"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/gn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/gn/firefox-112.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "c50a71c3c84f5136918565828f4836f0ea27e8622e3d0fecf7589ae0fae30529"; + sha256 = "4746b5b8055d6f212443d9bc551c1a863ce4a9874a8ba19619948cdc6cb9118f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/gu-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/gu-IN/firefox-112.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f51baa081d66fb9e93c9e27e9170eee86a1a213f9fc9b06c5326e45c8fa1ad98"; + sha256 = "85442986bd808d55c4d83a23afcc103c35c0a54ddf31a64b9d3237d805a6f9f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/he/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/he/firefox-112.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d8ce0bb347e9ec8d0863c7e65a9882cfbb0a2e5ec56101e21e1fd0b639d9cbe8"; + sha256 = "d4ebe3166abf22df3f861c6f1e5451ef6edca34a9e9247c654abf5fb85282688"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hi-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hi-IN/firefox-112.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "377104492757f930acdb10e82d79da3a71a0fdd140629f21a3b8bfc2b4d2fda8"; + sha256 = "86cd9fac24b2c6930adb891891f0b199f2422006a43c057f7238b6592c89e258"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hr/firefox-112.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3fe52d6eaa6db9c0ac2e65628eda8dc138cc220dba338f0dfecdc6732ae96bfb"; + sha256 = "ea4ab719fd777065ef8de89fb4f5a57f061268c7fc08a5daed03425746badc06"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hsb/firefox-112.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "efb66ffb24e1b629fbbe30d83c47a0c18aeded0707b13b4a17dd7f8adc57a5e6"; + sha256 = "791bf3ac58e54678e933ca220e4009998dbf277c8020ee09030178ee32c5c40e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hu/firefox-112.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "6fa3aeacdb245ec6d2bde07e8a421e4bbbe62a2d8cfbc04ace0d8a5ee16582ea"; + sha256 = "342cf4ae783ee6c215daa4942d445ef0e2f74483fb2c3e375e23aef75073f66d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/hy-AM/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/hy-AM/firefox-112.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f0ae32d1e74880bcf30f976ae5eabf6aa1a388d034f5ec3f836422b5b4750379"; + sha256 = "504bbf5d5cdf1331079ed09a2ba929e8d9e897040894ec0fb0309468764762ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ia/firefox-112.0b1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "afb6623a136d855f5ff2b98b88e82279171211e0e5611c7090b491a818ba5ae0"; + sha256 = "7182cbe1720507c0c5246918dbb100129db039b03006b4cdf06d4f762654e8cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/id/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/id/firefox-112.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "76178cb800ea33812cb38f9cc959c37e3110af5b9c14a0d2d19236d4399c14c2"; + sha256 = "6db9f226593c6133543a9ae6e8cf0b26db72dbfaaebc304189d241a9029ef147"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/is/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/is/firefox-112.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6b5116ea4b958fc0f9ec22399a12fb726338ba24fbc9900370aea1134e9b9124"; + sha256 = "5404b4b03edcd9448d5c81345c9e1ec6f28bddedf0ff90b47f4998568722bb6c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/it/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/it/firefox-112.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d117003d31f9c407520a5c37240fe6697a1b5fb58ace318f8e8ed3270d8e30e3"; + sha256 = "3884d8f3b2571cfa7ca78b49c2a7fda4fca4a328a13956e1d333b4ec61bb9fd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ja/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ja/firefox-112.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "64e7c43a3e8ab8ad846879d734989555c63a457535ebf8f2424fe1cd5b37df7f"; + sha256 = "e3f756396454164b3deaa4bedfb2dfcd3b94c891a925a06e52f33705ca48685f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ka/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ka/firefox-112.0b1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8314418e43ff9e445d80a18fd01b0507f33baf9e436da664adcb11aaeda9c1f5"; + sha256 = "b2e5ec6662c71900679016e16830f75d6dc09a2aec59142fb57d017c5d27e9ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/kab/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/kab/firefox-112.0b1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "068c704578f587a1e36022f17b1bc80847dae4e7f7b31f45c37ef2c881f2d8a5"; + sha256 = "541be0e1139413ebac9b8af3fa5478497b382768f7e3ea46ade5bfb45e0fad6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/kk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/kk/firefox-112.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e86c4b7ea854a7f3994da65ff76178f9cbc22b12da00575f37b5af0c0de42543"; + sha256 = "a2b5c6944213ca0b379b977def633f19b867fcb42d711368c48005cc390c385f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/km/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/km/firefox-112.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "8278bb53a8e6052b94a41b5618b3d7068b5a4b192962184e1021e46522b3eede"; + sha256 = "83b50d97ac792db6aa8ab267a83f0b129b07c99befd8c529a139bc55f9db5e15"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/kn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/kn/firefox-112.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "7ae5be43c6d04725b8d5c34006e8c5bd0802646d9dd5161260374ff8df76eb49"; + sha256 = "3feb801c2cde74d76566084524ba3be38b2e498b7ab0f8d64da87798a8596335"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ko/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ko/firefox-112.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "443a9b948ed2f28f105cd34184eabb7b960888b1ae7278d4d7511ee66f86fafe"; + sha256 = "809b806fef98e6e1c25a2d607efaeba8e9efc4c3a86d1ccc36d5d7f7f37e52d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/lij/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/lij/firefox-112.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "d202a6f116731917082b76551833cee6163f1804c1ee06cc9dc0a6eef1996ac0"; + sha256 = "e8eaf0534574f4972f974ee3e2db8acaca26b96bb685c1181d5665b1177eb4dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/lt/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/lt/firefox-112.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "96baff753368ec614498cba4280996361fe0017610e062ee4abf67139ba186ee"; + sha256 = "ca8c52113613a8695a55a988d19ddd3e3830eb19be6f20e7dbe5186087bb2d84"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/lv/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/lv/firefox-112.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a194099005d8d9ae9c81e0d87f5ddc6fa6493aebe72e439f8cade62e3686d23d"; + sha256 = "4a78ca9215847981c378091a8942efd687bf428a8c7c0aeb2947f9614ee0435c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/mk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/mk/firefox-112.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "a40b9280719b9f01077d2d5a66c6901f12c0acbd3d6d0b99e358724c15950777"; + sha256 = "c03731a4169782a2c6dab21e60476145f6798b5f99f15724363aa43c8cc9dc2f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/mr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/mr/firefox-112.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "aa352748e78e9505426595caf84b5f69b09045b0575aa81c384353aebb20fec1"; + sha256 = "7e009338695a1742494329b143c755a1d19f653b49f787deb7e4e58983453493"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ms/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ms/firefox-112.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "58cb4814186e716bfb3e998828fe332343908875f60a7e82d41867d9922f154b"; + sha256 = "24c36cb3a01601fcef177ae4b54e6197f0ffdfec54a6e4417d3c71ef508a7abe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/my/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/my/firefox-112.0b1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "939abe00dfec7f1c9df70c5a4c3a3faabc3664731a26740fc7f14af7a46e33f5"; + sha256 = "8c37bd11f97208f8f012ca5d7e708b79004e9dcaff4db769f946a10f973e1d57"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/nb-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/nb-NO/firefox-112.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "5d905f9996816a89e9c82d74f9dbd8ee724eda8748e9e2717f14d1ae6e5dab57"; + sha256 = "0a65b52f4bd6702a407b256b9c2ed83e921c7026287f93f63d447ab9ab0be6b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ne-NP/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ne-NP/firefox-112.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "0b5d81104f0d509b1e826ef2297cb53218e94bb58c882937b3d07e047d31fb7a"; + sha256 = "cad43ee48b5788f5bbfe68bc45b8963dcf6869857fb412d4eb07a63a6009d5c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/nl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/nl/firefox-112.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "158a03de2fab149b76b60e2b93336b04a0cdbbeaf9f63a3d3ea79c8e0c36a682"; + sha256 = "66b088403d9c3f4ae8d8e2f28f7c48468a604e3720b76f06797a46b846785378"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/nn-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/nn-NO/firefox-112.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "dd931c658f0d6461e357f2b0762704b7d51d8ddff83c79d9ad1474ee495bd916"; + sha256 = "00d105ce728179bde448554fecdd6052fac598152299a7284788de69423a0d2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/oc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/oc/firefox-112.0b1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "236bff2b99a3bc1b7db39886733a019b20b3af074888e31331687694722ad47c"; + sha256 = "c6166908cf9eb939fa1e25e88a833329a4392d3968cdc1fbb9375602bb686b77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/pa-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/pa-IN/firefox-112.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "3457624fc5483f8d357fe6020cb3a1c25cc8574b0b914047b58764397bce8317"; + sha256 = "b9960d6ca01ce0485c2d80170a9e1fb1de691bf1aa92c5f4e3996a03416338c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/pl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/pl/firefox-112.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "2a97af06b75f4ba948c02cd78ab1750fb347c84db2fa09d971d0c83d19ee7e7a"; + sha256 = "5897e9105d9ea69540a526c6ccb2625dd8d706e1448004092f862384c85c44fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/pt-BR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/pt-BR/firefox-112.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1273e711a3168029aeb60b96ca127c42082dba67415b96ebffb0a5bc05fa961b"; + sha256 = "d1d9040eb16abfb6615e26ba56456bb10b945209e04ba9951349e3a3fad6a03a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/pt-PT/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/pt-PT/firefox-112.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "01e882cfc7d7e5209a3c769599ae06684cbb2a43fc8b158e0ce2d88ed81c0227"; + sha256 = "930fb2bc665ae6d7609a0f87377dbf7b4e48e8238b466b1fa16c14849c8f9ede"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/rm/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/rm/firefox-112.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b55225d89f3987646595637a1e86ae51f158408f4c3d2c2f3abf20eeadefe804"; + sha256 = "89587145aa8d9d4c681bf304b7370b91bdcbacf88345873b668ab3ea0a501c02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ro/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ro/firefox-112.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3db42b0bbc15c4caf1591f21df0968c289375ac6de5ffbeb5ce2776078a64c9d"; + sha256 = "c26dac3faae365e377d596b6a4ffa9129825ec21bef2d1b10a06efd13aa327a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ru/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ru/firefox-112.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "69117125ea2a0df6605d225bfed5aca36c7c696a5e954d9aaeef4b5dcf27d98b"; + sha256 = "93366dcec9c7361af1b41494e7fc053af400a19b269feb4784aaa0f7cfe9d907"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sc/firefox-112.0b1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "2505e835ad763c275b6238a9a3ae4370ea88671f09fc295abe6868f32ddfd73f"; + sha256 = "c4b45f3396cc92ecbf89e2ccf26fc42ff81409f3161e8a6a4a62319c6e12440f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sco/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sco/firefox-112.0b1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "9798d76b83bebfb94434113816fdae34430741bea99c7b6c5490fdef83309837"; + sha256 = "c2ddae979704ca1d90a58a6a76209c8a6d9404f8b44ed1e4a71f99203f8566fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/si/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/si/firefox-112.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4dd622a082f89e50c05a7f4388ce686f8f41dd04b4d063d4bef9d66d1c3c7066"; + sha256 = "aa550c0da87ed5a750c6547e16670c40fb8abdab47be5c80d0189c7760c06fe3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sk/firefox-112.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "dd7a1db7e909bfa9b89054084fafda3e0b9956a5e379a5321dd1bc4de7379672"; + sha256 = "6045f7261ad2afd4915460e15750985448856056891a6e5df95fedd0cfafbbd5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sl/firefox-112.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "68618ea7b56e5d1d633feecc78651a7b08aaee385bb27033d10dc6e6c3f64954"; + sha256 = "93cd8c21a6d41064ad61e62b78b7cc6879e44fdb9efc3cdb6391f667a7f478fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/son/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/son/firefox-112.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c65c8c558daa2acb2631b7ef3ca8608507286b3a7fa27f178d523566196d3bb2"; + sha256 = "62f34485c3b4ef9125835e293878fe537f1a428d757e30d5c39bcc74ea2e5de5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sq/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sq/firefox-112.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ba2dfcffabd6d4a9b37b7205586371e33facedcbb6de5b6734ac0071e2ee1f69"; + sha256 = "41a323ffe21f64067d264208b25a0a1ddf7ca04336913873d8a0f1ae7e228307"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sr/firefox-112.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c68cfea022918652a8e0346b477d0fe97ac93d9239648ba2f085e603d54b195f"; + sha256 = "5d3cc63dea5f51039cfbf8396ce38a94c0d3a59b4ebfe6bdbc39b5f9e774dfcb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/sv-SE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/sv-SE/firefox-112.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5977903e8770010d72a1329c596751d364e938eacec7f01d9e3d9b47c09d979c"; + sha256 = "02d1b67022ba0177b52b695f118f979e3e4fb8899085ecf72cc1556889254273"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/szl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/szl/firefox-112.0b1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "c5e6daf0e3b17d694c32251bf4f59ef80e005d59afdefd8aec2b62bf0b9ef808"; + sha256 = "b9d4512190d2a21f368290d4978f4d911cf5568094526c8f8cc02e01becfed02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ta/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ta/firefox-112.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "5ba1ba64f83d1e664257de52613c7025dbedf7140503da0c45d5566c13406554"; + sha256 = "ead96fa1a6dead8bfd03374547e2405d2f7b1db1a8f238913de42cde13fb298d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/te/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/te/firefox-112.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "03680fe793073667591a89515d64bfeca23b86daed379ef9b8087323a5ddc043"; + sha256 = "03b89dab2a291bd2edc614a45df0a83e49bd9875487a810c806d95287c82152e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/th/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/th/firefox-112.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "06048d2b6780d9f4d6641a274fbea4f3ca11e43445a5482fb994fb0909dc7ee5"; + sha256 = "2af26ca795e150f88f81b4626a858a2633e1e3b2ecfc4445419edab1322de493"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/tl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/tl/firefox-112.0b1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "a5785db8a15480a9129ab6f5596fe1b3bb01b4634adf23cfe02ddce609f7f25f"; + sha256 = "cdeea682242fa8773d6ed61860b32a3687b461d279966379b0e0c39146dc3fdf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/tr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/tr/firefox-112.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4c71698850877baa9a985569fc63f25bef75570615c4e18c39c9363338ebbb63"; + sha256 = "a9190faef756fdfb7b9e4d555c569a6b0131519d8459fb9222e557b3aaa4ef02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/trs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/trs/firefox-112.0b1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "ece0b6f46b94ccedef60ae6d2802369131e4f95a6bca84206d8c46fac2de4800"; + sha256 = "3d58aa7ada7c84b6cbc5ea125007fb6e1faf3a8cdea959909df92d7ee3a836de"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/uk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/uk/firefox-112.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4186086dc1fe2faabcdfe0166163068c4ca3c25ed73004c32d81dde90bc47f30"; + sha256 = "8ac79435a653daae5b0dcfaf6ffb9b4a4ad685b67b06f8589b07098367338b35"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/ur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/ur/firefox-112.0b1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "77ca5c38415decf028a4dfd1689d992758160b6db3c083834b4a043f35f46377"; + sha256 = "329fbc0e073c8630ffa4d531d0cb7f26a55d73c07fb437861a613f91b4f21ab5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/uz/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/uz/firefox-112.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1d62ef67c28db53fd0821bbbc97ef301bb201a7e2680cea83ca979c3d2d8436f"; + sha256 = "f71ec3ccb35dfef2fc05092d81b141bb2aefa4faab7f51267376ae1e340c09c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/vi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/vi/firefox-112.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cf08f391fc6e4197f6f601104fa0ebbef04ba25c3aaaf79daacd4a96e3c43773"; + sha256 = "73226419139bc03f8febae048d6fd4cc93b50db2e6a19dcd6d22640d3c21a1b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/xh/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/xh/firefox-112.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "45213c9492edf8fe84ee54ece540c1c74976274b61f96d06fd1893fb133c7600"; + sha256 = "1a59d5bf9511d1a792b62b5dd30d4e877567a59ec514ae5ec45952e1f3ac5f46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/zh-CN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/zh-CN/firefox-112.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5ee5479bd327499e37a1015b20115145599b5d146d3d706ad9a174f438ae1079"; + sha256 = "ead9b1414763612dec804cb9c2357a1ffc7ae84a8a9f3c0c9d80900dac50a4e8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-x86_64/zh-TW/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-x86_64/zh-TW/firefox-112.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4b8c64268b976d45ae0ae828f72ecb361f48827821acad7e48e8494f01b5280d"; + sha256 = "969ecb156fe70f0b1c4b2812aab242987a6af9161f65f3bdc1dbfd20776fc578"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ach/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ach/firefox-112.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "6f69fb8054a6453473b49f83bf456326daba3bfd643c01484660914da7c57cdd"; + sha256 = "66045991569ee79935613b4b2b435aa1dbae5ed36cc9d1380fd8b9599ad61a6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/af/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/af/firefox-112.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "36ebcc435c3348676fd3b8a1e9ba698367592c262018ad5ad0a9ea123c465af8"; + sha256 = "f1b1ba98c45cfc9a8dd469248dbefb65e659ce8aaafcb70e1b5b8501a716d98e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/an/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/an/firefox-112.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5995a45cd573129ca4f7b15a6574764fc2099b8dcca0e8a5f6c37fd30f6e86e1"; + sha256 = "9f2c95f64f6b131e1aa8d045cdf67cd899259b2d15534a7bbcadd3441b0ae48a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ar/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ar/firefox-112.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "c09722c62b777d1a4af58346afba51b98c199319bf3cbcd4965a43e4d1d6e5ce"; + sha256 = "a5856f4158803ee2c226fdcff8bf522013726284736c692d8faef57591cd3b12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ast/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ast/firefox-112.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a4de9d5d8d1e7c3fcf057cbc14ff1eee417cb694e33a577c546ef0262277f852"; + sha256 = "d2d212429ee2820e68aecac6b0b90ff5fc9bd2672493c56477b8151832e2b2d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/az/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/az/firefox-112.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "5ee41730dd46f3a763e7e25b206bcdddb19bbed83b9378dc6446efa1e34a9e05"; + sha256 = "3bb9d637c38e3d1572c8688805c38c23e8212a03619396ac85192feb68e46896"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/be/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/be/firefox-112.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fd4191fb2e53bd5c7c9aa4980fc239f79cd08fea3172d7200081f10b32dea9dc"; + sha256 = "ab2ee8d2b0c3842bee542b6444731f1e74469cdc6b9329078640800c7633a384"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/bg/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/bg/firefox-112.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2a3bdd69bd544f4ce25f0413e236a4a6a14a880a101e4c3e08a53436a25e5cb5"; + sha256 = "dd80cf61de4cf84e8f3d3ac2209f5a34db4c611ea0e3068731f0132318b2d4eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/bn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/bn/firefox-112.0b1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3f900e507cdc6497bce9dff1e44061095a9f1e4e134ba8997f3c8216da3df8bd"; + sha256 = "2ea5374085f61be6b90c9f6d42679288d58172dd4b2a576e3cce1aab7e1a0eaf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/br/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/br/firefox-112.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "994675a5486f9dde504cf2070503261740c069dfc7c76c592ffaeea50a50a29e"; + sha256 = "8200b68bb183265bc8066ba86e7301c41e757ffef4462c820aac64f7e2f5bf4a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/bs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/bs/firefox-112.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "7c75af45a5445cecbc6a79eb0d496c6368672ad2ba49ed97d825f3c1aeb483b4"; + sha256 = "f7f242e3be00e29f2495a21c4b1df25a0bc4135d572134a09943b5f6927074b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ca-valencia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ca-valencia/firefox-112.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "22b4e45392146a87af87cb3e05db8855f5106fa940977e5f5e43692ccef132a0"; + sha256 = "ad5adfb048a851a95b75436d0c76add2f3b5e422c7c78c35a64f31050d8bf319"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ca/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ca/firefox-112.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b39958dba542d85a84d6aa8ad584a6c10da72c195f3ebc94c411847912b58396"; + sha256 = "666f7cc6c3bfe215c6f178fcfab36125296ea9da753d00933138a757e51a2fe1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/cak/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/cak/firefox-112.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "30952c36bc1db47adc823571f1a747245c7d6d755f5413d073b3d65c04b129e7"; + sha256 = "a0f24336f6c3bbc3cc215456db8e5f233852ed704aeb300f68844aaa1af18e3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/cs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/cs/firefox-112.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c5e9970c55fb57765ed539e42ad5d301801497e1027947dc6404bef834a6cf4a"; + sha256 = "8cc50eb0c0212c663261094e924ae8d9aa13512a271f9235c3855251445c5e96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/cy/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/cy/firefox-112.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "b73016a0d6cd924dbba755ab642568962236d50d07439c637e7756187e1af917"; + sha256 = "887e6948fd3249a367d10f9ca6d155a92c8d038208d6c332686b3732f1165757"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/da/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/da/firefox-112.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "f0e04f6947048b892ee580b81db8f4402c63a7b2dbcd95606619e1789021ecdd"; + sha256 = "191237d6098a7a3da1d53e37144f328eac704a5547b60e0eb1fb36c952e41a16"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/de/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/de/firefox-112.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "484ee318ffaef22cca94d8c246933951c1b23fdc4f26cbd0d5f7b53ace864aab"; + sha256 = "6ea53b30f2cb50c854c9dc9e8beea0a18447307a3330a0563c73dbc11b4b1c84"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/dsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/dsb/firefox-112.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "7376bf70cc23715a1338ee6a5666a7f60a753fcb91868de6ad4991a33988a5d5"; + sha256 = "c9595d2e95f46726f0e9a607e106e8b622254b002475b18190241cc2d30ed731"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/el/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/el/firefox-112.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c4aa68b64047397803b0f2faf7d32ed464ecca587324d3e57e05de32ab9fad03"; + sha256 = "313a68a38d70c20ec3c0bf592b9d81cc2c679b121dd32fd810358ef2977173b0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/en-CA/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/en-CA/firefox-112.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "cd304731d2eda48e6bf6fe4f2cf8385e2d88a1e9ba433e83ec50fe21c241b329"; + sha256 = "4b2a24724af2ad8e87a6bc0004441700fac6552e1de595cf26639ad5bfee5337"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/en-GB/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/en-GB/firefox-112.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "91f1b42e9fa2fbef7e9c897d7783d9d440f5d8dcf21331acd8afbf5fe36aadbc"; + sha256 = "543eee62ec72bc30834e89789c38d31b5dea134aa63fcb0b79a0234c9831d5f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/en-US/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/en-US/firefox-112.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "a2bd2526ad771145339f95a1557e3a2d71f860275535c523d7b335515bbee952"; + sha256 = "5142e6b3d206fb187548f57a4596650749ed0b6b9f14c7adaac2b063dd364311"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/eo/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/eo/firefox-112.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "03b3ef9929f865057e67e09d6fa80476d29e59afd08d4cd126ad301659e97cba"; + sha256 = "f2e4b1cac9c6f36d7ad0f07d74b3578c470c7bf1e34f84dfe42eb1afad52a6b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/es-AR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/es-AR/firefox-112.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "a5235dfaacf198d0da283681aa44f4e1f82a5a346becb40222cd736622872343"; + sha256 = "9f81560be34608bb05aace073d5eea44641c4e46bc6358f9fb3fb5131cc08777"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/es-CL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/es-CL/firefox-112.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "91bcc64fd63a2bc16526237419888206e26daed3e72e69419563f5ff29a097ae"; + sha256 = "88eb3eb8fac7efda8679cabec17cf77401e9bb6409a5e981f801684bec56f1cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/es-ES/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/es-ES/firefox-112.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2c967151f35113f090b860562c0df0ca46399974338424a279b5dee1d924d3ce"; + sha256 = "9f34e451d30937fca575b862d5471aab44d9890a70dbce60387088c2e9d82b9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/es-MX/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/es-MX/firefox-112.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "bdfbdc5281f706033c5dc1c05d4c8432aa6abe954703627a41620725cc0597b9"; + sha256 = "66350c6ae6476eb04e534e8872fdcb373ab82d97af819fd4c3b2db7b54b37a2b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/et/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/et/firefox-112.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9caf986653aee4623085c4c8e673a9576cece30edc5ca51f913b1e636dda70b1"; + sha256 = "eae317bbd435ae2cbf4537e23a30f98e74b8dd0c36c62fe3f1cadb23682bec19"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/eu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/eu/firefox-112.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2a28f0a6e0eb4562a356bce60686a0afc0ad53fb2a3dc0b058c5bf40bd4e6d77"; + sha256 = "a568e81cd590d23dd69e533f270305650e8329c182dd2c61d90a450c5f9d3f6d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fa/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fa/firefox-112.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "d33fae3e59561bb7562ebbbc79e48a5766079d3db79f7487d3ab6080ed2452d0"; + sha256 = "62f1b20917aaf084f1dcc98470d6701f49e27dc0144889905ea137fe9578c131"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ff/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ff/firefox-112.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9435504067c5b71332d787db2f2c8b521a12511f8ae5c8a79967b14e663b492c"; + sha256 = "df825d4705a712230ec6521be224b425cd64aefa736ebe847417cde407ea8efd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fi/firefox-112.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "6fa836e2178a036d2862776615eccab57139149f1295d13e273e1cc35b32f177"; + sha256 = "55a0ab072b36dd5d7b82002512988f29d5a18e12503184d468bd56b4dab7b973"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fr/firefox-112.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "4e1caef75cbb5a6a13fbdc2a2d7bcdeac0f2b4e83f476f6081c36692623a1341"; + sha256 = "1a9257117d5bbd3794a3cad046f3dcaff41e97b3366b75f04ea0cf2ce43c1567"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fur/firefox-112.0b1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "1990ac58a9225ab9b9c84f03784abb0c8f1c2699ebf3bc8dfdbc89a922079c7e"; + sha256 = "ff25e18bb09efcb9841ab17ea28b8728a0216ff8203359f5ce6a8013c25ab382"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/fy-NL/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/fy-NL/firefox-112.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "9fa1a0402e890f53bef344c019b424df792d2d1df2cc8987b765ded3bba260f5"; + sha256 = "34bb2c52a729f1b5f7b6f7abbcb44f5fb235849a9cfee347d5ccd02be8da1c40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ga-IE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ga-IE/firefox-112.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "89335e314cbda962869cec01e5aeb6d909b83146c940f057be48eb346c6a38ee"; + sha256 = "927d779635bac570ea20bb5e799550bc34896e63a358c09d8234418a61a3ac1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/gd/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/gd/firefox-112.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6d4a8c3db3d0dacb8b73b102134e76aaa765cb4a5bd7b02966ec1f0afc426e5e"; + sha256 = "f6e2d4d65219fb5be08a2f7673665a1333932aecd79179882b315169c563e7e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/gl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/gl/firefox-112.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "d630fb3b3ab82def3caf22c641fb38e0ae8baf7d02a35529b8524c59c10cfaad"; + sha256 = "4d9bcd0194dde5f22314ce8683dad2a0599166eea2c59857f7275682b6428593"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/gn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/gn/firefox-112.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "dc61f2ab9cd63e1289ed603fbdcebeae93194983a522b5a8491da6fc99c7b894"; + sha256 = "a39ca41a2719700c807440c889f5a9b465a7f7993f50d5f7fc813175cea25b3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/gu-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/gu-IN/firefox-112.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "a757b7ebdfe26ceaa22e920760cd24354c5192682fffa76650f7b95e612cea9a"; + sha256 = "8ea50e5afb28136e669d1c550af57f403d98f5c436a053e5e484ef9dad3a1523"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/he/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/he/firefox-112.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d118a5b1bc0b8db1caf16052eff92d846c0e3acfe22b994c448fcdec38eb346d"; + sha256 = "b4fdcf72dc47b4e0740a0c3e3459f01ef20cba6d55007f8902b066300dcc9916"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hi-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hi-IN/firefox-112.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "76c0726ea657ab747ad40a18975c20802298429c82bd94d47a9750100bcb7022"; + sha256 = "445c778079f54dc60bd0b1e745aa753fb1edc69a3088631898f5db6539f5cc48"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hr/firefox-112.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ca920ec313bc7bb6155cafde4c99f935ad8eb6eb2a633b20cee9ca8b449942fb"; + sha256 = "b21ac8a97c4843597dd98dcc51cc7d22413f193a2c6b3a475b130e1bbb63288e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hsb/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hsb/firefox-112.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "31ddb7a5dd2cc4284f8cc6ec5ccdc027645ba9e293e31a173f10966fc21b63c3"; + sha256 = "137a4c278d80bd50894c5fb690d37fb2f4bf41940db90c89d25cb7cddc69e717"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hu/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hu/firefox-112.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "63bacd5c6583e6aa2ab5a483756c2a664e6996fe46b5298cccbcf33fd049bf5a"; + sha256 = "3710e67ae0d57c396ab84aae21fa2a8e0e1dfb9d21c6d20ad79529381a982f1e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/hy-AM/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/hy-AM/firefox-112.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "64c30c1c3d2f05fefabfa549c8c3227f226fc548f3a29f6a275c18680061f379"; + sha256 = "e92d90e0274158d3622a949ce3b96d0c1cbed55df313a58b31c93bdd459f6fa0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ia/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ia/firefox-112.0b1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a5e78f3457227cf9fb79d1fcb64afff0001aa47906d55c5f14933c66214394a8"; + sha256 = "a00f57b53c6c0b87fa00c8c20e25f4a0bef59c36cda2af191253fa95bb34515f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/id/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/id/firefox-112.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "389a926f0bd71c3d40efda1e1011508aaef293a6ae6cd0b641b3f4a9000be96f"; + sha256 = "ec50266023ae4fb76bf1da464c14db16ff8545361105f5994dd84c86f312f6f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/is/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/is/firefox-112.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "49f0897868f7cdcee43ba135e4e2a20e806ca3a5ada71eb972785ec735935594"; + sha256 = "d469462327a58fa2c6335c0061c52ab36bb5252ed9fff9802dc0b8849c7433b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/it/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/it/firefox-112.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "64652575da342f32467db043511a8c6956070852866787109d7dbf6146d5cdc8"; + sha256 = "82cb4044881b176489644aeb7411aed365db1a97910f21f0d171df6a4ebc3961"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ja/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ja/firefox-112.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "817168208831288e66e5dc81ff667589697de72880c12f5c2d6b5ed70d44f502"; + sha256 = "328a66fcbb9805b366a540cc0fb34193b7cc74437d60f94660b3ca990e75db93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ka/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ka/firefox-112.0b1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "aa0cb69f29174e6f54294aec40ab3d0a5d998f59b389b8334f042dd78f7c6f3f"; + sha256 = "116cfde2f18ce1edd717c19033283278cc7675d4ca0efb73ab62b3746a16c1bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/kab/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/kab/firefox-112.0b1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "d0a97dbc0df5ca32ad211e81fff35104c166b5104fef28eaa376991e9a8c6e5f"; + sha256 = "27ccdfba687fbbea6285bb2a7d37dcf110a8777dd52fb5236d5e8fea098d63e6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/kk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/kk/firefox-112.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "438be59920decfe557e1552ef749babe6b56a344710b893490607339f42e1161"; + sha256 = "ab903a0504a0db8ce3cd9a19b82c3bdf6840a4f4bf20591ccc6fa18e31a6d40c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/km/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/km/firefox-112.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "655f9d2bab1498453e81bc9154820e9b90479c588852c207b05c249918b97120"; + sha256 = "80e987ed55d5057b8c48e09507186ce2fcbcd449ea96bcc88aca7df6505b4194"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/kn/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/kn/firefox-112.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "3c46577c779871f730af69e6a63a0687d8adca3a0975e7b36c49d408a459e7dd"; + sha256 = "1bf32ea771d4b9247e6be35033d1dfe5a38e637be489bc15f8b70354fcbabef1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ko/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ko/firefox-112.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c4f92c9e58ae19e2f536bef3c8af2c4b26a6f4ecadf5bfd0327361d92569327f"; + sha256 = "dcedfc29aafaea2599f33496b8a876c88c27d9ab260e590e46916ad4c3be989f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/lij/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/lij/firefox-112.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "510ae40ddcf9192779aedd4ad28bb73e62cc16bcab9d93e9eec4497e4c558d2d"; + sha256 = "35a483dd9fc037c21c5830500ea4f0e98707a19aa999d2d5373489520a940378"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/lt/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/lt/firefox-112.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "108480900b7d7f387ef601c6a185323052a8527fc00e6034f3be768149e6b212"; + sha256 = "3b1283c65ae4e3e6a9c8c5d0a98119b8ef16c70526b0cd612f08aa32b5219494"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/lv/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/lv/firefox-112.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "a73a2f6b6bb8f3bde245f52d3c420500ef231bef0727553bddff25881ed882ab"; + sha256 = "dbaba67cb570ea58cedfa25fd547c86bb9d6e2b1e6da00c7edaeeb8540c39400"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/mk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/mk/firefox-112.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "7371d79a75a7c9cb3fc59e9ee1a40b36ac1d438c0e1075f4c0783cac3ab16ed4"; + sha256 = "8fc4e1ca58d0c05bb542f525ce3dee272ffba567734482c38680e39f12710f07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/mr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/mr/firefox-112.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "63f07ea1ba8628cb0a44dcf0808c53c4a2fb81a186902b33b4345fc3e9cd7d1b"; + sha256 = "7a61c4cefb5612fb2bccb549cc19b84d6aa329d68c84ca4b48ee64a91ea57d5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ms/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ms/firefox-112.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "325f6724072108011d4664f687040538bf88f3a0e9218aa727155e1fdcedde42"; + sha256 = "948815263976cdde9f1a103bb0d497519cb17bdf655f5a20ff8925612fe87c81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/my/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/my/firefox-112.0b1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "63f0fc40b3d950d61ba9ee9a78d6e9fae59fdba10f2b1bf8cf9bf90bbcbf2fe1"; + sha256 = "ca48a482f774ef6725b488f390c15dfdf52077ef701e351fbb574d918e8b96f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/nb-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/nb-NO/firefox-112.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "af32243b16b1fef4806982e0ba5dbed64dde4150f7c91590f74503f5c3b782c1"; + sha256 = "27a1d390d81865142130f497f76d84bff92be708279945d9e7e3449a91050c22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ne-NP/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ne-NP/firefox-112.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "19d3151164c72c9ce792fc3cf94086eb523db5a77e4c077e18bf5a38153be611"; + sha256 = "7c91efd53579378f7aaf6cbdf4981396199cfbca2bd28e462f225bfa5e547f20"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/nl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/nl/firefox-112.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e602d6893ec553e14474c61a918ba3423bdcb7bdd38e630fb031017cb9a7cede"; + sha256 = "0a5a9d0854ce674c2f9c84d678e1424c4bcf07acb9b611698a210371c168034c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/nn-NO/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/nn-NO/firefox-112.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b601172d67252d83317a3f58523f2273530b0c7fa7b3edb1ce3fc6bde6b700a4"; + sha256 = "81d9128d72ed9389828a07e4457e76a063dc984208fa948613551df9f406b3d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/oc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/oc/firefox-112.0b1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6e9366506b6f71f3cd26c797b70a7b13266be64dee185dbb048c6c00832191aa"; + sha256 = "49183189bd729aaeef2970a826aba3096b99a502dcf0b87203ebd55be3f24af6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/pa-IN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/pa-IN/firefox-112.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8f5099c9d4ae4e5296d0d826f9c46045c8489c23f6cf1579f8bcf7b3cc26ffde"; + sha256 = "4b503f248d495cbb0eee8506c590bac655fe2d8ec51691875f61ff3d44d3a8cb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/pl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/pl/firefox-112.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0a5d3730799ad485c09df28d9a6425af9d4553decddb9d15ebad5a527704030b"; + sha256 = "58ef29bcbd101e5b7bc55e414dda6bb4f5c62bdffe98b514fd9cf604eda83fec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/pt-BR/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/pt-BR/firefox-112.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7bc8f6b0222ce4504dd3749545f1d3e7c5f50b2bf35d0c779477df85bd02e8a9"; + sha256 = "57d99f539ad21e31b802f66cc33606337dfb842ceb089c50df795658397e584a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/pt-PT/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/pt-PT/firefox-112.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8802dc061e9a97496db5d88d217f5251fc00c7db61eb94ef773a01550cc87c8e"; + sha256 = "dc7b9fd92a41cc66a09ae8d1ad8f3194443d97a85fc5373222748bb2377e666e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/rm/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/rm/firefox-112.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5e56f1dfe94c347b5daa52141785ae3c2ae6d85ff01cde69af7549e0eba5767f"; + sha256 = "10f6f81e1e2053a3adfd3ded763fc570d49cb8ab5efed014e4726b3f5c4cd0c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ro/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ro/firefox-112.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "7a81f507868bca0e7fff5cc9e31d00b1e74fa9ce23b4b027bb15fdb2536bc0a6"; + sha256 = "d2179ab4ff117acc643e42c0ebba2f527a47e969783a821c765b48e1797061f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ru/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ru/firefox-112.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "82184d2b055bc4206441cbf426a0592e0db4e2940e7dd75a368bb0adbc7cfb05"; + sha256 = "88a52a4d553880bb23c81474c8938b2a3a0939c28fba5c59fac793e6594dbfaf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sc/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sc/firefox-112.0b1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "4189a8125a485490b3595c0752ba935baf378c716caefd4be1880d1804a448cc"; + sha256 = "a1ef861439a0886805f0354fbf22d3013f627a34bf4562498d953318f18bc218"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sco/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sco/firefox-112.0b1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "724ec1e60ebf284db7f7c9b3b42804d9d7d36fa3bc139b0f95febaa4349d32d1"; + sha256 = "afca5820a0ded94fc3706b70c6c25dd151854cac74a55a8a2d601924ef0e60db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/si/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/si/firefox-112.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "73b93ba26e319c174953dd3a35c7096e25405f9767aa1c86d65f578288d2b005"; + sha256 = "5aae00a412b2a4ddbf01fa9346ee1aa11ba219674f62f264c4bdacf469bc1e26"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sk/firefox-112.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e6f897097a92b3d38f019a3d21999b30fd511dbed37a7e4629fea038783422e9"; + sha256 = "ca4052e3531f85b6e1129d9f350fed1835eadc1f3e25883fbfa905168a2d6900"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sl/firefox-112.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5b29e785c41bfa0570881cc3efd4b93d5ac1416fd9bf5f7a1c817133f14d23e2"; + sha256 = "5e6212fbcb7f3f788bac1824c5f08f1e9e1447324f5e2009a29d53dee6b0b202"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/son/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/son/firefox-112.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "eef9c2bcc4fa10c8473d66711580424f021025a8ce7c5d2c4bf96c96c45ea451"; + sha256 = "d5ce0f2ba243a5f50c2fb2ef173a29eb8b02bcf9e3579e6ca4cbbc07a4d3badc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sq/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sq/firefox-112.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "7aee66a28ebe89d41cbfdda8650541b98414ffe5179e122bafab730c370d91cf"; + sha256 = "4e3e6f1ae191af877aec4b31f1c8ab400b1695257e1a762f708848c9eb06619f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sr/firefox-112.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "e90b307e3b2ec5824483b9db02d55f833659793c5dac5bd53eeac623fed51eb7"; + sha256 = "7f329230d3262e97fc1dedfc27ca53006ae70a9e75aee3f7bbcdaf9c90ed1023"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/sv-SE/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/sv-SE/firefox-112.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "17aef104f240537c5a850a4a6bd321b3354c2b871a96fa221a2dcea79af640c9"; + sha256 = "1b916e646338ab8ecdf53ae9f126b9fb9d426906226b693f1c2485b392ff2623"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/szl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/szl/firefox-112.0b1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "9264ec69afad6e195cb19ff2aa0c5e66e37a14ceea62ac8f6031e6ab8f1a4fda"; + sha256 = "d90988d662bc2e5224fad5b3b7929b020fcb189299f53beb8103303c97314799"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ta/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ta/firefox-112.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "9ec6f648f46b681a6bb19e955aefb7e31ed341074b3c41b4c6db3bdc2bf96144"; + sha256 = "30d463b969eb55d09f2919d5fbfcfb3112a32feb0f5176dccf9de81976910578"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/te/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/te/firefox-112.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "59bb33a1ef60d43f274da7c809125c49e446947df932fcd33a062eb5956eda09"; + sha256 = "e8576d2ad2fd146a2c5acc46f66f68873368d8fe8fff5f77c6132ef372302157"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/th/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/th/firefox-112.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f745dad817683afe89aa89e6d86773353d21d0bb59366927238c25f90f96189d"; + sha256 = "3d3ab3141e45525264ec0d0373d2d6692ab03f3f05175c3c5dcbe69775bff070"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/tl/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/tl/firefox-112.0b1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "3380aa1f1f267980e97c828d8877dcb210230fa00863bff2489c7fb84699e732"; + sha256 = "c64ca24d32f856ccc3e8da9e085f80a1967856f8772afa6e856e073d6f55cabd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/tr/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/tr/firefox-112.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "46ddb752092c7d00a68de0167c23ca04ad156feee57c54f677bb0eea1f7ac06a"; + sha256 = "59cc194034044cc32053f2f2ebae46fec0a3f9c61cc9f162ca3fb16dd03354df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/trs/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/trs/firefox-112.0b1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "25e8f27c52c99d5ead7481b8f3f26d92f1ab5715fc4ba1c6ca5ee2f01ea6f659"; + sha256 = "7b0b268e6846b99c95a4eed1b60ce09cc312cd0dc1e1067c561cc800c49c477d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/uk/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/uk/firefox-112.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4b102bade2fe9cf589f098a29f72aa993a256acadb7326648c167f2bee381153"; + sha256 = "50fb5145b51c218b248034c5298ff09f2601567051d017a4fdb71c440290b284"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/ur/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/ur/firefox-112.0b1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ca73db1c3865298c851b7d74ccda685954a5c98123100cbf95a292c09c5dbfe4"; + sha256 = "9d3e6e4146e5572bd360b10dca5a0f60b635c6fe76c685d0a1956d79ea22a5d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/uz/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/uz/firefox-112.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "18feee2b0eb9c03ad065d42389f5684778399169cca59dddb443e1a6d5af8547"; + sha256 = "bad83d2293487b3cba4e870413f6f46c83cfc0375ec392aa55bb886b6bd7f8c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/vi/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/vi/firefox-112.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fadf2e73f49ee4b77b204e9140ca6272727e5213386482cc8ad1803a2034cc57"; + sha256 = "03b43baffe2957754a2d4bad73062f1bca009712c2b03cd6d1eec1610c0cd616"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/xh/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/xh/firefox-112.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "d3b659de184295da22231304c781ae3bf9bd1a86973eb7a85ee0c72b003a5cc8"; + sha256 = "dae05e9946336b2f25a6ae5cb635c406b7b7ed36a3287cd4713b9df5175c3a8d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/zh-CN/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/zh-CN/firefox-112.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "2e0f4a12c484cde191f44b55756627463ebb0328a065853eb76468745d171f0e"; + sha256 = "295d074d2d686d737e633859e196a76b8d7a4b909697f321439496ae23b27fa9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/111.0b8/linux-i686/zh-TW/firefox-111.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/112.0b1/linux-i686/zh-TW/firefox-112.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "419a41dcbf11ca41c44bea73988c9c1305654ad8ed48a00cc2c753e36252cac0"; + sha256 = "06c50734205a09a5675230fd8a00877603fc3a6927ff46c8d79892d014edaa4b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index b0c727f8c5a4..1666195bd7b1 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -472,9 +472,6 @@ buildStdenv.mkDerivation ({ separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; - # tests were disabled in configureFlags doCheck = false; @@ -501,41 +498,6 @@ buildStdenv.mkDerivation ({ gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped") ''; - # Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40. - # But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh - # Remove it when https://github.com/NixOS/nixpkgs/pull/146275 is merged. - preFixup = lib.optionalString enableDebugSymbols '' - _separateDebugInfo() { - [ -e "$prefix" ] || return 0 - - local dst="''${debug:-$out}" - if [ "$prefix" = "$dst" ]; then return 0; fi - - dst="$dst/lib/debug/.build-id" - - # Find executables and dynamic libraries. - local i - while IFS= read -r -d $'\0' i; do - if ! isELF "$i"; then continue; fi - - # Extract the Build ID. FIXME: there's probably a cleaner way. - local id="$($READELF -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')" - if [[ -z "$id" ]]; then - echo "could not find build ID of $i, skipping" >&2 - continue - fi - - # Extract the debug info. - echo "separating debug info from $i (build ID $id)" - mkdir -p "$dst/''${id:0:2}" - $OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug" - - # Also a create a symlink <original-name>.debug. - ln -sfn ".build-id/''${id:0:2}/''${id:2}.debug" "$dst/../$(basename "$i")" - done < <(find "$prefix" -type f -print0) - } - ''; - postFixup = lib.optionalString crashreporterSupport '' patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter ''; diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index da5f18386796..c4e16d432692 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -57,9 +57,6 @@ stdenv.mkDerivation { "-Daligned_alloc=_mm_malloc" ]); - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - # https://github.com/SerenityOS/serenity/issues/10055 postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath $out/lib $out/bin/ladybird diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 4739c7d5a37c..a1a60ff909fc 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "110.0.1-1", + "packageVersion": "111.0-2", "source": { - "rev": "110.0.1-1", - "sha256": "06k33gf2q77w3airgbqmki555pp2yv33cbkivbi4hgz80zl1m4i3" + "rev": "111.0-2", + "sha256": "0kz365pldyancbq029b3v0wpc1jchzywqjriy6276f1kwssyp8pr" }, "firefox": { - "version": "110.0.1", - "sha512": "42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21" + "version": "111.0", + "sha512": "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82" } } diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index 6945ce5245a2..e9f2ea4261ef 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -3,10 +3,8 @@ installShellFiles, less, lib, - makeWrapper, offpunk, - python3, - stdenv, + python3Packages, testers, timg, xdg-utils, @@ -14,7 +12,7 @@ }: let - pythonDependencies = with python3.pkgs; [ + pythonDependencies = with python3Packages; [ beautifulsoup4 cryptography feedparser @@ -30,40 +28,34 @@ let xsel ]; in -stdenv.mkDerivation (finalAttrs: { +python3Packages.buildPythonPackage rec { pname = "offpunk"; - version = "1.9"; + version = "1.9.2"; + format = "flit"; + + disabled = python3Packages.pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~lioploum"; repo = "offpunk"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-sxX4/7jbNbLwHVfE1lDtjr/luby5zAf6Hy1RcwXZLBA="; + rev = "v${version}"; + sha256 = "sha256-CYsuoj5/BaaboDRtcOrGzJoZDCfOLs7ROVWLVjOAnRU="; }; - nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildInputs = otherDependencies ++ pythonDependencies; - - installPhase = '' - runHook preInstall - - install -D ./offpunk.py $out/bin/offpunk - - wrapProgram $out/bin/offpunk \ - --set PYTHONPATH "$PYTHONPATH" \ - --set PATH ${lib.makeBinPath otherDependencies} + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = otherDependencies ++ pythonDependencies; - installManPage man/*.1 - runHook postInstall + postInstall = '' + installManPage man/*.1 ''; passthru.tests.version = testers.testVersion { package = offpunk; }; meta = with lib; { description = "An Offline-First browser for the smolnet "; - homepage = finalAttrs.src.meta.homepage; + homepage = src.meta.homepage; maintainers = with maintainers; [ DamienCassou ]; platforms = platforms.linux; license = licenses.bsd2; }; -}) +} diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 1634c72b27b7..c6d5d6f6cda4 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "95.0.4635.37"; + version = "96.0.4693.31"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-NQv9EVaBPfHygr76neYGACuk8A6Oc1GXAgizMa+jngw="; + hash = "sha256-ygJmwwwYg5lc7rDMkc8YH7oThET+4reFqPTrojtFowQ="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 3ee68ba8283f..a25e46c7e2bd 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-YYUOW3QWJx+XdrZTaPEGs5TJH2lVUJGPcPYYehR3V0M="; + sha256 = "sha256-zmb4T6D7kkAUY+Ky/mpNM6srC0LfzpZ9b1cjFhhKS5A="; }; vendorHash = "sha256-p8Q+oQFbkulcDFdHUoQ1qdO1zsi7XmU/IjnScZogz2g="; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index f0ceb7f269ba..b955f2ebdf63 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.6.3"; + version = "2.6.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-l2cuCS5CtAbmv7wHvccNA+DJ8+hN5/xHWTqZFGyBKGQ="; + sha256 = "sha256-+3d20bD2sxck8fCrMv6Z9O70g7iWdHA5FdFVoLDtY2k="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-c4KvsHN+2QXk/+MJgRIm5L6LtRe5juUF8rw84aVot38="; + vendorHash = "sha256-BqES6nhV17iqK1dsa+2IdNCd1Wl1O6hOBczqxRHewPk="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 0a3069572621..415e395ea705 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.9"; + version = "1.13.10"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-rlZtZC5D5wSYVjP/IHSY9eSfaGRGhtfndkC6PYDMXqg="; + hash = "sha256-PsdaGVBEslcBMNCj1NQozwbrRx1Nx7Z5+jtZLCrJwDU="; }; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 474a27238f20..ec177fe85562 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.27"; + version = "0.0.28"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yC0J6uXL0W00o0BGIrrZ9WjThSgIu5fEgQdyH2vZESs="; + sha256 = "sha256-uIWlOVZIqwOSvFWRIWKTFEp0aToIBo1htUXb3F+njyI="; }; - vendorHash = "sha256-QGzaKtku7fm14ijmE68nqgqoX86IgmEsemlQltZECI0="; + vendorHash = "sha256-CVBpBb8yYkc6/yLPsCPbVhBHecqZ03WE0NcKiH8SGYs="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 0fefba4f5d3d..19017383a5f1 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.5"; + version = "0.20.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-giCFea4uZNztWxQhsYSdh2KtFE0uU0hf/lhGnY9OsIE="; + sha256 = "sha256-y69pxIKGRLL+XUI6iJm+CP5WgMw5BZwWKBiBWAUQsw8="; }; - vendorHash = "sha256-i8MpQsqD1SBf+qPwYTFDTYDE4mvLdpKUoKML+u1027U="; + vendorHash = "sha256-376PGm8VQ9B7/YYYqJyRZoMwAmaHYqEerBW5PV9Z8nY="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index b1b807d96489..aae9dc556a3a 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.3.1"; - sha256 = "10vl3lay9f823qp0cqh4a7fzfkh8qcl0k6jwdjvrd93d4rasvnsm"; - vendorSha256 = "sha256-DPYGh2lUgyYqquaNVRWb2CCAAFi0bm3ZKHNOoVq6dJ4="; + version = "23.3.2"; + sha256 = "1vbi24nd8mh7vpzxy6qbjd3b7ifg16yc6abb8yvnqvxws8klpj8f"; + vendorSha256 = "sha256-sWNaCmh1fbtJOIHMwA4XAyGUNWpqME+PfmbxSFfH4ws="; } diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 2896c9e7b117..e9d948f61b19 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -53,7 +53,7 @@ buildGoModule rec { changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}"; description = "A Docker-compatible CLI for containerd"; license = licenses.asl20; - maintainers = with maintainers; [ jk ]; + maintainers = with maintainers; [ jk developer-guy ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index ee045f5782a9..ca92df03fdad 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-tqp2H8aWPBgje1zIK673cbr+DShhTQL9VQ0dEL/he7s="; + sha256 = "sha256-jJxrBBs8PkYg9oH9MY1RLJb262REmbKciHXiwWTqoRc="; }; - vendorHash = "sha256-ud07lWHwQfAHgVenUApwrfxmTjJKVm+pOExdR9pZFxA="; + vendorHash = "sha256-1MhscgCGSJXkcj5Rt29+xbBX1uGfOS0kmab+DNY/Bt4="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 4c8cbda6945b..e70f3329d67d 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-LXAQSz39dtfSN6ks6UYJtXiTjcVz/a+f+JIsgC3MXic="; + hash = "sha256-UViS9s8si1OuGAiTP2o80A2jw9uh3nc73XjXCtG8Iho="; }; - vendorHash = "sha256-ctkeEGrh8tzWvEsVhcc2Cl3rAMkYQtcxD1b27ux1QDM="; + vendorHash = "sha256-faw2I7cdhWM1ue6Ab2uHZXb9cdelcpoAooynrHeyIgw="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3c0ebda08cab..e3ce152f3dca 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -28,11 +28,11 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-InYRBUjOJ29dbnXTcz/ErPhEMyRdKn+YxHrAyBZNLdo=", + "hash": "sha256-unOLrWai4oMd+1Jc+s6OHLEZLew7HM+zVyZkIprBN7k=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.1.0", + "rev": "v4.1.1", "spdx": "MIT", "vendorHash": "sha256-VAYCx0DHG+J8zzYFP2UyZ+W6cOgi8G+PQktEBOWbjSk=" }, @@ -46,11 +46,11 @@ "vendorHash": "sha256-JOaw8rKH7eb3RiP/FD+M7VEXCRfVuarTjfEusz1yGmQ=" }, "alicloud": { - "hash": "sha256-QefplcJVXduBbado4Ykg2Ngybb/oxf6/ulCgRqJGm0A=", + "hash": "sha256-g+ksw5Yc3qiCGopxGMX9dEXCa3UDXfa8Evxx9qYjkzU=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.200.0", + "rev": "v1.201.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-dOcsD5yJrn+zpX5F0ImIqD9d+iC228Wem/668RtsQNY=", + "hash": "sha256-j+hKWMHnIE6nmRdGHaQxLybeljmheZ7t83NSXVWViZI=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.58.0", + "rev": "v4.59.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-nNQmiPBkIuQSBGDujMZI+dZMwv6xQcd8+nc1cMKrJws=" + "vendorHash": "sha256-TGzTElOmYW6XO4EtMD9MWvdvd1opnFSAVcEA2eYCQdk=" }, "azuread": { "hash": "sha256-MGCGfocs16qmJnvMRRD7TRHnPkS17h+oNUkMARAQhLs=", @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-XcqBkb+de+ikNtrDe33OZHhhv6ed2pXhbXXb7L661RI=", + "hash": "sha256-Sv9e48+2rV3t9dmg6COWfrxnfMaxS9xJAPN1sEPen60=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.47.0", + "rev": "v3.48.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -155,11 +155,11 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=", + "hash": "sha256-XnCwJxMuLysle4+UioJ/1e+FFZ39PkaEkdGGOePMo5s=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.16.2", + "rev": "v1.17.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -182,14 +182,14 @@ "vendorHash": "sha256-IiP1LvAX8fknB56gJoI75kGGkRIIoSfpmPkoTxujVDU=" }, "buildkite": { - "hash": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=", + "hash": "sha256-H9kVHGnIzOHViTAuJnLJqcxDjSRXVqyKBAFfOd8fkHo=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "proxyVendor": true, "repo": "terraform-provider-buildkite", - "rev": "v0.11.0", + "rev": "v0.11.1", "spdx": "MIT", - "vendorHash": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=" + "vendorHash": "sha256-C7bm9wDNEO7fJuqssUxQ4t9poVkPkKd8MU7S9MJTOW4=" }, "checkly": { "hash": "sha256-LhqdFNTc0RdKmivHI6CnBPmtMW8Sml+5MT8ZjNA4rLY=", @@ -382,11 +382,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-XvDsL2N/S7DE+9ks8Y6ZY3hcogzUsiF7VymNK7NnmaI=", + "hash": "sha256-60WydEYr/U1oDVq2YI5W86ivbLw/MRztOOQbTqbDQSg=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v4.0.0", + "rev": "v4.1.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -476,11 +476,11 @@ "vendorHash": "sha256-zPO+TbJsFrgfjSaSrX5YRop/0LDDw/grNNntaIGiBU0=" }, "gridscale": { - "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", + "hash": "sha256-deEP1x5rGIgX/CcRK4gWYbCsV1IKY7CFkwQl+uKhbEk=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.17.0", + "rev": "v1.18.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -503,11 +503,11 @@ "vendorHash": null }, "heroku": { - "hash": "sha256-HRwG8VNl13HdibczNDWiCS74vrRImM/g3zn4MgQQx3s=", + "hash": "sha256-r7aj1plLIqnESNIbXWqgXX+xyH1+iv9GAeKjtyza5vc=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.12", + "rev": "v5.2.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -765,13 +765,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-bf4t4xcA/K4atLyDVzkeLw5zm9sBz/dUBiivVaz4hNU=", + "hash": "sha256-1COn48CDGvRnM4M7tWZd5XxEW0vdeFmpOMEhi3sI2to=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.16.0", + "rev": "v3.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-yF2yk85RLbvmULakODOV2V0Z9dzKfLClUSZTnECdO3o=" + "vendorHash": "sha256-QL9uEO89PwU8UFbLWCytXpzgrVeXKmaPmFm844ABAvI=" }, "nomad": { "hash": "sha256-oHY+jM4JQgLlE1wd+/H9H8H2g0e9ZuxI6OMlz3Izfjg=", @@ -811,11 +811,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-ZERJIZ1nsvvMhZe9hjcZt5F1lFNFV4TP0ifNin+MC5M=", + "hash": "sha256-OceXVqPbjJnPNKbf5vKzbTBEES1+CNCa/dTfPFgdACM=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.111.0", + "rev": "v4.112.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -847,13 +847,13 @@ "vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk=" }, "openstack": { - "hash": "sha256-KUv921SV88aUAsEkJY8TUgmO1h2xC5aUcapcRN1FEys=", + "hash": "sha256-XjOij2mgBoQIgIMkk6U54O+0+ye80qUNJCuwjZx6Nu8=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.50.0", + "rev": "v1.51.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-aoJDRzackPjWxkrsQclweUFH3Bqdcj1aTJuTHZ7Dh7g=" + "vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI=" }, "opentelekomcloud": { "hash": "sha256-fkEQ4VWGJiPFTA6Wz8AxAiL4DOW+Kewl8T9ywy/yPME=", @@ -919,13 +919,13 @@ "vendorHash": null }, "rabbitmq": { - "hash": "sha256-ZhK9zwBaod+s4tGCSBUjW7ijKeucyToXVQDPlMFmIvk=", + "hash": "sha256-ArteHTNNUxgiBJamnR1bJFDrvNnqjbJ6D3mj1XlpVUA=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/rabbitmq", "owner": "cyrilgdn", "repo": "terraform-provider-rabbitmq", - "rev": "v1.7.0", + "rev": "v1.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JAhdryowDvb4LroKPcGrDibjSriSW6FqFbU7+DwjQEQ=" + "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { "hash": "sha256-DInP+DpCBOsBdlg1tiujlmN20WB5VQbeHgOiabEv9Zc=", @@ -1027,13 +1027,13 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-MMWObJRS7FKvOfor2j0QywRMRbGsE5QcyDGbY2CXjo4=", + "hash": "sha256-kkkpXIpioLHBbJCv7t6b17e3Coj4GoYORZaVp14K4nw=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.58.0", + "rev": "v0.58.2", "spdx": "MIT", - "vendorHash": "sha256-yFk5ap28JluaKkUPfePBuRUEg6/Ma5MrRkmWK6iAGNg=" + "vendorHash": "sha256-vxJGQkrbGITool/45JpBqdqrlSeP3xeWMkSLmFh4K+s=" }, "sops": { "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=", @@ -1099,11 +1099,11 @@ "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY=" }, "tencentcloud": { - "hash": "sha256-iQHueKyp1bYj5/hRDmUFENSc5V7Q3+eq3mmYGIvPOG8=", + "hash": "sha256-M1ymjlqA/rynuoGI9v1oO4+vaAWopvFezdPANn4oWNY=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.15", + "rev": "v1.79.16", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1181,14 +1181,14 @@ "vendorHash": "sha256-yTcroKTdYv0O8cX80A451I1vjYclVjA8P69fsb0wY/U=" }, "vault": { - "hash": "sha256-cYSw5aN7TvVMUY+YnyyosB4HjiosXYB7kDiNDQ258Eg=", + "hash": "sha256-HI+/vGQPwQWnTYyYZa5a7N1esWf2EQL2lziuZMv8DNE=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.13.0", + "rev": "v3.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" + "vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU=" }, "vcd": { "hash": "sha256-EG4WSnUZr/QfUT1qqOBOGze5Ztxp0HSB9Q1YYgLXQqk=", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index bc7a2545bdd7..215e3a781866 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.4.0"; - hash = "sha256-jt+axusOYbJmGJpim8i76Yfb/QgWduUmZMIiIs0CJoA="; - vendorHash = "sha256-M22VONnPs0vv2L3q/2RjE0+Jna/Kv95xubVNthp5bMc="; + version = "1.4.2"; + hash = "sha256-0CxB9VOrRoudJVK96mpuQ6etsI+F2dMh4NQTKQXec9c="; + vendorHash = "sha256-3ZQcWatJlQ6NVoPL/7cKQO6+YCSM3Ld77iLEQK3jBDE="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/tubekit/default.nix b/pkgs/applications/networking/cluster/tubekit/default.nix index f4a051c9adb7..afcef293c1d8 100644 --- a/pkgs/applications/networking/cluster/tubekit/default.nix +++ b/pkgs/applications/networking/cluster/tubekit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tubekit"; - version = "4"; + version = "5"; src = fetchFromGitHub { owner = "reconquest"; repo = "tubekit"; rev = "refs/tags/v${version}"; - hash = "sha256-sq91uR8ITMOv8hivwKQR02mMlJpjDHw6RxiwVUrpwnY="; + hash = "sha256-fUe5bMFF569A9Xdx3bfQH2DzbQDRfZ+ewlDL+gK2gWw="; }; - vendorHash = "sha256-qrGzmr1dZPn5r2WBJA7FT7RTqP2sxnrXgbrnKlnpF0Y="; + vendorHash = "sha256-qAmkUV5l5g8/w8ZTYFGYvd9I8NUk8rMYjutenHvTRnw="; meta = with lib; { description = "Kubectl alternative with quick context switching"; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index f80be45ebd1f..7563e8c22d78 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -66,9 +66,6 @@ python3.pkgs.buildPythonApplication rec { requests ]; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index a3978f99df4c..2612aef79d1d 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -30,10 +30,11 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt - APScheduler + apscheduler beautifulsoup4 click colorama + commonmark feedparser guessit html5lib @@ -44,7 +45,7 @@ python3Packages.buildPythonApplication rec { packaging psutil pynzb - PyRSS2Gen + pyrss2gen python-dateutil pyyaml rebulk diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 60c928e0b9cc..ee114446ac1f 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -12,7 +12,7 @@ , sqlite , tinyxml , wrapGAppsHook -, wxGTK30 +, wxGTK32 , gtk3 , xdg-utils }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { pugixml sqlite tinyxml - wxGTK30 + wxGTK32 gtk3 xdg-utils ]; diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 60c2ad8262ca..3e10a61a63f4 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -64,9 +64,6 @@ python3.pkgs.buildPythonApplication rec { --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; - # Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - meta = with lib; { description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind"; maintainers = with maintainers; [ dasj19 ]; diff --git a/pkgs/applications/networking/gossa/default.nix b/pkgs/applications/networking/gossa/default.nix index 4a14571b23ff..4e77b387a84e 100644 --- a/pkgs/applications/networking/gossa/default.nix +++ b/pkgs/applications/networking/gossa/default.nix @@ -5,7 +5,7 @@ }: buildGoModule rec { - name = "gossa"; + pname = "gossa"; version = "0.2.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 142bd5e38272..b31accd2861d 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - name = "cinny-desktop"; + pname = "cinny-desktop"; version = "2.2.4"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index b1c29d0b6180..92164bc068d4 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.24"; + "version" = "1.11.25"; "hashes" = { - "desktopSrcHash" = "eAcJwoifIg0yCcYyeueVOL6CeGVMwmHpbr58MOUpK9I="; - "desktopYarnHash" = "175ln40xp4djzc9wrx2vfg6did4rxy7nyxm6vs95pcbpv1i84g97"; - "webSrcHash" = "45xyfflTGA9LQxKi2WghYdDN0+R4ntjIPONnm+CJ5Dk="; - "webYarnHash" = "1rwlx73chgq7x4zki9w4y3br8ypvk37vi6agqhk2dvq6y4znr93y"; + "desktopSrcHash" = "Fd9I/tYp0ArXo73zfA85JZxZ0MvmVFkgEUi56e19zNA="; + "desktopYarnHash" = "0zlh75f2k1yd9mc9zq2lrm53n91npl771ds79n3m04nbihn23xzy"; + "webSrcHash" = "AYZJMGO53usAH2MiS5BeKt1en3XRncE/zUqkd3gWPx8="; + "webYarnHash" = "0kkyqgyc8k8rih024r72iagbj66f5x3h6b3c1cij474sk7ab2x1c"; }; } diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index d2896b82f450..9aa5f539bdea 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "jami"; - version = "20230306.0"; + version = "20230313.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-OQo5raXl2OIAF/iLMCNT32b4xRZ/jCN0EkgH9rJXbFE="; + hash = "sha256-3kZ4nn6x1xsXWybyuaY9W07tEM6LFvLL4QtDRPRmob4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 6a1b5086bc93..d80d2b2f4df5 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -51,7 +51,7 @@ buildPythonApplication rec { dbus-python pyxdg python-olm - ]; + ] ++ matrix-nio.optional-dependencies.e2e; meta = with lib; { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index bfe11b27218e..b6c9f61f821e 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -66,7 +66,7 @@ mkDerivation rec { watchgod dbus-python matrix-nio - ]; + ] ++ matrix-nio.optional-dependencies.e2e; qmakeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index bbabfedc690a..0b37b6999e01 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -83,9 +83,6 @@ stdenv.mkDerivation rec { "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - preFixup = lib.optionalString voipSupport '' # add gstreamer plugins path to the wrapper qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 10d2cb87f8b5..dbe944d189b6 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, - attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, + attrs, aiohttp, appdirs, click, keyring, logbook, peewee, janus, prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, setuptools, installShellFiles, nixosTests, @@ -29,12 +29,14 @@ buildPythonApplication rec { click janus keyring - Logbook + logbook matrix-nio peewee prompt-toolkit setuptools - ] ++ lib.optionals enableDbusUi [ + ] + ++ matrix-nio.optional-dependencies.e2e + ++ lib.optionals enableDbusUi [ dbus-python notify2 pygobject3 diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index bc7b973c7b9b..dcfe5424a93c 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -20,15 +20,15 @@ }: let - version = "3.0.0-571"; + version = "3.1.0-9572"; srcs = { x86_64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_amd64.deb"; - sha256 = "sha256-8KcUhZwgeFzGyrQITWnJUzEPGZOCj0LIHLmRuKqkgmQ="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_amd64.deb"; + sha256 = "sha256-xqbyyU4JSlYbAkJ/tqLoVPKfQvxYnMySRx7yV1EtDhM="; }; aarch64-linux = fetchurl { - url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_arm64.deb"; - sha256 = "sha256-LvE+Pryq4KLu+BFYVrGiTwBdgOrBguPHQd73MMFlfiY="; + url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_arm64.deb"; + sha256 = "sha256-ItZqhV9OmycdfRhlzP2llrzcIZvaiUC/LJiDJ/kNIkE="; }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 9fda9d0ec485..be06dbf386ba 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.9.0"; - hash = "sha256-VgEGFt8LvVpIWiqFyYiTXUavYY0YmnJ+CxrNhPP0hCg="; + version = "6.10.1"; + hash = "sha256-uWwRgP9iYirZU9x3QtS5lRGI7vLOOtX4B4fgVuYxkho="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.10.0-beta.1"; - hash = "sha256-A8jpYDWiCCBadRDzmNVxzucKPomgXlqdyeGiYp+1Byo="; + version = "6.11.0-beta.2"; + hash = "sha256-tw8VsPC0shKIN13ICD0PVKhKxA7rdj16r2lP2UEJGsY="; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 6f6a3867fcab..11a95f554fc0 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230307-1"; + version = "20230316"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-+FjjGsYMmleN+TDKFAsvC9o81gVhZHIrUgrWuzksxZU="; + hash = "sha256-aq/+6wxGEYhOsAIBJ+Phjc+jKZGFxrWIZozi4T6WwBI="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 23571658a24b..bb2f64212fc0 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -41,7 +41,7 @@ let inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; + throwSystem = throw "slack does not support system: ${system}"; pname = "slack"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 6e3a9e54f0db..1d42bba30d7d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -220,6 +220,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 1342e0f7e983..da599367af3a 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -8,7 +8,7 @@ , future , atomicwrites , attrs -, Logbook +, logbook , pygments , matrix-nio , aiohttp @@ -45,12 +45,12 @@ in buildPythonPackage { future atomicwrites attrs - Logbook + logbook pygments matrix-nio aiohttp requests - ]; + ] ++ matrix-nio.optional-dependencies.e2e; passthru.scripts = [ "matrix.py" ]; diff --git a/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/pkgs/applications/networking/mailreaders/bubblemail/default.nix index 612762207565..bd5783a5c656 100644 --- a/pkgs/applications/networking/mailreaders/bubblemail/default.nix +++ b/pkgs/applications/networking/mailreaders/bubblemail/default.nix @@ -13,6 +13,7 @@ , glib , gobject-introspection , folks +, bash }: python3Packages.buildPythonApplication rec { @@ -39,6 +40,7 @@ python3Packages.buildPythonApplication rec { libsecret gnome-online-accounts folks + bash ]; nativeBuildInputs = [ @@ -59,9 +61,6 @@ python3Packages.buildPythonApplication rec { # See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped dontWrapGApps = true; - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 2b3678de2726..d55b7f5d87fa 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.8.0"; + version = "102.9.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "2431eb8799184b261609c96bed3c9368bec9035a831aa5f744fa89e48aedb130385b268dd90f03bbddfec449dc3e5fad1b5f8727fe9e11e1d1f123a81b97ddf8"; + sha512 = "0de88cef22e7b239804e27705b577dd34a86487512bb2af29804b358d056628c14034a34cbbdded75612bda984fac2c04d116cca8040b9212a7fb0206c07c440"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index 58f381f7a4ea..de08620cf8a3 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; ([ - PyChromecast + pychromecast psutil mutagen flask diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index 3ba4f6ac57f3..4398c771e535 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/pkgs/applications/networking/opsdroid/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex mattermostdriver setuptools voluptuous ibm-watson tailer multidict watchgod get-video-properties appdirs bitstring matrix-nio - ]; + ] ++ matrix-nio.optional-dependencies.e2e; passthru.python = python3Packages.python; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 507d2a282e4b..dee7cde6fd3f 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -27,7 +27,7 @@ let propagatedBuildInputs = with pypkgs; [ twisted - Mako + mako chardet pyxdg pyopenssl diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index a4b78e250d5c..016ff2aa5e00 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { ipy pyperclip ] ++ - lib.optional useGeoIP GeoIP; + lib.optional useGeoIP geoip; dontBuild = true; doCheck = false; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 98f7ac541a78..14844161d18e 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -41,8 +41,6 @@ buildPythonApplication rec { ]; buildInputs = [ - # To avoid enabling strictDeps = false (#56943) - gobject-introspection librsvg pango webkitgtk diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/applications/networking/sniffers/qtwirediff/default.nix new file mode 100644 index 000000000000..d4fe6c8ee708 --- /dev/null +++ b/pkgs/applications/networking/sniffers/qtwirediff/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, qtbase +, qmake +, qtwayland +, wrapQtAppsHook +, wireshark-cli +}: + + +stdenv.mkDerivation { + pname = "qtwirediff"; + version = "unstable-2023-03-07"; + + src = fetchFromGitHub { + owner = "aaptel"; + repo = "qtwirediff"; + rev = "e0a38180cdf9d94b7535c441487dcefb3a8ec72e"; + hash = "sha256-QS4PslSHe2qhxayF7IHvtFASgd4A7vVtSY8tFQ6dqXM="; + }; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + ] ++ lib.optionals stdenv.isLinux [ + qtwayland + ]; + + installPhase = '' + runHook preInstall + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r qtwirediff.app $out/Applications + makeWrapper $out/{Applications/qtwirediff.app/Contents/MacOS,bin}/qtwirediff + '' + lib.optionalString stdenv.isLinux '' + install -Dm755 -T qtwirediff $out/bin/qtwirediff + wrapProgram $out/bin/qtwirediff \ + --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}" + '' + '' + runHook postInstall + ''; + + meta = { + description = "Debugging tool to diff network traffic leveraging Wireshark"; + homepage = "https://github.com/aaptel/qtwirediff"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ janik ]; + }; +} diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 6cdeaaf09e03..449d156a94ac 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.61.1"; + version = "1.62.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-mBnpmCzuMCXZPM3Tq2SsOPwEfTUn1StahkB5U/6Fe+A="; + sha256 = "sha256-nG3XW6OGzfbvkBmlmeOCnVRFun3EWIVLLvMXGhOAi+4="; }; - vendorSha256 = "sha256-EGNRKSlpdH/NNfLzSDL3lQzArVsVM6oRkyZm31V8cgM="; + vendorSha256 = "sha256-UA6PlhKxJ9wpg3mbiJ4Mqc4npwEBa93qi6WrQR8JQSk="; subPackages = [ "." ]; @@ -30,7 +30,7 @@ buildGoModule rec { postInstall = let rcloneBin = - if stdenv.buildPlatform == stdenv.hostPlatform + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else lib.getBin buildPackages.rclone; in @@ -45,8 +45,8 @@ buildGoModule rec { # as the setuid wrapper is required as non-root on NixOS. '' wrapProgram $out/bin/rclone \ - --suffix PATH : "${lib.makeBinPath [ fuse ] }" \ - --prefix LD_LIBRARY_PATH : "${fuse}/lib" + --suffix PATH : "${lib.makeBinPath [ fuse ] }" \ + --prefix LD_LIBRARY_PATH : "${fuse}/lib" ''; meta = with lib; { diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index be794c529ac3..41607522f73c 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { qtbase qtmultimedia qttools + ] ++ lib.optionals stdenv.isLinux [ qtwayland ] ++ lib.optionals useMupdf [ freetype diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 8165cc381c11..44aaa6c7146e 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -67,7 +67,6 @@ python3Packages.buildPythonApplication rec { ''; format = "other"; - strictDeps = false; # gobject-introspection does not run with strictDeps (https://github.com/NixOS/nixpkgs/issues/56943) checkPhase = "xvfb-run pytest ../tests/"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index d5925fa4d42b..a8a6fb8bf963 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -194,10 +194,12 @@ in outputs = [ "out" "dev" ]; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10 - ]; + ] ++ optionals (stdenv.isLinux && stdenv.isAarch64 && variant == "still") [ + "-O2" # https://bugs.gentoo.org/727188 + ]); tarballPath = "external/tarballs"; diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index c44ca11c4325..13819a0fb5ec 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -89,12 +89,16 @@ in runCommand "${unwrapped.name}-wrapped" { } ('' mkdir -p "$out/bin" mkdir -p "$out/share" + for dir in ${unwrapped}/share/*; do + dirname="''${dir##*/}" + if [[ $dirname == "applications" ]]; then + cp -r $dir/ $out/share/ + else + ln -s $dir $out/share/ + fi + done - ln -s ${unwrapped}/share/icons $out/share/icons - ln -s ${unwrapped}/share/templates $out/share/templates ln -s ${unwrapped}/lib $out/lib - - cp -r ${unwrapped}/share/applications/ $out/share/ for f in $out/share/applications/*.desktop; do substituteInPlace "$f" \ --replace "Exec=libreoffice${major}.${minor}" "Exec=soffice" diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 545a116d3480..d6833bcfae88 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-03-05"; + version = "unstable-2023-03-07"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "0208ba3b43d0618f6d25e99bfb68dcd6f2e19868"; - sha256 = "bxiAbD9s+O49t2hV0cdbDnSNMkBZOm6Z1cs7sQwlaYQ="; + rev = "6672b90aa6310f2a02d9527f500645dd525a8fe3"; + sha256 = "uf4fSkMGVS1/H5HwKTo0Fp69CjI3C9Bmw07oP9PYvlQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index e7275b7a31f9..97f8586894dc 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -6,13 +6,13 @@ let pname = "trilium-desktop"; - version = "0.59.1"; + version = "0.59.2"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "04jmpz8riz71vzs13yy0prwfq3sji36n7mgap80q2xwx445bxrka"; + linuxSource.sha256 = "1mnggfb16vi02dikhnsc3nbdrb0m25f9lch4d1r65lr6svw7sxjp"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "014phlv5mkn5pzbr9gwgy87d57wnkxa6g0pi3k2d4d29fj9v1f44"; + darwinSource.sha256 = "0j07yxfgvqn76bfpbqlvabdkbfrhp5g4f58w9gf6g1n9ky7w7dzj"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 3b326680d64a..bb785c4ef4c6 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "073hxqszd6sh2fcczs8c1sgby0pg97d3h99rjdrj7y2j85hflp5a"; - version = "0.59.1"; + serverSource.sha256 = "1i7rrzj40ixi4l4hhxdn9n0b8zmm40ycprhaklh9kk39v38rai3y"; + version = "0.59.2"; in stdenv.mkDerivation rec { pname = "trilium-server"; inherit version; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 73c94f7339c6..c20c9449ae84 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -14,9 +14,8 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-iOF11/fhQYlvnpWJidJS1yJVavF7xLxvBl59VCh9A4U="; }; - buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; - # see https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663 nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; dontWrapGApps = true; diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 641bda8fb861..76c18839bff7 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -6,7 +6,7 @@ , php}: stdenvNoCC.mkDerivation rec { - name = "cloudlog"; + pname = "cloudlog"; version = "2.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index e6461c924489..725f531dd072 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -41,7 +41,7 @@ gnuradio.pkgs.mkDerivation rec { cmake pkg-config gnuradio.unwrapped.python - gnuradio.unwrapped.python.pkgs.Mako + gnuradio.unwrapped.python.pkgs.mako gnuradio.unwrapped.python.pkgs.six ]; nativeCheckInputs = [ diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 1dbdbaa7225f..6220d36980cf 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -67,7 +67,7 @@ let # building with boost 1.7x fails ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ - Mako + mako six ]; }; @@ -118,7 +118,7 @@ let gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - Mako + mako numpy pygobject3 ]; diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index baf86ca43427..12b8ef003d9c 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -71,7 +71,7 @@ let # building with boost 1.7x fails ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ - Mako + mako six ]; }; @@ -118,7 +118,7 @@ let gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - Mako + mako numpy pygobject3 ]; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index e06e3437281c..80d534a351a9 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -73,7 +73,7 @@ let # building with boost 1.7x fails ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; pythonNative = with python.pkgs; [ - Mako + mako six ]; }; @@ -120,7 +120,7 @@ let gnuradio-companion = { pythonRuntime = with python.pkgs; [ pyyaml - Mako + mako numpy pygobject3 ]; diff --git a/pkgs/applications/radio/uhd/3.5.nix b/pkgs/applications/radio/uhd/3.5.nix index c0cb7b62aac4..5f34597ea274 100644 --- a/pkgs/applications/radio/uhd/3.5.nix +++ b/pkgs/applications/radio/uhd/3.5.nix @@ -85,8 +85,8 @@ stdenv.mkDerivation rec { ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; - # Python + Mako are always required for the build itself but not necessary for runtime. - pythonEnv = python3.withPackages (ps: with ps; [ Mako ] + # Python + mako are always required for the build itself but not necessary for runtime. + pythonEnv = python3.withPackages (ps: with ps; [ mako ] ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] ++ optionals (enableUtils) [ requests six ] ); diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 3eb5b9a679dc..b810af6e2ea6 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -6,6 +6,7 @@ , pkg-config # See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations , boost +, ncurses , enableCApi ? true # requires numpy , enablePythonApi ? false @@ -83,8 +84,8 @@ stdenv.mkDerivation rec { ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; - # Python + Mako are always required for the build itself but not necessary for runtime. - pythonEnv = python3.withPackages (ps: with ps; [ Mako ] + # Python + mako are always required for the build itself but not necessary for runtime. + pythonEnv = python3.withPackages (ps: with ps; [ mako ] ++ optionals (enablePythonApi) [ numpy setuptools ] ++ optionals (enableUtils) [ requests six ] ); @@ -105,6 +106,7 @@ stdenv.mkDerivation rec { # However, if enableLibuhd_Python_api *or* enableUtils is on, we need # pythonEnv for runtime as well. The utilities' runtime dependencies are # handled at the environment + ++ optionals (enableExamples) [ ncurses ncurses.dev ] ++ optionals (enablePythonApi || enableUtils) [ pythonEnv ] ++ optionals (enableDpdk) [ dpdk ] ; @@ -124,7 +126,7 @@ stdenv.mkDerivation rec { ]; postPhases = [ "installFirmware" "removeInstalledTests" ] - ++ optionals (enableUtils) [ "moveUdevRules" ] + ++ optionals (enableUtils && stdenv.targetPlatform.isLinux) [ "moveUdevRules" ] ; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index c555a30b15a8..05c445b6cd08 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ biopython psutil - XlsxWriter + xlsxwriter ]); # Tests rely on some of the databases being available, which is not bundled diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 99d13d1ab895..86219f35f95a 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "muscle"; + pname = "muscle"; version = "5.1.0"; src = fetchFromGitHub { owner = "rcedgar"; - repo = "${name}"; + repo = pname; rev = "${version}"; hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; }; diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index 9206c4fbed7b..d083e202a9ff 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "subread"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; - sha256 = "sha256-Vs7zovkU1DJxMGnVwoL0iDHDoezIlDKtVYDKoyKl9Ws="; + sha256 = "sha256-xUs37YOzQxjY8Rm1wC+50KZcgRGVvMnhdF322vdMots="; }; buildInputs = [ diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix index d5d4c6231e69..f85f93055289 100644 --- a/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "veryfasttree"; + pname = "veryfasttree"; version = "3.1.1"; src = fetchFromGitHub { owner = "citiususc"; - repo = "${name}"; + repo = pname; rev = "v${version}"; hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc="; }; diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 81849f675af3..a16797b955e5 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack , fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper -, libxsmm, spglib, which, pkg-config +, libxsmm, spglib, which, pkg-config, plumed, zlib , enableElpa ? false , elpa } : @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { scalapack blas lapack + plumed + zlib ] ++ lib.optional enableElpa elpa; propagatedBuildInputs = [ mpi ]; @@ -64,7 +66,8 @@ in stdenv.mkDerivation rec { AR = ar -r DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \ -D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \ - -D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"} + -D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"} \ + -D__PLUMED2 CFLAGS = -fopenmp FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \ -ftree-vectorize -funroll-loops -msse2 \ @@ -77,8 +80,11 @@ in stdenv.mkDerivation rec { -lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \ -lint2 -lstdc++ -lvori \ -lgomp -lpthread -lm \ - -fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"} + -fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"} \ + -lz -ldl -lstdc++ ${lib.optionalString (mpi.pname == "openmpi") "$(mpicxx --showme:link)"} \ + -lplumed LDFLAGS = \$(FCFLAGS) \$(LIBS) + include ${plumed}/lib/plumed/src/lib/Plumed.inc EOF ''; diff --git a/pkgs/applications/science/electronics/flatcam/default.nix b/pkgs/applications/science/electronics/flatcam/default.nix index 25efbd754b2a..02b2d2d61ac0 100644 --- a/pkgs/applications/science/electronics/flatcam/default.nix +++ b/pkgs/applications/science/electronics/flatcam/default.nix @@ -46,7 +46,7 @@ in python.pkgs.buildPythonApplication rec { numpy packaging pyqt4 - Rtree + rtree scipy setuptools shapely diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index fb9f226cf39e..fa2f68b82adc 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -13,7 +13,7 @@ , librsvg , libspnav , libuuid -, opencascade +, opencascade-occt , pkg-config , podofo , python3 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { librsvg libspnav libuuid - opencascade + opencascade-occt podofo python3 sqlite @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - CASROOT = opencascade; + CASROOT = opencascade-occt; installFlags = [ "INSTALL=${coreutils}/bin/install" diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index d64f5547e71b..f5ecbac9e852 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.3.2.1"; + version = "3.3.2.2"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "sha256-ysluU3UmWtrTAstnCbSy4TdzbjcnSUeE+d8mpC7Ocvk="; + sha256 = "sha256-0k9Q60+T28m1hPYf5viSdpt0s4d828lfjVo3GjLDm7c="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/engineering/strictdoc/default.nix b/pkgs/applications/science/engineering/strictdoc/default.nix index c81652c5ae7e..aaf944fdd01e 100644 --- a/pkgs/applications/science/engineering/strictdoc/default.nix +++ b/pkgs/applications/science/engineering/strictdoc/default.nix @@ -19,7 +19,7 @@ , setuptools , textx , xlrd -, XlsxWriter +, xlsxwriter , pytestCheckHook }: @@ -70,7 +70,7 @@ buildPythonApplication rec { setuptools textx xlrd - XlsxWriter + xlsxwriter ]; nativeCheckInputs = [ diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index 121d9bf2e20b..c00ab9c340b4 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-OKVAgmHdhQoS3kCwclE9ljON3H2NVCCvpR2hgwfqnA0="; + sha256 = "sha256-AIRqBSO71c26TeQwxjfAGIy8YQddF4tq+ZnWztroyRM="; }; buildInputs = [ expat ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 49c9fc47fef2..3740d4e39268 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -70,7 +70,7 @@ let substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" ''; - ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages + ocamlPackages = if customOCamlPackages != null then customOCamlPackages else with versions; switch coq-version [ { case = range "8.16" "8.17"; out = ocamlPackages_4_14; } { case = range "8.14" "8.15"; out = ocamlPackages_4_12; } diff --git a/pkgs/applications/science/machine-learning/uarmsolver/default.nix b/pkgs/applications/science/machine-learning/uarmsolver/default.nix index b04d4a010783..a4de341166fd 100644 --- a/pkgs/applications/science/machine-learning/uarmsolver/default.nix +++ b/pkgs/applications/science/machine-learning/uarmsolver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "uarmsolver"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "firefly-cpp"; repo = "uARMSolver"; rev = version; - sha256 = "17px69z0kw0z6cip41c45i6srbw56b0md92i9vbqyzinx8b75mzw"; + sha256 = "sha256-t5Nep99dH/TvJzI9woLSuBrAWSqXZvLncXl7/43Z7sA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index e610297a9020..67c7f6fb4a61 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -12,18 +12,25 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ]; - buildInputs = [ libqalculate qtbase qttools qtsvg qtwayland ]; + buildInputs = [ libqalculate qtbase qttools qtsvg ] + ++ lib.optionals stdenv.isLinux [ qtwayland ]; postPatch = '' substituteInPlace qalculate-qt.pro\ --replace "LRELEASE" "${qttools.dev}/bin/lrelease" ''; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/qalculate-qt.app $out/Applications + makeWrapper $out/{Applications/qalculate-qt.app/Contents/MacOS,bin}/qalculate-qt + ''; + meta = with lib; { description = "The ultimate desktop calculator"; homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ _4825764518 ]; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index e58674f34497..efbf80ba16ed 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: stdenv.mkDerivation rec { - name = "readstat"; + pname = "readstat"; version = "1.1.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 76495f5cae15..7ad542402b58 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec { pname = "bada-bib"; version = "0.8.0"; format = "other"; - strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "RogerCrocker"; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 9d107365a4b1..037b8dfa09c7 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -210,9 +210,6 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; - # https://github.com/NixOS/nixpkgs/issues/201254 - NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; - # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}. # TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged. postInstall = '' diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 92f64fbfb916..6fda53161dd3 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "sumo"; - version = "1.9.2"; + version = "1.15.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0zpd331vy1kfi4hfiszv3m8wl4m0wdfr3zzza200kkaakw5hjxhs"; + sha256 = "sha256-Mm8Kqb5W9h2jYvRGypI6v5IHDm4CnAeT+NcJybdU5K0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index ee28a2504781..d030c7add966 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -26,11 +26,6 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU="; }; - # Strict deps breaks guake - # See https://github.com/NixOS/nixpkgs/issues/59930 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index a5c98cb7df81..5eb565227a94 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "378"; + version = "379"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-ZJ37/V7dDtnkfPjk2VO0sNPDC8KAFm38T/0Ulz/sPpI="; + hash = "sha256-p93ydO6EuX+xKDZ1AJ1Tyi0CoP/VzlpRGNr8NiPrsxA="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix index d32e0154c8ae..fb5e0c832288 100644 --- a/pkgs/applications/version-management/bumpver/default.nix +++ b/pkgs/applications/version-management/bumpver/default.nix @@ -20,6 +20,11 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial]; + disabledTests = [ + # fails due to more aggressive setuptools version specifier validation + "test_parse_default_pattern" + ]; + meta = with lib; { description = "Bump version numbers in project files"; homepage = "https://pypi.org/project/bumpver/"; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index f505ebdfeb86..7e3d424a0ec1 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "sha256-pbOe7ZN0IM4PTdRywGCyGJ7GIyPudbVJ3QokVP1bazo="; + sha256 = "sha256-ngO2tj59vKmjz47UCi7sEynFNWVJmjSFxt2+oONkUlY="; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/applications/version-management/git-dive/default.nix new file mode 100644 index 000000000000..78963ec05e95 --- /dev/null +++ b/pkgs/applications/version-management/git-dive/default.nix @@ -0,0 +1,47 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config + # libgit2-sys doesn't support libgit2 1.6 yet +, libgit2_1_5 +, zlib +}: + +rustPlatform.buildRustPackage rec { + pname = "git-dive"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "gitext-rs"; + repo = "git-dive"; + rev = "v${version}"; + hash = "sha256-nl6JEVOU5eDntPOItYCooBi3zx2ceyRLtelr97uYiOY="; + }; + + cargoHash = "sha256-johUvl2hPlgn+2wgFJUR6/pR7lx1NzE4ralcjhVqkik="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libgit2_1_5 + zlib + ]; + + checkFlags = [ + # requires internet access + "--skip=screenshot" + ]; + + # don't use vendored libgit2 + buildNoDefaultFeatures = true; + + meta = with lib; { + description = "Dive into a file's history to find root cause"; + homepage = "https://github.com/gitext-rs/git-dive"; + changelog = "https://github.com/gitext-rs/git-dive/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/version-management/lefthook/default.nix b/pkgs/applications/version-management/lefthook/default.nix index 261b309ebf9a..c69931baceb6 100644 --- a/pkgs/applications/version-management/lefthook/default.nix +++ b/pkgs/applications/version-management/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.3.3"; + version = "1.3.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-9XmLQPkc8we5wRZe5+bhL1b9lxWX6JAQeF4DmRXBgew="; + sha256 = "sha256-v4ES3TbuDRUBK8xH/viP5QOZmp3eWjsy0YRaSxfTZV4="; }; vendorHash = "sha256-VeR/lyrQrjXWvHdxpG4H+XPlAud9rrlzX8GqhVzn1sg="; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 121a0cdf7731..224efe8c1ac2 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -52,10 +52,6 @@ python3.pkgs.buildPythonApplication rec { pycairo ]; - # gobject-introspection and some other similar setup hooks do not currently work with strictDeps. - # https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - postPatch = '' patchShebangs meson_shebang_normalisation.py ''; diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 80da93e5a228..bcbb680e6000 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - hash = "sha256-8fpOCyv/XafrVy76jtazRoHW2gidjikgnRdaWzh8kY8="; + hash = "sha256-XXD55sxgKg8qSdXV7mbnSCQJ4fNgWFG5IiR1QTjDkHI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 7e1157fc4a67..88513fc50a39 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -21,11 +21,11 @@ let version = "7.1.2"; src = oldAttrs.src.override { inherit version; - sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; }; }); - PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec { + pychromecast = super.pychromecast.overridePythonAttrs (oldAttrs: rec { version = "9.2.0"; src = oldAttrs.src.override { inherit version; @@ -40,6 +40,7 @@ with py.pkgs; buildPythonApplication rec { pname = "catt"; version = "0.12.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -49,7 +50,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ click ifaddr - PyChromecast + pychromecast protobuf requests yt-dlp diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index e8fa11c9147c..800edd4792cc 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -15,17 +15,8 @@ in buildPythonApplication rec { sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg"; }; - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/61578 - # and https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - nativeBuildInputs = [ gettext wrapGAppsHook - - # Temporary fix - # See https://github.com/NixOS/nixpkgs/issues/61578 - # and https://github.com/NixOS/nixpkgs/issues/56943 gobject-introspection ]; diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 335b8c191722..635d91ca54e2 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = [ - PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python + pychromecast bottle pycaption paste html5lib pygobject3 dbus-python gtk3 gobject-introspection ]; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 4ba0fe98df05..e44949f54ba6 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -40,9 +40,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 pyxdg pycairo dbus-python xlib ]; - # workaround https://github.com/NixOS/nixpkgs/issues/56943 - strictDeps = false; - patches = [ # Fix paths (substituteAll { diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index d256dad39343..5957d8a2208d 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "6.8.24+matrix.1"; + version = "7.0.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-/yQML2iK5jcIhN6RJC+WJ8EnH640qFJFdaaVeGPEg9U="; + sha256 = "sha256-azluf+CATsgjotTqBUAbqB3PvWuHpsS6weakKAbk9F8="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 0fa8486e15b0..a24d2eb2394e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , fetchFromGitHub +, fetchpatch , addOpenGLRunpath , docutils , meson @@ -93,6 +94,15 @@ in stdenv.mkDerivation (self: { sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; }; + patches = [ + (fetchpatch { + # fixes EDL error on youtube DASH streams https://github.com/mpv-player/mpv/issues/11392 + # to be removed on next release + url = "https://github.com/mpv-player/mpv/commit/94c189dae76ba280d9883b16346c3dfb9720687e.patch"; + sha256 = "sha256-MGXU1L5OSxY5bdEpu9vHngnRXMr7WHeHWuamhjcUD4A="; + }) + ]; + postPatch = '' patchShebangs version.* ./TOOLS/ ''; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 5406b7dfa8a8..7e6f89855ed2 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -44,10 +44,10 @@ python3.pkgs.buildPythonApplication rec { itstool python3 wrapGAppsHook + gobject-introspection ]; buildInputs = [ - gobject-introspection gtk3 libpeas librsvg @@ -78,12 +78,6 @@ python3.pkgs.buildPythonApplication rec { patchShebangs ./getenvvar.py ''; - # Fixes error - # Couldn’t recognize the image file format for file ".../share/pitivi/pixmaps/asset-proxied.svg" - # at startup, see https://github.com/NixOS/nixpkgs/issues/56943 - # and https://github.com/NixOS/nixpkgs/issues/89691#issuecomment-714398705. - strictDeps = false; - passthru = { updateScript = gnome.updateScript { packageName = "pitivi"; diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index b7a5f2ce38c1..8a2094bbb553 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -3,13 +3,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; - rev = "v${version}"; - sha256 = "0hgv9g17dkrh3zbsx27n80yvkgix9j2x0rgg6d3qsf7hp5j3xw4r"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-hUGKOJEDZMK5uhHoevFt1ay6QQEcoN4F8cPxln5uMRo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 47da9a3c7b25..56b91c48cb95 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -37,6 +37,10 @@ buildGoModule rec { vendorHash = "sha256-bEgC7j8WvCgrJ2Ahye4mfWVEmo6Y/OO64mDIJXvtaiE="; + # disable flaky Test_extractZones + # https://hydra.nixos.org/build/212378003/log + excludedPackages = "gvproxy"; + CGO_ENABLED = 1; preConfigure = '' diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 11d8f2223656..8d3c2dedd13a 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,35 +1,25 @@ -{ stdenv, lib, rust, rustPlatform, fetchgit, fetchpatch -, clang, pkg-config, protobuf, python3, wayland-scanner +{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "107.1"; + version = "111.1"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "5a49a836e63aa6e9ae38b80daa09a013a57bfb7f"; - sha256 = "F+5i3R7Tbd9xF63Olnyavzg/hD+8HId1duWm8bvAmLA="; + rev = "9ad89972330f70fca5a29967f226cf905977bf7f"; + sha256 = "hvP3V7kzfPXOIe+6GBWupfhW5SM3ifoqmx7dyTgSTeU="; fetchSubmodules = true; }; separateDebugInfo = true; - patches = [ - # Backport seccomp sandbox update for recent Glibc. - # fetchpatch is not currently gerrit/gitiles-compatible, so we - # have to use the mirror. - # https://github.com/NixOS/nixpkgs/pull/133604 - (fetchpatch { - url = "https://github.com/google/crosvm/commit/aae01416807e7c15270b3d44162610bcd73952ff.patch"; - sha256 = "nQuOMOwBu8QvfwDSuTz64SQhr2dF9qXt2NarbIU55tU="; - }) - ]; - - cargoSha256 = "1jg9x5adz1lbqdwnzld4xg4igzmh90nd9xm287cgkvh5fbmsjfjv"; + cargoSha256 = "S8zeOB+S5ZTuHqWNjxDIa4ev24ose/fByYwPrhR9OY8="; - nativeBuildInputs = [ clang pkg-config protobuf python3 wayland-scanner ]; + nativeBuildInputs = [ + pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner + ]; buildInputs = [ libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols @@ -37,12 +27,8 @@ rustPlatform.buildRustPackage rec { preConfigure = '' patchShebangs third_party/minijail/tools/*.py - substituteInPlace build.rs --replace '"clang"' '"${stdenv.cc.targetPrefix}clang"' ''; - "CARGO_TARGET_${lib.toUpper (builtins.replaceStrings ["-"] ["_"] (rust.toRustTarget stdenv.hostPlatform))}_LINKER" = - "${stdenv.cc.targetPrefix}cc"; - # crosvm mistakenly expects the stable protocols to be in the root # of the pkgdatadir path, rather than under the "stable" # subdirectory. diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix index 4e692eb51b11..54e0d737bf2d 100644 --- a/pkgs/applications/virtualization/docker/compose_1.nix +++ b/pkgs/applications/virtualization/docker/compose_1.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; + hash = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; }; # lots of networking and other fails diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 839022a8d551..f091aad6bf54 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation rec { # crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." hardeningDisable = [ "format" "fortify" ]; + # Fixes the following error when using liblkl-hijack.so on aarch64-linux: + # symbol lookup error: liblkl-hijack.so: undefined symbol: __aarch64_ldadd4_sync + env.NIX_CFLAGS_LINK = "-lgcc_s"; + makeFlags = [ "-C tools/lkl" "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index f20735e45e3d..5312dbdda0ff 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -76,7 +76,7 @@ in let defaultPathOriginal = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"; - privileged-un-utils = if ((isNull newuidmapPath) && (isNull newgidmapPath)) then null else + privileged-un-utils = if ((newuidmapPath == null) && (newgidmapPath == null)) then null else (runCommandLocal "privileged-un-utils" { } '' mkdir -p "$out/bin" ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap" @@ -212,10 +212,10 @@ buildGoModule { rm "$file" done ''} - ${lib.optionalString enableSuid (lib.warnIf (isNull starterSuidPath) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." '' + ${lib.optionalString enableSuid (lib.warnIf (starterSuidPath == null) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." '' chmod +x $out/libexec/${projectName}/bin/starter-suid '')} - ${lib.optionalString (enableSuid && !isNull starterSuidPath) '' + ${lib.optionalString (enableSuid && (starterSuidPath != null)) '' mv "$out"/libexec/${projectName}/bin/starter-suid{,.orig} ln -s ${lib.escapeShellArg starterSuidPath} "$out/libexec/${projectName}/bin/starter-suid" ''} diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index e5d5a1fbfe7c..1a9fe490af85 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 - gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ lib.optional spiceSupport spice-gtk; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 2cb03c7a508b..616045127d26 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.30.4"; + version = "0.30.5"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yJFM7+fpG/vnYvHRT+34rqToCfj8pjKpPRKQ49p2mh0="; + hash = "sha256-7Fjz6Q/f6jocMPAcgeodzdImILKuRmF6V0zo00ZPfjI="; }; - cargoHash = "sha256-G2Yveyplq/SdHgc+sipQqQ67YAU/dPteESVJ8My5Hqs="; + cargoHash = "sha256-cHG3wUlk0AotfrQ8pYZNQDualhKSp6aNpY2mbjgnqzU="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix index 378897435548..e5b0176a4e45 100644 --- a/pkgs/applications/window-managers/picom/picom-next.nix +++ b/pkgs/applications/window-managers/picom/picom-next.nix @@ -1,14 +1,14 @@ -{ pcre, pcre2, picom, lib, fetchFromGitHub }: +{ pcre, pcre2, libXinerama, picom, lib, fetchFromGitHub }: picom.overrideAttrs (oldAttrs: rec { pname = "picom-next"; - version = "unstable-2022-12-23"; - buildInputs = [ pcre2 ] ++ lib.remove pcre oldAttrs.buildInputs; + version = "unstable-2023-01-29"; + buildInputs = [ pcre2 ] ++ lib.remove libXinerama (lib.remove pcre oldAttrs.buildInputs); src = fetchFromGitHub { owner = "yshui"; repo = "picom"; - rev = "60ac2b64db78363fe04189cc734daea3d721d87e"; - sha256 = "09s8kgczks01xbvg3qxqi2rz3lkzgdfyvhrj30mg6n11b6xfgi0d"; + rev = "cee12875625465292bc11bf09dc8ab117cae75f4"; + sha256 = "sha256-lVwBwOvzn4ro1jInRuNvn1vQuwUHUp4MYrDaFRmW9pc="; }; meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; }) |